From b9e2bc93eaa4b60b797ab34286b384987c03f0be Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Tue, 24 Dec 2024 11:14:23 +0000
Subject: [PATCH 01/33] sample servicemonitor and values

---
 helm-charts/prometheus/service-monitor.yaml | 33 +++++++++++++++++++++
 helm-charts/prometheus/values.yaml          | 24 +++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 helm-charts/prometheus/service-monitor.yaml
 create mode 100644 helm-charts/prometheus/values.yaml

diff --git a/helm-charts/prometheus/service-monitor.yaml b/helm-charts/prometheus/service-monitor.yaml
new file mode 100644
index 000000000..03fbfd8ed
--- /dev/null
+++ b/helm-charts/prometheus/service-monitor.yaml
@@ -0,0 +1,33 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: dbadmin
+data:
+  username: ZGJhZG1pbg==
+  password: ''
+type: Opaque
+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: k8s-vertica-prometheus
+  labels:
+    release: prometheus
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: vertica
+  endpoints:
+    - basicAuth:
+        password:
+          key: password
+          name: dbadmin
+        username: 
+          key: username
+          name: dbadmin
+      interval: 1s
+      path: /v1/metrics
+      port: "8443"
+      scheme: https
+      tlsConfig:
+        insecureSkipVerify: true
diff --git a/helm-charts/prometheus/values.yaml b/helm-charts/prometheus/values.yaml
new file mode 100644
index 000000000..ca16a6ba8
--- /dev/null
+++ b/helm-charts/prometheus/values.yaml
@@ -0,0 +1,24 @@
+defaultRules:
+  create: false
+alertmanager:
+  enabled: true
+grafana:
+  enabled: false
+kubeApiServer:
+  enabled: true
+kubelet:
+  enabled: false
+kubeControllerManager:
+  enabled: true
+coreDns:
+  enabled: false
+kubeEtcd:
+  enabled: false
+kubeScheduler:
+  enabled: false
+kubeStateMetrics:
+  enabled: true
+nodeExporter:
+  enabled: false
+prometheus:
+  enabled: true

From f39bfb2753a984f59937bcb49214e7e525a0ea00 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Tue, 24 Dec 2024 11:15:52 +0000
Subject: [PATCH 02/33] update make file

---
 Makefile | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 3afb1124a..992694dbf 100644
--- a/Makefile
+++ b/Makefile
@@ -146,10 +146,12 @@ export OLM_CATALOG_IMG
 MINIMAL_VERTICA_IMG ?=
 # Name of the helm release that we will install/uninstall
 HELM_RELEASE_NAME?=vdb-op
+PROMETHEUS_HELM_NAME?=prometheus
 # Can be used to specify additional overrides when doing the helm install.
 # For example to specify a custom webhook tls cert when deploying use this command:
 #   HELM_OVERRIDES="--set webhook.tlsSecret=custom-cert" make deploy-operator
 HELM_OVERRIDES?=
+PROMETHEUS_HELM_OVERRIDES?=
 # Maximum number of tests to run at once. (default 2)
 # Set it to any value not greater than 8 to override the default one
 E2E_PARALLELISM?=2
@@ -245,7 +247,9 @@ DEPLOY_WAIT?=--wait
 # Name of the test OLM catalog that we will create and deploy with in e2e tests
 OLM_TEST_CATALOG_SOURCE=e2e-test-catalog
 # Name of the namespace to deploy the operator in
-NAMESPACE?=verticadb-operator
+NAMESPACE?=default
+# Name of the namespace to deploy prometheus 
+PROMETHEUS_NAMESPACE?=default
 
 # The Go version that we will build the operator with
 GO_VERSION?=1.23.2
@@ -255,6 +259,7 @@ HELM_UNITTEST_VERSION?=3.9.3-0.2.11
 KUTTL_PLUGIN_INSTALLED:=$(shell kubectl krew list 2>/dev/null | grep -c '^kuttl')
 STERN_PLUGIN_INSTALLED:=$(shell kubectl krew list 2>/dev/null | grep -c '^stern')
 OPERATOR_CHART = $(shell pwd)/helm-charts/verticadb-operator
+PROMETHEUS_CHART=prometheus-community/kube-prometheus-stack
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -634,12 +639,22 @@ endif
 
 deploy-webhook: manifests kustomize ## Using helm, deploy just the webhook in the k8s cluster
 ifeq ($(DEPLOY_WITH), helm)
-	helm install $(DEPLOY_WAIT) -n $(NAMESPACE) --create-namespace $(HELM_RELEASE_NAME) $(OPERATOR_CHART) --set image.repo=null --set image.name=${OPERATOR_IMG} --set image.pullPolicy=$(HELM_IMAGE_PULL_POLICY) --set imagePullSecrets[0].name=priv-reg-cred $(HELM_OVERRIDES) --set webhook.enable=true,controllers.enable=false
+	helm install $(DEPLOY_WAIT) -n $(NAMESPACE) --create-namespace $(HELM_RELEASE_NAME) $(OPERATOR_CHART) --set image.repo=null --set image.name=${OPERATOR_IMG} --set image.pullPolicy=$(HELM_IMAGE_PULL_POLICY) --set imagePullSecrets[0].name=priv-reg-cred $(HELM_OVERRIDES)
 	scripts/wait-for-webhook.sh -n $(NAMESPACE) -t 60
 else
 	$(error Unsupported deployment method for webhook only: $(DEPLOY_WITH))
 endif
 
+.PHONY: deploy-prometheus
+deploy-prometheus:
+	helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+	helm repo update
+	helm install $(DEPLOY_WAIT) -n $(PROMETHEUS_NAMESPACE) --create-namespace $(PROMETHEUS_HELM_NAME) $(PROMETHEUS_CHART) --values helm-charts/prometheus/values.yaml $(PROMETHEUS_HELM_OVERRIDES)
+
+.PHONY: undeploy-prometheus
+undeploy-prometheus:
+	helm uninstall $(PROMETHEUS_HELM_NAME)
+
 .PHONY: undeploy-operator
 undeploy-operator: ## Undeploy operator that was previously deployed
 	scripts/undeploy.sh $(if $(filter false,$(ignore-not-found)),,-i)

From 1c25379a4c7aaccb8a8c050c0a49a782a2d711ae Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Wed, 25 Dec 2024 08:11:35 +0000
Subject: [PATCH 03/33] update sample service monitor

---
 helm-charts/prometheus/service-monitor.yaml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/helm-charts/prometheus/service-monitor.yaml b/helm-charts/prometheus/service-monitor.yaml
index 03fbfd8ed..25142a3c3 100644
--- a/helm-charts/prometheus/service-monitor.yaml
+++ b/helm-charts/prometheus/service-monitor.yaml
@@ -16,7 +16,10 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: vertica
+      app.kubernetes.io/instance: verticadb-sample
+  namespaceSelector:
+    matchNames:
+      - default
   endpoints:
     - basicAuth:
         password:
@@ -25,9 +28,9 @@ spec:
         username: 
           key: username
           name: dbadmin
-      interval: 1s
+      interval: 5s
       path: /v1/metrics
-      port: "8443"
+      port: vertica-http
       scheme: https
       tlsConfig:
         insecureSkipVerify: true

From 6cf5e694f6e14b31d64a8dfb45ce7af11e077a50 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Wed, 25 Dec 2024 09:16:36 +0000
Subject: [PATCH 04/33] update example values

---
 Makefile                                    |  2 +-
 helm-charts/prometheus/service-monitor.yaml | 13 ++-----------
 helm-charts/prometheus/values.yaml          |  2 +-
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 992694dbf..76f8cb6de 100644
--- a/Makefile
+++ b/Makefile
@@ -247,7 +247,7 @@ DEPLOY_WAIT?=--wait
 # Name of the test OLM catalog that we will create and deploy with in e2e tests
 OLM_TEST_CATALOG_SOURCE=e2e-test-catalog
 # Name of the namespace to deploy the operator in
-NAMESPACE?=default
+NAMESPACE?=verticadb-operator
 # Name of the namespace to deploy prometheus 
 PROMETHEUS_NAMESPACE?=default
 
diff --git a/helm-charts/prometheus/service-monitor.yaml b/helm-charts/prometheus/service-monitor.yaml
index 25142a3c3..e89a5c259 100644
--- a/helm-charts/prometheus/service-monitor.yaml
+++ b/helm-charts/prometheus/service-monitor.yaml
@@ -1,12 +1,3 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: dbadmin
-data:
-  username: ZGJhZG1pbg==
-  password: ''
-type: Opaque
----
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -24,10 +15,10 @@ spec:
     - basicAuth:
         password:
           key: password
-          name: dbadmin
+          name: su-passwd
         username: 
           key: username
-          name: dbadmin
+          name: su-passwd
       interval: 5s
       path: /v1/metrics
       port: vertica-http
diff --git a/helm-charts/prometheus/values.yaml b/helm-charts/prometheus/values.yaml
index ca16a6ba8..1e907d18d 100644
--- a/helm-charts/prometheus/values.yaml
+++ b/helm-charts/prometheus/values.yaml
@@ -19,6 +19,6 @@ kubeScheduler:
 kubeStateMetrics:
   enabled: true
 nodeExporter:
-  enabled: false
+  enabled: true
 prometheus:
   enabled: true

From dd38f9277cb10de9049d207bd1eb1b3416d3a261 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Thu, 26 Dec 2024 08:27:16 +0000
Subject: [PATCH 05/33] create script

---
 scripts/deploy-prometheus.sh | 210 +++++++++++++++++++++++++++++++++++
 1 file changed, 210 insertions(+)
 create mode 100755 scripts/deploy-prometheus.sh

diff --git a/scripts/deploy-prometheus.sh b/scripts/deploy-prometheus.sh
new file mode 100755
index 000000000..7d027bfcd
--- /dev/null
+++ b/scripts/deploy-prometheus.sh
@@ -0,0 +1,210 @@
+#!/bin/bash
+
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# A script that will deploy the prometheus service monitor and secret. It assumes the prometheus operator is deployed.
+
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+REPO_DIR=$(dirname $SCRIPT_DIR)
+LABEL=''
+ACTION=''
+NAMESPACE=''
+USERNAME=''
+PASSWORD=''
+DBNAME=''
+
+function usage() {
+    echo "usage: $(basename $0) [-n <namespace>] [-l <label>] [-a <action>] [-u <username>] [-p <password>] [-d <dbname>]"
+    echo
+    echo "Options:"
+    echo "  -n <namespace>  The namespace used for prometheus service."
+    echo "  -l <label>      The label monitored by prometheus service."
+    echo "  -a <action>     The action to run in this script, deploy or undeploy."
+    echo "  -u <username>   The database username, should have access to the Vertica server metrics."
+    echo "  -p <password>   The database user password."
+    echo "  -d <dbname>     The database name."
+    echo "  -h <usage>      Print help message."
+    exit 1
+}
+
+while getopts "n:l:a:u:p:d:h" opt
+do
+    case $opt in
+        n)
+            NAMESPACE=$OPTARG
+            ;;
+        l)
+            LABEL=$OPTARG
+            ;;
+        a)
+            ACTION=$OPTARG
+            ;;
+        u)
+            USERNAME=$OPTARG
+            ;;
+        p)
+            PASSWORD=$OPTARG
+            ;;
+        d)
+            DBNAME=$OPTARG
+            ;;
+        h) 
+            usage
+            exit 0
+            ;;
+        \?)
+            echo "ERROR: unrecognized option: -$opt"
+            usage
+            exit 0
+            ;;
+    esac
+done
+
+if [ -z "$NAMESPACE" ]
+then
+  NAMESPACE=default
+fi
+
+
+function deploy(){
+  # Create an secret to store prometheus service monitor database username and password.
+  cat <<EOF | kubectl apply -f -
+apiVersion: v1
+kind: Secret
+metadata:
+  namespace: $NAMESPACE
+  name: prometheus-$DBNAME
+data:
+  username: '$(echo -n $USERNAME | base64)'
+  password: '$(echo -n $PASSWORD | base64)'
+type: Opaque
+EOF
+
+  # Create a subscription to the verticadb-operator
+  cat <<EOF | kubectl apply -f -
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: k8s-vertica-prometheus-$DBNAME
+  labels:
+    release: $LABEL
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/instance: $DBNAME
+  namespaceSelector:
+    matchNames:
+      - $NAMESPACE
+  endpoints:
+    - basicAuth:
+        password:
+          key: password
+          name: prometheus-$DBNAME
+        username: 
+          key: username
+          name: prometheus-$DBNAME
+          optional: true
+      interval: 5s
+      path: /v1/metrics
+      port: vertica-http
+      scheme: https
+      tlsConfig:
+        insecureSkipVerify: true
+EOF
+}
+
+function undeploy(){
+  # Delete the service monitor for prometheus service monitor.
+  cat <<EOF | kubectl delete -f -
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: k8s-vertica-prometheus-$DBNAME
+  labels:
+    release: $LABEL
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/instance: $DBNAME
+  namespaceSelector:
+    matchNames:
+      - $NAMESPACE
+  endpoints:
+    - basicAuth:
+        password:
+          key: password
+          name: prometheus-$DBNAME
+        username: 
+          key: username
+          name: prometheus-$DBNAME
+          optional: true
+      interval: 5s
+      path: /v1/metrics
+      port: vertica-http
+      scheme: https
+      tlsConfig:
+        insecureSkipVerify: true
+EOF
+
+  # delete secret for prometheus service monitor.
+  cat <<EOF | kubectl delete -f -
+apiVersion: v1
+kind: Secret
+metadata:
+  namespace: $NAMESPACE
+  name: prometheus-$DBNAME
+data:
+  username: '$(echo -n $USERNAME | base64)'
+  password: '$(echo -n $PASSWORD | base64)'
+type: Opaque
+EOF
+}
+
+ # ACTION deploy and undeploy
+case $ACTION in
+    deploy) 
+        echo "Running task: $ACTION"
+        deploy
+        ;;
+    undeploy) 
+        echo "Running task: $ACTION"
+        undeploy
+        ;;
+    *) 
+        echo "Invalid action: '$ACTION'"
+        usage
+        ;;
+esac
+
+
+
+
+
+
+
+# # Wait for the CSV to show up and report success
+# set +o xtrace
+# echo "Waiting for ClusterServicesVersion to show up..."
+# trap "echo 'Failed waiting for CSV to succeed'; kubectl get clusterserviceversion -n $NAMESPACE" 0 2 3 15
+# timeout $TIMEOUT bash -c -- "\
+#     while ! kubectl get -n $NAMESPACE clusterserviceversion --selector operators.coreos.com/verticadb-operator.$NAMESPACE="" 2> /dev/null | grep -cq 'Succeeded'; \
+#     do \
+#         sleep 0.1; \
+#     done" &
+# pid=$!
+# wait $pid
+# trap - 0 2 3 15 1> /dev/null
+# set -o xtrace
+# kubectl get clusterserviceversion -n $NAMESPACE

From b8b21101f9c755b56358cc8831ef46df8c4260f6 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Thu, 26 Dec 2024 08:27:57 +0000
Subject: [PATCH 06/33] update make file

---
 Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile b/Makefile
index 76f8cb6de..c4ca6af83 100644
--- a/Makefile
+++ b/Makefile
@@ -147,6 +147,9 @@ MINIMAL_VERTICA_IMG ?=
 # Name of the helm release that we will install/uninstall
 HELM_RELEASE_NAME?=vdb-op
 PROMETHEUS_HELM_NAME?=prometheus
+PROMETHEUS_USERNAME?=dbadmin
+PROMETHEUS_PASSWORD?=
+PROMETHEUS_DBNAME?=verticadb-sample
 # Can be used to specify additional overrides when doing the helm install.
 # For example to specify a custom webhook tls cert when deploying use this command:
 #   HELM_OVERRIDES="--set webhook.tlsSecret=custom-cert" make deploy-operator
@@ -650,9 +653,11 @@ deploy-prometheus:
 	helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
 	helm repo update
 	helm install $(DEPLOY_WAIT) -n $(PROMETHEUS_NAMESPACE) --create-namespace $(PROMETHEUS_HELM_NAME) $(PROMETHEUS_CHART) --values helm-charts/prometheus/values.yaml $(PROMETHEUS_HELM_OVERRIDES)
+	scripts/deploy-prometheus.sh -n $(PROMETHEUS_NAMESPACE) -l $(PROMETHEUS_HELM_NAME) -a deploy -u $(PROMETHEUS_USERNAME) -p '$(PROMETHEUS_PASSWORD)' -d $(PROMETHEUS_DBNAME)
 
 .PHONY: undeploy-prometheus
 undeploy-prometheus:
+	scripts/deploy-prometheus.sh -n $(PROMETHEUS_NAMESPACE) -l $(PROMETHEUS_HELM_NAME) -a undeploy -u $(PROMETHEUS_USERNAME) -p '$(PROMETHEUS_PASSWORD)' -d $(PROMETHEUS_DBNAME)
 	helm uninstall $(PROMETHEUS_HELM_NAME)
 
 .PHONY: undeploy-operator

From 1682e7143e3d58a12b495d5339c7ced3ff4673f5 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Thu, 26 Dec 2024 08:28:23 +0000
Subject: [PATCH 07/33] remove template file

---
 helm-charts/prometheus/service-monitor.yaml | 27 ---------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 helm-charts/prometheus/service-monitor.yaml

diff --git a/helm-charts/prometheus/service-monitor.yaml b/helm-charts/prometheus/service-monitor.yaml
deleted file mode 100644
index e89a5c259..000000000
--- a/helm-charts/prometheus/service-monitor.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: k8s-vertica-prometheus
-  labels:
-    release: prometheus
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/instance: verticadb-sample
-  namespaceSelector:
-    matchNames:
-      - default
-  endpoints:
-    - basicAuth:
-        password:
-          key: password
-          name: su-passwd
-        username: 
-          key: username
-          name: su-passwd
-      interval: 5s
-      path: /v1/metrics
-      port: vertica-http
-      scheme: https
-      tlsConfig:
-        insecureSkipVerify: true

From 5c3da0302f0f1a5da575ef18485492152e7de880 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Thu, 26 Dec 2024 08:29:34 +0000
Subject: [PATCH 08/33] remove unused content

---
 scripts/deploy-prometheus.sh | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/scripts/deploy-prometheus.sh b/scripts/deploy-prometheus.sh
index 7d027bfcd..f5e7c87bc 100755
--- a/scripts/deploy-prometheus.sh
+++ b/scripts/deploy-prometheus.sh
@@ -187,24 +187,3 @@ case $ACTION in
         usage
         ;;
 esac
-
-
-
-
-
-
-
-# # Wait for the CSV to show up and report success
-# set +o xtrace
-# echo "Waiting for ClusterServicesVersion to show up..."
-# trap "echo 'Failed waiting for CSV to succeed'; kubectl get clusterserviceversion -n $NAMESPACE" 0 2 3 15
-# timeout $TIMEOUT bash -c -- "\
-#     while ! kubectl get -n $NAMESPACE clusterserviceversion --selector operators.coreos.com/verticadb-operator.$NAMESPACE="" 2> /dev/null | grep -cq 'Succeeded'; \
-#     do \
-#         sleep 0.1; \
-#     done" &
-# pid=$!
-# wait $pid
-# trap - 0 2 3 15 1> /dev/null
-# set -o xtrace
-# kubectl get clusterserviceversion -n $NAMESPACE

From 4cd17545f32cb85134bfdedc6a51e82a8b5549b1 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Thu, 26 Dec 2024 11:59:36 +0000
Subject: [PATCH 09/33] address comments

---
 Makefile                     | 13 +++++++------
 scripts/deploy-prometheus.sh | 13 +++++++++----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index c4ca6af83..a71402aed 100644
--- a/Makefile
+++ b/Makefile
@@ -147,9 +147,10 @@ MINIMAL_VERTICA_IMG ?=
 # Name of the helm release that we will install/uninstall
 HELM_RELEASE_NAME?=vdb-op
 PROMETHEUS_HELM_NAME?=prometheus
-PROMETHEUS_USERNAME?=dbadmin
-PROMETHEUS_PASSWORD?=
-PROMETHEUS_DBNAME?=verticadb-sample
+PROMETHEUS_INTERVAL?=5s
+DB_USER?=dbadmin
+DB_PASSWORD?=
+VDB_NAME?=verticadb-sample
 # Can be used to specify additional overrides when doing the helm install.
 # For example to specify a custom webhook tls cert when deploying use this command:
 #   HELM_OVERRIDES="--set webhook.tlsSecret=custom-cert" make deploy-operator
@@ -252,7 +253,7 @@ OLM_TEST_CATALOG_SOURCE=e2e-test-catalog
 # Name of the namespace to deploy the operator in
 NAMESPACE?=verticadb-operator
 # Name of the namespace to deploy prometheus 
-PROMETHEUS_NAMESPACE?=default
+PROMETHEUS_NAMESPACE?=prometheus
 
 # The Go version that we will build the operator with
 GO_VERSION?=1.23.2
@@ -653,11 +654,11 @@ deploy-prometheus:
 	helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
 	helm repo update
 	helm install $(DEPLOY_WAIT) -n $(PROMETHEUS_NAMESPACE) --create-namespace $(PROMETHEUS_HELM_NAME) $(PROMETHEUS_CHART) --values helm-charts/prometheus/values.yaml $(PROMETHEUS_HELM_OVERRIDES)
-	scripts/deploy-prometheus.sh -n $(PROMETHEUS_NAMESPACE) -l $(PROMETHEUS_HELM_NAME) -a deploy -u $(PROMETHEUS_USERNAME) -p '$(PROMETHEUS_PASSWORD)' -d $(PROMETHEUS_DBNAME)
+	scripts/deploy-prometheus.sh -n $(PROMETHEUS_NAMESPACE) -l $(PROMETHEUS_HELM_NAME) -i $(PROMETHEUS_INTERVAL) -a deploy -u $(DB_USER) -p '$(DB_PASSWORD)' -d $(VDB_NAME)
 
 .PHONY: undeploy-prometheus
 undeploy-prometheus:
-	scripts/deploy-prometheus.sh -n $(PROMETHEUS_NAMESPACE) -l $(PROMETHEUS_HELM_NAME) -a undeploy -u $(PROMETHEUS_USERNAME) -p '$(PROMETHEUS_PASSWORD)' -d $(PROMETHEUS_DBNAME)
+	scripts/deploy-prometheus.sh -n $(PROMETHEUS_NAMESPACE) -l $(PROMETHEUS_HELM_NAME) -i $(PROMETHEUS_INTERVAL) -a undeploy -u $(DB_USER) -p '$(DB_PASSWORD)' -d $(VDB_NAME)
 	helm uninstall $(PROMETHEUS_HELM_NAME)
 
 .PHONY: undeploy-operator
diff --git a/scripts/deploy-prometheus.sh b/scripts/deploy-prometheus.sh
index f5e7c87bc..b7388d351 100755
--- a/scripts/deploy-prometheus.sh
+++ b/scripts/deploy-prometheus.sh
@@ -24,9 +24,10 @@ NAMESPACE=''
 USERNAME=''
 PASSWORD=''
 DBNAME=''
+INTERVAL='5s'
 
 function usage() {
-    echo "usage: $(basename $0) [-n <namespace>] [-l <label>] [-a <action>] [-u <username>] [-p <password>] [-d <dbname>]"
+    echo "usage: $(basename $0) [-n <namespace>] [-l <label>] [-a <action>] [-u <username>] [-p <password>] [-d <dbname>] [-i <interval>]"
     echo
     echo "Options:"
     echo "  -n <namespace>  The namespace used for prometheus service."
@@ -35,6 +36,7 @@ function usage() {
     echo "  -u <username>   The database username, should have access to the Vertica server metrics."
     echo "  -p <password>   The database user password."
     echo "  -d <dbname>     The database name."
+    echo "  -i <interval>   The scraping interval of prometheus update for metrics."
     echo "  -h <usage>      Print help message."
     exit 1
 }
@@ -60,6 +62,9 @@ do
         d)
             DBNAME=$OPTARG
             ;;
+        i)
+            INTERVAL=$OPTARG
+            ;;
         h) 
             usage
             exit 0
@@ -92,7 +97,7 @@ data:
 type: Opaque
 EOF
 
-  # Create a subscription to the verticadb-operator
+  # Create a service monitor to allow prometheus to discover vertica pods
   cat <<EOF | kubectl apply -f -
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -116,7 +121,7 @@ spec:
           key: username
           name: prometheus-$DBNAME
           optional: true
-      interval: 5s
+      interval: $INTERVAL
       path: /v1/metrics
       port: vertica-http
       scheme: https
@@ -150,7 +155,7 @@ spec:
           key: username
           name: prometheus-$DBNAME
           optional: true
-      interval: 5s
+      interval: $INTERVAL
       path: /v1/metrics
       port: vertica-http
       scheme: https

From 593441a7b8f4d357baef702cc39ccf513f99b503 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Thu, 26 Dec 2024 12:20:54 +0000
Subject: [PATCH 10/33] add interval in scrpits and fix bug in namespace

---
 Makefile                     | 10 ++++++++--
 scripts/deploy-prometheus.sh |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index a71402aed..4fa1d8a33 100644
--- a/Makefile
+++ b/Makefile
@@ -654,13 +654,19 @@ deploy-prometheus:
 	helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
 	helm repo update
 	helm install $(DEPLOY_WAIT) -n $(PROMETHEUS_NAMESPACE) --create-namespace $(PROMETHEUS_HELM_NAME) $(PROMETHEUS_CHART) --values helm-charts/prometheus/values.yaml $(PROMETHEUS_HELM_OVERRIDES)
-	scripts/deploy-prometheus.sh -n $(PROMETHEUS_NAMESPACE) -l $(PROMETHEUS_HELM_NAME) -i $(PROMETHEUS_INTERVAL) -a deploy -u $(DB_USER) -p '$(DB_PASSWORD)' -d $(VDB_NAME)
 
 .PHONY: undeploy-prometheus
 undeploy-prometheus:
-	scripts/deploy-prometheus.sh -n $(PROMETHEUS_NAMESPACE) -l $(PROMETHEUS_HELM_NAME) -i $(PROMETHEUS_INTERVAL) -a undeploy -u $(DB_USER) -p '$(DB_PASSWORD)' -d $(VDB_NAME)
 	helm uninstall $(PROMETHEUS_HELM_NAME)
 
+.PHONY: deploy-prometheus-service-monitor
+deploy-prometheus-service-monitor:
+	scripts/deploy-prometheus.sh -n $(PROMETHEUS_NAMESPACE) -l $(PROMETHEUS_HELM_NAME) -i $(PROMETHEUS_INTERVAL) -a deploy -u $(DB_USER) -p '$(DB_PASSWORD)' -d $(VDB_NAME)
+
+.PHONY: undeploy-prometheus-service-monitor
+undeploy-prometheus-service-monitor:
+	scripts/deploy-prometheus.sh -n $(PROMETHEUS_NAMESPACE) -l $(PROMETHEUS_HELM_NAME) -i $(PROMETHEUS_INTERVAL) -a undeploy -u $(DB_USER) -p '$(DB_PASSWORD)' -d $(VDB_NAME)
+
 .PHONY: undeploy-operator
 undeploy-operator: ## Undeploy operator that was previously deployed
 	scripts/undeploy.sh $(if $(filter false,$(ignore-not-found)),,-i)
diff --git a/scripts/deploy-prometheus.sh b/scripts/deploy-prometheus.sh
index b7388d351..142393c5f 100755
--- a/scripts/deploy-prometheus.sh
+++ b/scripts/deploy-prometheus.sh
@@ -41,7 +41,7 @@ function usage() {
     exit 1
 }
 
-while getopts "n:l:a:u:p:d:h" opt
+while getopts "n:l:a:u:p:d:i:h" opt
 do
     case $opt in
         n)
@@ -103,6 +103,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: k8s-vertica-prometheus-$DBNAME
+  namespace: $NAMESPACE
   labels:
     release: $LABEL
 spec:
@@ -137,6 +138,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: k8s-vertica-prometheus-$DBNAME
+  namespace: $NAMESPACE
   labels:
     release: $LABEL
 spec:

From b83799f34c0db20565e566e03437d4bb598d3660 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Thu, 26 Dec 2024 12:26:15 +0000
Subject: [PATCH 11/33] add namespace in undeploy

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 4fa1d8a33..016e129bd 100644
--- a/Makefile
+++ b/Makefile
@@ -657,7 +657,7 @@ deploy-prometheus:
 
 .PHONY: undeploy-prometheus
 undeploy-prometheus:
-	helm uninstall $(PROMETHEUS_HELM_NAME)
+	helm uninstall $(PROMETHEUS_HELM_NAME) -n $(PROMETHEUS_NAMESPACE)
 
 .PHONY: deploy-prometheus-service-monitor
 deploy-prometheus-service-monitor:

From 5d8c4642a5d943ce08f517d8027fd65bd6db7a00 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Thu, 26 Dec 2024 12:35:39 +0000
Subject: [PATCH 12/33] add vdb namespace customize

---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 016e129bd..dd9bd1e50 100644
--- a/Makefile
+++ b/Makefile
@@ -151,6 +151,7 @@ PROMETHEUS_INTERVAL?=5s
 DB_USER?=dbadmin
 DB_PASSWORD?=
 VDB_NAME?=verticadb-sample
+VDB_NAMESPACE?=default
 # Can be used to specify additional overrides when doing the helm install.
 # For example to specify a custom webhook tls cert when deploying use this command:
 #   HELM_OVERRIDES="--set webhook.tlsSecret=custom-cert" make deploy-operator
@@ -661,11 +662,11 @@ undeploy-prometheus:
 
 .PHONY: deploy-prometheus-service-monitor
 deploy-prometheus-service-monitor:
-	scripts/deploy-prometheus.sh -n $(PROMETHEUS_NAMESPACE) -l $(PROMETHEUS_HELM_NAME) -i $(PROMETHEUS_INTERVAL) -a deploy -u $(DB_USER) -p '$(DB_PASSWORD)' -d $(VDB_NAME)
+	scripts/deploy-prometheus.sh -n $(VDB_NAMESPACE) -l $(PROMETHEUS_HELM_NAME) -i $(PROMETHEUS_INTERVAL) -a deploy -u $(DB_USER) -p '$(DB_PASSWORD)' -d $(VDB_NAME)
 
 .PHONY: undeploy-prometheus-service-monitor
 undeploy-prometheus-service-monitor:
-	scripts/deploy-prometheus.sh -n $(PROMETHEUS_NAMESPACE) -l $(PROMETHEUS_HELM_NAME) -i $(PROMETHEUS_INTERVAL) -a undeploy -u $(DB_USER) -p '$(DB_PASSWORD)' -d $(VDB_NAME)
+	scripts/deploy-prometheus.sh -n $(VDB_NAMESPACE) -l $(PROMETHEUS_HELM_NAME) -i $(PROMETHEUS_INTERVAL) -a undeploy -u $(DB_USER) -p '$(DB_PASSWORD)' -d $(VDB_NAME)
 
 .PHONY: undeploy-operator
 undeploy-operator: ## Undeploy operator that was previously deployed

From b0b6b881e138e67e75a7f29bed520487a6d31e4a Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Thu, 26 Dec 2024 12:50:34 +0000
Subject: [PATCH 13/33] revert change

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index dd9bd1e50..2a67424e8 100644
--- a/Makefile
+++ b/Makefile
@@ -644,7 +644,7 @@ endif
 
 deploy-webhook: manifests kustomize ## Using helm, deploy just the webhook in the k8s cluster
 ifeq ($(DEPLOY_WITH), helm)
-	helm install $(DEPLOY_WAIT) -n $(NAMESPACE) --create-namespace $(HELM_RELEASE_NAME) $(OPERATOR_CHART) --set image.repo=null --set image.name=${OPERATOR_IMG} --set image.pullPolicy=$(HELM_IMAGE_PULL_POLICY) --set imagePullSecrets[0].name=priv-reg-cred $(HELM_OVERRIDES)
+	helm install $(DEPLOY_WAIT) -n $(NAMESPACE) --create-namespace $(HELM_RELEASE_NAME) $(OPERATOR_CHART) --set image.repo=null --set image.name=${OPERATOR_IMG} --set image.pullPolicy=$(HELM_IMAGE_PULL_POLICY) --set imagePullSecrets[0].name=priv-reg-cred --set webhook.enable=true,controllers.enable=false $(HELM_OVERRIDES)
 	scripts/wait-for-webhook.sh -n $(NAMESPACE) -t 60
 else
 	$(error Unsupported deployment method for webhook only: $(DEPLOY_WITH))

From aabad1420a05b973151f4666f737a89940dfefd5 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Thu, 2 Jan 2025 06:47:57 +0000
Subject: [PATCH 14/33] revert make file changes

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2a67424e8..c6e57c01a 100644
--- a/Makefile
+++ b/Makefile
@@ -633,7 +633,7 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 # If this secret does not exist then it is simply ignored.
 deploy-operator: manifests kustomize ## Using helm or olm, deploy the operator in the K8s cluster
 ifeq ($(DEPLOY_WITH), helm)
-	helm install $(DEPLOY_WAIT) -n $(NAMESPACE) --create-namespace $(HELM_RELEASE_NAME) $(OPERATOR_CHART) --set image.repo=null --set image.name=${OPERATOR_IMG} --set image.pullPolicy=$(HELM_IMAGE_PULL_POLICY) --set imagePullSecrets[0].name=priv-reg-cred --set controllers.scope=$(CONTROLLERS_SCOPE) --set controllers.vdbMaxBackoffDuration=$(VDB_MAX_BACKOFF_DURATION) $(HELM_OVERRIDES)
+	helm install $(DEPLOY_WAIT) -n $(NAMESPACE) --create-namespace $(HELM_RELEASE_NAME) $(OPERATOR_CHART) --set image.repo=null --set image.name=${OPERATOR_IMG} --set image.pullPolicy=$(HELM_IMAGE_PULL_POLICY) --set imagePullSecrets[0].name=priv-reg-cred $(HELM_OVERRIDES) --set controllers.scope=$(CONTROLLERS_SCOPE) --set controllers.vdbMaxBackoffDuration=$(VDB_MAX_BACKOFF_DURATION)
 	scripts/wait-for-webhook.sh -n $(NAMESPACE) -t 60
 else ifeq ($(DEPLOY_WITH), olm)
 	scripts/deploy-olm.sh -n $(NAMESPACE) $(OLM_TEST_CATALOG_SOURCE)

From 1006b9a0acffe96645f01747b9cfb36cd7ff4889 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Thu, 2 Jan 2025 06:52:53 +0000
Subject: [PATCH 15/33] update default values

---
 helm-charts/prometheus/values.yaml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/helm-charts/prometheus/values.yaml b/helm-charts/prometheus/values.yaml
index 1e907d18d..34ef2424d 100644
--- a/helm-charts/prometheus/values.yaml
+++ b/helm-charts/prometheus/values.yaml
@@ -1,15 +1,13 @@
-defaultRules:
-  create: false
 alertmanager:
-  enabled: true
+  enabled: false
 grafana:
   enabled: false
 kubeApiServer:
-  enabled: true
+  enabled: false
 kubelet:
   enabled: false
 kubeControllerManager:
-  enabled: true
+  enabled: false
 coreDns:
   enabled: false
 kubeEtcd:
@@ -17,8 +15,8 @@ kubeEtcd:
 kubeScheduler:
   enabled: false
 kubeStateMetrics:
-  enabled: true
+  enabled: false
 nodeExporter:
-  enabled: true
+  enabled: false
 prometheus:
   enabled: true

From e878ad6ff3148fd54058806077740492944a0297 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Thu, 2 Jan 2025 06:53:34 +0000
Subject: [PATCH 16/33] move values file to prometheus directory

---
 {helm-charts/prometheus => prometheus}/values.yaml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {helm-charts/prometheus => prometheus}/values.yaml (100%)

diff --git a/helm-charts/prometheus/values.yaml b/prometheus/values.yaml
similarity index 100%
rename from helm-charts/prometheus/values.yaml
rename to prometheus/values.yaml

From 5e260c89fe0f73fbcbc47c1e0bb58fbad9b68f77 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Thu, 2 Jan 2025 06:58:20 +0000
Subject: [PATCH 17/33] update file path

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c6e57c01a..fd526d446 100644
--- a/Makefile
+++ b/Makefile
@@ -654,7 +654,7 @@ endif
 deploy-prometheus:
 	helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
 	helm repo update
