windows: fix mtail program and network queries

HT: @SiliPSX (#2)
retzkek · May 17, 2021 · 9daf0c0 · 9daf0c0
1 parent 31bb86e
commit 9daf0c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/grafana/dashboards/Chia on Windows.json b/grafana/dashboards/Chia on Windows.json
@@ -976,21 +976,21 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "sum(increase(node_network_receive_bytes_total{instance=\"$node\",device=~\"$interfaces\"}[24h]))",
+          "expr": "sum(increase(windows_net_bytes_received_total{nic=~\"$interfaces\"}[24h]))",
           "interval": "",
           "intervalFactor": 1,
           "legendFormat": " rx",
-          "metric": "node_network_receive_bytes",
+          "metric": "windows_net_bytes_received_total",
           "refId": "A",
           "step": 10
         },
         {
           "exemplar": true,
-          "expr": "sum(increase(node_network_transmit_bytes_total{instance=\"$node\",device=~\"$interfaces\"}[24h]))",
+          "expr": "sum(increase(windows_net_bytes_sent_total{nic=~\"$interfaces\"}[24h]))",
           "interval": "",
           "intervalFactor": 1,
           "legendFormat": "tx",
-          "metric": "node_network_transmit_bytes",
+          "metric": "windows_net_bytes_sent_total",
           "refId": "B",
           "step": 10
         }
@@ -1210,4 +1210,4 @@
   "title": "Chia on Windows",
   "uid": "xyrdGDCMz",
   "version": 5
-}
+}
diff --git a/mtail/chialog.mtail b/mtail/chialog.mtail
@@ -8,7 +8,7 @@ counter chia_harvester_proofs_total
 # keep this from getting too high cardinality, plots_eligible will be one of: 0, 1, 2, many
 histogram chia_harvester_search_time buckets 0.1, 0.25, 0.5, 0.75, 1, 2.5, 5, 10, 30 by plots_eligible
 
-/^(?P<timestamp>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d+) harvester chia.harvester.harvester: \w+\s+ (?P<eligible_plots>\d+) plots were eligible for farming \w+\.\.\. Found (?P<proofs>\d+) proofs\. Time: (?P<search_time>[\d\.]+) s\. Total (?P<total_plots>\d+) plots$/ {
+/^(?P<timestamp>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d+) harvester chia.harvester.harvester: \w+\s+ (?P<eligible_plots>\d+) plots were eligible for farming \w+\.\.\. Found (?P<proofs>\d+) proofs\. Time: (?P<search_time>[\d\.]+) s\. Total (?P<total_plots>\d+) plots(\r\n|\r|\n)/ {
     strptime($timestamp, "2006-01-02T15:04:05")
     chia_harvester_blocks_total++
     chia_harvester_plots_total = $total_plots