[Elastic-Agent] Do not require unnecessary configuration (#18003)

* log paths within data * changelog * removed file * empty config allowed * configuration up to date and unified * changelog * unified * switched path * unnecessary type specifier * logs-output * var run to data path * inject run so meta.json is not created at root of data
elastic · May 4, 2020 · 69edae2 · 69edae2
1 parent a1ee6fd
commit 69edae2
Show file tree

Hide file tree

Showing 19 changed files with 723 additions and 588 deletions.
diff --git a/x-pack/elastic-agent/CHANGELOG.asciidoc b/x-pack/elastic-agent/CHANGELOG.asciidoc
@@ -42,3 +42,4 @@
 - Allow CLI overrides of paths {pull}17781[17781]
 - Enable Filebeat input: S3, Azureeventhub, cloudfoundry, httpjson, netflow, o365audit. {pull}17909[17909]
 - Use data subfolder as default for process logs {pull}17960[17960]
+- Do not require unnecessary configuration {pull}18003[18003]
diff --git a/x-pack/elastic-agent/_meta/common.p2.yml b/x-pack/elastic-agent/_meta/common.p2.yml
@@ -23,99 +23,99 @@ datasources:
           - metricset: filesystem
             dataset: system.filesystem
 
-management:
-  # Mode of management, the Elastic Agent support two modes of operation:
-  #
-  # local: The Elastic Agent will expect to find the inputs configuration in the local file.
-  #
-  # Default is local.
-  mode: "local"
+# management:
+#   # Mode of management, the Elastic Agent support two modes of operation:
+#   #
+#   # local: The Elastic Agent will expect to find the inputs configuration in the local file.
+#   #
+#   # Default is local.
+#   mode: "local"
 
-  fleet:
-    access_token: ""
-    kibana:
-      # kibana minimal configuration
-      host: "localhost:5601"
-      ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
+#   fleet:
+#     access_token: ""
+#     kibana:
+#       # kibana minimal configuration
+#       host: "localhost:5601"
+#       ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
 
-      # optional values
-      #protocol: "https"
-      #username: "elastic"
-      #password: "changeme"
-      #path: ""
-      #ssl.verification_mode: full
-      #ssl.supported_protocols: [TLSv1.0, TLSv1.1, TLSv1.2]
-      #ssl.cipher_suites: []
-      #ssl.curve_types: []
+#       # optional values
+#       #protocol: "https"
+#       #username: "elastic"
+#       #password: "changeme"
+#       #path: ""
+#       #ssl.verification_mode: full
+#       #ssl.supported_protocols: [TLSv1.0, TLSv1.1, TLSv1.2]
+#       #ssl.cipher_suites: []
+#       #ssl.curve_types: []
 
-  reporting:
-    log:
-      # format in which logs will be written, options are json or default.
-      format: "default"
-    fleet:
-      # enables fleet reporter. fleet reporting can be enabled only in fleet management.mode.
-      enabled: false
+#   reporting:
+#     log:
+#       # format in which logs will be written, options are json or default.
+#       format: "default"
+#     fleet:
+#       # enables fleet reporter. fleet reporting can be enabled only in fleet management.mode.
+#       enabled: false
 
-      # Reporting threshold indicates how many events should be kept in-memory before reporting them to fleet.
-      reporting_threshold: 10000
+#       # Reporting threshold indicates how many events should be kept in-memory before reporting them to fleet.
+#       reporting_threshold: 10000
 
-      # Frequency used to check the queue of events to be sent out to fleet.
-      reporting_check_frequency_sec: 30
+#       # Frequency used to check the queue of events to be sent out to fleet.
+#       reporting_check_frequency_sec: 30
 
-  # Allow fleet to reload his configuration locally on disk.
-  # Notes: Only specific process configuration will be reloaded.
-  reload:
-    # enabled configure the Elastic Agent to reload or not the local configuration.
-    #
-    # Default is true
-    enabled: true
+#   # Allow fleet to reload his configuration locally on disk.
+#   # Notes: Only specific process configuration will be reloaded.
+#   reload:
+#     # enabled configure the Elastic Agent to reload or not the local configuration.
+#     #
+#     # Default is true
+#     enabled: true
 
-    # period define how frequent we should look for changes in the configuration.
-    period: 10s
+#     # period define how frequent we should look for changes in the configuration.
+#     period: 10s
 
-download:
-  # source of the artifacts, requires elastic like structure and naming of the binaries
-  # e.g /windows-x86.zip
-  sourceURI: "https://artifacts.elastic.co/downloads/beats/"
-  # path to the directory containing downloaded packages
-  target_directory: "${path.data}/downloads"
-  # timeout for downloading package
-  timeout: 30s
-  # file path to a public key used for verifying downloaded artifacts
-  # if not file is present agent will try to load public key from elastic.co website.
-  pgpfile: "${path.data}/elastic.pgp"
-  # install_path describes the location of installed packages/programs. It is also used
-  # for reading program specifications.
-  install_path: "${path.data}/install"
+# download:
+#   # source of the artifacts, requires elastic like structure and naming of the binaries
+#   # e.g /windows-x86.zip
+#   sourceURI: "https://artifacts.elastic.co/downloads/beats/"
+#   # path to the directory containing downloaded packages
+#   target_directory: "${path.data}/downloads"
+#   # timeout for downloading package
+#   timeout: 30s
+#   # file path to a public key used for verifying downloaded artifacts
+#   # if not file is present agent will try to load public key from elastic.co website.
+#   pgpfile: "${path.data}/elastic.pgp"
+#   # install_path describes the location of installed packages/programs. It is also used
+#   # for reading program specifications.
+#   install_path: "${path.data}/install"
 
-process:
-  # minimal port number for spawned processes
-  min_port: 10000
-  # maximum port number for spawned processes
-  max_port: 30000
-  # timeout for creating new processes. when process is not successfully created by this timeout
-  # start operation is considered a failure
-  spawn_timeout: 30s
+# process:
+#   # minimal port number for spawned processes
+#   min_port: 10000
+#   # maximum port number for spawned processes
+#   max_port: 30000
+#   # timeout for creating new processes. when process is not successfully created by this timeout
+#   # start operation is considered a failure
+#   spawn_timeout: 30s
 
-retry:
-  # Enabled determines whether retry is possible. Default is false.
-  enabled: true
-  # RetriesCount specifies number of retries. Default is 3.
-  # Retry count of 1 means it will be retried one time after one failure.
-  retriesCount: 3
-  # Delay specifies delay in ms between retries. Default is 30s
-  delay: 30s
-  # MaxDelay specifies maximum delay in ms between retries. Default is 300s
-  maxDelay: 5m
-  # Exponential determines whether delay is treated as exponential.
-  # With 30s delay and 3 retries: 30, 60, 120s
-  # Default is false
-  exponential: false
+# retry:
+#   # Enabled determines whether retry is possible. Default is false.
+#   enabled: true
+#   # RetriesCount specifies number of retries. Default is 3.
+#   # Retry count of 1 means it will be retried one time after one failure.
+#   retriesCount: 3
+#   # Delay specifies delay in ms between retries. Default is 30s
+#   delay: 30s
+#   # MaxDelay specifies maximum delay in ms between retries. Default is 300s
+#   maxDelay: 5m
+#   # Exponential determines whether delay is treated as exponential.
+#   # With 30s delay and 3 retries: 30, 60, 120s
+#   # Default is false
+#   exponential: false
 
-settings.monitoring:
-  # enabled turns on monitoring of running processes
-  enabled: false
-  # enables log monitoring
-  logs: false
-  # enables metrics monitoring
-  metrics: false
+# settings.monitoring:
+#   # enabled turns on monitoring of running processes
+#   enabled: false
+#   # enables log monitoring
+#   logs: false
+#   # enables metrics monitoring
+#   metrics: false
diff --git a/x-pack/elastic-agent/_meta/common.reference.p2.yml b/x-pack/elastic-agent/_meta/common.reference.p2.yml
@@ -23,99 +23,99 @@ datasources:
           - metricset: filesystem
             dataset: system.filesystem
 
-management:
-  # Mode of management, the Elastic Agent currently only support the following mode:
-  #
-  # local: The Elastic Agent will expect to find the inputs configuration in the local file.
-  #
-  # Default is local.
-  mode: local
+# management:
+#   # Mode of management, the Elastic Agent support two modes of operation:
+#   #
+#   # local: The Elastic Agent will expect to find the inputs configuration in the local file.
+#   #
+#   # Default is local.
+#   mode: "local"
 
-  fleet:
-    access_token: ""
-    kibana:
-      # kibana minimal configuration
-      host: "localhost:5601"
-      ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
+#   fleet:
+#     access_token: ""
+#     kibana:
+#       # kibana minimal configuration
+#       host: "localhost:5601"
+#       ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
 
-      # optional values
-      #protocol: "https"
-      #username: "elastic"
-      #password: "changeme"
-      #path: ""
-      #ssl.verification_mode: full
-      #ssl.supported_protocols: [TLSv1.0, TLSv1.1, TLSv1.2]
-      #ssl.cipher_suites: []
-      #ssl.curve_types: []
+#       # optional values
+#       #protocol: "https"
+#       #username: "elastic"
+#       #password: "changeme"
+#       #path: ""
+#       #ssl.verification_mode: full
+#       #ssl.supported_protocols: [TLSv1.0, TLSv1.1, TLSv1.2]
+#       #ssl.cipher_suites: []
+#       #ssl.curve_types: []
 
-  reporting:
-    log:
-      # format in which logs will be written, options are json or default.
-      format: "default"
-    fleet:
-      # enables fleet reporter. fleet reporting can be enabled only in fleet management.mode.
-      enabled: false
+#   reporting:
+#     log:
+#       # format in which logs will be written, options are json or default.
+#       format: "default"
+#     fleet:
+#       # enables fleet reporter. fleet reporting can be enabled only in fleet management.mode.
+#       enabled: false
 
-      # Reporting threshold indicates how many events should be kept in-memory before reporting them to fleet.
-      reporting_threshold: 10000
+#       # Reporting threshold indicates how many events should be kept in-memory before reporting them to fleet.
+#       reporting_threshold: 10000
 
-      # Frequency used to check the queue of events to be sent out to fleet.
-      reporting_check_frequency_sec: 30
+#       # Frequency used to check the queue of events to be sent out to fleet.
+#       reporting_check_frequency_sec: 30
 
-  # Allow fleet to reload his configuration locally on disk.
-  # Notes: Only specific process configuration will be reloaded.
-  reload:
-    # enabled configure the Elastic Agent to reload or not the local configuration.
-    #
-    # Default is true
-    enabled: true
+#   # Allow fleet to reload his configuration locally on disk.
+#   # Notes: Only specific process configuration will be reloaded.
+#   reload:
+#     # enabled configure the Elastic Agent to reload or not the local configuration.
+#     #
+#     # Default is true
+#     enabled: true
 
-    # period define how frequent we should look for changes in the configuration.
-    period: 10s
+#     # period define how frequent we should look for changes in the configuration.
+#     period: 10s
 
-download:
-  # source of the artifacts, requires elastic like structure and naming of the binaries
-  # e.g /windows-x86.zip
-  sourceURI: "https://artifacts.elastic.co/downloads/beats/"
-  # path to the directory containing downloaded packages
-  target_directory: "${path.data}/downloads"
-  # timeout for downloading package
-  timeout: 30s
-  # file path to a public key used for verifying downloaded artifacts
-  # if not file is present agent will try to load public key from elastic.co website.
-  pgpfile: "${path.data}/elastic.pgp"
-  # install_path describes the location of installed packages/programs. It is also used
-  # for reading program specifications.
-  install_path: "${path.data}/install"
+# download:
+#   # source of the artifacts, requires elastic like structure and naming of the binaries
+#   # e.g /windows-x86.zip
+#   sourceURI: "https://artifacts.elastic.co/downloads/beats/"
+#   # path to the directory containing downloaded packages
+#   target_directory: "${path.data}/downloads"
+#   # timeout for downloading package
+#   timeout: 30s
+#   # file path to a public key used for verifying downloaded artifacts
+#   # if not file is present agent will try to load public key from elastic.co website.
+#   pgpfile: "${path.data}/elastic.pgp"
+#   # install_path describes the location of installed packages/programs. It is also used
+#   # for reading program specifications.
+#   install_path: "${path.data}/install"
 
-process:
-  # minimal port number for spawned processes
-  min_port: 10000
-  # maximum port number for spawned processes
-  max_port: 30000
-  # timeout for creating new processes. when process is not successfully created by this timeout
-  # start operation is considered a failure
-  spawn_timeout: 30s
+# process:
+#   # minimal port number for spawned processes
+#   min_port: 10000
+#   # maximum port number for spawned processes
+#   max_port: 30000
+#   # timeout for creating new processes. when process is not successfully created by this timeout
+#   # start operation is considered a failure
+#   spawn_timeout: 30s
 
-retry:
-  # enabled determines whether retry is possible. Default is false.
-  enabled: true
-  # retries_count specifies number of retries. Default is 3.
-  # Retry count of 1 means it will be retried one time after one failure.
-  retries_count: 3
-  # delay specifies delay in ms between retries. Default is 30s
-  delay: 30s
-  # max_delay specifies maximum delay in ms between retries. Default is 300s
-  max_delay: 5m
-  # Exponential determines whether delay is treated as exponential.
-  # With 30s delay and 3 retries: 30, 60, 120s
-  # Default is false
-  exponential: false
+# retry:
+#   # Enabled determines whether retry is possible. Default is false.
+#   enabled: true
+#   # RetriesCount specifies number of retries. Default is 3.
+#   # Retry count of 1 means it will be retried one time after one failure.
+#   retriesCount: 3
+#   # Delay specifies delay in ms between retries. Default is 30s
+#   delay: 30s
+#   # MaxDelay specifies maximum delay in ms between retries. Default is 300s
+#   maxDelay: 5m
+#   # Exponential determines whether delay is treated as exponential.
+#   # With 30s delay and 3 retries: 30, 60, 120s
+#   # Default is false
+#   exponential: false
 
-settings.monitoring:
-  # enabled turns on monitoring of running processes
-  enabled: false
-  # enables log monitoring
-  logs: false
-  # enables metrics monitoring
-  metrics: false
+# settings.monitoring:
+#   # enabled turns on monitoring of running processes
+#   enabled: false
+#   # enables log monitoring
+#   logs: false
+#   # enables metrics monitoring
+#   metrics: false