Merge remote-tracking branch 'origin/release-31.x' into develop

.circleci/main/commands/executions/run-smoke-tests.yml

@@ -52,7 +52,7 @@ commands:
             find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} ~/test-results/junit/ \;
             find . -type f -regex ".*/target/failsafe-reports/.*xml" -exec cp {} ~/test-results/junit/ \;
             mkdir -p ~/test-artifacts/recordings
-            cp -R ~/project/smoke-test/target/*.flv ~/test-artifacts/recordings || true
+            cp -R ~/project/smoke-test/target/*.{flv,mp4} ~/test-artifacts/recordings || true
             cp -R ~/project/smoke-test/target/screenshots ~/test-artifacts/ || true
             cp -R ~/project/smoke-test/target/logs ~/test-artifacts/ || true
       - store_test_results:

core/web-assets/ci.js

@@ -32,10 +32,6 @@ if (!fs.existsSync(touchfile)
 if (doUpdate) {
   console.info('node_modules is potentially out of date compared to package-lock.json');
 
-  const cache_cleanup_child = child_process.execFile(path.join(__dirname, 'target', 'node', 'npm'), ['cache', 'clean', '--force']);
-  cache_cleanup_child.stdout.pipe(process.stdout);
-  cache_cleanup_child.stderr.pipe(process.stderr);
-
   const child = child_process.execFile(path.join(__dirname, 'target', 'node', 'npm'), [ '--prefer-offline', '--no-progress', 'ci' ]);
   child.stdout.pipe(process.stdout);
   child.stderr.pipe(process.stderr);

core/web-assets/package.json

@@ -69,7 +69,6 @@
         "ts-jest": "^24.3.0",
         "typescript": "^4.5.5",
         "webpack": "^4.46.0",
-        "webpack-bundle-analyzer": "^4.7.0",
         "webpack-cli": "^3.3.12",
         "yargs": "^16.2.0"
     },

core/web-assets/webpack.config.js

@@ -9,7 +9,6 @@ var fs = require('fs');
 const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
 
 var AssetsPlugin = require('assets-webpack-plugin');
-var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 var CopyWebpackPlugin = require('copy-webpack-plugin');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
 var StringReplacePlugin = require('string-replace-webpack-plugin');
@@ -229,7 +228,8 @@ var config = {
   entry: allEntries,
   output: {
     path: distdir,
-    libraryTarget: 'umd'
+    libraryTarget: 'umd',
+    hashFunction: 'sha256',
   },
   target: 'web',
   module: {
@@ -547,8 +547,6 @@ function createConfig(options) {
         compress: true
       }
     }));
-  } else {
-    //myconf.plugins.push(new BundleAnalyzerPlugin());
   }
 
   myconf.plugins.push(new AssetsPlugin({

debian/control

@@ -7,7 +7,7 @@ Standards-Version: 3.7.3
 
 Package: opennms
 Architecture: all
-Depends: opennms-common (=${binary:Version}), opennms-db (=${binary:Version}), opennms-server (=${binary:Version}), opennms-webapp-jetty (=${binary:Version})
+Depends: opennms-common (=${binary:Version}), opennms-db (=${binary:Version}), opennms-server (=${binary:Version}), opennms-webapp-jetty (=${binary:Version}), opennms-plugin-cloud (>= 1.0.0)
 Recommends: opennms-source (=${binary:Version}), openjdk-11-jdk-headless | openjdk-11-jdk | adoptopenjdk-11-openj9xl | adoptopenjdk-11-openj9 | adoptopenjdk-11-hotspot | java11-jdk | temurin-11-jdk
 Suggests: opennms-doc
 Description: Enterprise-grade Open-source Network Management Platform (Full Install)
@@ -123,6 +123,7 @@ Depends: ${perl:Depends}, libdbi-perl, libdbd-pg-perl
 Recommends: libnet-snmp-perl, libxml2-utils, libwww-perl, libxml-twig-perl
 Conflicts: opennms-plugin-protocol-dhcp (<<${binary:Version}), opennms-plugin-protocol-xml (<<${binary:Version})
 Replaces: opennms-plugin-protocol-dhcp (<<${binary:Version}), opennms-plugin-protocol-xml (<<${binary:Version})
+Provides: opennms-plugin-api (= OPA_VERSION)
 Description: Enterprise-grade Open-source Network Management Platform (Common Files)
  OpenNMS is an enterprise-grade network management system written in Java.
  .
@@ -443,4 +444,3 @@ Description: Enterprise-grade Open-source Network Management Platform (RT Ticket
  events (such as SNMP traps), and generates notices via email, pager, SMS, etc.
  .
  This package provides support for opening RT tickets from OpenNMS alarms.
-

docs/modules/deployment/nav.adoc

@@ -27,6 +27,7 @@
 ** xref:time-series-storage/timeseries/ts-integration-layer.adoc[]
 *** xref:time-series-storage/timeseries/configuration.adoc[]
 ** xref:time-series-storage/timeseries/cortex.adoc[]
+** xref:time-series-storage/timeseries/hosted-tss.adoc[]
 
 * xref:opentracing/jaeger-tracing.adoc[]
 

docs/modules/deployment/pages/core/getting-started.adoc

@@ -13,10 +13,10 @@ This section explains how to install and configure a new {page-component-title}
 NOTE: The default configuration is not optimized to run in production or monitor large networks.
 
 ifeval::["{page-component-title}" == "Horizon"]
-** By default, your time series storage is JRobin, which persists RRD files on the local file system.
+** By default, your time series database is JRobin, which persists RRD files on the local file system.
 endif::[]
 ifeval::["{page-component-title}" == "Meridian"]
-** By default, your time series storage is RRDtool, which persists RRD files on the local file system.
+** By default, your time series database is RRDtool, which persists RRD files on the local file system.
 endif::[]
 * Log in to the web UI and change the default admin password.
 

docs/modules/deployment/pages/time-series-storage/newts/introduction.adoc

@@ -3,7 +3,7 @@
 = Newts
 
 link:http://newts.io/[Newts] is a time series data schema for link:http://cassandra.apache.org/[Apache Cassandra].
-It enables link:https://en.wikipedia.org/wiki/Scalability#Horizontal[horizontal scaling] for your time series storage and is an alternative to link:https://github.com/OpenNMS/jrobin[JRobin] and link:http://oss.oetiker.ch/rrdtool/[RRDtool].
+It enables link:https://en.wikipedia.org/wiki/Scalability#Horizontal[horizontal scaling] for your time series database and is an alternative to link:https://github.com/OpenNMS/jrobin[JRobin] and link:http://oss.oetiker.ch/rrdtool/[RRDtool].
 
 This section describes how to xref:time-series-storage/newts/newts.adoc#newts-configure[configure] {page-component-title} to use an existing Cassandra cluster, including how to initialize the Newts keyspace using `newts init` with STCS without production-ready tuning, and verify that time series data is stored and can be accessed
 

docs/modules/deployment/pages/time-series-storage/newts/newts.adoc

@@ -2,7 +2,7 @@
 [[newts-configure]]
 = Configure {page-component-title} Core to Use Newts
 
-.Create a configuration file with the time series storage settings
+.Create a configuration file with the time series database settings
 [source, console]
 ----
 sudo vi etc/opennms.properties.d/timeseries.properties

docs/modules/deployment/pages/time-series-storage/timeseries/cortex.adoc

@@ -28,7 +28,7 @@ If your aim is to get up to speed quickly in a test environment, you can use Doc
 
 . Download the plugin's `.kar` file from GitHub (https://github.com/OpenNMS/opennms-cortex-tss-plugin/releases).
 . Copy the file into `$\{OPENNMS_HOME}/deploy`.
-. Enable and configure time series storage plugins in {page-component-title}.
+. Enable and configure time series database plugins in {page-component-title}.
 +
 .Create or modify the `$\{OPENNMS_HOME}/etc/opennms.properties.d/cortex.properties` file
 [source, properties]