Merge pull request #8 from TYPO3-cookbooks/powerdns_stretch

[TASK] Adapt PowerDNS checks to Debian Stretch

Author: sgrossberndt

.kitchen.dokken.yml

@@ -35,13 +35,5 @@ platforms:
       - RUN /usr/bin/apt-get update
       - RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools -y
 
-# comment this out, if Debian 7 is not needed
-- name: debian-7
-  driver:
-    image: debian:7
-    intermediate_instructions:
-      - RUN /usr/bin/apt-get update
-      - RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools -y
-
 # suites are taken from .kitchen.yml usually
 # suites:

.kitchen.yml

@@ -6,8 +6,8 @@ provisioner:
   name: chef_zero
 
 platforms:
-  - name: debian-7.11
-  - name: debian-8.9
+  - name: debian-8.11
+  - name: debian-9.9
 
 suites:
   - name: default

templates/pdns/pdns_errors

@@ -13,14 +13,14 @@
 # https://github.com/Rikbruggink/Zabbix-templates
 # rev 5098005dfd70d91c4f11195f26f5166e981cc24f
 
-command="/etc/init.d/pdns dump"
+command="/usr/bin/pdns_control list"
 
-if [ "$1" = "autoconf" ]; then
+if [[ "$1" = "autoconf" ]]; then
         echo yes
         exit 0
 fi
 
-if [ "$1" = "config" ]; then
+if [[ "$1" = "config" ]]; then
         echo 'graph_title Power DNS errors'
         echo 'graph_args -l 0 --base 1000'
         echo 'graph_vlabel numbers of'
@@ -41,5 +41,4 @@ if [ "$1" = "config" ]; then
         exit 0
 fi
 
-
-$command | sed 's/=\([0-9]\+\),/.value \1\n/g' | grep corrupt'\|'servfail'\|'timedout | sed 's/-/_/g'
+${command} | sed 's/=\([0-9]\+\),/.value \1\n/g' | grep corrupt'\|'servfail'\|'timedout | sed 's/-/_/g'

templates/pdns/pdns_latency

@@ -13,14 +13,14 @@
 # https://github.com/Rikbruggink/Zabbix-templates
 # rev 5098005dfd70d91c4f11195f26f5166e981cc24f
 
-command="/etc/init.d/pdns show"
+command="/usr/bin/pdns_control show"
 
-if [ "$1" = "autoconf" ]; then
+if [[ "$1" = "autoconf" ]]; then
         echo yes
         exit 0
 fi
 
-if [ "$1" = "config" ]; then
+if [[ "$1" = "config" ]]; then
         echo 'graph_title Power DNS latency'
         echo 'graph_args -l 0'
         echo 'graph_vlabel usec'
@@ -32,7 +32,4 @@ if [ "$1" = "config" ]; then
         exit 0
 fi
 
-
-
-
-echo "latency.value $($command latency | awk -F= '{print $2}')"
+echo "latency.value $(${command} latency | awk -F= '{print $2}')"

templates/pdns/pdns_qsize

@@ -13,14 +13,14 @@
 # https://github.com/Rikbruggink/Zabbix-templates
 # rev 5098005dfd70d91c4f11195f26f5166e981cc24f
 
-command="/etc/init.d/pdns show"
+command="/usr/bin/pdns_control show"
 
-if [ "$1" = "autoconf" ]; then
+if [[ "$1" = "autoconf" ]]; then
         echo yes
         exit 0
 fi
 
-if [ "$1" = "config" ]; then
+if [[ "$1" = "config" ]]; then
         echo 'graph_title Power DNS database queue'
         echo 'graph_args -l 0'
         echo 'graph_vlabel number of waiting queries'
@@ -32,8 +32,5 @@ if [ "$1" = "config" ]; then
         exit 0
 fi
 
-
-
-
-echo "qsize.value $($command qsize_q | awk -F= '{print $2}')"
+echo "qsize.value $(${command} qsize-q)"
 

templates/pdns/pdns_queries

@@ -13,14 +13,14 @@
 # https://github.com/Rikbruggink/Zabbix-templates
 # rev 5098005dfd70d91c4f11195f26f5166e981cc24f
 
-command="/etc/init.d/pdns dump"
+command="/usr/bin/pdns_control list"
 
-if [ "$1" = "autoconf" ]; then
+if [[ "$1" = "autoconf" ]]; then
         echo yes
         exit 0
 fi
 
-if [ "$1" = "config" ]; then
+if [[ "$1" = "config" ]]; then
         echo 'graph_title Power DNS queries'
         echo 'graph_args -l 0 --base 1000'
         echo 'graph_vlabel numbers of'
@@ -53,5 +53,4 @@ if [ "$1" = "config" ]; then
         exit 0
 fi
 
-
-$command | sed 's/=\([0-9]\+\),/.value \1\n/g' | grep udp-'\|'recursing'\|'tcp | sed 's/-/_/g'
+${command} | sed 's/=\([0-9]\+\),/.value \1\n/g' | grep udp-'\|'recursing'\|'tcp | sed 's/-/_/g'

templates/pdns/zabbix.conf.erb

@@ -16,8 +16,8 @@ UserParameter=custom.pdns_qsize.qsize, sudo <%= node[:zabbix][:external_dir] %>/
 
 UserParameter=custom.pdns_queries.recursing_answers, sudo <%= node[:zabbix][:external_dir] %>/pdns_queries|grep 'recursing_answers'|cut -f2 -d" "
 UserParameter=custom.pdns_queries.recursing_questions, sudo <%= node[:zabbix][:external_dir] %>/pdns_queries|grep 'recursing_questions'|cut -f2 -d" "
-UserParameter=custom.pdns_queries.tcp_answers, sudo <%= node[:zabbix][:external_dir] %>/pdns_queries|grep 'tcp_answers'|cut -f2 -d" "
+UserParameter=custom.pdns_queries.tcp_answers, sudo <%= node[:zabbix][:external_dir] %>/pdns_queries|grep 'tcp_answers.value'|cut -f2 -d" "
 UserParameter=custom.pdns_queries.tcp_queries, sudo <%= node[:zabbix][:external_dir] %>/pdns_queries|grep 'tcp_queries'|cut -f2 -d" "
-UserParameter=custom.pdns_queries.udp_answers, sudo <%= node[:zabbix][:external_dir] %>/pdns_queries|grep 'udp_answers'|cut -f2 -d" "
+UserParameter=custom.pdns_queries.udp_answers, sudo <%= node[:zabbix][:external_dir] %>/pdns_queries|grep 'udp_answers.value'|cut -f2 -d" "
 UserParameter=custom.pdns_queries.udp_queries, sudo <%= node[:zabbix][:external_dir] %>/pdns_queries|grep 'udp_queries'|cut -f2 -d" "