Revert "Support Value Conversions (#172)"

This reverts commit ca13040.

Author: SuperQ

Diff for: README.md

@@ -60,18 +60,6 @@ modules:
         active: 1      # static value
         count: '{.count}' # dynamic value
         boolean: '{.some_boolean}'
-      
-    - name: example_convert
-      type: object
-      path: '{.values[0,1]}'
-      labels:
-        state: '{.state}'
-      values:
-        state: '{.state}'
-      valueconverter:
-        '{.state}': #convert value 'state' into a number
-          active: 1
-          inactive: 2
 
     headers:
       X-Dummy: my-test-header
@@ -82,8 +70,6 @@ Serving HTTP on 0.0.0.0 port 8000 ...
 $ ./json_exporter --config.file examples/config.yml &
 
 $ curl "http://localhost:7979/probe?module=default&target=http://localhost:8000/examples/data.json" | grep ^example
-example_convert_state{state="ACTIVE"} 1
-example_convert_state{state="INACTIVE"} 2
 example_global_value{environment="beta",location="planet-mars"} 1234
 example_value_active{environment="beta",id="id-A"} 1
 example_value_active{environment="beta",id="id-C"} 1

Diff for: config/config.go

@@ -30,11 +30,8 @@ type Metric struct {
 	EpochTimestamp string
 	Help           string
 	Values         map[string]string
-	ValueConverter ValueConverterType
 }
 
-type ValueConverterType map[string]map[string]string
-
 type ScrapeType string
 
 const (

Diff for: examples/config.yml

@@ -25,19 +25,6 @@ modules:
         active: 1      # static value
         count: '{.count}' # dynamic value
         boolean: '{.some_boolean}'
-
-    - name: example_convert
-      type: object
-      path: '{.values[0,1]}'
-      labels:
-        state: '{.state}'
-      values:
-        state: '{.state}'
-      valueconverter:
-        '{.state}': #convert value 'state' in JSON into a number
-          active: 1
-          inactive: 2
-
     headers:
       X-Dummy: my-test-header
 

Diff for: exporter/collector.go

@@ -16,7 +16,6 @@ package exporter
 import (
 	"bytes"
 	"encoding/json"
-	"strings"
 	"time"
 
 	"github.com/go-kit/log"
@@ -39,7 +38,6 @@ type JSONMetric struct {
 	ValueJSONPath          string
 	LabelsJSONPaths        []string
 	ValueType              prometheus.ValueType
-	ValueConverter         config.ValueConverterType
 	EpochTimestampJSONPath string
 }
 
@@ -88,14 +86,11 @@ func (mc JSONMetricCollector) Collect(ch chan<- prometheus.Metric) {
 						continue
 					}
 					value, err := extractValue(mc.Logger, jdata, m.ValueJSONPath, false)
-
 					if err != nil {
 						level.Error(mc.Logger).Log("msg", "Failed to extract value for metric", "path", m.ValueJSONPath, "err", err, "metric", m.Desc)
 						continue
 					}
 
-					value = convertValueIfNeeded(m, value)
-
 					if floatValue, err := SanitizeValue(value); err == nil {
 						metric := prometheus.MustNewConstMetric(
 							m.Desc,
@@ -166,19 +161,6 @@ func extractLabels(logger log.Logger, data []byte, paths []string) []string {
 	return labels
 }
 
-// Returns the conversion of the dynamic value- if it exists in the ValueConverter configuration
-func convertValueIfNeeded(m JSONMetric, value string) string {
-	if m.ValueConverter != nil {
-		if valueMappings, hasPathKey := m.ValueConverter[m.ValueJSONPath]; hasPathKey {
-			value = strings.ToLower(value)
-
-			if _, hasValueKey := valueMappings[value]; hasValueKey {
-				value = valueMappings[value]
-			}
-		}
-	}
-	return value
-}
 func timestampMetric(logger log.Logger, m JSONMetric, data []byte, pm prometheus.Metric) prometheus.Metric {
 	if m.EpochTimestampJSONPath == "" {
 		return pm

Diff for: exporter/util.go

@@ -118,9 +118,6 @@ func CreateMetricsList(c config.Module) ([]JSONMetric, error) {
 					variableLabels = append(variableLabels, k)
 					variableLabelsValues = append(variableLabelsValues, v)
 				}
-
-				var valueConverters config.ValueConverterType = initializeValueConverter(metric)
-
 				jsonMetric := JSONMetric{
 					Type: config.ObjectScrape,
 					Desc: prometheus.NewDesc(
@@ -133,7 +130,6 @@ func CreateMetricsList(c config.Module) ([]JSONMetric, error) {
 					ValueJSONPath:          valuePath,
 					LabelsJSONPaths:        variableLabelsValues,
 					ValueType:              valueType,
-					ValueConverter:         valueConverters,
 					EpochTimestampJSONPath: metric.EpochTimestamp,
 				}
 				metrics = append(metrics, jsonMetric)
@@ -249,22 +245,3 @@ func renderBody(logger log.Logger, body config.Body, tplValues url.Values) (meth
 	}
 	return
 }
-
-// Initializes and returns a ValueConverter object. nil if there aren't any conversions
-func initializeValueConverter(metric config.Metric) config.ValueConverterType {
-	var valueConverters config.ValueConverterType
-
-	//convert all keys to lowercase
-	if metric.ValueConverter != nil {
-		valueConverters = make(config.ValueConverterType)
-		for valuesKey, innerMap := range metric.ValueConverter {
-			//make the mappings for each value key lowercase
-			valueConverters[valuesKey] = make(map[string]string)
-			for conversionFrom, conversionTo := range innerMap {
-				valueConverters[valuesKey][strings.ToLower(conversionFrom)] = conversionTo
-			}
-		}
-	}
-
-	return valueConverters
-}