Skip to content

Commit

Permalink
Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@yuting-liu
yuting-liu committed Jul 11, 2019
2 parents 67218e5 + 58da820 commit aeddfa5
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 33 deletions.
6 changes: 5 additions & 1 deletion fluent-plugin-enhance-k8s-metadata/lib/fluent/plugin/filter_enhance_k8s_metadata.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,15 @@ def decorate_record(record)
elsif pod_name.nil?
log.debug "Record doesn't have [#{@in_pod_path}] field"
else
if record.key? 'service'
record['prometheus_service'] = record['service']
record.delete('service')
end
metadata = get_pod_metadata(namespace_name, pod_name)
if metadata.empty?
log.debug "Cannot get labels on pod #{namespace_name}::#{pod_name}, skip."
else
record[@out_root] = metadata
record.merge! metadata
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions fluent-plugin-enhance-k8s-metadata/lib/sumologic/kubernetes/reader.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def fetch_pod_metadata(namespace, pod)

metadata = {}
labels = pod['metadata']['labels']
metadata['pod'] = { 'labels' => labels } if labels.is_a?(Hash)
metadata['pod_labels'] = labels if labels.is_a?(Hash)

owners = fetch_pod_owners(namespace, pod)
metadata.merge!(owners)
Expand All @@ -33,7 +33,7 @@ def fetch_pod_owners(namespace, pod)
owners = fetch_owners(namespace, pod)
result = {}
owners.each do |owner|
result[owner['kind'].downcase] = { 'name' => owner['metadata']['name'] }
result[owner['kind'].downcase] = owner['metadata']['name']
end
result
end
Expand Down
16 changes: 7 additions & 9 deletions fluent-plugin-enhance-k8s-metadata/test/sumologic/kubernetes/test_cache_strategy.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,21 @@ def log
test 'get_pod_metadata load labels from API' do
metadata = get_pod_metadata('sumologic', 'somepod')
assert_not_nil metadata
assert_equal '1691804713', metadata['pod']['labels']['pod-template-hash']
assert_equal 'curl-byi', metadata['pod']['labels']['run']
assert_equal '1691804713', metadata['pod_labels']['pod-template-hash']
assert_equal 'curl-byi', metadata['pod_labels']['run']
end

test 'get_pod_metadata load labels from cache if already exist' do
assert_not_nil @cache
@cache['sumologic::somepod'] = {
'pod' => {
'labels' => {
'pod-template-hash' => '0',
'run' => 'from-cache'
}
'pod_labels' => {
'pod-template-hash' => '0',
'run' => 'from-cache'
}
}
metadata = get_pod_metadata('sumologic', 'somepod')
assert_equal '0', metadata['pod']['labels']['pod-template-hash']
assert_equal 'from-cache', metadata['pod']['labels']['run']
assert_equal '0', metadata['pod_labels']['pod-template-hash']
assert_equal 'from-cache', metadata['pod_labels']['run']
end

test 'get_pod_metadata cache empty result' do
Expand Down
8 changes: 4 additions & 4 deletions fluent-plugin-enhance-k8s-metadata/test/sumologic/kubernetes/test_reader.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ def log
test 'fetch_pod_metadata get labels' do
metadata = fetch_pod_metadata('sumologic', 'somepod')
assert_not_nil metadata
assert_equal '1691804713', metadata['pod']['labels']['pod-template-hash']
assert_equal 'curl-byi', metadata['pod']['labels']['run']
assert_equal '1691804713', metadata['pod_labels']['pod-template-hash']
assert_equal 'curl-byi', metadata['pod_labels']['run']
end

test 'fetch_pod_metadata get owners' do
metadata = fetch_pod_metadata('kube-system', 'somepod')
assert_not_nil metadata
assert_equal 'kube-dns-5fbcb4d67b', metadata['replicaset']['name']
assert_equal 'kube-dns', metadata['deployment']['name']
assert_equal 'kube-dns-5fbcb4d67b', metadata['replicaset']
assert_equal 'kube-dns', metadata['deployment']
end

test 'fetch_pod_metadata returns empty map if resource not found' do
Expand Down
2 changes: 1 addition & 1 deletion fluent-plugin-prometheus-format/lib/fluent/plugin/filter_prometheus_format.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def filter(_tag, _time, record)
KEY_TIMESTAMP = '@timestamp'.freeze
KEY_VALUE = '@value'.freeze
KEY_MESSAGE = 'message'.freeze
SPLITOR = '.'.freeze
SPLITOR = '_'.freeze

ORIGIN_KEY = '_origin'.freeze
ORIGIN_VALUE = 'kubernetes'.freeze
Expand Down
26 changes: 12 additions & 14 deletions fluent-plugin-prometheus-format/test/plugin/test_filter_prometheus_format.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ class PrometheusFormatFilterTest < Test::Unit::TestCase
config = %([
relabel {
"service" : "",
"kubernetes.service.name" : "service_name",
"kubernetes.pod.name" : "pod_name"
"kubernetes_service_name" : "service_name",
"kubernetes_pod_name" : "pod_name"
}
])
outputs = filter_datapoints(config, 'datapoint.nested')
Expand All @@ -75,20 +75,18 @@ class PrometheusFormatFilterTest < Test::Unit::TestCase
config = %([
relabel {
"service" : "",
"kubernetes.service.na e" : "service_na e",
"kubernetes.pod.na e" : "pod_na e"
"kubernetes_service_na e" : "service_na e",
"kubernetes_pod_na e" : "pod_na e"
}
])
outputs = filter_datapoints(config, 'datapoint.nested.spaces')
puts outputs
assert_equal 1, outputs.length
verify_with_expected outputs, 'output.datapoint.nested.spaces.relabel'
end

test 'transform data point with escaped sequences' do
config = %([])
outputs = filter_datapoints(config, 'datapoint.nested.escape')
puts outputs
assert_equal 1, outputs.length
verify_with_expected outputs, 'output.datapoint.nested.escape'
end
Expand Down Expand Up @@ -396,8 +394,8 @@ class PrometheusFormatFilterTest < Test::Unit::TestCase
config = %([
relabel {
"service" : "",
"kubernetes.service.name" : "service_name",
"kubernetes.pod.name" : "pod_name"
"kubernetes_service_name" : "service_name",
"kubernetes_pod_name" : "pod_name"
}
inclusions { "pod_name" : "^kube-scheduler-.*" }
])
Expand All @@ -413,8 +411,8 @@ class PrometheusFormatFilterTest < Test::Unit::TestCase
config = %([
relabel {
"service" : "",
"kubernetes.service.name" : "service_name",
"kubernetes.pod.name" : "pod_name"
"kubernetes_service_name" : "service_name",
"kubernetes_pod_name" : "pod_name"
}
inclusions { "pod_name" : "^cube-scheduler-.*" }
])
Expand All @@ -431,8 +429,8 @@ class PrometheusFormatFilterTest < Test::Unit::TestCase
config = %([
relabel {
"service" : "",
"kubernetes.service.name" : "service_name",
"kubernetes.pod.name" : "pod_name"
"kubernetes_service_name" : "service_name",
"kubernetes_pod_name" : "pod_name"
}
exclusions { "pod_name" : "^cube-scheduler.*" }
])
Expand All @@ -448,8 +446,8 @@ class PrometheusFormatFilterTest < Test::Unit::TestCase
config = %([
relabel {
"service" : "",
"kubernetes.service.name" : "service_name",
"kubernetes.pod.name" : "pod_name"
"kubernetes_service_name" : "service_name",
"kubernetes_pod_name" : "pod_name"
}
exclusions { "pod_name" : "^kube-scheduler.*" }
])
Expand Down
2 changes: 1 addition & 1 deletion fluent-plugin-prometheus-format/test/resources/output.datapoint.nested.escape.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"outputs": [
{
"message": "http_request_size_bytes_sum{endpoint=\"http-metrics\",error=\"No file:\\n\\\"FILE.TXT\\\"\",handler=\"prometheus\",instance=\"172.20.36.191:10251\",job=\"kube-scheduler\",kubernetes.pod.name=\"kube-scheduler-ip-172-20-36-191.us-west-1.compute.internal\",kubernetes.service.name=\"kube-scheduler\",namespace=\"kube-system\",path=\"C:\\\\DIR\\\\FILE.TXT\",prometheus=\"monitoring/prometheus-operator-prometheus\",prometheus_replica=\"prometheus-prometheus-operator-prometheus-0\",service=\"prometheus-operator-kube-scheduler\",_origin=\"kubernetes\"} 1619905.0 1550862304339"
"message": "http_request_size_bytes_sum{endpoint=\"http-metrics\",error=\"No file:\\n\\\"FILE.TXT\\\"\",handler=\"prometheus\",instance=\"172.20.36.191:10251\",job=\"kube-scheduler\",kubernetes_pod_name=\"kube-scheduler-ip-172-20-36-191.us-west-1.compute.internal\",kubernetes_service_name=\"kube-scheduler\",namespace=\"kube-system\",path=\"C:\\\\DIR\\\\FILE.TXT\",prometheus=\"monitoring/prometheus-operator-prometheus\",prometheus_replica=\"prometheus-prometheus-operator-prometheus-0\",service=\"prometheus-operator-kube-scheduler\",_origin=\"kubernetes\"} 1619905.0 1550862304339"
}
]
}
2 changes: 1 addition & 1 deletion fluent-plugin-prometheus-format/test/resources/output.datapoint.nested.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"outputs": [
{
"message": "http_request_size_bytes_sum{endpoint=\"http-metrics\",handler=\"prometheus\",instance=\"172.20.36.191:10251\",job=\"kube-scheduler\",kubernetes.pod.name=\"kube-scheduler-ip-172-20-36-191.us-west-1.compute.internal\",kubernetes.service.name=\"kube-scheduler\",namespace=\"kube-system\",prometheus=\"monitoring/prometheus-operator-prometheus\",prometheus_replica=\"prometheus-prometheus-operator-prometheus-0\",service=\"prometheus-operator-kube-scheduler\",_origin=\"kubernetes\"} 1619905.0 1550862304339"
"message": "http_request_size_bytes_sum{endpoint=\"http-metrics\",handler=\"prometheus\",instance=\"172.20.36.191:10251\",job=\"kube-scheduler\",kubernetes_pod_name=\"kube-scheduler-ip-172-20-36-191.us-west-1.compute.internal\",kubernetes_service_name=\"kube-scheduler\",namespace=\"kube-system\",prometheus=\"monitoring/prometheus-operator-prometheus\",prometheus_replica=\"prometheus-prometheus-operator-prometheus-0\",service=\"prometheus-operator-kube-scheduler\",_origin=\"kubernetes\"} 1619905.0 1550862304339"
}
]
}

0 comments on commit aeddfa5

Please sign in to comment.