-	helm install $(DEPLOY_WAIT) -n $(PROMETHEUS_NAMESPACE) --create-namespace $(PROMETHEUS_HELM_NAME) $(PROMETHEUS_CHART) --values helm-charts/prometheus/values.yaml $(PROMETHEUS_HELM_OVERRIDES)
+	helm install $(DEPLOY_WAIT) -n $(PROMETHEUS_NAMESPACE) --create-namespace $(PROMETHEUS_HELM_NAME) $(PROMETHEUS_CHART) --values prometheus/values.yaml $(PROMETHEUS_HELM_OVERRIDES)
 
 .PHONY: undeploy-prometheus
 undeploy-prometheus:

From 825cbbcb5433ad32ddd7e4b7872f8dca73befe80 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Thu, 2 Jan 2025 09:40:06 +0000
Subject: [PATCH 18/33] add e2e test

---
 .../prometheustest/00-create-secrets.yaml     | 19 ++++++
 .../e2e-leg-11/prometheustest/01-assert.yaml  | 21 +++++++
 .../prometheustest/01-deploy-operator.yaml    | 12 ++++
 .../e2e-leg-11/prometheustest/02-assert.yaml  | 22 +++++++
 tests/e2e-leg-11/prometheustest/02-rbac.yaml  | 18 ++++++
 .../e2e-leg-11/prometheustest/03-assert.yaml  | 22 +++++++
 .../prometheustest/03-password-secret.yaml    | 21 +++++++
 .../e2e-leg-11/prometheustest/05-assert.yaml  | 27 +++++++++
 .../prometheustest/05-setup-vdb.yaml          | 17 ++++++
 .../e2e-leg-11/prometheustest/10-assert.yaml  | 21 +++++++
 .../prometheustest/10-deploy-prometheus.yaml  | 17 ++++++
 .../15-deploy-prometheus-service-monitor.yaml | 17 ++++++
 .../e2e-leg-11/prometheustest/20-assert.yaml  | 23 ++++++++
 .../prometheustest/20-wait-for-data-pull.yaml | 44 ++++++++++++++
 .../e2e-leg-11/prometheustest/25-assert.yaml  | 23 ++++++++
 .../25-verify-prometheus-metrics.yaml         | 58 +++++++++++++++++++
 .../prometheustest/95-delete-cr.yaml          | 18 ++++++
 .../e2e-leg-11/prometheustest/95-errors.yaml  | 21 +++++++
 .../e2e-leg-11/prometheustest/96-assert.yaml  | 19 ++++++
 .../prometheustest/96-cleanup-storage.yaml    | 17 ++++++
 .../e2e-leg-11/prometheustest/96-errors.yaml  | 15 +++++
 .../prometheustest/99-delete-ns.yaml          | 17 ++++++
 .../setup-vdb/base/kustomization.yaml         | 15 +++++
 .../setup-vdb/base/setup-vdb.yaml             | 39 +++++++++++++
 24 files changed, 543 insertions(+)
 create mode 100644 tests/e2e-leg-11/prometheustest/00-create-secrets.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/01-assert.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/01-deploy-operator.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/02-assert.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/02-rbac.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/03-assert.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/03-password-secret.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/05-assert.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/05-setup-vdb.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/10-assert.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/10-deploy-prometheus.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/15-deploy-prometheus-service-monitor.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/20-assert.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/20-wait-for-data-pull.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/25-assert.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/25-verify-prometheus-metrics.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/95-delete-cr.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/95-errors.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/96-assert.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/96-cleanup-storage.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/96-errors.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/99-delete-ns.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/setup-vdb/base/kustomization.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/setup-vdb/base/setup-vdb.yaml

diff --git a/tests/e2e-leg-11/prometheustest/00-create-secrets.yaml b/tests/e2e-leg-11/prometheustest/00-create-secrets.yaml
new file mode 100644
index 000000000..ecced2c12
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/00-create-secrets.yaml
@@ -0,0 +1,19 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: kustomize build ../../manifests/communal-creds/overlay | kubectl apply -f - --namespace $NAMESPACE
+  - script: kustomize build ../../manifests/priv-container-creds/overlay | kubectl apply -f - --namespace $NAMESPACE
+  - script: kustomize build ../../manifests/vertica-license/overlay | kubectl apply -f - --namespace $NAMESPACE
diff --git a/tests/e2e-leg-11/prometheustest/01-assert.yaml b/tests/e2e-leg-11/prometheustest/01-assert.yaml
new file mode 100644
index 000000000..9faca75c9
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/01-assert.yaml
@@ -0,0 +1,21 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: Pod
+metadata:
+  namespace: verticadb-operator
+  labels:
+    control-plane: verticadb-operator
+status:
+  phase: Running
diff --git a/tests/e2e-leg-11/prometheustest/01-deploy-operator.yaml b/tests/e2e-leg-11/prometheustest/01-deploy-operator.yaml
new file mode 100644
index 000000000..0cd372046
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/01-deploy-operator.yaml
@@ -0,0 +1,12 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/e2e-leg-11/prometheustest/02-assert.yaml b/tests/e2e-leg-11/prometheustest/02-assert.yaml
new file mode 100644
index 000000000..0bd1a36d6
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/02-assert.yaml
@@ -0,0 +1,22 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: integration-test-role
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: integration-test-rb
diff --git a/tests/e2e-leg-11/prometheustest/02-rbac.yaml b/tests/e2e-leg-11/prometheustest/02-rbac.yaml
new file mode 100644
index 000000000..c6c5d01da
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/02-rbac.yaml
@@ -0,0 +1,18 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: kubectl apply --namespace $NAMESPACE -f ../../manifests/rbac/base/rbac.yaml
+    ignoreFailure: true
diff --git a/tests/e2e-leg-11/prometheustest/03-assert.yaml b/tests/e2e-leg-11/prometheustest/03-assert.yaml
new file mode 100644
index 000000000..155c44206
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/03-assert.yaml
@@ -0,0 +1,22 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+apiVersion: v1
+kind: Secret
+metadata:
+  name: su-passwd
+type: Opaque
+data:
+  username: ZGJhZG1pbg==
+  password: dG9wc2VjcmV0
diff --git a/tests/e2e-leg-11/prometheustest/03-password-secret.yaml b/tests/e2e-leg-11/prometheustest/03-password-secret.yaml
new file mode 100644
index 000000000..c67339e10
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/03-password-secret.yaml
@@ -0,0 +1,21 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: Secret
+metadata:
+  name: su-passwd
+type: Opaque
+stringData:
+  username: dbadmin
+  password: topsecret
\ No newline at end of file
diff --git a/tests/e2e-leg-11/prometheustest/05-assert.yaml b/tests/e2e-leg-11/prometheustest/05-assert.yaml
new file mode 100644
index 000000000..cc38ec07c
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/05-assert.yaml
@@ -0,0 +1,27 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: v-prometheus-pri1
+status:
+  currentReplicas: 3
+---
+apiVersion: vertica.com/v1
+kind: VerticaDB
+metadata:
+  name: v-prometheus
+spec:
+  subclusters:
+    - name: pri1
diff --git a/tests/e2e-leg-11/prometheustest/05-setup-vdb.yaml b/tests/e2e-leg-11/prometheustest/05-setup-vdb.yaml
new file mode 100644
index 000000000..c9ed69089
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/05-setup-vdb.yaml
@@ -0,0 +1,17 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - command: bash -c "kustomize build setup-vdb/overlay | kubectl -n $NAMESPACE apply -f - "
diff --git a/tests/e2e-leg-11/prometheustest/10-assert.yaml b/tests/e2e-leg-11/prometheustest/10-assert.yaml
new file mode 100644
index 000000000..5e6fc1dfb
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/10-assert.yaml
@@ -0,0 +1,21 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: Pod
+metadata:
+  namespace: prometheus
+  labels:
+    app.kubernetes.io/name: prometheus
+status:
+  phase: Running
diff --git a/tests/e2e-leg-11/prometheustest/10-deploy-prometheus.yaml b/tests/e2e-leg-11/prometheustest/10-deploy-prometheus.yaml
new file mode 100644
index 000000000..37f2649fc
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/10-deploy-prometheus.yaml
@@ -0,0 +1,17 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: cd ../../.. && make deploy-prometheus NAMESPACE=$NAMESPACE
diff --git a/tests/e2e-leg-11/prometheustest/15-deploy-prometheus-service-monitor.yaml b/tests/e2e-leg-11/prometheustest/15-deploy-prometheus-service-monitor.yaml
new file mode 100644
index 000000000..8fab5c0e2
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/15-deploy-prometheus-service-monitor.yaml
@@ -0,0 +1,17 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: cd ../../.. && make deploy-prometheus-service-monitor NAMESPACE=$NAMESPACE DB_USER=dbadmin DB_PASSWORD=topsecret VDB_NAME=v-prometheus 
diff --git a/tests/e2e-leg-11/prometheustest/20-assert.yaml b/tests/e2e-leg-11/prometheustest/20-assert.yaml
new file mode 100644
index 000000000..d905eae79
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/20-assert.yaml
@@ -0,0 +1,23 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: Pod
+metadata:
+  name: script-prometheus-sleep
+status:
+  containerStatuses:
+    - name: test
+      state:
+        terminated:
+          exitCode: 0 
diff --git a/tests/e2e-leg-11/prometheustest/20-wait-for-data-pull.yaml b/tests/e2e-leg-11/prometheustest/20-wait-for-data-pull.yaml
new file mode 100644
index 000000000..dea65b7da
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/20-wait-for-data-pull.yaml
@@ -0,0 +1,44 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: script-prometheus-sleep
+data:
+  entrypoint.sh: |-
+    #!/bin/bash
+    sleep 10
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: script-prometheus-sleep
+  labels:
+    stern: include
+spec:
+  restartPolicy: Never
+  containers:
+    - name: test
+      image: bitnami/kubectl:1.20.4
+      command: ["/bin/entrypoint.sh"]
+      volumeMounts:
+        - name: entrypoint-volume
+          mountPath: /bin/entrypoint.sh
+          readOnly: true
+          subPath: entrypoint.sh
+  volumes:
+    - name: entrypoint-volume
+      configMap:
+        defaultMode: 0777
+        name: script-prometheus-sleep
diff --git a/tests/e2e-leg-11/prometheustest/25-assert.yaml b/tests/e2e-leg-11/prometheustest/25-assert.yaml
new file mode 100644
index 000000000..bdd8a116f
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/25-assert.yaml
@@ -0,0 +1,23 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: Pod
+metadata:
+  name: script-verity-prometheus-metrics
+status:
+  containerStatuses:
+    - name: test
+      state:
+        terminated:
+          exitCode: 0 
diff --git a/tests/e2e-leg-11/prometheustest/25-verify-prometheus-metrics.yaml b/tests/e2e-leg-11/prometheustest/25-verify-prometheus-metrics.yaml
new file mode 100644
index 000000000..c4529d2b0
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/25-verify-prometheus-metrics.yaml
@@ -0,0 +1,58 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: script-verity-prometheus-metrics
+data:
+  entrypoint.sh: |-
+    #!/bin/bash
+    set -o errexit
+    set -o xtrace
+    
+    # Setup start and end time for query, e.g: 2024-09-14
+    START_TIME=$(date +%Y-%m-%d) 
+    END_TIME=$(date +%Y-%m-%d --date "$curr +1 day")
+    CMD="kubectl exec v-prometheus-pri1-0 -it -c server -- curl -g http://prometheus-kube-prometheus-prometheus.prometheus.svc.cluster.local:9090/api/v1/query?query=vertica_build_info&start=${START_TIME}&end=${END_TIME}"
+    RESULT=$(eval $CMD)
+    METRICS=$(echo $RESULT | jq -r '.data.result') 
+    
+    # verify the metrics result
+    if [[ "$METRICS" == "" || "$METRICS" == "\[\]" ]]; then
+      echo "empty metrics result: $RESULT found."
+      exit 1
+    fi
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: script-verity-prometheus-metrics
+  labels:
+    stern: include
+spec:
+  restartPolicy: Never
+  containers:
+    - name: test
+      image: bitnami/kubectl:1.20.4
+      command: ["/bin/entrypoint.sh"]
+      volumeMounts:
+        - name: entrypoint-volume
+          mountPath: /bin/entrypoint.sh
+          readOnly: true
+          subPath: entrypoint.sh
+  volumes:
+    - name: entrypoint-volume
+      configMap:
+        defaultMode: 0777
+        name: script-verity-prometheus-metrics
diff --git a/tests/e2e-leg-11/prometheustest/95-delete-cr.yaml b/tests/e2e-leg-11/prometheustest/95-delete-cr.yaml
new file mode 100644
index 000000000..96d43c1de
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/95-delete-cr.yaml
@@ -0,0 +1,18 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+delete:
+  - apiVersion: vertica.com/v1
+    kind: VerticaDB
diff --git a/tests/e2e-leg-11/prometheustest/95-errors.yaml b/tests/e2e-leg-11/prometheustest/95-errors.yaml
new file mode 100644
index 000000000..0794a6b38
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/95-errors.yaml
@@ -0,0 +1,21 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: apps/v1
+kind: StatefulSet
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/managed-by: verticadb-operator
diff --git a/tests/e2e-leg-11/prometheustest/96-assert.yaml b/tests/e2e-leg-11/prometheustest/96-assert.yaml
new file mode 100644
index 000000000..861c7dc8f
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/96-assert.yaml
@@ -0,0 +1,19 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: Pod
+metadata:
+  name: clean-communal
+status:
+  phase: Succeeded
diff --git a/tests/e2e-leg-11/prometheustest/96-cleanup-storage.yaml b/tests/e2e-leg-11/prometheustest/96-cleanup-storage.yaml
new file mode 100644
index 000000000..dcc6306f3
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/96-cleanup-storage.yaml
@@ -0,0 +1,17 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - command: bash -c "kustomize build clean-communal/overlay | kubectl -n $NAMESPACE apply -f - "
diff --git a/tests/e2e-leg-11/prometheustest/96-errors.yaml b/tests/e2e-leg-11/prometheustest/96-errors.yaml
new file mode 100644
index 000000000..671be36cf
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/96-errors.yaml
@@ -0,0 +1,15 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: PersistentVolumeClaim
diff --git a/tests/e2e-leg-11/prometheustest/99-delete-ns.yaml b/tests/e2e-leg-11/prometheustest/99-delete-ns.yaml
new file mode 100644
index 000000000..1674b3e8f
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/99-delete-ns.yaml
@@ -0,0 +1,17 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - command: kubectl delete ns $NAMESPACE
diff --git a/tests/e2e-leg-11/prometheustest/setup-vdb/base/kustomization.yaml b/tests/e2e-leg-11/prometheustest/setup-vdb/base/kustomization.yaml
new file mode 100644
index 000000000..681396735
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/setup-vdb/base/kustomization.yaml
@@ -0,0 +1,15 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+resources:
+  - setup-vdb.yaml
diff --git a/tests/e2e-leg-11/prometheustest/setup-vdb/base/setup-vdb.yaml b/tests/e2e-leg-11/prometheustest/setup-vdb/base/setup-vdb.yaml
new file mode 100644
index 000000000..ecd1b31cd
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/setup-vdb/base/setup-vdb.yaml
@@ -0,0 +1,39 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: vertica.com/v1
+kind: VerticaDB
+metadata:
+  name: v-prometheus
+  annotations:
+    vertica.com/include-uid-in-path: true
+    vertica.com/vcluster-ops: true
+spec:
+  image: kustomize-vertica-image
+  initPolicy: CreateSkipPackageInstall
+  communal: {}
+  local:
+    requestSize: 250Mi
+  imagePullPolicy: IfNotPresent
+  passwordSecret: su-passwd
+
+  # We pick a cluster size that is too big for the CE license. This relies on
+  # having a license, which will be added by kustomize.
+  subclusters:
+    - name: pri1
+      size: 3
+      type: primary
+  certSecrets: []
+  imagePullSecrets: []
+  volumes: []
+  volumeMounts: []

