From 61970663d9f8b42f4f8150541a9ee94b0ebf5bf9 Mon Sep 17 00:00:00 2001 From: Patrick Van der Veken Date: Fri, 5 Jul 2019 16:08:58 +0200 Subject: [PATCH] Added plugin check_exadata_zfs_cluster --- .../linux/ARCH/hc-exadata-platform/PKGBUILD | 2 + .../linux/SPECS/hc-exadata-platform.spec | 6 + .../hc/check_exadata_zfs_cluster.conf.dist | 35 +++ .../exadata/check_exadata_zfs_cluster.sh | 264 ++++++++++++++++++ .../exadata/check_exadata_zfs_logs.sh | 4 +- .../exadata/check_exadata_zfs_pool_usage.sh | 4 +- .../exadata/check_exadata_zfs_services.sh | 4 +- .../check_exadata_zfs_share_replication.sh | 4 +- .../exadata/check_exadata_zfs_share_usage.sh | 4 +- 9 files changed, 322 insertions(+), 5 deletions(-) create mode 100644 etc/opt/hc/check_exadata_zfs_cluster.conf.dist create mode 100644 opt/hc/lib/platform/exadata/check_exadata_zfs_cluster.sh diff --git a/build/exadata/linux/ARCH/hc-exadata-platform/PKGBUILD b/build/exadata/linux/ARCH/hc-exadata-platform/PKGBUILD index 2e9f2f6..cf41b77 100644 --- a/build/exadata/linux/ARCH/hc-exadata-platform/PKGBUILD +++ b/build/exadata/linux/ARCH/hc-exadata-platform/PKGBUILD @@ -29,6 +29,7 @@ package() { install -D -m 755 opt/hc/lib/platform/exadata/check_exadata_cell_megaraid.sh ${pkgdir}/opt/hc/lib/platform/exadata/check_exadata_cell_megaraid.sh install -D -m 755 opt/hc/lib/platform/exadata/check_exadata_cell_physicaldisks.sh ${pkgdir}/opt/hc/lib/platform/exadata/check_exadata_cell_physicaldisks.sh install -D -m 755 opt/hc/lib/platform/exadata/check_exadata_megaraid.sh ${pkgdir}/opt/hc/lib/platform/exadata/check_exadata_megaraid.sh + install -D -m 755 opt/hc/lib/platform/exadata/check_exadata_zfs_cluster.sh ${pkgdir}/opt/hc/lib/platform/exadata/check_exadata_zfs_cluster.sh install -D -m 755 opt/hc/lib/platform/exadata/check_exadata_zfs_logs.sh ${pkgdir}/opt/hc/lib/platform/exadata/check_exadata_zfs_logs.sh install -D -m 755 opt/hc/lib/platform/exadata/check_exadata_zfs_pool_usage.sh ${pkgdir}/opt/hc/lib/platform/exadata/check_exadata_zfs_pool_usage.sh install -D -m 755 opt/hc/lib/platform/exadata/check_exadata_zfs_services.sh ${pkgdir}/opt/hc/lib/platform/exadata/check_exadata_zfs_services.sh @@ -43,6 +44,7 @@ package() { install -D -m 644 etc/opt/hc/check_exadata_cell_megaraid.conf.dist ${pkgdir}/etc/opt/hc/check_exadata_cell_megaraid.conf.dist install -D -m 644 etc/opt/hc/check_exadata_cell_physicaldisks.conf.dist ${pkgdir}/etc/opt/hc/check_exadata_cell_physicaldisks.conf.dist install -D -m 644 etc/opt/hc/check_exadata_megaraid.conf.dist ${pkgdir}/etc/opt/hc/check_exadata_megaraid.conf.dist + install -D -m 644 etc/opt/hc/check_exadata_zfs_cluster.conf.dist ${pkgdir}/etc/opt/hc/check_exadata_zfs_cluster.conf.dist install -D -m 644 etc/opt/hc/check_exadata_zfs_logs.conf.dist ${pkgdir}/etc/opt/hc/check_exadata_zfs_logs.conf.dist install -D -m 644 etc/opt/hc/check_exadata_zfs_pool_usage.conf.dist ${pkgdir}/etc/opt/hc/check_exadata_zfs_pool_usage.conf.dist install -D -m 644 etc/opt/hc/check_exadata_zfs_services.conf.dist ${pkgdir}/etc/opt/hc/check_exadata_zfs_services.conf.dist diff --git a/build/exadata/linux/SPECS/hc-exadata-platform.spec b/build/exadata/linux/SPECS/hc-exadata-platform.spec index d66e77f..011549c 100644 --- a/build/exadata/linux/SPECS/hc-exadata-platform.spec +++ b/build/exadata/linux/SPECS/hc-exadata-platform.spec @@ -37,6 +37,7 @@ cp ../SOURCES/opt/hc/lib/platform/exadata/check_exadata_cell_luns.sh $RPM_BUILD_ cp ../SOURCES/opt/hc/lib/platform/exadata/check_exadata_cell_megaraid.sh $RPM_BUILD_ROOT/opt/hc/lib/platform/exadata/check_exadata_cell_megaraid.sh cp ../SOURCES/opt/hc/lib/platform/exadata/check_exadata_cell_physicaldisks.sh $RPM_BUILD_ROOT/opt/hc/lib/platform/exadata/check_exadata_cell_physicaldisks.sh cp ../SOURCES/opt/hc/lib/platform/exadata/check_exadata_megaraid.sh $RPM_BUILD_ROOT/opt/hc/lib/platform/exadata/check_exadata_megaraid.sh +cp ../SOURCES/opt/hc/lib/platform/exadata/check_exadata_zfs_cluster.sh $RPM_BUILD_ROOT/opt/hc/lib/platform/exadata/check_exadata_zfs_cluster.sh cp ../SOURCES/opt/hc/lib/platform/exadata/check_exadata_zfs_logs.sh $RPM_BUILD_ROOT/opt/hc/lib/platform/exadata/check_exadata_zfs_logs.sh cp ../SOURCES/opt/hc/lib/platform/exadata/check_exadata_zfs_pool_usage.sh $RPM_BUILD_ROOT/opt/hc/lib/platform/exadata/check_exadata_zfs_pool_usage.sh cp ../SOURCES/opt/hc/lib/platform/exadata/check_exadata_zfs_services.sh $RPM_BUILD_ROOT/opt/hc/lib/platform/exadata/check_exadata_zfs_services.sh @@ -52,6 +53,7 @@ cp ../SOURCES/etc/opt/hc/check_exadata_cell_luns.conf.dist $RPM_BUILD_ROOT/etc/o cp ../SOURCES/etc/opt/hc/check_exadata_cell_megaraid.conf.dist $RPM_BUILD_ROOT/etc/opt/hc/check_exadata_cell_megaraid.conf.dist cp ../SOURCES/etc/opt/hc/check_exadata_cell_physicaldisks.conf.dist $RPM_BUILD_ROOT/etc/opt/hc/check_exadata_cell_physicaldisks.conf.dist cp ../SOURCES/etc/opt/hc/check_exadata_megaraid.conf.dist $RPM_BUILD_ROOT/etc/opt/hc/check_exadata_megaraid.conf.dist +cp ../SOURCES/etc/opt/hc/check_exadata_zfs_cluster.conf.dist $RPM_BUILD_ROOT/etc/opt/hc/check_exadata_zfs_cluster.conf.dist cp ../SOURCES/etc/opt/hc/check_exadata_zfs_logs.conf.dist $RPM_BUILD_ROOT/etc/opt/hc/check_exadata_zfs_logs.conf.dist cp ../SOURCES/etc/opt/hc/check_exadata_zfs_pool_usage.conf.dist $RPM_BUILD_ROOT/etc/opt/hc/check_exadata_zfs_pool_usage.conf.dist cp ../SOURCES/etc/opt/hc/check_exadata_zfs_services.conf.dist $RPM_BUILD_ROOT/etc/opt/hc/check_exadata_zfs_services.conf.dist @@ -104,6 +106,7 @@ echo "INFO: finished post-uninstall script" %attr(755, root, root) /opt/hc/lib/platform/exadata/check_exadata_cell_megaraid.sh %attr(755, root, root) /opt/hc/lib/platform/exadata/check_exadata_cell_physicaldisks.sh %attr(755, root, root) /opt/hc/lib/platform/exadata/check_exadata_megaraid.sh +%attr(755, root, root) /opt/hc/lib/platform/exadata/check_exadata_zfs_cluster.sh %attr(755, root, root) /opt/hc/lib/platform/exadata/check_exadata_zfs_logs.sh %attr(755, root, root) /opt/hc/lib/platform/exadata/check_exadata_zfs_pool_usage.sh %attr(755, root, root) /opt/hc/lib/platform/exadata/check_exadata_zfs_services.sh @@ -118,6 +121,7 @@ echo "INFO: finished post-uninstall script" %attr(644, root, root) /etc/opt/hc/check_exadata_cell_megaraid.conf.dist %attr(644, root, root) /etc/opt/hc/check_exadata_cell_physicaldisks.conf.dist %attr(644, root, root) /etc/opt/hc/check_exadata_megaraid.conf.dist +%attr(644, root, root) /etc/opt/hc/check_exadata_zfs_cluster.conf.dist %attr(644, root, root) /etc/opt/hc/check_exadata_zfs_logs.conf.dist %attr(644, root, root) /etc/opt/hc/check_exadata_zfs_pool_usage.conf.dist %attr(644, root, root) /etc/opt/hc/check_exadata_zfs_services.conf.dist @@ -126,6 +130,8 @@ echo "INFO: finished post-uninstall script" %changelog +* Fri Jul 07 2019 - 0.4.0 +- Added check_exadata_zfs_cluster * Fri May 14 2019 - 0.3.0 - Added include_exadata - Added plugin check_exadata_cell_alerts diff --git a/etc/opt/hc/check_exadata_zfs_cluster.conf.dist b/etc/opt/hc/check_exadata_zfs_cluster.conf.dist new file mode 100644 index 0000000..79ab1e1 --- /dev/null +++ b/etc/opt/hc/check_exadata_zfs_cluster.conf.dist @@ -0,0 +1,35 @@ +#****************************************************************************** +# @(#) check_exadata_zfs_cluster.conf +#****************************************************************************** +# This is a configuration file for the check_exadata_zfs_cluster HC plugin. +# All lines starting with a '#' are comment lines. +# [default: indicates hardcoded script values if no value is defined here] +#****************************************************************************** + +# specify whether to also log passed health checks +# (warning: this may rapidly grow the HC log) +# [default: no] +log_healthy="yes" + +# specify the user account for the SSH session to the ZFS appliance(s) +# [default: root] +ssh_user="" + +# specify the private key file for the SSH session to the ZFS appliance(s) +# [default: ~root/.ssh/id_rsa] +ssh_key_file="" + +# specify additional options for the SSH session to the ZFS appliance(s) +# [default: null] +ssh_opts="" + +# specify the ZFS hostname(s) to check the cluster states on +# Format: +# zfs: +# Examples: +# zfs:myzfs1 + + +#****************************************************************************** +# End of FILE +#****************************************************************************** diff --git a/opt/hc/lib/platform/exadata/check_exadata_zfs_cluster.sh b/opt/hc/lib/platform/exadata/check_exadata_zfs_cluster.sh new file mode 100644 index 0000000..6fd5ca4 --- /dev/null +++ b/opt/hc/lib/platform/exadata/check_exadata_zfs_cluster.sh @@ -0,0 +1,264 @@ +#!/usr/bin/env ksh +#****************************************************************************** +# @(#) check_exadata_zfs_cluster.sh +#****************************************************************************** +# @(#) Copyright (C) 2019 by KUDOS BVBA (info@kudos.be). All rights reserved. +# +# This program is a free software; you can redistribute it and/or modify +# it under the same terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details +#****************************************************************************** +# +# DOCUMENTATION (MAIN) +# ----------------------------------------------------------------------------- +# @(#) MAIN: check_exadata_zfs_cluster +# DOES: see _show_usage() +# EXPECTS: see _show_usage() +# REQUIRES: data_comma2space(), data_get_lvalue_from_config, dump_logs(), +# data_strip_outer_space(), init_hc(), linux_exec_ssh(), log_hc(), warn() +# +# @(#) HISTORY: +# @(#) 2019-07-05: initial version [Patrick Van der Veken] +# ----------------------------------------------------------------------------- +# DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING! +#****************************************************************************** + +# ----------------------------------------------------------------------------- +function check_exadata_zfs_cluster +{ +# ------------------------- CONFIGURATION starts here ------------------------- +typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf" +typeset _VERSION="2019-07-05" # YYYY-MM-DD +typeset _SUPPORTED_PLATFORMS="Linux" # uname -s match +# cluster query script -- DO NOT CHANGE -- +# state=AKCS_CLUSTERED +# link=clustron3_ng3:0/clustron_uart:0 = AKCIOS_ACTIVE +# link=clustron3_ng3:0/clustron_uart:1 = AKCIOS_ACTIVE +# link=clustron3_ng3:0/dlpi:0 = AKCIOS_ACTIVE +typeset _ZFS_SCRIPT=" + script + run('configuration cluster'); + printf('state=%s\n', get('state')); + var links = run('links'); + var links_array = links.split('\n'); + for (var i = 0; i < links_array.length; ++i) { + if (links_array[i] != '') { + printf('link=%s\n', links_array[i].replace(/^\s+|\s+$/g,'')); + } + }" +# target state of the cluster +typeset _CLUSTER_TARGET="AKCS_CLUSTERED" +# target state of the cluster links +typeset _LINK_TARGET="AKCIOS_ACTIVE" +# ------------------------- CONFIGURATION ends here --------------------------- + +# set defaults +(( ARG_DEBUG > 0 && ARG_DEBUG_LEVEL > 0 )) && set ${DEBUG_OPTS} +init_hc "$0" "${_SUPPORTED_PLATFORMS}" "${_VERSION}" +typeset _ARGS=$(data_comma2space "$*") +typeset _ARG="" +typeset _MSG="" +typeset _STC=0 +typeset _CFG_HEALTHY="" +typeset _LOG_HEALTHY=0 +typeset _CFG_SSH_KEY_FILE="" +typeset _CFG_SSH_OPTS="" +typeset _CFG_SSH_USER="" +typeset _CFG_SPACE_THRESHOLD="" +typeset _CFG_ZFS_HOSTS="" +typeset _CFG_ZFS_HOST="" +typeset _CFG_ZFS_LINE="" +typeset _SSH_BIN="" +typeset _SSH_OUTPUT="" +typeset _ZFS_DATA="" + +# handle arguments (originally comma-separated) +for _ARG in ${_ARGS} +do + case "${_ARG}" in + help) + _show_usage $0 ${_VERSION} ${_CONFIG_FILE} && return 0 + ;; + esac +done + +# handle configuration file +[[ -n "${ARG_CONFIG_FILE}" ]] && _CONFIG_FILE="${ARG_CONFIG_FILE}" +if [[ ! -r ${_CONFIG_FILE} ]] +then + warn "unable to read configuration file at ${_CONFIG_FILE}" + return 1 +fi +# read configuration values +_CFG_HEALTHY=$(_CONFIG_FILE="${_CONFIG_FILE}" data_get_lvalue_from_config 'log_healthy') +case "${_CFG_HEALTHY}" in + yes|YES|Yes) + _LOG_HEALTHY=1 + ;; + *) + # do not override hc_arg + (( _LOG_HEALTHY > 0 )) || _LOG_HEALTHY=0 + ;; +esac +_CFG_SSH_USER=$(_CONFIG_FILE="${_CONFIG_FILE}" data_get_lvalue_from_config 'ssh_user') +if [[ -z "${_CFG_SSH_USER}" ]] +then + _CFG_SSH_USER="root" +fi +_CFG_SSH_KEY_FILE=$(_CONFIG_FILE="${_CONFIG_FILE}" data_get_lvalue_from_config 'ssh_key_file') +_CFG_SSH_OPTS=$(_CONFIG_FILE="${_CONFIG_FILE}" data_get_lvalue_from_config 'ssh_opts') +# add quiet mode +_CFG_SSH_OPTS="${_CFG_SSH_OPTS} -q" +if [[ -n "${_CFG_SSH_KEY_FILE}" ]] +then + if [[ -r "${_CFG_SSH_KEY_FILE}" ]] + then + log "will use SSH key ${_CFG_SSH_KEY_FILE}" + _CFG_SSH_OPTS="${_CFG_SSH_OPTS} -i ${_CFG_SSH_KEY_FILE}" + else + warn "will use SSH key ${_CFG_SSH_KEY_FILE}, but file does not exist" + return 1 + fi +fi + +# log_healthy +(( ARG_LOG_HEALTHY > 0 )) && _LOG_HEALTHY=1 +if (( _LOG_HEALTHY > 0 )) +then + if (( ARG_LOG > 0 )) + then + log "logging/showing passed health checks" + else + log "showing passed health checks (but not logging)" + fi +else + log "not logging/showing passed health checks" +fi + +# check ssh +_SSH_BIN="$(command -v ssh 2>>${HC_STDERR_LOG})" +if [[ ! -x ${_SSH_BIN} || -z "${_SSH_BIN}" ]] +then + warn "SSH is not installed here" + return 1 +fi + +# gather ZFS hostnames (for this we need at least one data line, possibly with wildcards) +_CFG_ZFS_HOSTS=$(grep -i -E -e '^zfs:' ${_CONFIG_FILE} 2>/dev/null | cut -f2 -d':' 2>/dev/null | sort -u 2>/dev/null) +if [[ -z "${_CFG_ZFS_HOSTS}" ]] +then + warn "no monitoring rules defined in ${_CONFIG_FILE}" + return 1 +fi + +# gather ZFS usage data +print "${_CFG_ZFS_HOSTS}" | while read -r _CFG_ZFS_HOST +do + (( ARG_DEBUG > 0 )) && debug "executing remote ZFS script on ${_CFG_ZFS_HOST}" + _SSH_OUTPUT=$(linux_exec_ssh "${_CFG_SSH_OPTS}" "${_CFG_SSH_USER}" "${_CFG_ZFS_HOST}" "${_ZFS_SCRIPT}" 2>>${HC_STDERR_LOG}) + # shellcheck disable=SC2181 + if (( $? > 0 )) || [[ -z "${_SSH_OUTPUT}" ]] + then + warn "unable to discover usage data on ${_CFG_ZFS_HOST}" + (( ARG_DEBUG > 0 && ARG_DEBUG_LEVEL > 0 )) && dump_logs + continue + else + # mangle SSH output by prefixing with hostname + print "${_SSH_OUTPUT}" | while read -r _SSH_LINE + do + if [[ -z "${_ZFS_DATA}" ]] + then + _ZFS_DATA="${_CFG_ZFS_HOST}#${_SSH_LINE}" + else + # shellcheck disable=SC1117 + _ZFS_DATA=$(printf "%s\n%s#%s" "${_ZFS_DATA}" "${_CFG_ZFS_HOST}" "${_SSH_LINE}") + fi + done + fi +done + +# process usage status data +if [[ -z "${_ZFS_DATA}" ]] +then + _MSG="did not discover any ZFS share data" + _STC=2 + if (( _LOG_HEALTHY > 0 || _STC > 0 )) + then + log_hc "$0" ${_STC} "${_MSG}" + fi + return 1 +fi +print "${_ZFS_DATA}" | while IFS='#' read -r _ZFS_HOST _CLUSTER_LINE +do + (( ARG_DEBUG > 0 )) && debug "parsing cluster data for appliance: ${_ZFS_HOST}" + + # split up cluster data & perform checks + case "${_CLUSTER_LINE}" in + link=*) + _LINK_STATE=$(data_strip_outer_space "$(print "${_CLUSTER_LINE}" | cut -f3 -d'=' 2>/dev/null)") + + if [[ "${_LINK_STATE}" != "${_LINK_TARGET}" ]] + then + _MSG="${_ZFS_HOST} cluster link state is NOK ([${_LINK_STATE}!=${_LINK_TARGET})" + _STC=1 + else + _MSG="${_ZFS_HOST} cluster link state is OK (${_LINK_STATE}==${_LINK_TARGET})" + _STC=0 + fi + if (( _LOG_HEALTHY > 0 || _STC > 0 )) + then + log_hc "$0" ${_STC} "${_MSG}" "${_LINK_STATE}" "${_LINK_TARGET}" + fi + ;; + state=*) + _CLUSTER_STATE=$(print "${_CLUSTER_LINE##state=}") + + if [[ "${_CLUSTER_STATE}" != "${_CLUSTER_TARGET}" ]] + then + _MSG="${_ZFS_HOST} cluster state is NOK (${_CLUSTER_STATE}!=${_CLUSTER_TARGET})" + _STC=1 + else + _MSG="${_ZFS_HOST} cluster state is OK (${_CLUSTER_STATE}==${_CLUSTER_TARGET})" + _STC=0 + fi + if (( _LOG_HEALTHY > 0 || _STC > 0 )) + then + log_hc "$0" ${_STC} "${_MSG}" "${_CLUSTER_STATE}" "${_CLUSTER_TARGET}" + fi + ;; + esac +done + +return 0 +} + +# ----------------------------------------------------------------------------- +function _show_usage +{ +cat <<- EOT +NAME : $1 +VERSION : $2 +CONFIG : $3 with parameters: + log_healthy= + ssh_user= + ssh_key_file= + ssh_opts= + and formatted stanzas of: + zfs: +PURPOSE : Checks the state of the cluster and its links + CLI: zfs > configuration > cluster > show +LOG HEALTHY : Supported + +EOT + +return 0 +} + +#****************************************************************************** +# END of script +#****************************************************************************** diff --git a/opt/hc/lib/platform/exadata/check_exadata_zfs_logs.sh b/opt/hc/lib/platform/exadata/check_exadata_zfs_logs.sh index e366f1a..0f6ab3c 100755 --- a/opt/hc/lib/platform/exadata/check_exadata_zfs_logs.sh +++ b/opt/hc/lib/platform/exadata/check_exadata_zfs_logs.sh @@ -26,6 +26,7 @@ # @(#) 2019-02-18: initial version [Patrick Van der Veken] # @(#) 2019-03-16: replace 'which' [Patrick Van der Veken] # @(#) 2019-05-14: _STC fix [Patrick Van der Veken] +# @(#) 2019-07-05: help fix [Patrick Van der Veken] # ----------------------------------------------------------------------------- # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING! #****************************************************************************** @@ -35,7 +36,7 @@ function check_exadata_zfs_logs { # ------------------------- CONFIGURATION starts here ------------------------- typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf" -typeset _VERSION="2019-05-14" # YYYY-MM-DD +typeset _VERSION="2019-07-05" # YYYY-MM-DD typeset _SUPPORTED_PLATFORMS="Linux" # uname -s match # ------------------------- CONFIGURATION ends here --------------------------- @@ -454,6 +455,7 @@ CONFIG : $3 with parameters: log_healthy= ssh_user= ssh_key_file= + ssh_opts= and formatted stanzas of: zfs::: PURPOSE : Checks the ZFS logs for (new) entries with particular alert level(s) diff --git a/opt/hc/lib/platform/exadata/check_exadata_zfs_pool_usage.sh b/opt/hc/lib/platform/exadata/check_exadata_zfs_pool_usage.sh index da9e366..f1f31f9 100644 --- a/opt/hc/lib/platform/exadata/check_exadata_zfs_pool_usage.sh +++ b/opt/hc/lib/platform/exadata/check_exadata_zfs_pool_usage.sh @@ -25,6 +25,7 @@ # @(#) HISTORY: # @(#) 2019-04-12: initial version [Patrick Van der Veken] # @(#) 2019-05-14: small fixes [Patrick Van der Veken] +# @(#) 2019-07-05: help fix [Patrick Van der Veken] # ----------------------------------------------------------------------------- # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING! #****************************************************************************** @@ -34,7 +35,7 @@ function check_exadata_zfs_pool_usage { # ------------------------- CONFIGURATION starts here ------------------------- typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf" -typeset _VERSION="2019-05-14" # YYYY-MM-DD +typeset _VERSION="2019-07-05" # YYYY-MM-DD typeset _SUPPORTED_PLATFORMS="Linux" # uname -s match # usage query script -- DO NOT CHANGE -- # prj1:share1:16 @@ -277,6 +278,7 @@ CONFIG : $3 with parameters: log_healthy= ssh_user= ssh_key_file= + ssh_opts= max_space_usage= and formatted stanzas of: zfs::: diff --git a/opt/hc/lib/platform/exadata/check_exadata_zfs_services.sh b/opt/hc/lib/platform/exadata/check_exadata_zfs_services.sh index b6b7a22..fae5e29 100755 --- a/opt/hc/lib/platform/exadata/check_exadata_zfs_services.sh +++ b/opt/hc/lib/platform/exadata/check_exadata_zfs_services.sh @@ -26,6 +26,7 @@ # @(#) 2019-02-18: initial version [Patrick Van der Veken] # @(#) 2019-03-16: replace 'which' [Patrick Van der Veken] # @(#) 2019-05-14: small fixes [Patrick Van der Veken] +# @(#) 2019-07-05: help fix [Patrick Van der Veken] # ----------------------------------------------------------------------------- # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING! #****************************************************************************** @@ -35,7 +36,7 @@ function check_exadata_zfs_services { # ------------------------- CONFIGURATION starts here ------------------------- typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf" -typeset _VERSION="2019-05-14" # YYYY-MM-DD +typeset _VERSION="2019-07-05" # YYYY-MM-DD typeset _SUPPORTED_PLATFORMS="Linux" # uname -s match # usage query script -- DO NOT CHANGE -- # svc1:online @@ -244,6 +245,7 @@ CONFIG : $3 with parameters: log_healthy= ssh_user= ssh_key_file= + ssh_opts= and formatted stanzas of: zfs::: PURPOSE : Checks the state of services for the configured ZFS hosts/shares diff --git a/opt/hc/lib/platform/exadata/check_exadata_zfs_share_replication.sh b/opt/hc/lib/platform/exadata/check_exadata_zfs_share_replication.sh index 008d3ec..8d72eca 100755 --- a/opt/hc/lib/platform/exadata/check_exadata_zfs_share_replication.sh +++ b/opt/hc/lib/platform/exadata/check_exadata_zfs_share_replication.sh @@ -28,6 +28,7 @@ # @(#) 2019-03-16: replace 'which' [Patrick Van der Veken] # @(#) 2019-04-12: small fixes [Patrick Van der Veken] # @(#) 2019-05-14: small fixes [Patrick Van der Veken] +# @(#) 2019-07-05: help fix [Patrick Van der Veken] # ----------------------------------------------------------------------------- # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING! #****************************************************************************** @@ -37,7 +38,7 @@ function check_exadata_zfs_share_replication { # ------------------------- CONFIGURATION starts here ------------------------- typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf" -typeset _VERSION="2019-05-14" # YYYY-MM-DD +typeset _VERSION="2019-07-05" # YYYY-MM-DD typeset _SUPPORTED_PLATFORMS="Linux" # uname -s match # replication query script -- DO NOT CHANGE -- # prj1/share1:true:idle:success:111 @@ -327,6 +328,7 @@ CONFIG : $3 with parameters: log_healthy= ssh_user= ssh_key_file= + ssh_opts= max_replication_lag= and formatted stanzas of: zfs::::: diff --git a/opt/hc/lib/platform/exadata/check_exadata_zfs_share_usage.sh b/opt/hc/lib/platform/exadata/check_exadata_zfs_share_usage.sh index 88064c8..9f1bd9b 100755 --- a/opt/hc/lib/platform/exadata/check_exadata_zfs_share_usage.sh +++ b/opt/hc/lib/platform/exadata/check_exadata_zfs_share_usage.sh @@ -28,6 +28,7 @@ # @(#) 2019-04-09: fix bad math in ZFS script & HC message [Patrick Van der Veken] # @(#) 2019-04-12: small fixes [Patrick Van der Veken] # @(#) 2019-05-14: small fixes [Patrick Van der Veken] +# @(#) 2019-07-05: help fix [Patrick Van der Veken] # ----------------------------------------------------------------------------- # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING! #****************************************************************************** @@ -37,7 +38,7 @@ function check_exadata_zfs_share_usage { # ------------------------- CONFIGURATION starts here ------------------------- typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf" -typeset _VERSION="2019-05-14" # YYYY-MM-DD +typeset _VERSION="2019-07-05" # YYYY-MM-DD typeset _SUPPORTED_PLATFORMS="Linux" # uname -s match # usage query script -- DO NOT CHANGE -- # prj1:share1:16 @@ -289,6 +290,7 @@ CONFIG : $3 with parameters: log_healthy= ssh_user= ssh_key_file= + ssh_opts= max_space_usage= and formatted stanzas of: zfs::::