Merge pull request #260 from elastic/main

🤖 ESQL: Merge upstream
elastic · Oct 3, 2022 · a139f40 · a139f40
2 parents e4d65c4 + 3c1fedf
commit a139f40
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 27 deletions.
diff --git a/docs/changelog/90493.yaml b/docs/changelog/90493.yaml
@@ -0,0 +1,5 @@
+pr: 90493
+summary: Add fields to fix logstash cgroup graphs
+area: Monitoring
+type: bug
+issues: []
diff --git a/docs/changelog/90494.yaml b/docs/changelog/90494.yaml
@@ -0,0 +1,16 @@
+pr: 90494
+summary: Fix logstash loadavg (xpack cases)
+area: Monitoring
+type: bug
+issues: []
+highlight:
+  title: "Stack Monitoring: Logstash load average type fixed for metricbeat collection"
+  body: |-
+    Previously, the templates for ingesting logstash load average using metricbeat were set to `long`. This provides only an integer graph.
+
+    The type has been corrected to `half_float`. You can force a rollover to see the change immediately or wait for the next ILM rollover.
+
+    [source,console]
+    ----
+    POST .monitoring-logstash-8-mb/_rollover
+    ----
diff --git a/x-pack/plugin/core/src/main/resources/monitoring-logstash-mb.json b/x-pack/plugin/core/src/main/resources/monitoring-logstash-mb.json
@@ -146,10 +146,10 @@
                               "type": "nested",
                               "properties": {
                                 "name": {
-                                    "type": "keyword"
+                                  "type": "keyword"
                                 },
                                 "value": {
-                                    "type": "long"
+                                  "type": "long"
                                 }
                               }
                             }
@@ -164,13 +164,13 @@
                             "load_average": {
                               "properties": {
                                 "5m": {
-                                  "type": "long"
+                                  "type": "half_float"
                                 },
                                 "15m": {
-                                  "type": "long"
+                                  "type": "half_float"
                                 },
                                 "1m": {
-                                  "type": "long"
+                                  "type": "half_float"
                                 }
                               }
                             }
@@ -192,6 +192,9 @@
                                       "type": "long"
                                     }
                                   }
+                                },
+                                "cfs_quota_micros": {
+                                  "type": "long"
                                 }
                               }
                             },
@@ -393,22 +396,6 @@
               "properties": {
                 "cpu": {
                   "properties": {
-                    "stat": {
-                      "properties": {
-                        "number_of_elapsed_periods": {
-                          "path": "logstash.node.stats.os.cgroup.cpu.stat.number_of_elapsed_periods",
-                          "type": "alias"
-                        },
-                        "number_of_times_throttled": {
-                          "path": "logstash.node.stats.os.cgroup.cpu.stat.number_of_times_throttled",
-                          "type": "alias"
-                        },
-                        "time_throttled_nanos": {
-                          "path": "logstash.node.stats.os.cgroup.cpu.stat.time_throttled_nanos",
-                          "type": "alias"
-                        }
-                      }
-                    },
                     "load_average": {
                       "properties": {
                         "5m": {
@@ -436,6 +423,30 @@
                           "type": "alias"
                         }
                       }
+                    },
+                    "cpu": {
+                      "properties": {
+                        "stat": {
+                          "properties": {
+                            "number_of_elapsed_periods": {
+                              "path": "logstash.node.stats.os.cgroup.cpu.stat.number_of_elapsed_periods",
+                              "type": "alias"
+                            },
+                            "number_of_times_throttled": {
+                              "path": "logstash.node.stats.os.cgroup.cpu.stat.number_of_times_throttled",
+                              "type": "alias"
+                            },
+                            "time_throttled_nanos": {
+                              "path": "logstash.node.stats.os.cgroup.cpu.stat.time_throttled_nanos",
+                              "type": "alias"
+                            }
+                          }
+                        },
+                        "cfs_quota_micros": {
+                          "path": "logstash.node.stats.os.cgroup.cpu.cfs_quota_micros",
+                          "type": "alias"
+                        }
+                      }
                     }
                   }
                 }

diff --git a/x-pack/plugin/core/src/main/resources/monitoring-logstash.json b/x-pack/plugin/core/src/main/resources/monitoring-logstash.json
@@ -204,6 +204,9 @@
                               "type": "long"
                             }
                           }
+                        },
+                        "cfs_quota_micros": {
+                          "type": "long"
                         }
                       }
                     }
@@ -271,7 +274,7 @@
                     "out": {
                       "type": "long"
                     },
-                    "duration_in_millis":{
+                    "duration_in_millis": {
                       "type": "long"
                     },
                     "queue_push_duration_in_millis": {
@@ -301,11 +304,21 @@
                     "id": {
                       "type": "keyword"
                     },
-                    "pipeline_ephemeral_id": { "type": "keyword" },
-                    "events_in": { "type": "long" },
-                    "events_out": { "type": "long" },
-                    "duration_in_millis": { "type": "long" },
-                    "queue_push_duration_in_millis": { "type": "long" },
+                    "pipeline_ephemeral_id": {
+                      "type": "keyword"
+                    },
+                    "events_in": {
+                      "type": "long"
+                    },
+                    "events_out": {
+                      "type": "long"
+                    },
+                    "duration_in_millis": {
+                      "type": "long"
+                    },
+                    "queue_push_duration_in_millis": {
+                      "type": "long"
+                    },
                     "long_counters": {
                       "type": "nested",
                       "properties": {