Merge branch 'graylog-6.3.7'

Author: VincentD06

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## [6.3.0](https://github.com/airbus-cyber/graylog-plugin-logging-alert/compare/6.1.7...6.3.0)
+### Changes
+* Change Graylog minimum version to 6.3.7
+
+
 ## [6.1.8](https://github.com/airbus-cyber/graylog-plugin-logging-alert/compare/6.1.7...6.1.8)
 ### Bug Fixes
 * Fix notification creation error ([issue #60](https://github.com/airbus-cyber/graylog-plugin-logging-alert/issues/60))

README.md

@@ -22,6 +22,7 @@ Alert example recorded as an internal log message:
 
 | Plugin Version | Graylog Version |
 |----------------|-----------------|
+| 6.3.x          | 6.3.7           |
 | 6.1.3+         | 6.1.4+          |
 | 6.1.0 to 6.1.2 | 6.1.0+          |
 | 6.0.0          | 6.0.x           |

package.json

@@ -1,21 +1,21 @@
 {
   "name": "LoggingAlert",
-  "version": "6.1.8",
+  "version": "6.3.0",
   "description": "Graylog plugin LoggingAlert Web Interface",
   "repository": {
     "type": "git",
     "url": "https://github.com/airbus-cyber/graylog-plugin-logging-alert"
   },
   "scripts": {
     "build": "webpack --bail",
-    "test": "jest"
+    "test": "jest",
+    "generate:apidefs": "echo skipGenerateApiDefs"
   },
   "keywords": [
     "graylog"
   ],
   "author": "Airbus CyberSecurity",
   "license": "SSPL-1.0",
-  "dependencies": {},
   "devDependencies": {
     "graylog-web-plugin": "file:../graylog2-server/graylog2-web-interface/packages/graylog-web-plugin",
     "urijs": "^1.19.11"

pom.xml

@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.graylog.plugins</groupId>
         <artifactId>graylog-plugin-web-parent</artifactId>
-        <version>6.1.4</version>
+        <version>6.3.7</version>
     </parent>
 
     <groupId>com.airbus-cyber-security.graylog</groupId>
     <artifactId>graylog-plugin-logging-alert</artifactId>
-    <version>6.1.8</version>
+    <version>6.3.0</version>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
     <description>Graylog ${project.artifactId} plugin.</description>

runtime/docker-compose.yml

@@ -8,6 +8,9 @@ services:
   mongo:
     image: "mongo:6.0"
     container_name: mongo
+    # uncomment to expose mongodb on localhost:27017
+    ports:
+      - 27017:27017
 
   # OpenSearch:
   # * https://hub.docker.com/r/opensearchproject/opensearch

src/web/components/event-notifications/LoggingAlertForm.tsx

@@ -14,9 +14,8 @@
  * along with this program. If not, see
  * <http://www.mongodb.com/licensing/server-side-public-license>.
  */
-import React from 'react';
-import PropTypes from 'prop-types';
 
+import React from 'react';
 import { ControlLabel, FormGroup, HelpBlock } from 'components/bootstrap';
 import lodash from 'lodash';
 // TODO this works, but should rather load the SourceCodeEditor from the index (it will then use lazy-loading)
@@ -46,50 +45,50 @@ class LoggingAlertForm extends React.Component<Props>  {
         this.state = {};
     }
 
-    componentDidMount() {
+	componentDidMount() {
         ConfigurationsActions.list(LOGGING_ALERT_CONFIG);
-    }
-
+	}
+  
     propagateChange = (key, value) => {
-        const { config, onChange } = this.props;
-        const nextConfig = lodash.cloneDeep(config);
-        nextConfig[key] = value;
-        onChange(nextConfig);
+	    const { config, onChange } = this.props;
+	    const nextConfig = lodash.cloneDeep(config);
+	    nextConfig[key] = value;
+	    onChange(nextConfig);
     };
 
     handleChange = (event) => {
-        const { name } = event.target;
-        this.propagateChange(name, FormsUtils.getValueFromInput(event.target));
+	    const { name } = event.target;
+	    this.propagateChange(name, FormsUtils.getValueFromInput(event.target));
     };
 
     handleBodyTemplateChange = (nextValue) => {
-        this.propagateChange('log_body', nextValue);
+	    this.propagateChange('log_body', nextValue);
     };
 
     handleFieldsChange = (key) => {
-        return nextValue => {
-            this.propagateChange(key, nextValue === '' ? [] : nextValue.split(','));
-        };
+  	    return nextValue => {
+  		    this.propagateChange(key, nextValue === '' ? [] : nextValue.split(','));
+	    };
     };
 
     getAlertConfig = (configuration) => {
-        if (configuration && configuration[LOGGING_ALERT_CONFIG]) {
-            if (this.props.config.log_body === undefined) {
-                this.handleBodyTemplateChange(configuration[LOGGING_ALERT_CONFIG].log_body);
-            }
-            if (this.props.config.alert_tag === undefined) {
-                this.propagateChange('alert_tag', configuration[LOGGING_ALERT_CONFIG].alert_tag);
-            }
-            return configuration[LOGGING_ALERT_CONFIG];
-        } else {
-            return {
-                log_body: DEFAULT_BODY_TEMPLATE,
-                alert_tag: 'LoggingAlert',
-                single_notification: false,
-            }
-        }
+  	    if (configuration && configuration[LOGGING_ALERT_CONFIG]) {
+		    if (this.props.config.log_body === undefined) {
+			    this.handleBodyTemplateChange(configuration[LOGGING_ALERT_CONFIG].log_body);
+		    }
+		    if (this.props.config.alert_tag === undefined) {
+			    this.propagateChange('alert_tag', configuration[LOGGING_ALERT_CONFIG].alert_tag);
+		    }
+  		    return configuration[LOGGING_ALERT_CONFIG];
+	    } else {
+  		    return {
+			    log_body: DEFAULT_BODY_TEMPLATE,
+			    alert_tag: 'LoggingAlert',
+			    single_notification: false,
+		    }
+	    }
     };
-
+    
     render() {
         const { config, validation } = this.props;
 
@@ -100,17 +99,18 @@ class LoggingAlertForm extends React.Component<Props>  {
             <React.Fragment>
                 <FormGroup controlId="log_body" validationState={validation.errors.log_body ? 'error' : null}>
                     <ControlLabel>Body Template</ControlLabel>
-                    <SourceCodeEditor id="log_body"
-                                      mode="text"
-                                      theme="light"
-                                      value={config.log_body? config.log_body : alertConfig.log_body}
-                                      onChange={this.handleBodyTemplateChange} />
+                    <SourceCodeEditor
+                        id="log_body"
+                        mode="text"
+                        theme="light"
+                        value={config.log_body? config.log_body : alertConfig.log_body}
+                        onChange={this.handleBodyTemplateChange} />
                     <HelpBlock>
                         {lodash.get(validation, 'errors.log_body[0]', 'The template to generate the log content form')}
                     </HelpBlock>
                 </FormGroup>
 
-                <ControlLabel>Alert Tag <small className="text-muted">(Optional)</small></ControlLabel>
+	            <ControlLabel>Alert Tag <small className="text-muted">(Optional)</small></ControlLabel>
                 <Input
                     id="alert_tag"
                     type="text"
@@ -119,7 +119,7 @@ class LoggingAlertForm extends React.Component<Props>  {
                     value={config.alert_tag? config.alert_tag : alertConfig.alert_tag}
                     onChange={this.handleChange}
                 />
-                <div>
+	            <div>
                     <Input
                         id="single_notification"
                         type="checkbox"
@@ -132,12 +132,12 @@ class LoggingAlertForm extends React.Component<Props>  {
                     <HelpBlock>
                         Check this box to send only one message by alert
                     </HelpBlock>
-                </div>
-            </React.Fragment>
+	            </div>
+	        </React.Fragment>
         );
     }
 }
 
 export default connect(LoggingAlertForm, {
     configurationsStore: ConfigurationsStore
-});
+});

src/web/components/event-notifications/LoggingAlertFormContainer.tsx

@@ -26,4 +26,4 @@ const LoggingAlertFormContainer = (props: Props) => {
     return <LoggingAlertForm {...props} />;
 }
 
-export default LoggingAlertFormContainer;
+export default LoggingAlertFormContainer;

validation/end_to_end/test_end_to_end.py

@@ -1,5 +1,6 @@
 from pytest import fixture
 from graylog.driver import Driver
+import re
 
 from playwright.sync_api import Page, expect
 
@@ -60,5 +61,5 @@ def test_plugin_logging_alert_configuration_cancel_button_should_close_popup_iss
 def test_plugin_logging_alert_configuration_window_close_should_close_popup_issue_50(page: Page):
     _go_to_plugin_configuration(page)
     page.get_by_role('button', name='Edit configuration').click()
-    page.get_by_text("×Close").click()
+    page.get_by_label('Update Logging Alert').get_by_role('button').filter(has_text=re.compile(r'^$')).click()
     expect(page.get_by_text('Update Logging Alert Notification Configuration')).not_to_be_attached()