From d1a939891c4329e3188716d6c5eef5f02dae6a28 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Thu, 2 Jan 2025 13:52:43 +0000
Subject: [PATCH 19/33] address comments

---
 .../prometheustest/10-deploy-prometheus.yaml  |  2 +-
 .../e2e-leg-11/prometheustest/20-assert.yaml  | 23 ------------
 .../prometheustest/20-wait-for-data-pull.yaml | 35 +++----------------
 3 files changed, 5 insertions(+), 55 deletions(-)
 delete mode 100644 tests/e2e-leg-11/prometheustest/20-assert.yaml

diff --git a/tests/e2e-leg-11/prometheustest/10-deploy-prometheus.yaml b/tests/e2e-leg-11/prometheustest/10-deploy-prometheus.yaml
index 37f2649fc..4cc900038 100644
--- a/tests/e2e-leg-11/prometheustest/10-deploy-prometheus.yaml
+++ b/tests/e2e-leg-11/prometheustest/10-deploy-prometheus.yaml
@@ -14,4 +14,4 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - script: cd ../../.. && make deploy-prometheus NAMESPACE=$NAMESPACE
+  - script: cd ../../.. && make deploy-prometheus PROMETHEUS_NAMESPACE=$NAMESPACE
diff --git a/tests/e2e-leg-11/prometheustest/20-assert.yaml b/tests/e2e-leg-11/prometheustest/20-assert.yaml
deleted file mode 100644
index d905eae79..000000000
--- a/tests/e2e-leg-11/prometheustest/20-assert.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# (c) Copyright [2021-2024] Open Text.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# You may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Pod
-metadata:
-  name: script-prometheus-sleep
-status:
-  containerStatuses:
-    - name: test
-      state:
-        terminated:
-          exitCode: 0 
diff --git a/tests/e2e-leg-11/prometheustest/20-wait-for-data-pull.yaml b/tests/e2e-leg-11/prometheustest/20-wait-for-data-pull.yaml
index dea65b7da..8287c3882 100644
--- a/tests/e2e-leg-11/prometheustest/20-wait-for-data-pull.yaml
+++ b/tests/e2e-leg-11/prometheustest/20-wait-for-data-pull.yaml
@@ -11,34 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: script-prometheus-sleep
-data:
-  entrypoint.sh: |-
-    #!/bin/bash
-    sleep 10
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: script-prometheus-sleep
-  labels:
-    stern: include
-spec:
-  restartPolicy: Never
-  containers:
-    - name: test
-      image: bitnami/kubectl:1.20.4
-      command: ["/bin/entrypoint.sh"]
-      volumeMounts:
-        - name: entrypoint-volume
-          mountPath: /bin/entrypoint.sh
-          readOnly: true
-          subPath: entrypoint.sh
-  volumes:
-    - name: entrypoint-volume
-      configMap:
-        defaultMode: 0777
-        name: script-prometheus-sleep
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: "sleep 10"

From bbbe46b1754f7bc50729c7c527b64122068f5069 Mon Sep 17 00:00:00 2001
From: Hao <HaoYang0000@users.noreply.github.com>
Date: Fri, 3 Jan 2025 06:09:31 +0000
Subject: [PATCH 20/33] Update Makefile

Co-authored-by: Roy Paulin <rnguetsopken@opentext.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index fd526d446..2857b8c09 100644
--- a/Makefile
+++ b/Makefile
@@ -633,7 +633,7 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 # If this secret does not exist then it is simply ignored.
 deploy-operator: manifests kustomize ## Using helm or olm, deploy the operator in the K8s cluster
 ifeq ($(DEPLOY_WITH), helm)
-	helm install $(DEPLOY_WAIT) -n $(NAMESPACE) --create-namespace $(HELM_RELEASE_NAME) $(OPERATOR_CHART) --set image.repo=null --set image.name=${OPERATOR_IMG} --set image.pullPolicy=$(HELM_IMAGE_PULL_POLICY) --set imagePullSecrets[0].name=priv-reg-cred $(HELM_OVERRIDES) --set controllers.scope=$(CONTROLLERS_SCOPE) --set controllers.vdbMaxBackoffDuration=$(VDB_MAX_BACKOFF_DURATION)
+	helm install $(DEPLOY_WAIT) -n $(NAMESPACE) --create-namespace $(HELM_RELEASE_NAME) $(OPERATOR_CHART) --set image.repo=null --set image.name=${OPERATOR_IMG} --set image.pullPolicy=$(HELM_IMAGE_PULL_POLICY) --set imagePullSecrets[0].name=priv-reg-cred --set controllers.scope=$(CONTROLLERS_SCOPE) --set controllers.vdbMaxBackoffDuration=$(VDB_MAX_BACKOFF_DURATION) $(HELM_OVERRIDES)
 	scripts/wait-for-webhook.sh -n $(NAMESPACE) -t 60
 else ifeq ($(DEPLOY_WITH), olm)
 	scripts/deploy-olm.sh -n $(NAMESPACE) $(OLM_TEST_CATALOG_SOURCE)

From cabbde903a4e4748e93c53f711ac9c0578e7c4c5 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Fri, 3 Jan 2025 06:11:41 +0000
Subject: [PATCH 21/33] update e2e test

---
 .../e2e-leg-11/prometheustest/10-assert.yaml  |  9 ++++++++-
 .../e2e-leg-11/prometheustest/15-assert.yaml  | 19 +++++++++++++++++++
 .../15-deploy-prometheus-service-monitor.yaml |  2 +-
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 tests/e2e-leg-11/prometheustest/15-assert.yaml

diff --git a/tests/e2e-leg-11/prometheustest/10-assert.yaml b/tests/e2e-leg-11/prometheustest/10-assert.yaml
index 5e6fc1dfb..54bea137a 100644
--- a/tests/e2e-leg-11/prometheustest/10-assert.yaml
+++ b/tests/e2e-leg-11/prometheustest/10-assert.yaml
@@ -14,8 +14,15 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  namespace: prometheus
   labels:
     app.kubernetes.io/name: prometheus
 status:
   phase: Running
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: prometheus-kube-prometheus-operator
+status:
+  replicas: 1
+  readyReplicas: 1
diff --git a/tests/e2e-leg-11/prometheustest/15-assert.yaml b/tests/e2e-leg-11/prometheustest/15-assert.yaml
new file mode 100644
index 000000000..a80686d38
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/15-assert.yaml
@@ -0,0 +1,19 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: k8s-vertica-prometheus-v-prometheus
+  labels:
+    release: prometheus
diff --git a/tests/e2e-leg-11/prometheustest/15-deploy-prometheus-service-monitor.yaml b/tests/e2e-leg-11/prometheustest/15-deploy-prometheus-service-monitor.yaml
index 8fab5c0e2..76d26766e 100644
--- a/tests/e2e-leg-11/prometheustest/15-deploy-prometheus-service-monitor.yaml
+++ b/tests/e2e-leg-11/prometheustest/15-deploy-prometheus-service-monitor.yaml
@@ -14,4 +14,4 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - script: cd ../../.. && make deploy-prometheus-service-monitor NAMESPACE=$NAMESPACE DB_USER=dbadmin DB_PASSWORD=topsecret VDB_NAME=v-prometheus 
+  - script: cd ../../.. && make deploy-prometheus-service-monitor VDB_NAMESPACE=$NAMESPACE DB_USER=dbadmin DB_PASSWORD=topsecret VDB_NAME=v-prometheus 

From 1e4d33b41410d09453b43eb330116d9db40fe7c9 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Fri, 3 Jan 2025 06:14:05 +0000
Subject: [PATCH 22/33] rename dbname to vdbname in script

---
 scripts/deploy-prometheus.sh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/scripts/deploy-prometheus.sh b/scripts/deploy-prometheus.sh
index 142393c5f..a69b29641 100755
--- a/scripts/deploy-prometheus.sh
+++ b/scripts/deploy-prometheus.sh
@@ -23,11 +23,11 @@ ACTION=''
 NAMESPACE=''
 USERNAME=''
 PASSWORD=''
