Skip to content

Commit

Permalink
fix(packaging): Revert recent packaging and service changes (vectordo…
Browse files Browse the repository at this point in the history
…tdev#13997)

* Revert "enhancement(apt platform,debian platform,dpkg platform,centos platform,rhel platform,rpm platform,yum platform): Improve packaging and service best practices (vectordotdev#13456)"

This reverts commit 98f8ccc.

* Revert "enhancement(docker platform): Dockerfile updates and improvements (vectordotdev#13483)"

This reverts commit fee0950.
  • Loading branch information
jszwedko authored Aug 16, 2022
1 parent 9e5040e commit 48077f8
Show file tree
Hide file tree
Showing 21 changed files with 334 additions and 430 deletions.
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@ debug = true
name = "vector"
section = "admin"
maintainer-scripts = "distribution/debian/scripts/"
conf-files = ["/etc/default/vector"]
conf-files = ["/etc/vector/vector.toml", "/etc/default/vector"]
assets = [
["target/release/vector", "/usr/bin/", "755"],
["config/vector.toml", "/etc/vector/vector.toml", "644"],
["config/examples/*", "/etc/vector/examples/", "644"],
["distribution/systemd/vector.service", "/lib/systemd/system/vector.service", "644"],
["distribution/systemd/vector.default", "/etc/default/vector", "600"]
Expand Down
4 changes: 4 additions & 0 deletions config/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@ This directory contains the default Vector configuration for both the agent
and aggregator roles and provides common examples to demonstrate
configuration for various use cases.

* [`/aggregator`](aggregator) - Default configuration when Vector is deployed as
an aggregator, subdirectories contain default configuration for a specific target
* [`/agent`](agent) - Default configuration when Vector is deployed as an agent,
subdirectories contain default configuration for a specific target
* [`/examples`](examples) - Configuration examples for common use cases
34 changes: 34 additions & 0 deletions config/agent/kubernetes/vector.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
data_dir: /vector-data-dir
api:
enabled: true
address: "[::]:8686"
playground: false
sources:
kubernetes_logs:
type: kubernetes_logs
host_metrics:
filesystem:
devices:
excludes: [binfmt_misc]
filesystems:
excludes: [binfmt_misc]
mountPoints:
excludes: ["*/proc/sys/fs/binfmt_misc"]
type: host_metrics
internal_metrics:
type: internal_metrics
sinks:
prom_exporter:
type: prometheus_exporter
inputs:
- host_metrics
- internal_metrics
address: "[::]:9090"
blackhole:
type: blackhole
inputs:
- kubernetes_logs
print_interval_secs: 10
acknowledgements:
enabled: true
45 changes: 45 additions & 0 deletions config/agent/vector.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
---
data_dir: /vector-data-dir
api:
enabled: true
address: "[::]:8686"
playground: false
sources:
datadog_agent:
address: "[::1]:8282"
type: datadog_agent
file:
include:
- "/var/log/**/*.log"
type: file
ignore_checkpoints: true
host_metrics:
filesystem:
devices:
excludes: [binfmt_misc]
filesystems:
excludes: [binfmt_misc]
mountPoints:
excludes: ["*/proc/sys/fs/binfmt_misc"]
type: host_metrics
internal_metrics:
type: internal_metrics
logstash:
address: "[::1]:5044"
type: logstash
sinks:
prom_exporter:
type: prometheus_exporter
inputs:
- host_metrics
- internal_metrics
address: "[::]:9090"
blackhole:
type: blackhole
inputs:
- datadog_agent
- file
- logstash
print_interval_secs: 10
acknowledgements:
enabled: true
52 changes: 52 additions & 0 deletions config/aggregator/vector.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
---
data_dir: /vector-data-dir
api:
enabled: true
address: "[::]:8686"
playground: false
sources:
datadog_agent:
address: "[::]:8282"
type: datadog_agent
fluent:
address: "[::]:24224"
type: fluent
internal_metrics:
type: internal_metrics
logstash:
address: "[::]:5044"
type: logstash
splunk_hec:
address: "[::]:8080"
type: splunk_hec
statsd:
address: "[::]:8125"
mode: tcp
type: statsd
syslog:
address: "[::]:9000"
mode: tcp
type: syslog
vector:
address: "[::]:6000"
type: vector
version: "2"
sinks:
prom_exporter:
type: prometheus_exporter
inputs:
- internal_metrics
address: "[::]:9090"
blackhole:
type: blackhole
inputs:
- datadog_agent
- fluent
- logstash
- splunk_hec
- statsd
- syslog
- vector
print_interval_secs: 10
acknowledgements:
enabled: true
52 changes: 0 additions & 52 deletions config/examples/agent.toml

This file was deleted.

98 changes: 0 additions & 98 deletions config/examples/aggregator.toml

This file was deleted.

44 changes: 44 additions & 0 deletions config/vector.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# __ __ __
# \ \ / / / /
# \ V / / /
# \_/ \/
#
# V E C T O R
# Configuration
#
# ------------------------------------------------------------------------------
# Website: https://vector.dev
# Docs: https://vector.dev/docs
# Chat: https://chat.vector.dev
# ------------------------------------------------------------------------------

# Change this to use a non-default directory for Vector data storage:
# data_dir = "/var/lib/vector"

# Random Syslog-formatted logs
[sources.dummy_logs]
type = "demo_logs"
format = "syslog"
interval = 1

# Parse Syslog logs
# See the Vector Remap Language reference for more info: https://vrl.dev
[transforms.parse_logs]
type = "remap"
inputs = ["dummy_logs"]
source = '''
. = parse_syslog!(string!(.message))
'''

# Print parsed logs to stdout
[sinks.print]
type = "console"
inputs = ["parse_logs"]
encoding.codec = "json"

# Vector's GraphQL API (disabled by default)
# Uncomment to try it out with the `vector top` command or
# in your browser at http://localhost:8686
#[api]
#enabled = true
#address = "127.0.0.1:8686"
Loading

0 comments on commit 48077f8

Please sign in to comment.