Skip to content

Commit 877b20a

Browse files
committed
wip
1 parent 4b3bf93 commit 877b20a

4 files changed

Lines changed: 14 additions & 14 deletions

File tree

cmd/operator-opamp-bridge/internal/workload/client.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
)
2121

2222
const (
23-
managedByLabel = "app.kubernetes.io/managed-by"
24-
managedByValue = "opamp-bridge"
23+
managedByLabel = "app.kubernetes.io/managed-by"
24+
managedByValue = "opamp-bridge"
2525
restartAnnotation = "kubectl.kubernetes.io/restartedAt"
2626
)
2727

@@ -142,7 +142,7 @@ func (c *Client) ListInstances() ([]operator.CollectorInstance, error) {
142142
for _, target := range c.targets {
143143
instance, err := c.getInstance(ctx, target)
144144
if err != nil {
145-
c.log.V(4).Info("Skipping target", "name", target.Name, "namespace", target.Namespace, "error", err)
145+
c.log.Error(err, "Error getting target", "name", target.Name, "namespace", target.Namespace)
146146
continue
147147
}
148148
result = append(result, instance)

config/standalone-bridge/configmap.yaml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ metadata:
66
data:
77
config.yaml: |
88
mode: standalone
9-
endpoint: ws://opamp-server:4320/v1/opamp
9+
#endpoint: ws://opamp-server:4320/v1/opamp
10+
endpoint: http://host.docker.internal:8080/v1/opamp
1011
listenAddr: ":8080"
1112
heartbeatInterval: 30s
1213
name: opamp-bridge-standalone
@@ -15,12 +16,12 @@ data:
1516
ReportsEffectiveConfig: true
1617
ReportsHealth: true
1718
ReportsOwnMetrics: true
18-
targets: []
19+
ReportsRemoteConfig: true
1920
# Example target:
2021
targets:
21-
- name: my-collector
22-
namespace: default
23-
kind: Deployment
24-
workloadName: otelcol
25-
configMapName: otelcol-config
26-
configMapKey: collector.yaml
22+
- name: otel-agent
23+
namespace: opentelemetry
24+
kind: DaemonSet
25+
workloadName: otel-agent
26+
configMapName: otel-agent-conf
27+
configMapKey: otel-agent-config

config/standalone-bridge/deployment.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ spec:
3333
mountPath: /conf
3434
readOnly: true
3535
livenessProbe:
36-
httpGet:
37-
path: /v1/opamp
36+
tcpSocket:
3837
port: opamp
3938
initialDelaySeconds: 5
4039
periodSeconds: 10

config/standalone-bridge/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ resources:
1313
images:
1414
- name: operator-opamp-bridge
1515
newName: ghcr.io/open-telemetry/opentelemetry-operator/operator-opamp-bridge
16-
newTag: v0.148.0-50-g7e425156
16+
newTag: v0.148.0-51-g4b3bf934

0 commit comments

Comments
 (0)