-
Notifications
You must be signed in to change notification settings - Fork 529
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add TLS support to jaeger query plugin (#1999)
* Add TLS support to jaeger query plugin Signed-off-by: Ruben Vargas <[email protected]> * add entry to CHANGELOG.md Signed-off-by: Ruben Vargas <[email protected]>
- Loading branch information
1 parent
1ff9264
commit 024a1ef
Showing
4 changed files
with
135 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,27 @@ | ||
package tempo | ||
|
||
import ( | ||
"github.com/grafana/dskit/crypto/tls" | ||
"github.com/spf13/viper" | ||
) | ||
|
||
// Config holds the configuration for redbull. | ||
type Config struct { | ||
Backend string `yaml:"backend"` | ||
Backend string `yaml:"backend"` | ||
TLSEnabled bool `yaml:"tls_enabled" category:"advanced"` | ||
TLS tls.ClientConfig `yaml:",inline"` | ||
} | ||
|
||
// InitFromViper initializes the options struct with values from Viper | ||
func (c *Config) InitFromViper(v *viper.Viper) { | ||
c.Backend = v.GetString("backend") | ||
c.TLSEnabled = v.GetBool("tls_enabled") | ||
c.TLS.CertPath = v.GetString("tls_cert_path") | ||
c.TLS.KeyPath = v.GetString("tls_key_path") | ||
c.TLS.CAPath = v.GetString("tls_ca_path") | ||
c.TLS.ServerName = v.GetString("tls_server_name") | ||
c.TLS.InsecureSkipVerify = v.GetBool("tls_insecure_skip_verify") | ||
c.TLS.CipherSuites = v.GetString("tls_cipher_suites") | ||
c.TLS.MinVersion = v.GetString("tls_min_version") | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters