-
- Items
- Items
+ Items
+ Items
- Graph
- Expression
diff --git a/cmd/scollector/collectors/elasticsearch.go b/cmd/scollector/collectors/elasticsearch.go
index 0fd6f82aea..db54f99f05 100644
--- a/cmd/scollector/collectors/elasticsearch.go
+++ b/cmd/scollector/collectors/elasticsearch.go
@@ -47,32 +47,47 @@ func init() {
if instance.Port == 0 {
instance.Port = 9200
}
- url := fmt.Sprintf("http://%v:%v", instance.Host, instance.Port)
- instanceName := fmt.Sprintf("%v_%v", instance.Host, instance.Port)
+ if instance.Scheme == "" {
+ instance.Scheme = "http"
+ }
+ if instance.Name == "" {
+ instance.Name = fmt.Sprintf("%v_%v", instance.Host, instance.Port)
+ }
+ if instance.Disable {
+ slog.Infof("Elastic instance %v is disabled. Skipping.", instance.Name)
+ continue
+ }
+ var creds string
+ if instance.User != "" || instance.Password != "" {
+ creds = fmt.Sprintf("%v:%v@", instance.User, instance.Password)
+ } else {
+ creds = ""
+ }
+ url := fmt.Sprintf("%v://%v%v:%v", instance.Scheme, creds, instance.Host, instance.Port)
if instance.IndexInterval != "" {
indexInterval, err = time.ParseDuration(instance.IndexInterval)
if err != nil {
panic(fmt.Errorf("Failed to parse IndexInterval: %v, err: %v", instance.IndexInterval, err))
}
- slog.Infof("Using IndexInterval: %v for %v", indexInterval, instanceName)
+ slog.Infof("Using IndexInterval: %v for %v", indexInterval, instance.Name)
} else {
- slog.Infof("Using default IndexInterval: %v for %v", indexInterval, instanceName)
+ slog.Infof("Using default IndexInterval: %v for %v", indexInterval, instance.Name)
}
if instance.ClusterInterval != "" {
clusterInterval, err = time.ParseDuration(instance.ClusterInterval)
if err != nil {
panic(fmt.Errorf("Failed to parse ClusterInterval: %v, err: %v", instance.ClusterInterval, err))
}
- slog.Infof("Using ClusterInterval: %v for %v", clusterInterval, instanceName)
+ slog.Infof("Using ClusterInterval: %v for %v", clusterInterval, instance.Name)
} else {
- slog.Infof("Using default ClusterInterval: %v for %v", clusterInterval, instanceName)
+ slog.Infof("Using default ClusterInterval: %v for %v", clusterInterval, instance.Name)
}
// for legacy reasons, keep localhost:9200 named elasticsearch / elasticsearch-indices
var name string
- if instanceName == "localhost_9200" {
+ if instance.Name == "localhost_9200" {
name = "elasticsearch"
} else {
- name = fmt.Sprintf("elasticsearch-%v", instanceName)
+ name = fmt.Sprintf("elasticsearch-%v", instance.Name)
}
collectors = append(collectors, &IntervalCollector{
F: func() (opentsdb.MultiDataPoint, error) {
@@ -83,10 +98,10 @@ func init() {
Enable: enableURL(url),
})
// keep legacy collector name if localhost_9200
- if instanceName == "localhost_9200" {
+ if instance.Name == "localhost_9200" {
name = "elasticsearch-indices"
} else {
- name = fmt.Sprintf("elasticsearch-indices-%v", instanceName)
+ name = fmt.Sprintf("elasticsearch-indices-%v", instance.Name)
}
collectors = append(collectors, &IntervalCollector{
F: func() (opentsdb.MultiDataPoint, error) {
@@ -309,14 +324,17 @@ func esSkipIndex(index string) bool {
}
func esReq(instance conf.Elastic, path, query string, v interface{}) error {
+ up := url.UserPassword(instance.User, instance.Password)
u := &url.URL{
- Scheme: "http",
+ Scheme: instance.Scheme,
+ User: up,
Host: fmt.Sprintf("%v:%v", instance.Host, instance.Port),
Path: path,
RawQuery: query,
}
resp, err := http.Get(u.String())
if err != nil {
+ slog.Errorf("Error querying Elasticsearch: %v", err)
return nil
}
defer resp.Body.Close()
diff --git a/cmd/scollector/collectors/interval.go b/cmd/scollector/collectors/interval.go
index cb9ed30b0b..88ecdf85dd 100644
--- a/cmd/scollector/collectors/interval.go
+++ b/cmd/scollector/collectors/interval.go
@@ -117,6 +117,7 @@ func enableURL(url string, regexes ...string) func() bool {
resp.Body.Close()
}()
if resp.StatusCode != 200 {
+ slog.Infof("URL not enabled: %v; HTTP Response not 200, but %v", url, resp.StatusCode)
return false
}
if len(res) == 0 {
diff --git a/cmd/scollector/conf/conf.go b/cmd/scollector/conf/conf.go
index 611f2c4b15..dc6e413733 100644
--- a/cmd/scollector/conf/conf.go
+++ b/cmd/scollector/conf/conf.go
@@ -275,4 +275,9 @@ type Elastic struct {
Port uint16 // default is 9200
ClusterInterval string // default is DefaultFreq
IndexInterval string // default is 15 mins
+ User string // default is empty
+ Password string // default is empty
+ Disable bool // default is false.
+ Name string // default is host_port
+ Scheme string // default is http
}
diff --git a/cmd/scollector/doc.go b/cmd/scollector/doc.go
index 539724a049..180fd3190c 100644
--- a/cmd/scollector/doc.go
+++ b/cmd/scollector/doc.go
@@ -414,19 +414,23 @@ ConnectionString and Role, which are the same as using sqlplus.
By default Elastic nodes are auto-detected on localhost:9200, but if you have a
node running on another network interface, a non-standard port or even multiple
-nodes running on the same host you can use the Elastic configuration:
-
- [[Elastic]]
- Host = "192.168.1.1"
- Port = 9201
- ClusterInterval = "10s"
- IndexInterval = "1m"
-
- [[Elastic]]
- Host = "192.168.1.1"
- Port = 9202
- ClusterInterval = "10s"
- IndexInterval = "1m"
+nodes running on the same host you can use the Elastic configuration. Also lets
+you specify basic auth credentials and using TLS by setting the Scheme to https:
+
+ [[Elastic]]
+ Host = "192.168.1.1"
+ Port = 9201
+ ClusterInterval = "10s"
+ IndexInterval = "1m"
+ User = "user"
+ Password = "pass"
+ Scheme = "https"
+
+ [[Elastic]]
+ Host = "192.168.1.1"
+ Port = 9202
+ ClusterInterval = "10s"
+ IndexInterval = "1m"
Windows
diff --git a/docs/definitions.md b/docs/definitions.md
index afe1a535c6..422db7034e 100644
--- a/docs/definitions.md
+++ b/docs/definitions.md
@@ -196,6 +196,8 @@ Variables and function available to the unknown template:
* Group: list of names of alerts
* Name: group name
* Time: [time](http://golang.org/pkg/time/#Time) this group triggered unknown
+* States: unknown incident states (only use when grouping unknown disabled using [unknownMinGroupSize](http://bosun.org/definitions#unknownmingroupsize))
+* IncidentUnknownLink: creates a link to Bosun’s incident view same as `.Incident` (require incident id)
Example:
@@ -214,6 +216,21 @@ template ut {
unknownTemplate = ut
```
+```
+template testunknownBody {
+ subject = {{.Name}}{{ if .States.Tags }}.{{ replace .States.Tags "," "." -1 }}{{else}}{{end}}
+ body = `
+ Time: {{.Time}}
+
Name: {{.Name}}
+
AlertKey: {{.States.AlertKey}}
+
Incident Id: {{.States.Id}}
+
Link: {{.IncidentUnknownLink .States.Id}}
+ `
+}
+
+unknownBody = testunknownBody
+```
+
In general it is better to stick with the system default by not defining an unknown template. The system default is:
Body:
diff --git a/graphite/graphite.go b/graphite/graphite.go
index e37cfe054f..d61902fd6a 100644
--- a/graphite/graphite.go
+++ b/graphite/graphite.go
@@ -15,10 +15,11 @@ const requestErrFmt = "graphite RequestError (%s): %s"
// Request holds query objects. Currently only absolute times are supported.
type Request struct {
- Start *time.Time
- End *time.Time
- Targets []string
- URL *url.URL
+ Start *time.Time
+ End *time.Time
+ Targets []string
+ URL *url.URL
+ DataProv interface{}
}
type Response []Series
@@ -124,6 +125,7 @@ var DefaultClient = &http.Client{
// Context is the interface for querying a Graphite server.
type Context interface {
Query(*Request) (Response, error)
+ SubstitueHeaders(*Request)
}
// Host is a simple Graphite Context with no additional features.
@@ -134,6 +136,13 @@ func (h Host) Query(r *Request) (Response, error) {
return r.Query(string(h), nil)
}
+func (h Host) SubstitueHeaders(r *Request) {
+}
+
+type SubstitutionData interface {
+ GetName() string
+}
+
type HostHeader struct {
Host string
Header http.Header
@@ -142,3 +151,15 @@ type HostHeader struct {
func (h HostHeader) Query(r *Request) (Response, error) {
return r.Query(h.Host, h.Header)
}
+
+func (h HostHeader) SubstitueHeaders(r *Request) {
+ dataProvider, implemented := r.DataProv.(SubstitutionData)
+ if implemented && h.Header != nil {
+ ownerName := dataProvider.GetName()
+ for _, values := range h.Header {
+ for idx, hvalue := range values {
+ values[idx] = strings.Replace(hvalue, "{alert-name}", ownerName, -1)
+ }
+ }
+ }
+}