(stream/refactoring) Upgrade BSM to api-v2 #91
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
psamecentreon
changed the title
psamecentreon
changed the title
tanguyvda
requested changes
Dec 17, 2021
Sims24
changed the title
…ttps://github.com/centreon/centreon-stream-connector-scripts into feat(streamconnector)-add-refacto-bsm-v2-lua-files
tanguyvda
requested changes
Jan 24, 2022
Co-authored-by: tcharles <[email protected]>
tanguyvda
requested changes
May 9, 2022
tanguyvda
requested changes
May 9, 2022
tanguyvda
requested changes
May 11, 2023
|
|
||
| local categories = self.sc_params.params.bbdo.categories | ||
| local elements = self.sc_params.params.bbdo.elements | ||
|
|
There was a problem hiding this comment.
in today's world, we have a custom code feature
Suggested change
| -- only load the custom code file, not executed yet | |
| if self.sc_params.load_custom_code_file and not self.sc_params:load_custom_code_file(self.sc_params.params.custom_code_file) then | |
| self.sc_logger:error("[EventQueue:new]: couldn't successfully load the custom code file: " .. tostring(self.sc_params.params.custom_code_file)) | |
| end |
There was a problem hiding this comment.
| } | ||
|
|
||
| self.send_data_method = { | ||
| [1] = function (payload) return self:send_data(payload) end |
There was a problem hiding this comment.
there's a metadata system for queues now
Suggested change
| [1] = function (payload) return self:send_data(payload) end | |
| [1] = function (payload, queue_metadata) return self:send_data(payload, queue_metadata) end |
|
|
||
| -- Format XML file with host infoamtion | ||
| function EventQueue:format_event_host() | ||
| local xml_host_severity = self.sc_broker:get_severity(self.sc_event.event.host_id) |
There was a problem hiding this comment.
not needed to call broker cache
severity is already stored in self.sc_event.event.cache.severity.host
| local xml_url = self.sc_common:ifnil_or_empty(self.sc_event.event.cache.host.action_url, 'no action url for this host') | ||
| local xml_notes = self.sc_common:ifnil_or_empty(self.sc_event.event.cache.host.notes, 'no notes found on host') | ||
|
|
||
| if xml_host_severity == false then |
There was a problem hiding this comment.
Suggested change
| if xml_host_severity == false then | |
| if not xml_host_severity then |
nil and false are not the same, both can be handled with "if not"
|
|
||
| -- Format XML file with service infoamtion | ||
| function EventQueue:format_event_service() | ||
| local xml_url = self.sc_common:ifnil_or_empty(self.sc_event.event.cache.host.notes_url, 'no url for this service') |
There was a problem hiding this comment.
not needed to call broker cache
severity is already stored in self.sc_event.event.cache.severity.service
| local xml_url = self.sc_common:ifnil_or_empty(self.sc_event.event.cache.host.notes_url, 'no url for this service') | ||
| local xml_service_severity = self.sc_broker:get_severity(self.sc_event.event.host_id, self.sc_event.event.service_id) | ||
|
|
||
| if xml_service_severity == false then |
There was a problem hiding this comment.
Suggested change
| if xml_service_severity == false then | |
| if not xml_service_severity then |
| return payload | ||
| end | ||
|
|
||
| function EventQueue:send_data(payload) |
There was a problem hiding this comment.
Suggested change
| function EventQueue:send_data(payload) | |
| function EventQueue:send_data(payload, queue_metadata) |
need to add the metadata with the new system
| -- write payload in the logfile for test purpose | ||
| if self.sc_params.params.send_data_test == 1 then | ||
| self.sc_logger:notice("[send_data]: " .. tostring(payload)) | ||
| return true |
There was a problem hiding this comment.
Suggested change
| return true | |
| return true |
|
|
||
| function EventQueue:send_data(payload) | ||
| self.sc_logger:debug("[EventQueue:send_data]: Starting to send data") | ||
|
|
There was a problem hiding this comment.
before the send _data_test condition, there is a whole new system to create the curl command.
in this case it would look like
queue_metadata.headers = {
"Content-Type: text/xml",
"content-length: " .. string.len(payload)
}
self.sc_logger:log_curl_command(self.sc_params.params.http_server_url, queue_metadata, self.sc_params.params, payload)
Comment on lines
+256
to
+262
| :setopt( | ||
| curl.OPT_HTTPHEADER, | ||
| { | ||
| "Content-Type: text/xml", | ||
| "content-length: " .. string.len(payload) | ||
| } | ||
| ) |
There was a problem hiding this comment.
Suggested change
| :setopt( | |
| curl.OPT_HTTPHEADER, | |
| { | |
| "Content-Type: text/xml", | |
| "content-length: " .. string.len(payload) | |
| } | |
| ) | |
| :setopt(curl.OPT_HTTPHEADER, queue_metadata.headers) |
with the log_curl_command system, headers are already built before. Therefore, we can simplify this line
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refacto streamconnector BSM to api-v2