Skip to content

LOG-5810: fix cloudwatch stream names #2641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 15, 2024
Merged

LOG-5810: fix cloudwatch stream names #2641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions internal/generator/vector/conf/complex.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ source = '''
if .log_type == "audit" && .log_source == "auditd" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
del(.file)
del(.source_type)
match1 = parse_regex(.message, r'type=(?P<type>[^ ]+)') ?? {}
Expand All @@ -172,6 +173,7 @@ if .log_type == "audit" && .log_source == "auditd" {
if .log_type == "audit" && .log_source == "kubeAPI" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
del(.file)
del(.source_type)
. = merge(., parse_json!(string!(.message))) ?? .
Expand All @@ -183,6 +185,7 @@ if .log_type == "audit" && .log_source == "kubeAPI" {
if .log_type == "audit" && .log_source == "openshiftAPI" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
del(.file)
del(.source_type)
. = merge(., parse_json!(string!(.message))) ?? .
Expand All @@ -194,6 +197,7 @@ if .log_type == "audit" && .log_source == "openshiftAPI" {
if .log_type == "audit" && .log_source == "ovn" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
del(.file)
del(.source_type)
if !exists(.level) {
Expand Down Expand Up @@ -222,6 +226,7 @@ if .log_type == "audit" && .log_source == "ovn" {
if .log_source == "container" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
if !exists(.level) {
.level = "default"
if match!(.message, r'Warning|WARN|^W[0-9]+|level=warn|Value:warn|"level":"warn"|<warn>') {
Expand Down Expand Up @@ -295,6 +300,7 @@ if .log_source == "container" {
if .log_source == "node" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
.tag = ".journal.system"

del(.source_type)
Expand Down
6 changes: 6 additions & 0 deletions internal/generator/vector/conf/complex_http_receiver.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ source = '''
if .log_type == "audit" && .log_source == "auditd" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
del(.file)
del(.source_type)
match1 = parse_regex(.message, r'type=(?P<type>[^ ]+)') ?? {}
Expand All @@ -206,6 +207,7 @@ if .log_type == "audit" && .log_source == "auditd" {
if .log_type == "audit" && .log_source == "kubeAPI" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
del(.file)
del(.source_type)
. = merge(., parse_json!(string!(.message))) ?? .
Expand All @@ -217,6 +219,7 @@ if .log_type == "audit" && .log_source == "kubeAPI" {
if .log_type == "audit" && .log_source == "openshiftAPI" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
del(.file)
del(.source_type)
. = merge(., parse_json!(string!(.message))) ?? .
Expand All @@ -228,6 +231,7 @@ if .log_type == "audit" && .log_source == "openshiftAPI" {
if .log_type == "audit" && .log_source == "ovn" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
del(.file)
del(.source_type)
if !exists(.level) {
Expand Down Expand Up @@ -256,6 +260,7 @@ if .log_type == "audit" && .log_source == "ovn" {
if .log_source == "container" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
if !exists(.level) {
.level = "default"
if match!(.message, r'Warning|WARN|^W[0-9]+|level=warn|Value:warn|"level":"warn"|<warn>') {
Expand Down Expand Up @@ -329,6 +334,7 @@ if .log_source == "container" {
if .log_source == "node" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
.tag = ".journal.system"

del(.source_type)
Expand Down
1 change: 1 addition & 0 deletions internal/generator/vector/conf/container.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ source = '''
if .log_source == "container" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
if !exists(.level) {
.level = "default"
if match!(.message, r'Warning|WARN|^W[0-9]+|level=warn|Value:warn|"level":"warn"|<warn>') {
Expand Down
5 changes: 4 additions & 1 deletion internal/generator/vector/filter/openshift/viaq/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@ package viaq
const (
ClusterID = `.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"`
FixTimestampField = `ts = del(.timestamp); if !exists(."@timestamp") {."@timestamp" = ts}`
InternalContext = `._internal.message = .message`
InternalContext = `
._internal.message = .message
._internal.file = .file
`
)
5 changes: 2 additions & 3 deletions internal/generator/vector/output/cloudwatch/cloudwatch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,8 @@ func NormalizeStreamName(componentID string, inputs []string) Element {
vrl := strings.TrimSpace(`
.stream_name = "default"

if (.file != null) {
.file = "kubernetes" + replace!(.file, "/", ".")
.stream_name = del(.file)
if ( ._internal.file != null) {
.stream_name = "kubernetes" + replace!(._internal.file, "/", ".")
}

if ( .log_type == "audit" ) {
Expand Down
5 changes: 2 additions & 3 deletions internal/generator/vector/output/cloudwatch/cw_groupname_with_aws_credentials.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ inputs = ["cw-forward"]
source = '''
.stream_name = "default"

if (.file != null) {
.file = "kubernetes" + replace!(.file, "/", ".")
.stream_name = del(.file)
if ( ._internal.file != null) {
.stream_name = "kubernetes" + replace!(._internal.file, "/", ".")
}

if ( .log_type == "audit" ) {
Expand Down
5 changes: 2 additions & 3 deletions internal/generator/vector/output/cloudwatch/cw_with_groupname.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ inputs = ["cw-forward"]
source = '''
.stream_name = "default"

if (.file != null) {
.file = "kubernetes" + replace!(.file, "/", ".")
.stream_name = del(.file)
if ( ._internal.file != null) {
.stream_name = "kubernetes" + replace!(._internal.file, "/", ".")
}

if ( .log_type == "audit" ) {
Expand Down
5 changes: 2 additions & 3 deletions internal/generator/vector/output/cloudwatch/cw_with_tls_and_default_mintls_ciphers.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ inputs = ["cw-forward"]
source = '''
.stream_name = "default"

if (.file != null) {
.file = "kubernetes" + replace!(.file, "/", ".")
.stream_name = del(.file)
if ( ._internal.file != null) {
.stream_name = "kubernetes" + replace!(._internal.file, "/", ".")
}

if ( .log_type == "audit" ) {
Expand Down
5 changes: 2 additions & 3 deletions internal/generator/vector/output/cloudwatch/cw_with_tls_spec.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ inputs = ["cw-forward"]
source = '''
.stream_name = "default"

if (.file != null) {
.file = "kubernetes" + replace!(.file, "/", ".")
.stream_name = del(.file)
if ( ._internal.file != null) {
.stream_name = "kubernetes" + replace!(._internal.file, "/", ".")
}

if ( .log_type == "audit" ) {
Expand Down
5 changes: 2 additions & 3 deletions internal/generator/vector/output/cloudwatch/cw_with_tls_spec_insecure_verify.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ inputs = ["cw-forward"]
source = '''
.stream_name = "default"

if (.file != null) {
.file = "kubernetes" + replace!(.file, "/", ".")
.stream_name = del(.file)
if ( ._internal.file != null) {
.stream_name = "kubernetes" + replace!(._internal.file, "/", ".")
}

if ( .log_type == "audit" ) {
Expand Down
5 changes: 2 additions & 3 deletions internal/generator/vector/output/cloudwatch/cw_with_url.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ inputs = ["cw-forward"]
source = '''
.stream_name = "default"

if (.file != null) {
.file = "kubernetes" + replace!(.file, "/", ".")
.stream_name = del(.file)
if ( ._internal.file != null) {
.stream_name = "kubernetes" + replace!(._internal.file, "/", ".")
}

if ( .log_type == "audit" ) {
Expand Down
2 changes: 2 additions & 0 deletions internal/generator/vector/pipeline/adapter_test_drop_filter.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ source = '''
if .log_source == "container" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
if !exists(.level) {
.level = "default"
if match!(.message, r'Warning|WARN|^W[0-9]+|level=warn|Value:warn|"level":"warn"|<warn>') {
Expand Down Expand Up @@ -86,6 +87,7 @@ if .log_source == "container" {
if .log_source == "node" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
.tag = ".journal.system"

del(.source_type)
Expand Down
1 change: 1 addition & 0 deletions internal/generator/vector/pipeline/adapter_test_kube_api_filter.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ source = '''
if .log_type == "audit" && .log_source == "kubeAPI" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
del(.file)
del(.source_type)
. = merge(., parse_json!(string!(.message))) ?? .
Expand Down
1 change: 1 addition & 0 deletions internal/generator/vector/pipeline/adapter_test_prune_inNotIn_filter.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ source = '''
if .log_source == "container" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
if !exists(.level) {
.level = "default"
if match!(.message, r'Warning|WARN|^W[0-9]+|level=warn|Value:warn|"level":"warn"|<warn>') {
Expand Down
1 change: 1 addition & 0 deletions internal/generator/vector/pipeline/adapter_test_prune_inOnly_filter.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ source = '''
if .log_source == "container" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
if !exists(.level) {
.level = "default"
if match!(.message, r'Warning|WARN|^W[0-9]+|level=warn|Value:warn|"level":"warn"|<warn>') {
Expand Down
1 change: 1 addition & 0 deletions internal/generator/vector/pipeline/adapter_test_prune_notIn_only_filter.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ source = '''
if .log_source == "container" {
.openshift.cluster_id = "${OPENSHIFT_CLUSTER_ID:-}"
._internal.message = .message
._internal.file = .file
if !exists(.level) {
.level = "default"
if match!(.message, r'Warning|WARN|^W[0-9]+|level=warn|Value:warn|"level":"warn"|<warn>') {
Expand Down