From 08b1415ccd240698a293342971e4e7059d21a407 Mon Sep 17 00:00:00 2001 From: sravula84 <119365902+sravula84@users.noreply.github.com> Date: Thu, 22 Aug 2024 10:12:36 -0700 Subject: [PATCH 01/12] Create podmonitoring.yaml --- .../templates/podmonitoring.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml diff --git a/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml b/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml new file mode 100644 index 00000000..7a5d61e8 --- /dev/null +++ b/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml @@ -0,0 +1,13 @@ +apiVersion: monitoring.googleapis.com/v1 +kind: PodMonitoring +metadata: + name: prosper-linux-np-podmonitor + namespace: prosper-runners +spec: + selector: + matchLabels: + app.kubernetes.io/component: runner-scale-set-listener + endpoints: + - interval: 30s + path: /metrics + port: 8080 From d1a9b1aac45bdd91b520d2834437e8f3b07504e6 Mon Sep 17 00:00:00 2001 From: sravula84 <119365902+sravula84@users.noreply.github.com> Date: Thu, 22 Aug 2024 10:13:17 -0700 Subject: [PATCH 02/12] Update podmonitoring.yaml --- .../templates/podmonitoring.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml b/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml index 7a5d61e8..78edd167 100644 --- a/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml +++ b/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml @@ -1,12 +1,13 @@ apiVersion: monitoring.googleapis.com/v1 kind: PodMonitoring metadata: - name: prosper-linux-np-podmonitor - namespace: prosper-runners + annotations: + meta.helm.sh/release-name: prosper-runner-controller + meta.helm.sh/release-namespace: prosper-runners spec: selector: matchLabels: - app.kubernetes.io/component: runner-scale-set-listener + app.kubernetes.io/name: gha-rs-controller endpoints: - interval: 30s path: /metrics From 2c1fc854437ece7a9d5008adeed90f89ad33d513 Mon Sep 17 00:00:00 2001 From: sravula84 <119365902+sravula84@users.noreply.github.com> Date: Thu, 22 Aug 2024 10:13:47 -0700 Subject: [PATCH 03/12] Create podmonitoring.yaml --- .../templates/podmonitoring.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 charts/gha-runner-scale-set/templates/podmonitoring.yaml diff --git a/charts/gha-runner-scale-set/templates/podmonitoring.yaml b/charts/gha-runner-scale-set/templates/podmonitoring.yaml new file mode 100644 index 00000000..7a5d61e8 --- /dev/null +++ b/charts/gha-runner-scale-set/templates/podmonitoring.yaml @@ -0,0 +1,13 @@ +apiVersion: monitoring.googleapis.com/v1 +kind: PodMonitoring +metadata: + name: prosper-linux-np-podmonitor + namespace: prosper-runners +spec: + selector: + matchLabels: + app.kubernetes.io/component: runner-scale-set-listener + endpoints: + - interval: 30s + path: /metrics + port: 8080 From 9e93d7c757053b53a8e108355dfd3d8c65b21cfd Mon Sep 17 00:00:00 2001 From: sravula84 <119365902+sravula84@users.noreply.github.com> Date: Thu, 22 Aug 2024 11:27:26 -0700 Subject: [PATCH 04/12] Update podmonitoring.yaml --- .../templates/podmonitoring.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml b/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml index 78edd167..132959f3 100644 --- a/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml +++ b/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml @@ -1,9 +1,8 @@ apiVersion: monitoring.googleapis.com/v1 kind: PodMonitoring metadata: - annotations: - meta.helm.sh/release-name: prosper-runner-controller - meta.helm.sh/release-namespace: prosper-runners + name: prosper-runner-controller + namespace: prosper-runners spec: selector: matchLabels: From e8bbeb7f02443c074093d0c0ef5179fc6104637e Mon Sep 17 00:00:00 2001 From: sravula84 <119365902+sravula84@users.noreply.github.com> Date: Thu, 22 Aug 2024 11:28:01 -0700 Subject: [PATCH 05/12] Update podmonitoring.yaml --- charts/gha-runner-scale-set/templates/podmonitoring.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gha-runner-scale-set/templates/podmonitoring.yaml b/charts/gha-runner-scale-set/templates/podmonitoring.yaml index 7a5d61e8..3ae3a899 100644 --- a/charts/gha-runner-scale-set/templates/podmonitoring.yaml +++ b/charts/gha-runner-scale-set/templates/podmonitoring.yaml @@ -1,7 +1,7 @@ apiVersion: monitoring.googleapis.com/v1 kind: PodMonitoring metadata: - name: prosper-linux-np-podmonitor + name: runner-scaleset-monitoring namespace: prosper-runners spec: selector: From 29865032205910e2c3f3616dd853c071d6bb019d Mon Sep 17 00:00:00 2001 From: sravula84 <119365902+sravula84@users.noreply.github.com> Date: Thu, 22 Aug 2024 11:28:26 -0700 Subject: [PATCH 06/12] Update podmonitoring.yaml --- .../templates/podmonitoring.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml b/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml index 132959f3..c3b5d7ac 100644 --- a/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml +++ b/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml @@ -1,8 +1,8 @@ apiVersion: monitoring.googleapis.com/v1 kind: PodMonitoring metadata: - name: prosper-runner-controller - namespace: prosper-runners + name: prosper-runner-controller + namespace: prosper-runners spec: selector: matchLabels: From 4eafff99e6354fa2add314290d5db269133504ff Mon Sep 17 00:00:00 2001 From: sravula84 <119365902+sravula84@users.noreply.github.com> Date: Thu, 22 Aug 2024 11:30:25 -0700 Subject: [PATCH 08/12] Update podmonitoring.yaml --- charts/gha-runner-scale-set/templates/podmonitoring.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gha-runner-scale-set/templates/podmonitoring.yaml b/charts/gha-runner-scale-set/templates/podmonitoring.yaml index 3ae3a899..7a030ebc 100644 --- a/charts/gha-runner-scale-set/templates/podmonitoring.yaml +++ b/charts/gha-runner-scale-set/templates/podmonitoring.yaml @@ -1,7 +1,7 @@ apiVersion: monitoring.googleapis.com/v1 kind: PodMonitoring metadata: - name: runner-scaleset-monitoring + name: runner-scaleset namespace: prosper-runners spec: selector: From f8e205fad7e2a877a9982adae0de9095655c5d4e Mon Sep 17 00:00:00 2001 From: sravula84 <119365902+sravula84@users.noreply.github.com> Date: Thu, 22 Aug 2024 11:31:45 -0700 Subject: [PATCH 09/12] Update podmonitoring.yaml --- .../templates/podmonitoring.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml b/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml index c3b5d7ac..1e604657 100644 --- a/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml +++ b/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml @@ -1,7 +1,7 @@ apiVersion: monitoring.googleapis.com/v1 kind: PodMonitoring metadata: - name: prosper-runner-controller + name: gha-runner-scale-set-controller namespace: prosper-runners spec: selector: From c9001549635071a13451618d62bf76448e1a0870 Mon Sep 17 00:00:00 2001 From: sravula84 <119365902+sravula84@users.noreply.github.com> Date: Thu, 22 Aug 2024 11:32:06 -0700 Subject: [PATCH 10/12] Update podmonitoring.yaml --- charts/gha-runner-scale-set/templates/podmonitoring.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gha-runner-scale-set/templates/podmonitoring.yaml b/charts/gha-runner-scale-set/templates/podmonitoring.yaml index 7a030ebc..5f9a2adf 100644 --- a/charts/gha-runner-scale-set/templates/podmonitoring.yaml +++ b/charts/gha-runner-scale-set/templates/podmonitoring.yaml @@ -1,7 +1,7 @@ apiVersion: monitoring.googleapis.com/v1 kind: PodMonitoring metadata: - name: runner-scaleset + name: gha-runner-scale-set namespace: prosper-runners spec: selector: From 73d5e7e4a8fa5489fe39fdb1a001e522f7caa297 Mon Sep 17 00:00:00 2001 From: sravula84 <119365902+sravula84@users.noreply.github.com> Date: Thu, 22 Aug 2024 11:39:30 -0700 Subject: [PATCH 11/12] Update podmonitoring.yaml --- charts/gha-runner-scale-set/templates/podmonitoring.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/gha-runner-scale-set/templates/podmonitoring.yaml b/charts/gha-runner-scale-set/templates/podmonitoring.yaml index 5f9a2adf..af601318 100644 --- a/charts/gha-runner-scale-set/templates/podmonitoring.yaml +++ b/charts/gha-runner-scale-set/templates/podmonitoring.yaml @@ -2,7 +2,6 @@ apiVersion: monitoring.googleapis.com/v1 kind: PodMonitoring metadata: name: gha-runner-scale-set - namespace: prosper-runners spec: selector: matchLabels: From 2a902db2fd85dc35dfc60cb63c85b8a90a5cc152 Mon Sep 17 00:00:00 2001 From: sravula84 <119365902+sravula84@users.noreply.github.com> Date: Thu, 22 Aug 2024 11:39:50 -0700 Subject: [PATCH 12/12] Update podmonitoring.yaml --- .../gha-runner-scale-set-controller/templates/podmonitoring.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml b/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml index 1e604657..59d75fe3 100644 --- a/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml +++ b/charts/gha-runner-scale-set-controller/templates/podmonitoring.yaml @@ -2,7 +2,6 @@ apiVersion: monitoring.googleapis.com/v1 kind: PodMonitoring metadata: name: gha-runner-scale-set-controller - namespace: prosper-runners spec: selector: matchLabels: