RabbitMQ and Metrics

.github/workflows/build.yaml

@@ -83,7 +83,7 @@ jobs:
       matrix:
         include:
           # note: actions/setup-python only allows using a major.minor releases
-          - python: '3.6'
+          - python: '3.8'
             make_target: 'python3'
             name: 'bolt tasks'
     steps:
@@ -122,7 +122,7 @@ jobs:
           - ruby: '2.7'
             name: 'centos7-puppet7'
           - ruby: '2.7'
-            name: 'centos7-puppet7-python36'
+            name: 'centos7-puppet7-python38'
           - ruby: '2.7'
             name: 'ubuntu18-puppet6'
           - ruby: '2.7'

.kitchen.yml

@@ -62,7 +62,7 @@ platforms:
       puppetfile_path: build/centos7-puppet7/Puppetfile
 
   # CentOS7 with Systemd - Puppet 7 - Python 3.6
-  - name: centos7-puppet7-python36
+  - name: centos7-puppet7-python38
     driver:
       platform: centos
       dockerfile: build/centos7-puppet7/Dockerfile.kitchen
@@ -71,7 +71,7 @@ platforms:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
     provisioner:
       puppetfile_path: build/centos7-puppet7/Puppetfile
-      manifest: test/fullinstall_python36.pp
+      manifest: test/fullinstall_python38.pp
 
   # Ubuntu Bionic with Systemd - Puppet 6
   - name: ubuntu18-puppet6

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Development
 
+- Added the ability to manage StackStack metrics giving options for the metric driver,
+  host and port number defined in st2.conf. Contributed by @bishopbm1
+
+- Added nginx web route to get basic nginx metrics. Contributed by @asktheaxis
+
+- Fixed issues with RabbitMQ @bishopbm1
+
+- Fixed and updated all tests @bishopbm1
+
 ## 2.4.0 (Mar 1, 2022)
 
 - Update RabbitMQ installer to use latest Erlang from RabbitMQ repos. Contributed by @rush-skills

README.md

