From 5e15d166830b2c0dec632a18d966791bcda3eb59 Mon Sep 17 00:00:00 2001 From: nsano-rururu Date: Fri, 18 Jun 2021 22:42:32 +0900 Subject: [PATCH 1/3] Rocket.Chat add kibana discover --- package-lock.json | 4 +- src/components/config/alert/ConfigAlert.vue | 54 +++++++++++++++++++++ src/store/config/alert.js | 15 ++++++ src/store/config/index.js | 23 +++++++++ 4 files changed, 94 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index c8b44156..d18de83e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "praeco", - "version": "1.8.6", + "version": "1.8.7", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "1.8.6", + "version": "1.8.7", "dependencies": { "@babel/core": "7.14.0", "@browser-bunyan/server-stream": "1.6.1", diff --git a/src/components/config/alert/ConfigAlert.vue b/src/components/config/alert/ConfigAlert.vue index 33498f68..3b5b4c82 100644 --- a/src/components/config/alert/ConfigAlert.vue +++ b/src/components/config/alert/ConfigAlert.vue @@ -1597,6 +1597,25 @@ Set this option using hostname:port if you need to use a proxy. + + + + + + + + + + + + + + @@ -3493,6 +3512,33 @@ export default { } }, + rocketChatAttachKibanaDiscoverUrl: { + get() { + return this.$store.state.config.alert.rocketChatAttachKibanaDiscoverUrl; + }, + set(value) { + this.$store.commit('config/alert/UPDATE_ROCKET_CHAT_ATTACH_KIBANA_DISCOVER_URL', value); + } + }, + + rocketChatKibanaDiscoverColor: { + get() { + return this.$store.state.config.alert.rocketChatKibanaDiscoverColor; + }, + set(value) { + this.$store.commit('config/alert/UPDATE_ROCKET_CHAT_KIBANA_DISCOVER_COLOR', value); + } + }, + + rocketChatKibanaDiscoverTitle: { + get() { + return this.$store.state.config.alert.rocketChatKibanaDiscoverTitle; + }, + set(value) { + this.$store.commit('config/alert/UPDATE_ROCKET_CHAT_KIBANA_DISCOVER_TITLE', value); + } + }, + ms_teamsWebhookUrl: { get() { return this.$store.state.config.alert.ms_teamsWebhookUrl; @@ -3966,6 +4012,14 @@ export default { this.$set(this.realert, Object.keys(value)[0], Object.values(value)[0]); }, + changeRocketChatAttachKibanaDiscoverUrl(val) { + if (val) { + this.rocketChatAttachKibanaDiscoverUrl = true; + } else { + this.rocketChatAttachKibanaDiscoverUrl = false; + } + }, + changeMattermostAttachKibanaDiscoverUrl(val) { if (val) { this.mattermostAttachKibanaDiscoverUrl = true; diff --git a/src/store/config/alert.js b/src/store/config/alert.js index 07f5a32b..b02c97ee 100644 --- a/src/store/config/alert.js +++ b/src/store/config/alert.js @@ -207,6 +207,9 @@ function initialState() { rocketChatMsgColor: 'danger', rocketChatTextString: '', rocketChatProxy: '', + rocketChatAttachKibanaDiscoverUrl: false, + rocketChatKibanaDiscoverColor: '#ec4b98', + rocketChatKibanaDiscoverTitle: 'Discover in Kibana', /* TheHive */ hiveAlertConfigTitle: '', @@ -860,6 +863,18 @@ export default { state.rocketChatProxy = rocketChatProxy; }, + UPDATE_ROCKET_CHAT_ATTACH_KIBANA_DISCOVER_URL(state, rocketChatAttachKibanaDiscoverUrl) { + state.rocketChatAttachKibanaDiscoverUrl = rocketChatAttachKibanaDiscoverUrl; + }, + + UPDATE_ROCKET_CHAT_KIBANA_DISCOVER_COLOR(state, rocketChatKibanaDiscoverColor) { + state.rocketChatKibanaDiscoverColor = rocketChatKibanaDiscoverColor; + }, + + UPDATE_ROCKET_CHAT_KIBANA_DISCOVER_TITLE(state, rocketChatKibanaDiscoverTitle) { + state.rocketChatKibanaDiscoverTitle = rocketChatKibanaDiscoverTitle; + }, + /* Slack */ UPDATE_SLACK_CHANNEL_OVERRIDE(state, slackChannelOverride) { state.slackChannelOverride = slackChannelOverride; diff --git a/src/store/config/index.js b/src/store/config/index.js index f161c13b..6bd421ac 100644 --- a/src/store/config/index.js +++ b/src/store/config/index.js @@ -547,6 +547,18 @@ export default { commit('alert/UPDATE_ROCKET_CHAT_TEXT_STRING', config.rocket_chat_text_string); commit('alert/UPDATE_ROCKET_CHAT_PROXY', config.rocket_chat_proxy); + if (config.rocket_chat_attach_kibana_discover_url) { + commit('alert/UPDATE_ROCKET_CHAT_ATTACH_KIBANA_DISCOVER_URL', config.rocket_chat_attach_kibana_discover_url); + } + + if (config.rocket_chat_kibana_discover_color) { + commit('alert/UPDATE_ROCKET_CHAT_KIBANA_DISCOVER_COLOR', config.rocket_chat_kibana_discover_color); + } + + if (config.rocket_chat_kibana_discover_color) { + commit('alert/UPDATE_ROCKET_CHAT_KIBANA_DISCOVER_TITLE', config.rocket_chat_kibana_discover_title); + } + /* TheHive */ if (config.hive_alert_config && config.hive_alert_config.title) { commit('alert/UPDATE_HIVE_ALERT_CONFIG_TITLE', config.hive_alert_config.title); @@ -1144,6 +1156,7 @@ export default { } else { config.generate_kibana_discover_url = false; config.slack_attach_kibana_discover_url = false; + config.rocket_chat_attach_kibana_discover_url = false; } if (state.alert.kibanaDiscoverAppUrl) { @@ -1916,6 +1929,16 @@ export default { config.rocket_chat_proxy = state.alert.rocketChatProxy; } + config.rocket_chat_attach_kibana_discover_url = state.alert.rocketChatAttachKibanaDiscoverUrl; + + if (state.alert.rocketChatKibanaDiscoverColor) { + config.rocket_chat_kibana_discover_color = state.alert.rocketChatKibanaDiscoverColor; + } + + if (state.alert.rocketChatKibanaDiscoverTitle) { + config.rocket_chat_kibana_discover_title = state.alert.rocketChatKibanaDiscoverTitle; + } + return config; }, From 6ec3d1d1567143ee9ad6ce4bb25f91b99d96156b Mon Sep 17 00:00:00 2001 From: nsano-rururu Date: Tue, 29 Jun 2021 00:02:48 +0900 Subject: [PATCH 2/3] Added Rocket.Chat settings rocket_chat_ca_certs rocket_chat_ignore_ssl_errors rocket_chat_timeout --- src/components/config/alert/ConfigAlert.vue | 75 +++++++++++++++++++++ src/store/config/alert.js | 15 +++++ src/store/config/index.js | 25 +++++++ 3 files changed, 115 insertions(+) diff --git a/src/components/config/alert/ConfigAlert.vue b/src/components/config/alert/ConfigAlert.vue index 3b5b4c82..9359a2a4 100644 --- a/src/components/config/alert/ConfigAlert.vue +++ b/src/components/config/alert/ConfigAlert.vue @@ -1616,6 +1616,30 @@ + + + + + + + + + + + + + @@ -3548,6 +3572,41 @@ export default { } }, + rocketChatIgnoreSslErrors: { + get() { + return this.$store.state.config.alert.rocketChatIgnoreSslErrors; + }, + set(value) { + this.$store.commit( + 'config/alert/UPDATE_ROCKET_CHAT_IGNORE_SSL_ERRORS', + value + ); + } + }, + + rocketChatCaCerts: { + get() { + return this.$store.state.config.alert.rocketChatCaCerts; + }, + set(value) { + this.$store.commit( + 'config/alert/UPDATE_ROCKET_CHAT_CA_CERTS', + value + ); + } + }, + rocketChatTimeout: { + get() { + return this.$store.state.config.alert.rocketChatTimeout; + }, + set(value) { + this.$store.commit( + 'config/alert/UPDATE_ROCKET_CHAT_TIMEOUT', + value + ); + } + }, + ms_teamsThemeColor: { get() { return this.$store.state.config.alert.ms_teamsThemeColor; @@ -3874,6 +3933,22 @@ export default { } }, + changeRocketChatIgnoreSslErrors(val) { + if (val) { + this.rocketChatIgnoreSslErrors = true; + } else { + this.rocketChatIgnoreSslErrors = false; + } + }, + + changeRocketChatCaCerts(val) { + if (val) { + this.rocketChatCaCerts = true; + } else { + this.rocketChatCaCerts = false; + } + }, + async validate() { try { if (this.$refs.hiveAlertConfigTags) { diff --git a/src/store/config/alert.js b/src/store/config/alert.js index b02c97ee..096b7497 100644 --- a/src/store/config/alert.js +++ b/src/store/config/alert.js @@ -210,6 +210,9 @@ function initialState() { rocketChatAttachKibanaDiscoverUrl: false, rocketChatKibanaDiscoverColor: '#ec4b98', rocketChatKibanaDiscoverTitle: 'Discover in Kibana', + rocketChatIgnoreSslErrors: false, + rocketChatCaCerts: false, + rocketChatTimeout: 10, /* TheHive */ hiveAlertConfigTitle: '', @@ -875,6 +878,18 @@ export default { state.rocketChatKibanaDiscoverTitle = rocketChatKibanaDiscoverTitle; }, + UPDATE_ROCKET_CHAT_IGNORE_SSL_ERRORS(state, rocketChatIgnoreSslErrors) { + state.rocketChatIgnoreSslErrors = rocketChatIgnoreSslErrors; + }, + + UPDATE_ROCKET_CHAT_CA_CERTS(state, rocketChatCaCerts) { + state.rocketChatCaCerts = rocketChatCaCerts; + }, + + UPDATE_ROCKET_CHAT_TIMEOUT(state, rocketChatTimeout) { + state.rocketChatTimeout = rocketChatTimeout; + }, + /* Slack */ UPDATE_SLACK_CHANNEL_OVERRIDE(state, slackChannelOverride) { state.slackChannelOverride = slackChannelOverride; diff --git a/src/store/config/index.js b/src/store/config/index.js index 03c6bd77..4d56d80b 100644 --- a/src/store/config/index.js +++ b/src/store/config/index.js @@ -559,6 +559,24 @@ export default { commit('alert/UPDATE_ROCKET_CHAT_KIBANA_DISCOVER_TITLE', config.rocket_chat_kibana_discover_title); } + if (config.rocket_chat_ignore_ssl_errors) { + commit('alert/UPDATE_ROCKET_CHAT_IGNORE_SSL_ERRORS', config.rocket_chat_ignore_ssl_errors); + } else { + commit('alert/UPDATE_ROCKET_CHAT_IGNORE_SSL_ERRORS', false); + } + + if (config.rocket_chat_timeout) { + commit('alert/UPDATE_ROCKET_CHAT_TIMEOUT', config.rocket_chat_timeout); + } else { + commit('alert/UPDATE_ROCKET_CHAT_TIMEOUT', 10); + } + + if (config.rocket_chat_ca_certs) { + commit('alert/UPDATE_ROCKET_CHAT_CA_CERTS', config.rocket_chat_ca_certs); + } else { + commit('alert/UPDATE_ROCKET_CHAT_CA_CERTS', false); + } + /* TheHive */ if (config.hive_alert_config && config.hive_alert_config.title) { commit('alert/UPDATE_HIVE_ALERT_CONFIG_TITLE', config.hive_alert_config.title); @@ -1184,6 +1202,13 @@ export default { config.kibana_discover_to_timedelta = state.alert.kibanaDiscoverToTimedelta; } + config.rocket_chat_ignore_ssl_errors = state.alert.rocketChatIgnoreSslErrors; + config.rocket_chat_ca_certs = state.alert.rocketChatCaCerts; + + if (state.alert.rocketChatTimeout) { + config.rocket_chat_timeout = state.alert.rocketChatTimeout; + } + return config; }, From b767f87f6b03838fef3e2a0d943acd2f1ecedff4 Mon Sep 17 00:00:00 2001 From: nsano-rururu Date: Thu, 1 Jul 2021 21:20:05 +0900 Subject: [PATCH 3/3] Add impact and urgency the servicenow alerter --- src/components/config/alert/ConfigAlert.vue | 40 +++++++++++++++++++++ src/store/config/alert.js | 10 ++++++ src/store/config/index.js | 10 ++++++ 3 files changed, 60 insertions(+) diff --git a/src/components/config/alert/ConfigAlert.vue b/src/components/config/alert/ConfigAlert.vue index 3cff5a42..1d643350 100644 --- a/src/components/config/alert/ConfigAlert.vue +++ b/src/components/config/alert/ConfigAlert.vue @@ -1266,6 +1266,22 @@ Set this option using hostname:port if you need to use a proxy. + + + + + + + + + + @@ -2819,6 +2835,30 @@ export default { } }, + servicenowImpact: { + get() { + return this.$store.state.config.alert.servicenowImpact; + }, + set(value) { + this.$store.commit( + 'config/alert/UPDATE_SERVICENOW_IMPACT', + value + ); + } + }, + + servicenowUrgency: { + get() { + return this.$store.state.config.alert.servicenowUrgency; + }, + set(value) { + this.$store.commit( + 'config/alert/UPDATE_SERVICENOW_URGENCY', + value + ); + } + }, + victoropsApiKey: { get() { return this.$store.state.config.alert.victoropsApiKey; diff --git a/src/store/config/alert.js b/src/store/config/alert.js index f9d7a0cc..0d8ad200 100644 --- a/src/store/config/alert.js +++ b/src/store/config/alert.js @@ -166,6 +166,8 @@ function initialState() { servicenowCmdbCi: '', servicenowCallerId: '', servicenowProxy: '', + servicenowImpact: 1, + servicenowUrgency: 1, /* VictorOps */ victoropsApiKey: '', @@ -728,6 +730,14 @@ export default { state.servicenowProxy = servicenowProxy; }, + UPDATE_SERVICENOW_IMPACT(state, servicenowImpact) { + state.servicenowImpact = servicenowImpact; + }, + + UPDATE_SERVICENOW_URGENCY(state, servicenowUrgency) { + state.servicenowUrgency = servicenowUrgency; + }, + /* VictorOps */ UPDATE_VICTOROPS_API_KEY(state, victoropsApiKey) { state.victoropsApiKey = victoropsApiKey; diff --git a/src/store/config/index.js b/src/store/config/index.js index 376c1657..1326d30b 100644 --- a/src/store/config/index.js +++ b/src/store/config/index.js @@ -420,6 +420,8 @@ export default { commit('alert/UPDATE_SERVICENOW_CMDB_CI', config.cmdb_ci); commit('alert/UPDATE_SERVICENOW_CALLER_ID', config.caller_id); commit('alert/UPDATE_SERVICENOW_PROXY', config.servicenow_proxy); + commit('alert/UPDATE_SERVICENOW_IMPACT', config.servicenow_impact); + commit('alert/UPDATE_SERVICENOW_URGENCY', config.servicenow_urgency); /* VictorOps */ commit('alert/UPDATE_VICTOROPS_API_KEY', config.victorops_api_key); @@ -1804,6 +1806,14 @@ export default { config.servicenow_proxy = state.alert.servicenowProxy; } + if (state.alert.servicenowImpact) { + config.servicenow_impact = state.alert.servicenowImpact; + } + + if (state.alert.servicenowUrgency) { + config.servicenow_urgency = state.alert.servicenowUrgency; + } + return config; },