mirror/github-octodns
1
0
Fork 0
mirror of https://github.com/github/octodns.git synced 2024-05-11 05:55:00 +00:00
Code Issues Releases Activity

Merge pull request #817 from octodns/ns1-rapid-recheck

Browse Source 
Rapid recheck for NS1 monitors
This commit is contained in:
Ross McFarland
2021-12-04 12:05:57 -08:00
committed by GitHub
parent ec1be7b6f5 85eeec988c
commit ab9b958acd
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/dynamic_records.md
View File

@@ -207,6 +207,7 @@ Sonar check regions (sonar_regions) possible values:
| frequency | Frequency (in seconds) of health-check | 60 |
| connect_timeout | Timeout (in seconds) before we give up trying to connect | 2 |
| response_timeout | Timeout (in seconds) after connecting to wait for output | 10 |
| rapid_recheck | Enable or disable a second, automatic verification test before changing the status of a host. Enabling this option can help prevent false positives. | False |
```yaml
@@ -218,4 +219,5 @@ Sonar check regions (sonar_regions) possible values:
frequency: 60
connect_timeout: 2
response_timeout: 10
rapid_recheck: True
```

9
octodns/provider/ns1.py
View File

@@ -1068,6 +1068,11 @@ class Ns1Provider(BaseProvider):
.get('healthcheck', {}) \
.get('frequency', 60)
def _healthcheck_rapid_recheck(self, record):
return record._octodns.get('ns1', {}) \
.get('healthcheck', {}) \
.get('rapid_recheck', False)
def _healthcheck_connect_timeout(self, record):
return record._octodns.get('ns1', {}) \
.get('healthcheck', {}) \
@@ -1101,7 +1106,6 @@ class Ns1Provider(BaseProvider):
self._healthcheck_response_timeout(record) * 1000,
'ssl': record.healthcheck_protocol == 'HTTPS',
},
'frequency': self._healthcheck_frequency(record),
'job_type': 'tcp',
'name': f'{host} - {_type} - {value}',
'notes': self._encode_notes({
@@ -1109,7 +1113,8 @@ class Ns1Provider(BaseProvider):
'type': _type,
}),
'policy': self._healthcheck_policy(record),
'rapid_recheck': False,
'frequency': self._healthcheck_frequency(record),
'rapid_recheck': self._healthcheck_rapid_recheck(record),
'region_scope': 'fixed',
'regions': self.monitor_regions,
}

4
tests/test_octodns_provider_ns1.py
View File

@@ -933,6 +933,10 @@ class TestNs1ProviderDynamic(TestCase):
monitor = provider._monitor_gen(record, value)
self.assertEquals(300, monitor['frequency'])
record._octodns['ns1']['healthcheck']['rapid_recheck'] = True
monitor = provider._monitor_gen(record, value)
self.assertTrue(monitor['rapid_recheck'])
record._octodns['ns1']['healthcheck']['connect_timeout'] = 1
monitor = provider._monitor_gen(record, value)
self.assertEquals(1000, monitor['config']['connect_timeout'])