Merge branch 'main' into dev/K8SPXC-1152

percona · Feb 7, 2024 · f86ff81 · f86ff81
2 parents 7ea4009 + 58baa81
commit f86ff81
Show file tree

Hide file tree

Showing 41 changed files with 2,188 additions and 64 deletions.
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -92,7 +92,7 @@ func main() {
 		},
 		HealthProbeBindAddress: probeAddr,
 		LeaderElection:         enableLeaderElection,
-		LeaderElectionID:       "08db0feb.percona.com",
+		LeaderElectionID:       "08db1feb.percona.com",
 		WebhookServer: ctrlWebhook.NewServer(ctrlWebhook.Options{
 			Port: 9443,
 		}),

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
@@ -88,7 +88,7 @@ spec:
             - name: PMM_AGENT_SETUP_NODE_TYPE
               value: container
             - name: PMM_AGENT_SETUP_NODE_NAME
-              value: $(PMM_PREFIX)$(POD_NAMESPASE)-$(POD_NAME)
+              value: $(POD_NAMESPASE)-$(POD_NAME)
             - name: DB_TYPE
               value: proxysql
             - name: MONITOR_USER

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
@@ -88,7 +88,7 @@ spec:
             - name: PMM_AGENT_SETUP_NODE_TYPE
               value: container
             - name: PMM_AGENT_SETUP_NODE_NAME
-              value: $(PMM_PREFIX)$(POD_NAMESPASE)-$(POD_NAME)
+              value: $(POD_NAMESPASE)-$(POD_NAME)
             - name: DB_TYPE
               value: proxysql
             - name: MONITOR_USER

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
@@ -85,7 +85,7 @@ spec:
             - name: PMM_AGENT_SETUP_NODE_TYPE
               value: container
             - name: PMM_AGENT_SETUP_NODE_NAME
-              value: $(PMM_PREFIX)$(POD_NAMESPASE)-$(POD_NAME)
+              value: $(POD_NAMESPASE)-$(POD_NAME)
             - name: DB_TYPE
               value: proxysql
             - name: MONITOR_USER

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased.yml
@@ -85,7 +85,7 @@ spec:
             - name: PMM_AGENT_SETUP_NODE_TYPE
               value: container
             - name: PMM_AGENT_SETUP_NODE_NAME
-              value: $(PMM_PREFIX)$(POD_NAMESPASE)-$(POD_NAME)
+              value: $(POD_NAMESPASE)-$(POD_NAME)
             - name: DB_TYPE
               value: proxysql
             - name: MONITOR_USER

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
@@ -88,7 +88,7 @@ spec:
             - name: PMM_AGENT_SETUP_NODE_TYPE
               value: container
             - name: PMM_AGENT_SETUP_NODE_NAME
-              value: $(PMM_PREFIX)$(POD_NAMESPASE)-$(POD_NAME)
+              value: $(POD_NAMESPASE)-$(POD_NAME)
             - name: DB_TYPE
               value: proxysql
             - name: MONITOR_USER

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-k127.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-k127.yml
@@ -88,7 +88,7 @@ spec:
             - name: PMM_AGENT_SETUP_NODE_TYPE
               value: container
             - name: PMM_AGENT_SETUP_NODE_NAME
-              value: $(PMM_PREFIX)$(POD_NAMESPASE)-$(POD_NAME)
+              value: $(POD_NAMESPASE)-$(POD_NAME)
             - name: DB_TYPE
               value: proxysql
             - name: MONITOR_USER

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-oc.yml
@@ -85,7 +85,7 @@ spec:
             - name: PMM_AGENT_SETUP_NODE_TYPE
               value: container
             - name: PMM_AGENT_SETUP_NODE_NAME
-              value: $(PMM_PREFIX)$(POD_NAMESPASE)-$(POD_NAME)
+              value: $(POD_NAMESPASE)-$(POD_NAME)
             - name: DB_TYPE
               value: proxysql
             - name: MONITOR_USER

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml
@@ -85,7 +85,7 @@ spec:
             - name: PMM_AGENT_SETUP_NODE_TYPE
               value: container
             - name: PMM_AGENT_SETUP_NODE_NAME
-              value: $(PMM_PREFIX)$(POD_NAMESPASE)-$(POD_NAME)
+              value: $(POD_NAMESPASE)-$(POD_NAME)
             - name: DB_TYPE
               value: proxysql
             - name: MONITOR_USER

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased-k127-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased-k127-oc.yml
@@ -88,7 +88,7 @@ spec:
             - name: PMM_AGENT_SETUP_NODE_TYPE
               value: container
             - name: PMM_AGENT_SETUP_NODE_NAME
-              value: $(PMM_PREFIX)$(POD_NAMESPASE)-$(POD_NAME)
+              value: $(POD_NAMESPASE)-$(POD_NAME)
             - name: DB_TYPE
               value: mysql
             - name: DB_USER

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased-k127.yml b/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased-k127.yml
@@ -88,7 +88,7 @@ spec:
             - name: PMM_AGENT_SETUP_NODE_TYPE
               value: container
             - name: PMM_AGENT_SETUP_NODE_NAME
