summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* disk_usage: set rrd configuration to multiplev0.1.1Timothy Asir Jeyasingh2014-06-263-0/+3
| | | | | | | | | | | | | | By default perfdata are created in single rrd file which causes failure of fetching DS for newly configured disks. This patch fixes this issue by setting pnp4nagios rrd configuration to multiple. Change-Id: I05ca0561e9b926a3ee0c655699fa30544c20e2ad Signed-off-by: Timothy Asir Jeyasingh <tjeyasin@redhat.com> Reviewed-on: http://review.gluster.org/8169 Tested-by: Timothy Asir <tim.gluster@gmail.com> Reviewed-by: Sahina Bose <sabose@redhat.com>
* fix pep8 errorsTimothy Asir Jeyasingh2014-06-267-117/+118
| | | | | | | | Change-Id: Ia0f570dfb74d6c41484e509f704df12d3b96db17 Signed-off-by: Timothy Asir Jeyasingh <tjeyasin@redhat.com> Reviewed-on: http://review.gluster.org/8161 Tested-by: Timothy Asir <tim.gluster@gmail.com> Reviewed-by: Shubhendu Tripathi <shtripat@redhat.com>
* nagios-server: Added noarch directive to specSahina Bose2014-06-211-0/+1
| | | | | | | | Change-Id: Ibb9fcdcb7f5a2c951011883f54ec14c209049555 Signed-off-by: Sahina Bose <sabose@redhat.com> Reviewed-on: http://review.gluster.org/8144 Reviewed-by: Kanagaraj M <kmayilsa@redhat.com> Tested-by: Kanagaraj M <kmayilsa@redhat.com>
* autoconfig: fixing issue in finding duplicate hostsRamesh Nachimuthu2014-06-161-4/+6
| | | | | | | | | | | | | | When a host is in disconnected status, we will not communicate with the host and will not be able to get the hostname. So we don't need to consider those disconnected hosts in finding duplicate hosts. Change-Id: Ie3fbef03635d46fd9d95e5b1f4df7435e800c55d Bug-Url: https://bugzilla.redhat.com/1109723 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/8074 Reviewed-by: Sahina Bose <sabose@redhat.com> Tested-by: Sahina Bose <sabose@redhat.com>
* interfaces: set rrd configuration to multipleBala.FA2014-06-163-0/+8
| | | | | | | | | | | | | | | By default perfdata are created in single rrd file which causes failure of fetching DS for newly configured network interfaces. This patch fixes this by setting pnp4nagios rrd configuration to multiple rrd file for each DS of network interfaces. Change-Id: I3e6fa0e4336fb866ceb37a5e3165a515d42bfae6 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1087837 Signed-off-by: Bala.FA <barumuga@redhat.com> Reviewed-on: http://review.gluster.org/8059 Reviewed-by: Sahina Bose <sabose@redhat.com> Tested-by: Sahina Bose <sabose@redhat.com>
* nagios-server-addons:Fixed issues with executeRandomHostNishanth Thomas2014-06-161-6/+12
| | | | | | | | | | | | | | | When a node in the cluster is down, nrpe request sent to the node gets timed out resulting a failure in executeRandomHost. This is fixed by selecting only those nodes which are UP Change-Id: I5b22dcb30c0e2a006a549dc642b16db278c9c0f1 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1109025 Signed-off-by: Nishanth Thomas <nthomas@redhat.com> Reviewed-on: http://review.gluster.org/8061 Reviewed-by: Ramesh N <rnachimu@redhat.com> Reviewed-by: Kanagaraj M <kmayilsa@redhat.com> Tested-by: Nishanth Thomas <nishusemail@gmail.com> Reviewed-by: Sahina Bose <sabose@redhat.com>
* spec: chkconfig for nagios/nsca servicesRamesh Nachimuthu2014-06-111-0/+8
| | | | | | | | | | | | | | Adding chkconfig for nagios and nsca services. By default nagios and nsca is disabled in all the run levels. So we have to enable them by running 'chkconfig <service> on' during installation. Change-Id: I8527abca24ec286f85c425db9cbeb216047eaa97 Bug-Url: https://bugzilla.redhat.com/1080449 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/8012 Reviewed-by: Bala FA <barumuga@redhat.com> Reviewed-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-by: Timothy Asir <tim.gluster@gmail.com>
* autoconfig: Handle sync host deletion in auto config.Ramesh Nachimuthu2014-06-111-0/+15
| | | | | | | | | | | | | | | | | Auto config uses a user configured host to periodically sync the gluster configuration. If the host used for sync itself is removed from the cluster, then auto config will detect this as all other hosts are getting removed from cluster. Fixing this issue by not removing all the hosts except sync host in auto mode. User has to run the auto config manually with differnt host to remove sync host. Change-Id: I18fa51b4ed9674264ea8b2d2f615f7680a59c04e Bug-Url: https://bugzilla.redhat.com/1107998 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/8024 Reviewed-by: Sahina Bose <sabose@redhat.com>
* Add sudo configuration for nagios user for nagios pluginsTimothy Asir2014-06-064-0/+13
| | | | | | | | | Change-Id: Ibb601ace97c34a4bd91f2f9658d305a68a7aacaa Bug-Url: https://bugzilla.redhat.com/1085291 Signed-off-by: Timothy Asir <tjeyasin@redhat.com> Reviewed-on: http://review.gluster.org/7895 Reviewed-by: Sahina Bose <sabose@redhat.com> Tested-by: Sahina Bose <sabose@redhat.com>
* nagios-server-addons:volume status based on volume typeNishanth Thomas2014-06-041-12/+102
| | | | | | | | | | | | | | | | Added the volume type in the plugin output The logic of determining the volume status changed based on the volume type.Added the volume type and the list of bricks down in the plugin output Change-Id: Ib8d3111bdcc04264ec8bb6383fcb4fad97a17bab Bug-Url:https://bugzilla.redhat.com/show_bug.cgi?id=1096159 Bug-Url:https://bugzilla.redhat.com/show_bug.cgi?id=1096169 Signed-off-by: Nishanth Thomas <nthomas@redhat.com> Reviewed-on: http://review.gluster.org/7874 Reviewed-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-by: Sahina Bose <sabose@redhat.com> Tested-by: Nishanth Thomas <nishusemail@gmail.com>
* nagios-server-addons: Fix for dummy config file issue.ndarshan2014-06-035-9/+35
| | | | | | | | | | | | | | | | | | | This patch replaces the configfile node1.cfg(gluster-host) by temp_node1.cfg which is of type linux-server having service PING. And this dummy config file is renamed to temp_node1.cfg.sample during auto-discovery as it is not needed after we configure actual hosts. Also this patch sets the config variable allow_empty_hostgroup_assignment to 1, which is needed for nagios to allow declaration of empty host-group with services. Change-Id: I03cc54975f5ff5857f8d82b66110e049e4195009 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1091236 Signed-off-by: ndarshan <dnarayan@redhat.com> Reviewed-on: http://review.gluster.org/7952 Reviewed-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-by: Shubhendu Tripathi <shtripat@redhat.com> Reviewed-by: Sahina Bose <sabose@redhat.com>
* nagios-server-addons: Added requires for mod_sslShubhendu Tripathi2014-05-301-0/+1
| | | | | | | | | | Added requires for mod_ssl. The same is required for SSL enabling for nagios and pnp4nagios. Change-Id: Ib391ebb7008396ea34e045cc1cc4041305470a14 Signed-off-by: Shubhendu Tripathi <shtripat@redhat.com> Reviewed-on: http://review.gluster.org/7935 Reviewed-by: Kanagaraj M <kmayilsa@redhat.com>
* nagios-server-addons: Check hosts status using NRPEShubhendu Tripathi2014-05-306-125/+29
| | | | | | | | | | | | | Enabled to execute check_nrpe for a given host to check its status. Change-Id: I938b78fcbf52cd46f4f493e2c2b8b927614834eb Bug-URL: https://bugzilla.redhat.com/show_bug.cgi?id=1102506 Signed-off-by: Shubhendu Tripathi <shtripat@redhat.com> Reviewed-on: http://review.gluster.org/7923 Reviewed-by: Ramesh N <rnachimu@redhat.com> Reviewed-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-by: Timothy Asir <tim.gluster@gmail.com>
* nagios-server-addons: Redirect http to https for nagiosShubhendu Tripathi2014-05-291-0/+11
| | | | | | | | | | Enabled redirecting nagios and pnp4nagios urls to https Change-Id: I3d1e62438c7265aca6cd930f37fd4aac08d83f76 Signed-off-by: Shubhendu Tripathi <shtripat@redhat.com> Reviewed-on: http://review.gluster.org/7906 Reviewed-by: Bala FA <barumuga@redhat.com> Reviewed-by: Timothy Asir <tim.gluster@gmail.com>
* server-plugins: Corrected cluster utilization when volume stoppedSahina Bose2014-05-292-50/+72
| | | | | | | | | | Corrected the message returned by plugin when all volumes in cluster are stopped Change-Id: Ie5e0fbbb10fa7d2787a82e1caa7ca86e8c7010a3 Bug-Url: https://bugzilla.redhat.com/1096730 Signed-off-by: Sahina Bose <sabose@redhat.com> Reviewed-on: http://review.gluster.org/7780
* autoconfig:mock pynag in auto config test caseRamesh Nachimuthu2014-05-291-3/+1
| | | | | | | | | | | | Mocking pynag using dicts in test cases Change-Id: I7ddedb640910c8dca0b79d17efe5e6eeefc9ee6f Bug-Url: https://bugzilla.redhat.com/1099093 Bug-Url: https://bugzilla.redhat.com/1099328 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/7921 Reviewed-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-by: Sahina Bose <sabose@redhat.com>
* autoconfig: refactoring and adding test casesRamesh Nachimuthu2014-05-284-49/+151
| | | | | | | | | | | | Refactoring the code to use constants for repeatedly used strings and add some test case. Change-Id: I7c88231a51ceea3b1cc94223018ecc704b657512 Bug-Url: https://bugzilla.redhat.com/1099093 Bug-Url: https://bugzilla.redhat.com/1099328 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/7883 Reviewed-by: Sahina Bose <sabose@redhat.com>
* autoConfig:Support for force syncing specific fields in service configRamesh Nachimuthu2014-05-282-16/+42
| | | | | | | | | | | | | | | | | | | Currently Auto-config won't update any service configurations in nagios. It always adds or deletes services configurations but no update. With the following bugs we have the need to update few values in service configuration. Hence adding the support to update specific fields in service config. All the fields in the list config_generator.SERVICE_FIELDS_TO_FORCE_SYNC will be force updated during auto configuration. With this patch only '_VOL_NAME' and 'notes' field will be updated. Change-Id: I6003ade375d2f0d6e7dee97ef05f7a9af4ce6ffd Bug-Url: https://bugzilla.redhat.com/1099093 Bug-Url: https://bugzilla.redhat.com/1099328 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/7868 Reviewed-by: Sahina Bose <sabose@redhat.com>
* server-plugin: Corrected the exit status for pluginSahina Bose2014-05-281-2/+1
| | | | | | | | | | | | | | The exit status from NRPE plugin was wrapped with WEXITSTATUS which was earlier used when running commands directly. With the subprocess implementation, this is not required as it always returns 0 for successful execution even when nrpe plugin returns 1/2. Change-Id: I3cda8d4aa5b4f726cb5c7faf05c7f2536115eafe Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1101211 Signed-off-by: Sahina Bose <sabose@redhat.com> Reviewed-on: http://review.gluster.org/7905
* server-addons: fix for hostgroup issue in brick status event handlerRamesh Nachimuthu2014-05-274-1/+72
| | | | | | | | | | | | | | | | | Macro "$HOSTGROUPNAME$" is used in brick status event handler. But this macro gives only one of the host group to which the host belongs to. But in gluster monitoring, all gluster hosts will have two host groups ('gluster-host' and a host group with cluster name). So using the macro "$HOSTGROUPNAMES$" to pass all the host groups to event handler and internally getting the currect cluster name. Change-Id: I61713ecabff52bcd7f585e9f678426370b9b24d4 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/7761 Reviewed-by: Nishanth Thomas <nishusemail@gmail.com> Reviewed-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-by: Timothy Asir <tim.gluster@gmail.com>
* autoConfig: create quota/geo rep services conditionallyRamesh Nachimuthu2014-05-232-51/+73
| | | | | | | | | | | Create QUOTA and GEO Replication status services for volume only when respective services are enabled in gluster. Bug-Url: https://bugzilla.redhat.com/1099731 Change-Id: I9813a64f7d2573aaf3b23534643662e198b5457d Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/7838 Reviewed-by: Sahina Bose <sabose@redhat.com>
* autoconfig: delete only auto generated configs in auto-configRamesh Nachimuthu2014-05-232-0/+6
| | | | | | | | | | | | | | | | Currently auto-config removes all the custom services and hosts defined by user. So with this issue, user can't add any extra services on top of services generated by auto-config. Adding a custom filed '__GENERATED_BY_AUTOCONFIG' as part of all the services added by auto-config. Only services with the above custom field will be deleted by auto-config when respective volume/brick/ is removed in gluster. Change-Id: I85d3d971d3b99f52ff603044f7f974746e247737 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/7750 Reviewed-by: Sahina Bose <sabose@redhat.com>
* autoconf:check if host is already being monitoredRamesh Nachimuthu2014-05-221-0/+20
| | | | | | | | | | | | | | | User may have a host configuration defined already for the host being discovered by auto config. So checking if the host already exist as part of another cluster before auto configuring. Same issue may happen when user gives a differnt cluster name in autoconfig after running for the first time. Change-Id: Ia3dbf8e4895cfe4d24e99eda49313b44dbd25aef Bug-Url: https://bugzilla.redhat.com/1085320 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/7755 Reviewed-by: Sahina Bose <sabose@redhat.com>
* Add check_brick_usage template into pnp4nagios template pathTimothy Asir2014-05-213-1/+3
| | | | | | | | | Change-Id: I7e81e22e73dc4cf336ad335f69735d54b9e9714a Signed-off-by: Timothy Asir <tjeyasin@redhat.com> Reviewed-on: http://review.gluster.org/7807 Tested-by: Timothy Asir <tim.gluster@gmail.com> Reviewed-by: Ramesh N <rnachimu@redhat.com> Reviewed-by: Timothy Asir <tim.gluster@gmail.com>
* autoconfig: fix for timeout param issue in auto modeRamesh Nachimuthu2014-05-201-1/+1
| | | | | | | | | | | Passing the timeout parameter to writeDelta() in auto mode also. Change-Id: Ia18ae225e5b6e239b4d4b09357d51844d5a868f5 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/7817 Reviewed-by: Shubhendu Tripathi <shtripat@redhat.com> Reviewed-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-by: Timothy Asir <tim.gluster@gmail.com>
* plugins: refactored volume status pluginKanagaraj M2014-05-201-28/+29
| | | | | | | | | | Passing the required arguments to the functions instead of passing 'arg'. Change-Id: Ib6cb654bc448c871a24dc636e6829ccf7523c2c8 Signed-off-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-on: http://review.gluster.org/7756 Reviewed-by: Sahina Bose <sabose@redhat.com>
* nagios-server-addons: Disabled check_remote_host serviceShubhendu Tripathi2014-05-203-8/+3
| | | | | | | | | | | | Disabled the gluster host service check_command service check_remote_host Change-Id: If71ed9d42ef65a9a9b36668fed7b449745cc5df1 Bug-URL: https://bugzilla.redhat.com/show_bug.cgi?id=1098468 Signed-off-by: Shubhendu Tripathi <shtripat@redhat.com> Reviewed-on: http://review.gluster.org/7797 Reviewed-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-by: Timothy Asir <tim.gluster@gmail.com>
* nagios-server-addons: NRPE command with timeoutShubhendu Tripathi2014-05-204-70/+106
| | | | | | | | | | | | | | | | | | | | | | | Introduced a utility method to return a NRPE base command with timeout set externally. Currently if a plugin internally executes NRPE to get the details from the node, there is no mechanism that timeout could be set to more than 10 sec. This method provides the NRPE command with timeout (if passed). This is required for some of the NRPE calls where gluster commands get executed and they might take more time. All the plugins, which execute a NRPE within, can provide optional command line argument for timeout, and same can be used for forming the proper NRPE call with timeout value. Change-Id: Id97624df743664a320a585acc4a85cfcf64d0a07 Signed-off-by: Shubhendu Tripathi <shtripat@redhat.com> Reviewed-on: http://review.gluster.org/7682 Reviewed-by: Sahina Bose <sabose@redhat.com> Tested-by: Sahina Bose <sabose@redhat.com>
* Add check brick usage pnp4nagios template pluginTimothy Asir2014-05-161-0/+48
| | | | | | | | Change-Id: If55d9a0f36fbb16136fe46dbbdc31b2f52228a7b Signed-off-by: Timothy Asir <tjeyasin@redhat.com> Reviewed-on: http://review.gluster.org/7691 Tested-by: Timothy Asir <tim.gluster@gmail.com> Reviewed-by: Timothy Asir <tim.gluster@gmail.com>
* Add total usage into disk usage graph vertical labelTimothy Asir2014-05-161-1/+2
| | | | | | | | Change-Id: I2f3b18c730ffd3ab142763433e0c75f9214eef1e Signed-off-by: Timothy Asir <tjeyasin@redhat.com> Reviewed-on: http://review.gluster.org/7685 Tested-by: Timothy Asir <tim.gluster@gmail.com> Reviewed-by: Timothy Asir <tim.gluster@gmail.com>
* nagios-server-addons: Open NSCA portShubhendu Tripathi2014-05-151-0/+2
| | | | | | | | | | Modified to open NSCA port while installation Bug-URL: https://bugzilla.redhat.com/show_bug.cgi?id=1097193 Change-Id: I52edd1cfde7d61945ae4bdc4f6339fe246713959 Signed-off-by: Shubhendu Tripathi <shtripat@redhat.com> Reviewed-on: http://review.gluster.org/7758 Reviewed-by: Kanagaraj M <kmayilsa@redhat.com>
* nagios-server-addons : Fixed cluster status plugin to correct queriesNishanth Thomas2014-05-131-10/+7
| | | | | | | | | | | | | | | BZ 1089641, changed the mk-livestatus query so that it picks the right services BZ 1089670, introduced a check to set status to OK if no volumes present in the cluster Bug-Url:https://bugzilla.redhat.com/show_bug.cgi?id=1089670 Bug:Url:https://bugzilla.redhat.com/show_bug.cgi?id=1089641 Change-Id: I93aed685c75ff3455e1129c0d8f9e485b6c5f2b0 Signed-off-by: Nishanth Thomas <nthomas@redhat.com> Reviewed-on: http://review.gluster.org/7708 Reviewed-by: Sahina Bose <sabose@redhat.com> Tested-by: Sahina Bose <sabose@redhat.com>
* 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>