[Pkg-nagios-devel] Bug#316333: nagios: really remove excluded hostgroups from statusmap

[Mathieu Baeumler]

This is a multi-part MIME message sent by reportbug.

--===============1634486241==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: nagios
Severity: wishlist
Tags: patch

The actual behaviour of the statusmap (circular) is to hide excluded
hostgroups, but to draw always the whole map.

When monitoring a lot of hosts, the result is really poor, as the map
is hard to read.

This patch really removes excluded hostgroups from statusmap, thus
making it a lot smaller and easier to read.

-- System Information:
Debian Release: 3.1
Architecture: i386 (i686)
Kernel: Linux 2.6.8-2-386
Locale: LANG=fr_FR@euro.ISO-8859-15, LC_CTYPE=fr_FR@euro.ISO-8859-15 (charmap=ISO-8859-15) (ignored: LC_ALL set to fr_FR@euro)

--===============1634486241==
Content-Type: application/x-shellscript
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="20_draw_statusmap_fix.dpatch"

IyEgL2Jpbi9zaCAvdXNyL3NoYXJlL2RwYXRjaC9kcGF0Y2gtcnVuCiMjIDIwX2RyYXdfc3RhdHVz
bWFwX2ZpeC5kcGF0Y2ggYnkgTWF0aGlldSBCYWV1bWxlciA8bWF0aGlldS5iYWV1bWxlckBnbWFp
bC5jb20+CiMjCiMjIEFsbCBsaW5lcyBiZWdpbm5pbmcgd2l0aCBgIyMgRFA6JyBhcmUgYSBkZXNj
cmlwdGlvbiBvZiB0aGUgcGF0Y2guCiMjIERQOiBob3N0Z3JvdXBzIGV4Y2x1ZGVkIGZyb20gc3Rh
dHVzbWFwIGFyZSBub3cgKnJlYWxseSogcmVtb3ZlZCwgdGh1cwojIyBEUDogbWFraW5nIHRoZSBt
YXAgYSBsb3Qgc21hbGxlciBhbmQgZWFzaWVyIHRvIHJlYWQuCgpARFBBVENIQApkaWZmIC11ck5h
ZCAtLWV4Y2x1ZGU9Q1ZTIC0tZXhjbHVkZT0uc3ZuIC4vY2dpL3N0YXR1c21hcC5jIC90bXAvZHBl
cC13b3JrLmc2MW9qRS9uYWdpb3MtMS4zLWN2cy4yMDA1MDQwMi9jZ2kvc3RhdHVzbWFwLmMKLS0t
IC4vY2dpL3N0YXR1c21hcC5jCTIwMDUtMDMtMTEgMDI6MTk6MTAuMDAwMDAwMDAwICswMTAwCisr
KyAvdG1wL2RwZXAtd29yay5nNjFvakUvbmFnaW9zLTEuMy1jdnMuMjAwNTA0MDIvY2dpL3N0YXR1
c21hcC5jCTIwMDUtMDYtMzAgMDg6NTU6MTIuMDAwMDAwMDAwICswMjAwCkBAIC0xNDg3LDYgKzE0
ODcsNyBAQAogCWludCBkb3R0ZWRfbGluZT1GQUxTRTsKIAlpbnQgeD0wOwogCWludCB5PTA7CisJ
aW50IGluX2xheWVyX2xpc3Q9RkFMU0U7CiAKIAlpZihjcmVhdGVfdHlwZT09Q1JFQVRFX0hUTUwp
CiAJCXJldHVybjsKQEAgLTE1MTEsNiArMTUxMiwxMiBAQAogCQlpZihpc19hdXRob3JpemVkX2Zv
cl9ob3N0KHRoaXNfaG9zdCwmY3VycmVudF9hdXRoZGF0YSk9PUZBTFNFKQogCQkJY29udGludWU7
CiAKKwkJaW5fbGF5ZXJfbGlzdD1pc19ob3N0X2luX2xheWVyX2xpc3QodGhpc19ob3N0KTsKKwor
CQlpZigoaW5fbGF5ZXJfbGlzdD09VFJVRSAmJiBleGNsdWRlX2xheWVycz09VFJVRSkKKwkJCXx8
IChpbl9sYXllcl9saXN0PT1GQUxTRSAmJiBleGNsdWRlX2xheWVycz09RkFMU0UpKQorCQkJY29u
dGludWU7CisKIAkJLyogdGhpcyBpcyBhICJyb290IiBob3N0LCBzbyBkcmF3IGxpbmsgdG8gTmFn
aW9zIHByb2Nlc3MgaWNvbiBpZiB1c2luZyBhdXRvLWxheW91dCBtb2RlICovCiAJCWlmKHRoaXNf
aG9zdC0+cGFyZW50X2hvc3RzPT1OVUxMICYmIGxheW91dF9tZXRob2QhPUxBWU9VVF9VU0VSX1NV
UFBMSUVEICYmIGRyYXdfbmFnaW9zX2ljb249PVRSVUUpewogCkBAIC0yNTQzLDE1ICsyNTUwLDIx
IEBACiBpbnQgbWF4X2NoaWxkX2hvc3RfZHJhd2luZ193aWR0aChob3N0ICpwYXJlbnQpewogCWhv
c3QgKnRlbXBfaG9zdDsKIAlpbnQgY2hpbGRfd2lkdGg9MDsKKwlpbnQgaW5fbGF5ZXJfbGlzdD1G
QUxTRTsKIAogCWZvcih0ZW1wX2hvc3Q9aG9zdF9saXN0O3RlbXBfaG9zdCE9TlVMTDt0ZW1wX2hv
c3Q9dGVtcF9ob3N0LT5uZXh0KXsKLQkJCisKKwkJaW5fbGF5ZXJfbGlzdD1pc19ob3N0X2luX2xh
eWVyX2xpc3QodGVtcF9ob3N0KTsKKwkJaWYoKGluX2xheWVyX2xpc3Q9PVRSVUUgJiYgZXhjbHVk
ZV9sYXllcnM9PVRSVUUpIAorCQkJfHwgKGluX2xheWVyX2xpc3Q9PUZBTFNFICYmIGV4Y2x1ZGVf
bGF5ZXJzPT1GQUxTRSkpCisJCQljb250aW51ZTsKKwogCQlpZihpc19ob3N0X2ltbWVkaWF0ZV9j
aGlsZF9vZl9ob3N0KHBhcmVudCx0ZW1wX2hvc3QpPT1UUlVFKQogCQkJY2hpbGRfd2lkdGgrPW1h
eF9jaGlsZF9ob3N0X2RyYXdpbmdfd2lkdGgodGVtcF9ob3N0KTsKIAkgICAgICAgIH0KIAogCS8q
IG5vIGNoaWxkcmVuLCBzbyBzZXQgd2lkdGggdG8gMSBmb3IgdGhpcyBob3N0ICovCi0JaWYoY2hp
bGRfd2lkdGg9PTApCisJaWYoY2hpbGRfd2lkdGg8PTApCiAJCXJldHVybiAxOwogCiAJZWxzZQpA
QCAtMjY5MiwxMyArMjcwNSwzMyBAQAogCWRvdWJsZSB5X2Nvb3JkPTAuMDsKIAlob3N0ICp0ZW1w
X2hvc3Q7CiAJaG9zdGV4dGluZm8gKnRlbXBfaG9zdGV4dGluZm87CisJaW50IGluX2xheWVyX2xp
c3Q9RkFMU0U7CiAKIAogCS8qIGdldCB0aGUgdG90YWwgbnVtYmVyIG9mIGltbWVkaWF0ZSBjaGls
ZHJlbiB0byB0aGlzIGhvc3QgKi8KIAlpbW1lZGlhdGVfY2hpbGRyZW49bnVtYmVyX29mX2ltbWVk
aWF0ZV9jaGlsZF9ob3N0cyhwYXJlbnQpOwogCisJZm9yKHRlbXBfaG9zdD1ob3N0X2xpc3Q7dGVt
cF9ob3N0IT1OVUxMO3RlbXBfaG9zdD10ZW1wX2hvc3QtPm5leHQpeworCisJCWlmIChwYXJlbnQg
PT0gdGVtcF9ob3N0KQorCQkJY29udGludWU7CisKKwkJdGVtcF9ob3N0ZXh0aW5mbz1maW5kX2hv
c3RleHRpbmZvKHRlbXBfaG9zdC0+bmFtZSk7CisJCWlmKHRlbXBfaG9zdGV4dGluZm89PU5VTEwp
CisJCQljb250aW51ZTsKKworCQlpZiAoaXNfaG9zdF9pbW1lZGlhdGVfY2hpbGRfb2ZfaG9zdChw
YXJlbnQsdGVtcF9ob3N0KT09VFJVRSkgeworCQkJaW5fbGF5ZXJfbGlzdD1pc19ob3N0X2luX2xh
eWVyX2xpc3QodGVtcF9ob3N0KTsKKworCQkJaWYoKGluX2xheWVyX2xpc3Q9PVRSVUUgJiYgZXhj
bHVkZV9sYXllcnM9PVRSVUUpCisJCQkJfHwgKGluX2xheWVyX2xpc3Q9PUZBTFNFICYmIGV4Y2x1
ZGVfbGF5ZXJzPT1GQUxTRSkpCisJCQkJaW1tZWRpYXRlX2NoaWxkcmVuLS07CisJCSAgICAgICAg
fQorCSAgICAgICAgfQorCisKIAkvKiBiYWlsIG91dCBpZiB3ZSdyZSBkb25lICovCi0JaWYoaW1t
ZWRpYXRlX2NoaWxkcmVuPT0wKQorCWlmKGltbWVkaWF0ZV9jaGlsZHJlbjw9MCkKIAkJcmV0dXJu
OwogCiAJLyogY2FsY3VsYXRlIHRvdGFsIGRyYXdpbmcgIndpZHRoIiBvZiBwYXJlbnQgaG9zdCAq
LwpAQCAtMjcyMCw2ICsyNzUzLDEyIEBACiAKIAkJaWYoaXNfaG9zdF9pbW1lZGlhdGVfY2hpbGRf
b2ZfaG9zdChwYXJlbnQsdGVtcF9ob3N0KT09VFJVRSl7CiAKKwkJCWluX2xheWVyX2xpc3Q9aXNf
aG9zdF9pbl9sYXllcl9saXN0KHRlbXBfaG9zdCk7CisKKwkJCWlmKChpbl9sYXllcl9saXN0PT1U
UlVFICYmIGV4Y2x1ZGVfbGF5ZXJzPT1UUlVFKSAKKwkJCQl8fCAoaW5fbGF5ZXJfbGlzdD09RkFM
U0UgJiYgZXhjbHVkZV9sYXllcnM9PUZBTFNFKSkKKwkJCQljb250aW51ZTsKKwogCQkJLyogZ2V0
IGRyYXdpbmcgd2lkdGggb2YgY2hpbGQgaG9zdCAqLwogCQkJdGhpc19kcmF3aW5nX3dpZHRoPW1h
eF9jaGlsZF9ob3N0X2RyYXdpbmdfd2lkdGgodGVtcF9ob3N0KTsKIApAQCAtMjc5NiwxMiArMjgz
NSwzMSBAQAogCWRvdWJsZSBhcmNfZW5kX2FuZ2xlPTAuMDsKIAlpbnQgdHJhbnNsYXRlZF94PTA7
CiAJaW50IHRyYW5zbGF0ZWRfeT0wOworCWludCBpbl9sYXllcl9saXN0PUZBTFNFOwogCiAJLyog
Z2V0IHRoZSB0b3RhbCBudW1iZXIgb2YgaW1tZWRpYXRlIGNoaWxkcmVuIHRvIHRoaXMgaG9zdCAq
LwogCWltbWVkaWF0ZV9jaGlsZHJlbj1udW1iZXJfb2ZfaW1tZWRpYXRlX2NoaWxkX2hvc3RzKHBh
cmVudCk7CiAKKwlmb3IodGVtcF9ob3N0PWhvc3RfbGlzdDt0ZW1wX2hvc3QhPU5VTEw7dGVtcF9o
b3N0PXRlbXBfaG9zdC0+bmV4dCl7CisKKwkJaWYgKHBhcmVudCA9PSB0ZW1wX2hvc3QpCisJCQlj
b250aW51ZTsKKworCQl0ZW1wX2hvc3RleHRpbmZvPWZpbmRfaG9zdGV4dGluZm8odGVtcF9ob3N0
LT5uYW1lKTsKKwkJaWYodGVtcF9ob3N0ZXh0aW5mbz09TlVMTCkKKwkJCWNvbnRpbnVlOworCisJ
CWlmIChpc19ob3N0X2ltbWVkaWF0ZV9jaGlsZF9vZl9ob3N0KHBhcmVudCx0ZW1wX2hvc3QpPT1U
UlVFKSB7CisJCQlpbl9sYXllcl9saXN0PWlzX2hvc3RfaW5fbGF5ZXJfbGlzdCh0ZW1wX2hvc3Qp
OworCisJCWlmKChpbl9sYXllcl9saXN0PT1UUlVFICYmIGV4Y2x1ZGVfbGF5ZXJzPT1UUlVFKSAK
KwkJCXx8IChpbl9sYXllcl9saXN0PT1GQUxTRSAmJiBleGNsdWRlX2xheWVycz09RkFMU0UpKQor
CQkJaW1tZWRpYXRlX2NoaWxkcmVuLS07CisJCSAgICAgICAgfQorCSAgICAgICAgfQorCiAJLyog
YmFpbCBvdXQgaWYgd2UncmUgZG9uZSAqLwotCWlmKGltbWVkaWF0ZV9jaGlsZHJlbj09MCkKKwlp
ZihpbW1lZGlhdGVfY2hpbGRyZW48PTApCiAJCXJldHVybjsKIAogCS8qIGNhbGN1bGF0ZSB0b3Rh
bCBkcmF3aW5nICJ3aWR0aCIgb2YgcGFyZW50IGhvc3QgKi8KQEAgLTI4MjIsNiArMjg4MCwxMiBA
QAogCiAJCWlmKGlzX2hvc3RfaW1tZWRpYXRlX2NoaWxkX29mX2hvc3QocGFyZW50LHRlbXBfaG9z
dCk9PVRSVUUpewogCisJCQlpbl9sYXllcl9saXN0PWlzX2hvc3RfaW5fbGF5ZXJfbGlzdCh0ZW1w
X2hvc3QpOworCisJCQlpZigoaW5fbGF5ZXJfbGlzdD09VFJVRSAmJiBleGNsdWRlX2xheWVycz09
VFJVRSkgCisJCQkJfHwgKGluX2xheWVyX2xpc3Q9PUZBTFNFICYmIGV4Y2x1ZGVfbGF5ZXJzPT1G
QUxTRSkpCisJCQkJY29udGludWU7CisKIAkJCS8qIGdldCBkcmF3aW5nIHdpZHRoIG9mIGNoaWxk
IGhvc3QgKi8KIAkJCXRoaXNfZHJhd2luZ193aWR0aD1tYXhfY2hpbGRfaG9zdF9kcmF3aW5nX3dp
ZHRoKHRlbXBfaG9zdCk7CiAKQEAgLTI5MDMsNCArMjk2NywzIEBACiAKIAlyZXR1cm47CiAgICAg
ICAgIH0KLQo=

--===============1634486241==--