Add support for the windows package by narph · Pull Request #91 · elastic/integrations

narph · 2020-06-17T13:14:51Z

Adding support for the winfows package (perfmon and service datasets)

Dashboard:

Event output:

 {
        "_index" : ".ds-metrics-windows.perfmon-default-000001",
        "_id" : "9E-j1HIB7dyOdm7JfqYP",
        "_score" : 1.0,
        "_source" : {
          "@timestamp" : "2020-06-29T14:29:50.693Z",
          "dataset" : {
            "name" : "windows.perfmon",
            "namespace" : "default",
            "type" : "metrics"
          },
          "ecs" : {
            "version" : "1.5.0"
          },
          "host" : {
            "os" : {
              "platform" : "windows",
              "version" : "10.0",
              "family" : "windows",
              "name" : "Windows 10 Pro",
              "kernel" : "10.0.18362.900 (WinBuild.160101.0800)",
              "build" : "18363.900"
            },
            "name" : "DESKTOP-RFOOE09",
            "id" : "1e50b6e1-9710-4164-a8f0-032b3c721dc3",
            "ip" : [
             ...
            ],
            "mac" : [
              ...
            ],
            "hostname" : "DESKTOP-RFOOE09",
            "architecture" : "x86_64"
          },
          "agent" : {
            "ephemeral_id" : "03da6428-30b7-4bf6-be3e-a25c00870218",
            "id" : "3b73ebb6-c6ea-4354-b1f3-240ac1aa072c",
            "name" : "DESKTOP-RFOOE09",
            "type" : "metricbeat",
            "version" : "8.0.0"
          },
          "event" : {
            "module" : "windows",
            "duration" : 43502000,
            "dataset" : "windows.perfmon"
          },
          "metricset" : {
            "name" : "perfmon",
            "period" : 10000
          },
          "service" : {
            "type" : "windows"
          },
          "windows" : {
            "perfmon" : {
              "metrics" : {
                "working_set" : 1.4184448E7,
                "cpu_perc" : 0.3156342672114659
              },
              "object" : "Process",
              "instance" : "svchost"
            }
          }
        }
      },

{
        "_index" : ".ds-metrics-windows.service-default-000001",
        "_id" : "o0-h1HIB7dyOdm7JNZCs",
        "_score" : 1.0,
        "_source" : {
          "@timestamp" : "2020-06-29T14:27:20.852Z",
          "metricset" : {
            "name" : "service",
            "period" : 60000
          },
          "service" : {
            "type" : "windows"
          },
          "windows" : {
            "service" : {
              "name" : "AJRouter",
              "state" : "Stopped",
              "start_type" : "",
              "start_name" : """NT AUTHORITY\LocalService""",
              "path_name" : """C:\WINDOWS\system32\svchost.exe -k LocalServiceNetworkRestricted -p""",
              "exit_code" : "ERROR_SERVICE_NEVER_STARTED",
              "id" : "dZteAzz7iE",
              "display_name" : "AllJoyn Router Service"
            }
          },
          "dataset" : {
            "name" : "windows.service",
            "namespace" : "default",
            "type" : "metrics"
          },
          "ecs" : {
            "version" : "1.5.0"
          },
          "host" : {
            "name" : "DESKTOP-RFOOE09",
            "hostname" : "DESKTOP-RFOOE09",
            "architecture" : "x86_64",
            "os" : {
              "build" : "18363.900",
              "platform" : "windows",
              "version" : "10.0",
              "family" : "windows",
              "name" : "Windows 10 Pro",
              "kernel" : "10.0.18362.900 (WinBuild.160101.0800)"
            },
            "id" : "1e50b6e1-9710-4164-a8f0-032b3c721dc3",
            "ip" : [
            ...
            ],
            "mac" : [
              ...
            ]
          },
          "agent" : {
            "type" : "metricbeat",
            "version" : "8.0.0",
            "ephemeral_id" : "03da6428-30b7-4bf6-be3e-a25c00870218",
            "id" : "3b73ebb6-c6ea-4354-b1f3-240ac1aa072c",
            "name" : "DESKTOP-RFOOE09"
          },
          "event" : {
            "module" : "windows",
            "duration" : 290079500,
            "dataset" : "windows.service"
          }
        }
      },

elasticmachine · 2020-06-17T13:17:58Z

💚 Build Succeeded

Expand to view the summary

Build stats

Build Cause: [Pull request #91 updated]
Start Time: 2020-06-30T13:30:08.872+0000
Duration: 3 min 25 sec

elasticmachine · 2020-06-29T14:48:54Z

Pinging @elastic/integrations (Team:Integrations)

mtojek

@narph

could you go over the tips section: https://github.com/mtojek/integrations/blob/tips-for-devs/CONTRIBUTING.md#tips-for-building-integrations and polish the package code?

mtojek · 2020-06-30T12:05:54Z

packages/windows/dataset/perfmon/fields/fields.yml

@@ -0,0 +1,12 @@
+- name: windows.perfmon
+  type: group
+  release: ga


Please remove release fields from fields.yml files or change them to "beta".

changed the release to beta

mtojek · 2020-06-30T12:07:03Z

packages/windows/dataset/perfmon/fields/fields.yml

+    type: keyword
+    description: |
+      Instance value.
+  - name: metrics.*.*


I'm not sure about this definition. @ruflin do you know if it may cause a negative impact on Kibana?

mtojek · 2020-06-30T12:07:36Z

packages/windows/dataset/perfmon/fields/package-fields.yml

@@ -0,0 +1,2 @@
+- name: windows


I think you can remove this file. It doesn't contain any specific fields.

might be a good idea to add that in the tips, didn't know if this file is required or not

#137

Feel free to review it.

packages/windows/dataset/perfmon/manifest.yml

packages/windows/dataset/service/fields/package-fields.yml

mtojek · 2020-06-30T12:10:44Z

packages/windows/dataset/perfmon/manifest.yml

+type: metrics
+streams:
+- input: windows/metrics
+  vars:


I wonder if all these vars should be presented to the end-user and whether all of them are required.

all the vars should be available to the user, 2 of which are not required so I have updated the manifest file, looks good now in Kibana

mtojek

I think this is good to be merged, well done. Could you please rebase this branch once again against the master branch and if the CI doesn't complain, feel free to merge it.

Thank you, Mariana!

adding windows package

3ea6eba

narph self-assigned this Jun 17, 2020

narph added the Team:Integrations Label for the Integrations team label Jun 17, 2020

narph added 4 commits June 23, 2020 15:54

trt

a6bbe21

Merge branch 'master' into import-windows

0c31f97

last changes

36487e9

version

858d082

narph marked this pull request as ready for review June 29, 2020 14:48

narph mentioned this pull request Jun 29, 2020

Add metrics to windows package #77

Closed

17 tasks

update doc

928b440

mtojek self-requested a review June 30, 2020 08:51

mtojek reviewed Jun 30, 2020

View reviewed changes

narph added 2 commits June 30, 2020 11:02

Merge branch 'master' into import-windows

3765e5c

update

b3e67ba

narph requested a review from mtojek June 30, 2020 09:30

mtojek reviewed Jun 30, 2020

View reviewed changes

changes

5ab6f1c

narph requested a review from mtojek June 30, 2020 12:42

mtojek approved these changes Jun 30, 2020

View reviewed changes

narph added 2 commits June 30, 2020 15:10

Merge branch 'master' into import-windows

e3f13a1

update

c30443b

narph merged commit cd5c8b4 into elastic:master Jun 30, 2020

narph deleted the import-windows branch June 30, 2020 13:36

andrewkroh added Integration:windows Windows New Integration Issue or pull request for creating a new integration package. labels Aug 13, 2024

Conversation

narph commented Jun 17, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

elasticmachine commented Jun 17, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

💚 Build Succeeded

Build stats

Uh oh!

elasticmachine commented Jun 29, 2020

Uh oh!

mtojek left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mtojek left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

narph commented Jun 17, 2020 •

edited

Loading

elasticmachine commented Jun 17, 2020 •

edited

Loading