Merge tag 'upstream/1.4.0+dfsg'

Upstream version 1.4.0+dfsg

1 files changed, 96 insertions, 0 deletions

diff --git a/configs.signatures b/configs.signatures
index 6a0194bf..24603ae9 100644
--- a/configs.signatures
+++ b/configs.signatures
@@ -18,6 +18,7 @@ declare -A configs_signatures=(
   ['a9cd91675467c5426f5b51c47602c889']='apps_groups.conf'
   ['acaa6731a272f6d251afb357e99b518f']='apps_groups.conf'
   ['bb51112d01ff20053196a57632df8962']='apps_groups.conf'
+  ['d9036091e2232fc2b8bfa8c7484dea28']='apps_groups.conf'
   ['d9258e671d0d0b6498af1ce16ef030d2']='apps_groups.conf'
   ['ebd0612ccc5807524ebb2b647e3e56c9']='apps_groups.conf'
   ['f2f1b8656f5011e965ac45b818cf668d']='apps_groups.conf'
@@ -28,54 +29,143 @@ declare -A configs_signatures=(
   ['7cf6402b51e5070f2be3ad6fe059ff89']='charts.d.conf'
   ['a02d14124b19c635c1426cee2e98bac5']='charts.d.conf'
   ['ca026d7c779f0a7cb7787713c5be5c47']='charts.d.conf'
+  ['074df527cc70b5f38c0714f08f20e57c']='health.d/apache.conf'
+  ['174c21a6ce5de97bda83d502aa47a9f8']='health.d/apache.conf'
   ['3848172053221b95279ba9bf789cd4e0']='health.d/apache.conf'
+  ['80266bddd3df374923c750a6de91d120']='health.d/apache.conf'
   ['842b1ad5b89bfa5f421d9c5b72e001a4']='health.d/apache.conf'
+  ['a6d5ce2572bf7a1dce9e545fcd29273e']='health.d/apache.conf'
   ['084ee72d64760f2641b0720e79c922f3']='health.d/cpu.conf'
+  ['254de8ec49602bea2da3631676d7cfec']='health.d/cpu.conf'
+  ['5eb670b6fe39da5fec2523d910b0dd1e']='health.d/cpu.conf'
   ['623771eecb3c277fc728b5304793f93b']='health.d/cpu.conf'
   ['7596ae54d46ce199ac599429ef753caf']='health.d/cpu.conf'
+  ['8d0552371a7c9725a04196fa560813d1']='health.d/cpu.conf'
+  ['c3296c08260bcd556e74711c820817be']='health.d/cpu.conf'
   ['fdd11640ba626cc2064c2fe3ea3eee4c']='health.d/cpu.conf'
   ['02fa10fa85ab88e9723998de48d1aca0']='health.d/disks.conf'
+  ['0433d98a19d3b08e6f13884e46d39b47']='health.d/disks.conf'
   ['22ceb822983134a7ca67343241f30341']='health.d/disks.conf'
   ['2385e5d35b440619621c4af62492d91b']='health.d/disks.conf'
   ['3bc2776623889744a98178bad6fb3b79']='health.d/disks.conf'
+  ['46798cda21e1a5faa769abf4e5d27c48']='health.d/disks.conf'
   ['573398335c0c71c075fa57f702bce287']='health.d/disks.conf'
   ['5da15d6e17a15213a720749045e5d419']='health.d/disks.conf'
+  ['7aa209fa287c95b3ca04c23681b40770']='health.d/disks.conf'
+  ['80d242d619eb7e91cebfdbf58d79b0f8']='health.d/disks.conf'
   ['8989b5e2f4ef9cd278ef58be0fae4074']='health.d/disks.conf'
+  ['8a1b95d375992d7b11330a0ac46f369c']='health.d/disks.conf'
   ['8dc0bd0a70b5117454bd5f5b98f91c2c']='health.d/disks.conf'
+  ['a4407787e4beb23a701a8a614dca461d']='health.d/disks.conf'
+  ['a5114d5b0d3816dba75024b9444f4b40']='health.d/disks.conf'
   ['a8167dafeac0b66696a1d9b08e815cda']='health.d/disks.conf'
   ['afdae4646c755ff2d117527fbf761c8e']='health.d/disks.conf'
   ['cb60badf376d246ad8ec9d3f524db430']='health.d/disks.conf'
+  ['dd8254ef74509a3e38cb2838e30f7e63']='health.d/disks.conf'
+  ['e8ec8046c7007af6ca3e8c51e62c99f8']='health.d/disks.conf'
+  ['057d12aaff0467e64529e839a258806b']='health.d/entropy.conf'
   ['2d1d7498c72f4245cf32902c2b7e71e0']='health.d/entropy.conf'
+  ['373160658e7d5f1a129de397b9347365']='health.d/entropy.conf'
   ['450667c552ab7a7d8d4a2c214fdacca5']='health.d/entropy.conf'
+  ['5ff1bcaa58695754e2f6980bfe19f579']='health.d/entropy.conf'
   ['a8feb36776005bf419c90278787a1be8']='health.d/entropy.conf'
+  ['b636e5e603f9d93e52c7577ac8c6bf0c']='health.d/entropy.conf'
   ['d8dc489e32f7114c6298fce94e86a8ef']='health.d/entropy.conf'
+  ['def883f35986c9d25de63b1a8e7d0f46']='health.d/entropy.conf'
   ['e449e5582279742496550df14b6fca95']='health.d/entropy.conf'
+  ['297160ae7ee01a547ed14f857b4f2c8d']='health.d/memcached.conf'
+  ['2bbbebf52f84fd27fbefecd2a8a8076f']='health.d/memcached.conf'
   ['45a77ac36ba9f1898144b902de17204b']='health.d/memcached.conf'
+  ['621f10b257a11add5ff5aff41e9662e3']='health.d/memcached.conf'
+  ['7e5fc1644aa7a54f9dbb1bd102521b09']='health.d/memcached.conf'
+  ['9c981c75bdf4b1637f7113e7e45eb2bf']='health.d/memcached.conf'
+  ['a731b7b164f42717c1c9a778ee637ff3']='health.d/memcached.conf'
   ['b81b8f331161b0d48e03f6fbf6b6d062']='health.d/memcached.conf'
   ['c1a7e634b5b8aad523a0d115a93379cd']='health.d/memcached.conf'
+  ['dd7764507804a2296bfd091a58ad4ad7']='health.d/memcached.conf'
   ['f8c30f22df92765e2c0fab3c8174e2fc']='health.d/memcached.conf'
+  ['09264cec953ae1c4c2985e6446abb386']='health.d/mysql.conf'
+  ['4d13684cadfa90e73ab465409bf7263b']='health.d/mysql.conf'
+  ['97eee7a30e6419df4537242e9d4a719d']='health.d/mysql.conf'
   ['373c1276dc9e65884ff2b26e1f08afe7']='health.d/named.conf'
+  ['58e835b7176865ec5a6f59f7aba832bf']='health.d/named.conf'
+  ['669ebef43ee341f6889d382e86d0e200']='health.d/named.conf'
+  ['6b39de5d85db45115db236347a6896d4']='health.d/named.conf'
   ['846ce94bfeeb90c0dc6a89e8d25f1a68']='health.d/named.conf'
   ['ddda2bb1c88be03b637d3285406f7910']='health.d/named.conf'
+  ['0529b679d3c0e7e6332753c7f6484731']='health.d/net.conf'
+  ['0856124b1eecf01681b4fdf4e21efb3f']='health.d/net.conf'
   ['2827de41cf34a91b7a8e4d8724f59668']='health.d/net.conf'
   ['2ad55a5d1e885cf142849a78d4b00401']='health.d/net.conf'
+  ['318bb45755726a25120bb33413d4b582']='health.d/net.conf'
   ['43ebb7f224c3b232d8ad044d7e9508b6']='health.d/net.conf'
+  ['cb178b15427274d7def5b14bc4c09441']='health.d/net.conf'
   ['d11711b3647bc2bdd0292dd7deebbeb1']='health.d/net.conf'
+  ['dc9c2a66778623a759706c14c3d91983']='health.d/net.conf'
   ['de02f899a61f21b86adb646940f0bcae']='health.d/net.conf'
+  ['feb8bcf828aa2529a7ee4a140feeb12d']='health.d/net.conf'
+  ['32fde0057c790964f2c743cb3c9aad29']='health.d/nginx.conf'
+  ['3f170e3343cd784983b019163393f5af']='health.d/nginx.conf'
   ['64c48f9726ab987baec9c617a9fef7a6']='health.d/nginx.conf'
   ['7a985528cc9176564640001aa73e3492']='health.d/nginx.conf'
+  ['81255035f6d53534938085df72cdef23']='health.d/nginx.conf'
+  ['eb5168f0b516bc982aac45e59da6e52e']='health.d/nginx.conf'
   ['36fdd55665cf10b0db164c2a0cca5e57']='health.d/qos.conf'
+  ['55608bdd908a3806df1468f6ee318b2b']='health.d/qos.conf'
   ['80f109ff293ac94222bf3959432751bd']='health.d/qos.conf'
+  ['b735732fbe993d8191d6b3317082efa2']='health.d/qos.conf'
+  ['eb748d6fb69d11b0d29c5794657e206c']='health.d/qos.conf'
   ['20be73f473e59bc7de1fe61d53466aba']='health.d/ram.conf'
+  ['919911d13901d60a7580f5dfd7fc87bb']='health.d/ram.conf'
+  ['a09714b5942cf25a89ec3da1dbc18063']='health.d/ram.conf'
   ['b7d769ce86a7aebba01315da5c0799e6']='health.d/ram.conf'
+  ['cd08e5534c94bf1f2cd28396c76b8bbc']='health.d/ram.conf'
+  ['d55bdb83b9ff606852f6a97c1430258c']='health.d/ram.conf'
   ['325617412a628e3bc776e3fbb777a2a6']='health.d/redis.conf'
+  ['3634d5eddc46fb0d50cf47f370670c2c']='health.d/redis.conf'
   ['4f6a5b47a13f5912cc89e9286701dd08']='health.d/redis.conf'
+  ['99b6030ce25c8fee4598179c0f95fb0b']='health.d/redis.conf'
+  ['a4be524cc5b7192878c292a17c767c28']='health.d/redis.conf'
+  ['39f9422b0f0c3eec11a31aff79d89514']='health.d/retroshare.conf'
+  ['46ef6c1b638e40a7dfd62defdc5f99a3']='health.d/retroshare.conf'
+  ['6608c6546b3c6bde084fc1d34b1163c1']='health.d/retroshare.conf'
+  ['1c12b678ab65f271a96da1bbd0a1ab1c']='health.d/softnet.conf'
+  ['2472e49550326f7142e2c425ccbca005']='health.d/softnet.conf'
+  ['312b4b8e2805e19cf9be554b319567d6']='health.d/softnet.conf'
+  ['565f11c38ae6bd5cc9d3c2adb542bc1b']='health.d/softnet.conf'
+  ['6398ef37a15cb6a0bc921f58948d2b39']='health.d/softnet.conf'
+  ['a305b400378d6492efd15f9940c2779b']='health.d/softnet.conf'
+  ['e734c5951a8764d4d9de046dd7cf7407']='health.d/softnet.conf'
   ['23ae815aefa221b1929f96752a1f7556']='health.d/squid.conf'
+  ['3cc6255457d4cba881ae0554ae5d9190']='health.d/squid.conf'
+  ['845023f9b4a526aa0e6493756dbe6034']='health.d/squid.conf'
   ['a4a8660728c6afcb528cc6b378897d6b']='health.d/squid.conf'
+  ['d162b7465a56151312e60151c1d74fba']='health.d/squid.conf'
   ['ef9916ea144878a9f37cbb6b1b29da10']='health.d/squid.conf'
+  ['043f0a35dde85837fabeb85b990a41c1']='health.d/swap.conf'
+  ['52d4131cf9df84e2550b1a5d899ec61d']='health.d/swap.conf'
+  ['53160707fdc6ce46c195b1b55bb0bcb1']='health.d/swap.conf'
+  ['8214bb8f4b005aa4691fcd38f7331e8f']='health.d/swap.conf'
   ['a44899a5795bed2863c1d11aa3e85586']='health.d/swap.conf'
+  ['a7320c6f26191b9599ec3bc4be007a93']='health.d/swap.conf'
   ['c9b792755de59d842ba95f8c315d94c8']='health.d/swap.conf'
+  ['ca08a9b18d38ae0a0f5081a7cdc96863']='health.d/swap.conf'
   ['da29d2ab1ab7b8fda189960c840e5144']='health.d/swap.conf'
+  ['b3fc4749b132e55ac0d3a0f92859237e']='health.d/tcp_resets.conf'
+  ['2fa8fb929fd597f2ab97b6efc540a043']='health_alarm_notify.conf'
+  ['42ad0e70b1365b6e7244cc305dbaa529']='health_alarm_notify.conf'
+  ['707a63f53f4b32e01d134ae90ba94aad']='health_alarm_notify.conf'
+  ['8fd472a854b0996327e8ed3562161182']='health_alarm_notify.conf'
+  ['a55133f1b0be0a4255057849dd451b09']='health_alarm_notify.conf'
+  ['a89c516a1144435a88decf25509318ac']='health_alarm_notify.conf'
+  ['b68706bb8101ef85192db92f865a5d80']='health_alarm_notify.conf'
+  ['ce2e8768964a936f58c4c2144aee8a01']='health_alarm_notify.conf'
+  ['e3023092e3b2bbb5351e0fe6682f4fe9']='health_alarm_notify.conf'
+  ['f8dade4484f1b6a48655388502df7d5a']='health_alarm_notify.conf'
+  ['fd3164e6e8cb6726706267eae49aa082']='health_alarm_notify.conf'
+  ['ff1b3d8ae8b2149c711d8da9b7a9c4bd']='health_alarm_notify.conf'
+  ['707a63f53f4b32e01d134ae90ba94aad']='health_email_recipients.conf'
+  ['a752e51d923e15add4a11fa8f3be935a']='health_email_recipients.conf'
   ['13141998a5d71308d9c119834c27bfd3']='python.d.conf'
   ['38d1bf04fe9901481dd6febcc0404a86']='python.d.conf'
   ['4b775fb31342f1478b3773d041a72911']='python.d.conf'
@@ -117,25 +207,31 @@ declare -A configs_signatures=(
   ['70105b1744a8e13f49083d7f1981aea2']='python.d/ipfs.conf'
   ['97f337eb96213f3ede05e522e3743a6c']='python.d/memcached.conf'
   ['1ea8e8ef1fa8a3a0fcdfba236f4cb195']='python.d/mysql.conf'
+  ['42bf1c7c64ed77038a0aa094d792a9e2']='python.d/mysql.conf'
   ['5379cdc26d7725e2b0d688d785816cef']='python.d/mysql.conf'
   ['7deb236ec68a512b9bdd18e6a51d76f7']='python.d/mysql.conf'
   ['88f77865f75c9fb61c97d700bd4561ee']='python.d/mysql.conf'
   ['b0f0a0ac415e4b1a82187b80d211e83b']='python.d/mysql.conf'
   ['df381f3a7ca9fb2b4b43ae7cb7a4c492']='python.d/mysql.conf'
   ['061c45b0e34170d357e47883166ecf40']='python.d/nginx.conf'
+  ['08042325ab27256b938575deafee8ecf']='python.d/nginx.conf'
   ['21924a6ab8008d16ffac340f226ebad9']='python.d/nginx.conf'
   ['c61948101e0e6846679682794ee48c5b']='python.d/nginx.conf'
+  ['ce3b65eac6c472b21905f7f72104f4c9']='python.d/nginx.conf'
   ['6cba40e32a7e98a98c31a209913839cc']='python.d/nginx_log.conf'
   ['3ca696189911fb38a0319ddd71e9a395']='python.d/phpfpm.conf'
   ['8c1d41e2c88aeca78bc319ed74c8748c']='python.d/phpfpm.conf'
   ['b8b87574fd496a66ede884c5336493bd']='python.d/phpfpm.conf'
   ['c88fb430f35b7d8f08775d84debffbd2']='python.d/phpfpm.conf'
+  ['d2b2ad30e277a69d8713e620dabc18bc']='python.d/phpfpm.conf'
   ['d7e0bd12d4a60a761dcab3531a841711']='python.d/phpfpm.conf'
   ['142a5b693d34b0308bb0b8aec71fad79']='python.d/postfix.conf'
   ['ca249db7a0637d55abb938d969f9b486']='python.d/postfix.conf'
   ['39571e9fad9b759200c5d5b2ee13feb4']='python.d/redis.conf'
   ['777f4da70f461ef675bde07fb3644312']='python.d/redis.conf'
   ['b915126262d08aa9da81de539a58a3fb']='python.d/redis.conf'
+  ['749fe31362969d75f1ea66d15231d98d']='python.d/retroshare.conf'
+  ['a71d9082410200bf92e823675d78121c']='python.d/retroshare.conf'
   ['837480f77ba1a85677a36747fbc2cd2e']='python.d/sensors.conf'
   ['cfecf298bdafaa7e0a3a263548e82132']='python.d/sensors.conf'
   ['48195c5c8c0476a49b714b4c76bdb570']='python.d/squid.conf'