K8SPXC-1473 expose ha and proxysql stats. (#1942)

* K8SPXC-1473_expose_ha * fix config * fix config * fix tests * update monitoring test
percona · Jan 16, 2025 · 879e522 · 879e522
1 parent b620e48
commit 879e522
Show file tree

Hide file tree

Showing 90 changed files with 307 additions and 18 deletions.
diff --git a/build/proxysql.cnf b/build/proxysql.cnf
@@ -5,6 +5,8 @@ admin_variables =
 	admin_credentials="admin:admin"
 	mysql_ifaces="0.0.0.0:6032"
 	refresh_interval=2000
+	restapi_enabled=true
+	restapi_port=6070
 
 	cluster_username="admin"
 	cluster_password="admin"

diff --git a/e2e-tests/affinity/compare/statefulset_custom-proxysql-k127-oc.yml b/e2e-tests/affinity/compare/statefulset_custom-proxysql-k127-oc.yml
@@ -111,6 +111,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/affinity/compare/statefulset_custom-proxysql-k127.yml b/e2e-tests/affinity/compare/statefulset_custom-proxysql-k127.yml
@@ -111,6 +111,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/affinity/compare/statefulset_custom-proxysql-oc.yml b/e2e-tests/affinity/compare/statefulset_custom-proxysql-oc.yml
@@ -108,6 +108,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/affinity/compare/statefulset_custom-proxysql.yml b/e2e-tests/affinity/compare/statefulset_custom-proxysql.yml
@@ -100,6 +100,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/affinity/compare/statefulset_hostname-proxysql-k127-oc.yml b/e2e-tests/affinity/compare/statefulset_hostname-proxysql-k127-oc.yml
@@ -84,6 +84,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/affinity/compare/statefulset_hostname-proxysql-k127.yml b/e2e-tests/affinity/compare/statefulset_hostname-proxysql-k127.yml
@@ -84,6 +84,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/affinity/compare/statefulset_hostname-proxysql-oc.yml b/e2e-tests/affinity/compare/statefulset_hostname-proxysql-oc.yml
@@ -81,6 +81,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/affinity/compare/statefulset_hostname-proxysql.yml b/e2e-tests/affinity/compare/statefulset_hostname-proxysql.yml
@@ -73,6 +73,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/affinity/compare/statefulset_region-proxysql-k127-oc.yml b/e2e-tests/affinity/compare/statefulset_region-proxysql-k127-oc.yml
@@ -84,6 +84,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/affinity/compare/statefulset_region-proxysql-k127.yml b/e2e-tests/affinity/compare/statefulset_region-proxysql-k127.yml
@@ -84,6 +84,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/affinity/compare/statefulset_region-proxysql-oc.yml b/e2e-tests/affinity/compare/statefulset_region-proxysql-oc.yml
@@ -81,6 +81,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/affinity/compare/statefulset_region-proxysql.yml b/e2e-tests/affinity/compare/statefulset_region-proxysql.yml
@@ -73,6 +73,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/affinity/compare/statefulset_zone-proxysql-k127-oc.yml b/e2e-tests/affinity/compare/statefulset_zone-proxysql-k127-oc.yml
@@ -84,6 +84,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/affinity/compare/statefulset_zone-proxysql-k127.yml b/e2e-tests/affinity/compare/statefulset_zone-proxysql-k127.yml
@@ -84,6 +84,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/affinity/compare/statefulset_zone-proxysql-oc.yml b/e2e-tests/affinity/compare/statefulset_zone-proxysql-oc.yml
@@ -81,6 +81,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/affinity/compare/statefulset_zone-proxysql.yml b/e2e-tests/affinity/compare/statefulset_zone-proxysql.yml
@@ -73,6 +73,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-k127.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-k127.yml
@@ -85,6 +85,9 @@ spec:
             - containerPort: 33060
               name: mysqlx
               protocol: TCP
+            - containerPort: 8404
+              name: stats
+              protocol: TCP
           readinessProbe:
             exec:
               command:

diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-oc.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-oc.yml
@@ -82,6 +82,9 @@ spec:
             - containerPort: 33060
               name: mysqlx
               protocol: TCP
+            - containerPort: 8404
+              name: stats
+              protocol: TCP
           readinessProbe:
             exec:
               command:

diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret-k127.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret-k127.yml
@@ -85,6 +85,9 @@ spec:
             - containerPort: 33060
               name: mysqlx
               protocol: TCP
+            - containerPort: 8404
+              name: stats
+              protocol: TCP
           readinessProbe:
             exec:
               command:

diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret-oc.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret-oc.yml
@@ -82,6 +82,9 @@ spec:
             - containerPort: 33060
               name: mysqlx
               protocol: TCP
+            - containerPort: 8404
+              name: stats
+              protocol: TCP
           readinessProbe:
             exec:
               command:

diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy.yml
@@ -78,6 +78,9 @@ spec:
             - containerPort: 33060
               name: mysqlx
               protocol: TCP
+            - containerPort: 8404
+              name: stats
+              protocol: TCP
           readinessProbe:
             exec:
               command:

diff --git a/e2e-tests/init-deploy/compare/service_some-name-proxysql.yml b/e2e-tests/init-deploy/compare/service_some-name-proxysql.yml
@@ -23,6 +23,10 @@ spec:
       port: 33062
       protocol: TCP
       targetPort: 33062
+    - name: stats
+      port: 6070
+      protocol: TCP
+      targetPort: 6070
   selector:
     app.kubernetes.io/component: proxysql
     app.kubernetes.io/instance: some-name

diff --git a/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-k127-oc.yml b/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-k127-oc.yml
@@ -84,6 +84,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-k127.yml b/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-k127.yml
@@ -84,6 +84,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-oc.yml b/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-oc.yml
@@ -81,6 +81,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql.yml b/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql.yml
@@ -73,6 +73,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             limits:
               cpu: 700m

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-k127-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-k127-oc.yml
@@ -207,6 +207,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             requests:
               cpu: 600m

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-k127.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-k127.yml
@@ -207,6 +207,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             requests:
               cpu: 600m

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-oc.yml
@@ -204,6 +204,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             requests:
               cpu: 600m

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased.yml
@@ -196,6 +196,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             requests:
               cpu: 600m

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-k127-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-k127-oc.yml
@@ -207,6 +207,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             requests:
               cpu: 300m

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-k127.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-k127.yml
@@ -207,6 +207,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             requests:
               cpu: 300m

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-oc.yml
@@ -204,6 +204,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             requests:
               cpu: 300m

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml
@@ -196,6 +196,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources:
             requests:
               cpu: 300m

diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-k127-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-k127-oc.yml
@@ -73,6 +73,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources: {}
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File

diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-k127.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-k127.yml
@@ -73,6 +73,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources: {}
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File

diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-oc.yml
@@ -70,6 +70,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources: {}
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File

diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased.yml
@@ -62,6 +62,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources: {}
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File

diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-k127-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-k127-oc.yml
@@ -73,6 +73,9 @@ spec:
             - containerPort: 6032
               name: proxyadm
               protocol: TCP
+            - containerPort: 6070
+              name: stats
+              protocol: TCP
           resources: {}
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File