mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-02-02 08:31:11 -08:00
Code Issues Actions 53 Packages Projects Releases Wiki Activity

Merge "Replace some uses of obsolete /metrics.json with /metrics (haven't touched test files yet)."

Browse source
This commit is contained in:
Julius Volz 2013-12-18 16:56:30 +01:00 committed by Gerrit Code Review
parent f44f398ea7 aada5ded85
commit 7b013e6491
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/config.proto
View file

@ -72,7 +72,7 @@ message JobConfig {
// used for a job. // used for a job.
repeated TargetGroup target_group = 5; repeated TargetGroup target_group = 5;
// The HTTP resource path to fetch metrics from on targets. // The HTTP resource path to fetch metrics from on targets.
optional string metrics_path = 6 [default = "/metrics.json"]; optional string metrics_path = 6 [default = "/metrics"];
} }
// The top-level Prometheus configuration. // The top-level Prometheus configuration.

4
config/generated/config.pb.go
View file

@ -158,7 +158,7 @@ type JobConfig struct {
// used for a job. // used for a job.
TargetGroup []*TargetGroup `protobuf:"bytes,5,rep,name=target_group" json:"target_group,omitempty"` TargetGroup []*TargetGroup `protobuf:"bytes,5,rep,name=target_group" json:"target_group,omitempty"`
// The HTTP resource path to fetch metrics from on targets. // The HTTP resource path to fetch metrics from on targets.
MetricsPath *string `protobuf:"bytes,6,opt,name=metrics_path,def=/metrics.json" json:"metrics_path,omitempty"` MetricsPath *string `protobuf:"bytes,6,opt,name=metrics_path,def=/metrics" json:"metrics_path,omitempty"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
} }
@ -168,7 +168,7 @@ func (*JobConfig) ProtoMessage() {}
const Default_JobConfig_ScrapeTimeout string = "10s" const Default_JobConfig_ScrapeTimeout string = "10s"
const Default_JobConfig_SdRefreshInterval string = "30s" const Default_JobConfig_SdRefreshInterval string = "30s"
const Default_JobConfig_MetricsPath string = "/metrics.json" const Default_JobConfig_MetricsPath string = "/metrics"
func (m *JobConfig) GetName() string { func (m *JobConfig) GetName() string {
if m != nil && m.Name != nil { if m != nil && m.Name != nil {