Merge "improve mkfs condition and make fs_type for partitioning optional"
diff --git a/linux/meta/prometheus.yml b/linux/meta/prometheus.yml
index bea6995..67e4211 100644
--- a/linux/meta/prometheus.yml
+++ b/linux/meta/prometheus.yml
@@ -14,6 +14,7 @@
SystemDiskSpaceTooLow:
if: 'predict_linear(disk_free[1h], 8*3600) < 0'
{% raw %}
+ for: 5m
labels:
severity: warning
service: system
@@ -34,6 +35,7 @@
SystemDiskInodesTooLow:
if: 'predict_linear(disk_inodes_free[1h], 8*3600) < 0'
{% raw %}
+ for: 5m
labels:
severity: warning
service: system
diff --git a/linux/network/interface.sls b/linux/network/interface.sls
index c97e3dc..ddcb8d8 100644
--- a/linux/network/interface.sls
+++ b/linux/network/interface.sls
@@ -121,7 +121,7 @@
ovs_port_{{ interface_name }}_line1:
file.replace:
- name: /etc/network/interfaces
- - pattern: auto {{ interface_name }}
+ - pattern: auto {{ interface_name }}$
- repl: ""
ovs_port_{{ interface_name }}_line2:
@@ -246,7 +246,7 @@
remove_interface_{{ network }}_line1:
file.replace:
- name: /etc/network/interfaces
- - pattern: auto {{ network }}
+ - pattern: auto {{ network }}$
- repl: ""
remove_interface_{{ network }}_line2: