Skip to content

Commit

Permalink
mattermost bugfix Item addition
Browse files Browse the repository at this point in the history
add
  mattermostAttachKibanaDiscoverUrl
  mattermostKibanaDiscoverColor
  mattermostKibanaDiscoverTitle
  mattermost_title
fix
  mattermost_title_link
  • Loading branch information
nsano-rururu committed Jun 9, 2021
1 parent 044ed3b commit 4f63a29
Show file tree
Hide file tree
Showing 3 changed files with 119 additions and 1 deletion.
71 changes: 71 additions & 0 deletions src/components/config/alert/ConfigAlert.vue
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,11 @@
</label>
</el-form-item>

<el-form-item label="Title" prop="mattermostTitle">
<el-input v-model="mattermostTitle" :disabled="viewOnly" />
<label>Sets a title for the message, this shows up as a blue text at the start of the message.</label>
</el-form-item>

<el-form-item label="Title Link" prop="mattermostTitleLink">
<el-input v-model="mattermostTitleLink" :disabled="viewOnly" />
<label>You can add a link in your Mattermost notification by setting this to a valid URL.</label>
Expand Down Expand Up @@ -700,6 +705,25 @@
<el-input v-model="mattermostAuthorIcon" :disabled="viewOnly" />
<label>An optional URL used to display a 16x16 pixel icon beside the author_name.</label>
</el-form-item>

<el-form-item label="Attach Kibana Discover URL" prop="mattermostAttachKibanaDiscoverUrl">
<el-switch
id="mattermostAttachKibanaDiscoverUrl"
v-model="mattermostAttachKibanaDiscoverUrl"
:disabled="viewOnly"
@change="changeMattermostAttachKibanaDiscoverUrl" />
</el-form-item>

<el-form-item label="Kibana Discover Color" prop="mattermostKibanaDiscoverColor">
<el-color-picker
v-model="mattermostKibanaDiscoverColor" :disabled="viewOnly" />
<label>The color of the Kibana Discover url attachment.</label>
</el-form-item>

<el-form-item label="Kibana Discover Title" prop="mattermostKibanaDiscoverTitle">
<el-input v-model="mattermostKibanaDiscoverTitle" :disabled="viewOnly" />
<label>The title of the Kibana Discover url attachment.</label>
</el-form-item>
</el-tab-pane>

