Merge pull request #2734 from rikatz/gateway-api-telemetry

MON-4420: Gateway API telemetry

Author: openshift-merge-bot[bot]

assets/kube-state-metrics/cluster-role.yaml

@@ -143,3 +143,11 @@ rules:
   verbs:
   - list
   - watch
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - gatewayclasses
+  - gateways
+  verbs:
+  - list
+  - watch

assets/kube-state-metrics/custom-resource-state-configmap.yaml

@@ -488,6 +488,53 @@ data:
             - "metadata"
             - "name"
           "name": "verticalpodautoscaler_spec_resourcepolicy_container_policies_maxallowed_memory"
+      - "groupVersionKind":
+          "group": "gateway.networking.k8s.io"
+          "kind": "GatewayClass"
+          "version": "v1"
+        "metrics":
+        - "each":
+            "info":
+              "labelsFromPath":
+                "accepted":
+                - "status"
+                - "conditions"
+                - "[type=Accepted]"
+                - "status"
+                "controller":
+                - "spec"
+                - "controllerName"
+                "gateway_class":
+                - "metadata"
+                - "name"
+            "type": "Info"
+          "help": "Information about GatewayClasses"
+          "name": "gateway_class_info"
+      - "groupVersionKind":
+          "group": "gateway.networking.k8s.io"
+          "kind": "Gateway"
+          "version": "v1"
+        "metrics":
+        - "each":
+            "info":
+              "labelsFromPath":
+                "gateway":
+                - "metadata"
+                - "name"
+                "gateway_class":
+                - "spec"
+                - "gatewayClassName"
+                "namespace":
+                - "metadata"
+                - "namespace"
+                "programmed":
+                - "status"
+                - "conditions"
+                - "[type=Programmed]"
+                - "status"
+            "type": "Info"
+          "help": "Information about Gateways"
+          "name": "gateway_info"
 kind: ConfigMap
 metadata:
   labels:

jsonnet/components/kube-state-metrics.libsonnet

@@ -54,6 +54,11 @@ function(params)
           resources: ['verticalpodautoscalers'],
           verbs: ['list', 'watch'],
         },
+        {
+          apiGroups: ['gateway.networking.k8s.io'],
+          resources: ['gatewayclasses', 'gateways'],
+          verbs: ['list', 'watch'],
+        },
       ],
     },
 

jsonnet/utils/kube-state-metrics-custom-resource-state.libsonnet

@@ -85,6 +85,41 @@ local vpaMetrics = [
   vpaMetric('verticalpodautoscaler_spec_resourcepolicy_container_policies_maxallowed_memory', 'Minimum memory resources the VerticalPodAutoscaler can set for containers matching the name.', 'gauge'),
 ];
 
+local gatewayClassMetrics = [
+  {
+    name: 'gateway_class_info',
+    help: 'Information about GatewayClasses',
+    each: {
+      type: 'Info',
+      info: {
+        labelsFromPath: {
+          gateway_class: ['metadata', 'name'],
+          controller: ['spec', 'controllerName'],
+          accepted: ['status', 'conditions', '[type=Accepted]', 'status'],
+        },
+      },
+    },
+  },
+];
+
+local gatewayMetrics = [
+  {
+    name: 'gateway_info',
+    help: 'Information about Gateways',
+    each: {
+      type: 'Info',
+      info: {
+        labelsFromPath: {
+          namespace: ['metadata', 'namespace'],
+          gateway: ['metadata', 'name'],
+          gateway_class: ['spec', 'gatewayClassName'],
+          programmed: ['status', 'conditions', '[type=Programmed]', 'status'],
+        },
+      },
+    },
+  },
+];
+
 local crsConfig = {
   kind: 'CustomResourceStateMetrics',
   spec: {
@@ -97,6 +132,22 @@ local crsConfig = {
         },
         metrics: vpaMetrics,
       },
+      {
+        groupVersionKind: {
+          group: 'gateway.networking.k8s.io',
+          version: 'v1',
+          kind: 'GatewayClass',
+        },
+        metrics: gatewayClassMetrics,
+      },
+      {
+        groupVersionKind: {
+          group: 'gateway.networking.k8s.io',
+          version: 'v1',
+          kind: 'Gateway',
+        },
+        metrics: gatewayMetrics,
+      },
     ],
   },
 };

manifests/0000_50_cluster-monitoring-operator_02-role.yaml

@@ -374,6 +374,14 @@ rules:
   verbs:
   - list
   - watch
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - gatewayclasses
+  - gateways
+  verbs:
+  - list
+  - watch
 - apiGroups:
   - authentication.k8s.io
   resources: