Skip to content

Commit

Permalink
Merge pull request #1758 from jrha/indentation-icinga
Browse files Browse the repository at this point in the history 
ncm-icinga: Cleanup pan templates
  • Loading branch information
@wpoely86
wpoely86 authored Dec 9, 2024
2 parents f2bd56e + 177fa60 commit d98b5e4
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 32 deletions.
2 changes: 1 addition & 1 deletion ncm-icinga/src/main/pan/components/icinga/functions.pan
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function icinga_check_service_name = {
v = ARGV[0];
foreach(key; val; v) {
if (! match (unescape(key), '^[\w. -]+$')) {
error(format('Icinga service name "%s" contains invalid characters.', unescape(key)));
error('Icinga service name "%s" contains invalid characters.', unescape(key));
};
};
true;
Expand Down
74 changes: 43 additions & 31 deletions ncm-icinga/src/main/pan/components/icinga/schema.pan
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,36 +10,45 @@ include 'pan/types';

# Please note that the "use" directive is not supported in order to make
# validation code easier. If you want hosts to inherit settings then use
# Pan statements like create ("...") or value ("...")
# Pan statements like create("...") or value("...")

type icinga_hoststring = string with exists ("/software/components/icinga/hosts/" + SELF) ||
SELF == "*" || SELF == 'dummy';
type icinga_hoststring = string with {
exists("/software/components/icinga/hosts/" + SELF) || SELF == "*" || SELF == 'dummy';
};

type icinga_hostgroupstring = string with exists ("/software/components/icinga/hostgroups/" + escape(SELF)) ||
SELF == "*";
type icinga_hostgroupstring = string with {
exists("/software/components/icinga/hostgroups/" + escape(SELF)) || SELF == "*";
};

type icinga_commandstrings = string [] with exists ("/software/components/icinga/commands/" + SELF[0]);
type icinga_commandstrings = string [] with {
exists("/software/components/icinga/commands/" + SELF[0]);
};

type icinga_timeperiodstring = string with exists ("/software/components/icinga/timeperiods/" + SELF) ||
SELF == "*";
type icinga_timeperiodstring = string with {
exists("/software/components/icinga/timeperiods/" + SELF) || SELF == "*";
};

type icinga_contactgroupstring = string with exists ("/software/components/icinga/contactgroups/" + SELF) ||
SELF == "*";
type icinga_contactgroupstring = string with {
exists("/software/components/icinga/contactgroups/" + SELF) || SELF == "*";
};

type icinga_contactstring = string with exists ("/software/components/icinga/contacts/" + SELF) ||
SELF == "*";
type icinga_contactstring = string with {
exists("/software/components/icinga/contacts/" + SELF) || SELF == "*";
};

type icinga_servicegroupstring = string with exists ("/software/components/icinga/servicegroups/" + SELF) ||
SELF == "*";
type icinga_servicegroupstring = string with {
exists("/software/components/icinga/servicegroups/" + SELF) || SELF == "*";
};

type icinga_servicestring = string with exists ("/software/components/icinga/services/" + SELF) ||
SELF == "*";
type icinga_servicestring = string with {
exists("/software/components/icinga/services/" + SELF) || SELF == "*";
};

type icinga_service_notification_string = string with match (SELF, "^(w|u|c|r|f|n)$");
type icinga_host_notification_string = string with match (SELF, "^(d|u|r|f|n)$");
type icinga_stalking_string = string with match (SELF, "^(o|w|u|c)$");
type icinga_execution_failure_string = string with match (SELF, "^(o|w|u|c|p|n)$");
type icinga_notification_failure_string = string with match (SELF, "^(o|w|u|c|p|n)$");
type icinga_service_notification_string = string with match(SELF, "^(w|u|c|r|f|n)$");
type icinga_host_notification_string = string with match(SELF, "^(d|u|r|f|n)$");
type icinga_stalking_string = string with match(SELF, "^(o|w|u|c)$");
type icinga_execution_failure_string = string with match(SELF, "^(o|w|u|c|p|n)$");
type icinga_notification_failure_string = string with match(SELF, "^(o|w|u|c|p|n)$");

type structure_icinga_host_generic = {
"name" ? string # Used instead of alias when it s a template declaration
Expand All @@ -65,7 +74,7 @@ type structure_icinga_host_generic = {
"notification_period" : icinga_timeperiodstring
"notification_options" : icinga_host_notification_string []
"notifications_enabled" ? boolean
"stalking_options" ? string with match (SELF, "^(o|d|u)$")
"stalking_options" ? string with match(SELF, "^(o|d|u)$")
"register" : boolean = true
} = dict();

Expand Down Expand Up @@ -100,7 +109,7 @@ type structure_icinga_host = {
"notification_period" : icinga_timeperiodstring
"notification_options" : icinga_host_notification_string []
"notifications_enabled" ? boolean
"stalking_options" ? string with match (SELF, "^(o|d|u)$")
"stalking_options" ? string with match(SELF, "^(o|d|u)$")
"register" : boolean = true
"action_url" ? string
"notes" ? string[]
Expand Down Expand Up @@ -163,7 +172,7 @@ type structure_icinga_service = {
"register" : boolean = true
"failure_prediction_enabled" ? boolean
"action_url" ? string
} with icinga_has_host_or_hostgroup (SELF);
} with icinga_has_host_or_hostgroup(SELF);

# Servicegroup definition:
type structure_icinga_servicegroup = {
Expand All @@ -187,7 +196,7 @@ type structure_icinga_servicedependency = {
"execution_failure_criteria" ? icinga_execution_failure_string []
"notification_failure_criteria" ? icinga_notification_failure_string []
"dependency_period" ? icinga_timeperiodstring
} with icinga_has_host_or_hostgroup (SELF);
} with icinga_has_host_or_hostgroup(SELF);

# Contact definition
type structure_icinga_contact = {
Expand All @@ -210,8 +219,7 @@ type structure_icinga_contactgroup = {
} = dict();

# Time range definition
type icinga_timerange = string with
match (SELF, "^(([0-9]+:[0-9]+)-([0-9]+:[0-9]+),)*([0-9]+:[0-9]+)-([0-9]+:[0-9]+)$");
type icinga_timerange = string with match(SELF, "^(([0-9]+:[0-9]+)-([0-9]+:[0-9]+),)*([0-9]+:[0-9]+)-([0-9]+:[0-9]+)$");

# Time period definition
type structure_icinga_timeperiod = {
Expand All @@ -235,7 +243,7 @@ type structure_icinga_serviceextinfo = {
"action_url" ? type_absoluteURI
"icon_image" ? string
"icon_image_alt" ? string
} with icinga_has_host_or_hostgroup (SELF);
} with icinga_has_host_or_hostgroup(SELF);

# CGI configuration
type structure_icinga_cgi_cfg = {
Expand Down Expand Up @@ -322,7 +330,9 @@ type structure_icinga_icinga_cfg = {
"log_external_commands" : boolean = true
"log_passive_checks" : boolean = true
"log_external_commands_user" ? boolean = false with {
deprecated(0, 'removed in recent versions of icinga 1.X'); true; }
deprecated(0, 'removed in recent versions of icinga 1.X');
true;
}
"log_long_plugin_output" : boolean = false
"global_host_event_handler" ? string
"service_inter_check_delay_method" : string = "s"
Expand Down Expand Up @@ -422,11 +432,13 @@ type structure_icinga_icinga_cfg = {
"ochp_command" ? string
"use_timezone" ? string
"broker_module" ? string[] with {
deprecated(0, 'deprecated recent versions of icinga 1.X, use module instead'); true; }
deprecated(0, 'deprecated recent versions of icinga 1.X, use module instead');
true;
}
"module" ? string[]
"debug_file" ? string
"debug_level" ? long
"debug_verbosity" ? long (0..2)
"debug_verbosity" ? long(0..2)
"max_debug_file_size" ? long
"ocsp_command" ? string
"check_result_path" : string = "/var/icinga/checkresults"
Expand Down

0 comments on commit d98b5e4

Please sign in to comment.