Add json_field config interpolation

redpanda-data · Jul 26, 2018 · 381a2e4 · 381a2e4
1 parent 1688d3c
commit 381a2e4
Show file tree

Hide file tree

Showing 131 changed files with 387 additions and 304 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+### Added
+
+- New config interpolator function `json_field` for extracting parts of a JSON
+  message into a config value.
+
+### Changed
+
+- Log level config field no longer stutters, `logger.log_level` is now
+  `logger.level`.
+
 ## 0.19.1 - 2018-07-25
 
 ### Added

diff --git a/config/amazon_s3.json b/config/amazon_s3.json
@@ -54,7 +54,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/amazon_s3.yaml b/config/amazon_s3.yaml
@@ -44,7 +44,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/amazon_sqs.json b/config/amazon_sqs.json
@@ -46,7 +46,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/amazon_sqs.yaml b/config/amazon_sqs.yaml
@@ -36,7 +36,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/amqp.json b/config/amqp.json
@@ -44,7 +44,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/amqp.yaml b/config/amqp.yaml
@@ -36,7 +36,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/broker.json b/config/broker.json
@@ -34,7 +34,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/broker.yaml b/config/broker.yaml
@@ -26,7 +26,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/buffers.json b/config/buffers.json
@@ -43,7 +43,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/buffers.yaml b/config/buffers.yaml
@@ -33,7 +33,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/dynamic.json b/config/dynamic.json
@@ -35,7 +35,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/dynamic.yaml b/config/dynamic.yaml
@@ -27,7 +27,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/elasticsearch.json b/config/elasticsearch.json
@@ -43,7 +43,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/elasticsearch.yaml b/config/elasticsearch.yaml
@@ -33,7 +33,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/env/README.md b/config/env/README.md
@@ -378,7 +378,7 @@ OUTPUT_WEBSOCKET_URL                         = ws://localhost:4195/post/ws
 ```
 LOGGER_ADD_TIMESTAMP = true
 LOGGER_JSON_FORMAT   = true
-LOGGER_LOG_LEVEL     = INFO
+LOGGER_LEVEL         = INFO
 LOGGER_PREFIX        = benthos
 ```
 

diff --git a/config/env/default.yaml b/config/env/default.yaml
@@ -428,7 +428,7 @@ output:
 logger:
   add_timestamp: ${LOGGER_ADD_TIMESTAMP:true}
   json_format: ${LOGGER_JSON_FORMAT:true}
-  log_level: ${LOGGER_LOG_LEVEL:INFO}
+  level: ${LOGGER_LEVEL:INFO}
   prefix: ${LOGGER_PREFIX:benthos}
 metrics:
   prefix: ${METRICS_PREFIX:benthos}

diff --git a/config/everything.yaml b/config/everything.yaml
@@ -587,7 +587,7 @@ resources:
       xor: []
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/file.json b/config/file.json
@@ -35,7 +35,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/file.yaml b/config/file.yaml
@@ -27,7 +27,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/files.json b/config/files.json
@@ -31,7 +31,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/files.yaml b/config/files.yaml
@@ -23,7 +23,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/http_client.json b/config/http_client.json
@@ -91,7 +91,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/http_client.yaml b/config/http_client.yaml
@@ -74,7 +74,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/http_server.json b/config/http_server.json
@@ -42,7 +42,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/http_server.yaml b/config/http_server.yaml
@@ -34,7 +34,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/inproc.json b/config/inproc.json
@@ -27,7 +27,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/inproc.yaml b/config/inproc.yaml
@@ -21,7 +21,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/kafka.json b/config/kafka.json
@@ -54,7 +54,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/kafka.yaml b/config/kafka.yaml
@@ -44,7 +44,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/kafka_balanced.json b/config/kafka_balanced.json
@@ -41,7 +41,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/kafka_balanced.yaml b/config/kafka_balanced.yaml
@@ -31,7 +31,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/mqtt.json b/config/mqtt.json
@@ -43,7 +43,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/mqtt.yaml b/config/mqtt.yaml
@@ -32,7 +32,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/nats.json b/config/nats.json
@@ -37,7 +37,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/nats.yaml b/config/nats.yaml
@@ -27,7 +27,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/nats_stream.json b/config/nats_stream.json
@@ -44,7 +44,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/nats_stream.yaml b/config/nats_stream.yaml
@@ -34,7 +34,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/nsq.json b/config/nsq.json
@@ -43,7 +43,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/nsq.yaml b/config/nsq.yaml
@@ -33,7 +33,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/processors/archive.json b/config/processors/archive.json
@@ -41,7 +41,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},

diff --git a/config/processors/archive.yaml b/config/processors/archive.yaml
@@ -29,7 +29,7 @@ resources:
   conditions: {}
 logger:
   prefix: benthos
-  log_level: INFO
+  level: INFO
   add_timestamp: true
   json_format: true
 metrics:

diff --git a/config/processors/batch.json b/config/processors/batch.json
@@ -45,7 +45,7 @@
 	},
 	"logger": {
 		"prefix": "benthos",
-		"log_level": "INFO",
+		"level": "INFO",
 		"add_timestamp": true,
 		"json_format": true
 	},