From 3b70c41f6c91ddc012673ed8f6dd166f687c4164 Mon Sep 17 00:00:00 2001
From: Andreas Deininger <andreas@deininger.net>
Date: Mon, 27 Nov 2023 21:17:46 +0100
Subject: [PATCH] fix(input format json v2): correct wrong name of config
 option

---
 plugins/parsers/json_v2/README.md | 8 ++++----
 plugins/parsers/json_v2/parser.go | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/parsers/json_v2/README.md b/plugins/parsers/json_v2/README.md
index 992410c592f9f..77d910d309a5f 100644
--- a/plugins/parsers/json_v2/README.md
+++ b/plugins/parsers/json_v2/README.md
@@ -77,10 +77,10 @@ sections that follow these configuration keys are defined in more detail.
 * **measurement_name (OPTIONAL)**:  Will set the measurement name to the provided string.
 * **measurement_name_path (OPTIONAL)**: You can define a query with [GJSON Path Syntax](https://github.com/tidwall/gjson/blob/v1.7.5/SYNTAX.md) to set a measurement name from the JSON input. The query must return a single data value or it will use the default measurement name. This takes precedence over `measurement_name`.
 * **timestamp_path (OPTIONAL)**: You can define a query with [GJSON Path Syntax](https://github.com/tidwall/gjson/blob/v1.7.5/SYNTAX.md) to set a timestamp from the JSON input. The query must return a single data value or it will default to the current time.
-* **timestamp_format (OPTIONAL, but REQUIRED when timestamp_query is defined**: Must be set to `unix`, `unix_ms`, `unix_us`, `unix_ns`, or
+* **timestamp_format (OPTIONAL, but REQUIRED when timestamp_path is defined**: Must be set to `unix`, `unix_ms`, `unix_us`, `unix_ns`, or
 the Go "reference time" which is defined to be the specific time:
 `Mon Jan 2 15:04:05 MST 2006`
-* **timestamp_timezone (OPTIONAL, but REQUIRES timestamp_query**: This option should be set to a
+* **timestamp_timezone (OPTIONAL, but REQUIRES timestamp_path**: This option should be set to a
 [Unix TZ value](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones),
 such as `America/New_York`, to `Local` to utilize the system timezone, or to `UTC`. Defaults to `UTC`
 
@@ -162,10 +162,10 @@ TOML as an array table using double brackets.
 *Keys to define what JSON keys should be used as timestamps:*
 
 * **timestamp_key(OPTIONAL)**: You can define a json key (for a nested key, prepend the parent keys with underscores) for the value to be set as the timestamp from the JSON input.
-* **timestamp_format (OPTIONAL, but REQUIRED when timestamp_query is defined**: Must be set to `unix`, `unix_ms`, `unix_us`, `unix_ns`, or
+* **timestamp_format (OPTIONAL, but REQUIRED when timestamp_key is defined**: Must be set to `unix`, `unix_ms`, `unix_us`, `unix_ns`, or
 the Go "reference time" which is defined to be the specific time:
 `Mon Jan 2 15:04:05 MST 2006`
-* **timestamp_timezone (OPTIONAL, but REQUIRES timestamp_query**: This option should be set to a
+* **timestamp_timezone (OPTIONAL, but REQUIRES timestamp_key**: This option should be set to a
 [Unix TZ value](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones),
 such as `America/New_York`, to `Local` to utilize the system timezone, or to `UTC`. Defaults to `UTC`
 
diff --git a/plugins/parsers/json_v2/parser.go b/plugins/parsers/json_v2/parser.go
index b8be884ccc6ad..84334d2e4a2ab 100644
--- a/plugins/parsers/json_v2/parser.go
+++ b/plugins/parsers/json_v2/parser.go
@@ -24,7 +24,7 @@ type Parser struct {
 	DefaultTags       map[string]string `toml:"-"`
 	Log               telegraf.Logger   `toml:"-"`
 
-	// **** The struct fields bellow this comment are used for processing indvidual configs ****
+	// **** The struct fields bellow this comment are used for processing individual configs ****
 
 	// measurementName is the name of the current config used in each line protocol
 	measurementName string
@@ -165,7 +165,7 @@ func (p *Parser) parseCriticalPath(input []byte) ([]telegraf.Metric, error) {
 			}
 			if !result.IsArray() && !result.IsObject() {
 				if c.TimestampFormat == "" {
-					err := fmt.Errorf("use of 'timestamp_query' requires 'timestamp_format'")
+					err := fmt.Errorf("use of 'timestamp_path' requires 'timestamp_format'")
 					return nil, err
 				}
 
@@ -379,7 +379,7 @@ func (p *Parser) expandArray(result MetricNode, timestamp time.Time) ([]telegraf
 	} else {
 		if p.objectConfig.TimestampKey != "" && result.SetName == p.objectConfig.TimestampKey {
 			if p.objectConfig.TimestampFormat == "" {
-				err := fmt.Errorf("use of 'timestamp_query' requires 'timestamp_format'")
+				err := fmt.Errorf("use of 'timestamp_key' requires 'timestamp_format'")
 				return nil, err
 			}
 			var loc *time.Location