check-msdefender 1.1.8__tar.gz → 1.1.9__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/PKG-INFO +1 -1
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/__init__.py +1 -1
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/core/nagios.py +1 -1
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/services/machines_service.py +4 -2
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/pyproject.toml +1 -1
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/integration/test_cli_integration.py +3 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/LICENSE +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/README.md +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/__main__.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/check_msdefender.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/cli/__init__.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/cli/__main__.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/cli/commands/__init__.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/cli/commands/alerts.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/cli/commands/detail.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/cli/commands/lastseen.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/cli/commands/machines.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/cli/commands/onboarding.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/cli/commands/products.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/cli/commands/vulnerabilities.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/cli/decorators.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/cli/handlers.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/core/__init__.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/core/auth.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/core/config.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/core/defender.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/core/exceptions.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/core/logging_config.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/services/__init__.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/services/alerts_service.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/services/detail_service.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/services/lastseen_service.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/services/models.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/services/onboarding_service.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/services/products_service.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/services/vulnerabilities_service.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/__init__.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/fixtures/__init__.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/fixtures/alerts_data.json +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/fixtures/machine_data.json +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/fixtures/mock_defender_client.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/fixtures/test_alerts_service.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/fixtures/test_detail_service.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/fixtures/test_lastseen_service.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/fixtures/test_onboarding_service.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/fixtures/test_vulnerabilities_service.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/fixtures/vulnerability_data.json +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/integration/__init__.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/integration/test_lastseen_integration.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/unit/__init__.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/unit/test_alerts_service.py +0 -0
- {check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/unit/test_detail_service.py +0 -0
|
@@ -116,7 +116,7 @@ class NagiosPlugin:
|
|
|
116
116
|
) -> int:
|
|
117
117
|
"""Execute the check and return Nagios exit code."""
|
|
118
118
|
try:
|
|
119
|
-
result = self.service.get_result()
|
|
119
|
+
result = self.service.get_result(machine_id=machine_id, dns_name=dns_name)
|
|
120
120
|
value = result["value"]
|
|
121
121
|
details = result.get("details", [])
|
|
122
122
|
|
{check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/services/machines_service.py
RENAMED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"""Machines service implementation."""
|
|
2
2
|
|
|
3
|
-
from typing import Dict, List, Any
|
|
3
|
+
from typing import Dict, List, Any, Optional
|
|
4
4
|
|
|
5
5
|
from check_msdefender.core.logging_config import get_verbose_logger
|
|
6
6
|
|
|
@@ -13,7 +13,9 @@ class MachinesService:
|
|
|
13
13
|
self.defender = defender_client
|
|
14
14
|
self.logger = get_verbose_logger(__name__, verbose_level)
|
|
15
15
|
|
|
16
|
-
def get_result(
|
|
16
|
+
def get_result(
|
|
17
|
+
self, machine_id: Optional[str] = None, dns_name: Optional[str] = None
|
|
18
|
+
) -> Dict[str, Any]:
|
|
17
19
|
"""Get machine count result with value and details."""
|
|
18
20
|
self.logger.method_entry("get_result")
|
|
19
21
|
|
|
@@ -301,6 +301,7 @@ class TestDetailCommand:
|
|
|
301
301
|
assert "DEFENDER OK - Machine ID:" in result.output
|
|
302
302
|
assert "test-machine" in result.output
|
|
303
303
|
mock_service_instance.get_result.assert_called_once_with(
|
|
304
|
+
machine_id="test-machine-123", dns_name=None
|
|
304
305
|
)
|
|
305
306
|
|
|
306
307
|
@patch("check_msdefender.cli.commands.detail.load_config")
|
|
@@ -331,6 +332,7 @@ class TestDetailCommand:
|
|
|
331
332
|
assert result.exit_code == 0
|
|
332
333
|
assert "DEFENDER OK - Machine ID:" in result.output
|
|
333
334
|
mock_service_instance.get_result.assert_called_once_with(
|
|
335
|
+
machine_id="test-machine-456", dns_name=None
|
|
334
336
|
)
|
|
335
337
|
|
|
336
338
|
@patch("check_msdefender.cli.commands.detail.load_config")
|
|
@@ -362,6 +364,7 @@ class TestDetailCommand:
|
|
|
362
364
|
assert "DEFENDER OK - Machine ID:" in result.output
|
|
363
365
|
assert "test.domain.com" in result.output
|
|
364
366
|
mock_service_instance.get_result.assert_called_once_with(
|
|
367
|
+
machine_id=None, dns_name="test.domain.com"
|
|
365
368
|
)
|
|
366
369
|
|
|
367
370
|
@patch("check_msdefender.cli.commands.detail.load_config")
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/cli/commands/onboarding.py
RENAMED
|
File without changes
|
|
File without changes
|
{check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/cli/commands/vulnerabilities.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/services/alerts_service.py
RENAMED
|
File without changes
|
{check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/services/detail_service.py
RENAMED
|
File without changes
|
{check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/services/lastseen_service.py
RENAMED
|
File without changes
|
|
File without changes
|
{check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/services/onboarding_service.py
RENAMED
|
File without changes
|
{check_msdefender-1.1.8 → check_msdefender-1.1.9}/check_msdefender/services/products_service.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/fixtures/test_vulnerabilities_service.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{check_msdefender-1.1.8 → check_msdefender-1.1.9}/tests/integration/test_lastseen_integration.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|