@@ -125,21 +125,21 @@ Hiera data bindings. A few notable parameters to take note of:
   being taken (proper steps detailed here: https://docs.stackstorm.com/install/upgrades.html)
 * `st2::python_version` - Version to Python to use. The default is `'system'` and the
   system `python` package will be installed, whatever version that is for your OS.
-  To explicitly install Python 3.6 specify `'3.6'` if on RHEL/CentOS 7.
-  If on Ubuntu 16.04 specify `'python3.6'`.
+  To explicitly install Python 3.8 specify `'3.8'` if on RHEL/CentOS 7.
+  If on Ubuntu 16.04 specify `'python3.8'`.
   **Notes**
     * RHEL 7 - The Red Hat subscription repo `'rhel-7-server-optional-rpms'`
       will need to be enabled prior to running this module.
 
   ```puppet
   # CentOS/RHEL 7
   class { 'st2':
-    python_version => '3.6',
+    python_version => '3.8',
   }
 
   # Ubuntu 18.04/20.04
   class { 'st2':
-    python_version            => 'python3.6',
+    python_version            => 'python3.8',
   }
 
   contain st2::profile::fullinstall
@@ -161,6 +161,7 @@ classes for use and configuration.
 * `st2::proflle::server` - st2 server components
 * `st2::profile::web` - st2 web components
 * `st2::profile::chatops` - st2 chatops components
+* `st2::profile::metrics` - st2 set up metrics
 
 #### Installing and Configuring Packs
 
@@ -331,7 +332,7 @@ that can be higher on CPU and Memory to allow more processes to run at the same
 Configuration all services:
 ```ruby
 class { 'st2':
-  python_version     => '3.6',
+  python_version     => '3.8',
   workflowengine_num => 4,
   scheduler_num      => 2,
   rulesengine_num    => 1,
@@ -466,6 +467,24 @@ $res = run_task('st2::key_get', $stackstorm_target,
                 password => $password)
 ```
 
+#### Metrics
+
+This module provides the ability to set up the metrics endpoints to expose different metrics built into StackStorm as documented here:
+https://docs.stackstorm.com/reference/metrics.html
+
+There is also an addition metric that can be auto created which exposes the basic health for NGINX called a basic status page.
+
+```ruby
+class { 'st2':
+  python_version             => '3.8',
+  metrics_include            => true,
+  nginx_basicstatus_enabled  => true,
+}
+```
+
+Once these metrics are setup and enabled it gives the ability to scrape those metrics with an outside source like telegraf
+or prometheus or any other scraping tool.
+
 ## Limitations
 
 ### Supported platforms

build/centos7-puppet6/Puppetfile

@@ -44,7 +44,9 @@
 #   └── saz-sudo (v6.0.0)
 forge "https://forgeapi.puppetlabs.com"
 
-mod 'ghoneycutt-facter'
+# Current bug: https://github.com/ghoneycutt/puppet-module-facter/issues/70
+# in latest release. Pinning to 3.5 until resolved.
+mod 'ghoneycutt/facter', '3.5.0'
 mod 'jamtur01-httpauth'
 mod 'npwalker-recursive_file_permissions'
 mod 'puppet-epel'
@@ -55,7 +57,10 @@ mod 'puppet-nginx'
 mod 'puppetlabs-concat'    # dependency of puppet-nginx'
 mod 'puppet-nodejs'
 mod 'puppet-python'
-mod 'puppet-rabbitmq'
+# Using master branch due to new release on hold pending new tests.
+mod 'puppet/rabbitmq',
+    :git => 'https://github.com/voxpupuli/puppet-rabbitmq.git',
+    :branch => 'master'
 mod 'camptocamp-systemd'   # dependency of puppet-rabbitmq
 mod 'puppet-archive'       # dependency of puppet-rabbitmq
 mod 'puppet-selinux'

build/centos7-puppet7/Puppetfile

@@ -44,7 +44,9 @@
 #   └── saz-sudo (v6.0.0)
 forge "https://forgeapi.puppetlabs.com"
 
-mod 'ghoneycutt-facter'
+# Current bug: https://github.com/ghoneycutt/puppet-module-facter/issues/70
+# in latest release. Pinning to 3.5 until resolved.
+mod 'ghoneycutt/facter', '3.5.0'
 mod 'jamtur01-httpauth'
 mod 'npwalker-recursive_file_permissions'
 mod 'puppet-epel'
@@ -55,7 +57,10 @@ mod 'puppet-nginx'
 mod 'puppetlabs-concat'    # dependency of puppet-nginx'
 mod 'puppet-nodejs'
 mod 'puppet-python'
-mod 'puppet-rabbitmq'
+# Using master branch due to new release on hold pending new tests.
+mod 'puppet/rabbitmq',
+    :git => 'https://github.com/voxpupuli/puppet-rabbitmq.git',
+    :branch => 'master'
 mod 'camptocamp-systemd'   # dependency of puppet-rabbitmq
 mod 'puppet-archive'       # dependency of puppet-rabbitmq
 mod 'puppet-selinux'

build/ubuntu18-puppet6/Puppetfile

@@ -44,7 +44,9 @@
 #   └── saz-sudo (v6.0.0)
 forge "https://forgeapi.puppetlabs.com"
 
-mod 'ghoneycutt-facter'
+# Current bug: https://github.com/ghoneycutt/puppet-module-facter/issues/70
+# in latest release. Pinning to 3.5 until resolved.
+mod 'ghoneycutt/facter', '3.5.0'
 mod 'jamtur01-httpauth'
 mod 'npwalker-recursive_file_permissions'
 mod 'puppet-epel'
@@ -55,7 +57,10 @@ mod 'puppet-nginx'
 mod 'puppetlabs-concat'    # dependency of puppet-nginx'
 mod 'puppet-nodejs'
 mod 'puppet-python'
-mod 'puppet-rabbitmq'
+# Using master branch due to new release on hold pending new tests.
+mod 'puppet/rabbitmq',
+    :git => 'https://github.com/voxpupuli/puppet-rabbitmq.git',
+    :branch => 'master'
 mod 'camptocamp-systemd'   # dependency of puppet-rabbitmq
 mod 'puppet-archive'       # dependency of puppet-rabbitmq
 mod 'puppet-selinux'

build/ubuntu18-puppet7/Puppetfile

@@ -44,7 +44,9 @@
 #   └── saz-sudo (v6.0.0)
 forge "https://forgeapi.puppetlabs.com"
 
-mod 'ghoneycutt-facter'
+# Current bug: https://github.com/ghoneycutt/puppet-module-facter/issues/70
+# in latest release. Pinning to 3.5 until resolved.
+mod 'ghoneycutt/facter', '3.5.0'
 mod 'jamtur01-httpauth'
 mod 'npwalker-recursive_file_permissions'
 mod 'puppet-epel'
@@ -55,7 +57,10 @@ mod 'puppet-nginx'
 mod 'puppetlabs-concat'    # dependency of puppet-nginx'
 mod 'puppet-nodejs'
 mod 'puppet-python'
-mod 'puppet-rabbitmq'
+# Using master branch due to new release on hold pending new tests.
+mod 'puppet/rabbitmq',
+    :git => 'https://github.com/voxpupuli/puppet-rabbitmq.git',
+    :branch => 'master'
 mod 'camptocamp-systemd'   # dependency of puppet-rabbitmq
 mod 'puppet-archive'       # dependency of puppet-rabbitmq
 mod 'puppet-selinux'

build/ubuntu20-puppet6/Puppetfile

@@ -44,7 +44,9 @@
 #   └── saz-sudo (v6.0.0)
 forge "https://forgeapi.puppetlabs.com"
 
-mod 'ghoneycutt-facter'
+# Current bug: https://github.com/ghoneycutt/puppet-module-facter/issues/70
+# in latest release. Pinning to 3.5 until resolved.
+mod 'ghoneycutt/facter', '3.5.0'
 mod 'jamtur01-httpauth'
 mod 'npwalker-recursive_file_permissions'
 mod 'puppet-epel'
@@ -55,7 +57,10 @@ mod 'puppet-nginx'
 mod 'puppetlabs-concat'    # dependency of puppet-nginx'
 mod 'puppet-nodejs'
 mod 'puppet-python'
-mod 'puppet-rabbitmq'
+# Using master branch due to new release on hold pending new tests.
+mod 'puppet/rabbitmq',
+    :git => 'https://github.com/voxpupuli/puppet-rabbitmq.git',
+    :branch => 'master'
 mod 'camptocamp-systemd'   # dependency of puppet-rabbitmq
 mod 'puppet-archive'       # dependency of puppet-rabbitmq
 mod 'puppet-selinux'

build/ubuntu20-puppet7/Puppetfile

@@ -44,7 +44,9 @@
 #   └── saz-sudo (v6.0.0)
 forge "https://forgeapi.puppetlabs.com"
 
-mod 'ghoneycutt-facter'
+# Current bug: https://github.com/ghoneycutt/puppet-module-facter/issues/70
+# in latest release. Pinning to 3.5 until resolved.
+mod 'ghoneycutt/facter', '3.5.0'
 mod 'jamtur01-httpauth'
 mod 'npwalker-recursive_file_permissions'
 mod 'puppet-epel'
@@ -55,7 +57,10 @@ mod 'puppet-nginx'
 mod 'puppetlabs-concat'    # dependency of puppet-nginx'
 mod 'puppet-nodejs'
 mod 'puppet-python'
-mod 'puppet-rabbitmq'
+# Using master branch due to new release on hold pending new tests.
+mod 'puppet/rabbitmq',
+    :git => 'https://github.com/voxpupuli/puppet-rabbitmq.git',
+    :branch => 'master'
 mod 'camptocamp-systemd'   # dependency of puppet-rabbitmq
 mod 'puppet-archive'       # dependency of puppet-rabbitmq
 mod 'puppet-selinux'