Merge pull request #15 'feature/expose-schema-through-content-type'

This commit is contained in:
Bernerd Schaefer 2013-04-29 10:17:48 +02:00
commit 9ba7cdf4cf
2 changed files with 4 additions and 7 deletions

View File

@ -24,12 +24,10 @@ const (
// The format of the exported data. This will match this library's version,
// which subscribes to the Semantic Versioning scheme.
APIVersion = "0.0.1"
APIVersion = "0.0.2"
// When reporting telemetric data over the HTTP web services interface, a web
// services interface shall include this header along with APIVersion as its
// value.
ProtocolVersionHeader = "X-Prometheus-API-Version"
// The content type and schema information set on telemetry data responses.
TelemetryContentType = `application/json; schema="prometheus/telemetry"; version=` + APIVersion
// The customary web services endpoint on which telemetric data is exposed.
ExpositionResource = "/metrics.json"

View File

@ -240,8 +240,7 @@ func (registry registry) Handler() http.HandlerFunc {
if strings.HasSuffix(url.Path, jsonSuffix) {
header := w.Header()
header.Set(ProtocolVersionHeader, APIVersion)
header.Set(contentTypeHeader, jsonContentType)
header.Set(contentTypeHeader, TelemetryContentType)
writer := decorateWriter(r, w)