mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-12 06:17:27 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Replace some uses of obsolete /metrics.json with /metrics

Browse source 
(haven't touched test files yet).

Change-Id: I48c7c0cf27a39d596627a06cbb4f5913fb3da13c
This commit is contained in:
Conor Hennessy 2013-10-15 12:36:25 +02:00
parent 2d2c434d48
commit aada5ded85
3 changed files with 4 additions and 4 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.
repeated TargetGroup target_group = 5;
// 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.

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

@ -158,7 +158,7 @@ type JobConfig struct {
// used for a job.
TargetGroup []*TargetGroup `protobuf:"bytes,5,rep,name=target_group" json:"target_group,omitempty"`
// 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:"-"`
}
@ -168,7 +168,7 @@ func (*JobConfig) ProtoMessage() {}
const Default_JobConfig_ScrapeTimeout string = "10s"
const Default_JobConfig_SdRefreshInterval string = "30s"
const Default_JobConfig_MetricsPath string = "/metrics.json"
const Default_JobConfig_MetricsPath string = "/metrics"
func (m *JobConfig) GetName() string {
if m != nil && m.Name != nil {

2
documentation/examples/prometheus.conf
View file

@ -25,6 +25,6 @@ job: {
# Let's define a group of targets to scrape for this job. In this case, only one.
target_group: {
# These endpoints are scraped via HTTP.
target: "http://localhost:9090/metrics.json"
target: "http://localhost:9090/metrics"
}
}