From 1f36fef4fb70d29a37954f7db5ede4655d564d0b Mon Sep 17 00:00:00 2001
From: Andy Lake <andy@es.net>
Date: Wed, 26 Jun 2024 15:04:14 -0400
Subject: [PATCH] Updating grafana template to account for bucket width

---
 .../templates/endpoints.json.j2               | 351 ++++++++++++++++--
 1 file changed, 322 insertions(+), 29 deletions(-)

diff --git a/psconfig/perfsonar-psconfig/templates/endpoints.json.j2 b/psconfig/perfsonar-psconfig/templates/endpoints.json.j2
index bc71142..757467b 100644
--- a/psconfig/perfsonar-psconfig/templates/endpoints.json.j2
+++ b/psconfig/perfsonar-psconfig/templates/endpoints.json.j2
@@ -18,6 +18,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 1,
+  "id": 7,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -25,10 +26,10 @@
       "datasource": {{ grafana_datasource|tojson }},
       "type": "text",
       "gridPos": {
-        "x": 0,
-        "y": 0,
+        "h": 3,
         "w": 24,
-        "h": 3
+        "x": 0,
+        "y": 0
       },
       "id": 1000,
       "options": {
@@ -40,8 +41,8 @@
         },
         "content": "<div>\n<text style=\"font-size:20pt;\">\n<img \nsrc=\"/grafana/public/img/perfsonar-logo-white-full.svg\" \nstyle=\"background:rgb(17, 18, 23); width:200px; \"/> \n</text>\n<a class=\"simple-button\" href=\"/grafana/dashboards/f/{{ grafana_folder_uid }}\" style=\"float: right;\">Dashboards</a>\n</div>\n\n\n<style>\n  /* custom stuff */\n  a.buttons, button.buttons {\n    text-decoration: none;\n    background-color: #1b6522;\n    border: 3px solid white; \n    border-radius: 3px;\n    color: white !important;  \n    font-weight: bold; \n    text-align: right; \n    padding: 10px; \n    width: auto;\n    display: inline-block;\n  }\n  a.simple-button {\n    text-decoration: none;\n    background-color: black;\n    border: 3px solid #1b6522; \n    border-radius: 3px;\n    color: white; \n    font-weight: bold; \n    text-align: right; \n    padding: 10px; \n    width: auto;\n    margin: 0 5px 0 5px;\n  }\n  a.simple-button:hover {\n    color: #1b6522;\n  }\n  h1.title,h2.title,h3.title,div.title {\n    color: #6D6E71; \n    font-weight:bold;\n  }\n  p.description {\n    color: #6D6E71;\n  }\n  a.link {\n    color: #1b6522;\n  }\n\n  /* ----grafana stuff---- */\n  button.css-82ooe6-button, button.css-1pq88ji-button {\n    background-color: rgba(78, 193, 224,0.7);\n    color: white;\n  }\n  button.css-82ooe6-button:hover, button.css-1pq88ji-button:hover {\n    background-color: #1b6522;\n  }\n  button.dashboard-row__title {\n    color: #6D6E71;\n  }\n  /* +add button */\n  button.css-r8pbcf-button-add-panel-button-add-panel-button-text,\n  button.css-1bvfhzx-button-add-panel-button-add-panel-button-text {\n    color: #1b6522;\n    border: 1px solid #1b6522;\n    }\n\n\n  /* ----light mode---- */\n  button.css-14424at {\n    color: #6D6E71; \n  }\n  button.css-14424at:hover {\n    color: #1b6522; \n  }\n    /* data links */\n  div.css-1d09i7b {\n    color: rgb(36, 41, 46);\n  }\n  div.css-1d09i7b:hover {\n    color: #1b6522;\n  }\n\n  /* ----dark mode---- */\n  div.css-1h2bvkc {\n    color: rgb(204, 204, 220);\n  }\n  div.css-1h2bvkc:hover {\n    color: #6d6e71;\n  }\n  button.css-1n3c59t {\n    color: #1b6522;\n  }\n  button.css-1n3c59t:hover {\n    color: #6D6E71;\n  }\n\n  /* data links */\n  div.css-1ijov7j {\n    color: rgb(204, 204, 220);\n  }\n  div.css-1ijov7j:hover {\n    color: #1b6522;\n  }\n  \n</style>"
       },
-      "pluginVersion": "10.2.0",
-      "transparent": true
+      "pluginVersion": "10.4.3",
+      "transparent": true,
     },
     {
       "datasource":  {{ grafana_datasource|tojson }},
@@ -682,8 +683,36 @@
           "metrics": [
             {
               "field": "result.latency.p_95",
+              "hide": true,
               "id": "1",
               "type": "max"
+            },
+            {
+              "field": "test.spec.bucket-width",
+              "hide": true,
+              "id": "8",
+              "settings": {
+                "missing": "0.001"
+              },
+              "type": "max"
+            },
+            {
+              "hide": false,
+              "id": "9",
+              "pipelineVariables": [
+                {
+                  "name": "latency",
+                  "pipelineAgg": "1"
+                },
+                {
+                  "name": "bucket_width",
+                  "pipelineAgg": "8"
+                }
+              ],
+              "settings": {
+                "script": "params.latency * (params.bucket_width / 0.001)"
+              },
+              "type": "bucket_script"
             }
           ],
           "query": "test.type.keyword:latencybg AND (test.spec.source.keyword:$source OR reference.display-set-source.keyword:$source_ref) AND (test.spec.dest.keyword:$dest OR reference.display-set-dest.keyword:$dest_ref)",
@@ -764,8 +793,35 @@
           "metrics": [
             {
               "field": "result.latency.median",
+              "hide": true,
               "id": "1",
               "type": "max"
+            },
+            {
+              "field": "test.spec.bucket-width",
+              "hide": true,
+              "id": "8",
+              "settings": {
+                "missing": "0.001"
+              },
+              "type": "max"
+            },
+            {
+              "id": "9",
+              "pipelineVariables": [
+                {
+                  "name": "latency",
+                  "pipelineAgg": "1"
+                },
+                {
+                  "name": "bucket_width",
+                  "pipelineAgg": "8"
+                }
+              ],
+              "settings": {
+                "script": "params.latency * (params.bucket_width / 0.001)"
+              },
+              "type": "bucket_script"
             }
           ],
           "query": "test.type.keyword:latencybg AND (test.spec.source.keyword:$source OR reference.display-set-source.keyword:$source_ref) AND (test.spec.dest.keyword:$dest OR reference.display-set-dest.keyword:$dest_ref)",
@@ -846,8 +902,35 @@
           "metrics": [
             {
               "field": "result.latency.min",
+              "hide": true,
               "id": "1",
               "type": "min"
+            },
+            {
+              "field": "test.spec.bucket-width",
+              "hide": true,
+              "id": "8",
+              "settings": {
+                "missing": "0.001"
+              },
+              "type": "max"
+            },
+            {
+              "id": "9",
+              "pipelineVariables": [
+                {
+                  "name": "latency",
+                  "pipelineAgg": "1"
+                },
+                {
+                  "name": "bucket_width",
+                  "pipelineAgg": "8"
+                }
+              ],
+              "settings": {
+                "script": "params.latency * (params.bucket_width / 0.001)"
+              },
+              "type": "bucket_script"
             }
           ],
           "query": "test.type.keyword:latencybg AND (test.spec.source.keyword:$source OR reference.display-set-source.keyword:$source_ref) AND (test.spec.dest.keyword:$dest OR reference.display-set-dest.keyword:$dest_ref)",
@@ -1009,8 +1092,35 @@
           "metrics": [
             {
               "field": "result.latency.p_95",
+              "hide": true,
               "id": "1",
               "type": "max"
+            },
+            {
+              "field": "test.spec.bucket-width",
+              "hide": true,
+              "id": "8",
+              "settings": {
+                "missing": "0.001"
+              },
+              "type": "max"
+            },
+            {
+              "id": "9",
+              "pipelineVariables": [
+                {
+                  "name": "latency",
+                  "pipelineAgg": "1"
+                },
+                {
+                  "name": "bucket_width",
+                  "pipelineAgg": "8"
+                }
+              ],
+              "settings": {
+                "script": "params.latency * (params.bucket_width / 0.001)"
+              },
+              "type": "bucket_script"
             }
           ],
           "query": "test.type.keyword:latencybg AND (test.spec.source.keyword:$dest OR reference.display-set-source.keyword:$dest_ref) AND (test.spec.dest.keyword:$source OR reference.display-set-dest.keyword:$source_ref)",
@@ -1091,8 +1201,35 @@
           "metrics": [
             {
               "field": "result.latency.median",
+              "hide": true,
               "id": "1",
               "type": "max"
+            },
+            {
+              "field": "test.spec.bucket-width",
+              "hide": true,
+              "id": "8",
+              "settings": {
+                "missing": "0.001"
+              },
+              "type": "max"
+            },
+            {
+              "id": "9",
+              "pipelineVariables": [
+                {
+                  "name": "latency",
+                  "pipelineAgg": "1"
+                },
+                {
+                  "name": "bucket_width",
+                  "pipelineAgg": "8"
+                }
+              ],
+              "settings": {
+                "script": "params.latency * (params.bucket_width / 0.001)"
+              },
+              "type": "bucket_script"
             }
           ],
           "query": "test.type.keyword:latencybg AND (test.spec.source.keyword:$dest OR reference.display-set-source.keyword:$dest_ref) AND (test.spec.dest.keyword:$source OR reference.display-set-dest.keyword:$source_ref)",
@@ -1173,8 +1310,35 @@
           "metrics": [
             {
               "field": "result.latency.min",
+              "hide": true,
               "id": "1",
               "type": "min"
+            },
+            {
+              "field": "test.spec.bucket-width",
+              "hide": true,
+              "id": "8",
+              "settings": {
+                "missing": "0.001"
+              },
+              "type": "max"
+            },
+            {
+              "id": "9",
+              "pipelineVariables": [
+                {
+                  "name": "latency",
+                  "pipelineAgg": "1"
+                },
+                {
+                  "name": "bucket_width",
+                  "pipelineAgg": "8"
+                }
+              ],
+              "settings": {
+                "script": "params.latency * (params.bucket_width / 0.001)"
+              },
+              "type": "bucket_script"
             }
           ],
           "query": "test.type.keyword:latencybg AND (test.spec.source.keyword:$dest OR reference.display-set-source.keyword:$dest_ref) AND (test.spec.dest.keyword:$source OR reference.display-set-dest.keyword:$source_ref)",
@@ -1664,8 +1828,35 @@
           "metrics": [
             {
               "field": "result.latency.stddev",
+              "hide": true,
               "id": "1",
               "type": "avg"
+            },
+            {
+              "field": "test.spec.bucket-width",
+              "hide": true,
+              "id": "8",
+              "settings": {
+                "missing": "0.001"
+              },
+              "type": "max"
+            },
+            {
+              "id": "9",
+              "pipelineVariables": [
+                {
+                  "name": "latency",
+                  "pipelineAgg": "1"
+                },
+                {
+                  "name": "bucket_width",
+                  "pipelineAgg": "8"
+                }
+              ],
+              "settings": {
+                "script": "params.latency * (params.bucket_width / 0.001)"
+              },
+              "type": "bucket_script"
             }
           ],
           "query": "test.type.keyword:latencybg AND (test.spec.source.keyword:$source OR reference.display-set-source.keyword:$source_ref) AND (test.spec.dest.keyword:$dest OR reference.display-set-dest.keyword:$dest_ref)",
@@ -1746,8 +1937,35 @@
           "metrics": [
             {
               "field": "result.latency.variance",
+              "hide": true,
               "id": "1",
               "type": "avg"
+            },
+            {
+              "field": "test.spec.bucket-width",
+              "hide": true,
+              "id": "8",
+              "settings": {
+                "missing": "0.001"
+              },
+              "type": "max"
+            },
+            {
+              "id": "9",
+              "pipelineVariables": [
+                {
+                  "name": "latency",
+                  "pipelineAgg": "1"
+                },
+                {
+                  "name": "bucket_width",
+                  "pipelineAgg": "8"
+                }
+              ],
+              "settings": {
+                "script": "params.latency * ((params.bucket_width * params.bucket_width) / (0.001 * 0.001))"
+              },
+              "type": "bucket_script"
             }
           ],
           "query": "test.type.keyword:latencybg AND (test.spec.source.keyword:$source OR reference.display-set-source.keyword:$source_ref) AND (test.spec.dest.keyword:$dest OR reference.display-set-dest.keyword:$dest_ref)",
@@ -1839,7 +2057,15 @@
               "type": "avg"
             },
             {
+              "field": "test.spec.bucket-width",
               "id": "9",
+              "settings": {
+                "missing": "0.001"
+              },
+              "type": "max"
+            },
+            {
+              "id": "10",
               "pipelineVariables": [
                 {
                   "name": "var1",
@@ -1848,10 +2074,14 @@
                 {
                   "name": "var2",
                   "pipelineAgg": "8"
+                },
+                {
+                  "name": "bucket_width",
+                  "pipelineAgg": "9"
                 }
               ],
               "settings": {
-                "script": "params.var1 - params.var2"
+                "script": "(params.var1 - params.var2) * (params.bucket_width / 0.001)"
               },
               "type": "bucket_script"
             }
@@ -2015,8 +2245,35 @@
           "metrics": [
             {
               "field": "result.latency.stddev",
+              "hide": true,
               "id": "1",
               "type": "avg"
+            },
+            {
+              "field": "test.spec.bucket-width",
+              "hide": true,
+              "id": "8",
+              "settings": {
+                "missing": "0.001"
+              },
+              "type": "max"
+            },
+            {
+              "id": "9",
+              "pipelineVariables": [
+                {
+                  "name": "latency",
+                  "pipelineAgg": "1"
+                },
+                {
+                  "name": "bucket_width",
+                  "pipelineAgg": "8"
+                }
+              ],
+              "settings": {
+                "script": "params.latency * (params.bucket_width / 0.001)"
+              },
+              "type": "bucket_script"
             }
           ],
           "query": "test.type.keyword:latencybg AND (test.spec.source.keyword:$dest OR reference.display-set-source.keyword:$dest_ref) AND (test.spec.dest.keyword:$source OR reference.display-set-dest.keyword:$source_ref)",
@@ -2097,8 +2354,35 @@
           "metrics": [
             {
               "field": "result.latency.variance",
+              "hide": true,
               "id": "1",
               "type": "avg"
+            },
+            {
+              "field": "test.spec.bucket-width",
+              "hide": true,
+              "id": "8",
+              "settings": {
+                "missing": "0.001"
+              },
+              "type": "max"
+            },
+            {
+              "id": "9",
+              "pipelineVariables": [
+                {
+                  "name": "latency",
+                  "pipelineAgg": "1"
+                },
+                {
+                  "name": "bucket_width",
+                  "pipelineAgg": "8"
+                }
+              ],
+              "settings": {
+                "script": "params.latency * ((params.bucket_width * params.bucket_width) / (0.001 * 0.001))"
+              },
+              "type": "bucket_script"
             }
           ],
           "query": "test.type.keyword:latencybg AND (test.spec.source.keyword:$dest OR reference.display-set-source.keyword:$dest_ref) AND (test.spec.dest.keyword:$source OR reference.display-set-dest.keyword:$source_ref)",
@@ -2190,7 +2474,16 @@
               "type": "avg"
             },
             {
+              "field": "test.spec.bucket-width",
+              "hide": true,
               "id": "9",
+              "settings": {
+                "missing": "0.001"
+              },
+              "type": "max"
+            },
+            {
+              "id": "10",
               "pipelineVariables": [
                 {
                   "name": "var1",
@@ -2199,10 +2492,14 @@
                 {
                   "name": "var2",
                   "pipelineAgg": "8"
+                },
+                {
+                  "name": "bucket_width",
+                  "pipelineAgg": "9"
                 }
               ],
               "settings": {
-                "script": "params.var1 - params.var2"
+                "script": "(params.var1 - params.var2) * (params.bucket_width / 0.001)"
               },
               "type": "bucket_script"
             }
@@ -2552,7 +2849,7 @@
         "showHeader": true,
         "sortBy": []
       },
-      "pluginVersion": "10.2.0",
+      "pluginVersion": "10.4.3",
       "targets": [
         {
           "alias": "",
@@ -2628,11 +2925,11 @@
             "indexByName": {},
             "renameByName": {
               "Max": "",
-              "test.spec.dest.keyword": "Destination",
               "meta.ip_version": "",
-              "test.spec.source.keyword": "Source",
               "pscheduler.tool.keyword": "Tool",
-              "result.hop.ip_str.keyword": "Hops"
+              "result.hop.ip_str.keyword": "Hops",
+              "test.spec.dest.keyword": "Destination",
+              "test.spec.source.keyword": "Source"
             }
           }
         }
@@ -2731,7 +3028,7 @@
         "showHeader": true,
         "sortBy": []
       },
-      "pluginVersion": "10.2.0",
+      "pluginVersion": "10.4.3",
       "targets": [
         {
           "alias": "",
@@ -2807,11 +3104,11 @@
             "indexByName": {},
             "renameByName": {
               "Max": "",
-              "test.spec.dest.keyword": "Destination",
               "meta.ip_version": "",
-              "test.spec.source.keyword": "Source",
               "pscheduler.tool.keyword": "Tool",
-              "result.hop.ip_str.keyword": "Hops"
+              "result.hop.ip_str.keyword": "Hops",
+              "test.spec.dest.keyword": "Destination",
+              "test.spec.source.keyword": "Source"
             }
           }
         }
