From 88469209b7192caf6db3bdfc480cd53dcf6835d8 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Fri, 29 Nov 2019 09:54:51 +0100
Subject: [PATCH] #4113 Update to 1.19.0
---
defaults/main.yml | 2 +-
tasks/apache.yml | 2 +-
tasks/configure.yml | 1 +
templates/go.d.conf | 45 +++++++++++++++++++++++++++++++++++++
templates/python.d.conf | 2 +-
templates/web_log.conf | 50 +++++++++++++++++++++--------------------
6 files changed, 75 insertions(+), 27 deletions(-)
create mode 100644 templates/go.d.conf
diff --git a/defaults/main.yml b/defaults/main.yml
index 796a938..c5d378f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,6 @@
---
-netdata_version: v1.18.0
+netdata_version: v1.19.0
netdata_force_reset: no
netdata_fluentd_buffer:
green: 75
diff --git a/tasks/apache.yml b/tasks/apache.yml
index 18da744..6f64b1e 100644
--- a/tasks/apache.yml
+++ b/tasks/apache.yml
@@ -28,7 +28,7 @@
- name: Weblog Module Configuration
template:
src: web_log.conf
- dest: /etc/netdata/python.d/web_log.conf
+ dest: /etc/netdata/go.d/web_log.conf
owner: netdata
group: netdata
mode: 0660
diff --git a/tasks/configure.yml b/tasks/configure.yml
index cb90d66..6fad3b3 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -33,6 +33,7 @@
with_items:
- health_alarm_notify.conf
- python.d.conf
+ - go.d.conf
notify:
- Restart NetData
diff --git a/templates/go.d.conf b/templates/go.d.conf
new file mode 100644
index 0000000..e5db314
--- /dev/null
+++ b/templates/go.d.conf
@@ -0,0 +1,45 @@
+# netdata go.d.plugin configuration
+#
+# This file is in YaML format.
+
+# Enable/disable the whole go.d.plugin.
+enabled: yes
+
+# Enable/disable default value for all modules.
+default_run: yes
+
+# Maximum number of used CPUs. Zero means no limit.
+max_procs: 0
+
+# Enable/disable specific g.d.plugin module
+modules:
+# activemq: yes
+# apache: yes
+# bind: yes
+# consul: yes
+# coredns: yes
+# dns_query: yes
+# docker_engine: yes
+# dockerhub: yes
+# example: no
+# freeradius: yes
+# httpcheck: yes
+# k8s_kubelet: yes
+# k8s_kubeproxy: yes
+# lighttpd: yes
+# lighttpd2: yes
+# logstash: yes
+# mysql: yes
+# nginx: yes
+# openvpn: yes
+# portcheck: yes
+# rabbitmq: yes
+# scaleio: yes
+# solr: yes
+# springboot2: yes
+# tengine: yes
+# unbound: yes
+# vsphere: yes
+ web_log: {{ (groups['webserver'] is defined and inventory_hostname in groups['webserver'])|ternary("yes", "no") }}
+# wmi: yes
+# x509check: yes
diff --git a/templates/python.d.conf b/templates/python.d.conf
index d95c3f1..dfba72d 100644
--- a/templates/python.d.conf
+++ b/templates/python.d.conf
@@ -92,4 +92,4 @@ unbound: no
uwsgi: yes
varnish: {{ (groups['varnishserver'] is defined and inventory_hostname in groups['varnishserver'])|ternary("yes", "no") }}
w1sensor: yes
-web_log: {{ (groups['webserver'] is defined and inventory_hostname in groups['webserver'])|ternary("yes", "no") }}
+web_log: no
diff --git a/templates/web_log.conf b/templates/web_log.conf
index 408f47e..945b662 100644
--- a/templates/web_log.conf
+++ b/templates/web_log.conf
@@ -1,43 +1,45 @@
-apache_log:
- name: apache
- path: /var/log/apache2/access.log
+jobs:
-apache_ssl_log:
- name: apache_ssl
- path: /var/log/apache2/ssl_access.log
+# apache_log:
+ - name: apache
+ path: /var/log/apache2/access.log
-apache_vhosts_log:
- name: apache_vhosts
- path: /var/log/apache2/other_vhosts_access.log
+# apache_ssl_log:
+ - name: apache_ssl
+ path: /var/log/apache2/ssl_access.log
+
+# apache_vhosts_log:
+ - name: apache_vhosts
+ path: /var/log/apache2/other_vhosts_access.log
{% for drupal in drupal_settings|default([]) %}
{% for drupal_domain in drupal.domains|default([]) %}
-apache_log_{{ drupal_domain.domain|regex_replace('[\.\-]', '_') }}:
- name: apache_{{ drupal_domain.domain|regex_replace('[\.\-]', '_') }}
- path: {% if drupal.jail is defined %}{{ jailroot|default('/jails') }}/{{ drupal.jail.name }}{% endif %}/var/log/apache2/{{ drupal_domain.domain }}-access.log
+# apache_log_{{ drupal_domain.domain|regex_replace('[\.\-]', '_') }}:
+ - name: apache_{{ drupal_domain.domain|regex_replace('[\.\-]', '_') }}
+ path: {% if drupal.jail is defined %}{{ jailroot|default('/jails') }}/{{ drupal.jail.name }}{% endif %}/var/log/apache2/{{ drupal_domain.domain }}-access.log
{% endfor %}
{% endfor %}
{% for nextcloud in nextcloud_settings|default([]) %}
-apache_log_{{ nextcloud.domain|regex_replace('[\.\-]', '_') }}:
- name: apache_{{ nextcloud.domain|regex_replace('[\.\-]', '_') }}
- path: {% if nextcloud.jail is defined %}{{ jailroot|default('/jails') }}/{{ nextcloud.jail.name }}{% endif %}/var/log/apache2/{{ nextcloud.domain }}-access.log
+# apache_log_{{ nextcloud.domain|regex_replace('[\.\-]', '_') }}:
+ - name: apache_{{ nextcloud.domain|regex_replace('[\.\-]', '_') }}
+ path: {% if nextcloud.jail is defined %}{{ jailroot|default('/jails') }}/{{ nextcloud.jail.name }}{% endif %}/var/log/apache2/{{ nextcloud.domain }}-access.log
{% endfor %}
{% for matomo in matomo_settings|default([]) %}
-apache_log_{{ matomo.domain|regex_replace('[\.\-]', '_') }}:
- name: apache_{{ matomo.domain|regex_replace('[\.\-]', '_') }}
- path: {% if matomo.jail is defined %}{{ jailroot|default('/jails') }}/{{ matomo.jail.name }}{% endif %}/var/log/apache2/{{ matomo.domain }}-access.log
+# apache_log_{{ matomo.domain|regex_replace('[\.\-]', '_') }}:
+ - name: apache_{{ matomo.domain|regex_replace('[\.\-]', '_') }}
+ path: {% if matomo.jail is defined %}{{ jailroot|default('/jails') }}/{{ matomo.jail.name }}{% endif %}/var/log/apache2/{{ matomo.domain }}-access.log
{% endfor %}
{% for youtrack in youtrack_settings|default([]) %}
-apache_log_{{ youtrack.domain|regex_replace('[\.\-]', '_') }}:
- name: apache_{{ youtrack.domain|regex_replace('[\.\-]', '_') }}
- path: {% if youtrack.jail is defined %}{{ jailroot|default('/jails') }}/{{ youtrack.jail.name }}{% endif %}/var/log/apache2/{{ youtrack.domain }}-access.log
+# apache_log_{{ youtrack.domain|regex_replace('[\.\-]', '_') }}:
+ - name: apache_{{ youtrack.domain|regex_replace('[\.\-]', '_') }}
+ path: {% if youtrack.jail is defined %}{{ jailroot|default('/jails') }}/{{ youtrack.jail.name }}{% endif %}/var/log/apache2/{{ youtrack.domain }}-access.log
{% endfor %}
{% for log in apache_logs|default([]) %}
-apache_log_{{ log.name }}:
- name: apache_{{ log.name }}
- path: {{ log.file }}
+# apache_log_{{ log.name }}:
+ - name: apache_{{ log.name }}
+ path: {{ log.file }}
{% endfor %}
--
GitLab