Update loki push path

cmd/docker-driver/README.md

@@ -41,7 +41,7 @@ The following command configure the container `grafana` to start with the loki d
 
 ```bash
 docker run --log-driver=loki \
-    --log-opt loki-url="https://<user_id>:<password>@logs-us-west1.grafana.net/api/prom/push" \
+    --log-opt loki-url="https://<user_id>:<password>@logs-us-west1.grafana.net/loki/api/v1/push" \
     --log-opt loki-retries=5 \
     --log-opt loki-batch-size=400 \
     grafana/grafana
@@ -68,7 +68,7 @@ The logging driver has configurable options, you can set them in the `daemon.jso
     "debug" : true,
     "log-driver": "loki",
     "log-opts": {
-        "loki-url": "https://<user_id>:<password>@logs-us-west1.grafana.net/api/prom/push",
+        "loki-url": "https://<user_id>:<password>@logs-us-west1.grafana.net/loki/api/v1/push",
         "loki-batch-size": "400"
     }
 }
@@ -90,7 +90,7 @@ services:
     logging:
       driver: loki
       options:
-        loki-url: "https://<user_id>:<password>@logs-us-west1.grafana.net/api/prom/push"
+        loki-url: "https://<user_id>:<password>@logs-us-west1.grafana.net/loki/api/v1/push"
 ```
 
 You can then deploy your stack using:

cmd/promtail/promtail-docker-config.yaml

@@ -6,7 +6,7 @@ positions:
   filename: /tmp/positions.yaml
 
 clients:
-  - url: http://loki:3100/api/prom/push
+  - url: http://loki:3100/loki/api/v1/push
 
 scrape_configs:
 - job_name: system

cmd/promtail/promtail-local-config.yaml

@@ -6,7 +6,7 @@ positions:
   filename: /tmp/positions.yaml
 
 clients:
-  - url: http://localhost:3100/api/prom/push
+  - url: http://localhost:3100/loki/api/v1/push
 
 scrape_configs:
 - job_name: system

fluentd/fluent-plugin-grafana-loki/README.md

@@ -92,7 +92,7 @@ services:
 ## Configuration
 
 ### url
-The url of the Loki server to send logs to.  When sending data the publish path (`/api/prom/push`) will automatically be appended.
+The url of the Loki server to send logs to.  When sending data the publish path (`/loki/api/v1/push`) will automatically be appended.
 By default the url is set to `https://logs-us-west1.grafana.net`, the url of the Grafana Labs preview (hosted Loki)[https://grafana.com/loki] service.
 
 #### Proxy Support

fluentd/fluent-plugin-grafana-loki/lib/fluent/plugin/out_loki.rb

@@ -87,7 +87,7 @@ def write(chunk)
         body = { 'streams': payload }
 
         # add ingest path to loki url
-        uri = URI.parse(url + '/api/prom/push')
+        uri = URI.parse(url + '/loki/api/v1/push')
 
         req = Net::HTTP::Post.new(
           uri.request_uri

pkg/loki/modules.go

@@ -126,10 +126,14 @@ func (t *Loki) initDistributor() (err error) {
 		return
 	}
 
-	t.server.HTTP.Path("/ready").Handler(http.HandlerFunc(t.distributor.ReadinessHandler))
-	t.server.HTTP.Handle("/api/prom/push", middleware.Merge(
+	pushHandler := middleware.Merge(
 		t.httpAuthMiddleware,
-	).Wrap(http.HandlerFunc(t.distributor.PushHandler)))
+	).Wrap(http.HandlerFunc(t.distributor.PushHandler))
+
+	t.server.HTTP.Path("/ready").Handler(http.HandlerFunc(t.distributor.ReadinessHandler))
+
+	t.server.HTTP.Handle("/api/prom/push", pushHandler)
+	t.server.HTTP.Handle("/loki/api/v1/push", pushHandler)
 	return
 }
 

pkg/promtail/promtail_test.go

@@ -69,7 +69,7 @@ func TestPromtail(t *testing.T) {
 		recMtx:         sync.Mutex{},
 		t:              t,
 	}
