Merge pull request #352 from npawelek/master

major · web-flow · commit 904e8d4a9ea4 · 2017-09-12T12:44:12.000-06:00
Fix issue with filesystem template population
diff --git a/playbooks/templates/rax-maas/filesystem.yaml.j2 b/playbooks/templates/rax-maas/filesystem.yaml.j2
@@ -15,8 +15,8 @@ alarms      :
         criteria                : |
             :set consecutiveCount={{ maas_alarm_local_consecutive_count }}
             if (percentage(metric['used'], metric['total']) >= {{ item.critical_threshold }}) {
-                return new AlarmStatus(CRITICAL, "{{ item }} filesystem is >= {{ item.critical_threshold }}% full.");
+                return new AlarmStatus(CRITICAL, "{{ item.filesystem }} filesystem is >= {{ item.critical_threshold }}% full.");
             }
             if (percentage(metric['used'], metric['total']) >= {{ item.warning_threshold }}) {
-                return new AlarmStatus(WARNING, "{{ item }} filesystem is >= {{ item.warning_threshold }}% full.");
+                return new AlarmStatus(WARNING, "{{ item.filesystem }} filesystem is >= {{ item.warning_threshold }}% full.");
             }

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ alarms :`
`15`	`15`	`criteria : \|`
`16`	`16`	`:set consecutiveCount={{ maas_alarm_local_consecutive_count }}`
`17`	`17`	`if (percentage(metric['used'], metric['total']) >= {{ item.critical_threshold }}) {`
`18`		`- return new AlarmStatus(CRITICAL, "{{ item }} filesystem is >= {{ item.critical_threshold }}% full.");`
	`18`	`+ return new AlarmStatus(CRITICAL, "{{ item.filesystem }} filesystem is >= {{ item.critical_threshold }}% full.");`
`19`	`19`	`}`
`20`	`20`	`if (percentage(metric['used'], metric['total']) >= {{ item.warning_threshold }}) {`
`21`		`- return new AlarmStatus(WARNING, "{{ item }} filesystem is >= {{ item.warning_threshold }}% full.");`
	`21`	`+ return new AlarmStatus(WARNING, "{{ item.filesystem }} filesystem is >= {{ item.warning_threshold }}% full.");`
`22`	`22`	`}`