finalize dashboard, update example sql, remove comments from scrape, …

…change gauge -> counter
medic · Apr 22, 2024 · e4d1f20 · e4d1f20
1 parent 65327e0
commit e4d1f20
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 30 deletions.
diff --git a/exporters/postgres/couch2pg_collector.yml b/exporters/postgres/couch2pg_collector.yml
@@ -13,8 +13,8 @@ queries:
         seq like '%-%'
 
 metrics:
-  - metric_name: couch2pg
-    type: gauge
+  - metric_name: couch2pg_progress_sequence
+    type: counter
     help: 'couch2pg backlog.'
     key_labels:
       - db

diff --git a/exporters/postgres/scrape.yml b/exporters/postgres/scrape.yml
@@ -2,14 +2,3 @@ scrape_configs:
   - job_name: sql_exporter
     static_configs:
       - targets: ['sql_exporter:9399']
-#    relabel_configs:
-#      - source_labels: [__address__]
-#        regex: "(.*)"
-#        replacement: "sql_exporter://${1}"
-#        target_label: __param_target
-#      - source_labels: [__address__]
-#        target_label: instance
-#      - source_labels: [__address__]
-#        target_label: __param_auth_module
-#      - target_label: __address__
-#        replacement: postgres-exporter:9187
diff --git a/exporters/postgres/sql_servers_example.yml b/exporters/postgres/sql_servers_example.yml
@@ -24,5 +24,6 @@ jobs:
     enable_ping: true
     static_configs:
       - targets:
-          local-cht: 'postgres://cht_couch2pg:cht_couch2pg_password@172.17.0.1:5432/cht?sslmode=disable' # //NOSONAR - password is safe to commit
+          # " same as URL in cht-instances.yml      ": 'postgres://USERNAME:PASSWORD@DB_SERVER_IP/DATABASE
+          "172-17-0-1.local-ip.medicmobile.org:10464": 'postgres://cht_couch2pg:cht_couch2pg_password@172.17.0.1:5432/cht?sslmode=disable' # //NOSONAR - password is safe to commit
 
diff --git a/grafana/provisioning/dashboards/CHT/cht_admin_overview.json b/grafana/provisioning/dashboards/CHT/cht_admin_overview.json
@@ -106,7 +106,7 @@
         "content": "# CHT Watchdog\n\nSee the [CHT documentation](https://docs.communityhealthtoolkit.org/apps/guides/hosting/monitoring/) for more information about monitoring and alerting!",
         "mode": "markdown"
       },
-      "pluginVersion": "10.0.0",
+      "pluginVersion": "10.1.1",
       "type": "text"
     },
     {
@@ -181,7 +181,7 @@
         "showHeader": false,
         "sortBy": []
       },
-      "pluginVersion": "9.5.3",
+      "pluginVersion": "10.1.1",
       "targets": [
         {
           "datasource": {
@@ -374,7 +374,7 @@
         },
         "textMode": "auto"
       },
-      "pluginVersion": "10.0.0",
+      "pluginVersion": "10.1.1",
       "targets": [
         {
           "datasource": {
@@ -459,7 +459,7 @@
         },
         "textMode": "auto"
       },
-      "pluginVersion": "10.0.0",
+      "pluginVersion": "10.1.1",
       "targets": [
         {
           "datasource": {
@@ -546,7 +546,7 @@
         "showThresholdLabels": false,
         "showThresholdMarkers": false
       },
-      "pluginVersion": "10.0.0",
+      "pluginVersion": "10.1.1",
       "targets": [
         {
           "datasource": {
@@ -652,7 +652,7 @@
         },
         "textMode": "auto"
       },
-      "pluginVersion": "10.0.0",
+      "pluginVersion": "10.1.1",
       "targets": [
         {
           "datasource": {
@@ -776,7 +776,7 @@
         "showUnfilled": true,
         "valueMode": "color"
       },
-      "pluginVersion": "10.0.0",
+      "pluginVersion": "10.1.1",
       "targets": [
         {
           "datasource": {
@@ -881,7 +881,7 @@
         },
         "textMode": "auto"
       },
-      "pluginVersion": "10.0.0",
+      "pluginVersion": "10.1.1",
       "targets": [
         {
           "datasource": {
@@ -969,7 +969,7 @@
         "showThresholdLabels": false,
         "showThresholdMarkers": false
       },
-      "pluginVersion": "10.0.0",
+      "pluginVersion": "10.1.1",
       "targets": [
         {
           "datasource": {
@@ -1076,7 +1076,7 @@
         "showThresholdLabels": false,
         "showThresholdMarkers": false
       },
-      "pluginVersion": "10.0.0",
+      "pluginVersion": "10.1.1",
       "targets": [
         {
           "datasource": {
@@ -1193,7 +1193,7 @@
         "showThresholdLabels": false,
         "showThresholdMarkers": false
       },
-      "pluginVersion": "10.0.0",
+      "pluginVersion": "10.1.1",
       "targets": [
         {
           "datasource": {
@@ -1215,7 +1215,7 @@
           },
           "editorMode": "builder",
           "exemplar": false,
-          "expr": "sum(couch2pg_progress_sequence{cht_instance=~\"$cht_instance\", db=~\"medic|medic-sentinel|medic-users-meta\"})",
+          "expr": "sum(couch2pg_progress_sequence{target=~\"$cht_instance\", db=~\"medic|medic-sentinel|medic-users-meta\"})",
           "hide": false,
           "instant": true,
           "legendFormat": "__auto",
@@ -1305,7 +1305,7 @@
         },
         "textMode": "auto"
       },
-      "pluginVersion": "10.0.0",
+      "pluginVersion": "10.1.1",
       "targets": [
         {
           "datasource": {
@@ -1482,7 +1482,7 @@
         "showHeader": false,
         "sortBy": []
       },
-      "pluginVersion": "10.0.0",
+      "pluginVersion": "10.1.1",
       "targets": [
         {
           "category": "All categories",
@@ -1670,7 +1670,7 @@
         },
         "textMode": "auto"
       },
-      "pluginVersion": "10.0.0",
+      "pluginVersion": "10.1.1",
       "targets": [
         {
           "datasource": {
@@ -2340,6 +2340,6 @@
   "timezone": "",
   "title": "CHT Admin Overview",
   "uid": "oa2OfL-Vk",
-  "version": 35,
+  "version": 36,
   "weekStart": ""
 }