Merge branch 'fixfiltermain' into 'main'

rjeberhard · rjeberhard · commit 879c26e50bb8 · 2025-03-26T17:51:22.000Z
Port forward changes from 4.2 for MonitoringExporterFiltering fix

See merge request weblogic-cloud/weblogic-kubernetes-operator!4923
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,4 +1,4 @@
-// Copyright (c) 2017, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2017, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 //
 def kind_k8s_map = [
@@ -168,7 +168,7 @@ pipeline {
         )
         string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',
                description: '',
-               defaultValue: '2.1.2'
+               defaultValue: '2.3.0'
         )
         string(name: 'PROMETHEUS_CHART_VERSION',
                description: '',
diff --git a/Jenkinsfile.armoke b/Jenkinsfile.armoke
@@ -1,4 +1,4 @@
-// Copyright (c) 2023,2024 Oracle and/or its affiliates.
+// Copyright (c) 2023, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 //
 
@@ -179,7 +179,7 @@ pipeline {
         )
         string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',
                description: '',
-               defaultValue: '2.1.3'
+               defaultValue: '2.3.0'
         )
         string(name: 'PROMETHEUS_CHART_VERSION',
                description: '',
diff --git a/Jenkinsfile.kindnightly b/Jenkinsfile.kindnightly
@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 //
 def kind_k8s_map = [
@@ -193,7 +193,7 @@ pipeline {
         )
         string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',
                description: '',
-               defaultValue: '2.1.2'
+               defaultValue: '2.3.0'
         )
         string(name: 'PROMETHEUS_CHART_VERSION',
                description: '',
diff --git a/Jenkinsfile.ocne b/Jenkinsfile.ocne
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, Oracle and/or its affiliates.
+// Copyright (c) 2023, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 //
 
@@ -181,7 +181,7 @@ pipeline {
         )
         string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',
                description: '',
-               defaultValue: '2.1.3'
+               defaultValue: '2.3.0'
         )
         string(name: 'PROMETHEUS_CHART_VERSION',
                description: '',
diff --git a/Jenkinsfile.ocne19 b/Jenkinsfile.ocne19
@@ -1,4 +1,4 @@
-// Copyright (c) 2024, Oracle and/or its affiliates.
+// Copyright (c) 2024, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 //
 
@@ -167,7 +167,7 @@ pipeline {
         )
         string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',
                description: '',
-               defaultValue: '2.1.3'
+               defaultValue: '2.3.0'
         )
         string(name: 'PROMETHEUS_CHART_VERSION',
                description: '',
diff --git a/Jenkinsfile.okd b/Jenkinsfile.okd
@@ -1,5 +1,5 @@
 
-// Copyright (c) 2024, Oracle and/or its affiliates.
+// Copyright (c) 2024, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 //
 
@@ -149,7 +149,7 @@ pipeline {
         )
         string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',
                description: '',
-               defaultValue: '2.1.3'
+               defaultValue: '2.3.0'
         )
         string(name: 'PROMETHEUS_CHART_VERSION',
                description: '',
diff --git a/Jenkinsfile.oke b/Jenkinsfile.oke
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2023, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 //
 
@@ -86,13 +86,13 @@ pipeline {
 
         string(name: 'OKE_KUBE_VERSION',
                description: 'kube version for oke cluster',
-               defaultValue: '1.30.1'
+               defaultValue: '1.31.1'
         )
         string(name: 'IMAGE_ID',
                        description: 'oci image id for node pool, find image OCID for your region from https://docs.oracle.com/iaas/images/',
                        //defaultValue OKE1.26.2: 'ocid1.image.oc1.phx.aaaaaaaaaizmtmozeudeeuq7o5ir7dkl2bkxbbb3tgomshqbqn6jpomrsjza'
                        //1.27.2 oke defaultValue: 'ocid1.image.oc1.phx.aaaaaaaaypr5r5drojwytghw6e6mvpjsscrnkuwtmqlmvmix7kjb2zcnc7wa'
-                       defaultValue: 'ocid1.image.oc1.phx.aaaaaaaahgrs3zcwrvutjtni557ttrt62uggseijsmqxacr7dym423uaokcq'
+                       defaultValue: 'ocid1.image.oc1.phx.aaaaaaaatkz7laillswel25edlbmq67ino2y2pv6xhp2lml2vzha44ao5gtq'
                        
                 )
         string(name: 'KUBECTL_VERSION',
@@ -196,7 +196,7 @@ pipeline {
         )
         string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',
                description: '',
-               defaultValue: '2.1.3'
+               defaultValue: '2.3.0'
         )
         string(name: 'PROMETHEUS_CHART_VERSION',
                description: '',
diff --git a/Jenkinsfile.podman b/Jenkinsfile.podman
@@ -1,4 +1,4 @@
-// Copyright (c) 2024, Oracle and/or its affiliates.
+// Copyright (c) 2024, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 //
 def kind_k8s_map = [
@@ -186,7 +186,7 @@ pipeline {
         )
         string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',
                description: '',
-               defaultValue: '2.1.2'
+               defaultValue: '2.3.0'
         )
         string(name: 'PROMETHEUS_CHART_VERSION',
                description: '',
diff --git a/Jenkinsfile.podman.upgrade b/Jenkinsfile.podman.upgrade
@@ -1,4 +1,4 @@
-// Copyright (c) 2024, Oracle and/or its affiliates.
+// Copyright (c) 2024, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 //
 def kind_k8s_map = [
@@ -185,7 +185,7 @@ pipeline {
         )
         string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',
                description: '',
-               defaultValue: '2.1.2'
+               defaultValue: '2.3.0'
         )
         string(name: 'PROMETHEUS_CHART_VERSION',
                description: '',
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMonitoringExporterMetricsFiltering.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMonitoringExporterMetricsFiltering.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2023, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
@@ -44,12 +44,14 @@
 import static oracle.weblogic.kubernetes.TestConstants.IT_MONITORINGEXPORTERMF_PROMETHEUS_HTTP_NODEPORT;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
 import static oracle.weblogic.kubernetes.TestConstants.KIND_CLUSTER;
+import static oracle.weblogic.kubernetes.TestConstants.MONITORING_EXPORTER_WEBAPP_VERSION;
 import static oracle.weblogic.kubernetes.TestConstants.OKD;
 import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER_PRIVATEIP;
 import static oracle.weblogic.kubernetes.TestConstants.PROMETHEUS_CHART_VERSION;
 import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
 import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTPS_HOSTPORT;
 import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_HOSTPORT;
+import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG;
 import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER;
 import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER_DEFAULT;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
@@ -72,6 +74,7 @@
 import static oracle.weblogic.kubernetes.utils.MonitoringUtils.installAndVerifyGrafana;
 import static oracle.weblogic.kubernetes.utils.MonitoringUtils.installAndVerifyPrometheus;
 import static oracle.weblogic.kubernetes.utils.MonitoringUtils.installMonitoringExporter;
+import static oracle.weblogic.kubernetes.utils.MonitoringUtils.replaceValueInFile;
 import static oracle.weblogic.kubernetes.utils.MonitoringUtils.uninstallPrometheusGrafana;
 import static oracle.weblogic.kubernetes.utils.MonitoringUtils.verifyMonExpAppAccess;
 import static oracle.weblogic.kubernetes.utils.OKDUtils.createRouteForOKD;
@@ -134,6 +137,7 @@ class ItMonitoringExporterMetricsFiltering {
   private static String grafanaReleaseName = "grafana" + releaseSuffix;
   private static  String monitoringExporterDir;
   private static String hostPortPrometheus = null;
+  private static String servletPath = "com.oracle.wls.exporter";
 
 
   /**
@@ -223,6 +227,13 @@ public void initAll(@Namespaces(4) List<String> namespaces) throws IOException {
     }
     assertDoesNotThrow(() -> setupDomainAndMonitoringTools(domain1Namespace, domain1Uid),
         "failed to setup domain and monitoring tools");
+    if (!isVersionAtLeast(MONITORING_EXPORTER_WEBAPP_VERSION, "2.3.0")) {
+      logger.info("Monitoting Exporter Version is less than 2.3.0");
+      servletPath = "com.oracle.wls.exporter.webapp";
+    } else {
+      servletPath = servletPath + ((WEBLOGIC_IMAGE_TAG.contains("14.1")
+          || WEBLOGIC_IMAGE_TAG.contains("12.")) ? ".javax" : ".jakarta");
+    }
   }
 
   /**
@@ -249,11 +260,19 @@ void testFilterIIncludedKeysFromTopLevel() throws Exception {
   void testFilterIIncludedKeysFromSubLevel() throws Exception {
     logger.info("Testing filtering only included specific app name in the metrics ");
     List<String> checkIncluded = new ArrayList<>();
-    checkIncluded.add("servletName=\"com.oracle.wls.exporter.webapp.ExporterServlet\"");
+    // Regular expression pattern to match servletName="ANYTHING.ExporterServlet"
+    String checkKey1 = "servletName=\"" + servletPath + ".ExporterServlet\"";
+    checkIncluded.add(checkKey1);
     List<String> checkExcluded = new ArrayList<>();
-    checkExcluded.add("servletName=\"com.oracle.wls.exporter.webapp.MainServlet\"");
-
-    replaceConfigurationWithFilter(RESOURCE_DIR + "/exporter/rest_filter_included_servlet_name.yaml",
+    // Regular expression pattern to match servletName="ANYTHING.ExporterServlet"
+    String checkKey2 = "servletName=\"" + servletPath + ".MainServlet\"";
+    checkExcluded.add(checkKey2);
+
+    String configurationFile = replaceValueInFile(
+        "ItMonitoringExporterMetricsFiltering/testFilterIIncludedKeysFromSubLevel",
+        "rest_filter_included_servlet_name.yaml",
+        "com.oracle.wls.exporter.webapp", servletPath);
+    replaceConfigurationWithFilter(configurationFile,
         checkIncluded, checkExcluded);
   }
 
@@ -266,13 +285,19 @@ void testFilterIIncludedKeysFromSubLevel() throws Exception {
   void testFilterIIncludedKeysFromBothLevels() throws Exception {
     logger.info("Testing filtering only included specific app name in the metrics ");
     List<String> checkIncluded = new ArrayList<>();
-    checkIncluded.add("servletName=\"com.oracle.wls.exporter.webapp.ExporterServlet\"");
+    String checkKey1 = "servletName=\"" + servletPath + ".ExporterServlet\"";
+    checkIncluded.add(checkKey1);
     checkIncluded.add("app=\"wls-exporter\"");
     List<String> checkExcluded = new ArrayList<>();
-    checkExcluded.add("servletName=\"com.oracle.wls.exporter.webapp.MainServlet\"");
+    String checkKey2 = "servletName=\"" + servletPath + ".MainServlet\"";
+    checkExcluded.add(checkKey2);
     checkExcluded.add("app=\"myear1\"");
-    replaceConfigurationWithFilter(RESOURCE_DIR
-        + "/exporter/rest_filter_included_webapp_and_servlet_names.yaml",checkIncluded, checkExcluded);
+    String configurationFile = replaceValueInFile(
+        "ItMonitoringExporterMetricsFiltering/testFilterIIncludedKeysFromBothLevels",
+        "rest_filter_included_webapp_and_servlet_names.yaml",
+        "com.oracle.wls.exporter.webapp", servletPath);
+    replaceConfigurationWithFilter(configurationFile,
+        checkIncluded, checkExcluded);
   }
 
   /**
@@ -299,11 +324,16 @@ void testFilterExcludedKeysFromTopLevel() throws Exception {
   void testFilterExcludedKeysFromSubLevel() throws Exception {
     logger.info("Testing filtering only excluded specific app name in the metrics ");
     List<String> checkIncluded = new ArrayList<>();
-    checkIncluded.add("servletName=\"com.oracle.wls.exporter.webapp.MainServlet\"");
+    String checkKey1 = "servletName=\"" + servletPath + ".MainServlet\"";
+    checkIncluded.add(checkKey1);
     List<String> checkExcluded = new ArrayList<>();
-    checkExcluded.add("servletName=\"com.oracle.wls.exporter.webapp.ExporterServlet\"");
-
-    replaceConfigurationWithFilter(RESOURCE_DIR + "/exporter/rest_filter_excluded_servlet_name.yaml",
+    String checkKey2 = "servletName=\"" + servletPath + ".ExporterServlet\"";
+    checkExcluded.add(checkKey2);
+    String configurationFile = replaceValueInFile(
+        "ItMonitoringExporterMetricsFiltering/testFilterExcludedKeysFromSubLevel",
+        "rest_filter_excluded_servlet_name.yaml",
+        "com.oracle.wls.exporter.webapp", servletPath);
+    replaceConfigurationWithFilter(configurationFile,
         checkIncluded, checkExcluded);
   }
 
@@ -316,13 +346,19 @@ void testFilterExcludedKeysFromSubLevel() throws Exception {
   void testFilterExcludedKeysFromBothLevels() throws Exception {
     logger.info("Testing filtering only excluded specific app name in the metrics ");
     List<String> checkIncluded = new ArrayList<>();
-    checkIncluded.add("servletName=\"com.oracle.wls.exporter.webapp.ExporterServlet\"");
+    String checkKey1 = "servletName=\"" + servletPath + ".ExporterServlet\"";
+    checkIncluded.add(checkKey1);
     checkIncluded.add("app=\"myear1\"");
     List<String> checkExcluded = new ArrayList<>();
-    checkExcluded.add("servletName=\"com.oracle.wls.exporter.webapp.MainServlet\"");
+    String checkKey2 = "servletName=\"" + servletPath + ".MainServlet\"";
+    checkExcluded.add(checkKey2);
     checkExcluded.add("app=\"myear123\"");
-    replaceConfigurationWithFilter(RESOURCE_DIR
-        + "/exporter/rest_filter_excluded_webapp_and_servlet_names.yaml",checkIncluded, checkExcluded);
+    String configurationFile = replaceValueInFile(
+        "ItMonitoringExporterMetricsFiltering/testFilterExcludedKeysFromBothLevels",
+        "rest_filter_excluded_webapp_and_servlet_names.yaml",
+        "com.oracle.wls.exporter.webapp", servletPath);
+    replaceConfigurationWithFilter(configurationFile,
+        checkIncluded, checkExcluded);
   }
 
   /**
@@ -336,9 +372,13 @@ void testFilterIncludedTopExcludedKeysSubLevels() throws Exception {
     List<String> checkIncluded = new ArrayList<>();
     checkIncluded.add("app=\"wls-exporter\"");
     List<String> checkExcluded = new ArrayList<>();
-    checkExcluded.add("servletName=\"com.oracle.wls.exporter.webapp.ExporterServlet\"");
-    replaceConfigurationWithFilter(RESOURCE_DIR
-        + "/exporter/rest_filter_included_webapp_excluded_servlet_name.yaml",checkIncluded, checkExcluded);
+    checkExcluded.add("servletName=\"" + servletPath + ".ExporterServlet\"");
+    String configurationFile = replaceValueInFile(
+        "ItMonitoringExporterMetricsFiltering/testFilterIncludedTopExcludedKeysSubLevels",
+        "rest_filter_included_webapp_excluded_servlet_name.yaml",
+        "com.oracle.wls.exporter.webapp", servletPath);
+    replaceConfigurationWithFilter(configurationFile,
+        checkIncluded, checkExcluded);
   }
 
   /**
@@ -368,17 +408,21 @@ void testFilterIncludedExcludedKeysComboTopLevel() throws Exception {
   void testFilterIncludedExcludedKeysComboSubLevel() throws Exception {
     logger.info("Testing filtering included and excluded specific app names in the metrics ");
     List<String> checkIncluded = new ArrayList<>();
-    checkIncluded.add("servletName=\"com.oracle.wls.exporter.webapp");
+    checkIncluded.add("servletName=\"" + servletPath);
     List<String> checkExcluded = new ArrayList<>();
-    checkExcluded.add("servletName=\"com.oracle.wls.exporter.webapp.ExporterServlet\"");
-    replaceConfigurationWithFilter(RESOURCE_DIR
-        + "/exporter/rest_filter_included_excluded_servlet_name.yaml",checkIncluded, checkExcluded);
+    checkExcluded.add("servletName=\"" + servletPath + ".ExporterServlet\"");
+    String configurationFile = replaceValueInFile(
+        "ItMonitoringExporterMetricsFiltering/testFilterIncludedExcludedKeysComboSubLevel",
+        "rest_filter_included_excluded_servlet_name.yaml",
+        "com.oracle.wls.exporter.webapp", servletPath);
+    replaceConfigurationWithFilter(configurationFile,
+        checkIncluded, checkExcluded);
   }
 
   /**
-   * Check filtering functionality of monitoring exporter for
-   * not existed includedKeyValues .
-   */
+     * Check filtering functionality of monitoring exporter for
+     * not existed includedKeyValues .
+  */
   @Test
   @DisplayName("Test Filtering of the Metrics with includedKeyValues for not existed key of Monitoring Exporter on "
       + " top level.")
@@ -728,17 +772,19 @@ private void replaceConfigurationWithFilter(String configurationFile,
   }
 
   private static void verifyMetrics(List<String> checkIncluded, List<String> checkExcluded) {
+    boolean isRegexInc = false;
+    boolean isRegexExc = false;
     for (String includedString : checkIncluded) {
       assertTrue(verifyMonExpAppAccess("wls-exporter/metrics",
-              includedString,
+              includedString, isRegexInc,
               domain1Uid,
               domain1Namespace,
               false, cluster1Name),
           "monitoring exporter metrics can't filter to included " + includedString);
     }
     for (String excludedString : checkExcluded) {
       assertFalse(verifyMonExpAppAccess("wls-exporter/metrics",
-              excludedString,
+              excludedString, isRegexExc,
               domain1Uid,
               domain1Namespace,
               false, cluster1Name),
@@ -781,5 +827,22 @@ private int getTraefikLbNodePort(boolean isHttps) {
         -> getServiceNodePort(traefikNamespace, traefikHelmParams.getReleaseName(), isHttps ? "websecure" : "web"),
         "Getting web node port for Traefik loadbalancer failed");
   }
+
+  private static boolean isVersionAtLeast(String version, String minVersion) {
+    String[] versionParts = version.split("\\.");
+    String[] minVersionParts = minVersion.split("\\.");
+
+    for (int i = 0; i < 3; i++) {
+      int verPart = Integer.parseInt(versionParts[i]); // Convert to integer
+      int minVPart = Integer.parseInt(minVersionParts[i]);
+
+      if (verPart > minVPart) {
+        return true;
+      } else if (verPart < minVPart) {
+        return false;
+      }
+    }
+    return true; // Versions are equal
+  }
 }
 
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java
@@ -305,7 +305,7 @@ public interface TestConstants {
 
   //monitoring constants
   public static final String MONITORING_EXPORTER_WEBAPP_VERSION =
-      getNonEmptySystemProperty("wko.it.monitoring.exporter.webapp.version", "2.1.3");
+      getNonEmptySystemProperty("wko.it.monitoring.exporter.webapp.version", "2.3.0");
   public static final String MONITORING_EXPORTER_BRANCH =
       getNonEmptySystemProperty("wko.it.monitoring.exporter.branch", "main");
   public static final String PROMETHEUS_CHART_VERSION =
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/MonitoringUtils.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/MonitoringUtils.java
diff --git a/integration-tests/src/test/resources/oke/terraform/okemodule/oke.create.sh b/integration-tests/src/test/resources/oke/terraform/okemodule/oke.create.sh
diff --git a/integration-tests/src/test/resources/oke/terraform/okemodule/oke.delete.sh b/integration-tests/src/test/resources/oke/terraform/okemodule/oke.delete.sh

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2017, 2024, Oracle and/or its affiliates.`
	`1`	`+// Copyright (c) 2017, 2025, Oracle and/or its affiliates.`
`2`	`2`	`// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.`
`3`	`3`	`//`
`4`	`4`	`def kind_k8s_map = [`
`@@ -168,7 +168,7 @@ pipeline {`
`168`	`168`	`)`
`169`	`169`	`string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',`
`170`	`170`	`description: '',`
`171`		`- defaultValue: '2.1.2'`
	`171`	`+ defaultValue: '2.3.0'`
`172`	`172`	`)`
`173`	`173`	`string(name: 'PROMETHEUS_CHART_VERSION',`
`174`	`174`	`description: '',`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2023,2024 Oracle and/or its affiliates.`
	`1`	`+// Copyright (c) 2023, 2025, Oracle and/or its affiliates.`
`2`	`2`	`// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.`
`3`	`3`	`//`
`4`	`4`
`@@ -179,7 +179,7 @@ pipeline {`
`179`	`179`	`)`
`180`	`180`	`string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',`
`181`	`181`	`description: '',`
`182`		`- defaultValue: '2.1.3'`
	`182`	`+ defaultValue: '2.3.0'`
`183`	`183`	`)`
`184`	`184`	`string(name: 'PROMETHEUS_CHART_VERSION',`
`185`	`185`	`description: '',`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2022, 2024, Oracle and/or its affiliates.`
	`1`	`+// Copyright (c) 2022, 2025, Oracle and/or its affiliates.`
`2`	`2`	`// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.`
`3`	`3`	`//`
`4`	`4`	`def kind_k8s_map = [`
`@@ -193,7 +193,7 @@ pipeline {`
`193`	`193`	`)`
`194`	`194`	`string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',`
`195`	`195`	`description: '',`
`196`		`- defaultValue: '2.1.2'`
	`196`	`+ defaultValue: '2.3.0'`
`197`	`197`	`)`
`198`	`198`	`string(name: 'PROMETHEUS_CHART_VERSION',`
`199`	`199`	`description: '',`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2023, Oracle and/or its affiliates.`
	`1`	`+// Copyright (c) 2023, 2025, Oracle and/or its affiliates.`
`2`	`2`	`// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.`
`3`	`3`	`//`
`4`	`4`
`@@ -181,7 +181,7 @@ pipeline {`
`181`	`181`	`)`
`182`	`182`	`string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',`
`183`	`183`	`description: '',`
`184`		`- defaultValue: '2.1.3'`
	`184`	`+ defaultValue: '2.3.0'`
`185`	`185`	`)`
`186`	`186`	`string(name: 'PROMETHEUS_CHART_VERSION',`
`187`	`187`	`description: '',`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2024, Oracle and/or its affiliates.`
	`1`	`+// Copyright (c) 2024, 2025, Oracle and/or its affiliates.`
`2`	`2`	`// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.`
`3`	`3`	`//`
`4`	`4`
`@@ -167,7 +167,7 @@ pipeline {`
`167`	`167`	`)`
`168`	`168`	`string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',`
`169`	`169`	`description: '',`
`170`		`- defaultValue: '2.1.3'`
	`170`	`+ defaultValue: '2.3.0'`
`171`	`171`	`)`
`172`	`172`	`string(name: 'PROMETHEUS_CHART_VERSION',`
`173`	`173`	`description: '',`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-// Copyright (c) 2024, Oracle and/or its affiliates.`
	`2`	`+// Copyright (c) 2024, 2025, Oracle and/or its affiliates.`
`3`	`3`	`// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.`
`4`	`4`	`//`
`5`	`5`
`@@ -149,7 +149,7 @@ pipeline {`
`149`	`149`	`)`
`150`	`150`	`string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',`
`151`	`151`	`description: '',`
`152`		`- defaultValue: '2.1.3'`
	`152`	`+ defaultValue: '2.3.0'`
`153`	`153`	`)`
`154`	`154`	`string(name: 'PROMETHEUS_CHART_VERSION',`
`155`	`155`	`description: '',`