Added support for partial dim

Author: Mathieu

aws.go

@@ -54,15 +54,22 @@ func scrape(collector *cwCollector, ch chan<- prometheus.Metric) {
 		//This map will hold dimensions name which has been already collected
 		valueCollected :=  map[string]bool{}
 
-		//Check the special case where the user want all the values. A bit "hacky" but will do the job for now
-		if (len(metric.ConfMetric.DimensionsSelect)==0 && len(metric.ConfMetric.DimensionsSelectRegex)==0 ){
-			metric.ConfMetric.DimensionsSelectRegex=map[string]string{}
-			for _,dimension := range metric.ConfMetric.Dimensions {
+
+		if len(metric.ConfMetric.DimensionsSelectRegex) == 0 {
+			metric.ConfMetric.DimensionsSelectRegex =  map[string]string{}
+		}
+
+		//Check for dimensions who does not have either select or dimensions select_regex and make them select everything using regex
+		for _,dimension := range metric.ConfMetric.Dimensions {
+			_, found := metric.ConfMetric.DimensionsSelect[dimension]
+			_, found2 := metric.ConfMetric.DimensionsSelectRegex[dimension]
+			if !found && !found2 {
 				metric.ConfMetric.DimensionsSelectRegex[dimension]=".*"
 			}
 		}
 
 
+
 		for _, stat := range metric.ConfMetric.Statistics {
 			params.Statistics = append(params.Statistics, aws.String(stat))
 		}
@@ -136,6 +143,10 @@ func scrape(collector *cwCollector, ch chan<- prometheus.Metric) {
 			//Try to match each dimensions to the regex
 			for _,dim := range met.Dimensions {
 				dimRegex:=metric.ConfMetric.DimensionsSelectRegex[*dim.Name]
+				if(dimRegex==""){
+					dimRegex="\\b"+strings.Join(metric.ConfMetric.DimensionsSelect[*dim.Name],"\\b|\\b")+"\\b"
+				}
+
 				match,_:=regexp.MatchString(dimRegex,*dim.Value)
 				if match  {
 					dimensions=append(dimensions, &cloudwatch.Dimension{

config.yml

@@ -10,19 +10,29 @@ tasks:
       aws_statistics: [Average]
       range_seconds: 86400
 
- - name: billing-per-service
+ - name: billing-per-service-partial-dim
+   default_region: us-east-1
+   metrics:
+    - aws_namespace: "AWS/Billing"
+      aws_dimensions: [ServiceName,Currency]
+      aws_dimensions_select:
+        ServiceName: [AWSDataTransfer,AWSLambda]
+      aws_metric_name: EstimatedCharges
+      aws_statistics: [Average]
+      range_seconds: 86400
+
+ - name: billing-per-service-partial-dim-regex
    default_region: us-east-1
    metrics:
     - aws_namespace: "AWS/Billing"
       aws_dimensions: [ServiceName,Currency]
       aws_dimensions_select_regex:
         ServiceName: AWS.*
-        Currency: .*
       aws_metric_name: EstimatedCharges
       aws_statistics: [Average]
       range_seconds: 86400 
 
- - name: billing-per-service_no_dim
+ - name: billing-per-service-no-dim
    default_region: us-east-1
    metrics:
     - aws_namespace: "AWS/Billing"