fix(rapid7-insightidr): a partial region result is not a quiet period (v1.6.0)
An RRN states its region — rrn:alerts:eu:<org>:alert:… — while the base URL is built from the instance's configured `region`. Following that thread found a gap that matters more than the naming. The Alert Triage API is multi-region behind one gateway, and eleven of its endpoints can answer HTTP 200 with a region_failures list. The spec is explicit: the presence of items in that field IS the partial failure. Three of the commands here call such endpoints and all three read only the payload, so a region the gateway could not reach produced fewer alerts and nothing else — no error, no count, no log line. For an ingestion feed that is indistinguishable from a quiet period, which is the one failure mode this integration has now hit three separate times. So region_failures is carried into the run metadata by every command that can receive it, alongside the regions actually seen in the collected RRNs, the configured region, and any mismatch between them. The mismatch report is deliberately a report and not a correction. On a single-region tenant the two always agree. On a multi-customer key, which spans organizations, they need not — and rewriting the host per resource would be a guess about how Rapid7 routes these calls, made without a tenant to verify it against. Naming the discrepancy is what can be done honestly today; if it ever fires, the metadata says so instead of the alerts silently going missing. list_alert_fields already passed region_failures through untouched, since it returns the API response as it stands. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -14,6 +14,10 @@ def _cfg():
|
||||
return base, headers, multi
|
||||
|
||||
|
||||
def _cfg_region():
|
||||
return str(json.loads(os.environ.get("INTEGRATION_SECRETS", "{}")).get("region") or "us").strip().lower()
|
||||
|
||||
|
||||
def _inputs():
|
||||
return json.loads(os.environ.get("INTEGRATION_INPUTS", "{}"))
|
||||
|
||||
@@ -82,6 +86,32 @@ def _alert_rrn(a):
|
||||
return None
|
||||
|
||||
|
||||
def _rrn_region(rrn):
|
||||
"""The region segment of an RRN, or None.
|
||||
|
||||
An RRN is rrn:<service>:<region>:<org>:<type>:… — so a resource states which
|
||||
region it lives in, while the base URL is built from the instance's
|
||||
configured region. Those two agree on a single-region tenant and need not on
|
||||
a multi-customer key, which spans organizations.
|
||||
"""
|
||||
parts = str(rrn or "").split(":")
|
||||
return parts[2] if len(parts) > 4 and parts[0] == "rrn" and parts[2] else None
|
||||
|
||||
|
||||
def _collect_region_failures(out, sink):
|
||||
"""Carry a partial failure out of a response instead of dropping it.
|
||||
|
||||
The Alert Triage API answers HTTP 200 with a region_failures list when it
|
||||
could not reach one of the regions behind the request — the spec says the
|
||||
presence of items there IS the partial failure. Reading only the payload
|
||||
turns that into missing alerts with no error anywhere, which for an
|
||||
ingestion feed is indistinguishable from a quiet period.
|
||||
"""
|
||||
for f in (out.get("region_failures") or []):
|
||||
sink.append(f)
|
||||
return out
|
||||
|
||||
|
||||
def run():
|
||||
_, _, multi = _cfg()
|
||||
inp = _inputs()
|
||||
@@ -114,6 +144,7 @@ def run():
|
||||
# output with an alerts_error: losing the whole run over one of them, or
|
||||
# dropping it silently, would both be worse.
|
||||
rrns_by_inv, order, truncated, skipped = {}, [], False, 0
|
||||
region_failures, regions_seen = [], set()
|
||||
for inv in investigations:
|
||||
inv_rrn = inv.get("rrn") or ""
|
||||
if not inv_rrn:
|
||||
@@ -134,6 +165,9 @@ def run():
|
||||
skipped += 1
|
||||
continue
|
||||
got.append(rrn)
|
||||
r = _rrn_region(rrn)
|
||||
if r:
|
||||
regions_seen.add(r)
|
||||
if rrn not in order:
|
||||
order.append(rrn)
|
||||
rrns_by_inv[inv_rrn] = got
|
||||
@@ -146,7 +180,7 @@ def run():
|
||||
body = {"rrns": order[i:i + RRN_BATCH]}
|
||||
if field_ids:
|
||||
body["field_ids"] = field_ids
|
||||
out = request("POST", AT + "alerts/ops/rrns", body=body)
|
||||
out = _collect_region_failures(request("POST", AT + "alerts/ops/rrns", body=body), region_failures)
|
||||
for a in (out.get("alerts") or []):
|
||||
if a.get("rrn"):
|
||||
by_rrn[a["rrn"]] = a
|
||||
@@ -193,6 +227,13 @@ def run():
|
||||
"alerts_fetched": fetched,
|
||||
"alert_ids_without_rrn": skipped,
|
||||
"truncated": truncated,
|
||||
# HTTP 200 with a non-empty region_failures is a PARTIAL result:
|
||||
# alerts from that region are simply absent. Surfaced so a shrinking
|
||||
# feed has a cause attached to it.
|
||||
"region_failures": region_failures,
|
||||
"regions_seen": sorted(regions_seen),
|
||||
"configured_region": _cfg_region(),
|
||||
"region_mismatch": sorted(r for r in regions_seen if r != _cfg_region()),
|
||||
"elapsed_seconds": round(time.monotonic() - started, 1),
|
||||
},
|
||||
}))
|
||||
|
||||
@@ -79,6 +79,32 @@ def _terms(inp):
|
||||
return [{"field_ids": field_ids, "operator": op, "terms": values}]
|
||||
|
||||
|
||||
def _rrn_region(rrn):
|
||||
"""The region segment of an RRN, or None.
|
||||
|
||||
An RRN is rrn:<service>:<region>:<org>:<type>:… — so a resource states which
|
||||
region it lives in, while the base URL is built from the instance's
|
||||
configured region. Those two agree on a single-region tenant and need not on
|
||||
a multi-customer key, which spans organizations.
|
||||
"""
|
||||
parts = str(rrn or "").split(":")
|
||||
return parts[2] if len(parts) > 4 and parts[0] == "rrn" and parts[2] else None
|
||||
|
||||
|
||||
def _collect_region_failures(out, sink):
|
||||
"""Carry a partial failure out of a response instead of dropping it.
|
||||
|
||||
The Alert Triage API answers HTTP 200 with a region_failures list when it
|
||||
could not reach one of the regions behind the request — the spec says the
|
||||
presence of items there IS the partial failure. Reading only the payload
|
||||
turns that into missing alerts with no error anywhere, which for an
|
||||
ingestion feed is indistinguishable from a quiet period.
|
||||
"""
|
||||
for f in (out.get("region_failures") or []):
|
||||
sink.append(f)
|
||||
return out
|
||||
|
||||
|
||||
def run():
|
||||
inp = _inputs()
|
||||
limit = int(inp.get("limit") or 50)
|
||||
@@ -108,13 +134,16 @@ def run():
|
||||
|
||||
rrns_only = str(inp.get("rrns_only") or "").strip().lower() in ("1", "true", "yes")
|
||||
alerts, rrns, meta = [], [], {}
|
||||
region_failures = []
|
||||
index = int(inp.get("index") or 0)
|
||||
while len(alerts) + len(rrns) < limit:
|
||||
size = min(PAGE, limit - len(alerts) - len(rrns))
|
||||
out = request("POST", AT + "alerts/ops/search",
|
||||
params={"index": index, "size": size,
|
||||
"rrns_only": "true" if rrns_only else None},
|
||||
body=body)
|
||||
out = _collect_region_failures(
|
||||
request("POST", AT + "alerts/ops/search",
|
||||
params={"index": index, "size": size,
|
||||
"rrns_only": "true" if rrns_only else None},
|
||||
body=body),
|
||||
region_failures)
|
||||
meta = out.get("metadata") or {}
|
||||
page_alerts = out.get("alerts") or []
|
||||
page_rrns = out.get("rrns") or []
|
||||
@@ -124,6 +153,11 @@ def run():
|
||||
break
|
||||
index += 1
|
||||
|
||||
if not isinstance(meta, dict):
|
||||
meta = {}
|
||||
# A non-empty region_failures means alerts from that region are missing from
|
||||
# this page, on an otherwise successful response.
|
||||
meta["region_failures"] = region_failures
|
||||
result = {"metadata": meta}
|
||||
if rrns_only:
|
||||
result["rrns"] = rrns[:limit]
|
||||
|
||||
@@ -14,6 +14,10 @@ def _cfg():
|
||||
return base, headers, multi
|
||||
|
||||
|
||||
def _cfg_region():
|
||||
return str(json.loads(os.environ.get("INTEGRATION_SECRETS", "{}")).get("region") or "us").strip().lower()
|
||||
|
||||
|
||||
def _inputs():
|
||||
return json.loads(os.environ.get("INTEGRATION_INPUTS", "{}"))
|
||||
|
||||
@@ -72,6 +76,32 @@ def _alert_rrn(a):
|
||||
return None
|
||||
|
||||
|
||||
def _rrn_region(rrn):
|
||||
"""The region segment of an RRN, or None.
|
||||
|
||||
An RRN is rrn:<service>:<region>:<org>:<type>:… — so a resource states which
|
||||
region it lives in, while the base URL is built from the instance's
|
||||
configured region. Those two agree on a single-region tenant and need not on
|
||||
a multi-customer key, which spans organizations.
|
||||
"""
|
||||
parts = str(rrn or "").split(":")
|
||||
return parts[2] if len(parts) > 4 and parts[0] == "rrn" and parts[2] else None
|
||||
|
||||
|
||||
def _collect_region_failures(out, sink):
|
||||
"""Carry a partial failure out of a response instead of dropping it.
|
||||
|
||||
The Alert Triage API answers HTTP 200 with a region_failures list when it
|
||||
could not reach one of the regions behind the request — the spec says the
|
||||
presence of items there IS the partial failure. Reading only the payload
|
||||
turns that into missing alerts with no error anywhere, which for an
|
||||
ingestion feed is indistinguishable from a quiet period.
|
||||
"""
|
||||
for f in (out.get("region_failures") or []):
|
||||
sink.append(f)
|
||||
return out
|
||||
|
||||
|
||||
def run():
|
||||
_, _, multi = _cfg()
|
||||
inp = _inputs()
|
||||
@@ -104,6 +134,7 @@ def run():
|
||||
# 2) Their alert RRNs. One call per investigation — there is no bulk form —
|
||||
# so this is the step the time budget guards.
|
||||
order, by_rrn, truncated, skipped = [], {}, False, 0
|
||||
region_failures, regions_seen = [], set()
|
||||
for inv in investigations:
|
||||
if time.monotonic() - started > budget or len(order) >= max_alerts:
|
||||
truncated = True
|
||||
@@ -123,6 +154,9 @@ def run():
|
||||
if rrn is None:
|
||||
skipped += 1
|
||||
continue
|
||||
r = _rrn_region(rrn)
|
||||
if r:
|
||||
regions_seen.add(r)
|
||||
if rrn not in by_rrn:
|
||||
order.append(rrn)
|
||||
by_rrn[rrn] = inv
|
||||
@@ -140,7 +174,7 @@ def run():
|
||||
body = {"rrns": batch}
|
||||
if field_ids:
|
||||
body["field_ids"] = field_ids
|
||||
out = request("POST", AT + "alerts/ops/rrns", body=body)
|
||||
out = _collect_region_failures(request("POST", AT + "alerts/ops/rrns", body=body), region_failures)
|
||||
alerts.extend(out.get("alerts") or [])
|
||||
|
||||
# The investigation each alert came from, carried alongside so a mapper can
|
||||
@@ -161,6 +195,10 @@ def run():
|
||||
"alerts_returned": len(alerts),
|
||||
"alert_ids_without_rrn": skipped,
|
||||
"truncated": truncated,
|
||||
"region_failures": region_failures,
|
||||
"regions_seen": sorted(regions_seen),
|
||||
"configured_region": _cfg_region(),
|
||||
"region_mismatch": sorted(r for r in regions_seen if r != _cfg_region()),
|
||||
"elapsed_seconds": round(time.monotonic() - started, 1),
|
||||
},
|
||||
}))
|
||||
|
||||
Reference in New Issue
Block a user