diff --git a/cmd/docker-driver/config.json b/cmd/docker-driver/config.json index e9ab4f1299ba..905ba305dc15 100644 --- a/cmd/docker-driver/config.json +++ b/cmd/docker-driver/config.json @@ -1,12 +1,16 @@ { "description": "Loki Logging Driver", "documentation": "https://github.com/grafana/loki", - "entrypoint": ["/bin/docker-driver"], + "entrypoint": [ + "/bin/docker-driver" + ], "network": { "type": "host" }, "interface": { - "types": ["docker.logdriver/1.0"], + "types": [ + "docker.logdriver/1.0" + ], "socket": "loki.sock" }, "env": [ @@ -14,18 +18,9 @@ "name": "LOG_LEVEL", "description": "Set log level to output for plugin logs", "value": "info", - "settable": ["value"] - } - ], - "mounts": [ - { - "name": "data", - "description": "Optional external pipeline files", - "source": "", - "destination": "/data", - "type": "none", - "options": ["bind", "ro"], - "settable": ["source", "destination"] + "settable": [ + "value" + ] } ] } diff --git a/docs/clients/docker-driver/configuration.md b/docs/clients/docker-driver/configuration.md index 481eb3c12fb3..e106c4d59efc 100644 --- a/docs/clients/docker-driver/configuration.md +++ b/docs/clients/docker-driver/configuration.md @@ -109,37 +109,6 @@ Custom labels can be added using the `loki-external-labels`, `loki-pipeline-stage-file`, `labels`, `env`, and `env-regex` options. See the next section for all supported options. -## Configure custom pipeline stage file - -You can also use custom pipeline stage files, with `loki-pipeline-stage-file` option, -provided from outside of the Loki logging driver container by running Loki with a -mounted volume. To do so, you'll need to disable the plugin, set a volume mount -options and enable the plugin again: - -```bash -docker plugin disable loki:latest -docker plugin set loki:latest data.source=/etc/pipelines -docker plugin enable loki:latest -``` - -In the example above the directory `/etc/pipelines` will be mounted as `/data` -inside the Loki driver container and `loki-pipeline-stage-file` option can be -passed with a custom pipeline configuration, provided there's a file -`/etc/pipelines/mypipeline.yaml` on the host machine: - -```bash -docker run --log-driver=loki \ - --log-opt loki-url="https://:@logs-us-west1.grafana.net/loki/api/v1/push" \ - --log-opt loki-pipeline-stage-file=/data/mypipeline.yaml \ - grafana/grafana -``` - -Available options are: - -- `data.source`: the source directory the volume -- `data.destination`: the path where the directory is mounted in the container, -and is `/data` by default - ## Supported log-opt options The following are all supported options that the Loki logging driver supports: