tasks/configure.yml

@@ -60,7 +60,6 @@
     mode: 0644
     backup: yes
   with_items:
-    - httpcheck.conf
     - phpfpm.conf
     - oracle.conf
   notify:
@@ -75,6 +74,7 @@
     mode: 0644
     backup: yes
   with_items:
+    - httpcheck.conf
     - fluentd.conf
     - phpfpm.conf
   notify:

templates/python.d/httpcheck.conf → templates/go.d/httpcheck.conf

-chart_cleanup: 0
-redirect: no
-
+jobs:
 {% for item in netdata_httpcheck|default([]) %}
 {% if not item.disabled|default(false) and item.username is not defined %}
 
 {{ item.name|to_uuid }}:
-    name: {{ item.name }}
+  - name: {{ item.name }}
     url: {{ item.url }}
 {% if item.method is defined %}
     method: {{ item.method }}
@@ -28,6 +26,9 @@ redirect: no
 {% if item.header is defined %}
     header: {{ item.header|to_json }}
 {% endif %}
+{% if item.status_accepted is defined %}
+    status_accepted: {{ item.status_accepted|to_json }}
+{% endif %}
 {% endif %}
 {% endfor %}
 {% for drupal in drupal_settings|default([]) %}
@@ -35,7 +36,7 @@ redirect: no
 {% if site.uptime is defined and not site.uptime.disabled|default(false) %}
 
 {{ site.uptime.name|to_uuid }}:
-    name: {{ site.uptime.name }}
+  - name: {{ site.uptime.name }}
     url: {{ site.protocol|default('https') }}://{{ site.domain }}{% if site.uptime.path is defined %}/{{ site.uptime.path }}{% endif %}
 
 {% if site.uptime.pollerParams|default(false) and site.uptime.pollerParams.body|default(false) %}
@@ -50,6 +51,9 @@ redirect: no
 {% if site.uptime.header is defined %}
     header: {{ site.uptime.header|to_json }}
 {% endif %}
+{% if site.status_accepted is defined %}
+    status_accepted: {{ site.status_accepted|to_json }}
+{% endif %}
 {% endif %}
 {% endfor %}
 {% endfor %}
@@ -57,7 +61,7 @@ redirect: no
 {% if site.uptime is defined and not site.uptime.disabled|default(false) %}
 
 {{ site.uptime.name|to_uuid }}:
-    name: {{ site.uptime.name }}
+  - name: {{ site.uptime.name }}
     url: {{ site.protocol|default('https') }}://{{ site.domain }}{% if site.uptime.path is defined %}/{{ site.uptime.path }}{% endif %}
 
 {% if site.uptime.pollerParams|default(false) and site.uptime.pollerParams.body|default(false) %}
@@ -70,15 +74,21 @@ redirect: no
 {% if site.uptime.header is defined %}
     header: {{ site.uptime.header|to_json }}
 {% endif %}
+{% if site.status_accepted is defined %}
+    status_accepted: {{ site.status_accepted|to_json }}
+{% endif %}
 {% endif %}
 {% if site.ocs is defined %}
 
 {{ site.domain|to_uuid }}:
-    name: NextCloud OCS {{ site.id }}
+  - name: NextCloud OCS {{ site.id }}
     url: {{ site.protocol|default('https') }}://{{ site.domain }}/ocs/v2.php/apps/serverinfo/api/v1/info?format=json
     header:
       Authorization: Basic {{ (site.ocs.username + ':' + site.ocs.password) | b64encode }}
     regex: {{ '"status":"ok"'|regex_escape() }}
     update_every: 1{{ loop.index }}
+{% if site.status_accepted is defined %}
+    status_accepted: {{ site.status_accepted|to_json }}
+{% endif %}
 {% endif %}
 {% endfor %}