Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Host ping #66

Merged
merged 2 commits into from
May 24, 2023
Merged

Host ping #66

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee60ee0
Fix typo
jonhattan May 23, 2023
a0192d4
Add PING[4|6] tests
jonhattan May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions lib/puppet/functions/monit_validate_tests.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
'FILESYSTEM' => [
'FSFLAGS', 'SPACE', 'INODE', 'PERM', 'PERMISSION'
],
'HOST' => ['CONNECTION'],
'HOST' => ['CONNECTION', 'PING', 'PING4', 'PING6'],
'NETWORK' => ['LINK', 'LINK DOWN', 'LINK UP'], # See https://mmonit.com/monit/changes/#5.28.0
'PROCESS' => RESOURCE_TESTS + ['CONNECTION', 'UPTIME'],
'PROGRAM' => ['STATUS'],
Expand Down Expand Up @@ -90,32 +90,52 @@ def validate(check_type, tests)
test['action'] = 'ALERT'
end

# "<type> <operator> <value>" CONDITIONS
# "<type> <operator> <value>" CONDITION
if (RESOURCE_TESTS.include? test['type']) || (['SPACE', 'INODE', 'STATUS', 'UPTIME'].include? test['type'])
raise Puppet::ParseError, exception_prefix + "'operator' is mandatory" unless test.key? 'operator'
raise Puppet::ParseError, exception_prefix + "invalid operator: #{test['operator']}" unless RESOURCE_TESTS_OPERATORS.include? test['operator']
raise Puppet::ParseError, exception_prefix + "'value' is mandatory" unless test.key? 'value'
test['operator'] = test['operator'].upcase
test['condition'] = "#{test['type']} #{test['operator']} #{test['value']}"

# "CHANGED <type>" CONDITIONS
# "CHANGED <type>" CONDITION
elsif ['FSFLAGS'].include? test['type']
test['condition'] = "CHANGED #{test['type']}"

# "FAILED <type> <value>" CONDITIONS
# "FAILED <type> <value>" CONDITION
elsif ['PERM', 'PERMISSION', 'UID', 'GID'].include? test['type']
raise Puppet::ParseError, exception_prefix + "'value' is mandatory" unless test.key? 'value'
test['condition'] = "FAILED #{test['type']} #{test['value']}"

# "FAILED <type>" CONDITIONS
# "FAILED <type>" CONDITION
elsif ['CHECKSUM', 'LINK'].include? test['type']
test['condition'] = "FAILED #{test['type']}"

# "<type>" CONDITIONS
# "<type>" CONDITION
elsif ['EXIST', 'LINK UP', 'LINK DOWN'].include? test['type']
test['condition'] = test['type']

# CONNECTION TESTING
# PING[4|6] CONDITION
elsif ['PING', 'PING4', 'PING6'].include? test['type']
condition = "#{test.fetch(:condition, 'FAILED').upcase} #{test['type']}"
if test.key? 'count'
condition += " COUNT #{test['count']}"
end
if test.key? 'size'
condition += " SIZE #{test['size']}"
end
if test.key? 'responsetime'
condition += " RESPONSETIME #{test['responsetime']}"
end
if test.key? 'timeout'
condition += " TIMEOUT #{test['timeout']} SECONDS"
end
if test.key? 'address'
condition += " ADDRESS #{test['address']}"
end
test['condition'] = condition

# CONNECTION CONDITION
elsif test['type'] == 'CONNECTION'
raise Puppet::ParseError, exception_prefix + "'port' or 'unixsocket' is mandatory" unless (test.key? 'port') || (test.key? 'unixsocket')
condition = 'FAILED'
Expand Down