Sort alerts and recording rules

Change-Id: I53b58e4812eb743a8826808c10d79b9dababe7bf
Related-PROD: PROD-24981 (PROD:24981)
diff --git a/prometheus/files/server/2.0/alerts.yml b/prometheus/files/server/2.0/alerts.yml
index ca38699..1d46e15 100644
--- a/prometheus/files/server/2.0/alerts.yml
+++ b/prometheus/files/server/2.0/alerts.yml
@@ -14,7 +14,7 @@
 {%- set recordings = salt['grains.filter_by']({'default': recordings}, merge=server.get('recording', {})) %}
 - name: recording.rules
   rules:
-{%- for recordingname, recording in recordings.iteritems() %}
+{%- for recordingname, recording in recordings.iteritems()|sort %}
   {%- if recording.get('enabled', True) %}
   - record: {{ recordingname }}
     expr: >-
@@ -36,7 +36,7 @@
 {%- set alerts = salt['grains.filter_by']({'default': alerts}, merge=server.get('alert', {})) %}
 - name: alert.rules
   rules:
-{%- for alertname, alert in alerts.iteritems() %}
+{%- for alertname, alert in alerts.iteritems()|sort %}
   {%- if alert.get('enabled', True) %}
   - alert: {{ alertname }}
     expr: >-