Merge pull request #7052 from Viii3/FISH-10052-Notifier-Merge

FISH-10052 Notifier Filtering
payara · Nov 11, 2024 · b486ca5 · b486ca5
2 parents 9075514 + f1e4873
commit b486ca5
Show file tree

Hide file tree

Showing 32 changed files with 289 additions and 224 deletions.
diff --git a/...tifier-console-plugin/src/main/resources/cdieventbus/cdiEventbusNotifierConfiguration.jsf b/...tifier-console-plugin/src/main/resources/cdieventbus/cdiEventbusNotifierConfiguration.jsf
@@ -1,7 +1,7 @@
 <!--
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright (c) [2017-2020] Payara Foundation and/or its affiliates. All rights reserved.
+  Copyright (c) [2017-2024] Payara Foundation and/or its affiliates. All rights reserved.
 
   The contents of this file are subject to the terms of either the GNU
   General Public License Version 2 only ("GPL") or the Common Development
@@ -55,7 +55,7 @@
                 method="GET" result="#{requestScope.resp}");
         setPageSessionAttribute(key="valueMap", value="#{requestScope.resp.data.extraProperties.notifierConfiguration}");
         mapPut(map="#{pageSession.valueMap}" key="target" value="#{pageSession.configName}");
-        setPageSessionAttribute(key="convertToFalseList", value={"enabled", "noisy", "dynamic", "loopback"});
+        setPageSessionAttribute(key="convertToFalseList", value={"enabled", "dynamic", "loopback"});
 
         if (#{pageSession.valueMap['enabled']}=true) {
             setPageSessionAttribute(key="enabledSelected", value="true");
@@ -66,9 +66,6 @@
         if (#{pageSession.valueMap['hazelcastEnabled']}=true) {
             setPageSessionAttribute(key="hazelcastEnabled", value="true");
         }
-        if (#{pageSession.valueMap['noisy']}=true) {
-			setPageSessionAttribute(key="noisy", value="true");
-		}	
         setPageSessionAttribute(key="dynamic", value="true");
     /> 
 </event>
@@ -83,7 +80,6 @@
                         onClick="if (guiValidate('#{reqMsg}','#{reqInt}','#{reqPort}')) submitAndDisable(this, '$resource{i18n.button.Processing}'); return false;" >
                     <!command
                         mapPut(map="#{pageSession.valueMap}" key="enabled" value="#{pageSession.enabledSelected}");
-                        mapPut(map="#{pageSession.valueMap}" key="noisy" value="#{pageSession.noisy}");
                         mapPut(map="#{pageSession.valueMap}" key="dynamic" value="#{pageSession.dynamic}");
                         mapPut(map="#{pageSession.valueMap}" key="loopBack" value="#{pageSession.loopBackSelected}");
                         mapPut(map="#{pageSession.valueMap}" key="hazelcastEnabled" value="#{pageSession.hazelcastEnabled}");
@@ -105,18 +101,17 @@
                           helpText="$resource{i18ncebn.notifier.cdieventbus.configuration.enabledLabelHelpText}">
                 <sun:checkbox id="enabledProp" selected="#{pageSession.enabledSelected}" selectedValue="true" />
             </sun:property>
-            <sun:property id="noisy" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
-                          rendered="#{pageSession.hazelcastEnabled == true}"
-                          label="$resource{i18nn.notification.configuration.notifier.noisyLabel}"  
-                          helpText="$resource{i18nn.notification.configuration.notifier.noisyLabelHelpText}">
-                <sun:checkbox id="noisy" selected="#{pageSession.noisy}" selectedValue="true" />
-            </sun:property>
             <sun:property id="dynamic" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
                           rendered="#{pageSession.hazelcastEnabled == true}"
                           label="$resource{i18nn.notification.configuration.dynamic}"
                           helpText="$resource{i18nn.notification.configuration.notifier.dynamicHelp}">
                 <sun:checkbox id="dynamic" selected="#{pageSession.dynamic}" selectedValue="true" />
             </sun:property>
+            <sun:property id="filter" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
+                          label="$resource{i18nn.notification.configuration.filter}"
+                          helpText="$resource{i18nn.notification.configuration.notifier.filterHelp}">
+                <sun:dropDown id="filterDropdown" selected="#{pageSession.valueMap['filter']}" labels={"SEVERE", "WARNING", "INFO"} />
+            </sun:property>
             <sun:property id="loopBackProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
                           rendered="#{pageSession.hazelcastEnabled == true}"
                           label="$resource{i18ncebn.notifier.cdieventbus.configuration.loopBackEnabledLabel}"

diff --git a/...bus-notifier-console-plugin/src/main/resources/eventbus/eventbusNotifierConfiguration.jsf b/...bus-notifier-console-plugin/src/main/resources/eventbus/eventbusNotifierConfiguration.jsf
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) [2017-2020] Payara Foundation and/or its affiliates. All rights reserved.
+Copyright (c) [2017-2024] Payara Foundation and/or its affiliates. All rights reserved.
 
 The contents of this file are subject to the terms of either the GNU
 General Public License Version 2 only ("GPL") or the Common Development
@@ -53,14 +53,11 @@ holder.
                 method="GET" result="#{requestScope.resp}");
         setPageSessionAttribute(key="valueMap", value="#{requestScope.resp.data.extraProperties.notifierConfiguration}");
         mapPut(map="#{pageSession.valueMap}" key="target" value="#{pageSession.configName}");
-        setPageSessionAttribute(key="convertToFalseList", value={"enabled", "noisy", "dynamic"});
+        setPageSessionAttribute(key="convertToFalseList", value={"enabled", "dynamic"});
 
         if (#{pageSession.valueMap['enabled']}=true) {
             setPageSessionAttribute(key="enabledSelected", value="true");
         }
-        if (#{pageSession.valueMap['noisy']}=true) {
-			setPageSessionAttribute(key="noisy", value="true");
-		}	
         setPageSessionAttribute(key="dynamic", value="true");
     /> 
 </event>
@@ -86,7 +83,6 @@ holder.
                         onClick="if (guiValidate('#{reqMsg}','#{reqInt}','#{reqPort}')) submitAndDisable(this, '$resource{i18n.button.Processing}'); return false;" >
                     <!command
                         mapPut(map="#{pageSession.valueMap}" key="enabled" value="#{pageSession.enabledSelected}");
-						mapPut(map="#{pageSession.valueMap}" key="noisy" value="#{pageSession.noisy}");
                         mapPut(map="#{pageSession.valueMap}" key="dynamic" value="#{pageSession.dynamic}");
                         prepareSuccessfulMsg();
                         gf.updateEntity(endpoint="#{sessionScope.NOTIFICATION_CONFIG_URL}/set-eventbus-notifier-configuration" 
@@ -105,16 +101,16 @@ holder.
                           helpText="$resource{i18nebn.notifier.eventbus.configuration.enabledLabelHelpText}">
                 <sun:checkbox id="enabledProp" selected="#{pageSession.enabledSelected}" selectedValue="true" />
             </sun:property>
-            <sun:property id="noisy" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" 
-                          label="$resource{i18nn.notification.configuration.notifier.noisyLabel}"  
-                          helpText="$resource{i18nn.notification.configuration.notifier.noisyLabelHelpText}">
-                <sun:checkbox id="noisy" selected="#{pageSession.noisy}" selectedValue="true" />
-            </sun:property>
             <sun:property id="dynamic" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" 
                           label="$resource{i18nn.notification.configuration.dynamic}"  
                           helpText="$resource{i18nn.notification.configuration.notifier.dynamicHelp}">
                 <sun:checkbox id="dynamic" selected="#{pageSession.dynamic}" selectedValue="true" />
             </sun:property>
+            <sun:property id="filter" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
+                          label="$resource{i18nn.notification.configuration.filter}"
+                          helpText="$resource{i18nn.notification.configuration.notifier.filterHelp}">
+                <sun:dropDown id="filterDropdown" selected="#{pageSession.valueMap['filter']}" labels={"SEVERE", "WARNING", "INFO"} />
+            </sun:property>
             <sun:property id="topicNameProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
                           label="$resource{i18nebn.notifier.eventbus.configuration.topicNameLabel}"
                           helpText="$resource{i18nebn.notifier.eventbus.configuration.topicNameLabelHelpText}">

diff --git a/.../admingui/jms-notifier-console-plugin/src/main/resources/jms/jmsNotifierConfiguration.jsf b/.../admingui/jms-notifier-console-plugin/src/main/resources/jms/jmsNotifierConfiguration.jsf
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) [2017-2020] Payara Foundation and/or its affiliates. All rights reserved.
+Copyright (c) [2017-2024] Payara Foundation and/or its affiliates. All rights reserved.
 
 The contents of this file are subject to the terms of either the GNU
 General Public License Version 2 only ("GPL") or the Common Development
