7c5ed8 Merge branch 'cboltz-monitoring' into 'production'

Merged and Committed by Christian Boltz 6 years ago
    Merge branch 'cboltz-monitoring' into 'production'
    
    add profile.monitoring and salt the monitoring checks
    
    See merge request infra/salt!96
        
file modified
+21 -7
file modified
+11 -10
file modified
+4 -0
file added
+319
file modified
+6 -0
file modified
+1 -0