Merge branch 'release/20190213-01'

johnsusek · Feb 13, 2019 · 32d665c · 32d665c
2 parents f37296c + 8861211
commit 32d665c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/config/api.config.json b/config/api.config.json
@@ -16,6 +16,8 @@
   },
   "es_host": "elasticsearch",
   "es_port": 9200,
+  "es_username": "",
+  "es_password": "",
   "es_ssl": false,
   "writeback_index": "praeco_elastalert_status"
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "praeco",
-  "version": "0.1.0",
+  "version": "0.3.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

diff --git a/src/components/config/ConfigCondition.vue b/src/components/config/ConfigCondition.vue
@@ -945,10 +945,11 @@ export default {
         this.spikeOrThreshold = 'spike';
       }
 
-      // if querykey and type is freq or flatline, set groupedOver to field
+      // if rule supports queryKey, set groupedOver to field
       if (
         this.queryKey &&
-        (this.type === 'frequency' || this.type === 'flatline')
+        ['metric_aggregation', 'freqeuncy', 'flatline',
+          'change', 'spike', 'flatline'].includes(this.type)
       ) {
         this.groupedOver = 'field';
       }

diff --git a/version.json b/version.json
@@ -1 +1 @@
-"v0.3.0"
+"v0.3.1"