Skip to content

Commit

Permalink
Merge branch 'release/20181024-01'
Browse files Browse the repository at this point in the history
  • Loading branch information
johnsusek committed Oct 24, 2018
2 parents f225a6b + bc0c5e6 commit ee93f99
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 6 deletions.
20 changes: 20 additions & 0 deletions MAINTENANCE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Building download latest.zip

Any time the configs, the Dockerfile or docker-compose.yml change, run this script to create a new latest.zip file.
This zip file contains only what is needed to run praeco for end users, and is linked to from documentation.

`./build_download.sh`

# Updating packages

Run `npm install` to install latest versions of packages per package.json.

# Checklist for new prod release

- Stash all changes in elastalert project
- Create docker image + tag + push to servercentral/elastalert

- Run tests
- Recreate latest.zip if neccessary
- Stash all changes in this project; make sure in `master`
- Create docker image + tag + push to servercentral/praeco (Drone does this for us)
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ Praeco is an alerting tool for elasticsearch – a GUI for [elastalert](https://

## Quickstart

If you have an existing elastalert installation, you should edit config/api.config.json and config/elastalert.yaml and change the writeback_index to something unique.

```bash
export PRAECO_ELASTICSEARCH=<your elasticsearch ip>
docker-compose up
Expand Down
2 changes: 1 addition & 1 deletion config/api.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
},
"es_host": "elasticsearch",
"es_port": 9200,
"writeback_index": "elastalert_status"
"writeback_index": "praeco_elastalert_status"
}
2 changes: 1 addition & 1 deletion config/elastalert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ buffer_time:
# The index on es_host which is used for metadata storage
# This can be a unmapped index, but it is recommended that you run
# elastalert-create-index to set a mapping
writeback_index: elastalert_status
writeback_index: praeco_elastalert_status

# If an alert fails for some reason, ElastAlert will retry
# sending the alert until this time period has elapsed
Expand Down
Binary file modified download/latest.zip
Binary file not shown.
6 changes: 4 additions & 2 deletions src/store/configs.js
Original file line number Diff line number Diff line change
Expand Up @@ -286,10 +286,11 @@ export default {
});

if (res.data.created) {
config.is_enabled = false;
commit('UPDATED_CONFIG', {
path: conf.__praeco_full_path,
type: 'rules',
config: conf
config
});
return true;
}
Expand Down Expand Up @@ -326,10 +327,11 @@ export default {
});

if (res.data.created) {
config.is_enabled = true;
commit('UPDATED_CONFIG', {
path: conf.__praeco_full_path,
type: 'rules',
config: conf
config
});
return true;
}
Expand Down

0 comments on commit ee93f99

Please sign in to comment.