Skip to content

Commit

Permalink
Rename target allocator (#599)
Browse files Browse the repository at this point in the history
  • Loading branch information
gracewehner authored Sep 22, 2023
1 parent 3c89dab commit edfb12b
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ apiVersion: v1
kind: Service
metadata:
labels:
component: ama-metrics-targetallocator
component: ama-metrics-operator-targets
kubernetes.azure.com/managedby: aks
name: ama-metrics-targetallocator
name: ama-metrics-operator-targets
namespace: kube-system
spec:
internalTrafficPolicy: Cluster
Expand All @@ -18,7 +18,7 @@ spec:
protocol: TCP
targetPort: 8080
selector:
rsName: ama-metrics-targetallocator
rsName: ama-metrics-operator-targets
sessionAffinity: None
type: ClusterIP
status:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
component: ama-metrics-targetallocator
component: ama-metrics-operator-targets
kubernetes.azure.com/managedby: aks
name: ama-metrics-targetallocator
name: ama-metrics-operator-targets
namespace: kube-system
spec:
progressDeadlineSeconds: 600
replicas: 1
revisionHistoryLimit: 10
selector:
matchLabels:
rsName: ama-metrics-targetallocator
rsName: ama-metrics-operator-targets
kubernetes.azure.com/managedby: aks
strategy:
rollingUpdate:
Expand All @@ -24,7 +24,7 @@ spec:
metadata:
creationTimestamp: null
labels:
rsName: ama-metrics-targetallocator
rsName: ama-metrics-operator-targets
kubernetes.azure.com/managedby: aks
spec:
containers:
Expand Down
4 changes: 2 additions & 2 deletions otelcollector/fluent-bit/fluent-bit-daemonset.conf
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
[INPUT]
Name tail
Tag prometheus.log.targetallocator.tacontainer
Path /var/log/containers/ama-metrics-*targetallocator*kube-system*targetallocator*.log
Path /var/log/containers/ama-metrics-*operator-targets*kube-system*targetallocator*.log
DB /var/opt/microsoft/state/prometheus-collector-ai.db
DB.Sync Off
Parser cri
Expand All @@ -55,7 +55,7 @@
[INPUT]
Name tail
Tag prometheus.log.targetallocator.configreader
Path /var/log/containers/ama-metrics-*targetallocator*kube-system*config-reader*.log
Path /var/log/containers/ama-metrics-*operator-targets*kube-system*config-reader*.log
DB /var/opt/microsoft/state/prometheus-collector-ai.db
DB.Sync Off
Parser cri
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ processors:
receivers:
prometheus:
target_allocator:
endpoint: http://ama-metrics-targetallocator.kube-system.svc.cluster.local
endpoint: http://ama-metrics-operator-targets.kube-system.svc.cluster.local
interval: 30s
collector_id: "$POD_NAME"
extensions:
Expand Down
4 changes: 2 additions & 2 deletions otelcollector/scripts/main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ if [ "$HTTPS_PROXY" != "" ] && [ "${HTTPS_PROXY: -1}" == "/" ]; then
fi

# Add our target-allocator service to the no_proxy env variable
export NO_PROXY=$NO_PROXY,ama-metrics-targetallocator.kube-system.svc.cluster.local
export NO_PROXY=$NO_PROXY,ama-metrics-operator-targets.kube-system.svc.cluster.local
echo "export NO_PROXY=$NO_PROXY" >> ~/.bashrc
export no_proxy=$no_proxy,ama-metrics-targetallocator.kube-system.svc.cluster.local
export no_proxy=$no_proxy,ama-metrics-operator-targets.kube-system.svc.cluster.local
echo "export no_proxy=$no_proxy" >> ~/.bashrc

# If HTTP Proxy is enabled, HTTP_PROXY will always have a value.
Expand Down
2 changes: 1 addition & 1 deletion otelcollector/telegraf/telegraf-prometheus-collector.conf
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@

[[inputs.prometheus]]
interval = "5m"
urls = ["http://ama-metrics-targetallocator.kube-system.svc.cluster.local/metrics"]
urls = ["http://ama-metrics-operator-targets.kube-system.svc.cluster.local/metrics"]
fieldpass = ["opentelemetry_allocator_targets","opentelemetry_allocator_collectors_discovered"]
metric_version = 2
url_tag = "scrapeUrl"
Expand Down

0 comments on commit edfb12b

Please sign in to comment.