Remove os specific config examples and code (#549)

As discussed in #533 the os specific configs should be removed from now.
elastic · Jun 29, 2020 · 3466343 · 3466343
1 parent 561ab48
commit 3466343
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 74 deletions.
diff --git a/testdata/generated/package/datasources/1.0.0/index.json b/testdata/generated/package/datasources/1.0.0/index.json
@@ -55,19 +55,7 @@
               "show_user": false,
               "default": [
                 "/var/log/nginx/error.log*"
-              ],
-              "os": {
-                "darwin": {
-                  "default": [
-                    "/usr/local/var/log/nginx/error.log*"
-                  ]
-                },
-                "windows": {
-                  "default": [
-                    "c:/programdata/nginx/logs/*error.log*"
-                  ]
-                }
-              }
+              ]
             }
           ],
           "template_path": "logs.yml",
@@ -104,19 +92,7 @@
               "show_user": false,
               "default": [
                 "/var/log/nginx/access.log*"
-              ],
-              "os": {
-                "darwin": {
-                  "default": [
-                    "/usr/local/var/log/nginx/access.log*"
-                  ]
-                },
-                "windows": {
-                  "default": [
-                    "c:/programdata/nginx/logs/*access.log*"
-                  ]
-                }
-              }
+              ]
             }
           ],
           "title": "Title of the stream",
@@ -239,19 +215,7 @@
                   "show_user": false,
                   "default": [
                     "/var/log/nginx/error.log*"
-                  ],
-                  "os": {
-                    "darwin": {
-                      "default": [
-                        "/usr/local/var/log/nginx/error.log*"
-                      ]
-                    },
-                    "windows": {
-                      "default": [
-                        "c:/programdata/nginx/logs/*error.log*"
-                      ]
-                    }
-                  }
+                  ]
                 }
               ],
               "dataset": "datasources.examplelog1",
@@ -273,19 +237,7 @@
                   "show_user": false,
                   "default": [
                     "/var/log/nginx/access.log*"
-                  ],
-                  "os": {
-                    "darwin": {
-                      "default": [
-                        "/usr/local/var/log/nginx/access.log*"
-                      ]
-                    },
-                    "windows": {
-                      "default": [
-                        "c:/programdata/nginx/logs/*access.log*"
-                      ]
-                    }
-                  }
+                  ]
                 }
               ],
               "dataset": "datasources.examplelog2",

diff --git a/testdata/package/datasources/1.0.0/dataset/examplelog1/manifest.yml b/testdata/package/datasources/1.0.0/dataset/examplelog1/manifest.yml
@@ -14,14 +14,6 @@ streams:
         multi: true
         default:
           - /var/log/nginx/error.log*
-        # I suggest to use ECS fields for this config options here: https://github.com/elastic/ecs/blob/master/schemas/os.yml
-        # This would need to be based on a predefined definition on what can be filtered on
-        os.darwin:
-          default:
-            - /usr/local/var/log/nginx/error.log*
-        os.windows:
-          default:
-            - c:/programdata/nginx/logs/*error.log*
 
   - input: syslog
     title: Title of the stream

diff --git a/testdata/package/datasources/1.0.0/dataset/examplelog2/manifest.yml b/testdata/package/datasources/1.0.0/dataset/examplelog2/manifest.yml
@@ -14,11 +14,3 @@ streams:
         multi: true
         default:
           - /var/log/nginx/access.log*
-        # I suggest to use ECS fields for this config options here: https://github.com/elastic/ecs/blob/master/schemas/os.yml
-        # This would need to be based on a predefined definition on what can be filtered on
-        os.darwin:
-          default:
-            - /usr/local/var/log/nginx/access.log*
-        os.windows:
-          default:
-            - c:/programdata/nginx/logs/*access.log*
diff --git a/util/dataset.go b/util/dataset.go
@@ -76,12 +76,6 @@ type Variable struct {
 	Required    bool        `config:"required" json:"required" yaml:"required"`
 	ShowUser    bool        `config:"show_user" json:"show_user" yaml:"show_user"`
 	Default     interface{} `config:"default" json:"default,omitempty" yaml:"default,omitempty"`
-	Os          *Os         `config:"os" json:"os,omitempty" yaml:"os,omitempty"`
-}
-
-type Os struct {
-	Darwin  interface{} `config:"darwin" json:"darwin,omitempty" yaml:"darwin,omitempty"`
-	Windows interface{} `config:"windows" json:"windows,omitempty" yaml:"windows,omitempty"`
 }
 
 type fieldEntry struct {