Skip to content

Commit d368088

Browse files
qclaoguiqclaogui
committed
regenerates k8s manifests
Signed-off-by: Weifeng Wang <qclaogui@gmail.com>
1 parent 428feb2 commit d368088

17 files changed

Lines changed: 1990 additions & 958 deletions

File tree

‎alloy-modules/provider/grafana_cloud.alloy‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,10 @@ declare "grafana_cloud" {
6464
}
6565

6666
otelcol.auth.basic "grafana_cloud" {
67-
username = json_decode(remote.http.json_config.content)["htInstanceId"]
68-
password = argument.token.value
67+
client_auth {
68+
username = json_decode(remote.http.json_config.content)["htInstanceId"]
69+
password = argument.token.value
70+
}
6971
}
7072

7173
otelcol.exporter.otlp "grafana_cloud" {

‎alloy-modules/provider/self_hosted.alloy‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,17 @@ declare "self_hosted_stack" {
6060
}
6161
}
6262

63-
otelcol.auth.basic "self_hosted" {
64-
username = coalesce(sys.env("SELF_HOSTED_TRACES_BASIC_AUTH_USERNAME"), sys.env("SELF_HOSTED_BASIC_AUTH_USERNAME"))
65-
password = coalesce(sys.env("SELF_HOSTED_TRACES_BASIC_AUTH_PASSWORD"), sys.env("SELF_HOSTED_BASIC_AUTH_PASSWORD"))
66-
}
63+
// otelcol.auth.basic "self_hosted" {
64+
// client_auth {
65+
// username = coalesce(sys.env("SELF_HOSTED_TRACES_BASIC_AUTH_USERNAME"), sys.env("SELF_HOSTED_BASIC_AUTH_USERNAME"))
66+
// password = coalesce(sys.env("SELF_HOSTED_TRACES_BASIC_AUTH_PASSWORD"), sys.env("SELF_HOSTED_BASIC_AUTH_PASSWORD"))
67+
// }
68+
// }
6769

6870
otelcol.exporter.otlphttp "self_hosted" {
6971
client {
7072
endpoint = argument.traces_endpoint_url.value
71-
auth = otelcol.auth.basic.self_hosted.handler
73+
// auth = otelcol.auth.basic.self_hosted.handler
7274

7375
tls {
7476
insecure = true

‎kubernetes/common/alloy/configs/provider/grafana_cloud.alloy‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,10 @@ declare "grafana_cloud" {
6464
}
6565

6666
otelcol.auth.basic "grafana_cloud" {
67-
username = json_decode(remote.http.json_config.content)["htInstanceId"]
68-
password = argument.token.value
67+
client_auth {
68+
username = json_decode(remote.http.json_config.content)["htInstanceId"]
69+
password = argument.token.value
70+
}
6971
}
7072

7173
otelcol.exporter.otlp "grafana_cloud" {

‎kubernetes/common/alloy/configs/provider/self_hosted.alloy‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,17 @@ declare "self_hosted_stack" {
6060
}
6161
}
6262

63-
otelcol.auth.basic "self_hosted" {
64-
username = coalesce(sys.env("SELF_HOSTED_TRACES_BASIC_AUTH_USERNAME"), sys.env("SELF_HOSTED_BASIC_AUTH_USERNAME"))
65-
password = coalesce(sys.env("SELF_HOSTED_TRACES_BASIC_AUTH_PASSWORD"), sys.env("SELF_HOSTED_BASIC_AUTH_PASSWORD"))
66-
}
63+
// otelcol.auth.basic "self_hosted" {
64+
// client_auth {
65+
// username = coalesce(sys.env("SELF_HOSTED_TRACES_BASIC_AUTH_USERNAME"), sys.env("SELF_HOSTED_BASIC_AUTH_USERNAME"))
66+
// password = coalesce(sys.env("SELF_HOSTED_TRACES_BASIC_AUTH_PASSWORD"), sys.env("SELF_HOSTED_BASIC_AUTH_PASSWORD"))
67+
// }
68+
// }
6769

6870
otelcol.exporter.otlphttp "self_hosted" {
6971
client {
7072
endpoint = argument.traces_endpoint_url.value
71-
auth = otelcol.auth.basic.self_hosted.handler
73+
// auth = otelcol.auth.basic.self_hosted.handler
7274

7375
tls {
7476
insecure = true

‎kubernetes/common/alloy/manifests/k8s-all-in-one.yaml‎

Lines changed: 41 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ metadata:
88
app.kubernetes.io/managed-by: Helm
99
app.kubernetes.io/name: alloy
1010
app.kubernetes.io/part-of: alloy
11-
app.kubernetes.io/version: v1.12.1
12-
helm.sh/chart: alloy-1.5.1
11+
app.kubernetes.io/version: v1.14.0
12+
helm.sh/chart: alloy-1.6.2
1313
name: alloy
1414
namespace: monitoring-system
1515
---
@@ -22,8 +22,8 @@ metadata:
2222
app.kubernetes.io/managed-by: Helm
2323
app.kubernetes.io/name: alloy
2424
app.kubernetes.io/part-of: alloy
25-
app.kubernetes.io/version: v1.12.1
26-
helm.sh/chart: alloy-1.5.1
25+
app.kubernetes.io/version: v1.14.0
26+
helm.sh/chart: alloy-1.6.2
2727
name: alloy
2828
rules:
2929
- apiGroups:
@@ -115,7 +115,21 @@ rules:
115115
- ""
116116
resources:
117117
- nodes
118-
- nodes/proxy
118+
verbs:
119+
- get
120+
- list
121+
- watch
122+
- apiGroups:
123+
- ""
124+
resources:
125+
- nodes/pods
126+
verbs:
127+
- get
128+
- list
129+
- watch
130+
- apiGroups:
131+
- ""
132+
resources:
119133
- nodes/metrics
120134
verbs:
121135
- get
@@ -135,8 +149,8 @@ metadata:
135149
app.kubernetes.io/managed-by: Helm
136150
app.kubernetes.io/name: alloy
137151
app.kubernetes.io/part-of: alloy
138-
app.kubernetes.io/version: v1.12.1
139-
helm.sh/chart: alloy-1.5.1
152+
app.kubernetes.io/version: v1.14.0
153+
helm.sh/chart: alloy-1.6.2
140154
name: alloy
141155
roleRef:
142156
apiGroup: rbac.authorization.k8s.io
@@ -2969,9 +2983,9 @@ data:
29692983
{\n\t\tendpoint {\n\t\t\turl = json_decode(remote.http.json_config.content)[\"hlInstanceUrl\"]
29702984
+ \"/loki/api/v1/push\"\n\n\t\t\tbasic_auth {\n\t\t\t\tusername = json_decode(remote.http.json_config.content)[\"hlInstanceId\"]\n\t\t\t\tpassword
29712985
= argument.token.value\n\t\t\t}\n\t\t}\n\t}\n\n\totelcol.auth.basic \"grafana_cloud\"
2972-
{\n\t\tusername = json_decode(remote.http.json_config.content)[\"htInstanceId\"]\n\t\tpassword
2973-
= argument.token.value\n\t}\n\n\totelcol.exporter.otlp \"grafana_cloud\" {\n\t\tclient
2974-
{\n\t\t\tendpoint = json_decode(remote.http.json_config.content)[\"htInstanceUrl\"]
2986+
{\n\t\tclient_auth {\n\t\t\tusername = json_decode(remote.http.json_config.content)[\"htInstanceId\"]\n\t\t\tpassword
2987+
= argument.token.value\n\t\t}\n\t}\n\n\totelcol.exporter.otlp \"grafana_cloud\"
2988+
{\n\t\tclient {\n\t\t\tendpoint = json_decode(remote.http.json_config.content)[\"htInstanceUrl\"]
29752989
+ \":443\"\n\t\t\tauth = otelcol.auth.basic.grafana_cloud.handler\n\t\t}\n\t}\n\n\tpyroscope.write
29762990
\"grafana_cloud\" {\n\t\tendpoint {\n\t\t\turl = json_decode(remote.http.json_config.content)[\"hpInstanceUrl\"]\n\n\t\t\tbasic_auth
29772991
{\n\t\t\t\tusername = json_decode(remote.http.json_config.content)[\"hpInstanceId\"]\n\t\t\t\tpassword
@@ -3006,12 +3020,12 @@ data:
30063020
{\n\t\t\t\tpassword_file = coalesce(sys.env(\"SELF_HOSTED_LOGS_BASIC_AUTH_PASSWORD_FILE\"),
30073021
sys.env(\"SELF_HOSTED_BASIC_AUTH_PASSWORD_FILE\"))\n\t\t\t\tpassword = coalesce(sys.env(\"SELF_HOSTED_LOGS_BASIC_AUTH_PASSWORD\"),
30083022
sys.env(\"SELF_HOSTED_BASIC_AUTH_PASSWORD\"))\n\t\t\t\tusername = coalesce(sys.env(\"SELF_HOSTED_LOGS_BASIC_AUTH_USERNAME\"),
3009-
sys.env(\"SELF_HOSTED_BASIC_AUTH_USERNAME\"))\n\t\t\t}\n\t\t}\n\t}\n\n\totelcol.auth.basic
3010-
\"self_hosted\" {\n\t\tusername = coalesce(sys.env(\"SELF_HOSTED_TRACES_BASIC_AUTH_USERNAME\"),
3011-
sys.env(\"SELF_HOSTED_BASIC_AUTH_USERNAME\"))\n\t\tpassword = coalesce(sys.env(\"SELF_HOSTED_TRACES_BASIC_AUTH_PASSWORD\"),
3012-
sys.env(\"SELF_HOSTED_BASIC_AUTH_PASSWORD\"))\n\t}\n\n\totelcol.exporter.otlphttp
3013-
\"self_hosted\" {\n\t\tclient {\n\t\t\tendpoint = argument.traces_endpoint_url.value\n\t\t\tauth
3014-
\ = otelcol.auth.basic.self_hosted.handler\n\n\t\t\ttls {\n\t\t\t\tinsecure
3023+
sys.env(\"SELF_HOSTED_BASIC_AUTH_USERNAME\"))\n\t\t\t}\n\t\t}\n\t}\n\n\t// otelcol.auth.basic
3024+
\"self_hosted\" {\n\t// \tclient_auth {\n\t// \t\tusername = coalesce(sys.env(\"SELF_HOSTED_TRACES_BASIC_AUTH_USERNAME\"),
3025+
sys.env(\"SELF_HOSTED_BASIC_AUTH_USERNAME\"))\n\t// \t\tpassword = coalesce(sys.env(\"SELF_HOSTED_TRACES_BASIC_AUTH_PASSWORD\"),
3026+
sys.env(\"SELF_HOSTED_BASIC_AUTH_PASSWORD\"))\n\t// \t}\n\t// }\n\n\totelcol.exporter.otlphttp
3027+
\"self_hosted\" {\n\t\tclient {\n\t\t\tendpoint = argument.traces_endpoint_url.value\n\t\t\t//
3028+
auth = otelcol.auth.basic.self_hosted.handler\n\n\t\t\ttls {\n\t\t\t\tinsecure
30153029
\ = true\n\t\t\t\tinsecure_skip_verify = true\n\t\t\t}\n\t\t}\n\t}\n\n\tpyroscope.write
30163030
\"self_hosted\" {\n\t\tendpoint {\n\t\t\turl = argument.profiles_endpoint_url.value\n\n\t\t\tbasic_auth
30173031
{\n\t\t\t\tpassword_file = coalesce(sys.env(\"SELF_HOSTED_PROFILES_BASIC_AUTH_PASSWORD_FILE\"),
@@ -3025,7 +3039,7 @@ data:
30253039
{\n\t\tvalue = pyroscope.write.self_hosted.receiver\n\t}\n}\n"
30263040
kind: ConfigMap
30273041
metadata:
3028-
name: alloy-modules-receiver-provider-7hd5m984c2
3042+
name: alloy-modules-receiver-provider-6b55cm4h6h
30293043
namespace: monitoring-system
30303044
---
30313045
apiVersion: v1
@@ -4995,8 +5009,8 @@ metadata:
49955009
app.kubernetes.io/managed-by: Helm
49965010
app.kubernetes.io/name: alloy
49975011
app.kubernetes.io/part-of: alloy
4998-
app.kubernetes.io/version: v1.12.1
4999-
helm.sh/chart: alloy-1.5.1
5012+
app.kubernetes.io/version: v1.14.0
5013+
helm.sh/chart: alloy-1.6.2
50005014
name: alloy
50015015
namespace: monitoring-system
50025016
spec:
@@ -5036,8 +5050,8 @@ metadata:
50365050
app.kubernetes.io/managed-by: Helm
50375051
app.kubernetes.io/name: alloy
50385052
app.kubernetes.io/part-of: alloy
5039-
app.kubernetes.io/version: v1.12.1
5040-
helm.sh/chart: alloy-1.5.1
5053+
app.kubernetes.io/version: v1.14.0
5054+
helm.sh/chart: alloy-1.6.2
50415055
name: alloy-cluster
50425056
namespace: monitoring-system
50435057
spec:
@@ -5077,8 +5091,8 @@ metadata:
50775091
app.kubernetes.io/managed-by: Helm
50785092
app.kubernetes.io/name: alloy
50795093
app.kubernetes.io/part-of: alloy
5080-
app.kubernetes.io/version: v1.12.1
5081-
helm.sh/chart: alloy-1.5.1
5094+
app.kubernetes.io/version: v1.14.0
5095+
helm.sh/chart: alloy-1.6.2
50825096
name: alloy
50835097
namespace: monitoring-system
50845098
spec:
@@ -5131,7 +5145,7 @@ spec:
51315145
- secretRef:
51325146
name: alloy-env
51335147
optional: true
5134-
image: docker.io/grafana/alloy:v1.12.1
5148+
image: docker.io/grafana/alloy:v1.14.0
51355149
imagePullPolicy: IfNotPresent
51365150
name: alloy
51375151
ports:
@@ -5189,7 +5203,7 @@ spec:
51895203
name: alloy-config-6c9b9f764d
51905204
name: config
51915205
- configMap:
5192-
name: alloy-modules-receiver-provider-7hd5m984c2
5206+
name: alloy-modules-receiver-provider-6b55cm4h6h
51935207
name: modules-receiver-provider
51945208
- configMap:
51955209
name: alloy-modules-kubernetes-metrics-mk6dkk489b
@@ -5434,8 +5448,8 @@ metadata:
54345448
app.kubernetes.io/managed-by: Helm
54355449
app.kubernetes.io/name: alloy
54365450
app.kubernetes.io/part-of: alloy
5437-
app.kubernetes.io/version: v1.12.1
5438-
helm.sh/chart: alloy-1.5.1
5451+
app.kubernetes.io/version: v1.14.0
5452+
helm.sh/chart: alloy-1.6.2
54395453
name: alloy
54405454
namespace: monitoring-system
54415455
spec:

0 commit comments

Comments
 (0)