summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* nagios-server-addons : Added a php template for volume utilizationNishanth Thomas2014-05-133-0/+39
| | | | | | | | | | | | Volume Utilization plugin didn't have a php template written and hence the graph was not getting displayed properly Change-Id: I6726a6de5370d271467be03e9e8500421cf66e39 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1095427 Signed-off-by: Nishanth Thomas <nthomas@redhat.com> Reviewed-on: http://review.gluster.org/7724 Tested-by: Nishanth Thomas <nishusemail@gmail.com> Reviewed-by: Sahina Bose <sabose@redhat.com>
* autoconf: don't remove disconnected hosts from nagiosRamesh Nachimuthu2014-05-124-35/+60
| | | | | | | | | | | | | | | | | | | | | | | | | Currently auto-config removes all the hosts with disconnected status in 'peer status' from nagios configuration. But that is not correct as a host can goto disconnected status for many differnt reasons and we should not remove the configuration. Similarly disconnected hosts need not be added to nagios configuration during auto discovery. Fixing this by ingnoring all the disconnected hosts in delta calculation. Note: Host name can't be used to identify disconnected hosts as we may not be able to communicate the disconnected host to get the host name. Hence Host UUID in peer status is used to intentify the host. Bug-Url: https://bugzilla.redhat.com/1091170 Change-Id: I3fe730d2545f8cbc8224c576712b09bb4c16e712 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/7677 Reviewed-by: Sahina Bose <sabose@redhat.com>
* autoconfig: Corrected comparison for volume typeSahina Bose2014-05-081-1/+1
| | | | | | | | | | | The self heal service is only added for a replicate volume type. Corrected the comparison to do so. Change-Id: I78c783bbe9b2f17dc1d5cfa7d86d9a69690be3cd Signed-off-by: Sahina Bose <sabose@redhat.com> Reviewed-on: http://review.gluster.org/7711 Reviewed-by: Ramesh N <rnachimu@redhat.com> Tested-by: Ramesh N <rnachimu@redhat.com>
* Server-addon:Fix: Modified graph templates for memory and swap.ndarshan2014-05-082-17/+11
| | | | | | | | | | | Modified graph templates for memory and swap to handle the unit change in respective plugins . https://bugzilla.redhat.com/show_bug.cgi?id=1080004 Signed-off-by: ndarshan <dnarayan@redhat.com> Change-Id: Id11dee8992b7a4ba93df0fb107fa73e29035088e Reviewed-on: http://review.gluster.org/7641 Reviewed-by: Sahina Bose <sabose@redhat.com>
* plugin: rename CIFS to SMBKanagaraj M2014-05-082-3/+3
| | | | | | | | | Changed the serice name to SMB Change-Id: I717b538d0ebff04c288dc19396e42151f9e7bec1 Signed-off-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-on: http://review.gluster.org/7704 Reviewed-by: Timothy Asir <tim.gluster@gmail.com>
* server-addons: add active checks for gluster processRamesh Nachimuthu2014-05-074-16/+33
| | | | | | | | | | | Adding checks for gluster process and bricks. Change-Id: Ie688233db2a5da0d1a26d5576507559e7e8f5d2d Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/7697 Reviewed-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-by: Shubhendu Tripathi <shtripat@redhat.com> Reviewed-by: Sahina Bose <sabose@redhat.com>
* nagios-server-addons: Disabled host event handlerShubhendu Tripathi2014-05-062-12/+3
| | | | | | | | | | | Disabled the event handler for gluster hosts Change-Id: Ib81245add29126761185dec110015ecb73449a3a Signed-off-by: Shubhendu Tripathi <shtripat@redhat.com> Reviewed-on: http://review.gluster.org/7664 Reviewed-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-by: Ramesh N <rnachimu@redhat.com> Reviewed-by: Timothy Asir <tim.gluster@gmail.com>
* nagios-server: Fixed livestatus query for quotaSahina Bose2014-05-051-1/+1
| | | | | | | | | | As the service name has changed, fixed the livestatus query for Quota service Change-Id: I4967429f357786aad5f6402293054a930371a52e Signed-off-by: Sahina Bose <sabose@redhat.com> Reviewed-on: http://review.gluster.org/7673 Reviewed-by: Kanagaraj M <kmayilsa@redhat.com>
* refactored service description for gluster servicesKanagaraj M2014-05-055-9/+9
| | | | | | | | | | | | | | service descriptions: - Gluster Management - NFS - Self-Heal - Quota - Brick - <brick_dir> Change-Id: I3ece94ef61fcb3fd264e848508362375842dcc6f Signed-off-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-on: http://review.gluster.org/7671 Reviewed-by: Sahina Bose <sabose@redhat.com>
* nagios-server: Added quorum service to auto configSahina Bose2014-05-052-3/+17
| | | | | | | | | | | | Added a quorum service to auto-config generator. Renamed "Volume Status Quota" to "Volume Quota" service Change-Id: Id83eefeee63bf7c34373196f4cfa2b326e1cb71d Signed-off-by: Sahina Bose <sabose@redhat.com> Reviewed-on: http://review.gluster.org/7661 Reviewed-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-by: Ramesh N <rnachimu@redhat.com>
* autoconf: handle exceptions in nrpe commandsRamesh Nachimuthu2014-05-042-21/+28
| | | | | | | | | Handling the exceptions and failure from NRPE commands. Change-Id: I36cba2d6adf8484ba134ad3f7aec77437ba07857 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/7659 Reviewed-by: Sahina Bose <sabose@redhat.com>
* Added CIFS and CTDB service configurationTimothy Asir2014-05-042-1/+17
| | | | | | | | | Change-Id: Ic2e285e758d0a15612f3e14d4f0dbd34e28aaac5 Signed-off-by: Timothy Asir <tjeyasin@redhat.com> Reviewed-on: http://review.gluster.org/7650 Tested-by: Timothy Asir <tim.gluster@gmail.com> Reviewed-by: Shubhendu Tripathi <shtripat@redhat.com> Reviewed-by: Sahina Bose <sabose@redhat.com>
* autoconf: send email notification for auto syncRamesh Nachimuthu2014-05-021-11/+33
| | | | | | | | | | | | | | | | Sending a cusotm email notification whenever nagios configurations are changed by auto-config service. note: By default, nagios mail notification command 'notify-service-by-email' doesn't include the comments macro. But in auto config, all the changes are sent as comment to the custom notificiation command. Hence nagios command 'notify-service-by-email' should be changed to include the macro '$NOTIFICATIONCOMMENT$' as part of mail template. Change-Id: Ie5dd23578e08fbc757c46a884a79923ff3c403b2 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/7626 Reviewed-by: Sahina Bose <sabose@redhat.com>
* notification: Remove ovirt from contactsKanagaraj M2014-05-021-2/+2
| | | | | | | | | | Removed ovirt contact from host and service as sending notifications to ovirt is not ready yet. Change-Id: Ic62b5b62c1a32e3cdc068ad67ec60b781b1effde Signed-off-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-on: http://review.gluster.org/7627 Reviewed-by: Sahina Bose <sabose@redhat.com>
* vol-status: change volume status based on brick statusKanagaraj M2014-05-022-29/+39
| | | | | | | | | | | | | Currently the brick description will have only brick path. Changed the code to query based on volume name,cluster name. Volume status will be decided based on state of the bricks in nagios. Change-Id: If1e4f85f5643cf2b747ae8837b905f0d5b8d9b22 Signed-off-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-on: http://review.gluster.org/7611 Reviewed-by: Ramesh N <rnachimu@redhat.com> Reviewed-by: Sahina Bose <sabose@redhat.com>
* autoconf: discover volume list and info separatelyRamesh Nachimuthu2014-05-022-13/+46
| | | | | | | | | | | | | NRPE doesn't support transfering large junk of data as a result. Hence we have to discover the volume details one by one. First fetch the volume list using 'discover_volume_list' NRPE command then fetch the brick details of volume one by one using 'discover_volume_info' NRPE command Change-Id: I2cd3c2309ffa2f1bf5c271e06dd03ade75bf5d92 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/7631 Reviewed-by: Sahina Bose <sabose@redhat.com>
* plugins: Server side plugin for geo-repSahina Bose2014-05-015-2/+50
| | | | | | | | | Added server side plugin option for geo-rep status Change-Id: I6f604862ec7d4813298a670b7ed2cc0b448faf23 Signed-off-by: Sahina Bose <sabose@redhat.com> Reviewed-on: http://review.gluster.org/7592
* plugins: Changed the server side vol_status commandsSahina Bose2014-05-011-3/+3
| | | | | | | | | | | Changed the nrpe vol_status commands to pass arguments for the different status - self-heal, quota etc Change-Id: Ib26d445a582139fd9d5a07d2b9646a3517843548 Signed-off-by: Sahina Bose <sabose@redhat.com> Reviewed-on: http://review.gluster.org/7638 Reviewed-by: Ramesh N <rnachimu@redhat.com> Reviewed-by: Kanagaraj M <kmayilsa@redhat.com>
* autoconf:fix for pep8 errorRamesh Nachimuthu2014-05-011-3/+3
| | | | | | | | | fixing a pep8 error in discovery.py Change-Id: I2cbacea466e0d178636c00d7212d107fd82f2719 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/7628 Reviewed-by: Kanagaraj M <kmayilsa@redhat.com>
* autoconf: fix for empty services in hosts.Ramesh Nachimuthu2014-04-302-7/+7
| | | | | | | | | | There were some key errors when there is no service in the hosts. It fixed by using dict.get(). Change-Id: Ic479f5335240c772a520e4ee0e7b41ce85f905e5 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/7594 Reviewed-by: Sahina Bose <sabose@redhat.com>
* autoconf: Configure the nodes in auto-config using NRPERamesh Nachimuthu2014-04-302-15/+106
| | | | | | | | | | | Addning an NRPE command to configure all the newly added nodes to used passive check results using NSCA. It is done using the NRPE command 'configure_gluster_node'. Change-Id: I75d0214c8c52afdedd13dac3f38d52abc4ca5a93 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/7593 Reviewed-by: Sahina Bose <sabose@redhat.com>
* autoconf: Use only brick path in brick serviceRamesh Nachimuthu2014-04-303-18/+18
| | | | | | | | | | | | Change the brick service description to "Brick Status - <brick-path>". Currently it is "Brick Status - <hostaddress>:<brick-path>". Same case for Brick utilization service also. Change-Id: I3924f15e3b8b86826c0019c5ab52bd371a970cf1 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/7597 Reviewed-by: Sahina Bose <sabose@redhat.com>
* autoconf: fix for pep 8 errorRamesh Nachimuthu2014-04-291-2/+2
| | | | | Change-Id: I8b662cb36921d62f14eb9af7660585ffc30f94d1 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com>
* auto config : Enhance the auto config to preserve user changesRamesh Nachimuthu2014-04-2910-140/+531
| | | | | | | | | Enhace the auto configuration in nagios to preserve the user changes. pynag apis are used to read/write/update the nagios config files. Change-Id: I6820928fb2b0baff5d6e65c811a48b5ff718f9e3 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com>
* spec: fix dependencies issue in spec fileKanagaraj M2014-04-291-0/+6
| | | | | | | Added BuildRequires for required packages. Change-Id: Ie3c1fbc27b93c582a3caf0a61a07897c7892880c Signed-off-by: Kanagaraj M <kmayilsa@redhat.com>
* plugins: Server side plugin for self-healSahina Bose2014-04-294-2/+47
| | | | | | | | Server side plugin to check the volume self heal status Change-Id: Ia1ee3fb653913360edb1b54b42cce3ed105bdb79 Signed-off-by: Sahina Bose <sabose@redhat.com>
* autoconf: use host uuid to indentity bricksRamesh Nachimuthu2014-04-293-8/+7
| | | | | | | Using host UUIDs to bricks in host Change-Id: Ie5467b05391f709e292644f00495b41af8213b42 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com>
* autoconf: use host name for host configRamesh Nachimuthu2014-04-297-68/+150
| | | | | | | | Discover the host name configured for the gluster node and use the same as host_name in nagios host configuration. Change-Id: Ib9eb8b3f3a1a03d1be28fa2faba44c2fc81fa0cf Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com>
* snmp: Fix conf file name and permissionKanagaraj M2014-04-294-2/+3
| | | | | | | | | | | Renamed the file to snmpmanagers.conf, as .cfg files nagios specific files. Changed the permission to nagios:nagios, as trapgenerater fails otherwise. Change-Id: I2fbc4404c7177ee3bcaeab3151cbcba8e062772a Signed-off-by: Kanagaraj M <kmayilsa@redhat.com>
* volume status: event handler for brick statusRamesh Nachimuthu2014-04-295-1/+63
| | | | | | | | | Adding an event handler for brick status services. It will reschedule the volume status service to determine the current status of volume after any brick state change Change-Id: I94fa018e5aed15be53f45506f1a38efd698eca79 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com>
* vol-status: fix issue when all bricks downKanagaraj M2014-04-291-1/+1
| | | | | | | Fix the aggregation issue when all bricks in CRITICAL state. Change-Id: I8fba79fe77cb876780d4d00cd2992daee758b580 Signed-off-by: Kanagaraj M <kmayilsa@redhat.com>
* vol-status: check for brick statusesKanagaraj M2014-04-291-4/+39
| | | | | | | | | | | | When a volume is in Up state, Volume status will be decided based on the status of the bricks. CRITICAL - If all bricks are in CRITICAL state WARNING - If some bricks are in CRITICAL state OK - If all bricks are in OK state Change-Id: Id90f8a5b1e0aaaa1de488b4356efbdd45fa43b7b Signed-off-by: Kanagaraj M <kmayilsa@redhat.com>
* SNMP Trap Support : Fix for pep8 errorRamesh Nachimuthu2014-04-292-7/+7
| | | | | Change-Id: Iba14a8af63741a5a5014baccaa5b37aad97c7657 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com>
* autocof: adding volume name as part of brick servicesRamesh Nachimuthu2014-04-293-20/+21
| | | | | | | | | Currently there is no way to identify the volume from brick services. Hence adding volume name as custom variable and note in brick services Change-Id: If1ef000196dca2239f713fe41d033d8a4161d6c0 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com>
* packaging: Added dependency on nscaSahina Bose2014-04-291-0/+1
| | | | | | | | Added a dependency on nsca . required by passive check plugins Change-Id: If9c5b50adcbe8803d36bce3bc5f9bf0e20c07256 Signed-off-by: Sahina Bose <sabose@redhat.com>
* SNMP Trap Support : SNMP notification on status changeNishanth Thomas2014-04-2913-11/+985
| | | | | | | | | | | These plugins will generate SNMP traps when there is a host or service state change in Nagios. Plugged into the Nagios Notification mechanism and uses netsnmp utils to generate SNMP traps Addressed the review comments Change-Id: I42c4d1968a48bc80e767f6fbc24d1637a92d21b0 Signed-off-by: Nishanth Thomas <nthomas@redhat.com>
* autoconf: fix adding volume status quota serviceKanagaraj M2014-04-291-0/+1
| | | | | | | | Volume Quota status service was not appended to the service list. Fixed it now. Change-Id: Ia327deefc855619848a7d9ba0e41c155e2c15aa0 Signed-off-by: Kanagaraj M <kmayilsa@redhat.com>
* plugins: Fixed quota status plugin errorsSahina Bose2014-04-291-7/+11
| | | | | | | | | Fixed the error when there's no current status for volume quota status plugin Also corrected the livestatus query Change-Id: Icb7fd0a363588c27c6237a6af397f07b5cfa6bdc Signed-off-by: Sahina Bose <sabose@redhat.com>
* Cluster Status: Plugin to display the overall status of clusterNishanth Thomas2014-04-297-3/+83
| | | | | | | | | This plugin use mk-livestatus to retrieve the status of the all the volumes and provide aggregrate status of the cluster Addressed review comments Change-Id: Ia83b41cfdc6dcfc1f379c024ba6ea33f9ccfe598 Signed-off-by: Nishanth Thomas <nthomas@redhat.com>
* autoconf: don't restart nagios if it is stoped.Ramesh Nachimuthu2014-04-291-2/+18
| | | | | | | | | | | Autoconfig script get struck when user runs the script without starting the nagios. Fixed it by checking the nagios service status before restarting. Now autoconfig will restart the nagios only if it started already by the user. Bug-Url: https://bugzilla.redhat.com/1084975 Change-Id: I1582d06abe764e6f2ae2c63d4a2e7169f0b11aa5 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com>
* autoconf: make 'nagios' as the owner of gluster conf folderRamesh Nachimuthu2014-04-291-0/+1
| | | | | | | | | | | | | Currently root is the owner of gluster config folder /etc/nagios/gluster. Because if this, autocof fails to write the config as it is running under nagios user. With this patch, I am changing the owner of gluster config folder to 'nagios' user. Bug-Url: https://bugzilla.redhat.com/1085302 Change-Id: I0cacc266c22cd66e3558a6b78b39009db0ba9a26 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com>
* autoconf: add brick/volume status serviceRamesh Nachimuthu2014-04-291-5/+9
| | | | | | | | Adding services for brick and volume status in auto config Change-Id: Ic4a885f0b0f83294c21e9d8e0c22c720e0866a94 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com>
* config: added passive checks for gluster quota daemonTimothy Asir2014-04-292-1/+9
| | | | | | | Added passive check service entry for quotad Change-Id: I276ee017a3938aa211f683f589918966f40d9e38 Signed-off-by: Timothy Asir <tjeyasin@redhat.com>
* plugins: Added quota NRPE to volume statusSahina Bose2014-04-294-28/+79
| | | | | | | | | | Added a way to query for quota status to the check_vol_server plugin This will poll for quota status only if the service status for quota returns non-OK status Change-Id: I6260042ef54308a1f4f7b6d482a2b58a4682d36c Signed-off-by: Sahina Bose <sabose@redhat.com>
* Server-addons: Server-side plugin for volume status.ndarshan2014-04-296-87/+151
| | | | | | | | | | | Modified the existing volume utilization server plugin to include status information as well. Refactored the plugin with an argument -o|--option to get the specific volume status. Change-Id: I2b6f8612e32390fb20917098a255de1ee6b3a170 Signed-off-by: ndarshan <dnarayan@redhat.com> Signed-off-by: Sahina Bose <sabose@redhat.com>
* config: added passive checks for gluster processes/bricksKanagaraj M2014-04-294-4/+55
| | | | | | | | | | | | | | | | | | Added passive check service entry for the following. Gluster Management Daemon Gluster NFS Daemon Gluster Self-Heal Daemon Brick Status And renamed the service_description of Brick Brick Utilization - host_ip:brick_dir Brick Status - host_ip:brick_dir display_name for host/service is not being used by nagios according to the documentation, so removed from the conf. Change-Id: Iab66c1a9a07a04ac4e8b8dac76cac30cd5b02365 Signed-off-by: Kanagaraj M <kmayilsa@redhat.com>
* rhsc-nagios-addon: Chnaged the logic to report host statusShubhendu Tripathi2014-04-291-3/+1
| | | | | | | | Modified to check the list of critical services to decide on the host status. Change-Id: I6629abdd575e2fe92ea133a57d329e04fbd3b052 Signed-off-by: Shubhendu Tripathi <shtripat@redhat.com>
* autoconf: fix for pep8 errorRamesh Nachimuthu2014-04-291-1/+1
| | | | | | | Fixing the pep8 error Change-Id: I437a7dc1502c19b3ab90ad5b8c8cb1862b9ba359 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com>
* autoconf: refactoring auto confRamesh Nachimuthu2014-04-292-6/+7
| | | | | | | | | | | | | | Following small changes have been made in auto conf. 1. Create Cluster utilization service only when there is atleast one volume in the cluster. 2. Change the auto config to use the same host given during manual run for further auto syncing. 3. Change the "gluster_auto_discovery" command to passss the cluster name to auto discovery using $HOSTNAME$ macro Change-Id: Id30e0794d98ada4a0276af0c17781f8742dc14e5 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com>
* Server-addons: Fix for issue in cluster utilization help option.ndarshan2014-04-291-2/+2
| | | | | | | | | This patch fixes the issue with -h(help) option for the cluster utilization plugin. Change-Id: Ide120c741d668188e2e270a509c20e9e109f11b9 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1082834 Signed-off-by: ndarshan <dnarayan@redhat.com>