Skip to content
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

move _origin to meta tag #10

Merged
merged 2 commits into from
Apr 12, 2019
Merged

move _origin to meta tag #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
257cc98
move _origin to meta tag
Apr 11, 2019
28e9479
test resource fix
Apr 11, 2019
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
3 changes: 1 addition & 2 deletions fluent-plugin-carbon-v2/lib/fluent/plugin/filter_carbon_v2.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def to_carbon_line(record)
metric = @metric_accessor.call(record).gsub(/\s/, @space_as)
timestamp = @timestamp_accessor.call(record)
value = @value_accessor.call(record)
"metric=#{metric} #{to_tags(record)} #{value} #{timestamp}"
"metric=#{metric} #{to_tags(record)} #{ORIGIN_KEY}=#{ORIGIN_VALUE} #{value} #{timestamp}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, although I think we determined we could also just change this to

metric=#{metric} #{to_tags(record)}  #{value} #{timestamp}

(2 spaces)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. it should also works.
We may change it to Prometheus format in near future, so just keep it for now to unblock E2E

end

def valid?(record)
Expand Down Expand Up @@ -117,7 +117,6 @@ def relabel_record(record)
record[new_key] = value unless new_key.nil? || new_key.empty?
end
end
record[ORIGIN_KEY] = ORIGIN_VALUE
record
end

Expand Down
540 changes: 270 additions & 270 deletions fluent-plugin-carbon-v2/test/resources/output.batch.case1.json
View file
Open in desktop

Large diffs are not rendered by default.

104 changes: 52 additions & 52 deletions fluent-plugin-carbon-v2/test/resources/output.batch.case2.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion fluent-plugin-carbon-v2/test/resources/output.datapoint.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"outputs": [
{
"message": "metric=http_request_size_bytes_sum _origin=kubernetes endpoint=http-metrics handler=prometheus instance=172.20.36.191:10251 job=kube-scheduler namespace=kube-system pod=kube-scheduler-ip-172-20-36-191.us-west-1.compute.internal prometheus=monitoring/prometheus-operator-prometheus prometheus_replica=prometheus-prometheus-operator-prometheus-0 service=prometheus-operator-kube-scheduler 1619905.0 1550862304339"
"message": "metric=http_request_size_bytes_sum endpoint=http-metrics handler=prometheus instance=172.20.36.191:10251 job=kube-scheduler namespace=kube-system pod=kube-scheduler-ip-172-20-36-191.us-west-1.compute.internal 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-carbon-v2/test/resources/output.datapoint.nested.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"outputs": [
{
"message": "metric=http_request_size_bytes_sum _origin=kubernetes 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 1619905.0 1550862304339"
"message": "metric=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"
}
]
}
2 changes: 1 addition & 1 deletion fluent-plugin-carbon-v2/test/resources/output.datapoint.nested.relabel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"outputs": [
{
"message": "metric=http_request_size_bytes_sum _origin=kubernetes endpoint=http-metrics handler=prometheus instance=172.20.36.191:10251 job=kube-scheduler namespace=kube-system pod_name=kube-scheduler-ip-172-20-36-191.us-west-1.compute.internal prometheus=monitoring/prometheus-operator-prometheus prometheus_replica=prometheus-prometheus-operator-prometheus-0 service_name=kube-scheduler 1619905.0 1550862304339"
"message": "metric=http_request_size_bytes_sum endpoint=http-metrics handler=prometheus instance=172.20.36.191:10251 job=kube-scheduler namespace=kube-system pod_name=kube-scheduler-ip-172-20-36-191.us-west-1.compute.internal prometheus=monitoring/prometheus-operator-prometheus prometheus_replica=prometheus-prometheus-operator-prometheus-0 service_name=kube-scheduler _origin=kubernetes 1619905.0 1550862304339"
}
]
}
2 changes: 1 addition & 1 deletion fluent-plugin-carbon-v2/test/resources/output.datapoint.nested.spaces.relabel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"outputs": [
{
"message": "metric=http_request_size_bytes_su* _origin=kubernetes endpoint=http-*etrics handler=pro*etheus instance=172.20.36.191:10251 job=kube-scheduler na*espace=kube-syste* pod_na*e=kube-scheduler-ip-172-20-36-191.us-west-1.co*pute.internal pro*etheus=*onitoring/pro*etheus-operator-pro*etheus pro*etheus_replica=pro*etheus-pro*etheus-operator-pro*etheus-0 service_na*e=kube-scheduler 1619905.0 1550862304339"
"message": "metric=http_request_size_bytes_su* endpoint=http-*etrics handler=pro*etheus instance=172.20.36.191:10251 job=kube-scheduler na*espace=kube-syste* pod_na*e=kube-scheduler-ip-172-20-36-191.us-west-1.co*pute.internal pro*etheus=*onitoring/pro*etheus-operator-pro*etheus pro*etheus_replica=pro*etheus-pro*etheus-operator-pro*etheus-0 service_na*e=kube-scheduler _origin=kubernetes 1619905.0 1550862304339"
}
]
}
2 changes: 1 addition & 1 deletion fluent-plugin-carbon-v2/test/resources/output.datapoint.relabel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"outputs": [
{
"message": "metric=http_request_size_bytes_sum _origin=kubernetes endpoint=http-metrics handler=prometheus instance=172.20.36.191:10251 job=kube-scheduler namespace=kube-system pod=kube-scheduler-ip-172-20-36-191.us-west-1.compute.internal prometheus=monitoring/prometheus-operator-prometheus prometheus.replica=prometheus-prometheus-operator-prometheus-0 prometheus.service=prometheus-operator-kube-scheduler 1619905.0 1550862304339"
"message": "metric=http_request_size_bytes_sum endpoint=http-metrics handler=prometheus instance=172.20.36.191:10251 job=kube-scheduler namespace=kube-system pod=kube-scheduler-ip-172-20-36-191.us-west-1.compute.internal prometheus=monitoring/prometheus-operator-prometheus prometheus.replica=prometheus-prometheus-operator-prometheus-0 prometheus.service=prometheus-operator-kube-scheduler _origin=kubernetes 1619905.0 1550862304339"
}
]
}
2 changes: 1 addition & 1 deletion fluent-plugin-carbon-v2/test/resources/output.datapoint.relabel.remove.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"outputs": [
{
"message": "metric=http_request_size_bytes_sum _origin=kubernetes endpoint=http-metrics handler=prometheus instance=172.20.36.191:10251 job=kube-scheduler namespace=kube-system pod=kube-scheduler-ip-172-20-36-191.us-west-1.compute.internal prometheus=monitoring/prometheus-operator-prometheus 1619905.0 1550862304339"
"message": "metric=http_request_size_bytes_sum endpoint=http-metrics handler=prometheus instance=172.20.36.191:10251 job=kube-scheduler namespace=kube-system pod=kube-scheduler-ip-172-20-36-191.us-west-1.compute.internal prometheus=monitoring/prometheus-operator-prometheus _origin=kubernetes 1619905.0 1550862304339"
}
]
}