admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use configmap to store log output configs

Browse Source 
Signed-off-by: huanggze <loganhuang@yunify.com>
This commit is contained in:
huanggze
2019-03-26 23:06:09 +08:00
parent 8edf1ca7b8
commit 74325fa81b
9 changed files with 172 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/apiserver/logging/logging.go
View File

@@ -91,6 +91,7 @@ func LoggingInsertFluentbitOutput(request *restful.Request, response *restful.Re
err := request.ReadEntity(&output)
if err != nil {
glog.Errorln(err)
res = &log.FluentbitOutputsResult{Status: http.StatusBadRequest}
} else {
res = log.FluentbitOutputInsert(output)
@@ -104,14 +105,10 @@ func LoggingUpdateFluentbitOutput(request *restful.Request, response *restful.Re
var output fb.OutputPlugin
id := request.PathParameter("output")
_, err := strconv.ParseUint(id, 10, 64)
if err != nil {
res := &log.FluentbitOutputsResult{Status: http.StatusBadRequest}
response.WriteAsJson(res)
return
}
err = request.ReadEntity(&output)
err := request.ReadEntity(&output)
if err != nil {
glog.Errorln(err)
res := &log.FluentbitOutputsResult{Status: http.StatusBadRequest}
response.WriteAsJson(res)
return
@@ -126,12 +123,7 @@ func LoggingDeleteFluentbitOutput(request *restful.Request, response *restful.Re
var res *log.FluentbitOutputsResult
id := request.PathParameter("output")
_, err := strconv.ParseUint(id, 10, 64)
if err != nil {
res = &log.FluentbitOutputsResult{Status: http.StatusBadRequest}
} else {
res = log.FluentbitOutputDelete(id)
}
res = log.FluentbitOutputDelete(id)
response.WriteAsJson(res)
}