diff --git a/horizon/Chart.yaml b/horizon/Chart.yaml index ba34112..e0205f5 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.18 +version: 1.1.19 # 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 e018ae4..fe574c0 100644 --- a/horizon/README.md +++ b/horizon/README.md @@ -113,6 +113,10 @@ kubectl create configmap -n $instance $configmap --from-file=lots-of-zeros.zip | core.configuration.http.restPassword | string | `"admin"` | | | core.configuration.http.restUsername | string | `"opennms"` | | | core.configuration.instanceId | string | `"OpenNMS"` | Used only when multiTenant=false, otherwise it uses the release name | +| core.configuration.logConsoleDaemonOutput | string | `"ConsolePlain"` | | +| core.configuration.logConsoleStartupOutput | string | `"ConsolePlain"` | | +| core.configuration.logDistribution | string | `"horizon"` | | +| core.configuration.logEnvironment | string | `""` | | | core.configuration.nodeSelector | string | `nil` | | | core.configuration.ports.karaf.enabled | bool | `true` | | | core.configuration.ports.karaf.externalPort | int | `8101` | | diff --git a/horizon/templates/app-settings.configmap.yaml b/horizon/templates/app-settings.configmap.yaml index 0710370..4ef975d 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.logConsoleStartupOutput | quote }} + OPENNMS_LOG_CONSOLE_DAEMON_OUTPUT: {{ .Values.core.configuration.logConsoleDaemonOutput | quote }} + OPENNMS_LOG_DISTRIBUTION: {{ .Values.core.configuration.logDistribution | quote }} + OPENNMS_ENVIRONMENT: {{ .Values.core.configuration.logEnvironment | 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 39cb34c..8ace5c5 100644 --- a/horizon/values.schema.json +++ b/horizon/values.schema.json @@ -117,6 +117,28 @@ "enum": ["http", "https"], "default": "https" }, + "logConsoleStartupOutput": { + "type": "string", + "enum": ["ConsolePlain", "ConsoleJson", "ConsoleNull"], + "default": "ConsolePlain", + "description": "Controls the format of manager logging output on startup. 'ConsolePlain' outputs human-readable text, 'ConsoleJson' outputs structured JSON for machine parsing, and 'ConsoleNull' suppresses console output." + }, + "logConsoleDaemonOutput": { + "type": "string", + "enum": ["ConsolePlain", "ConsoleJson", "ConsoleNull"], + "default": "ConsolePlain", + "description": "Controls the format of daemon logging output. 'ConsolePlain' outputs human-readable text, 'ConsoleJson' outputs structured JSON for machine parsing, and 'ConsoleNull' suppresses console output." + }, + "logDistribution": { + "type": "string", + "default": "horizon", + "description": "Specifies the distribution identifier for logging purposes. This can help differentiate logs from different OpenNMS distributions." + }, + "logEnvironment": { + "type": "string", + "default": "", + "description": "Specifies the environment identifier for logging purposes. Common values include 'production', 'staging', or 'development'." + }, "services": { "type": "object", "title": "Services", diff --git a/horizon/values.yaml b/horizon/values.yaml index ccf13d2..d87f649 100644 --- a/horizon/values.yaml +++ b/horizon/values.yaml @@ -141,6 +141,10 @@ core: enableTssDualWrite: false enableAcls: false webBaseUrlScheme: https + logConsoleStartupOutput: ConsolePlain + logConsoleDaemonOutput: ConsolePlain + logDistribution: horizon + logEnvironment: '' services: alarmd: enabled: true