Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed call to InfluxDB via controller proxy (#2638)

Browse Source 
* handle error condition in fission fn log command
* use the single stream for log exclude fetcher logs
* add all pods in the fn logs command
* update the previous stable version
* remove proxy to the controller for influxdb call
* stop running controller if influxdb flag turned true
* port-forward for influx DB
* remove controller dependency from test case
* port forward to influx DB if URL not provided by the user
* archive pruner test
This commit is contained in:
neha_gupta
2022-11-25 21:11:25 +05:30
committed by GitHub
parent f11902e81b
commit 1e0641d5f9
10 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/fission-cli/logdb/influxdb.go
+22 -16
View File
@@ -22,8 +22,7 @@ import (
"encoding/json"
"fmt"
"net/http"
"net/url"
"path"
"os"
"sort"
"strconv"
"strings"
@@ -42,11 +41,20 @@ const (
)
func NewInfluxDB(ctx context.Context, logDBOptions LogDBOptions) (InfluxDB, error) {
server, err := util.GetApplicationUrl(ctx, logDBOptions.Client, "application=fission-api")
if err != nil {
return InfluxDB{}, err
dbType := INFLUXDB
// retrieve db auth config from the env
url := os.Getenv(fmt.Sprintf("%s_URL", dbType))
if url == "" {
// Portforward to the influxdb
localRouterPort, err := util.SetupPortForward(ctx, logDBOptions.Client, util.GetFissionNamespace(), "svc=influxdb")
if err != nil {
return InfluxDB{}, err
}
url = "http://127.0.0.1:" + localRouterPort + "/query"
}
return InfluxDB{endpoint: server}, nil
return InfluxDB{endpoint: url}, nil
}
type InfluxDB struct {
@@ -89,7 +97,7 @@ func (influx InfluxDB) GetLogs(ctx context.Context, filter LogFilter, output *by
query := influxdbClient.NewQueryWithParameters(queryCmd, INFLUXDB_DATABASE, "", parameters)
logEntries := []LogEntry{}
response, err := influx.query(query)
response, err := influx.query(ctx, query)
if err != nil {
return err
}
@@ -158,18 +166,16 @@ func (influx InfluxDB) GetLogs(ctx context.Context, filter LogFilter, output *by
return nil
}
func (influx InfluxDB) query(query influxdbClient.Query) (*influxdbClient.Response, error) {
queryURL, err := url.Parse(influx.endpoint)
if err != nil {
return nil, err
}
// connect to controller first, then controller will redirect our query command
// to influxdb and proxy back the db response.
queryURL.Path = path.Clean(fmt.Sprintf("%s/proxy/%s", queryURL.Path, INFLUXDB))
req, err := http.NewRequest(http.MethodPost, queryURL.String(), nil)
func (influx InfluxDB) query(ctx context.Context, query influxdbClient.Query) (*influxdbClient.Response, error) {
username := os.Getenv(fmt.Sprintf("%s_USERNAME", INFLUXDB))
password := os.Getenv(fmt.Sprintf("%s_PASSWORD", INFLUXDB))
req, err := http.NewRequest(http.MethodPost, influx.endpoint, nil)
if err != nil {
return nil, errors.Wrap(err, "error creating request for log proxy")
}
req.SetBasicAuth(username, password)
parametersBytes, err := json.Marshal(query.Parameters)
if err != nil {