Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions pkg/configpath/paths.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func ResolveAppConfigPath(explicit string) (string, error) {
return filepath.Clean(explicit), nil
}

for _, envVar := range []string{"PANDA_CONFIG", "ETHPANDAOPS_CONFIG", "CONFIG_PATH"} {
for _, envVar := range []string{"PANDA_CONFIG", "ETHPANDAOPS_CONFIG"} {
if value := strings.TrimSpace(os.Getenv(envVar)); value != "" {
return filepath.Clean(value), nil
}
Expand All @@ -79,7 +79,7 @@ func ResolveProxyConfigPath(explicit, baseDir string) (string, error) {
return cleanRelative(baseDir, explicit), nil
}

for _, envVar := range []string{"PANDA_PROXY_CONFIG", "ETHPANDAOPS_PROXY_CONFIG", "CONFIG_PATH"} {
for _, envVar := range []string{"PANDA_PROXY_CONFIG", "ETHPANDAOPS_PROXY_CONFIG"} {
if value := strings.TrimSpace(os.Getenv(envVar)); value != "" {
return filepath.Clean(value), nil
}
Expand Down
4 changes: 0 additions & 4 deletions pkg/operations/types.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
package operations

const (
ResultKindTable = "table"
ResultKindObject = "object"

RowEncodingObject = "object"
RowEncodingArray = "array"
)

type Request struct {
Expand Down
8 changes: 8 additions & 0 deletions pkg/proxy/server_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ type PrometheusInstanceConfig struct {
URL string `yaml:"url"`
Username string `yaml:"username,omitempty"`
Password string `yaml:"password,omitempty"`
SkipVerify bool `yaml:"skip_verify,omitempty"`
Timeout int `yaml:"timeout,omitempty"`
}

// LokiInstanceConfig holds Loki instance configuration.
Expand All @@ -114,6 +116,8 @@ type LokiInstanceConfig struct {
URL string `yaml:"url"`
Username string `yaml:"username,omitempty"`
Password string `yaml:"password,omitempty"`
SkipVerify bool `yaml:"skip_verify,omitempty"`
Timeout int `yaml:"timeout,omitempty"`
}

// EthNodeInstanceConfig holds Ethereum node API access configuration.
Expand Down Expand Up @@ -315,6 +319,8 @@ func (c *ServerConfig) ToHandlerConfigs() ([]handlers.ClickHouseConfig, []handle
URL: prom.URL,
Username: prom.Username,
Password: prom.Password,
SkipVerify: prom.SkipVerify,
Timeout: prom.Timeout,
}
}

Expand All @@ -327,6 +333,8 @@ func (c *ServerConfig) ToHandlerConfigs() ([]handlers.ClickHouseConfig, []handle
URL: loki.URL,
Username: loki.Username,
Password: loki.Password,
SkipVerify: loki.SkipVerify,
Timeout: loki.Timeout,
}
}

Expand Down
1 change: 0 additions & 1 deletion pkg/server/operation_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ func writePassthroughResponse(w http.ResponseWriter, status int, contentType str
if contentType != "" {
w.Header().Set("Content-Type", contentType)
}
w.Header().Set("X-Operation-Transport", "passthrough")
w.WriteHeader(status)
if len(body) == 0 {
return
Expand Down
1 change: 0 additions & 1 deletion pkg/serverapi/runtime_storage.go

This file was deleted.

1 change: 0 additions & 1 deletion pkg/serverapi/runtime_storage_test.go

This file was deleted.

Loading