From 45f0b4c85f2b7c29ccc9037b9f8484a101759066 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 8 Jul 2021 16:43:53 -0400
Subject: [PATCH] manint and monint

---
 .../grafana/panels/management_traffic.json.jinja | 16 ++++++++--------
 salt/grafana/panels/monitor_traffic.json.jinja   |  8 ++++----
 .../templates/{mainint.json => manint.json}      |  0
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename salt/grafana/templates/{mainint.json => manint.json} (100%)

diff --git a/salt/grafana/panels/management_traffic.json.jinja b/salt/grafana/panels/management_traffic.json.jinja
index c5fda1869..147ddf1ec 100644
--- a/salt/grafana/panels/management_traffic.json.jinja
+++ b/salt/grafana/panels/management_traffic.json.jinja
@@ -82,7 +82,7 @@
       "measurement": "net",
       "orderByTime": "ASC",
       "policy": "default",
-      "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '{{ MANINT }}' AND $timeFilter GROUP BY time($interval) fill(null)",
+      "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '$manint' AND $timeFilter GROUP BY time($interval) fill(null)",
       "rawQuery": false,
       "refId": "A",
       "resultFormat": "time_series",
@@ -122,7 +122,7 @@
           "condition": "AND",
           "key": "interface",
           "operator": "=",
-          "value": "{{ MANINT }}"
+          "value": "$manint"
         }
       ]
     },
@@ -146,7 +146,7 @@
       "measurement": "net",
       "orderByTime": "ASC",
       "policy": "default",
-      "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '{{ MANINT }}' AND $timeFilter GROUP BY time($interval) fill(null)",
+      "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '$manint' AND $timeFilter GROUP BY time($interval) fill(null)",
       "rawQuery": false,
       "refId": "B",
       "resultFormat": "time_series",
@@ -186,7 +186,7 @@
           "condition": "AND",
           "key": "interface",
           "operator": "=",
-          "value": "{{ MANINT }}"
+          "value": "$manint"
         }
       ]
     },
@@ -211,7 +211,7 @@
       "measurement": "net",
       "orderByTime": "ASC",
       "policy": "so_long_term",
-      "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '{{ MANINT }}' AND $timeFilter GROUP BY time($interval) fill(null)",
+      "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '$manint' AND $timeFilter GROUP BY time($interval) fill(null)",
       "rawQuery": false,
       "refId": "C",
       "resultFormat": "time_series",
@@ -251,7 +251,7 @@
           "condition": "AND",
           "key": "interface",
           "operator": "=",
-          "value": "{{ MANINT }}"
+          "value": "$manint"
         }
       ]
     },
@@ -276,7 +276,7 @@
       "measurement": "net",
       "orderByTime": "ASC",
       "policy": "so_long_term",
-      "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '{{ MANINT }}' AND $timeFilter GROUP BY time($interval) fill(null)",
+      "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '$manint' AND $timeFilter GROUP BY time($interval) fill(null)",
       "rawQuery": false,
       "refId": "D",
       "resultFormat": "time_series",
@@ -316,7 +316,7 @@
           "condition": "AND",
           "key": "interface",
           "operator": "=",
-          "value": "{{ MANINT }}"
+          "value": "$manint"
         }
       ]
     }
diff --git a/salt/grafana/panels/monitor_traffic.json.jinja b/salt/grafana/panels/monitor_traffic.json.jinja
index ad3bca4b3..95adf6f75 100644
--- a/salt/grafana/panels/monitor_traffic.json.jinja
+++ b/salt/grafana/panels/monitor_traffic.json.jinja
@@ -82,7 +82,7 @@
       "measurement": "net",
       "orderByTime": "ASC",
       "policy": "default",
-      "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '{{ MONINT }}' AND $timeFilter GROUP BY time($interval) fill(null)",
+      "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '$monint' AND $timeFilter GROUP BY time($interval) fill(null)",
       "rawQuery": false,
       "refId": "A",
       "resultFormat": "time_series",
@@ -122,7 +122,7 @@
           "condition": "AND",
           "key": "interface",
           "operator": "=",
-          "value": "{{ MONINT }}"
+          "value": "$monint"
         }
       ]
     },
@@ -147,7 +147,7 @@
       "measurement": "net",
       "orderByTime": "ASC",
       "policy": "so_long_term",
-      "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '{{ MONINT }}' AND $timeFilter GROUP BY time($interval) fill(null)",
+      "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '$monint' AND $timeFilter GROUP BY time($interval) fill(null)",
       "rawQuery": false,
       "refId": "B",
       "resultFormat": "time_series",
@@ -187,7 +187,7 @@
           "condition": "AND",
           "key": "interface",
           "operator": "=",
-          "value": "{{ MONINT }}"
+          "value": "$monint"
         }
       ]
     }
diff --git a/salt/grafana/templates/mainint.json b/salt/grafana/templates/manint.json
similarity index 100%
rename from salt/grafana/templates/mainint.json
rename to salt/grafana/templates/manint.json