[DO NOT MERGE] Dependency update

ambari-metrics-common/pom.xml

@@ -93,7 +93,7 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.4</version>
+      <version>2.14.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>

ambari-metrics-grafana/conf/unix/ams-grafana.ini

@@ -151,6 +151,9 @@ static_root_path = /usr/lib/ambari-metrics-grafana/public
 # data source proxy whitelist (ip_or_domain:port seperated by spaces)
 ;data_source_proxy_whitelist =
 
+# Controls if old angular plugins are supported or not.
+angular_support_enabled = true
+
 [snapshots]
 # snapshot sharing options
 ;external_enabled = true

ambari-metrics-hadoop-sink/pom.xml

@@ -129,9 +129,9 @@ limitations under the License.
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.2.2</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+      <version>4.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

ambari-metrics-host-monitoring/src/main/python/core/controller.py

@@ -22,13 +22,13 @@
 import threading
 from queue import Queue
 from threading import Timer
-from resource_monitoring.core.application_metric_map import ApplicationMetricMap
-from resource_monitoring.core.event_definition import HostMetricCollectEvent, ProcessMetricCollectEvent
-from resource_monitoring.core.metric_collector import MetricsCollector
-from resource_monitoring.core.emitter import Emitter
-from resource_monitoring.core.host_info import HostInfo
-from resource_monitoring.core.aggregator import Aggregator
-from resource_monitoring.core.aggregator import AggregatorWatchdog
+from core.application_metric_map import ApplicationMetricMap
+from core.event_definition import HostMetricCollectEvent, ProcessMetricCollectEvent
+from core.metric_collector import MetricsCollector
+from core.emitter import Emitter
+from core.host_info import HostInfo
+from core.aggregator import Aggregator
+from core.aggregator import AggregatorWatchdog
 
 
 logger = logging.getLogger()

ambari-metrics-host-monitoring/src/main/python/core/emitter.py

@@ -21,10 +21,10 @@
 import logging
 import threading
 
-from resource_monitoring.core.security import CachedHTTPSConnection, CachedHTTPConnection
-from resource_monitoring.core.blacklisted_set import BlacklistedSet
-from resource_monitoring.core.config_reader import ROUND_ROBIN_FAILOVER_STRATEGY
-from resource_monitoring.core.spnego_kerberos_auth import SPNEGOKerberosAuth
+from core.security import CachedHTTPSConnection, CachedHTTPConnection
+from core.blacklisted_set import BlacklistedSet
+from core.config_reader import ROUND_ROBIN_FAILOVER_STRATEGY
+from core.spnego_kerberos_auth import SPNEGOKerberosAuth
 
 logger = logging.getLogger()
 

ambari-metrics-host-monitoring/src/main/python/core/metering.py

@@ -21,7 +21,7 @@
 import logging
 import time
 import json
-from resource_monitoring.core.instance_type_provider import HostInstanceTypeProvider
+from core.instance_type_provider import HostInstanceTypeProvider
 
 logger = logging.getLogger()
 

ambari-metrics-host-monitoring/src/main/python/core/metric_collector.py

@@ -20,8 +20,8 @@
 
 import logging
 from time import time
-from resource_monitoring.core.event_definition import HostMetricCollectEvent, ProcessMetricCollectEvent
-from resource_monitoring.core.metering import MeteringMetricHandler
+from core.event_definition import HostMetricCollectEvent, ProcessMetricCollectEvent
+from core.metering import MeteringMetricHandler
 
 logger = logging.getLogger()
 

ambari-metrics-host-monitoring/src/main/python/core/spnego_kerberos_auth.py

@@ -26,7 +26,7 @@
 try:
   import kerberos
 except ImportError:
-  from resource_monitoring.core import krberr as kerberos
+  from core import krberr as kerberos
   logger.warn('import kerberos exception: %s' % str(ImportError))
 pass
 

ambari-metrics-host-monitoring/src/main/python/main.py

@@ -28,9 +28,9 @@
 parent_dir = os.path.dirname(current_dir)
 sys.path.append(parent_dir)
 
-from resource_monitoring.core.config_reader import Configuration, PID_OUT_FILE
-from resource_monitoring.core.stop_handler import bind_signal_handlers
-from resource_monitoring.core.controller import Controller
+from core.config_reader import Configuration, PID_OUT_FILE
+from core.stop_handler import bind_signal_handlers
+from core.controller import Controller
 
 logger = logging.getLogger()
 

ambari-metrics-host-monitoring/src/test/python/core/TestEmitter.py

@@ -25,9 +25,9 @@
 
 from unittest import TestCase
 from mock.mock import patch, MagicMock
-from security import CachedHTTPConnection
-from blacklisted_set import BlacklistedSet
-from spnego_kerberos_auth import SPNEGOKerberosAuth
+from core.security import CachedHTTPConnection
+from core.blacklisted_set import BlacklistedSet
+from core.spnego_kerberos_auth import SPNEGOKerberosAuth
 
 os_distro_value = ('Suse','11','Final')
 

ambari-metrics-host-monitoring/src/test/python/core/TestHostInfo.py

@@ -21,7 +21,7 @@
 import collections
 import logging
 import platform
-from host_info import HostInfo
+from core.host_info import HostInfo
 from mock.mock import patch, MagicMock
 from unittest import TestCase
 

ambari-metrics-timelineservice/pom.xml

@@ -269,7 +269,7 @@
     <dependency>
       <groupId>org.apache.helix</groupId>
       <artifactId>helix-core</artifactId>
-      <version>0.6.6</version>
+      <version>1.3.0</version>
       <exclusions>
         <!-- zkclient is helix-core dependency but it need to be 0.9 in order for AMS HA to work on secure cluster-->
         <exclusion>
@@ -391,6 +391,14 @@
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-databind</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>commons-collections</groupId>
+          <artifactId>commons-collections</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-collections4</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -513,7 +521,7 @@
     <dependency>
       <groupId>org.codehaus.jettison</groupId>
       <artifactId>jettison</artifactId>
-      <version>1.1</version>
+      <version>1.5.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
@@ -700,9 +708,9 @@
     </dependency>
 
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.2.2</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+      <version>4.4</version>
     </dependency>
 
     <dependency>
@@ -823,7 +831,7 @@
     <dependency>
       <groupId>org.apache.ignite</groupId>
       <artifactId>ignite-core</artifactId>
-      <version>2.15.0</version>
+      <version>2.16.0</version>
       <exclusions>
         <exclusion>
           <artifactId>ignite-shmem</artifactId>

ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/HBaseTimelineMetricsService.java

@@ -52,8 +52,8 @@
 import org.apache.ambari.metrics.core.timeline.query.ConditionBuilder;
 import org.apache.ambari.metrics.core.timeline.query.PhoenixTransactSQL;
 import org.apache.ambari.metrics.core.timeline.query.TopNCondition;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/PhoenixHBaseAccessor.java

@@ -128,7 +128,7 @@
 import org.apache.ambari.metrics.core.timeline.sink.ExternalSinkProvider;
 import org.apache.ambari.metrics.core.timeline.source.InternalMetricsSource;
 import org.apache.ambari.metrics.core.timeline.source.InternalSourceProvider;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;

ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/TimelineMetricsFilter.java

@@ -30,7 +30,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/AbstractTimelineAggregator.java

@@ -37,7 +37,7 @@
 import org.apache.ambari.metrics.core.timeline.availability.MetricCollectorHAController;
 import org.apache.ambari.metrics.core.timeline.query.Condition;
 import org.apache.ambari.metrics.core.timeline.query.EmptyCondition;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.conf.Configuration;

ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/AggregatorUtils.java

@@ -25,7 +25,7 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/v2/TimelineMetricFilteringHostAggregator.java

@@ -26,7 +26,7 @@
 
 import org.apache.ambari.metrics.core.timeline.availability.MetricCollectorHAController;
 import org.apache.ambari.metrics.core.timeline.query.EmptyCondition;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.ambari.metrics.core.timeline.PhoenixHBaseAccessor;
 import org.apache.ambari.metrics.core.timeline.availability.AggregationTaskRunner;

ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/discovery/TimelineMetricMetadataManager.java

@@ -46,8 +46,8 @@
 import org.apache.ambari.metrics.core.timeline.uuid.MetricUuidGenStrategy;
 import org.apache.ambari.metrics.core.timeline.uuid.Murmur3HashUuidGenStrategy;
 import org.apache.ambari.metrics.core.timeline.uuid.TimelineMetricUuid;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;

ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/query/ConditionBuilder.java

@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.hadoop.metrics2.sink.timeline.Precision;
 import org.apache.ambari.metrics.core.timeline.aggregators.Function;
 

ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/query/DefaultCondition.java

@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.metrics2.sink.timeline.Precision;

ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/query/MetadataQueryCondition.java

@@ -21,7 +21,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 
 public class MetadataQueryCondition extends TransientMetricCondition {

ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/query/PhoenixTransactSQL.java

@@ -25,7 +25,7 @@
 import java.util.regex.Pattern;
 
 import org.apache.ambari.metrics.core.timeline.TimelineMetricConfiguration;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.metrics2.sink.timeline.Precision;

ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/query/TopNCondition.java

@@ -20,7 +20,7 @@
 import java.util.List;
 
 import org.apache.ambari.metrics.core.timeline.aggregators.Function;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.metrics2.sink.timeline.Precision;

ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/query/TransientMetricCondition.java

@@ -18,7 +18,7 @@
 
 package org.apache.ambari.metrics.core.timeline.query;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.hadoop.metrics2.sink.timeline.Precision;
 
 import java.util.ArrayList;

ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/webapp/TimelineWebServices.java

@@ -49,7 +49,7 @@
 import javax.xml.bind.annotation.XmlRootElement;
 
 import org.apache.ambari.metrics.core.timeline.TimelineMetricServiceSummary;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Public;

ambari-metrics-timelineservice/src/test/java/org/apache/ambari/metrics/core/timeline/query/DefaultConditionTest.java

@@ -19,7 +19,7 @@
 package org.apache.ambari.metrics.core.timeline.query;
 
 import junit.framework.Assert;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.junit.Ignore;
 import org.junit.Test;
 

pom.xml

@@ -49,8 +49,8 @@
     <hadoop.tar>http://repo.bigtop.apache.org.s3.amazonaws.com/bigtop-stack-binary/3.2.0/centos-7/x86_64/hadoop-3.3.4.tar.gz</hadoop.tar>
     <hadoop.folder>hadoop-3.3.4</hadoop.folder>
     <hadoop.version>3.3.4</hadoop.version>
-    <grafana.folder>grafana-v11.1.4</grafana.folder>
-    <grafana.tar>https://dl.grafana.com/oss/release/grafana-11.1.4.linux-amd64.tar.gz</grafana.tar>
+    <grafana.folder>grafana-v11.5.2</grafana.folder>
+    <grafana.tar>https://dl.grafana.com/oss/release/grafana-11.5.2.linux-amd64.tar.gz</grafana.tar>
     <phoenix.tar>http://repo.bigtop.apache.org.s3.amazonaws.com/bigtop-stack-binary/3.2.0/centos-7/x86_64/phoenix-hbase-2.4-5.1.2-bin.tar.gz</phoenix.tar>
     <phoenix.folder>phoenix-hbase-2.4-5.1.2-bin</phoenix.folder>
     <resmonitor.install.dir>/usr/lib/python3.9/site-packages/resource_monitoring</resmonitor.install.dir>