Skip to content

Minor tweaks 1. Remove some logging 2. Added more Error Handling 3. Continue when there is an error with k8s api #141

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

Merged
r-dilip merged 2 commits into from
Oct 9, 2018
Merged

Minor tweaks 1. Remove some logging 2. Added more Error Handling 3. Continue when there is an error with k8s api #141

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa36a3d
Removing some logs, added more error checking, continue on kube-api e…
r-dilip Oct 9, 2018
4fecfa5
Return FLB OF for json Marshall error, instead of RETRY
r-dilip Oct 9, 2018
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
13 changes: 5 additions & 8 deletions source/code/go/src/plugins/oms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ func updateContainerImageNameMaps() {
pods, err := ClientSet.CoreV1().Pods("").List(metav1.ListOptions{})
if err != nil {
Log("Error getting pods %s\nIt is ok to log here and continue, because the logs will be missing image and Name, but the logs will still have the containerID", err.Error())
continue
}

for _, pod := range pods.Items {
Expand Down Expand Up @@ -216,20 +217,12 @@ func PostDataHelper(tailPluginRecords []map[interface{}]interface{}) int {
stringMap["Image"] = val
} else {
Log("ContainerId %s not present in Map ", containerID)
Log("CurrentMap Snapshot \n")
for k, v := range ImageIDMap {
Log("%s ==> %s", k, v)
}
}

if val, ok := NameIDMap[containerID]; ok {
stringMap["Name"] = val
} else {
Log("ContainerId %s not present in Map ", containerID)
Log("CurrentMap Snapshot \n")
for k, v := range NameIDMap {
Log("%s ==> %s", k, v)
}
}

dataItem := DataItem{
Expand All @@ -253,6 +246,10 @@ func PostDataHelper(tailPluginRecords []map[interface{}]interface{}) int {
DataItems: dataItems}

marshalled, err := json.Marshal(logEntry)
if err != nil {
Log("Error while Marshalling log Entry: %s", err.Error())
return output.FLB_OK
}
req, _ := http.NewRequest("POST", OMSEndpoint, bytes.NewBuffer(marshalled))
req.Header.Set("Content-Type", "application/json")

Expand Down