Rename etl_test_count to etl_test_total (#879)

m-lab · Feb 23, 2022 · e1c54fe · e1c54fe
1 parent 281f8b3
commit e1c54fe
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/config/federation/grafana/dashboards/Alert_ParserDailyVolumeTooLow.json b/config/federation/grafana/dashboards/Alert_ParserDailyVolumeTooLow.json
@@ -56,15 +56,15 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "candidate_service:etl_test_count:increase24h",
+          "expr": "candidate_service:etl_test_total:increase24h",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
           "legendFormat": "{{service}}",
           "refId": "A"
         },
         {
-          "expr": "0.7 * quantile by(service)(0.50,\n         label_replace(candidate_service:etl_test_count:increase24h offset 1d,\"delay\",\"1d\",\"\",\".*\" ) OR\n         label_replace(candidate_service:etl_test_count:increase24h offset 3d,\"delay\",\"3d\",\"\",\".*\" ) OR\n         label_replace(candidate_service:etl_test_count:increase24h offset 5d,\"delay\",\"5d\",\"\",\".*\" ) OR\n         label_replace(candidate_service:etl_test_count:increase24h offset 7d,\"delay\",\"7d\",\"\",\".*\" ) OR\n         label_replace(label_replace(vector(0),\"delay\",\"c1\",\"\",\".*\" ), \"service\", \"etl-ndt-parser\",        \"\", \".*\") OR\n         label_replace(label_replace(vector(0),\"delay\",\"c2\",\"\",\".*\" ), \"service\", \"etl-ndt-parser\",        \"\", \".*\") OR\n         label_replace(label_replace(vector(0),\"delay\",\"c1\",\"\",\".*\" ), \"service\", \"etl-sidestream-parser\", \"\", \".*\") OR\n         label_replace(label_replace(vector(0),\"delay\",\"c2\",\"\",\".*\" ), \"service\", \"etl-sidestream-parser\", \"\", \".*\") OR\n         label_replace(label_replace(vector(0),\"delay\",\"c1\",\"\",\".*\" ), \"service\", \"etl-traceroute-parser\", \"\", \".*\") OR\n         label_replace(label_replace(vector(0),\"delay\",\"c2\",\"\",\".*\" ), \"service\", \"etl-traceroute-parser\", \"\", \".*\")\n         )",
+          "expr": "0.7 * quantile by(service)(0.50,\n         label_replace(candidate_service:etl_test_total:increase24h offset 1d,\"delay\",\"1d\",\"\",\".*\" ) OR\n         label_replace(candidate_service:etl_test_total:increase24h offset 3d,\"delay\",\"3d\",\"\",\".*\" ) OR\n         label_replace(candidate_service:etl_test_total:increase24h offset 5d,\"delay\",\"5d\",\"\",\".*\" ) OR\n         label_replace(candidate_service:etl_test_total:increase24h offset 7d,\"delay\",\"7d\",\"\",\".*\" ) OR\n         label_replace(label_replace(vector(0),\"delay\",\"c1\",\"\",\".*\" ), \"service\", \"etl-ndt-parser\",        \"\", \".*\") OR\n         label_replace(label_replace(vector(0),\"delay\",\"c2\",\"\",\".*\" ), \"service\", \"etl-ndt-parser\",        \"\", \".*\") OR\n         label_replace(label_replace(vector(0),\"delay\",\"c1\",\"\",\".*\" ), \"service\", \"etl-sidestream-parser\", \"\", \".*\") OR\n         label_replace(label_replace(vector(0),\"delay\",\"c2\",\"\",\".*\" ), \"service\", \"etl-sidestream-parser\", \"\", \".*\") OR\n         label_replace(label_replace(vector(0),\"delay\",\"c1\",\"\",\".*\" ), \"service\", \"etl-traceroute-parser\", \"\", \".*\") OR\n         label_replace(label_replace(vector(0),\"delay\",\"c2\",\"\",\".*\" ), \"service\", \"etl-traceroute-parser\", \"\", \".*\")\n         )",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,

diff --git a/config/federation/grafana/dashboards/KeepMLabRunning.json b/config/federation/grafana/dashboards/KeepMLabRunning.json
@@ -465,27 +465,27 @@
       "targets": [
         {
           "datasource": "Data Processing (mlab-oti)",
-          "expr": "60*sum by(table) (rate(etl_test_count[10m]))",
+          "expr": "60*sum by(table) (rate(etl_test_total[10m]))",
           "hide": true,
           "legendFormat": "standard - {{table}}",
           "refId": "C"
         },
         {
           "datasource": "Prometheus (mlab-oti)",
-          "expr": "60 * sum by (table) (rate(etl_test_count[10m]))",
+          "expr": "60 * sum by (table) (rate(etl_test_total[10m]))",
           "hide": true,
           "legendFormat": "legacy - {{table}}",
           "refId": "D"
         },
         {
           "datasource": "Data Processing (mlab-oti)",
-          "expr": "60*sum (rate(etl_test_count[10m]))",
+          "expr": "60*sum (rate(etl_test_total[10m]))",
           "legendFormat": "standard",
           "refId": "A"
         },
         {
           "datasource": "Prometheus (mlab-oti)",
-          "expr": "60 * sum  (rate(etl_test_count[10m]))",
+          "expr": "60 * sum  (rate(etl_test_total[10m]))",
           "legendFormat": "legacy",
           "refId": "B"
         }

diff --git a/config/federation/prometheus/alerts.yml b/config/federation/prometheus/alerts.yml
@@ -666,12 +666,12 @@ groups:
 # the delay dimension.
   - alert: ParserDailyVolumeTooLow
     expr: |
-      candidate_service:etl_test_count:increase24h
+      candidate_service:etl_test_total:increase24h
         < (0.7 * quantile by(service)(0.5,
-          label_replace(candidate_service:etl_test_count:increase24h offset 1d, "delay", "1d", "", ".*") or
-          label_replace(candidate_service:etl_test_count:increase24h offset 3d, "delay", "3d", "", ".*") or
-          label_replace(candidate_service:etl_test_count:increase24h offset 5d, "delay", "5d", "", ".*") or
-            label_replace(candidate_service:etl_test_count:increase24h offset 1w, "delay", "7d", "", ".*") or
+          label_replace(candidate_service:etl_test_total:increase24h offset 1d, "delay", "1d", "", ".*") or
+          label_replace(candidate_service:etl_test_total:increase24h offset 3d, "delay", "3d", "", ".*") or
+          label_replace(candidate_service:etl_test_total:increase24h offset 5d, "delay", "5d", "", ".*") or
+            label_replace(candidate_service:etl_test_total:increase24h offset 1w, "delay", "7d", "", ".*") or
             label_replace(label_replace(vector(0), "delay", "c1", "", ".*"), "service", "etl-disco-parser", "", ".*") or
             label_replace(label_replace(vector(0), "delay", "c2", "", ".*"), "service", "etl-disco-parser", "", ".*") or
             label_replace(label_replace(vector(0), "delay", "c1", "", ".*"), "service", "etl-ndt-parser", "", ".*") or

diff --git a/config/federation/prometheus/rules.yml b/config/federation/prometheus/rules.yml
@@ -41,8 +41,8 @@ groups:
   # This rule optimizes the alert query used for ParserDailyVolumeTooLow. Rather
   # than calculate multi-day values continuously, this rule will maintain a history
   # of the precalculated value needed by the rule.
-  - record: candidate_service:etl_test_count:increase24h
-    expr: sum by(service) (increase(etl_test_count{service!~".*batch.*",status="ok"}[1d]))
+  - record: candidate_service:etl_test_total:increase24h
+    expr: sum by(service) (increase(etl_test_total{service!~".*batch.*",status="ok"}[1d]))
 
   # Calculates the daily increase of GCS files for all datatypes.
   # NOTE: increase() appears to add an addition 8-10 archives over reality.