Skip to content

Commit

Permalink
Move default port for Loki to 3100 everywhere. (#1838)
Browse files Browse the repository at this point in the history
Also fixes default value for the table manager that doesn't support 0 anymore on master.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
  • Loading branch information
cyriltovena authored Mar 23, 2020
1 parent 2a03cde commit fa51393
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cmd/loki/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ RUN addgroup -g 1000 -S loki && \
RUN mkdir -p /loki && \
chown -R loki:loki /etc/loki /loki
USER loki
EXPOSE 8080
EXPOSE 3100
ENTRYPOINT [ "/usr/bin/loki" ]
CMD ["-config.file=/etc/loki/local-config.yaml"]
2 changes: 1 addition & 1 deletion cmd/loki/Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN apk add --update --no-cache ca-certificates
COPY --from=build /src/loki/cmd/loki/loki-debug /usr/bin/loki-debug
COPY --from=build /go/bin/dlv /usr/bin/dlv
COPY cmd/loki/loki-local-config.yaml /etc/loki/local-config.yaml
EXPOSE 8080
EXPOSE 3100

# Expose 40000 for delve
EXPOSE 40000
Expand Down
2 changes: 1 addition & 1 deletion cmd/loki/loki-local-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
auth_enabled: false

server:
http_listen_port: 8080
http_listen_port: 3100

ingester:
lifecycler:
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki-stack/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: "v1"
name: loki-stack
version: 0.32.1
version: 0.32.2
appVersion: v1.3.0
kubeVersion: "^1.10.0-0"
description: "Loki: like Prometheus, but for logs."
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: "v1"
name: loki
version: 0.25.2
version: 0.25.3
appVersion: v1.3.0
kubeVersion: "^1.10.0-0"
description: "Loki: like Prometheus, but for logs."
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ config:
max_look_back_period: 0
table_manager:
retention_deletes_enabled: false
retention_period: 0
retention_period: 0s

## Additional Loki container arguments, e.g. log level (debug, info, warn, error)
extraArgs: {}
Expand Down
2 changes: 1 addition & 1 deletion production/ksonnet/loki/config.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
_config+: {
namespace: error 'must define namespace',
cluster: error 'must define cluster',
http_listen_port: 8080,
http_listen_port: 3100,

replication_factor: 3,
memcached_replicas: 3,
Expand Down

0 comments on commit fa51393

Please sign in to comment.