Allow user to control services via environment variables

.github/workflows/lint-test.yml

@@ -1,6 +1,8 @@
 name: Lint and Test Charts
 
-on: pull_request
+on:
+  pull_request:
+  workflow_dispatch:
 
 jobs:
   lint-test:
@@ -48,7 +50,7 @@ jobs:
       - name: Setup dependencies
         if: steps.list-changed.outputs.changed == 'true'
         run: scripts/start-dependencies.sh
-            
+
       - name: Run chart-testing (install)
         if: steps.list-changed.outputs.changed == 'true'
         run: ct install --chart-dirs . --charts "horizon" --target-branch ${{ github.event.repository.default_branch }} --helm-extra-set-args "--set createNamespace=false -f examples/minimal-resources.yaml"

.github/workflows/main.yml

@@ -1,9 +1,9 @@
 name: Release Helm Charts
 
 on:
- push:
-  branches:
-     - main
+  push:
+    branches:
+      - main
 
 # Make sure only one copy of this workflow can run at a time.
 concurrency: ${{ github.workflow }}
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-          
+
       - name: Configure Git
         run: |
           git config user.name "$GITHUB_ACTOR"

.github/workflows/readme.yml

@@ -1,34 +1,34 @@
 name: Sync README file
 on:
-    push:
-     branches:
-        - main
-     paths:
-        - 'README.md'
-        - 'minion/README.md'
-        - 'horizon/README.md'
+  push:
+    branches:
+      - main
+    paths:
+      - 'README.md'
+      - 'minion/README.md'
+      - 'horizon/README.md'
 jobs:
-    build:
-     permissions:
-       contents: write
-     runs-on: ubuntu-latest
-     steps:
-       - uses: actions/checkout@v2
-       - run: |
-           cp -f README.md ${{ runner.temp }}/README.md
-           mkdir ${{ runner.temp }}/minion
-           cp -f minion/README.md ${{ runner.temp }}/minion/README.md
-           mkdir ${{ runner.temp }}/horizon
-           cp -f horizon/README.md ${{ runner.temp }}/horizon/README.md
-       - uses: actions/checkout@v2
-         with:
-           ref: gh-pages
-       - run: |
-           cp -f ${{ runner.temp }}/README.md .
-           cp -f ${{ runner.temp }}/minion/README.md ./minion/README.md
-           cp -f ${{ runner.temp }}/horizon/README.md ./horizon/README.md
-           git config user.name "$GITHUB_ACTOR"
-           git config user.email "[email protected]"
-           git add -A
-           git commit -m "Sync README from main"
-           git push
+  build:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: |
+          cp -f README.md ${{ runner.temp }}/README.md
+          mkdir ${{ runner.temp }}/minion
+          cp -f minion/README.md ${{ runner.temp }}/minion/README.md
+          mkdir ${{ runner.temp }}/horizon
+          cp -f horizon/README.md ${{ runner.temp }}/horizon/README.md
+      - uses: actions/checkout@v2
+        with:
+          ref: gh-pages
+      - run: |
+          cp -f ${{ runner.temp }}/README.md .
+          cp -f ${{ runner.temp }}/minion/README.md ./minion/README.md
+          cp -f ${{ runner.temp }}/horizon/README.md ./horizon/README.md
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "[email protected]"
+          git add -A
+          git commit -m "Sync README from main"
+          git push

horizon/Chart.yaml

@@ -17,13 +17,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.1.15
+version: 1.1.16
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "34.0.1"
+appVersion: "34.0.2"
 
 maintainers:
   - name: The OpenNMS Group Inc.

horizon/README.md

@@ -124,12 +124,40 @@ kubectl create configmap -n $instance $configmap --from-file=lots-of-zeros.zip
 | core.configuration.rras[2] | string | `"RRA:AVERAGE:0.5:288:366"` |  |
 | core.configuration.rras[3] | string | `"RRA:MAX:0.5:288:366"` |  |
 | core.configuration.rras[4] | string | `"RRA:MIN:0.5:288:366"` |  |
+| core.configuration.services.ackd.enabled | bool | `true` |  |
+| core.configuration.services.actiond.enabled | bool | `true` |  |
+| core.configuration.services.alarmd.enabled | bool | `true` |  |
+| core.configuration.services.asteriskGateway.enabled | bool | `false` |  |
+| core.configuration.services.bsmd.enabled | bool | `true` |  |
+| core.configuration.services.collectd.enabled | bool | `true` |  |
+| core.configuration.services.correlator.enabled | bool | `false` |  |
+| core.configuration.services.discovery.enabled | bool | `true` |  |
+| core.configuration.services.enhancedLinkd.enabled | bool | `true` |  |
+| core.configuration.services.eventTranslator.enabled | bool | `true` |  |
+| core.configuration.services.jettyServer.enabled | bool | `true` |  |
+| core.configuration.services.karafStartupMonitor.enabled | bool | `true` |  |
+| core.configuration.services.notifd.enabled | bool | `true` |  |
+| core.configuration.services.passiveStatusd.enabled | bool | `true` |  |
+| core.configuration.services.perspectivePoller.enabled | bool | `true` |  |
+| core.configuration.services.pollerd.enabled | bool | `true` |  |
+| core.configuration.services.provisiond.enabled | bool | `true` |  |
+| core.configuration.services.queued.enabled | bool | `true` |  |
+| core.configuration.services.reportd.enabled | bool | `true` |  |
+| core.configuration.services.rtcd.enabled | bool | `true` |  |
+| core.configuration.services.scriptd.enabled | bool | `true` |  |
+| core.configuration.services.snmpPoller.enabled | bool | `false` |  |
+| core.configuration.services.statsd.enabled | bool | `true` |  |
+| core.configuration.services.syslogd.enabled | bool | `false` |  |
+| core.configuration.services.telemetryd.enabled | bool | `true` |  |
+| core.configuration.services.ticketer.enabled | bool | `true` |  |
+| core.configuration.services.tl1d.enabled | bool | `false` |  |
+| core.configuration.services.trapd.enabled | bool | `true` |  |
+| core.configuration.services.vacuumd.enabled | bool | `true` |  |
 | core.configuration.storage.etc | string | `"1Gi"` |  |
 | core.configuration.storage.mibs | string | `nil` |  |
 | core.configuration.storage.rrd | string | `"1000Gi"` |  |
 | core.configuration.timeSeriesStrategy | string | `"rrd"` |  |
 | core.configuration.tolerations | string | `nil` |  |
-| core.env | object | `{}` | Environment variables to set on the onms container. |
 | core.image.pullPolicy | string | `"IfNotPresent"` |  |
 | core.image.repository | string | `"opennms/horizon"` |  |
 | core.image.tag | string | `""` |  |

horizon/scripts/onms-core-init.sh

@@ -594,15 +594,10 @@ if [[ -v OPENNMS_RRAS ]]; then
   done
 fi
 
-# Enable Syslogd
-echo "Enabling syslogd in ${CONFIG_DIR}/service-configuration.xml"
-sed -r -i '/enabled="false"/{$!{N;s/ enabled="false"[>]\n(.*OpenNMS:Name=Syslogd.*)/>\n\1/}}' ${CONFIG_DIR}/service-configuration.xml
-
 # Disable Telemetryd
 if [[ ${ENABLE_TELEMETRYD} == "false" ]]; then
-  echo "Enabling telemetryd in ${CONFIG_DIR}/service-configuration.xml and ${CONFIG_DIR}/org.apache.karaf.features.cfg"
+  echo "Disable telemetryd in ${CONFIG_DIR}/org.apache.karaf.features.cfg"
   sed -i -r '/opennms-flows/d' ${CONFIG_DIR}/org.apache.karaf.features.cfg
-  sed -i 'N;s/service.*\n\(.*Telemetryd\)/service enabled="false">\n\1/;P;D' ${CONFIG_DIR}/service-configuration.xml
 fi
 
 # Cleanup temporary requisition files

horizon/templates/app-settings.configmap.yaml

@@ -19,6 +19,35 @@ data:
   OPENNMS_DATABASE_CONNECTION_MAXPOOL: {{ .Values.core.configuration.database.maxPool | default "50" | quote }}
   ENABLE_ALEC: {{ ((.Values.core).configuration).enableAlec | default "false" | quote }}
   ENABLE_ACLS: {{ ((.Values.core).configuration).enableAcls | default "false" | quote }}
