update loki manifests to use cluster default SC (#263)

* update loki manifests to use cluster default SC * updating prom. join queries to avoid many-to-many matching
openshift-qe · Sep 15, 2022 · 3fe37cb · 3fe37cb
1 parent 816fd93
commit 3fe37cb
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/scripts/lokistack-1x-exsmall.yaml b/scripts/lokistack-1x-exsmall.yaml
@@ -16,4 +16,4 @@ spec:
       name: s3-secret
       type: s3
   size: 1x.extra-small
-  storageClassName: gp2
+  storageClassName: ${DEFAULT_SC}
diff --git a/scripts/lokistack-1x-medium.yaml b/scripts/lokistack-1x-medium.yaml
@@ -16,4 +16,4 @@ spec:
       name: s3-secret
       type: s3
   size: 1x.medium
-  storageClassName: gp2
+  storageClassName: ${DEFAULT_SC}
diff --git a/scripts/lokistack-1x-small.yaml b/scripts/lokistack-1x-small.yaml
@@ -16,4 +16,4 @@ spec:
       name: s3-secret
       type: s3
   size: 1x.small
-  storageClassName: gp2
+  storageClassName: ${DEFAULT_SC}
diff --git a/scripts/netobserv.sh b/scripts/netobserv.sh
@@ -81,6 +81,7 @@ deploy_lokistack() {
   # create s3 secret for loki
   $WORKSPACE/ocp-qe-perfscale-ci/scripts/deploy-loki-aws-secret.sh
   oc wait --timeout=180s --for=condition=ready pod -l app.kubernetes.io/name=loki-operator -n openshift-operators-redhat
+  export DEFAULT_SC=$(oc get storageclass -o=jsonpath='{.items[?(@.metadata.annotations.storageclass\.kubernetes\.io/is-default-class=="true")].metadata.name}')
   if [[ "${LOKISTACK_SIZE}" == "1x.extra-small" ]]; then
     LokiStack_CONFIG=$WORKSPACE/ocp-qe-perfscale-ci/scripts/lokistack-1x-exsmall.yaml
   elif [[ "${LOKISTACK_SIZE}" == "1x.small" ]]; then
@@ -90,7 +91,9 @@ deploy_lokistack() {
   else
     LokiStack_CONFIG=$WORKSPACE/ocp-qe-perfscale-ci/scripts/lokistack-1x-exsmall.yaml
   fi
-  oc apply -f $LokiStack_CONFIG
+  TMP_LOKICONFIG=/tmp/lokiconfig.yaml
+  envsubst <$LokiStack_CONFIG >$TMP_LOKICONFIG
+  oc apply -f $TMP_LOKICONFIG
   sleep 30
   oc wait --timeout=300s --for=condition=ready pod -l app.kubernetes.io/name=lokistack -n openshift-operators-redhat
 }

diff --git a/scripts/netobserv_queries_ebpf.yaml b/scripts/netobserv_queries_ebpf.yaml
@@ -1,10 +1,10 @@
 
 # 1. network-observability pods CPU usage
-- query: pod:container_cpu_usage:sum{namespace="network-observability"} * on (pod) group_left(node) kube_pod_info{namespace="network-observability"}
+- query: pod:container_cpu_usage:sum{namespace="network-observability"} * on (pod) group_left(node) kube_pod_info{namespace="network-observability", pod_ip!=""}
   metricName: cpuUsage
 
 # 2. eBPF pods CPU usage
-- query: pod:container_cpu_usage:sum{namespace="network-observability-privileged"} * on (pod) group_left(node) kube_pod_info{namespace="network-observability-privileged"}
+- query: pod:container_cpu_usage:sum{namespace="network-observability-privileged"} * on (pod) group_left(node) kube_pod_info{namespace="network-observability-privileged", pod_ip!=""}
   metricName: ebpfCpuUsage
 
 # 3. network-observability pods memory usage (Working Set)
@@ -28,7 +28,7 @@
   metricName: lokiStorageUsage
 
 # 8. Number of flows processed by ingester per minute aggregated by FLP pods.
-- query: sum(rate(ingest_collector_flow_logs_processed[1m])*60) by (pod) * on (pod) group_left(node) kube_pod_info{namespace="network-observability"}
+- query: sum(rate(ingest_collector_flow_logs_processed[1m])*60) by (pod) * on (pod) group_left(node) kube_pod_info{namespace="network-observability", pod_ip!=""}
   metricName: nFlowsProcessedPerMinute
 
 # 9. Number of bytes processed per minute.

diff --git a/scripts/netobserv_queries_ipfix.yaml b/scripts/netobserv_queries_ipfix.yaml
@@ -1,6 +1,6 @@
 
 # 1. network-observability pods CPU usage
-- query: pod:container_cpu_usage:sum{namespace="network-observability"} * on (pod) group_left(node) kube_pod_info{namespace="network-observability"}
+- query: pod:container_cpu_usage:sum{namespace="network-observability"} * on (pod) group_left(node) kube_pod_info{namespace="network-observability", pod_ip!=""}
   metricName: cpuUsage
 
 # 2. network-observability pods memory usage
@@ -16,7 +16,7 @@
   metricName: memoryUsageRSS
 
 # 5. Number of flows processed by ingester per minute aggregated by FLP pods.
-- query: sum(rate(ingest_collector_flow_logs_processed[1m])*60) by (pod) * on (pod) group_left(node) kube_pod_info{namespace="network-observability"}
+- query: sum(rate(ingest_collector_flow_logs_processed[1m])*60) by (pod) * on (pod) group_left(node) kube_pod_info{namespace="network-observability", pod_ip!=""}
   metricName: nFlowsProcessedPerMinute
 
 # 6. loki-store PVC usage averaging over 5 mins period