Skip to content

Commit 07d9d58

Browse files
Kuckkuckkayrustimojohlo
authored
feature: adding keystone_scope parsing for ceph/prysm-sidecar container (#1220)
* feature: adding keystone_scope parsing for ceph/prysm-sidecar container * Update logs/charts/templates/_ceph-config.tpl Co-authored-by: pýrus <kayrus@users.noreply.github.com> * Update logs/charts/templates/_ceph-config.tpl Co-authored-by: pýrus <kayrus@users.noreply.github.com> * feature: rename field * feature: rename field * Update logs/charts/templates/_ceph-config.tpl Co-authored-by: pýrus <kayrus@users.noreply.github.com> * Update logs/charts/templates/_ceph-config.tpl Co-authored-by: pýrus <kayrus@users.noreply.github.com> * rm dublicates, sort * bump version after rebase --------- Co-authored-by: pýrus <kayrus@users.noreply.github.com> Co-authored-by: Timo <32620814+timojohlo@users.noreply.github.com> Co-authored-by: I504010 <me@timojohner.de>
1 parent 9829523 commit 07d9d58

File tree

3 files changed

+29
-11
lines changed

3 files changed

+29
-11
lines changed

logs/charts/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
apiVersion: v2
55
name: opentelemetry-operator
6-
version: 0.11.11
6+
version: 0.11.12
77
description: OpenTelemetry Operator Helm chart for Kubernetes
88
icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png
99
type: application

logs/charts/templates/_ceph-config.tpl

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,36 @@ transform/ceph_prysm_sidecar:
9393
- resource.attributes["k8s.container.name"] == "prysm-sidecar"
9494
statements:
9595
- merge_maps(log.cache, ParseJSON(log.body), "upsert") where IsMatch(log.body, "^\\{")
96+
- set(log.attributes["access_key_id"], log.cache["access_key_id"])
97+
- set(log.attributes["authentication_type"], log.cache["authentication_type"])
9698
- set(log.attributes["bucket"], log.cache["bucket"])
97-
- set(log.attributes["remote_addr"], log.cache["remote_addr"])
98-
- set(log.attributes["user"], log.cache["user"])
99-
- set(log.attributes["operation"], log.cache["operation"])
100-
- set(log.attributes["uri"], log.cache["uri"])
101-
- set(log.attributes["http_status"], log.cache["http_status"])
99+
- set(log.attributes["bytes_received"], log.cache["bytes_received"])
102100
- set(log.attributes["bytes_sent"], log.cache["bytes_sent"])
101+
- set(log.attributes["error_code"], log.cache["error_code"])
102+
- set(log.attributes["http_status"], log.cache["http_status"])
103+
- set(log.attributes["object"], log.cache["object"])
103104
- set(log.attributes["object_size"], log.cache["object_size"])
105+
- set(log.attributes["operation"], log.cache["operation"])
106+
- set(log.attributes["referrer"], log.cache["referrer"])
107+
- set(log.attributes["remote_addr"], log.cache["remote_addr"])
108+
- set(log.attributes["transaction_id"], log.cache["trans_id"])
109+
- set(log.attributes["temp_url"], log.cache["temp_url"])
110+
- set(log.attributes["total_time"], log.cache["total_time"])
111+
- set(log.attributes["uri"], log.cache["uri"])
112+
- set(log.attributes["user"], log.cache["user"])
104113
- set(log.attributes["user_agent"], log.cache["user_agent"])
105-
- set(log.attributes["trans_id"], log.cache["trans_id"])
106-
- set(log.attributes["access_key_id"], log.cache["access_key_id"])
107-
- set(log.attributes["authentication_type"], log.cache["authentication_type"])
114+
- set(log.attributes["keystone_scope.project.id"], log.cache["keystone_scope"]["project"]["id"])
115+
- set(log.attributes["keystone_scope.project.name"], log.cache["keystone_scope"]["project"]["name"])
116+
- set(log.attributes["keystone_scope.project.domain.id"], log.cache["keystone_scope"]["project"]["domain"]["id"])
117+
- set(log.attributes["keystone_scope.project.domain.name"], log.cache["keystone_scope"]["project"]["domain"]["name"])
118+
- set(log.attributes["keystone_scope.user.id"], log.cache["keystone_scope"]["user"]["id"])
119+
- set(log.attributes["keystone_scope.user.name"], log.cache["keystone_scope"]["user"]["name"])
120+
- set(log.attributes["keystone_scope.user.domain.id"], log.cache["keystone_scope"]["user"]["domain"]["id"])
121+
- set(log.attributes["keystone_scope.user.domain.name"], log.cache["keystone_scope"]["user"]["domain"]["name"])
122+
- set(log.attributes["keystone_scope.roles"], log.cache["keystone_scope"]["roles"])
123+
- set(log.attributes["keystone_scope.application.credential.id"], log.cache["keystone_scope"]["application_credential"]["id"])
124+
- set(log.attributes["keystone_scope.application_credential.name"], log.cache["keystone_scope"]["application_credential"]["name"])
125+
- set(log.attributes["keystone_scope.application_credential.restricted"], log.cache["keystone_scope"]["application_credential"]["restricted"])
108126
{{- end }}
109127

110128
{{- define "ceph.pipeline" }}

logs/plugindefinition.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ kind: ClusterPluginDefinition
66
metadata:
77
name: logs
88
spec:
9-
version: 0.11.11
9+
version: 0.11.12
1010
displayName: Logs
1111
description: Observability framework for instrumenting, generating, collecting, and exporting logs.
1212
icon: https://raw.githubusercontent.com/cloudoperators/greenhouse-extensions/main/logs/logo.png
1313
helmChart:
1414
name: opentelemetry-operator
1515
repository: oci://ghcr.io/cloudoperators/greenhouse-extensions/charts
16-
version: 0.11.11
16+
version: 0.11.12
1717
options:
1818
- default: true
1919
description: Activates the standard configuration for logs

0 commit comments

Comments
 (0)