+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/registration.js b/src/registration.js
index 981ee6aa..7ceee790 100644
--- a/src/registration.js
+++ b/src/registration.js
@@ -26,6 +26,7 @@ import ConfigAlertExotel from '@/components/config/alert/ConfigAlertExotel.vue';
import ConfigAlertGitter from '@/components/config/alert/ConfigAlertGitter.vue';
import ConfigAlertGoogleChat from '@/components/config/alert/ConfigAlertGoogleChat.vue';
import ConfigAlertHttpPost from '@/components/config/alert/ConfigAlertHttpPost.vue';
+import ConfigAlertHttpPost2 from '@/components/config/alert/ConfigAlertHttpPost2.vue';
import ConfigAlertJira from '@/components/config/alert/ConfigAlertJira.vue';
import ConfigAlertLineNotify from '@/components/config/alert/ConfigAlertLineNotify.vue';
import ConfigAlertMattermost from '@/components/config/alert/ConfigAlertMattermost.vue';
@@ -68,6 +69,7 @@ Vue.component('ConfigAlertExotel', ConfigAlertExotel);
Vue.component('ConfigAlertGitter', ConfigAlertGitter);
Vue.component('ConfigAlertGoogleChat', ConfigAlertGoogleChat);
Vue.component('ConfigAlertHttpPost', ConfigAlertHttpPost);
+Vue.component('ConfigAlertHttpPost2', ConfigAlertHttpPost2);
Vue.component('ConfigAlertJira', ConfigAlertJira);
Vue.component('ConfigAlertLineNotify', ConfigAlertLineNotify);
Vue.component('ConfigAlertMattermost', ConfigAlertMattermost);
diff --git a/src/store/config/alert.js b/src/store/config/alert.js
index e2d9cae8..857cd5ea 100644
--- a/src/store/config/alert.js
+++ b/src/store/config/alert.js
@@ -309,6 +309,13 @@ function initialState() {
httpPostCaCerts: false,
httpPostTimeout: '',
httpPostProxy: '',
+
+ /* HTTP POST 2 */
+ httpPost2Url: '',
+ httpPost2IgnoreSslErrors: false,
+ httpPost2CaCerts: false,
+ httpPost2Timeout: '',
+ httpPost2Proxy: '',
};
}
@@ -390,6 +397,27 @@ export default {
state.httpPostProxy = httpPostProxy;
},
+ /* HTTP POST 2 */
+ UPDATE_HTTP_POST2_URL(state, httpPost2Url) {
+ state.httpPost2Url = httpPost2Url;
+ },
+
+ UPDATE_HTTP_POST2_IGNORE_SSL_ERRORS(state, httpPost2IgnoreSslErrors) {
+ state.httpPost2IgnoreSslErrors = httpPost2IgnoreSslErrors;
+ },
+
+ UPDATE_HTTP_POST2_CA_CERTS(state, httpPost2CaCerts) {
+ state.httpPost2CaCerts = httpPost2CaCerts;
+ },
+
+ UPDATE_HTTP_POST2_TIMEOUT(state, httpPost2Timeout) {
+ state.httpPost2Timeout = httpPost2Timeout;
+ },
+
+ UPDATE_HTTP_POST2_PROXY(state, httpPost2Proxy) {
+ state.httpPost2Proxy = httpPost2Proxy;
+ },
+
/* EMail */
UPDATE_FROM_ADDR(state, fromAddr) {
state.fromAddr = fromAddr;
diff --git a/src/store/config/index.js b/src/store/config/index.js
index a41dfe17..81805353 100644
--- a/src/store/config/index.js
+++ b/src/store/config/index.js
@@ -235,6 +235,25 @@ export default {
commit('alert/UPDATE_HTTP_POST_PROXY', config.http_post_proxy);
+ /* HTTP POST 2 */
+ commit('alert/UPDATE_HTTP_POST2_URL', config.http_post2_url);
+
+ if (config.http_post2_ignore_ssl_errors) {
+ commit('alert/UPDATE_HTTP_POST2_IGNORE_SSL_ERRORS', config.http_post2_ignore_ssl_errors);
+ }
+
+ if (config.http_post2_ca_certs) {
+ commit('alert/UPDATE_HTTP_POST2_CA_CERTS', config.http_post2_ca_certs);
+ }
+
+ if (config.http_post2_timeout) {
+ commit('alert/UPDATE_HTTP_POST2_TIMEOUT', config.http_post2_timeout);
+ } else {
+ commit('alert/UPDATE_HTTP_POST2_TIMEOUT', 10);
+ }
+
+ commit('alert/UPDATE_HTTP_POST2_PROXY', config.http_post2_proxy);
+
/* EMail */
commit('alert/UPDATE_FROM_ADDR', config.from_addr);
commit('alert/UPDATE_REPLY_TO', config.email_reply_to);
@@ -1230,6 +1249,32 @@ export default {
return config;
},
+ http2(state) {
+ let config = {};
+
+ if (state.alert.httpPost2Url) {
+ config.http_post2_url = state.alert.httpPost2Url;
+ }
+
+ if (state.alert.httpPost2IgnoreSslErrors) {
+ config.http_post2_ignore_ssl_errors = state.alert.httpPost2IgnoreSslErrors;
+ }
+
+ if (state.alert.httpPost2CaCerts) {
+ config.http_post2_ca_certs = state.alert.httpPost2CaCerts;
+ }
+
+ if (state.alert.httpPost2Timeout) {
+ config.http_post2_timeout = state.alert.httpPost2Timeout;
+ }
+
+ if (state.alert.httpPost2Proxy) {
+ config.http_post2_proxy = state.alert.httpPost2Proxy;
+ }
+
+ return config;
+ },
+
aggregation(state) {
let config = {};
@@ -2467,6 +2512,10 @@ export default {
config = { ...config, ...getters.http };
}
+ if (state.alert.alert.includes('post2')) {
+ config = { ...config, ...getters.http2 };
+ }
+
if (state.alert.alert.includes('email')) {
config = { ...config, ...getters.email };
}
@@ -2576,6 +2625,7 @@ export default {
}
if (state.alert.alert.includes('email')
+ || state.alert.alert.includes('post2')
|| state.alert.alert.includes('slack')
|| state.alert.alert.includes('ms_teams')
|| state.alert.alert.includes('telegram')