diff --git a/README.rst b/README.rst
index e9eb4cf..99a4ffe 100644
--- a/README.rst
+++ b/README.rst
@@ -366,6 +366,8 @@
             transport_type: https
             lun_space_reservation: enabled
             use_multipath_for_image_xfer: True
+            nas_secure_file_operations: false
+            nas_secure_file_permissions: false
             devices:
               - 172.18.1.2:/vol_1
               - 172.18.1.2:/vol_2
diff --git a/cinder/files/backend/_netapp.conf b/cinder/files/backend/_netapp.conf
index f755b43..5555cf6 100644
--- a/cinder/files/backend/_netapp.conf
+++ b/cinder/files/backend/_netapp.conf
@@ -30,3 +30,9 @@
 netapp_lun_space_reservation={{ backend.get('lun_space_reservation', 'disabled') }}
 use_multipath_for_image_xfer={{ backend.get('use_multipath_for_image_xfer', False) }}
 netapp_copyoffload_tool_path={{ backend.get('copyoffload_tool_path', '') }}
+{%- if backend.nas_secure_file_permissions is defined %}
+nas_secure_file_permissions={{ backend.nas_secure_file_permissions }}
+{%- endif %}
+{%- if backend.nas_secure_file_operations is defined %}
+nas_secure_file_operations={{ backend.nas_secure_file_operations }}
+{%- endif %}
diff --git a/cinder/files/grafana_dashboards/cinder_prometheus.json b/cinder/files/grafana_dashboards/cinder_prometheus.json
index ce024b4..ed1f67d 100644
--- a/cinder/files/grafana_dashboards/cinder_prometheus.json
+++ b/cinder/files/grafana_dashboards/cinder_prometheus.json
@@ -22,8 +22,8 @@
           "colorValue": true,
           "colors": [
             "rgba(245, 54, 54, 0.9)",
-            "rgba(237, 129, 40, 0.89)",
-            "rgba(50, 172, 45, 0.97)"
+            "rgba(50, 172, 45, 0.97)",
+            "rgba(237, 129, 40, 0.89)"
           ],
           "datasource": "prometheus",
           "format": "none",
@@ -80,7 +80,7 @@
               "step": 60
             }
           ],
-          "thresholds": "1,0",
+          "thresholds": "0.5,1.5",
           "title": "API Availability",
           "type": "singlestat",
           "valueFontSize": "80%",
@@ -92,13 +92,18 @@
             },
             {
               "op": "=",
+              "text": "DOWN",
+              "value": "0"
+            },
+            {
+              "op": "=",
               "text": "OK",
               "value": "1"
             },
             {
               "op": "=",
-              "text": "DOWN",
-              "value": "0"
+              "text": "UNKNOWN",
+              "value": "2"
             }
           ],
           "valueName": "current"
diff --git a/cinder/meta/prometheus.yml b/cinder/meta/prometheus.yml
index 35e5ea8..d4d3780 100644
--- a/cinder/meta/prometheus.yml
+++ b/cinder/meta/prometheus.yml
@@ -9,7 +9,7 @@
 {%- raw %}
     CinderAPIDown:
       if: >-
-        max(openstack_api_check_status{service=~"cinder.+"}) by (service) == 0
+        max(openstack_api_check_status{service=~"cinder.*"}) by (service) == 0
       for: 2m
       labels:
         severity: down
@@ -18,9 +18,20 @@
         summary: "Endpoint check for '{{ $labels.service }}' is down"
         description: >-
             Endpoint check for '{{ $labels.service }}' is down for 2 minutes
+    CinderAPIServiceDown:
+      if: >-
+        http_response_status{service=~"cinder-api"} == 0
+      for: 2m
+      labels:
+        severity: down
+        service: "{{ $labels.service }}"
+      annotations:
+        summary: "HTTP check for '{{ $labels.service }}' down"
+        description: >-
+            The HTTP check for '{{ $labels.service }}' is down on {{ $labels.host }} for 2 minutes.
     CinderSomeServicesDown:
       if: >-
-          openstack_cinder_services{state="down",service="cinder-volume|cinder-scheduler"} > 0 and ignoring (state) openstack_cinder_services{state="up",services="cinder-volume|cinder-scheduler"} >= 2
+          openstack_cinder_services{state="down",service=~"cinder-volume|cinder-scheduler"} > 0 and ignoring (state) openstack_cinder_services{state="up",service=~"cinder-volume|cinder-scheduler"} >= 2
       for: 2m
       labels:
         severity: warning
@@ -31,7 +42,7 @@
             {{ $value }} {{ $labels.service }} services are down for 2 minutes
     CinderOnlyOneServiceUp:
       if: >-
-          openstack_cinder_services{state="up",service="cinder-volume|cinder-scheduler"} == 1 and ignoring (state) openstack_cinder_services{state="down",service="cinder-volume|cinder-scheduler"} > 0
+          openstack_cinder_services{state="up",service=~"cinder-volume|cinder-scheduler"} == 1 and ignoring (state) openstack_cinder_services{state="down",service=~"cinder-volume|cinder-scheduler"} > 0
       for: 2m
       labels:
         severity: critical
@@ -42,7 +53,7 @@
             Only one {{ $labels.service }} service is up for 2 minutes
     CinderAllServicesDown:
       if: >-
-        openstack_cinder_services{state="up",service="cinder-volume|cinder-scheduler"} == 0
+        openstack_cinder_services{state="up",service=~"cinder-volume|cinder-scheduler"} == 0
       for: 2m
       labels:
         severity: down
diff --git a/tests/pillar/netapp.sls b/tests/pillar/netapp.sls
index 5add497..1508d22 100644
--- a/tests/pillar/netapp.sls
+++ b/tests/pillar/netapp.sls
@@ -29,6 +29,8 @@
         transport_type: https
         netapp_lun_space_reservation: enabled
         use_multipath_for_image_xfer: True
+        nas_secure_file_operations: false
+        nas_secure_file_permissions: false
         devices:
           - 172.18.2.2:/vol_1
           - 172.18.2.2:/vol_2