replace fields group naming (#12750)

- replace group naming for kubescheduler scheduling
elastic · Jul 2, 2019 · 8f0412d · 8f0412d
1 parent 03dc081
commit 8f0412d
Show file tree

Hide file tree

Showing 7 changed files with 222 additions and 228 deletions.
diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -15526,7 +15526,7 @@ type: boolean
 --
 
 
-*`kubernetes.scheduler.scheduler.e2e.duration.us.bucket.*`*::
+*`kubernetes.scheduler.scheduling.e2e.duration.us.bucket.*`*::
 +
 --
 End to end scheduling duration microseconds
@@ -15535,7 +15535,7 @@ type: object
 
 --
 
-*`kubernetes.scheduler.scheduler.e2e.duration.us.sum`*::
+*`kubernetes.scheduler.scheduling.e2e.duration.us.sum`*::
 +
 --
 End to end scheduling duration microseconds sum
@@ -15544,7 +15544,7 @@ type: long
 
 --
 
-*`kubernetes.scheduler.scheduler.e2e.duration.us.count`*::
+*`kubernetes.scheduler.scheduling.e2e.duration.us.count`*::
 +
 --
 End to end scheduling count
@@ -15553,7 +15553,7 @@ type: long
 
 --
 
-*`kubernetes.scheduler.scheduler.pod.preemption.victims.count`*::
+*`kubernetes.scheduler.scheduling.pod.preemption.victims.count`*::
 +
 --
 Pod preemption victims
@@ -15562,7 +15562,7 @@ type: long
 
 --
 
-*`kubernetes.scheduler.scheduler.pod.attempts.count`*::
+*`kubernetes.scheduler.scheduling.pod.attempts.count`*::
 +
 --
 Pod attempts count
@@ -15571,7 +15571,7 @@ type: long
 
 --
 
-*`kubernetes.scheduler.scheduler.duration.seconds.percentile.*`*::
+*`kubernetes.scheduler.scheduling.duration.seconds.percentile.*`*::
 +
 --
 Scheduling duration percentiles
@@ -15580,7 +15580,7 @@ type: object
 
 --
 
-*`kubernetes.scheduler.scheduler.duration.seconds.sum`*::
+*`kubernetes.scheduler.scheduling.duration.seconds.sum`*::
 +
 --
 Scheduling duration cumulative sum
@@ -15589,7 +15589,7 @@ type: double
 
 --
 
-*`kubernetes.scheduler.scheduler.duration.seconds.count`*::
+*`kubernetes.scheduler.scheduling.duration.seconds.count`*::
 +
 --
 Scheduling count

diff --git a/metricbeat/module/kubernetes/fields.go b/metricbeat/module/kubernetes/fields.go
diff --git a/metricbeat/module/kubernetes/scheduler/_meta/data.json b/metricbeat/module/kubernetes/scheduler/_meta/data.json
@@ -7,20 +7,14 @@
     },
     "kubernetes": {
         "scheduler": {
-            "operation": "binding",
-            "scheduler": {
-                "duration": {
-                    "seconds": {
-                        "count": 3,
-                        "percentile": {
-                            "50": 0.012318629,
-                            "90": 0.012921477,
-                            "99": 0.012921477
-                        },
-                        "sum": 0.039052979
-                    }
+            "client": {
+                "request": {
+                    "count": 4631
                 }
-            }
+            },
+            "code": "200",
+            "host": "localhost:8443",
+            "method": "PUT"
         }
     },
     "metricset": {

diff --git a/metricbeat/module/kubernetes/scheduler/_meta/fields.yml b/metricbeat/module/kubernetes/scheduler/_meta/fields.yml
@@ -99,7 +99,7 @@
     description: >
       Whether the node is master
 
-  - name: scheduler
+  - name: scheduling
     type: group
     fields:
       - name: e2e.duration.us.bucket.*

diff --git a/metricbeat/module/kubernetes/scheduler/_meta/test/metrics.scheduler.1.14.expected b/metricbeat/module/kubernetes/scheduler/_meta/test/metrics.scheduler.1.14.expected
@@ -49,17 +49,11 @@
 		"RootFields": null,
 		"ModuleFields": null,
 		"MetricSetFields": {
-			"operation": "preemption_evaluation",
-			"scheduler": {
-				"duration": {
-					"seconds": {
-						"count": 154,
-						"percentile": {
-							"50": 0.008470238,
-							"90": 0.016152651,
-							"99": 0.026165495
-						},
-						"sum": 1.5003563099999988
+			"result": "scheduled",
+			"scheduling": {
+				"pod": {
+					"attempts": {
+						"count": 3
 					}
 				}
 			}
@@ -97,11 +91,17 @@
 		"RootFields": null,
 		"ModuleFields": null,
 		"MetricSetFields": {
-			"result": "unschedulable",
-			"scheduler": {
-				"pod": {
-					"attempts": {
-						"count": 154
+			"operation": "binding",
+			"scheduling": {
+				"duration": {
+					"seconds": {
+						"count": 3,
+						"percentile": {
+							"50": 0.012318629,
+							"90": 0.012921477,
+							"99": 0.012921477
+						},
+						"sum": 0.039052979
 					}
 				}
 			}
@@ -244,17 +244,11 @@
 		"RootFields": null,
 		"ModuleFields": null,
 		"MetricSetFields": {
-			"operation": "predicate_evaluation",
-			"scheduler": {
-				"duration": {
-					"seconds": {
-						"count": 3,
-						"percentile": {
-							"50": 0.00004643,
-							"90": 0.000058348,
-							"99": 0.000058348
-						},
-						"sum": 0.003265988
+			"result": "unschedulable",
+			"scheduling": {
+				"pod": {
+					"attempts": {
+						"count": 154
 					}
 				}
 			}
@@ -274,7 +268,7 @@
 		"ModuleFields": null,
 		"MetricSetFields": {
 			"result": "error",
-			"scheduler": {
+			"scheduling": {
 				"pod": {
 					"attempts": {
 						"count": 0
@@ -296,17 +290,46 @@
 		"RootFields": null,
 		"ModuleFields": null,
 		"MetricSetFields": {
-			"operation": "binding",
-			"scheduler": {
+			"operation": "predicate_evaluation",
+			"scheduling": {
 				"duration": {
 					"seconds": {
 						"count": 3,
 						"percentile": {
-							"50": 0.012318629,
-							"90": 0.012921477,
-							"99": 0.012921477
+							"50": 0.00004643,
+							"90": 0.000058348,
+							"99": 0.000058348
 						},
-						"sum": 0.039052979
+						"sum": 0.003265988
+					}
+				}
+			}
+		},
+		"Index": "",
+		"ID": "",
+		"Namespace": "",
+		"Timestamp": "0001-01-01T00:00:00Z",
+		"Error": null,
+		"Host": "",
+		"Service": "",
+		"Took": 0,
+		"DisableTimeSeries": false
+	},
+	{
+		"RootFields": null,
+		"ModuleFields": null,
+		"MetricSetFields": {
+			"operation": "preemption_evaluation",
+			"scheduling": {
+				"duration": {
+					"seconds": {
+						"count": 154,
+						"percentile": {
+							"50": 0.008470238,
+							"90": 0.016152651,
+							"99": 0.026165495
+						},
+						"sum": 1.5003563099999988
 					}
 				}
 			}
@@ -346,7 +369,7 @@
 					"sec": 1560349587.32
 				}
 			},
-			"scheduler": {
+			"scheduling": {
 				"e2e": {
 					"duration": {
 						"us": {
@@ -391,28 +414,5 @@
 		"Service": "",
 		"Took": 0,
 		"DisableTimeSeries": false
-	},
-	{
-		"RootFields": null,
-		"ModuleFields": null,
-		"MetricSetFields": {
-			"result": "scheduled",
-			"scheduler": {
-				"pod": {
-					"attempts": {
-						"count": 3
-					}
-				}
-			}
-		},
-		"Index": "",
-		"ID": "",
-		"Namespace": "",
-		"Timestamp": "0001-01-01T00:00:00Z",
-		"Error": null,
-		"Host": "",
-		"Service": "",
-		"Took": 0,
-		"DisableTimeSeries": false
 	}
 ]