Skip to content

Commit

Permalink
imp: crlfEscape no longer required as of vm >= 1.83.0
Browse files Browse the repository at this point in the history
  • Loading branch information
johnalotoski committed Nov 14, 2022
1 parent d50c3a2 commit 96151bf
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions modules/monitoring.nix
Original file line number Diff line number Diff line change
Expand Up @@ -522,14 +522,14 @@ in {
httpListenAddr = "0.0.0.0:8880";
externalUrl = "https://monitoring.${domain}";
httpPathPrefix = "/vmalert-vm";
externalAlertSource = ''explore?left=%%7B%%22datasource%%22:%%22VictoriaMetrics%%22,%%22queries%%22:%%5B%%7B%%22refId%%22:%%22A%%22,%%22expr%%22:%%22{{$expr|quotesEscape|crlfEscape|pathEscape}}%%22,%%22range%%22:true,%%22editorMode%%22:%%22code%%22%%7D%%5D,%%22range%%22:%%7B%%22from%%22:%%22now-1h%%22,%%22to%%22:%%22now%%22%%7D%%7D&orgId=1'';
externalAlertSource = ''explore?left=%%7B%%22datasource%%22:%%22VictoriaMetrics%%22,%%22queries%%22:%%5B%%7B%%22refId%%22:%%22A%%22,%%22expr%%22:%%22{{$expr|quotesEscape|pathEscape}}%%22,%%22range%%22:true,%%22editorMode%%22:%%22code%%22%%7D%%5D,%%22range%%22:%%7B%%22from%%22:%%22now-1h%%22,%%22to%%22:%%22now%%22%%7D%%7D&orgId=1'';
};
loki = {
datasourceUrl = "http://127.0.0.1:3100/loki";
httpListenAddr = "0.0.0.0:8881";
externalUrl = "https://monitoring.${domain}";
httpPathPrefix = "/vmalert-loki";
externalAlertSource = ''explore?left=%%7B%%22datasource%%22:%%22Loki%%22,%%22queries%%22:%%5B%%7B%%22refId%%22:%%22A%%22,%%22expr%%22:%%22{{$expr|quotesEscape|crlfEscape|pathEscape}}%%22,%%22range%%22:true,%%22editorMode%%22:%%22code%%22%%7D%%5D,%%22range%%22:%%7B%%22from%%22:%%22now-1h%%22,%%22to%%22:%%22now%%22%%7D%%7D&orgId=1'';
externalAlertSource = ''explore?left=%%7B%%22datasource%%22:%%22Loki%%22,%%22queries%%22:%%5B%%7B%%22refId%%22:%%22A%%22,%%22expr%%22:%%22{{$expr|quotesEscape|pathEscape}}%%22,%%22range%%22:true,%%22editorMode%%22:%%22code%%22%%7D%%5D,%%22range%%22:%%7B%%22from%%22:%%22now-1h%%22,%%22to%%22:%%22now%%22%%7D%%7D&orgId=1'';
# Loki uses PromQL type queries that do not strictly comply with PromQL
# Ref: https://github.com/VictoriaMetrics/VictoriaMetrics/issues/780
ruleValidateExpressions = false;
Expand Down

0 comments on commit 96151bf

Please sign in to comment.