Skip to content

Commit 269b5d7

Browse files
committed
Fixing config alloy
1 parent bfdcc7a commit 269b5d7

File tree

3 files changed

+6
-165
lines changed

3 files changed

+6
-165
lines changed

hack/observability/alloy/alloy-config.yaml

Lines changed: 0 additions & 126 deletions
This file was deleted.

hack/observability/alloy/kustomization.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
resources:
22
- ../namespace.yaml
3-
- alloy-config.yaml
43

54
helmCharts:
65
- name: alloy

hack/observability/alloy/values.yaml

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,12 @@
1-
# # Configuration for alloy - https://github.com/grafana/alloy/blob/main/operations/helm/charts/alloy/values.yaml
2-
# config:
3-
# # publish data to loki
4-
# clients:
5-
# - url: http://loki:3100/loki/api/v1/push
6-
# # We have to set the tenant_id/OrgID to push logs to Loki
7-
# # otherwise we get an auth error.
8-
# tenant_id: 1
9-
10-
# snippets:
11-
# pipelineStages:
12-
# # Parse cluster and machine to make them available as labels.
13-
# - cri: {}
14-
# - json:
15-
# expressions:
16-
# controller:
17-
# Cluster: join('/',[Cluster.namespace,Cluster.name])
18-
# Machine: join('/',[Machine.namespace,Machine.name])
19-
# KubeadmControlPlane: join('/',[KubeadmControlPlane.namespace,KubeadmControlPlane.name])
20-
# MachineDeployment: join('/',[MachineDeployment.namespace,MachineDeployment.name])
21-
# MachineSet: join('/',[MachineSet.namespace,MachineSet.name])
22-
# MachinePool: join('/',[MachinePool.namespace,MachinePool.name])
23-
# - labels:
24-
# controller:
25-
# Cluster:
26-
# Machine:
27-
# KubeadmControlPlane:
28-
# MachineDeployment:
29-
# MachineSet:
30-
# MachinePool:
31-
32-
33-
# Add a yaml file to generate
34-
35-
36-
1+
# Configuration for alloy - https://github.com/grafana/alloy/blob/main/operations/helm/charts/alloy/values.yaml
2+
# Configuration for alloy - https://github.com/grafana/alloy/blob/main/operations/helm/charts/alloy/values.yaml
373
alloy:
384
configMap:
39-
create: false
5+
create: true
406
name: alloy-config
41-
key: config.alloy
7+
configFiles:
8+
config.alloy: |
9+
{{ .Files.Get "config.alloy" }}
4210
mounts:
4311
varlog: true
4412
run:

0 commit comments

Comments
 (0)