Skip to content

Added service label cmk/mssql_recovery_type for mssql_backup services #949

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

Open
lbuhleie wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −9
Open

Added service label cmk/mssql_recovery_type for mssql_backup services #949

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 34 additions & 9 deletions cmk/plugins/mssql/agent_based/backup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
render,
Result,
Service,
ServiceLabel,
State,
StringTable,
)
Expand Down Expand Up @@ -62,7 +63,8 @@ class Backup(NamedTuple):
state: str


Section = Mapping[str, Sequence[Backup]]
SectionBackup = Mapping[str, Sequence[Backup]]
SectionDatabases = dict[str, dict[str, str]]


_MAP_BACKUP_TYPES = {
Expand Down Expand Up @@ -103,7 +105,7 @@ def _get_word(line: Sequence[str], idx: int) -> str | None:
return None


def parse_mssql_backup(string_table: StringTable) -> Section:
def parse_mssql_backup(string_table: StringTable) -> SectionBackup:
parsed: dict[str, list[Backup]] = {}

line: Sequence[str | None]
Expand Down Expand Up @@ -133,15 +135,37 @@ def parse_mssql_backup(string_table: StringTable) -> Section:
)


def discover_mssql_backup(params: Mapping[str, Any], section: Section) -> DiscoveryResult:
def discover_mssql_backup(
params: Mapping[str, Any],
section_mssql_backup: SectionBackup | None,
section_mssql_databases: SectionDatabases | None,
) -> DiscoveryResult:
if params["mode"] != "summary":
return
for db_name in section:
yield Service(item=db_name)
for db_name in section_mssql_backup:
try:
yield Service(
item=db_name,
labels=[
ServiceLabel(
name="cmk/mssql_recovery_type",
value=section_mssql_databases.get(db_name.split("MSSQL_")[1]).get(
"Recovery"
),
)
],
)
except Exception:
yield Service(item=db_name)


def check_mssql_backup(item: str, params: Mapping[str, Any], section: Section) -> CheckResult:
data = section.get(item)
def check_mssql_backup(
item: str,
params: Mapping[str, Any],
section_mssql_backup: SectionBackup | None,
section_mssql_databases: SectionDatabases | None,
) -> CheckResult:
data = section_mssql_backup.get(item)
if data is None:
# Assume general connection problem to the database, which is reported
# by the "X Instance" service and skip this check.
Expand Down Expand Up @@ -186,6 +210,7 @@ def check_mssql_backup(item: str, params: Mapping[str, Any], section: Section) -

check_plugin_mssql_backup = CheckPlugin(
name="mssql_backup",
sections=["mssql_backup", "mssql_databases"],
service_name="MSSQL %s Backup",
discovery_function=discover_mssql_backup,
discovery_ruleset_name="discovery_mssql_backup",
Expand Down Expand Up @@ -222,7 +247,7 @@ def _mssql_backup_per_type_item(db_name: str, backup: Backup) -> str:
return f"{db_name} {backup.type.title()}"


def discover_mssql_backup_per_type(params: Mapping[str, Any], section: Section) -> DiscoveryResult:
def discover_mssql_backup_per_type(params: Mapping[str, Any], section: SectionBackup) -> DiscoveryResult:
if params["mode"] != "per_type":
return
for db_name, attrs in section.items():
Expand All @@ -231,7 +256,7 @@ def discover_mssql_backup_per_type(params: Mapping[str, Any], section: Section)


def check_mssql_backup_per_type(
item: str, params: Mapping[str, Any], section: Section
item: str, params: Mapping[str, Any], section: SectionBackup
) -> CheckResult:
for db_name, attrs in section.items():
for backup in attrs:
Expand Down
Loading