-	http.Handle("/api/prom/push", handler)
+	http.Handle("/loki/api/v1/push", handler)
 	defer func() {
 		if err != nil {
 			t.Fatal(err)
@@ -526,7 +526,7 @@ func parsePromMetrics(t *testing.T, bytes []byte, contentType string, metricName
 
 func buildTestConfig(t *testing.T, positionsFileName string, logDirName string) config.Config {
 	var clientURL flagext.URLValue
-	err := clientURL.Set("http://localhost:3100/api/prom/push")
+	err := clientURL.Set("http://localhost:3100/loki/api/v1/push")
 	if err != nil {
 		t.Fatal("Failed to parse client URL")
 	}

production/helm/loki-stack/templates/tests/loki-test-configmap.yaml

@@ -34,7 +34,7 @@ data:
       local timestamp=$(date -Iseconds -u | sed 's/UTC/.000000000+00:00/')
       local data=$(jq -n --arg timestamp "${timestamp}" '{"streams": [{"labels": "{app=\"loki-test\"}", "entries": [{"ts": $timestamp, "line": "foobar"}]}]}')
 
-      curl -s -X POST -H "Content-Type: application/json" ${LOKI_URI}/api/prom/push -d "${data}"
+      curl -s -X POST -H "Content-Type: application/json" ${LOKI_URI}/loki/api/v1/push -d "${data}"
 
       curl -sG ${LOKI_URI}/api/prom/query?limit=1 --data-urlencode 'query={app="loki-test"}' | \
       jq -e '.streams[].entries[].line == "foobar"'

production/helm/promtail/Chart.yaml

@@ -1,5 +1,5 @@
 name: promtail
-version: 0.12.2
+version: 0.12.3
 appVersion: v0.3.0
 kubeVersion: "^1.10.0-0"
 description: "Responsible for gathering logs and sending them to Loki"

production/helm/promtail/templates/daemonset.yaml

@@ -45,9 +45,9 @@ spec:
           args:
             - "-config.file=/etc/promtail/promtail.yaml"
             {{- if and .Values.loki.user .Values.loki.password }}
-            - "-client.url={{ .Values.loki.serviceScheme }}://{{ .Values.loki.user }}:{{ .Values.loki.password }}@{{ include "loki.serviceName" . }}:{{ .Values.loki.servicePort }}/api/prom/push"
+            - "-client.url={{ .Values.loki.serviceScheme }}://{{ .Values.loki.user }}:{{ .Values.loki.password }}@{{ include "loki.serviceName" . }}:{{ .Values.loki.servicePort }}/loki/api/v1/push"
             {{- else }}
-            - "-client.url={{ .Values.loki.serviceScheme }}://{{ include "loki.serviceName" . }}:{{ .Values.loki.servicePort }}/api/prom/push"
+            - "-client.url={{ .Values.loki.serviceScheme }}://{{ include "loki.serviceName" . }}:{{ .Values.loki.servicePort }}/loki/api/v1/push"
             {{- end }}
           volumeMounts:
             - name: config

production/ksonnet/loki/gateway.libsonnet

@@ -52,6 +52,14 @@
             location ~ /api/prom/.* {
               proxy_pass      http://querier.%(namespace)s.svc.cluster.local$request_uri;
             }
+
+            location = /loki/api/v1/push {
+              proxy_pass      http://distributor.%(namespace)s.svc.cluster.local$request_uri;
+            }
+
+            location ~ /loki/api/.* {
+              proxy_pass      http://querier.%(namespace)s.svc.cluster.local$request_uri;
+            }
           }
         }
       ||| % $._config,

production/ksonnet/promtail/promtail.libsonnet

@@ -19,9 +19,9 @@ k + config + scrape_config {
   promtail_config+:: {
     local service_url(client) =
       if std.objectHasAll(client, 'username') then
-        '%(scheme)s://%(username)s:%(password)s@%(hostname)s/api/prom/push' % client
+        '%(scheme)s://%(username)s:%(password)s@%(hostname)s/loki/api/v1/push' % client
       else
-        '%(scheme)s://%(hostname)s/api/prom/push' % client,
+        '%(scheme)s://%(hostname)s/loki/api/v1/push' % client,
 
     local client_config(client) = client + {
       url: service_url(client),

tools/promtail.sh

@@ -284,7 +284,7 @@ spec:
     spec:
       containers:
       - args:
-        - -client.url=https://<instanceId>:<apiKey>@<instanceUrl>/api/prom/push
+        - -client.url=https://<instanceId>:<apiKey>@<instanceUrl>/loki/api/v1/push
         - -config.file=/etc/promtail/promtail.yml
         env:
         - name: HOSTNAME