<el-tab-pane v-if="alert.includes('command')">
Expand Down Expand Up @@ -3214,6 +3238,18 @@ export default {
}
},
mattermostTitle: {
get() {
return this.$store.state.config.alert.mattermostTitle;
},
set(value) {
this.$store.commit(
'config/alert/UPDATE_MATTERMOST_TITLE',
value
);
}
},
mattermostTitleLink: {
get() {
return this.$store.state.config.alert.mattermostTitleLink;
Expand Down Expand Up @@ -3310,6 +3346,33 @@ export default {
}
},
mattermostAttachKibanaDiscoverUrl: {
get() {
return this.$store.state.config.alert.mattermostAttachKibanaDiscoverUrl;
},
set(value) {
this.$store.commit('config/alert/UPDATE_MATTERMOST_ATTACH_KIBANA_DISCOVER_URL', value);
}
},
mattermostKibanaDiscoverColor: {
get() {
return this.$store.state.config.alert.mattermostKibanaDiscoverColor;
},
set(value) {
this.$store.commit('config/alert/UPDATE_MATTERMOST_KIBANA_DISCOVER_COLOR', value);
}
},
mattermostKibanaDiscoverTitle: {
get() {
return this.$store.state.config.alert.mattermostKibanaDiscoverTitle;
},
set(value) {
this.$store.commit('config/alert/UPDATE_MATTERMOST_KIBANA_DISCOVER_TITLE', value);
}
},
ms_teamsWebhookUrl: {
get() {
return this.$store.state.config.alert.ms_teamsWebhookUrl;
Expand Down Expand Up @@ -3783,6 +3846,14 @@ export default {
this.$set(this.realert, Object.keys(value)[0], Object.values(value)[0]);
},
changeMattermostAttachKibanaDiscoverUrl(val) {
if (val) {
this.mattermostAttachKibanaDiscoverUrl = true;
} else {
this.mattermostAttachKibanaDiscoverUrl = false;
}
},
changeSlackAttachKibanaDiscoverUrl(val) {
if (val) {
this.slackAttachKibanaDiscoverUrl = true;
Expand Down
22 changes: 21 additions & 1 deletion src/store/config/alert.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ function initialState() {
mattermostMsgPretext: '',
mattermostIgnoreSslErrors: false,
mattermostProxy: '',
mattermostTitle: '',
mattermostTitleLink: '',
mattermostFooter: '',
mattermostFooterIcon: '',
Expand All @@ -195,6 +196,9 @@ function initialState() {
mattermostAuthorName: '',
mattermostAuthorLink: '',
mattermostAuthorIcon: '',
mattermostAttachKibanaDiscoverUrl: false,
mattermostKibanaDiscoverColor: '#ec4b98',
mattermostKibanaDiscoverTitle: 'Discover in Kibana',

/* TheHive */
hiveAlertConfigTitle: '',
Expand Down Expand Up @@ -775,8 +779,12 @@ export default {
state.mattermostProxy = mattermostProxy;
},

UPDATE_MATTERMOST_TITLE(state, mattermostTitle) {
state.mattermostTitle = mattermostTitle;
},

UPDATE_MATTERMOST_TITLE_LINK(state, mattermostTitleLink) {
state.mattermostFooter = mattermostTitleLink;
state.mattermostTitleLink = mattermostTitleLink;
},

UPDATE_MATTERMOST_FOOTER(state, mattermostFooter) {
Expand Down Expand Up @@ -807,6 +815,18 @@ export default {
state.mattermostAuthorIcon = mattermostAuthorIcon;
},

UPDATE_MATTERMOST_ATTACH_KIBANA_DISCOVER_URL(state, mattermostAttachKibanaDiscoverUrl) {
state.mattermostAttachKibanaDiscoverUrl = mattermostAttachKibanaDiscoverUrl;
},

UPDATE_MATTERMOST_KIBANA_DISCOVER_COLOR(state, mattermostKibanaDiscoverColor) {
state.mattermostKibanaDiscoverColor = mattermostKibanaDiscoverColor;
},

UPDATE_MATTERMOST_KIBANA_DISCOVER_TITLE(state, mattermostKibanaDiscoverTitle) {
state.mattermostKibanaDiscoverTitle = mattermostKibanaDiscoverTitle;
},

/* Slack */
UPDATE_SLACK_CHANNEL_OVERRIDE(state, slackChannelOverride) {
state.slackChannelOverride = slackChannelOverride;
Expand Down
27 changes: 27 additions & 0 deletions src/store/config/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,7 @@ export default {
}

commit('alert/UPDATE_MATTERMOST_PROXY', config.mattermost_proxy);
commit('alert/UPDATE_MATTERMOST_TITLE', config.mattermost_title);
commit('alert/UPDATE_MATTERMOST_TITLE_LINK', config.mattermost_title_link);
commit('alert/UPDATE_MATTERMOST_FOOTER', config.mattermost_footer);
commit('alert/UPDATE_MATTERMOST_FOOTER_ICON', config.mattermost_footer_icon);
Expand All @@ -510,6 +511,18 @@ export default {
commit('alert/UPDATE_MATTERMOST_AUTHOR_LINK', config.mattermost_author_link);
commit('alert/UPDATE_MATTERMOST_AUTHOR_ICON', config.mattermost_author_icon);

if (config.mattermost_attach_kibana_discover_url) {
commit('alert/UPDATE_MATTERMOST_ATTACH_KIBANA_DISCOVER_URL', config.mattermost_attach_kibana_discover_url);
}

if (config.mattermost_kibana_discover_color) {
commit('alert/UPDATE_MATTERMOST_KIBANA_DISCOVER_COLOR', config.mattermost_kibana_discover_color);
}

if (config.mattermost_kibana_discover_color) {
commit('alert/UPDATE_MATTERMOST_KIBANA_DISCOVER_TITLE', config.mattermost_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);
Expand Down Expand Up @@ -1803,6 +1816,10 @@ export default {
config.mattermost_proxy = state.alert.mattermostProxy;
}

if (state.alert.mattermostTitle) {
config.mattermost_title = state.alert.mattermostTitle;
}

if (state.alert.mattermostTitleLink) {
config.mattermost_title_link = state.alert.mattermostTitleLink;
}
Expand Down Expand Up @@ -1835,6 +1852,16 @@ export default {
config.mattermost_author_icon = state.alert.mattermostAuthorIcon;
}

config.mattermost_attach_kibana_discover_url = state.alert.mattermostAttachKibanaDiscoverUrl;

if (state.alert.mattermostKibanaDiscoverColor) {
config.mattermost_kibana_discover_color = state.alert.mattermostKibanaDiscoverColor;
}

if (state.alert.mattermostKibanaDiscoverTitle) {
config.mattermost_kibana_discover_title = state.alert.mattermostKibanaDiscoverTitle;
}

return config;
},

Expand Down

0 comments on commit 4f63a29

Please sign in to comment.