Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update cloud_config_requirer lib #329

Merged
merged 2 commits into from
Nov 14, 2024
Merged

update cloud_config_requirer lib #329

merged 2 commits into from
Nov 14, 2024

Conversation

Abuelodelanada
Copy link
Contributor

@Abuelodelanada Abuelodelanada commented Nov 14, 2024

Issue

This PR updates the cloud_config_requirer lib to its last version, so we can fix this same issue, but in the k8s operator

We are not updating the others libs in this PR, since we are addressing it in a separate PR because it needs modification to charm code.

Testing Instructions

Pack the charm, and deploy this bundle:

bundle: kubernetes
applications:
  agent:
    charm: local:grafana-agent-k8s-0
    scale: 1
    constraints: arch=amd64
    storage:
      data: kubernetes,1,1024M
    trust: true
  flog:
    charm: flog-k8s
    channel: latest/edge
    revision: 8
    base: [email protected]/stable
    resources:
      workload-image: 2
    scale: 1
    constraints: arch=amd64
  gci:
    charm: grafana-cloud-integrator
    channel: latest/edge
    revision: 23
    scale: 1
    options:
      loki-url: http://loki.com
      password: Password
      username: Username
    constraints: arch=amd64
  loki:
    charm: loki-k8s
    channel: latest/edge
    revision: 176
    base: [email protected]/stable
    resources:
      loki-image: 100
      node-exporter-image: 3
    scale: 1
    constraints: arch=amd64
    storage:
      active-index-directory: kubernetes,1,1024M
      loki-chunks: kubernetes,1,1024M
    trust: true
relations:
- - gci:grafana-cloud-config
  - agent:grafana-cloud-config
- - flog:log-proxy
  - agent:logging-provider
- - agent:logging-consumer
  - loki:logging

then, verify that in every grafana-agent config file, username and password are inside logs section, for instance:

logs:
  configs:
  - clients:
    - tls_config:
        insecure_skip_verify: false
      url: http://loki-0.loki-endpoints.test.svc.cluster.local:3100/loki/api/v1/push
    - basic_auth:
        password: Password
        username: Username
      headers:
        Content-Encoding: snappy
      tls_config:
        insecure_skip_verify: false
      url: http://loki.com
    name: push_api_server
    scrape_configs:
    - job_name: loki
      loki_push_api:
        server:
          grpc_listen_port: 3600
          http_listen_port: 3500
  positions_directory: /run/grafana-agent-positions

@Abuelodelanada Abuelodelanada marked this pull request as ready for review November 14, 2024 02:09
@Abuelodelanada Abuelodelanada requested a review from a team as a code owner November 14, 2024 02:09
Signed-off-by: Leon <[email protected]>
@lucabello lucabello merged commit 3c30f33 into main Nov 14, 2024
13 checks passed
@lucabello lucabello deleted the update-libs branch November 14, 2024 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants