diff --git a/charts/monitoring/Chart.yaml b/charts/monitoring/Chart.yaml index 6526493..a3f8020 100644 --- a/charts/monitoring/Chart.yaml +++ b/charts/monitoring/Chart.yaml @@ -8,4 +8,4 @@ dependencies: description: A Helm chart for Monitoring name: monitoring type: application -version: 0.1.17 +version: 0.1.18 diff --git a/charts/monitoring/templates/alertmanager-dashboard.yaml b/charts/monitoring/templates/alertmanager-dashboard.yaml index 2392d2f..94775e0 100644 --- a/charts/monitoring/templates/alertmanager-dashboard.yaml +++ b/charts/monitoring/templates/alertmanager-dashboard.yaml @@ -8,7 +8,7 @@ metadata: labels: grafana_dashboard: "1" data: - cluster.json: |- + alert.json: |- { "annotations": { "list": [ @@ -232,8 +232,8 @@ data: }, { "datasource": { - "type": "camptocamp-prometheus-alertmanager-datasource", - "uid": "camptocamp-prometheus-alertmanager-datasource" + "type": "Prometheus AlertManager Datasource", + "uid": "Prometheus AlertManager Datasource" }, "fieldConfig": { "defaults": { @@ -363,8 +363,8 @@ data: "targets": [ { "datasource": { - "type": "camptocamp-prometheus-alertmanager-datasource", - "uid": "camptocamp-prometheus-alertmanager-datasource" + "type": "Prometheus AlertManager Datasource", + "uid": "Prometheus AlertManager Datasource" }, "filters": "cluster_name=\"$cluster_name\"", "refId": "A" @@ -383,8 +383,8 @@ data: }, { "datasource": { - "type": "camptocamp-prometheus-alertmanager-datasource", - "uid": "camptocamp-prometheus-alertmanager-datasource" + "type": "Prometheus AlertManager Datasource", + "uid": "Prometheus AlertManager Datasource" }, "fieldConfig": { "defaults": { @@ -433,8 +433,8 @@ data: "targets": [ { "datasource": { - "type": "camptocamp-prometheus-alertmanager-datasource", - "uid": "camptocamp-prometheus-alertmanager-datasource" + "type": "Prometheus AlertManager Datasource", + "uid": "Prometheus AlertManager Datasource" }, "filters": "severity=\"warning\", cluster_name=\"$cluster_name\"", "refId": "A" @@ -528,8 +528,8 @@ data: }, { "datasource": { - "type": "camptocamp-prometheus-alertmanager-datasource", - "uid": "camptocamp-prometheus-alertmanager-datasource" + "type": "Prometheus AlertManager Datasource", + "uid": "Prometheus AlertManager Datasource" }, "fieldConfig": { "defaults": { @@ -607,8 +607,8 @@ data: "targets": [ { "datasource": { - "type": "camptocamp-prometheus-alertmanager-datasource", - "uid": "camptocamp-prometheus-alertmanager-datasource" + "type": "Prometheus AlertManager Datasource", + "uid": "Prometheus AlertManager Datasource" }, "filters": "severity=\"warning\", cluster_name=\"$cluster_name\"", "refId": "A" @@ -662,8 +662,8 @@ data: }, { "datasource": { - "type": "camptocamp-prometheus-alertmanager-datasource", - "uid": "camptocamp-prometheus-alertmanager-datasource" + "type": "Prometheus AlertManager Datasource", + "uid": "Prometheus AlertManager Datasource" }, "fieldConfig": { "defaults": { @@ -712,8 +712,8 @@ data: "targets": [ { "datasource": { - "type": "camptocamp-prometheus-alertmanager-datasource", - "uid": "camptocamp-prometheus-alertmanager-datasource" + "type": "Prometheus AlertManager Datasource", + "uid": "Prometheus AlertManager Datasource" }, "filters": "severity=\"critical\", cluster_name=\"$cluster_name\"", "refId": "A" @@ -806,8 +806,8 @@ data: }, { "datasource": { - "type": "camptocamp-prometheus-alertmanager-datasource", - "uid": "camptocamp-prometheus-alertmanager-datasource" + "type": "Prometheus AlertManager Datasource", + "uid": "Prometheus AlertManager Datasource" }, "fieldConfig": { "defaults": { @@ -885,8 +885,8 @@ data: "targets": [ { "datasource": { - "type": "camptocamp-prometheus-alertmanager-datasource", - "uid": "camptocamp-prometheus-alertmanager-datasource" + "type": "Prometheus AlertManager Datasource", + "uid": "Prometheus AlertManager Datasource" }, "filters": "severity=\"critical\", cluster_name=\"$cluster_name\"", "refId": "A" @@ -963,8 +963,8 @@ data: "targets": [ { "datasource": { - "type": "camptocamp-prometheus-alertmanager-datasource", - "uid": "camptocamp-prometheus-alertmanager-datasource" + "type": "Prometheus AlertManager Datasource", + "uid": "Prometheus AlertManager Datasource" }, "editorMode": "builder", "expr": "{cluster_name=\"$cluster_name\", namespace=\"observability\", pod=\"alertmanager-prometheus-kube-prometheus-alertmanager-0\"} |= `$filter`", diff --git a/charts/monitoring/templates/application-overview-dashboard.yaml b/charts/monitoring/templates/application-overview-dashboard.yaml index 6628131..7f44419 100644 --- a/charts/monitoring/templates/application-overview-dashboard.yaml +++ b/charts/monitoring/templates/application-overview-dashboard.yaml @@ -8,7 +8,7 @@ metadata: labels: grafana_dashboard: "1" data: - cluster.json: |- + application.json: |- { "annotations": { "list": [ diff --git a/charts/monitoring/templates/proact-dashboard.yaml b/charts/monitoring/templates/proact-dashboard.yaml index ad952d6..48eac92 100644 --- a/charts/monitoring/templates/proact-dashboard.yaml +++ b/charts/monitoring/templates/proact-dashboard.yaml @@ -36,7 +36,7 @@ data: { "datasource": { "type": "marcusolsson-json-datasource", - "uid": "marcusolsson-json-datasource" + "uid": "JSON-API" }, "fieldConfig": { "defaults": { @@ -127,7 +127,7 @@ data: "cacheDurationSeconds": 300, "datasource": { "type": "marcusolsson-json-datasource", - "uid": "marcusolsson-json-datasource" + "uid": "JSON-API" }, "fields": [ { @@ -156,7 +156,7 @@ data: { "datasource": { "type": "marcusolsson-json-datasource", - "uid": "marcusolsson-json-datasource" + "uid": "JSON-API" }, "fieldConfig": { "defaults": { @@ -205,7 +205,7 @@ data: "cacheDurationSeconds": 300, "datasource": { "type": "marcusolsson-json-datasource", - "uid": "marcusolsson-json-datasource" + "uid": "JSON-API" }, "fields": [ { @@ -226,7 +226,7 @@ data: { "datasource": { "type": "marcusolsson-json-datasource", - "uid": "marcusolsson-json-datasource" + "uid": "JSON-API" }, "fieldConfig": { "defaults": { @@ -381,7 +381,7 @@ data: "cacheDurationSeconds": 300, "datasource": { "type": "marcusolsson-json-datasource", - "uid": "marcusolsson-json-datasource" + "uid": "JSON-API" }, "fields": [ { @@ -436,7 +436,7 @@ data: { "datasource": { "type": "marcusolsson-json-datasource", - "uid": "marcusolsson-json-datasource" + "uid": "JSON-API" }, "fieldConfig": { "defaults": { @@ -515,7 +515,7 @@ data: "cacheDurationSeconds": 300, "datasource": { "type": "marcusolsson-json-datasource", - "uid": "marcusolsson-json-datasource" + "uid": "JSON-API" }, "fields": [ { @@ -569,7 +569,7 @@ data: { "datasource": { "type": "marcusolsson-json-datasource", - "uid": "marcusolsson-json-datasource" + "uid": "JSON-API" }, "fieldConfig": { "defaults": { @@ -664,7 +664,7 @@ data: "cacheDurationSeconds": 300, "datasource": { "type": "marcusolsson-json-datasource", - "uid": "marcusolsson-json-datasource" + "uid": "JSON-API" }, "fields": [ { @@ -707,7 +707,7 @@ data: { "datasource": { "type": "marcusolsson-json-datasource", - "uid": "marcusolsson-json-datasource" + "uid": "JSON-API" }, "fieldConfig": { "defaults": { @@ -764,7 +764,7 @@ data: "cacheDurationSeconds": 300, "datasource": { "type": "marcusolsson-json-datasource", - "uid": "marcusolsson-json-datasource" + "uid": "JSON-API" }, "fields": [ { @@ -784,7 +784,7 @@ data: { "datasource": { "type": "marcusolsson-json-datasource", - "uid": "marcusolsson-json-datasource" + "uid": "JSON-API" }, "fieldConfig": { "defaults": { @@ -841,7 +841,7 @@ data: "cacheDurationSeconds": 300, "datasource": { "type": "marcusolsson-json-datasource", - "uid": "marcusolsson-json-datasource" + "uid": "JSON-API" }, "fields": [ { @@ -873,7 +873,7 @@ data: }, "datasource": { "type": "marcusolsson-json-datasource", - "uid": "marcusolsson-json-datasource" + "uid": "JSON-API" }, "definition": "$.[*].schedule_id", "hide": 2, diff --git a/charts/monitoring/templates/prometheus-alertmanager-datasource.yaml b/charts/monitoring/templates/prometheus-alertmanager-datasource.yaml index da0fb87..a9baa9b 100644 --- a/charts/monitoring/templates/prometheus-alertmanager-datasource.yaml +++ b/charts/monitoring/templates/prometheus-alertmanager-datasource.yaml @@ -11,6 +11,6 @@ data: apiVersion: 1 datasources: - name: Prometheus AlertManager Datasource - type: Prometheus AlertManager Datasource + type: camptocamp-prometheus-alertmanager-datasource access: proxy url: {{ .Values.datasources.prometheusAlertmanager.url }} \ No newline at end of file diff --git a/charts/monitoring/values.yaml b/charts/monitoring/values.yaml index c3def09..7484ed3 100644 --- a/charts/monitoring/values.yaml +++ b/charts/monitoring/values.yaml @@ -104,7 +104,7 @@ datasources: prometheusAlertmanager: url: http://prometheus-kube-prometheus-alertmanager:9093 jsonApi: - url: http://proact-scheduler + url: http://proact-scheduler.capten.svc.cluster.local:5000/api/v1/schedule/ nodeSelector: {} tolerations: []