@@ -53,14 +53,11 @@ holder.
                 method="GET" result="#{requestScope.resp}");
         setPageSessionAttribute(key="valueMap", value="#{requestScope.resp.data.extraProperties.notifierConfiguration}");
         mapPut(map="#{pageSession.valueMap}" key="target" value="#{pageSession.configName}");
-        setPageSessionAttribute(key="convertToFalseList", value={"enabled", "noisy", "dynamic"});
+        setPageSessionAttribute(key="convertToFalseList", value={"enabled", "dynamic"});
 
         if (#{pageSession.valueMap['enabled']}=true) {
             setPageSessionAttribute(key="enabledSelected", value="true");
         }
-        if (#{pageSession.valueMap['noisy']}=true) {
-			setPageSessionAttribute(key="noisy", value="true");
-		}	
         setPageSessionAttribute(key="dynamic", value="true");
     /> 
 </event>
@@ -86,7 +83,6 @@ holder.
                         onClick="if (guiValidate('#{reqMsg}','#{reqInt}','#{reqPort}')) submitAndDisable(this, '$resource{i18n.button.Processing}'); return false;" >
                     <!command
                         mapPut(map="#{pageSession.valueMap}" key="enabled" value="#{pageSession.enabledSelected}");
-						mapPut(map="#{pageSession.valueMap}" key="noisy" value="#{pageSession.noisy}");
                         mapPut(map="#{pageSession.valueMap}" key="dynamic" value="#{pageSession.dynamic}");
                         prepareSuccessfulMsg();
                         gf.updateEntity(endpoint="#{sessionScope.NOTIFICATION_CONFIG_URL}/set-jms-notifier-configuration" 
@@ -105,16 +101,16 @@ holder.
                           helpText="$resource{i18njn.notifier.jms.configuration.enabledLabelHelpText}">
                 <sun:checkbox id="enabledProp" selected="#{pageSession.enabledSelected}" selectedValue="true" />
             </sun:property>
-            <sun:property id="noisy" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" 
-                          label="$resource{i18nn.notification.configuration.notifier.noisyLabel}"  
-                          helpText="$resource{i18nn.notification.configuration.notifier.noisyLabelHelpText}">
-                <sun:checkbox id="noisy" selected="#{pageSession.noisy}" selectedValue="true" />
-            </sun:property>
             <sun:property id="dynamic" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" 
                           label="$resource{i18nn.notification.configuration.dynamic}"  
                           helpText="$resource{i18nn.notification.configuration.notifier.dynamicHelp}">
                 <sun:checkbox id="dynamic" selected="#{pageSession.dynamic}" selectedValue="true" />
             </sun:property>
+            <sun:property id="filter" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
+                          label="$resource{i18nn.notification.configuration.filter}"
+                          helpText="$resource{i18nn.notification.configuration.notifier.filterHelp}">
+                <sun:dropDown id="filterDropdown" selected="#{pageSession.valueMap['filter']}" labels={"SEVERE", "WARNING", "INFO"} />
+            </sun:property>
             <sun:property id="contextFactoryClassProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" 
                           label="$resource{i18njn.notifier.jms.configuration.contextFactoryClassLabel}"  
                           helpText="$resource{i18njn.notifier.jms.configuration.contextFactoryClassLabelHelpText}">

diff --git a/...e-plugin/src/main/resources/microprofile/specs/configAPI/gcpConfigSourceConfiguration.jsf b/...e-plugin/src/main/resources/microprofile/specs/configAPI/gcpConfigSourceConfiguration.jsf
@@ -1,7 +1,7 @@
 <!--
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2020 Payara Foundation and/or its affiliates. All rights reserved.
+    Copyright (c) [2020-2024] Payara Foundation and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
@@ -59,7 +59,7 @@
                 value="#{requestScope.resp.data.extraProperties.configSourceConfiguration}");
         mapPut(map="#{pageSession.valueMap}" key="target" value="#{pageSession.configName}");
 
-        setPageSessionAttribute(key="convertToFalseList", value={"enabled", "noisy"});
+        setPageSessionAttribute(key="convertToFalseList", value={"enabled"});
 
         if (#{pageSession.valueMap['enabled']}=true) {
             setPageSessionAttribute(key="enabledSelected", value="true");

diff --git a/...-console-extras-l10n/src/main/resources/fish/payara/admingui/extras/Strings_es.properties b/...-console-extras-l10n/src/main/resources/fish/payara/admingui/extras/Strings_es.properties
@@ -160,8 +160,6 @@ notification.configuration.dynamic=Dinámico
 notification.configuration.dynamicHelp=Empieza o para el servicio de notificaciones en Payara si es requerido.
 notification.configuration.logNotifierEnabled=Notificador de log habilitado
 notification.configuration.logNotifierEnabledHelp=Determina si el notificador de log está habilitado.
-notification.configuration.logNotifierNoisy=Notificador de log ruidoso
-notification.configuration.logNotifierNoisyHelp=Deterina si el notificador de log está activo incluso si el umbral de HealthCheck no se ha rebasado.
 notification.configuration.useSeparateLogFile=Utilizar un archivo aparte de log
 notification.configuration.useSeparateLogFileHelp=Determina si se utiliza un fichero separado de log para almacenar las notificaciones. Haz click en <a href="#{request.contextPath}/common/configuration/loggerGeneral.jsf?configName=#{pageSession.configName}">Configuración del log de notificaciones Payara</a> para editar la configuración de log para el servicio de notificaciones Payara. 
 tree.notification=Notificación
@@ -170,8 +168,6 @@ notification.configuration.notifier.enabled=Habilitar notificador
 notification.configuration.notifier.enabledHelp=Habilita o deshabilita el notificador de notificaciones.
 notification.configuration.notifier.dynamic=Notificador dinámico
 notification.configuration.notifier.dynamicHelp=Empieza o para el notificador de Payara si es requerido.
-notification.configuration.notifier.noisyLabel=Ruidoso
-notification.configuration.notifier.noisyLabelHelpText=No comprueba el umbral, siempre envía notificación
 notification.configuration.notifier.name=Nombre del servicio notificador
 notification.configuration.notifier.nameHelp=Nombre del servicio notificador
 

diff --git a/...-console-extras-l10n/src/main/resources/fish/payara/admingui/extras/Strings_ja.properties b/...-console-extras-l10n/src/main/resources/fish/payara/admingui/extras/Strings_ja.properties
@@ -199,8 +199,6 @@ notification.configuration.dynamic=\u52D5\u7684
 notification.configuration.dynamicHelp=\u5FC5\u8981\u306B\u5FDC\u3058\u3066Payara\u306E\u901A\u77E5\u30B5\u30FC\u30D3\u30B9\u3092\u958B\u59CB\u304A\u3088\u3073\u505C\u6B62\u3057\u307E\u3059\u3002
 notification.configuration.logNotifierEnabled=\u30ED\u30B0\u30FB\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1\u30A4\u30E4\u30FC\u6709\u52B9\u5316
 notification.configuration.logNotifierEnabledHelp=\u30ED\u30B0\u30FB\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1\u30A4\u30E4\u30FC\u3092\u6709\u52B9\u5316\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002
-notification.configuration.logNotifierNoisy=\u30ED\u30B0\u30FB\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1\u30A4\u30E4\u30FC (Noisy)
-notification.configuration.logNotifierNoisyHelp=\u30D8\u30EB\u30B9\u30C1\u30A7\u30C3\u30AF\u306E\u95BE\u5024\u304Cfine\u3067\u3082\u30ED\u30B0\u30FB\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1\u30A4\u30E4\u30FC\u3092\u6709\u52B9\u5316\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002
 notification.configuration.useSeparateLogFile=\u5225\u306E\u30ED\u30B0\u30D5\u30A1\u30A4\u30EB\u3092\u4F7F\u7528
 notification.configuration.useSeparateLogFileHelp=\u901A\u77E5\u306E\u8A18\u9332\u306B\u5225\u306E\u30ED\u30B0\u30D5\u30A1\u30A4\u30EB\u3092\u4F7F\u7528\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002<a href="#{request.contextPath}/common/configuration/loggerGeneral.jsf?configName=#{pageSession.configName}">Payara \u901A\u77E5\u30ED\u30AC\u30FC\u8A2D\u5B9A</a>\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066Payara\u901A\u77E5\u30B5\u30FC\u30D3\u30B9\u306E\u30ED\u30AE\u30F3\u30B0\u8A2D\u5B9A\u3092\u7DE8\u96C6\u3057\u307E\u3059\u3002
 tree.notification=\u901A\u77E5
@@ -209,8 +207,6 @@ notification.configuration.notifier.enabled=\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1
 notification.configuration.notifier.enabledHelp=\u901A\u77E5\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1\u30A4\u30E4\u30FC\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059\u3002
 notification.configuration.notifier.dynamic=\u52D5\u7684\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1\u30A4\u30E4\u30FC
 notification.configuration.notifier.dynamicHelp=\u5FC5\u8981\u306B\u5FDC\u3058\u3066Payara\u306E\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1\u30A4\u30E4\u30FC\u3092\u958B\u59CB\u307E\u305F\u306F\u505C\u6B62\u3057\u307E\u3059\u3002
-notification.configuration.notifier.noisyLabel=Noisy
-notification.configuration.notifier.noisyLabelHelpText=\u95BE\u5024\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u884C\u308F\u305A\u3001\u5E38\u306B\u3059\u3079\u3066\u901A\u77E5\u5BFE\u8C61\u306B\u3057\u307E\u3059\u3002
 notification.configuration.notifier.name=\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1\u30A4\u30E4\u30FC\u30FB\u30B5\u30FC\u30D3\u30B9\u540D
 notification.configuration.notifier.nameHelp=\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1\u30A4\u30E4\u30FC\u30FB\u30B5\u30FC\u30D3\u30B9\u306E\u540D\u79F0\u3067\u3059\u3002
 

diff --git a/...i/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties b/...i/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties
@@ -213,10 +213,10 @@ notification.configuration.enabled=Notification Service Enabled
 notification.configuration.enabledHelp=Determines whether the Notification Service is enabled.
 notification.configuration.dynamic=Dynamic
 notification.configuration.dynamicHelp=Starts or Stops the Notification Service in Payara if required.
+notification.configuration.filter=Filter Level
+notification.configuration.filterHelp=Notifications below this severity level will be ignored by the notifier.
 notification.configuration.logNotifierEnabled=Log Notifier Enabled
 notification.configuration.logNotifierEnabledHelp=Determines whether the Log Notifier is enabled.
-notification.configuration.logNotifierNoisy=Log Notifier Noisy
-notification.configuration.logNotifierNoisyHelp=Determines whether the Log Notifier is active even if HealthCheck's threshold is fine.
 notification.configuration.useSeparateLogFile=Use Separate Log File
 notification.configuration.useSeparateLogFileHelp=Determines whether to use separate log file for storing notifications. Click <a href="#{request.contextPath}/common/configuration/loggerGeneral.jsf?configName=#{pageSession.configName}">Payara Notification Logger Settings</a> to edit the logging settings for Payara Notification Service. 
 tree.notification=Notification
@@ -225,11 +225,10 @@ notification.configuration.notifier.enabled=Notifier Enable
 notification.configuration.notifier.enabledHelp=Enables or disables the Notification Notifier.
 notification.configuration.notifier.dynamic=Notifier Dynamic
 notification.configuration.notifier.dynamicHelp=Starts or Stops the Notifier in Payara if required.
-notification.configuration.notifier.noisyLabel=Noisy
-notification.configuration.notifier.noisyLabelHelpText=Does not check threshold, always apply notification
 notification.configuration.notifier.name=Notifier Service Name
 notification.configuration.notifier.nameHelp=Name of the Notifier Service
-
+notification.configuration.notifier.filter=Filter Level
+notification.configuration.notifier.filterHelp=Notifications below this severity level will be ignored by the notifier.
 
 requestTracing.configurationTitle=Request Tracing Configuration
 requestTracing.configurationTitleHelp=Enable and configure the settings for the Request Tracing Service.