Skip to content

Commit

Permalink
PMM-13391 Expose vmlogs port, dont' replace nginx configs
Browse files Browse the repository at this point in the history
  • Loading branch information
ademidoff committed Nov 13, 2024
1 parent 3916baf commit 064a875
Show file tree
Hide file tree
Showing 8 changed files with 59 additions and 346 deletions.
2 changes: 1 addition & 1 deletion build/ansible/pmm-docker/victorialogs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
become: yes
gather_facts: yes
vars:
victorialogs_version: "0.37.0"
victorialogs_version: "0.42.0"
roles:
- victorialogs
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:victorialogs-0.37.0 -f ./build/ansible/roles/victorialogs/files/Dockerfile.victorialogs .
# docker buildx build --platform=linux/amd64 --progress=plain -t perconalab/pmm-server:victorialogs-0.42.0 -f ./build/ansible/roles/victorialogs/files/Dockerfile.victorialogs .
FROM perconalab/pmm-server:3-dev-latest

ENV GF_ANALYTICS_CHECK_FOR_UPDATES=false
Expand All @@ -13,4 +13,6 @@ COPY build/ansible /opt/ansible

RUN ansible-playbook -vvv -i 'localhost,' -c local /opt/ansible/pmm-docker/victorialogs.yml

EXPOSE 9428

USER pmm
12 changes: 12 additions & 0 deletions build/ansible/roles/victorialogs/files/json_log_format.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
'time="$time_iso8601" '
'host=$http_host '
'remote_addr=$remote_addr '
'request_method=$request_method '
'request="$request_uri" '
'request_time=$request_time '
'body_bytes_sent=$body_bytes_sent '
'server_protocol="$server_protocol" '
'status=$status '
'http_referrer="$http_referer" '
'http_x_forwarded_for="$http_x_forwarded_for" '
'http_user_agent="$http_user_agent"';
62 changes: 0 additions & 62 deletions build/ansible/roles/victorialogs/files/nginx.conf

This file was deleted.

268 changes: 0 additions & 268 deletions build/ansible/roles/victorialogs/files/pmm.conf

This file was deleted.

2 changes: 1 addition & 1 deletion build/ansible/roles/victorialogs/files/victorialogs.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ priority = 20
command = /usr/local/bin/victoria-logs
-storageDataPath=/srv/victorialogs/data
-retentionPeriod=30d
-httpListenAddr=127.0.0.1:9428
-httpListenAddr=0.0.0.0:9428
-envflag.enable
-envflag.prefix=VL_
user = pmm
Expand Down
13 changes: 13 additions & 0 deletions build/ansible/roles/victorialogs/files/vlogs_location.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
location /vmui {
proxy_pass http://127.0.0.1:9428/select/vmui;
proxy_http_version 1.1;
proxy_read_timeout 600;
proxy_set_header Connection "";
}

location /select/logsql {
proxy_pass http://127.0.0.1:9428$request_uri;
proxy_http_version 1.1;
proxy_read_timeout 600;
proxy_set_header Connection "";
}
Loading

0 comments on commit 064a875

Please sign in to comment.