Merge branch 'master' into master

This commit is contained in:
Zhuxiaoyang
2019-05-14 19:33:23 +08:00
committed by GitHub
2 changed files with 3 additions and 2 deletions

View File

@@ -216,7 +216,5 @@ func logQuery(level log.LogQueryLevel, request *restful.Request) *es.QueryResult
param.Size = 10
}
glog.Infof("LogQuery with %v", param)
return es.Query(param)
}

View File

@@ -474,6 +474,7 @@ func syncFluentbitCRDOutputWithConfigMap(outputs []fb.OutputPlugin) error {
crdcs, scheme, err := createCRDClientSet()
if err != nil {
glog.Errorln(err)
return err
}
@@ -482,12 +483,14 @@ func syncFluentbitCRDOutputWithConfigMap(outputs []fb.OutputPlugin) error {
fluentbit, err := crdclient.Get("fluent-bit")
if err != nil {
glog.Errorln(err)
return err
}
fluentbit.Spec.Output = enabledOutputs
_, err = crdclient.Update("fluent-bit", fluentbit)
if err != nil {
glog.Errorln(err)
return err
}