Skip to content
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

add error descripiton to crd #1

Merged
merged 2 commits into from
Nov 26, 2023
Merged

add error descripiton to crd #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e13457e
add error descripiton to crd
tombokombo Nov 26, 2023
272b42e
add error descripiton to crd fix
tombokombo Nov 26, 2023
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
6 changes: 6 additions & 0 deletions operator-crds/es-template-crd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ spec:
lastRollover:
type: string
format: date-time
lastError:
type: string
format: date-time
lastErrorDescription:
type: string

subresources:
status: {}
scope: Namespaced
Expand Down
57 changes: 40 additions & 17 deletions prometheus_es_exporter/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@ def updateStatus(item, merge_patch):
log.error(f"Updating template {name} k8s ElasticQueryExporterTemplate Status Exception: {str(e)}")

def updateEsTemplate(item, template):
err = None
templateName = item['spec']['templateName']
namespace = item['metadata']['namespace']
log.debug(f"Updating template {templateName} on ES cluster")
Expand All @@ -522,30 +523,38 @@ def updateEsTemplate(item, template):
)
except Exception as e:
log.error(f"Updating estemplate {template} Exception: {str(e)}")
err = e
else:
if es_request.ok:
return True
else:
log.error(f"Updating estemplate {template} returned error -> {json.dumps(r.json())}")
return False
if not es_request.ok:
log.error(f"Updating estemplate {template} returned error -> {json.dumps(es_request.json())}")
if not err:
err = json.dumps(es_request.json())
return err

def deleteEsTemplate(templateName):
err = None
log.debug(f"Deleting template {templateName}")
try:
es_request = requests.delete(f"{es_cluster[0]}/_template/{templateName}", timeout=15)
except Exception as e:
log.error(f"Deleting estemplate {template} Exception: {str(e)}")
if not es_request.ok:
log.error(f"Deleting template {template} returned error {json.dumps(es_request.json())}")

err = str(e)
else:
if not es_request.ok:
log.error(f"Deleting template {template} returned error {json.dumps(es_request.json())}")
if not err:
err = json.dumps(es_request.json())
return err

def buildTemplate(resource):
err = None
try:
mappings = json.loads(item['spec']['mappings'])
idxPatterns = item['spec']['indexPatterns']
idxPatterns = [pattern + "-*" for pattern in idxPatterns]
except ValueError as e:
log.error(f"Mapping error in {item['spec']['templateName']} custom resource")
err = str(e)
else:
template = {
"index_patterns": idxPatterns,
Expand All @@ -563,8 +572,8 @@ def buildTemplate(resource):
if item['spec']['order']:
template['order'] = item['spec']['order']

return template
return None
return template, None
return None, err

def rolloverAlias(item):
idxPatterns = item['spec']['indexPatterns']
Expand Down Expand Up @@ -597,14 +606,21 @@ def rolloverAlias(item):
name = item['metadata']['name']
log.debug(f"Template event {ev['type']}, name: {name}, resource version: {item_resource_version}")

status_patch = {}

if ev['type'] == 'DELETED':
if item['spec']['deleteTemplate']:
deleteEsTemplate(templateName)
err = deleteEsTemplate(templateName)
log.info(f"Deleted template {templateName} from ES")
if err:
status_patch = {"status": {"lastError": now, "lastErrorDescription": err}}
updateStatus(item, status_patch)
if ev['type'] == 'ADDED' or ev['type'] == 'MODIFIED':
template = buildTemplate(item)
template, err = buildTemplate(item)
if not template:
log.error(f"Bad template {name}")
status_patch = {"status": {"lastError": now, "lastErrorDescription": err}}
updateStatus(item, status_patch)
continue

template_hash = hashlib.md5(json.dumps(template).encode()).hexdigest()
Expand All @@ -620,24 +636,31 @@ def rolloverAlias(item):
"provisioned": "yes",
"lastProvision": TEMPLATES_PROVISION_STATUS[templateName]["last_provision"],
"lastProvisionedConfigHash": TEMPLATES_PROVISION_STATUS[templateName]["hash"],
"lastRollover": TEMPLATES_PROVISION_STATUS[templateName]["last_rollover"]
"lastRollover": TEMPLATES_PROVISION_STATUS[templateName]["last_rollover"],
"lastErrorDescription": ""
}
})
continue

# We need just one status update in this cycle, because it will generate modiefied event
status_patch = {}
now = datetime.datetime.now(datetime.timezone.utc)
update_ok = updateEsTemplate(item, template)
if update_ok:
err = updateEsTemplate(item, template)
if not err:
TEMPLATES_PROVISION_STATUS[templateName] = {"hash": template_hash, "last_provision": now, "last_rollover": None }
status_patch = {"status": {"provisioned": "yes", "lastProvision": now, "lastProvisionedConfigHash": template_hash}}
status_patch = { "status": {
"provisioned": "yes",
"lastProvision": now,
"lastProvisionedConfigHash": template_hash,
"lastErrorDescription": ""
}}
log.info(f"Updating ES {template}, {name} sucessfull")
if item['spec']['rolloverIndexAfterUpdate']:
rollover_ok = rolloverAlias(item)
if rollover_ok:
status_patch["status"]["lastRollover"] = now
TEMPLATES_PROVISION_STATUS[templateName]["last_rollover"] = now
else:
status_patch = {"status": {"lastError": now, "lastErrorDescription": err}}
if 'status' in status_patch:
updateStatus(item, status_patch)
except Exception as e:
Expand Down
Loading