summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* plugins: Fixed issue with str comparisonv1.0.0Sahina Bose2014-12-021-2/+2
| | | | | | | | | | | | Wrongly used str.contains in python. Fixed this Change-Id: Idea139329dc430294fc016b30db2578335bb3666 Bug-Url: https://bugzilla.redhat.com/1109752 Signed-off-by: Sahina Bose <sabose@redhat.com> Reviewed-on: http://review.gluster.org/9226 Reviewed-by: Ramesh N <rnachimu@redhat.com> Reviewed-by: kasturi narra <kasturi.narra@gmail.com> Reviewed-by: Kanagaraj M <kmayilsa@redhat.com>
* brick plugin: set rrd configuration to multiple.ndarshan2014-11-264-3/+11
| | | | | | | | | | | | | | | | | | By default perfdata is created in single rrd file which causes failure of fetching DS in upgrade scenario. Because earlier brick utilization had only one DS. Now with thin LV monitoring included in brick utilization, It will be having two DS. The graph templates wont be able to read them in single rrd file. So in case of upgrade we run the script rrd_convert as a pre step to migrate the old data to new rrd files.and this patch also sets pnp4nagios rrd configuration to multiple rrd file for each DS. Change-Id: Iadb50250b2e93d73b61e25be90a0770dae0780f3 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1143995 Signed-off-by: ndarshan <dnarayan@redhat.com> Reviewed-on: http://review.gluster.org/9188 Reviewed-by: Sahina Bose <sabose@redhat.com>
* plugins: Handle volume locked errorsSahina Bose2014-11-251-2/+8
| | | | | | | | | | | | | | | When plugin returns unknown status due to transaction in progress, the plugin should try again after some time to avoid propogating this error to Nagios Change-Id: I83fa7c3ec7382d1263e36995662df83b5ae39aa6 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1109752 Signed-off-by: Sahina Bose <sabose@redhat.com> Reviewed-on: http://review.gluster.org/9192 Reviewed-by: Ramesh N <rnachimu@redhat.com> Reviewed-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-by: Bala FA <barumuga@redhat.com>
* nagios-server-addons: Modified brick utilization graph template.ndarshan2014-11-181-1/+8
| | | | | | | | | | | | | | Modified brick utilization graph template to give an additional graph to show the actual brick utilization when the brick is made up of thin lv. Change-Id: I0ecc2de9d0b6ca72b7a4ed87c342f242fb035598 Bug-Url:https://bugzilla.redhat.com/show_bug.cgi?id=1143995 Signed-off-by: ndarshan <dnarayan@redhat.com> Reviewed-on: http://review.gluster.org/9116 Reviewed-by: Nishanth Thomas <nishusemail@gmail.com> Reviewed-by: Ramesh N <rnachimu@redhat.com> Reviewed-by: Sahina Bose <sabose@redhat.com>
* nagios-server-addons:_executeRandomHost to check for the status of glusterd ↵Nishanth Thomas2014-11-171-2/+15
| | | | | | | | | | | | | | | | | | | service During the creation of eligible list of hosts, need to consider the status of glusterd service also. this is included. Also added some additional checks to handle the errors https://bugzilla.redhat.com/show_bug.cgi?id=1136205 https://bugzilla.redhat.com/show_bug.cgi?id=1109843 Signed-off-by: Nishanth Thomas <nthomas@redhat.com> Change-Id: Ic757ecc0df5ef3c261048a961af59715ca889a26 Reviewed-on: http://review.gluster.org/9066 Reviewed-by: Ramesh N <rnachimu@redhat.com> Tested-by: Nishanth Thomas <nishusemail@gmail.com> Reviewed-by: Shubhendu Tripathi <shtripat@redhat.com> Reviewed-by: Sahina Bose <sabose@redhat.com>
* nagios-server-addons:Add php template for cluster utilization pluginNishanth Thomas2014-11-173-0/+39
| | | | | | | | | | | | | | | There was no php template available for cluster utilization and it was using the the default template and causing the improper display Change-Id: I21f458a678d12807d275cc536e56aa14eae22a80 Bug-url: https://bugzilla.redhat.com/show_bug.cgi?id=1119233 Signed-off-by: Nishanth Thomas <nthomas@redhat.com> Reviewed-on: http://review.gluster.org/9002 Tested-by: Nishanth Thomas <nishusemail@gmail.com> Reviewed-by: Ramesh N <rnachimu@redhat.com> Reviewed-by: Shubhendu Tripathi <shtripat@redhat.com> Reviewed-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-by: Sahina Bose <sabose@redhat.com>
* autoconf: unregister the temp_node1 instead of deleting it.Ramesh Nachimuthu2014-11-172-13/+21
| | | | | | | | | | | | | | | | | | | | | | | Unregistering the temp_node1 instead of deleting it while configuring nagios . new field 'register' will be added to temp_node1 and its services with value 0, so that it won't be considered by nagios. If both files, temp_node1.cfg and temp_node1.cfg.sample are present during upgrade then we will remove the file temp_node1.cfg.sample and add the 'register 0' flag to definitions in temp_node1.cfg file. Bug-Url: https://bugzilla.redhat.com/1162446 Bug-Url: https://bugzilla.redhat.com/1162443 Bug-Url: https://bugzilla.redhat.com/1115387 Change-Id: I3c76d6c6a9a9e411315859e07238a7902ddd2380 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/9123 Reviewed-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-by: Sahina Bose <sabose@redhat.com>
* Revert "packaging: install temp_node1.cfg only for the first time"Ramesh Nachimuthu2014-11-173-27/+21
| | | | | | | | | | | | This reverts commit 11f96adbb1f8bff8cf7b385da10200a5627d980a. Bug-Url:https://bugzilla.redhat.com/1162446 Bug-Url:https://bugzilla.redhat.com/1162443 Change-Id: I831bb0c84721a0c3181a2d58421520a6fb788621 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/9122 Reviewed-by: Kanagaraj M <kmayilsa@redhat.com> Reviewed-by: Sahina Bose <sabose@redhat.com>
* server-plugin: consider all status of volume in cluster statusRamesh Nachimuthu2014-11-111-2/+22
| | | | | | | | | | | | | | | | | | | | | | Consider the 'UNKNOWN' status of volumes while calculating the cluster status. Following will be the cluster state and state information. Cluster State State Information UP "OK : None of the Volumes in the cluster are in Critical State" UP "OK : No Volumes present in the cluster" UP "WARNING : Some Volumes in the cluster are in Critical State" UP "WARNING : Some Volumes in the cluster are in Unknown State" UP "WARNING : Some Volumes in the cluster are in Warning State" UP "WARNING : All Volumes in the cluster are in Warning State" DOWN "CRITICAL: All Volumes in the cluster are in Critical State" DOWN "CRITICAL: All Volumes in the cluster are in Unknown State" Bug-url: https://bugzilla.redhat.com/1128007 Change-Id: I06fb1697cb4919420ab6d6ea54e9d9ee96820d2a Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/9053 Reviewed-by: Shubhendu Tripathi <shtripat@redhat.com> Reviewed-by: Sahina Bose <sabose@redhat.com>
* packaging: install temp_node1.cfg only for the first timeRamesh Nachimuthu2014-10-293-21/+27
| | | | | | | | | | | | Installing temp_node1.cfg conditionally during first installation only. It won't be re-installed during upgrade. Change-Id: I26cc945d5b8b650d8457b7232d9dc0f3c5eac105 Bug-Url: https://bugzilla.redhat.com/1115387 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/8303 Reviewed-by: Sahina Bose <sabose@redhat.com> Tested-by: Sahina Bose <sabose@redhat.com>
* autoconf: fix the error message for duplicate hostRamesh Nachimuthu2014-10-291-1/+1
| | | | | | | | | | | Modified the error message for the case when there is already a host with same name existing. Change-Id: I2e6b5ef80baa0a45d94f069980ac81b1fbd8c058 Bug-Url: https://bugzilla.redhat.com/1112201 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/8658 Reviewed-by: Sahina Bose <sabose@redhat.com>
* autoconfig: avoid renaming hostnames in nagiosRamesh Nachimuthu2014-10-293-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto Config tries to use the output of 'hostname' command as a host_name for node in nagios. But if the hostnames are not unique, then it uses IP Address as node_name name in nagios. If after removal of a node, hostnames becomes unique then auto config renames all the host configuration in nagios to their hostnames instead of ip address. It creates multiples issues like removing all the nodes, loss of time series data and unnecessary confusion to the user. Fixing this issue by retaining the perviously configured host names always by going through the host uuid. So if duplication comes after a node addition then only that node will be configured with ip address as host_name but all other existing hosts will not be touched. Similary, even though there is no duplication after the removal of a node with duplicate name, auto config will retain the previously configured hostnames (which are ip addresss becasue there was a hostname duplication earlier) instead of renaming. Change-Id: I0abef47e2e495a591dd3901d2b1766a04c59a701 Bug-Url: https://bugzilla.redhat.com/1139228 Bug-Url: https://bugzilla.redhat.com/1139505 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/8699 Reviewed-by: darshan n <dnarayan@redhat.com> Reviewed-by: Sahina Bose <sabose@redhat.com>
* nagios-server-addons:executeRandomHost to send request with correct host addressNishanth Thomas2014-10-131-5/+9
| | | | | | | | | | | | | | | When the inital request fails, executeRandomHost is supposed to iterate over the list of avialable hosts and resend the request until get a successful response. This part of code was falty, where the request was send without getting the proper ipaddress/hostname Change-Id: I1f1c7a5bccba3bd601c9e3241083784f15a2c4b6 Bug-url: https://bugzilla.redhat.com/show_bug.cgi?id=1109843 Signed-off-by: Nishanth Thomas <nthomas@redhat.com> Reviewed-on: http://review.gluster.org/8101 Reviewed-by: Sahina Bose <sabose@redhat.com> Tested-by: Nishanth Thomas <nishusemail@gmail.com>
* autoconf: verify the configurations before restarting nagiosRamesh Nachimuthu2014-09-154-8/+32
| | | | | | | | | | | | | Verify the Nagios configuration before restarting the nagios server. It helps in accidently stoping the nagios server because of config error. Change-Id: I8c7cb5663bf42d73812577e9b162434cb2ecfdfe Bug-Url: https://bugzilla.redhat.com/1138943 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/8131 Reviewed-by: Shubhendu Tripathi <shtripat@redhat.com> Reviewed-by: Sahina Bose <sabose@redhat.com>
* nagios-config: corrected the directive for check_attemptsSahina Bose2014-08-141-1/+1
| | | | | | | | | | The directive for check attempts should be max_check_attempts Change-Id: Id7cb814a55dbde714aa9cf570150e5d0158763e4 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1128154 Signed-off-by: Sahina Bose <sabose@redhat.com> Reviewed-on: http://review.gluster.org/8482 Reviewed-by: Ramesh N <rnachimu@redhat.com>
* nagios-config: Changing config for passive checksSahina Bose2014-08-131-0/+1
| | | | | | | | | | | | | Passive check results that result in state changes need to be treated as HARD states, so that notifications can be send out immediately Change-Id: I747b0f1301ee9321adb559e02a47e30fd4e4a346 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1128154 Signed-off-by: Sahina Bose <sabose@redhat.com> Reviewed-on: http://review.gluster.org/8467 Reviewed-by: Ramesh N <rnachimu@redhat.com> Reviewed-by: Kanagaraj M <kmayilsa@redhat.com>
* server-addons: Fix typo in error messageRamesh Nachimuthu2014-07-021-1/+1
| | | | | | | | | | Fixing typo 'NPRE' in server_utils.execNRPECommand() Bug-Url: https://bugzilla.redhat.com/1108569 Change-Id: I9b29780661353eb0b82ef24a390c2d2091f7ea4e Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/8130 Reviewed-by: Sahina Bose <sabose@redhat.com>
* packaging: Avoid overwriting config files during upgrade.Ramesh Nachimuthu2014-07-021-2/+2
| | | | | | | | | | | Adding %config(noreplace) flag for config files so that config files will not be over written during RPM upgarde. Change-Id: Iff5ff8f8df589745e9d69bc22f8bf10674d1f49f Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/8220 Reviewed-by: Bala FA <barumuga@redhat.com> Reviewed-by: Sahina Bose <sabose@redhat.com>
* 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>
generated by cgit (git 2.34.1) at 2024-04-19 13:31:35 +0000