mirror of
https://github.com/VictoriaMetrics/VictoriaMetrics.git
synced 2024-12-01 14:47:38 +00:00
df8ec22662
Previously the `quotesEscape` function was escaping only double quotes. This wasn't enough, since the input string could contain other special chars, which must be escaped when put inside JSON string. For example, carriage return and line feed chars (\n\r), backslash char, etc. This led to the following issues, which were improperly fixed: - https://github.com/VictoriaMetrics/VictoriaMetrics/issues/890 - this issue was "fixed" by introducing the `crlfEscape` function, which led to unnecessary complications in user templates, while not fixing various corner cases such as backslash chars in the input string. See1de15ad490
- https://github.com/VictoriaMetrics/VictoriaMetrics/issues/3139 - this issue was "fixed" by urlencoding the whole string passed to -external.alert.source command-line flag. This led to invalid urls, which couldn't be parsed by Grafana. See00c838353d
and4bd0244599
This commit properly encodes the input string passed to `quotesEscape`, so it can be safely embedded inside JSON strings. This commit deprecates crlfEscape template function and adds the following new template functions: - strvalue and stripDomain - these functions are supported by Prometheus, so they were added for compatibility purposes. - jsonEscape and htmlEscape for converting the input string to valid quoted JSON string and for html-escaping the input string, so it could be safely embedded as a plaintext into html. This commit also documents all supported template functions at https://docs.victoriametrics.com/vmalert.html#template-functions The deprecated crlfEscape function isn't documented on purpose, since its usefulness is negative in general case.
119 lines
3.2 KiB
YAML
119 lines
3.2 KiB
YAML
version: '3.5'
|
|
services:
|
|
vmagent:
|
|
container_name: vmagent
|
|
image: victoriametrics/vmagent
|
|
depends_on:
|
|
- "vminsert"
|
|
ports:
|
|
- 8429:8429
|
|
volumes:
|
|
- vmagentdata:/vmagentdata
|
|
- ./prometheus.yml:/etc/prometheus/prometheus.yml
|
|
command:
|
|
- '--promscrape.config=/etc/prometheus/prometheus.yml'
|
|
- '--remoteWrite.url=http://vminsert:8480/insert/0/prometheus/'
|
|
restart: always
|
|
|
|
grafana:
|
|
container_name: grafana
|
|
image: grafana/grafana:9.0.2
|
|
depends_on:
|
|
- "vmselect"
|
|
ports:
|
|
- 3000:3000
|
|
restart: always
|
|
volumes:
|
|
- grafanadata:/var/lib/grafana
|
|
- ./provisioning/:/etc/grafana/provisioning/
|
|
- ./../../dashboards/victoriametrics.json:/var/lib/grafana/dashboards/vm.json
|
|
- ./../../dashboards/vmagent.json:/var/lib/grafana/dashboards/vmagent.json
|
|
- ./../../dashboards/vmalert.json:/var/lib/grafana/dashboards/vmalert.json
|
|
|
|
vmstorage-1:
|
|
container_name: vmstorage-1
|
|
image: victoriametrics/vmstorage
|
|
ports:
|
|
- 8482
|
|
- 8400
|
|
- 8401
|
|
volumes:
|
|
- strgdata-1:/storage
|
|
command:
|
|
- '--storageDataPath=/storage'
|
|
restart: always
|
|
vmstorage-2:
|
|
container_name: vmstorage-2
|
|
image: victoriametrics/vmstorage
|
|
ports:
|
|
- 8482
|
|
- 8400
|
|
- 8401
|
|
volumes:
|
|
- strgdata-2:/storage
|
|
command:
|
|
- '--storageDataPath=/storage'
|
|
restart: always
|
|
vminsert:
|
|
container_name: vminsert
|
|
image: victoriametrics/vminsert
|
|
depends_on:
|
|
- "vmstorage-1"
|
|
- "vmstorage-2"
|
|
command:
|
|
- '--storageNode=vmstorage-1:8400'
|
|
- '--storageNode=vmstorage-2:8400'
|
|
ports:
|
|
- 8480
|
|
restart: always
|
|
vmselect:
|
|
container_name: vmselect
|
|
image: victoriametrics/vmselect
|
|
depends_on:
|
|
- "vmstorage-1"
|
|
- "vmstorage-2"
|
|
command:
|
|
- '--storageNode=vmstorage-1:8401'
|
|
- '--storageNode=vmstorage-2:8401'
|
|
- '--vmalert.proxyURL=http://vmalert:8880'
|
|
ports:
|
|
- 8481:8481
|
|
restart: always
|
|
|
|
vmalert:
|
|
container_name: vmalert
|
|
image: victoriametrics/vmalert
|
|
depends_on:
|
|
- "vmselect"
|
|
ports:
|
|
- 8880:8880
|
|
volumes:
|
|
- ./alerts.yml:/etc/alerts/alerts.yml
|
|
command:
|
|
- '--datasource.url=http://vmselect:8481/select/0/prometheus'
|
|
- '--remoteRead.url=http://vmselect:8481/select/0/prometheus'
|
|
- '--remoteWrite.url=http://vminsert:8480/insert/0/prometheus'
|
|
- '--notifier.url=http://alertmanager:9093/'
|
|
- '--rule=/etc/alerts/*.yml'
|
|
# display source of alerts in grafana
|
|
- '-external.url=http://127.0.0.1:3000' #grafana outside container
|
|
# when copypaste the line be aware of '$$' for escaping in '$expr'
|
|
- '--external.alert.source=explore?orgId=1&left=["now-1h","now","VictoriaMetrics",{"expr":{{$$expr|jsonEscape|queryEscape}} },{"mode":"Metrics"},{"ui":[true,true,true,"none"]}]'
|
|
restart: always
|
|
|
|
alertmanager:
|
|
container_name: alertmanager
|
|
image: prom/alertmanager
|
|
volumes:
|
|
- ./alertmanager.yml:/config/alertmanager.yml
|
|
command:
|
|
- '--config.file=/config/alertmanager.yml'
|
|
ports:
|
|
- 9093:9093
|
|
restart: always
|
|
|
|
volumes:
|
|
vmagentdata: {}
|
|
strgdata-1: {}
|
|
strgdata-2: {}
|
|
grafanadata: {}
|