From 6db0a0ed484d876c4796107bf14fe8ae618736ed Mon Sep 17 00:00:00 2001
From: Paige Rubendall <prubenda@redhat.com>
Date: Tue, 14 Feb 2023 12:25:07 -0500
Subject: [PATCH] normal node information

---
 utils/touchstone-configs/crio.json            | 33 +++++++++++++
 utils/touchstone-configs/etcd.json            | 46 +++++++++++++++++++
 utils/touchstone-configs/kubelet.json         | 33 +++++++++++++
 utils/touchstone-configs/nodeWorkers.json     | 34 ++++++++++++++
 .../metrics-profiles/metrics-ovn.yaml         |  3 ++
 .../kube-burner/metrics-profiles/metrics.yaml |  3 ++
 6 files changed, 152 insertions(+)
 create mode 100644 utils/touchstone-configs/crio.json
 create mode 100644 utils/touchstone-configs/etcd.json
 create mode 100644 utils/touchstone-configs/kubelet.json
 create mode 100644 utils/touchstone-configs/nodeWorkers.json

diff --git a/utils/touchstone-configs/crio.json b/utils/touchstone-configs/crio.json
new file mode 100644
index 00000000..6ee7f84b
--- /dev/null
+++ b/utils/touchstone-configs/crio.json
@@ -0,0 +1,33 @@
+{
+    "elasticsearch": {
+      "ripsaw-kube-burner": [
+        {
+          "filter": {
+            "metricName.keyword": "crioCPU"
+          },
+          "buckets": [
+            "labels.node.keyword"
+          ],
+          "aggregations": {
+            "value": [
+              "max"
+            ]
+          }
+        },
+        {
+            "filter": {
+              "metricName.keyword": "crioMemory"
+            },
+            "buckets": [
+              "labels.node.keyword"
+            ],
+            "aggregations": {
+              "value": [
+                "max"
+              ]
+            }
+          }
+      ]
+    }
+  }
+  
\ No newline at end of file
diff --git a/utils/touchstone-configs/etcd.json b/utils/touchstone-configs/etcd.json
new file mode 100644
index 00000000..94f79561
--- /dev/null
+++ b/utils/touchstone-configs/etcd.json
@@ -0,0 +1,46 @@
+{
+    "elasticsearch": {
+      "ripsaw-kube-burner": [
+        {
+          "filter": {
+            "metricName.keyword": "99thEtcdDiskBackendCommitDurationSeconds"
+          },
+          "buckets": [
+            "labels.pod.keyword"
+          ],
+          "aggregations": {
+            "value": [
+              "max"
+            ]
+          }
+        },
+        {
+            "filter": {
+              "metricName.keyword": "99thEtcdDiskWalFsyncDurationSeconds"
+            },
+            "buckets": [
+                "labels.pod.keyword"
+              ],
+            "aggregations": {
+              "value": [
+                "max"
+              ]
+            }
+          },
+          {
+            "filter": {
+              "metricName.keyword": "99thEtcdRoundTripTimeSeconds"
+            },
+            "buckets": [
+                "labels.pod.keyword"
+              ],
+            "aggregations": {
+              "value": [
+                "max"
+              ]
+            }
+          }
+      ]
+    }
+  }
+  
\ No newline at end of file
diff --git a/utils/touchstone-configs/kubelet.json b/utils/touchstone-configs/kubelet.json
new file mode 100644
index 00000000..e76a78d9
--- /dev/null
+++ b/utils/touchstone-configs/kubelet.json
@@ -0,0 +1,33 @@
+{
+    "elasticsearch": {
+      "ripsaw-kube-burner": [
+        {
+          "filter": {
+            "metricName.keyword": "kubeletCPU"
+          },
+          "buckets": [
+            "labels.node.keyword"
+          ],
+          "aggregations": {
+            "value": [
+              "max"
+            ]
+          }
+        },
+        {
+            "filter": {
+              "metricName.keyword": "kubeletMemory"
+            },
+            "buckets": [
+              "labels.node.keyword"
+            ],
+            "aggregations": {
+              "value": [
+                "max"
+              ]
+            }
+          }
+      ]
+    }
+  }
+  
\ No newline at end of file
diff --git a/utils/touchstone-configs/nodeWorkers.json b/utils/touchstone-configs/nodeWorkers.json
new file mode 100644
index 00000000..aaed7191
--- /dev/null
+++ b/utils/touchstone-configs/nodeWorkers.json
@@ -0,0 +1,34 @@
+{
+  "elasticsearch": {
+    "ripsaw-kube-burner": [
+        {
+          "filter": {
+            "metricName.keyword": "nodeCPU-Workers"
+          },
+          "buckets": [
+            "labels.instance.keyword"
+          ],
+          "aggregations": {
+            "value": [
+              "avg",
+              "max"
+            ]
+          }
+        },
+        {
+          "filter": {
+            "metricName.keyword": "nodeMemoryUtilization-Workers"
+          },
+          "buckets": [
+            "labels.instance.keyword"
+          ],
+          "aggregations": {
+            "value": [
+              "avg",
+              "max"
+            ]
+          }
+        }
+    ]
+  }
+}
diff --git a/workloads/kube-burner/metrics-profiles/metrics-ovn.yaml b/workloads/kube-burner/metrics-profiles/metrics-ovn.yaml
index 2b9f329f..e0bde772 100644
--- a/workloads/kube-burner/metrics-profiles/metrics-ovn.yaml
+++ b/workloads/kube-burner/metrics-profiles/metrics-ovn.yaml
@@ -69,6 +69,9 @@
 - query: (node_memory_MemTotal_bytes - node_memory_MemAvailable_bytes) and on (instance) label_replace(kube_node_role{role="worker"}, "instance", "$1", "node", "(.+)")
   metricName: nodeMemoryUtilization-Workers
 
+- query: (node_memory_MemTotal_bytes - node_memory_MemAvailable_bytes) and on (instance) label_replace(kube_node_role{role="master"}, "instance", "$1", "node", "(.+)")
+  metricName: nodeMemoryUtilization-Masters
+
 - query: node_memory_MemAvailable_bytes and on (instance) label_replace(kube_node_role{role="infra"}, "instance", "$1", "node", "(.+)")
   metricName: nodeMemoryAvailable-Infra
 
diff --git a/workloads/kube-burner/metrics-profiles/metrics.yaml b/workloads/kube-burner/metrics-profiles/metrics.yaml
index 30e775c4..b98d52f2 100644
--- a/workloads/kube-burner/metrics-profiles/metrics.yaml
+++ b/workloads/kube-burner/metrics-profiles/metrics.yaml
@@ -64,6 +64,9 @@
 - query: (node_memory_MemTotal_bytes - node_memory_MemAvailable_bytes) and on (instance) label_replace(kube_node_role{role="worker"}, "instance", "$1", "node", "(.+)")
   metricName: nodeMemoryUtilization-Workers
 
+- query: (node_memory_MemTotal_bytes - node_memory_MemAvailable_bytes) and on (instance) label_replace(kube_node_role{role="master"}, "instance", "$1", "node", "(.+)")
+  metricName: nodeMemoryUtilization-Masters
+  
 - query: node_memory_MemAvailable_bytes and on (instance) label_replace(kube_node_role{role="infra"}, "instance", "$1", "node", "(.+)")
   metricName: nodeMemoryAvailable-Infra