+  CORE_SERVICE_ALARMD_ENABLED: {{ .Values.core.configuration.services.alarmd.enabled | quote }}
+  CORE_SERVICE_BSMD_ENABLED: {{ .Values.core.configuration.services.bsmd.enabled | quote }}
+  CORE_SERVICE_TICKETER_ENABLED: {{ .Values.core.configuration.services.ticketer.enabled | quote }}
+  CORE_SERVICE_CORRELATOR_ENABLED: {{ .Values.core.configuration.services.correlator.enabled | quote }}
+  CORE_SERVICE_QUEUED_ENABLED: {{ .Values.core.configuration.services.queued.enabled | quote }}
+  CORE_SERVICE_ACTIOND_ENABLED: {{ .Values.core.configuration.services.actiond.enabled | quote }}
+  CORE_SERVICE_NOTIFD_ENABLED: {{ .Values.core.configuration.services.notifd.enabled | quote }}
+  CORE_SERVICE_SCRIPTD_ENABLED: {{ .Values.core.configuration.services.scriptd.enabled | quote }}
+  CORE_SERVICE_RTCD_ENABLED: {{ .Values.core.configuration.services.rtcd.enabled | quote }}
+  CORE_SERVICE_POLLERD_ENABLED: {{ .Values.core.configuration.services.pollerd.enabled | quote }}
+  CORE_SERVICE_SNMPPOLLER_ENABLED: {{ .Values.core.configuration.services.snmpPoller.enabled | quote }}
+  CORE_SERVICE_ENHANCEDLINKD_ENABLED: {{ .Values.core.configuration.services.enhancedLinkd.enabled | quote }}
+  CORE_SERVICE_COLLECTD_ENABLED: {{ .Values.core.configuration.services.collectd.enabled | quote }}
+  CORE_SERVICE_DISCOVERY_ENABLED: {{ .Values.core.configuration.services.discovery.enabled | quote }}
+  CORE_SERVICE_VACUUMD_ENABLED: {{ .Values.core.configuration.services.vacuumd.enabled | quote }}
+  CORE_SERVICE_EVENTTRANSLATOR_ENABLED: {{ .Values.core.configuration.services.eventTranslator.enabled | quote }}
+  CORE_SERVICE_PASSIVESTATUSD_ENABLED: {{ .Values.core.configuration.services.passiveStatusd.enabled | quote }}
+  CORE_SERVICE_STATSD_ENABLED: {{ .Values.core.configuration.services.statsd.enabled | quote }}
+  CORE_SERVICE_PROVISIOND_ENABLED: {{ .Values.core.configuration.services.provisiond.enabled | quote }}
+  CORE_SERVICE_REPORTD_ENABLED: {{ .Values.core.configuration.services.reportd.enabled | quote }}
+  CORE_SERVICE_ACKD_ENABLED: {{ .Values.core.configuration.services.ackd.enabled | quote }}
+  CORE_SERVICE_JETTYSERVER_ENABLED: {{ .Values.core.configuration.services.jettyServer.enabled | quote }}
+  CORE_SERVICE_KARAFSTARTUPMONITOR_ENABLED: {{ .Values.core.configuration.services.karafStartupMonitor.enabled | quote }}
+  CORE_SERVICE_TL1D_ENABLED: {{ .Values.core.configuration.services.tl1d.enabled | quote }}
+  CORE_SERVICE_SYSLOGD_ENABLED: {{ .Values.core.configuration.services.syslogd.enabled | quote }}
+  CORE_SERVICE_ASTERISKGATEWAY_ENABLED: {{ .Values.core.configuration.services.asteriskGateway.enabled | quote }}
+  CORE_SERVICE_TELEMETRYD_ENABLED: {{ .Values.core.configuration.services.telemetryd.enabled | quote }}
+  CORE_SERVICE_TRAPD_ENABLED: {{ .Values.core.configuration.services.trapd.enabled | quote }}
+  CORE_SERVICE_PERSPECTIVEPOLLER_ENABLED: {{ .Values.core.configuration.services.perspectivePoller.enabled | quote }}
   ENABLE_TELEMETRYD: {{ if gt ((.Values.sentinel).replicaCount|int) 0 }}"true"{{ else }}"false"{{ end }}
   ENABLE_CORTEX: {{ ((.Values.core).configuration).enableCortex | quote }}
   ENABLE_TSS_DUAL_WRITE: {{ ((.Values.core).configuration).enableTssDualWrite | quote }}