Merge pull request #10 from PatriceT/master

Add settings for period and action per metric

Author: fauguste

alarmes.php

@@ -23,12 +23,15 @@
     $instanceId = file_get_contents("http://169.254.169.254/latest/meta-data/instance-id");
 }
 
+
 $client = getCloudWatchClient($conf);
 
 foreach ($conf->metrics as $metrics) {
     foreach ($metrics as $metricName => $metric) {
         $pluginName = isset($metric->{'plugin'})===true?$metric->{'plugin'}:$metricName;
         $className = "CloudWatchScript\\Plugins\\" . $pluginName  . "Monitoring";
+        $period = isset($metric->period) === true ? $metric->period : 300;
+        $action = isset($metric->action) === true ? $metric->action : $conf->alarms->action;
 
         $metricController = new $className($metric,  $metric->name);
 
@@ -37,17 +40,17 @@
                     'AlarmName' => $alarm["Name"],
                     'AlarmDescription' => $metric->description,
                     'ActionsEnabled' => true,
-                    'OKActions' => array($conf->alarms->action),
-                    'AlarmActions' => array($conf->alarms->action),
-                    'InsufficientDataActions' => array($conf->alarms->action),
+                    'OKActions' => array($action),
+                    'AlarmActions' => array($action),
+                    'InsufficientDataActions' => array($action),
                     'Dimensions' => array(
                                     array('Name' => 'InstanceId', 'Value' => $instanceId),
                                     array('Name' => 'Metrics', 'Value' => $metricName)
                     ),
                     'MetricName' => $metricController->getMetricName($alarm["Name"]),
                     'Namespace' => $metric->namespace,
                     'Statistic' => 'Average',
-                    'Period' => 300,
+                    'Period' => $period,
                     'Unit' => $metricController->getUnit($alarm["Name"]),
                     // EvaluationPeriods is required
                     'EvaluationPeriods' => 2,

conf/config_sample.json

@@ -2,7 +2,7 @@
     "aws": {
         "key":"YOUR_KEY",
         "secret":"YOUR_SECRET",
-        "region":"YUR_REGION",
+        "region":"YOUR_REGION",
         "instance":"INSTANCE_ID"
     },
     "alarms" : {
@@ -14,7 +14,9 @@
                 "name" : "Solr",
                 "url": "http://localhost:8080/solr/collection1/admin/ping",
                 "namespace": "YOUR_NAMESPACE",
-                "description": "YOUR_COMMENT"
+                "description": "YOUR_COMMENT",
+                "period": "YOUR_PERIOD (optional, must be 10, 30 or a multiple of 60)",
+                "action": "YOUR_SPECIFIC_ACTION_ARM (optional)"
             }
         }
     ]