[MediaWiki-commits] [Gerrit] operations/puppet[production]: diamond: skip DiskSpace for Docker containers

2017-11-30 Thread Alexandros Kosiaris (Code Review) 
Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393215 )

Change subject: diamond: skip DiskSpace for Docker containers
..


diamond: skip DiskSpace for Docker containers

When a container starts, Docker mount a filesystem under
/var/lib/docker/devicemmapper/mnt/. Diamond eventually the disk space
usages on those and report to Graphite.

Shinken monitor the graphite data and it ends up emitting an alarm
because the metrics are outdated (no valid datapoints found).

That causes alarms such as:

WARNING: integration.integration-slave-docker-1001.diskspace._var_lib_d
ocker_devicemapper_mnt_e6e01440f04a145c09affed5a3ca6f3b53daaab53d038a0d
9a25a2321ad2e83e.byte_percentfree (No valid datapoints found) integrati
on.integration-slave-docker-1001.diskspace._var_lib_docker_devicemapper
_mnt_ae0c0365a418e6d09fafa87f9895fd4e627f98827599ba01651a8d2bb7a745fa.b
yte_percentfree ...

Filter out anything mounted under /var/lib/docker/ as well as the nfs
mounts under /run/docker/netns/

Bug: T177052
Change-Id: Idffe85202cb60f656e698f7b3af8c3a0ed74d0ce
---
M modules/diamond/manifests/init.pp
1 file changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/diamond/manifests/init.pp 
b/modules/diamond/manifests/init.pp
index 7b730c6..a90141e 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -127,7 +127,12 @@
 diamond::collector { 'Network': }
 diamond::collector { 'DiskSpace':
 settings => {
-filesystems => 
'ext2,ext3,ext4,xfs,fuse.fuse_dfs,fat32,fat16,btrfs',
+filesystems => 
'ext2,ext3,ext4,xfs,fuse.fuse_dfs,fat32,fat16,btrfs',
+# Dockerd has ephemeral mounts - T181295
+exclude_filters => [
+'^/var/lib/docker/',
+'^/run/docker/',
+],
 },
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/393215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idffe85202cb60f656e698f7b3af8c3a0ed74d0ce
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: diamond: skip DiskSpace for Docker containers

2017-11-24 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393215 )

Change subject: diamond: skip DiskSpace for Docker containers
..

diamond: skip DiskSpace for Docker containers

When a container starts, Docker mount a filesystem under
/var/lib/docker/devicemmapper/mnt/. Diamond eventually the disk space
usages on those and report to Graphite.

Shinken monitor the graphite data and it ends up emitting an alarm
because the metrics are outdated (no valid datapoints found).

That causes alarms such as:

WARNING: integration.integration-slave-docker-1001.diskspace._var_lib_d
ocker_devicemapper_mnt_e6e01440f04a145c09affed5a3ca6f3b53daaab53d038a0d
9a25a2321ad2e83e.byte_percentfree (No valid datapoints found) integrati
on.integration-slave-docker-1001.diskspace._var_lib_docker_devicemapper
_mnt_ae0c0365a418e6d09fafa87f9895fd4e627f98827599ba01651a8d2bb7a745fa.b
yte_percentfree ...

Filter out /var/lib/docker/devicemapper/mnt/

Bug: T181295
Change-Id: Idffe85202cb60f656e698f7b3af8c3a0ed74d0ce
---
M modules/diamond/manifests/init.pp
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/15/393215/1

diff --git a/modules/diamond/manifests/init.pp 
b/modules/diamond/manifests/init.pp
index 7b730c6..50c68b2 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -127,7 +127,10 @@
 diamond::collector { 'Network': }
 diamond::collector { 'DiskSpace':
 settings => {
-filesystems => 
'ext2,ext3,ext4,xfs,fuse.fuse_dfs,fat32,fat16,btrfs',
+# Dockerd has ephemeral mounts - T181295
+exclude_filters => ['^/var/lib/docker/devicemapper/mnt/'],
+
+filesystems => 
'ext2,ext3,ext4,xfs,fuse.fuse_dfs,fat32,fat16,btrfs',
 },
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/393215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idffe85202cb60f656e698f7b3af8c3a0ed74d0ce
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits