diff --git a/horizon/Chart.yaml b/horizon/Chart.yaml index 40cc73d..ba34112 100644 --- a/horizon/Chart.yaml +++ b/horizon/Chart.yaml @@ -17,7 +17,7 @@ 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.17 +version: 1.1.18 # 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 diff --git a/horizon/README.md b/horizon/README.md index 5a73d31..0332096 100644 --- a/horizon/README.md +++ b/horizon/README.md @@ -159,6 +159,11 @@ kubectl create configmap -n $instance $configmap --from-file=lots-of-zeros.zip | core.configuration.timeSeriesStrategy | string | `"rrd"` | | | core.configuration.tolerations | string | `nil` | | | core.configuration.webBaseUrlScheme | string | `"https"` | | +| core.configuration.opennms_log_console_startup_output | string | `"ConsolePlain"` | | +| core.configuration.opennms_log_console_daemon_output | string | `"ConsolePlain"` | | +| core.configuration.opennms_log_distribution | string | `"horizon"` | | +| core.configuration.opennms_enviroment | string | `"unspecified"` | | +| core.configuration.opennms_instance_id | string | `"OpenNMS"` | | | core.image.pullPolicy | string | `"IfNotPresent"` | | | core.image.repository | string | `"opennms/horizon"` | | | core.image.tag | string | `""` | | diff --git a/horizon/templates/app-settings.configmap.yaml b/horizon/templates/app-settings.configmap.yaml index a6ef0f0..062733d 100644 --- a/horizon/templates/app-settings.configmap.yaml +++ b/horizon/templates/app-settings.configmap.yaml @@ -18,6 +18,10 @@ data: OPENNMS_DATABASE_CONNECTION_MINPOOL: {{ .Values.core.configuration.database.minPool | default "25" | quote }} OPENNMS_DATABASE_CONNECTION_MAXPOOL: {{ .Values.core.configuration.database.maxPool | default "50" | quote }} OPENNMS_WEB_BASEURL_SCHEME: {{ .Values.core.configuration.webBaseUrlScheme | quote }} + OPENNMS_LOG_CONSOLE_STARTUP_OUTPUT: {{ .Values.core.configuration.opennms_log_console_startup_output | quote }} + OPENNMS_LOG_CONSOLE_DAEMON_OUTPUT: {{ .Values.core.configuration.opennms_log_console_daemon_output | quote }} + OPENNMS_LOG_DISTRIBUTION: {{ .Values.core.configuration.opennms_log_distribution | quote }} + OPENNMS_ENVIRONMENT: {{ .Values.core.configuration.opennms_environment | 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 }} diff --git a/horizon/values.schema.json b/horizon/values.schema.json index 9cca078..ad5187f 100644 --- a/horizon/values.schema.json +++ b/horizon/values.schema.json @@ -112,6 +112,28 @@ "enum": ["http", "https"], "default": "https" }, + "opennms_log_console_startup_output": { + "type": "string", + "enum": ["ConsolePlain", "ConsoleJson", "ConsoleNull"], + "default": "ConsolePlain" + }, + "opennms_log_console_daemon_output": { + "type": "string", + "enum": ["ConsolePlain", "ConsoleJson", "ConsoleNull"], + "default": "ConsolePlain" + }, + "opennms_log_distribution": { + "type": "string", + "default": "horizon" + }, + "opennms_environment": { + "type": "string", + "default": "" + }, + "opennms_instance_id": { + "type": "string", + "default": "OpenNMS" + }, "services": { "type": "object", "title": "Services", diff --git a/horizon/values.yaml b/horizon/values.yaml index 5af5534..dcea2df 100644 --- a/horizon/values.yaml +++ b/horizon/values.yaml @@ -139,6 +139,11 @@ core: enableTssDualWrite: false enableAcls: false webBaseUrlScheme: https + opennms_log_console_startup_output: ConsolePlain + opennms_log_console_daemon_output: ConsolePlain + opennms_log_distribution: horizon + opennms_enviroment: '' + opennms_instance_id: OpenNMS services: alarmd: enabled: true