@@ -2848,8 +3145,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -2969,14 +3265,12 @@
                   "host": 10,
                   "id": 11,
                   "meta.destination.geo.as": 12,
-                  "test.spec.dest": 4,
                   "meta.destination.ip": 5,
                   "meta.ip_version": 13,
                   "meta.observer.geo.as": 14,
                   "meta.observer.hostname": 15,
                   "meta.observer.ip": 16,
                   "meta.source.geo.as": 17,
-                  "test.spec.source": 2,
                   "meta.source.ip": 3,
                   "pscheduler.added": 18,
                   "pscheduler.duration": 19,
@@ -3054,11 +3348,11 @@
                 },
                 "renameByName": {
                   "Max": "",
-                  "test.spec.dest.keyword": "Destination",
                   "meta.ip_version": "",
-                  "test.spec.source.keyword": "Source",
                   "pscheduler.tool.keyword": "Tool",
-                  "result.hop.ip_str.keyword": "Hops"
+                  "result.hop.ip_str.keyword": "Hops",
+                  "test.spec.dest.keyword": "Destination",
+                  "test.spec.source.keyword": "Source"
                 }
               }
             }
@@ -3085,8 +3379,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -3199,11 +3492,11 @@
                 "indexByName": {},
                 "renameByName": {
                   "Max": "",
-                  "test.spec.dest.keyword": "Destination",
                   "meta.ip_version": "",
-                  "test.spec.source.keyword": "Source",
                   "pscheduler.tool.keyword": "Tool",
-                  "result.hop.ip_str.keyword": "Hops"
+                  "result.hop.ip_str.keyword": "Hops",
+                  "test.spec.dest.keyword": "Destination",
+                  "test.spec.source.keyword": "Source"
                 }
               }
             }
@@ -3233,7 +3526,7 @@
         "content": "<hr>\n<div style=\"text-align:center\"><a href=\"https://www.perfsonar.net/about/privacy-policy/\">Privacy Policy</a> | <a href=\"http://stats.perfsonar.net/\">Global Node Directory</a> | <a href=\"/toolkit/services/host.cgi?method=get_summary\">Host JSON</a></div>\n<div style=\"padding:10px 10px 10px 10px;text-align:center\"><img style=\"width:30px;\" src=\"public/img/ps_footer_grafana_logo.svg\"/>&nbsp;Powered by Grafana</div>",
         "mode": "html"
       },
-      "pluginVersion": "10.2.0",
+      "pluginVersion": "10.4.3",
       "targets": [
         {
           "alias": "",
@@ -3266,7 +3559,7 @@
     }
   ],
   "refresh": "",
-  "schemaVersion": 38,
+  "schemaVersion": 39,
   "tags": [],
   "templating": {
     "list": [