Merge pull request #40 from ARGOeu/devel

Version 0.2.1

Author: themiszamani

.travis.yml

@@ -1,6 +1,8 @@
 language: python
-# Target py version 2.7
+# Target py version 3.6
 python:
-  - "2.7"
+  - "3.6"
 
-script: pytest
+script:
+  - pip install -r ./requirements.txt
+  - pytest

Jenkinsfile

@@ -0,0 +1,35 @@
+pipeline {
+    agent any
+    options {
+        checkoutToSubdirectory('argo-alert')
+    }
+    environment {
+        PROJECT_DIR="argo-alert"
+    }
+    stages {
+        stage ('Test Centos 7') {
+            agent {
+                docker {
+                    image 'argo.registry:5000/epel-7-ams'
+                    args '-u jenkins:jenkins'
+                }
+            }
+            steps {
+                sh '''
+                    cd ${WORKSPACE}/$PROJECT_DIR
+                    pipenv install -r requirements.txt
+                    pipenv run python setup.py install
+                    pipenv run coverage run --source=./argoalert -m py.test
+                    pipenv run coverage xml
+                    pipenv run py.test ./ --junitxml=./junit.xml
+                '''
+                cobertura coberturaReportFile: '**/coverage.xml'
+            }
+        }
+    }
+    post {
+        always {
+            cleanWs()
+        }
+    }
+}

README.md

@@ -137,6 +137,19 @@ of your own email aliases (before using client contact emails) issue:
 The rule list will be generated using the configured client sources but each client
 email will be replaced (using round-robin method) by a test-email (as defined in the cli arg list)
 
+Ingore notification flag for groups (top-level)
+-----------------------------------------------
+For the special case that top level groups have different notification flag requirement the special cli parameter 
+`--group-notification-flag` or `-g` can be used and set to `true` or `false`. 
+For example if config file honors the use of notification flag in general but user needs to turn it of for top level 
+groups, can issue:
+
+    $ argo-alert-rulegen -c /path/to/argo-alert.conf -g false
+
+The rule list will be generated using the configured client sources but each client
+email will be replaced (using round-robin method) by a test-email (as defined in the cli arg list)
+
+
 Run tests
 ---------