-DBNAME=''
+VDB_NAME=''
 INTERVAL='5s'
 
 function usage() {
-    echo "usage: $(basename $0) [-n <namespace>] [-l <label>] [-a <action>] [-u <username>] [-p <password>] [-d <dbname>] [-i <interval>]"
+    echo "usage: $(basename $0) [-n <namespace>] [-l <label>] [-a <action>] [-u <username>] [-p <password>] [-d <vdbname>] [-i <interval>]"
     echo
     echo "Options:"
     echo "  -n <namespace>  The namespace used for prometheus service."
@@ -35,7 +35,7 @@ function usage() {
     echo "  -a <action>     The action to run in this script, deploy or undeploy."
     echo "  -u <username>   The database username, should have access to the Vertica server metrics."
     echo "  -p <password>   The database user password."
-    echo "  -d <dbname>     The database name."
+    echo "  -d <vdbname>    The k8s CRD database name."
     echo "  -i <interval>   The scraping interval of prometheus update for metrics."
     echo "  -h <usage>      Print help message."
     exit 1
@@ -60,7 +60,7 @@ do
             PASSWORD=$OPTARG
             ;;
         d)
-            DBNAME=$OPTARG
+            VDB_NAME=$OPTARG
             ;;
         i)
             INTERVAL=$OPTARG
@@ -90,7 +90,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   namespace: $NAMESPACE
-  name: prometheus-$DBNAME
+  name: prometheus-$VDB_NAME
 data:
   username: '$(echo -n $USERNAME | base64)'
   password: '$(echo -n $PASSWORD | base64)'
@@ -102,14 +102,14 @@ EOF
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: k8s-vertica-prometheus-$DBNAME
+  name: k8s-vertica-prometheus-$VDB_NAME
   namespace: $NAMESPACE
   labels:
     release: $LABEL
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/instance: $DBNAME
+      app.kubernetes.io/instance: $VDB_NAME
   namespaceSelector:
     matchNames:
       - $NAMESPACE
@@ -117,10 +117,10 @@ spec:
     - basicAuth:
         password:
           key: password
-          name: prometheus-$DBNAME
+          name: prometheus-$VDB_NAME
         username: 
           key: username
-          name: prometheus-$DBNAME
+          name: prometheus-$VDB_NAME
           optional: true
       interval: $INTERVAL
       path: /v1/metrics
@@ -137,14 +137,14 @@ function undeploy(){
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: k8s-vertica-prometheus-$DBNAME
+  name: k8s-vertica-prometheus-$VDB_NAME
   namespace: $NAMESPACE
   labels:
     release: $LABEL
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/instance: $DBNAME
+      app.kubernetes.io/instance: $VDB_NAME
   namespaceSelector:
     matchNames:
       - $NAMESPACE
@@ -152,10 +152,10 @@ spec:
     - basicAuth:
         password:
           key: password
-          name: prometheus-$DBNAME
+          name: prometheus-$VDB_NAME
         username: 
           key: username
-          name: prometheus-$DBNAME
+          name: prometheus-$VDB_NAME
           optional: true
       interval: $INTERVAL
       path: /v1/metrics
@@ -171,7 +171,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   namespace: $NAMESPACE
-  name: prometheus-$DBNAME
+  name: prometheus-$VDB_NAME
 data:
   username: '$(echo -n $USERNAME | base64)'
   password: '$(echo -n $PASSWORD | base64)'

From dd194a6b360f472e544ed3d2665eaabc10cab407 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Fri, 3 Jan 2025 06:16:53 +0000
Subject: [PATCH 23/33] update script with cmd instead of cat f

---
 scripts/deploy-prometheus.sh | 44 ++----------------------------------
 1 file changed, 2 insertions(+), 42 deletions(-)

diff --git a/scripts/deploy-prometheus.sh b/scripts/deploy-prometheus.sh
index a69b29641..7ef0e5c20 100755
--- a/scripts/deploy-prometheus.sh
+++ b/scripts/deploy-prometheus.sh
@@ -133,50 +133,10 @@ EOF
 
 function undeploy(){
   # Delete the service monitor for prometheus service monitor.
-  cat <<EOF | kubectl delete -f -
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: k8s-vertica-prometheus-$VDB_NAME
-  namespace: $NAMESPACE
-  labels:
-    release: $LABEL
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/instance: $VDB_NAME
-  namespaceSelector:
-    matchNames:
-      - $NAMESPACE
-  endpoints:
-    - basicAuth:
-        password:
-          key: password
-          name: prometheus-$VDB_NAME
-        username: 
-          key: username
-          name: prometheus-$VDB_NAME
-          optional: true
-      interval: $INTERVAL
-      path: /v1/metrics
-      port: vertica-http
-      scheme: https
-      tlsConfig:
-        insecureSkipVerify: true
-EOF
+  kubectl delete servicemonitor k8s-vertica-prometheus-$VDBNAME -n $NAMESPACE
 
   # delete secret for prometheus service monitor.
-  cat <<EOF | kubectl delete -f -
-apiVersion: v1
-kind: Secret
-metadata:
-  namespace: $NAMESPACE
-  name: prometheus-$VDB_NAME
-data:
-  username: '$(echo -n $USERNAME | base64)'
-  password: '$(echo -n $PASSWORD | base64)'
-type: Opaque
-EOF
+  kubectl delete secret prometheus-$VDBNAME -n $NAMESPACE
 }
 
  # ACTION deploy and undeploy

From 4e9ca4e9320cf46071c95df956c0acd1d265f96b Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Fri, 3 Jan 2025 06:17:55 +0000
Subject: [PATCH 24/33] add label for secret

---
 scripts/deploy-prometheus.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/deploy-prometheus.sh b/scripts/deploy-prometheus.sh
index 7ef0e5c20..daf18b65b 100755
--- a/scripts/deploy-prometheus.sh
+++ b/scripts/deploy-prometheus.sh
@@ -91,6 +91,8 @@ kind: Secret
 metadata:
   namespace: $NAMESPACE
   name: prometheus-$VDB_NAME
+  labels:
+    release: $LABEL
 data:
   username: '$(echo -n $USERNAME | base64)'
   password: '$(echo -n $PASSWORD | base64)'

From 9aa24287582fab0d83eeafd6b8266f259362daec Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Fri, 3 Jan 2025 06:21:08 +0000
Subject: [PATCH 25/33] assert service as well in e2e check

---
 tests/e2e-leg-11/prometheustest/10-assert.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/e2e-leg-11/prometheustest/10-assert.yaml b/tests/e2e-leg-11/prometheustest/10-assert.yaml
index 54bea137a..a2e02d9a4 100644
--- a/tests/e2e-leg-11/prometheustest/10-assert.yaml
+++ b/tests/e2e-leg-11/prometheustest/10-assert.yaml
@@ -26,3 +26,8 @@ metadata:
 status:
   replicas: 1
   readyReplicas: 1
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: prometheus-kube-prometheus-prometheus

From cfc65ca0281ea5cf15c365816df8b90b2854b4e1 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Fri, 3 Jan 2025 08:03:06 +0000
Subject: [PATCH 26/33] add cr deletetion and fix namespace issue

---
 .../25-verify-prometheus-metrics.yaml         |  2 +-
 .../prometheustest/90-delete-prometheus.yaml  | 18 +++++++++++++
 .../e2e-leg-11/prometheustest/90-errors.yaml  | 27 +++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 tests/e2e-leg-11/prometheustest/90-delete-prometheus.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/90-errors.yaml

diff --git a/tests/e2e-leg-11/prometheustest/25-verify-prometheus-metrics.yaml b/tests/e2e-leg-11/prometheustest/25-verify-prometheus-metrics.yaml
index c4529d2b0..8df791217 100644
--- a/tests/e2e-leg-11/prometheustest/25-verify-prometheus-metrics.yaml
+++ b/tests/e2e-leg-11/prometheustest/25-verify-prometheus-metrics.yaml
@@ -24,7 +24,7 @@ data:
     # Setup start and end time for query, e.g: 2024-09-14
     START_TIME=$(date +%Y-%m-%d) 
     END_TIME=$(date +%Y-%m-%d --date "$curr +1 day")
-    CMD="kubectl exec v-prometheus-pri1-0 -it -c server -- curl -g http://prometheus-kube-prometheus-prometheus.prometheus.svc.cluster.local:9090/api/v1/query?query=vertica_build_info&start=${START_TIME}&end=${END_TIME}"
+    CMD="kubectl exec v-prometheus-pri1-0 -it -c server -- curl -g http://prometheus-kube-prometheus-prometheus.${NAMESPACE}.svc.cluster.local:9090/api/v1/query?query=vertica_build_info&start=${START_TIME}&end=${END_TIME}"
     RESULT=$(eval $CMD)
     METRICS=$(echo $RESULT | jq -r '.data.result') 
     
diff --git a/tests/e2e-leg-11/prometheustest/90-delete-prometheus.yaml b/tests/e2e-leg-11/prometheustest/90-delete-prometheus.yaml
new file mode 100644
index 000000000..93fc2f368
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/90-delete-prometheus.yaml
@@ -0,0 +1,18 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: cd ../../.. && make undeploy-prometheus-service-monitor VDB_NAMESPACE=$NAMESPACE DB_USER=dbadmin DB_PASSWORD=topsecret VDB_NAME=v-prometheus
+  - script: cd ../../.. && make undeploy-prometheus PROMETHEUS_NAMESPACE=$NAMESPACE
diff --git a/tests/e2e-leg-11/prometheustest/90-errors.yaml b/tests/e2e-leg-11/prometheustest/90-errors.yaml
new file mode 100644
index 000000000..678d2cd13
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/90-errors.yaml
@@ -0,0 +1,27 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: k8s-vertica-prometheus-v-prometheus
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: prometheus-kube-prometheus-operator
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: prometheus-kube-prometheus-prometheus
\ No newline at end of file

From 1910af9cf3286377bcb59bcb9af549331d701985 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Fri, 3 Jan 2025 08:27:29 +0000
Subject: [PATCH 27/33] fix namespace issue

---
 .../e2e-leg-11/prometheustest/25-verify-prometheus-metrics.yaml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/e2e-leg-11/prometheustest/25-verify-prometheus-metrics.yaml b/tests/e2e-leg-11/prometheustest/25-verify-prometheus-metrics.yaml
index 8df791217..13c2eab00 100644
--- a/tests/e2e-leg-11/prometheustest/25-verify-prometheus-metrics.yaml
+++ b/tests/e2e-leg-11/prometheustest/25-verify-prometheus-metrics.yaml
@@ -24,6 +24,7 @@ data:
     # Setup start and end time for query, e.g: 2024-09-14
     START_TIME=$(date +%Y-%m-%d) 
     END_TIME=$(date +%Y-%m-%d --date "$curr +1 day")
+    NAMESPACE=$(kubectl get pod v-prometheus-pri1-0 -o=jsonpath='{.metadata.namespace}')
     CMD="kubectl exec v-prometheus-pri1-0 -it -c server -- curl -g http://prometheus-kube-prometheus-prometheus.${NAMESPACE}.svc.cluster.local:9090/api/v1/query?query=vertica_build_info&start=${START_TIME}&end=${END_TIME}"
     RESULT=$(eval $CMD)
     METRICS=$(echo $RESULT | jq -r '.data.result') 

From da6aea49618faa11e5c8776baf68697e75247860 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Fri, 3 Jan 2025 09:02:35 +0000
Subject: [PATCH 28/33] fix _

---
 scripts/deploy-prometheus.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/deploy-prometheus.sh b/scripts/deploy-prometheus.sh
index daf18b65b..59d7496b4 100755
--- a/scripts/deploy-prometheus.sh
+++ b/scripts/deploy-prometheus.sh
@@ -135,10 +135,10 @@ EOF
 
 function undeploy(){
   # Delete the service monitor for prometheus service monitor.
-  kubectl delete servicemonitor k8s-vertica-prometheus-$VDBNAME -n $NAMESPACE
+  kubectl delete servicemonitor k8s-vertica-prometheus-$VDB_NAME -n $NAMESPACE
 
   # delete secret for prometheus service monitor.
-  kubectl delete secret prometheus-$VDBNAME -n $NAMESPACE
+  kubectl delete secret prometheus-$VDB_NAME -n $NAMESPACE
 }
 
  # ACTION deploy and undeploy

From 678ff62c6dcd6ec56774a7c74fab25be3567ebe0 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Mon, 6 Jan 2025 07:50:14 +0000
Subject: [PATCH 29/33] adding target
 undeploy-prometheus-service-monitor-by-release in make file

---
 Makefile                     |  4 ++++
 scripts/deploy-prometheus.sh | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2857b8c09..4b464e957 100644
--- a/Makefile
+++ b/Makefile
@@ -668,6 +668,10 @@ deploy-prometheus-service-monitor:
 undeploy-prometheus-service-monitor:
 	scripts/deploy-prometheus.sh -n $(VDB_NAMESPACE) -l $(PROMETHEUS_HELM_NAME) -i $(PROMETHEUS_INTERVAL) -a undeploy -u $(DB_USER) -p '$(DB_PASSWORD)' -d $(VDB_NAME)
 
+.PHONY: undeploy-prometheus-service-monitor-by-release
+undeploy-prometheus-service-monitor-by-release:
+	scripts/deploy-prometheus.sh -n $(VDB_NAMESPACE) -l $(PROMETHEUS_HELM_NAME) -i $(PROMETHEUS_INTERVAL) -a undeploy_by_label -u $(DB_USER) -p '$(DB_PASSWORD)' -d $(VDB_NAME)
+
 .PHONY: undeploy-operator
 undeploy-operator: ## Undeploy operator that was previously deployed
 	scripts/undeploy.sh $(if $(filter false,$(ignore-not-found)),,-i)
diff --git a/scripts/deploy-prometheus.sh b/scripts/deploy-prometheus.sh
index 59d7496b4..82fc740b4 100755
--- a/scripts/deploy-prometheus.sh
+++ b/scripts/deploy-prometheus.sh
@@ -141,7 +141,15 @@ function undeploy(){
   kubectl delete secret prometheus-$VDB_NAME -n $NAMESPACE
 }
 
- # ACTION deploy and undeploy
+function undeploy_by_label(){
+  # Delete the service monitor for prometheus service monitor.
+  kubectl delete servicemonitor -A -l release=$LABEL
+
+  # delete secret for prometheus service monitor.
+  kubectl delete secret -A -l release=$LABEL
+}
+
+# ACTION deploy, undeploy, undeploy_by_label
 case $ACTION in
     deploy) 
         echo "Running task: $ACTION"
