Skip to content

Commit

Permalink
PMM-13391 Bump up loki and fix the config
Browse files Browse the repository at this point in the history
  • Loading branch information
ademidoff committed Dec 10, 2024
1 parent 7fa2537 commit cf94fe4
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
6 changes: 3 additions & 3 deletions build/ansible/roles/loki/files/Dockerfile.loki
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# TODO: the image should be percona/pmm-server:3 once PMM v3 is released.

# To build the image, run the following in the project root directory (mind the dot):
# docker buildx build --platform=linux/amd64 --progress plain -t perconalab/pmm-server:loki-3.2 -f ./build/ansible/roles/loki/files/Dockerfile.loki .
# docker buildx build --platform=linux/amd64 --progress plain -t perconalab/pmm-server:loki-3.3.1 -f ./build/ansible/roles/loki/files/Dockerfile.loki .
FROM perconalab/pmm-server:3-dev-latest

ENV GF_ANALYTICS_CHECK_FOR_UPDATES=false
Expand All @@ -17,8 +17,8 @@ USER pmm

EXPOSE 3100

# To launch it:
# `docker run -d --name loki --platform=linux/amd64 -p 3100:3100 -p 443:8443 perconalab/pmm-server:loki-3.2`
# To launch it:
# docker run -d --name loki --platform=linux/amd64 -p 3100:3100 -p 443:8443 perconalab/pmm-server:loki-3.3.1

# To upload data to Loki:
# curl -X POST -k \
Expand Down
4 changes: 0 additions & 4 deletions build/ansible/roles/loki/files/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ common:
kvstore:
store: inmemory

ingester_rf1:
enabled: false

query_range:
results_cache:
cache:
Expand All @@ -41,7 +38,6 @@ schema_config:
pattern_ingester:
enabled: true
metric_aggregation:
enabled: true
loki_address: 127.0.0.1:3100

ruler:
Expand Down
13 changes: 12 additions & 1 deletion build/ansible/roles/loki/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
sslcacert: /etc/pki/tls/certs/ca-bundle.crt

- name: Install Loki and Promtail
yum:
dnf:
name: "{{ item }}"
state: latest
disablerepo: "*"
Expand Down Expand Up @@ -99,3 +99,14 @@

- name: Remove ansible markers from pmm.conf
command: sed -i '/^#LOKI_LOCATION_.*/d' /etc/nginx/conf.d/pmm.conf

- name: Clean up dnf cache
command: dnf clean all

- name: Remove package cache directories
file:
path: "{{ item }}"
state: absent
loop:
- /var/cache/dnf
- /var/cache/yum

0 comments on commit cf94fe4

Please sign in to comment.