-              value: $(PMM_PREFIX)$(POD_NAMESPASE)-$(POD_NAME)
+              value: $(POD_NAMESPASE)-$(POD_NAME)
             - name: DB_TYPE
               value: mysql
             - name: DB_USER

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased-oc.yml
@@ -85,7 +85,7 @@ spec:
             - name: PMM_AGENT_SETUP_NODE_TYPE
               value: container
             - name: PMM_AGENT_SETUP_NODE_NAME
-              value: $(PMM_PREFIX)$(POD_NAMESPASE)-$(POD_NAME)
+              value: $(POD_NAMESPASE)-$(POD_NAME)
             - name: DB_TYPE
               value: mysql
             - name: DB_USER

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased.yml b/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased.yml
@@ -85,7 +85,7 @@ spec:
             - name: PMM_AGENT_SETUP_NODE_TYPE
               value: container
             - name: PMM_AGENT_SETUP_NODE_NAME
-              value: $(PMM_PREFIX)$(POD_NAMESPASE)-$(POD_NAME)
+              value: $(POD_NAMESPASE)-$(POD_NAME)
             - name: DB_TYPE
               value: mysql
             - name: DB_USER

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc-k127-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-pxc-k127-oc.yml
@@ -88,7 +88,7 @@ spec:
             - name: PMM_AGENT_SETUP_NODE_TYPE
               value: container
             - name: PMM_AGENT_SETUP_NODE_NAME
-              value: $(PMM_PREFIX)$(POD_NAMESPASE)-$(POD_NAME)
+              value: $(POD_NAMESPASE)-$(POD_NAME)
             - name: DB_TYPE
               value: mysql
             - name: DB_USER

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc-k127.yml b/e2e-tests/limits/compare/statefulset_no-limits-pxc-k127.yml
@@ -88,7 +88,7 @@ spec:
             - name: PMM_AGENT_SETUP_NODE_TYPE
               value: container
             - name: PMM_AGENT_SETUP_NODE_NAME
-              value: $(PMM_PREFIX)$(POD_NAMESPASE)-$(POD_NAME)
+              value: $(POD_NAMESPASE)-$(POD_NAME)
             - name: DB_TYPE
               value: mysql
             - name: DB_USER

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-pxc-oc.yml
@@ -85,7 +85,7 @@ spec:
             - name: PMM_AGENT_SETUP_NODE_TYPE
               value: container
             - name: PMM_AGENT_SETUP_NODE_NAME
-              value: $(PMM_PREFIX)$(POD_NAMESPASE)-$(POD_NAME)
+              value: $(POD_NAMESPASE)-$(POD_NAME)
             - name: DB_TYPE
               value: mysql
             - name: DB_USER

diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc.yml b/e2e-tests/limits/compare/statefulset_no-limits-pxc.yml
@@ -85,7 +85,7 @@ spec:
             - name: PMM_AGENT_SETUP_NODE_TYPE
               value: container
             - name: PMM_AGENT_SETUP_NODE_NAME
-              value: $(PMM_PREFIX)$(POD_NAMESPASE)-$(POD_NAME)
+              value: $(POD_NAMESPASE)-$(POD_NAME)
             - name: DB_TYPE
               value: mysql
             - name: DB_USER

diff --git a/e2e-tests/monitoring-2-0/compare/agents-list.json b/e2e-tests/monitoring-2-0/compare/agents-list.json
@@ -1,4 +1,72 @@
 [
+  {
+    "service_type": "haproxy",
+    "service_name": "monitoring-haproxy-0",
+    "node_name": "monitoring-haproxy-0",
+    "cluster": "monitoring",
+    "agents": [
+      {
+        "agent_type": "external-exporter"
+      },
+      {
+        "agent_type": "pmm-agent"
+      },
+      {
+        "agent_type": "vmagent",
+        "status": "RUNNING"
+      }
+    ]
+  },
+  {
+    "service_type": "mysql",
+    "service_name": "monitoring-pxc-0",
+    "node_name": "monitoring-pxc-0",
+    "cluster": "monitoring",
+    "address": "monitoring-pxc-0",
+    "port": 33062,
+    "agents": [
+      {
+        "agent_type": "mysqld_exporter",
+        "status": "RUNNING"
+      },
+      {
+        "agent_type": "pmm-agent"
+      },
+      {
+        "agent_type": "qan-mysql-perfschema-agent",
+        "status": "RUNNING"
+      },
+      {
+        "agent_type": "vmagent",
+        "status": "RUNNING"
+      }
+    ]
+  },
+  {
+    "service_type": "mysql",
+    "service_name": "monitoring-pxc-1",
+    "node_name": "monitoring-pxc-1",
+    "cluster": "monitoring",
+    "address": "monitoring-pxc-1",
+    "port": 33062,
+    "agents": [
+      {
+        "agent_type": "mysqld_exporter",
+        "status": "RUNNING"
+      },
+      {
+        "agent_type": "pmm-agent"
+      },
+      {
+        "agent_type": "qan-mysql-perfschema-agent",
+        "status": "RUNNING"
+      },
+      {
+        "agent_type": "vmagent",
+        "status": "RUNNING"
+      }
+    ]
+  },
   {
     "service_type": "postgresql",
     "service_name": "pmm-server-postgresql",