@@ -151,6 +159,10 @@ case $ACTION in
         echo "Running task: $ACTION"
         undeploy
         ;;
+    undeploy_by_label) 
+        echo "Running task: $ACTION"
+        undeploy_by_label
+        ;;
     *) 
         echo "Invalid action: '$ACTION'"
         usage

From c82437dac9079d1f5185531766cca2870c24ffe3 Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Mon, 6 Jan 2025 07:50:47 +0000
Subject: [PATCH 30/33] address cr comments

---
 scripts/deploy-prometheus.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/deploy-prometheus.sh b/scripts/deploy-prometheus.sh
index 82fc740b4..d8195e69f 100755
--- a/scripts/deploy-prometheus.sh
+++ b/scripts/deploy-prometheus.sh
@@ -35,7 +35,7 @@ function usage() {
     echo "  -a <action>     The action to run in this script, deploy or undeploy."
     echo "  -u <username>   The database username, should have access to the Vertica server metrics."
     echo "  -p <password>   The database user password."
-    echo "  -d <vdbname>    The k8s CRD database name."
+    echo "  -d <vdbname>    The CR database name."
     echo "  -i <interval>   The scraping interval of prometheus update for metrics."
     echo "  -h <usage>      Print help message."
     exit 1

From 0c0e3c9b5c2fadb794eb0d169d30c7e40e66272e Mon Sep 17 00:00:00 2001
From: roypaulin <rnguetsopken@opentext.com>
Date: Mon, 6 Jan 2025 13:52:47 +0100
Subject: [PATCH 31/33] Address comments

---
 Makefile                                      |  8 +++--
 scripts/deploy-prometheus.sh                  | 16 +++++-----
 .../e2e-leg-11/prometheustest/05-assert.yaml  |  3 --
 .../e2e-leg-11/prometheustest/06-assert.yaml  | 29 +++++++++++++++++++
 .../prometheustest/06-wait-for-createdb.yaml  |  1 +
 .../e2e-leg-11/prometheustest/10-assert.yaml  | 10 +++----
 .../e2e-leg-11/prometheustest/15-assert.yaml  |  5 ++++
 .../prometheustest/90-delete-prometheus.yaml  |  1 -
 .../e2e-leg-11/prometheustest/90-errors.yaml  |  5 ++++
 .../setup-vdb/base/setup-vdb.yaml             |  1 -
 10 files changed, 59 insertions(+), 20 deletions(-)
 create mode 100644 tests/e2e-leg-11/prometheustest/06-assert.yaml
 create mode 100644 tests/e2e-leg-11/prometheustest/06-wait-for-createdb.yaml

diff --git a/Makefile b/Makefile
index 4b464e957..18c85691d 100644
--- a/Makefile
+++ b/Makefile
@@ -657,9 +657,13 @@ deploy-prometheus:
 	helm install $(DEPLOY_WAIT) -n $(PROMETHEUS_NAMESPACE) --create-namespace $(PROMETHEUS_HELM_NAME) $(PROMETHEUS_CHART) --values prometheus/values.yaml $(PROMETHEUS_HELM_OVERRIDES)
 
 .PHONY: undeploy-prometheus
-undeploy-prometheus:
+undeploy-prometheus: undeploy-prometheus-service-monitor-by-release
 	helm uninstall $(PROMETHEUS_HELM_NAME) -n $(PROMETHEUS_NAMESPACE)
 
+.PHONY: port-forward-prometheus
+port-forward-prometheus:  ## Expose the prometheus endpoint so that you can connect to it through http://localhost:9090
+	kubectl port-forward -n $(PROMETHEUS_NAMESPACE) svc/$(PROMETHEUS_HELM_NAME)-kube-prometheus-prometheus 9090
+
 .PHONY: deploy-prometheus-service-monitor
 deploy-prometheus-service-monitor:
 	scripts/deploy-prometheus.sh -n $(VDB_NAMESPACE) -l $(PROMETHEUS_HELM_NAME) -i $(PROMETHEUS_INTERVAL) -a deploy -u $(DB_USER) -p '$(DB_PASSWORD)' -d $(VDB_NAME)
@@ -670,7 +674,7 @@ undeploy-prometheus-service-monitor:
 
 .PHONY: undeploy-prometheus-service-monitor-by-release
 undeploy-prometheus-service-monitor-by-release:
-	scripts/deploy-prometheus.sh -n $(VDB_NAMESPACE) -l $(PROMETHEUS_HELM_NAME) -i $(PROMETHEUS_INTERVAL) -a undeploy_by_label -u $(DB_USER) -p '$(DB_PASSWORD)' -d $(VDB_NAME)
+	scripts/deploy-prometheus.sh -l $(PROMETHEUS_HELM_NAME) -a undeploy_by_release
 
 .PHONY: undeploy-operator
 undeploy-operator: ## Undeploy operator that was previously deployed
diff --git a/scripts/deploy-prometheus.sh b/scripts/deploy-prometheus.sh
index d8195e69f..32a362a07 100755
--- a/scripts/deploy-prometheus.sh
+++ b/scripts/deploy-prometheus.sh
@@ -135,21 +135,21 @@ EOF
 
 function undeploy(){
   # Delete the service monitor for prometheus service monitor.
-  kubectl delete servicemonitor k8s-vertica-prometheus-$VDB_NAME -n $NAMESPACE
+  kubectl delete servicemonitor k8s-vertica-prometheus-$VDB_NAME -n $NAMESPACE || :
 
   # delete secret for prometheus service monitor.
-  kubectl delete secret prometheus-$VDB_NAME -n $NAMESPACE
+  kubectl delete secret prometheus-$VDB_NAME -n $NAMESPACE || :
 }
 
-function undeploy_by_label(){
+function undeploy_by_release(){
   # Delete the service monitor for prometheus service monitor.
-  kubectl delete servicemonitor -A -l release=$LABEL
+  kubectl delete servicemonitor -A -l release=$LABEL || :
 
   # delete secret for prometheus service monitor.
-  kubectl delete secret -A -l release=$LABEL
+  kubectl delete secret -A -l release=$LABEL || :
 }
 
-# ACTION deploy, undeploy, undeploy_by_label
+# ACTION deploy, undeploy, undeploy_by_release
 case $ACTION in
     deploy) 
         echo "Running task: $ACTION"
@@ -159,9 +159,9 @@ case $ACTION in
         echo "Running task: $ACTION"
         undeploy
         ;;
-    undeploy_by_label) 
+    undeploy_by_release) 
         echo "Running task: $ACTION"
-        undeploy_by_label
+        undeploy_by_release
         ;;
     *) 
         echo "Invalid action: '$ACTION'"
diff --git a/tests/e2e-leg-11/prometheustest/05-assert.yaml b/tests/e2e-leg-11/prometheustest/05-assert.yaml
index cc38ec07c..3596a38f8 100644
--- a/tests/e2e-leg-11/prometheustest/05-assert.yaml
+++ b/tests/e2e-leg-11/prometheustest/05-assert.yaml
@@ -22,6 +22,3 @@ apiVersion: vertica.com/v1
 kind: VerticaDB
 metadata:
   name: v-prometheus
-spec:
-  subclusters:
-    - name: pri1
diff --git a/tests/e2e-leg-11/prometheustest/06-assert.yaml b/tests/e2e-leg-11/prometheustest/06-assert.yaml
new file mode 100644
index 000000000..7942cd613
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/06-assert.yaml
@@ -0,0 +1,29 @@
+# (c) Copyright [2021-2024] Open Text.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: v-prometheus-pri1
+status:
+  currentReplicas: 3
+  readyReplicas: 3
+---
+apiVersion: vertica.com/v1
+kind: VerticaDB
+metadata:
+  name: v-prometheus
+status:
+  subclusters:
+    - addedToDBCount: 3
+      upNodeCount: 3
diff --git a/tests/e2e-leg-11/prometheustest/06-wait-for-createdb.yaml b/tests/e2e-leg-11/prometheustest/06-wait-for-createdb.yaml
new file mode 100644
index 000000000..bf3726035
--- /dev/null
+++ b/tests/e2e-leg-11/prometheustest/06-wait-for-createdb.yaml
@@ -0,0 +1 @@
+# Intentionally empty to give this step a name in kuttl
\ No newline at end of file
diff --git a/tests/e2e-leg-11/prometheustest/10-assert.yaml b/tests/e2e-leg-11/prometheustest/10-assert.yaml
index a2e02d9a4..aacf9adba 100644
--- a/tests/e2e-leg-11/prometheustest/10-assert.yaml
+++ b/tests/e2e-leg-11/prometheustest/10-assert.yaml
@@ -11,13 +11,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-kind: Pod
+apiVersion: apps/v1
+kind: StatefulSet
 metadata:
-  labels:
-    app.kubernetes.io/name: prometheus
+  name: prometheus-prometheus-kube-prometheus-prometheus
 status:
-  phase: Running
+  replicas: 1
+  readyReplicas: 1
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/tests/e2e-leg-11/prometheustest/15-assert.yaml b/tests/e2e-leg-11/prometheustest/15-assert.yaml
index a80686d38..191cd6f51 100644
--- a/tests/e2e-leg-11/prometheustest/15-assert.yaml
+++ b/tests/e2e-leg-11/prometheustest/15-assert.yaml
@@ -11,6 +11,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+apiVersion: v1
+kind: Secret
+metadata:
+  name: prometheus-v-prometheus
+---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
diff --git a/tests/e2e-leg-11/prometheustest/90-delete-prometheus.yaml b/tests/e2e-leg-11/prometheustest/90-delete-prometheus.yaml
index 93fc2f368..09e979db8 100644
--- a/tests/e2e-leg-11/prometheustest/90-delete-prometheus.yaml
+++ b/tests/e2e-leg-11/prometheustest/90-delete-prometheus.yaml
@@ -14,5 +14,4 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - script: cd ../../.. && make undeploy-prometheus-service-monitor VDB_NAMESPACE=$NAMESPACE DB_USER=dbadmin DB_PASSWORD=topsecret VDB_NAME=v-prometheus
   - script: cd ../../.. && make undeploy-prometheus PROMETHEUS_NAMESPACE=$NAMESPACE
diff --git a/tests/e2e-leg-11/prometheustest/90-errors.yaml b/tests/e2e-leg-11/prometheustest/90-errors.yaml
index 678d2cd13..92bd9639d 100644
--- a/tests/e2e-leg-11/prometheustest/90-errors.yaml
+++ b/tests/e2e-leg-11/prometheustest/90-errors.yaml
@@ -11,6 +11,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+apiVersion: v1
+kind: Secret
+metadata:
+  name: prometheus-v-prometheus
+---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
diff --git a/tests/e2e-leg-11/prometheustest/setup-vdb/base/setup-vdb.yaml b/tests/e2e-leg-11/prometheustest/setup-vdb/base/setup-vdb.yaml
index ecd1b31cd..76aca605a 100644
--- a/tests/e2e-leg-11/prometheustest/setup-vdb/base/setup-vdb.yaml
+++ b/tests/e2e-leg-11/prometheustest/setup-vdb/base/setup-vdb.yaml
@@ -26,7 +26,6 @@ spec:
     requestSize: 250Mi
   imagePullPolicy: IfNotPresent
   passwordSecret: su-passwd
-
   # We pick a cluster size that is too big for the CE license. This relies on
   # having a license, which will be added by kustomize.
   subclusters:

From 133c9e4ab1081fe14defc88e30a89e3fb8c2d81a Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Mon, 6 Jan 2025 13:39:25 +0000
Subject: [PATCH 32/33] rename test folder

---
 .../{prometheustest => prometheus-sanity}/00-create-secrets.yaml  | 0
 .../{prometheustest => prometheus-sanity}/01-assert.yaml          | 0
 .../{prometheustest => prometheus-sanity}/01-deploy-operator.yaml | 0
 .../{prometheustest => prometheus-sanity}/02-assert.yaml          | 0
 .../e2e-leg-11/{prometheustest => prometheus-sanity}/02-rbac.yaml | 0
 .../{prometheustest => prometheus-sanity}/03-assert.yaml          | 0
 .../{prometheustest => prometheus-sanity}/03-password-secret.yaml | 0
 .../{prometheustest => prometheus-sanity}/05-assert.yaml          | 0
 .../{prometheustest => prometheus-sanity}/05-setup-vdb.yaml       | 0
 .../{prometheustest => prometheus-sanity}/10-assert.yaml          | 0
 .../10-deploy-prometheus.yaml                                     | 0
 .../{prometheustest => prometheus-sanity}/15-assert.yaml          | 0
 .../15-deploy-prometheus-service-monitor.yaml                     | 0
 .../20-wait-for-data-pull.yaml                                    | 0
 .../{prometheustest => prometheus-sanity}/25-assert.yaml          | 0
 .../25-verify-prometheus-metrics.yaml                             | 0
 .../90-delete-prometheus.yaml                                     | 0
 .../{prometheustest => prometheus-sanity}/90-errors.yaml          | 0
 .../{prometheustest => prometheus-sanity}/95-delete-cr.yaml       | 0
 .../{prometheustest => prometheus-sanity}/95-errors.yaml          | 0
 .../{prometheustest => prometheus-sanity}/96-assert.yaml          | 0
 .../{prometheustest => prometheus-sanity}/96-cleanup-storage.yaml | 0
 .../{prometheustest => prometheus-sanity}/96-errors.yaml          | 0
 .../{prometheustest => prometheus-sanity}/99-delete-ns.yaml       | 0
 .../setup-vdb/base/kustomization.yaml                             | 0
 .../setup-vdb/base/setup-vdb.yaml                                 | 0
 26 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/00-create-secrets.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/01-assert.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/01-deploy-operator.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/02-assert.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/02-rbac.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/03-assert.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/03-password-secret.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/05-assert.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/05-setup-vdb.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/10-assert.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/10-deploy-prometheus.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/15-assert.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/15-deploy-prometheus-service-monitor.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/20-wait-for-data-pull.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/25-assert.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/25-verify-prometheus-metrics.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/90-delete-prometheus.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/90-errors.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/95-delete-cr.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/95-errors.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/96-assert.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/96-cleanup-storage.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/96-errors.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/99-delete-ns.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/setup-vdb/base/kustomization.yaml (100%)
 rename tests/e2e-leg-11/{prometheustest => prometheus-sanity}/setup-vdb/base/setup-vdb.yaml (100%)

diff --git a/tests/e2e-leg-11/prometheustest/00-create-secrets.yaml b/tests/e2e-leg-11/prometheus-sanity/00-create-secrets.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/00-create-secrets.yaml
rename to tests/e2e-leg-11/prometheus-sanity/00-create-secrets.yaml
diff --git a/tests/e2e-leg-11/prometheustest/01-assert.yaml b/tests/e2e-leg-11/prometheus-sanity/01-assert.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/01-assert.yaml
rename to tests/e2e-leg-11/prometheus-sanity/01-assert.yaml
diff --git a/tests/e2e-leg-11/prometheustest/01-deploy-operator.yaml b/tests/e2e-leg-11/prometheus-sanity/01-deploy-operator.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/01-deploy-operator.yaml
rename to tests/e2e-leg-11/prometheus-sanity/01-deploy-operator.yaml
diff --git a/tests/e2e-leg-11/prometheustest/02-assert.yaml b/tests/e2e-leg-11/prometheus-sanity/02-assert.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/02-assert.yaml
rename to tests/e2e-leg-11/prometheus-sanity/02-assert.yaml
diff --git a/tests/e2e-leg-11/prometheustest/02-rbac.yaml b/tests/e2e-leg-11/prometheus-sanity/02-rbac.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/02-rbac.yaml
rename to tests/e2e-leg-11/prometheus-sanity/02-rbac.yaml
diff --git a/tests/e2e-leg-11/prometheustest/03-assert.yaml b/tests/e2e-leg-11/prometheus-sanity/03-assert.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/03-assert.yaml
rename to tests/e2e-leg-11/prometheus-sanity/03-assert.yaml
diff --git a/tests/e2e-leg-11/prometheustest/03-password-secret.yaml b/tests/e2e-leg-11/prometheus-sanity/03-password-secret.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/03-password-secret.yaml
rename to tests/e2e-leg-11/prometheus-sanity/03-password-secret.yaml
diff --git a/tests/e2e-leg-11/prometheustest/05-assert.yaml b/tests/e2e-leg-11/prometheus-sanity/05-assert.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/05-assert.yaml
rename to tests/e2e-leg-11/prometheus-sanity/05-assert.yaml
diff --git a/tests/e2e-leg-11/prometheustest/05-setup-vdb.yaml b/tests/e2e-leg-11/prometheus-sanity/05-setup-vdb.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/05-setup-vdb.yaml
rename to tests/e2e-leg-11/prometheus-sanity/05-setup-vdb.yaml
diff --git a/tests/e2e-leg-11/prometheustest/10-assert.yaml b/tests/e2e-leg-11/prometheus-sanity/10-assert.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/10-assert.yaml
rename to tests/e2e-leg-11/prometheus-sanity/10-assert.yaml
diff --git a/tests/e2e-leg-11/prometheustest/10-deploy-prometheus.yaml b/tests/e2e-leg-11/prometheus-sanity/10-deploy-prometheus.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/10-deploy-prometheus.yaml
rename to tests/e2e-leg-11/prometheus-sanity/10-deploy-prometheus.yaml
diff --git a/tests/e2e-leg-11/prometheustest/15-assert.yaml b/tests/e2e-leg-11/prometheus-sanity/15-assert.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/15-assert.yaml
rename to tests/e2e-leg-11/prometheus-sanity/15-assert.yaml
diff --git a/tests/e2e-leg-11/prometheustest/15-deploy-prometheus-service-monitor.yaml b/tests/e2e-leg-11/prometheus-sanity/15-deploy-prometheus-service-monitor.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/15-deploy-prometheus-service-monitor.yaml
rename to tests/e2e-leg-11/prometheus-sanity/15-deploy-prometheus-service-monitor.yaml
diff --git a/tests/e2e-leg-11/prometheustest/20-wait-for-data-pull.yaml b/tests/e2e-leg-11/prometheus-sanity/20-wait-for-data-pull.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/20-wait-for-data-pull.yaml
rename to tests/e2e-leg-11/prometheus-sanity/20-wait-for-data-pull.yaml
diff --git a/tests/e2e-leg-11/prometheustest/25-assert.yaml b/tests/e2e-leg-11/prometheus-sanity/25-assert.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/25-assert.yaml
rename to tests/e2e-leg-11/prometheus-sanity/25-assert.yaml
diff --git a/tests/e2e-leg-11/prometheustest/25-verify-prometheus-metrics.yaml b/tests/e2e-leg-11/prometheus-sanity/25-verify-prometheus-metrics.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/25-verify-prometheus-metrics.yaml
rename to tests/e2e-leg-11/prometheus-sanity/25-verify-prometheus-metrics.yaml
diff --git a/tests/e2e-leg-11/prometheustest/90-delete-prometheus.yaml b/tests/e2e-leg-11/prometheus-sanity/90-delete-prometheus.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/90-delete-prometheus.yaml
rename to tests/e2e-leg-11/prometheus-sanity/90-delete-prometheus.yaml
diff --git a/tests/e2e-leg-11/prometheustest/90-errors.yaml b/tests/e2e-leg-11/prometheus-sanity/90-errors.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/90-errors.yaml
rename to tests/e2e-leg-11/prometheus-sanity/90-errors.yaml
diff --git a/tests/e2e-leg-11/prometheustest/95-delete-cr.yaml b/tests/e2e-leg-11/prometheus-sanity/95-delete-cr.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/95-delete-cr.yaml
rename to tests/e2e-leg-11/prometheus-sanity/95-delete-cr.yaml
diff --git a/tests/e2e-leg-11/prometheustest/95-errors.yaml b/tests/e2e-leg-11/prometheus-sanity/95-errors.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/95-errors.yaml
rename to tests/e2e-leg-11/prometheus-sanity/95-errors.yaml
diff --git a/tests/e2e-leg-11/prometheustest/96-assert.yaml b/tests/e2e-leg-11/prometheus-sanity/96-assert.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/96-assert.yaml
rename to tests/e2e-leg-11/prometheus-sanity/96-assert.yaml
diff --git a/tests/e2e-leg-11/prometheustest/96-cleanup-storage.yaml b/tests/e2e-leg-11/prometheus-sanity/96-cleanup-storage.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/96-cleanup-storage.yaml
rename to tests/e2e-leg-11/prometheus-sanity/96-cleanup-storage.yaml
diff --git a/tests/e2e-leg-11/prometheustest/96-errors.yaml b/tests/e2e-leg-11/prometheus-sanity/96-errors.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/96-errors.yaml
rename to tests/e2e-leg-11/prometheus-sanity/96-errors.yaml
diff --git a/tests/e2e-leg-11/prometheustest/99-delete-ns.yaml b/tests/e2e-leg-11/prometheus-sanity/99-delete-ns.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/99-delete-ns.yaml
rename to tests/e2e-leg-11/prometheus-sanity/99-delete-ns.yaml
diff --git a/tests/e2e-leg-11/prometheustest/setup-vdb/base/kustomization.yaml b/tests/e2e-leg-11/prometheus-sanity/setup-vdb/base/kustomization.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/setup-vdb/base/kustomization.yaml
rename to tests/e2e-leg-11/prometheus-sanity/setup-vdb/base/kustomization.yaml
diff --git a/tests/e2e-leg-11/prometheustest/setup-vdb/base/setup-vdb.yaml b/tests/e2e-leg-11/prometheus-sanity/setup-vdb/base/setup-vdb.yaml
similarity index 100%
rename from tests/e2e-leg-11/prometheustest/setup-vdb/base/setup-vdb.yaml
rename to tests/e2e-leg-11/prometheus-sanity/setup-vdb/base/setup-vdb.yaml

From 094e3d4c99b0047e52be8752c1d664b6ad4a9dde Mon Sep 17 00:00:00 2001
From: Hao Yamg <hyang3@opentext.com>
Date: Mon, 6 Jan 2025 13:41:04 +0000
Subject: [PATCH 33/33] add comments

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 4b464e957..52462e10f 100644
--- a/Makefile
+++ b/Makefile
@@ -146,6 +146,7 @@ export OLM_CATALOG_IMG
 MINIMAL_VERTICA_IMG ?=
 # Name of the helm release that we will install/uninstall
 HELM_RELEASE_NAME?=vdb-op
+# Prometheus variables that we wil be used for deployment 
 PROMETHEUS_HELM_NAME?=prometheus
 PROMETHEUS_INTERVAL?=5s
 DB_USER?=dbadmin