Merge pull request #94 from akash4sh/main

Rename grafana-dashboard chart with monitoring

charts/k8ssandra-cluster/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.2
+version: 0.1.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/k8ssandra-cluster/templates/cluster.yaml

@@ -1,11 +1,11 @@
 apiVersion: k8ssandra.io/v1alpha1
 kind: K8ssandraCluster
 metadata:
-  name: temporal
+  name: capten-cass
 spec:
   cassandra:
     serverVersion: "4.0.1"
-    serverImage: k8ssandra/cass-management-api:4.0.1
+    serverImage: {{ .Values.image.serverImage }}
     telemetry:
       prometheus:
         enabled: true
@@ -19,10 +19,12 @@ spec:
     config:
       jvmOptions:
         heapSize: 512M
+    networking: 
+      hostNetwork: {{ .Values.networking.hostNetwork }}
     datacenters:
       - metadata:
-          name: temporal
-        size: 1
+          name: capten-cass
+        size: {{ .Values.datacenters.size }}
     mgmtAPIHeap: 256Mi 
   stargate:
     size: 1

charts/k8ssandra-cluster/values.yaml

@@ -5,15 +5,19 @@
 replicaCount: 1
 
 image:
-  repository: nginx
-  pullPolicy: IfNotPresent
+  serverImage: k8ssandra/cass-management-api:4.0.1
   # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
 
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
+networking: 
+  hostNetwork: false 
+
+datacenters:
+  size: 3
+
 serviceAccount:
   # Specifies whether a service account should be created
   create: true

charts/monitoring/Chart.yaml

@@ -0,0 +1,11 @@
+apiVersion: v2
+appVersion: 1.16.0
+description: A Helm chart for Monitoring
+name: monitoring
+type: application
+version: 0.1.7
+dependencies:
+  - name: prometheus-msteams 
+    condition: teams.enabled
+    version: 1.0.0
+    repository: https://kube-tarian.github.io/helmrepo-supporting-tools/

charts/monitoring/templates/NOTES.txt

@@ -0,0 +1 @@
+{}

charts/grafana-dashboards/templates/_helpers.tpl → charts/monitoring/templates/_helpers.tpl

@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "grafana-dashboards.name" -}}
+{{- define "monitoring.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -10,7 +10,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "grafana-dashboards.fullname" -}}
+{{- define "monitoring.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "grafana-dashboards.chart" -}}
+{{- define "monitoring.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "grafana-dashboards.labels" -}}
-helm.sh/chart: {{ include "grafana-dashboards.chart" . }}
-{{ include "grafana-dashboards.selectorLabels" . }}
+{{- define "monitoring.labels" -}}
+helm.sh/chart: {{ include "monitoring.chart" . }}
+{{ include "monitoring.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "grafana-dashboards.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "grafana-dashboards.name" . }}
+{{- define "monitoring.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "monitoring.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "grafana-dashboards.serviceAccountName" -}}
+{{- define "monitoring.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "grafana-dashboards.fullname" .) .Values.serviceAccount.name }}
+{{- default (include "monitoring.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}

charts/grafana-dashboards/templates/falco-dashboard.yaml → charts/monitoring/templates/falco-dashboard.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "grafana-dashboards.fullname" . }}-falco
+  name: {{ include "monitoring.fullname" . }}-falco
   annotations:
     meta.helm.sh/release-namespace: {{ .Release.Namespace }}
     grafana_folder: "Falco"

charts/grafana-dashboards/templates/k8ssandra-condensed-dashboard.yaml → charts/monitoring/templates/k8ssandra-condensed-dashboard.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "grafana-dashboards.fullname" . }}-k8ssandra-condensed
+  name: {{ include "monitoring.fullname" . }}-k8ssandra-condensed
   annotations:
     meta.helm.sh/release-namespace: {{ .Release.Namespace }}
     grafana_folder: "Cassandra"

charts/grafana-dashboards/templates/k8ssandra-dashboard.yaml → charts/monitoring/templates/k8ssandra-dashboard.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "grafana-dashboards.fullname" . }}-k8ssandra
+  name: {{ include "monitoring.fullname" . }}-k8ssandra
   annotations:
     meta.helm.sh/release-namespace: {{ .Release.Namespace }}
     grafana_folder: "Cassandra"

charts/grafana-dashboards/templates/k8ssandra-overview-dashboard.yaml → charts/monitoring/templates/k8ssandra-overview-dashboard.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "grafana-dashboards.fullname" . }}-k8ssandra-overview
+  name: {{ include "monitoring.fullname" . }}-k8ssandra-overview
   annotations:
     meta.helm.sh/release-namespace: {{ .Release.Namespace }}
     grafana_folder: "Cassandra"

charts/grafana-dashboards/templates/kubescape-dashboard.yaml → charts/monitoring/templates/kubescape-dashboard.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "grafana-dashboards.fullname" . }}-kubescape
+  name: {{ include "monitoring.fullname" . }}-kubescape
   annotations:
     meta.helm.sh/release-namespace: {{ .Release.Namespace }}
     grafana_folder: "Kubescape"

charts/grafana-dashboards/templates/kyverno-dashboard.yaml → charts/monitoring/templates/kyverno-dashboard.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "grafana-dashboards.fullname" . }}-kyverno
+  name: {{ include "monitoring.fullname" . }}-kyverno
   annotations:
     meta.helm.sh/release-namespace: {{ .Release.Namespace }}
     grafana_folder: "Kyverno"

charts/monitoring/templates/openebs-cstor-servicemonitor.yaml

@@ -0,0 +1,36 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    release: prometheus
+  name: {{ include "monitoring.fullname" . }}-cstor
+spec:
+  endpoints:
+  - path: /metrics
+    port: exporter
+    relabelings:
+    - action: keep
+      regex: volume_exporter_prometheus
+      sourceLabels:
+      - __meta_kubernetes_pod_label_monitoring
+    - action: replace
+      sourceLabels:
+      - __meta_kubernetes_pod_label_vsm
+      targetLabel: openebs_pv
+    - action: replace
+      sourceLabels:
+      - __meta_kubernetes_pod_label_openebs_io_persistent_volume
+      targetLabel: openebs_pv
+    - action: replace
+      sourceLabels:
+      - __meta_kubernetes_pod_label_openebs_io_persistent_volume_claim
+      targetLabel: openebs_pvc
+    - action: replace
+      sourceLabels:
+      - __meta_kubernetes_endpoints_label_openebs_io_cas_type
+      targetLabel: openebs_cas_type
+  namespaceSelector:
+    any: true
+  selector:
+    matchLabels:
+      openebs.io/cas-type: cstor

charts/grafana-dashboards/templates/rules.yaml → charts/monitoring/templates/rules.yaml

@@ -1,7 +1,7 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  name: {{ include "grafana-dashboards.fullname" . }}-alert.rules
+  name: {{ include "monitoring.fullname" . }}-alert.rules
   annotations:
     meta.helm.sh/release-namespace: {{ .Release.Namespace }}
   labels:

charts/grafana-dashboards/templates/slack-alertmanager.yaml → charts/monitoring/templates/slack-alertmanager.yaml

@@ -2,7 +2,7 @@
 apiVersion: monitoring.coreos.com/v1alpha1
 kind: AlertmanagerConfig
 metadata:
-  name: {{ include "grafana-dashboards.fullname" . }}-slack-alertmanager
+  name: {{ include "monitoring.fullname" . }}-slack-alertmanager
   labels:
     alertmanagerConfig: slack
 spec:
@@ -22,7 +22,7 @@ spec:
     slackConfigs:
     - sendResolved: true
       apiURL:
-        name: {{ include "grafana-dashboards.fullname" . }}-slack-webhook
+        name: {{ include "monitoring.fullname" . }}-slack-webhook
         key: webhookURL
       channel: '{{ .Values.slack.channel }}'
       iconURL: https://avatars3.githubusercontent.com/u/3380462

charts/grafana-dashboards/templates/slack-webhook-secret.yaml → charts/monitoring/templates/slack-webhook-secret.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Secret
 type: Opaque
 metadata:
-  name: {{ include "grafana-dashboards.fullname" . }}-slack-webhook
+  name: {{ include "monitoring.fullname" . }}-slack-webhook
   namespace: {{ .Release.Namespace }}
 data:
   webhookURL: {{ .Values.slack.webhook | b64enc }}

charts/monitoring/templates/teams-alermanager.yaml

@@ -0,0 +1,22 @@
+{{- if .Values.teams.enabled }}
+apiVersion: monitoring.coreos.com/v1alpha1
+kind: AlertmanagerConfig
+metadata:
+  labels:
+    alertmanagerConfig: webhook
+    release: prometheus
+  name: {{ include "monitoring.fullname" . }}-webhook
+spec:
+  receivers:
+  - name: webhook
+    webhookConfigs:
+    - url: '{{ .Values.teams.url }}'
+  route:
+    groupBy:
+    - job
+    groupInterval: 5m
+    groupWait: 30s
+    receiver: webhook
+    repeatInterval: 12h
+{{- end }}
+

charts/grafana-dashboards/templates/temporal-dashboard.yaml → charts/monitoring/templates/temporal-dashboard.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "grafana-dashboards.fullname" . }}-temporal
+  name: {{ include "monitoring.fullname" . }}-temporal
   annotations:
     meta.helm.sh/release-namespace: {{ .Release.Namespace }}
     grafana_folder: "Temporal"

charts/monitoring/templates/traefik-servicemonitor.yaml

@@ -0,0 +1,22 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    app.kubernetes.io/instance: traefik-traefik
+    app.kubernetes.io/name: traefik
+    release: prometheus
+  name: {{ include "monitoring.fullname" . }}-traefik
+spec:
+  endpoints:
+  - honorLabels: true
+    interval: 30s
+    path: /metrics
+    port: metrics
+  jobLabel: traefik
+  namespaceSelector:
+    matchNames:
+    - traefik
+  selector:
+    matchLabels:
+      app.kubernetes.io/instance: traefik-traefik
+      app.kubernetes.io/name: traefik

charts/grafana-dashboards/templates/velero-dashboard.yaml → charts/monitoring/templates/velero-dashboard.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "grafana-dashboards.fullname" . }}-velero
+  name: {{ include "monitoring.fullname" . }}-velero
   annotations:
     meta.helm.sh/release-namespace: {{ .Release.Namespace }}
     grafana_folder: "Velero"

charts/grafana-dashboards/values.yaml → charts/monitoring/values.yaml

@@ -61,6 +61,22 @@ slack:
   webhook: "https://hooks.slack.com/services"
   channel: "#capten-cluster-alert"
 
+teams:
+  enabled: true
+  url: "http://prometheus-msteams:2000/alert"
+  container:
+    additionalArgs:
+    - -debug
+    - -teams-request-uri=alert
+  metrics:
+    serviceMonitor:
+      additionalLabels:
+        release: prometheus
+      enabled: true
+      scrapeInterval: 30s
+  connectors:
+  - alert: https://webhook.office.com/
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little