tag v0.155.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.155.0 ---------------- * Fedora 43: add shadow-utils when LockRoot is enabled, update cloud-init service name (osbuild/images#1618) * Author: Achilleas Koutsou, Reviewers: Gianluca Zuccarelli, Michael Vogt * Update osbuild dependency commit ID to latest (osbuild/images#1609) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger, Tomáš Hozza * Update snapshots to 20250626 (osbuild/images#1623) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger * distro/rhel9: xz compress azure-cvm image type [HMS-8587] (osbuild/images#1620) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza * distro/rhel: introduce new image type: Azure SAP Apps [HMS-8738] (osbuild/images#1612) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza * distro/rhel: move ansible-core to sap_extras_pkgset (osbuild/images#1624) * Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Tomáš Hozza * github/create-tag: allow passing the version when run manually (osbuild/images#1621) * Author: Achilleas Koutsou, Reviewers: Lukáš Zapletal, Tomáš Hozza * rhel9: move image-config into pure YAML (HMS-8593) (osbuild/images#1616) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * test: split manifest checksums into separate files (osbuild/images#1625) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza — Somewhere on the Internet, 2025-06-30 --- tag v0.156.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.156.0 ---------------- * Many: delete repositories for EOL distributions (HMS-7044) (osbuild/images#1607) * Author: Tomáš Hozza, Reviewers: Michael Vogt, Simon de Vlieger * RHSM/facts: add 'image-builder CLI' API type (osbuild/images#1640) * Author: Tomáš Hozza, Reviewers: Brian C. Lane, Simon de Vlieger * Update dependencies 2025-06-29 (osbuild/images#1628) * Author: SchutzBot, Reviewers: Simon de Vlieger, Tomáš Hozza * Update osbuild dependency commit ID to latest (osbuild/images#1627) * Author: SchutzBot, Reviewers: Simon de Vlieger, Tomáš Hozza * [RFC] image: drop `InstallWeakDeps` from image.DiskImage (osbuild/images#1642) * Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger, Tomáš Hozza * build(deps): bump the go-deps group across 1 directory with 3 updates (osbuild/images#1632) * Author: dependabot[bot], Reviewers: SchutzBot, Tomáš Hozza * distro/rhel10: xz compress azure-cvm image type (osbuild/images#1638) * Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Simon de Vlieger * distro: cleanup/refactor distro/{defs,generic} (HMS-8744) (osbuild/images#1570) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * distro: remove some hardcoded values from generic/images.go (osbuild/images#1636) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * distro: small tweaks for the YAML based imagetypes (osbuild/images#1622) * Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger * fedora/wsl: packages and locale (osbuild/images#1635) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Tomáš Hozza * image/many: make compression more generic (osbuild/images#1634) * Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt * manifest: handle content template name with spaces (osbuild/images#1641) * Author: Bryttanie, Reviewers: Brian C. Lane, Michael Vogt, Tomáš Hozza * many: implement gzip (osbuild/images#1633) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Tomáš Hozza * rhel/azure: set GRUB_TERMINAL based on architecture [RHEL-91383] (osbuild/images#1626) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza — Somewhere on the Internet, 2025-07-07 ---
207 lines
6.6 KiB
Go
207 lines
6.6 KiB
Go
// Copyright 2015 The Prometheus Authors
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
// Package expfmt contains tools for reading and writing Prometheus metrics.
|
|
package expfmt
|
|
|
|
import (
|
|
"errors"
|
|
"strings"
|
|
|
|
"github.com/prometheus/common/model"
|
|
)
|
|
|
|
// Format specifies the HTTP content type of the different wire protocols.
|
|
type Format string
|
|
|
|
// Constants to assemble the Content-Type values for the different wire
|
|
// protocols. The Content-Type strings here are all for the legacy exposition
|
|
// formats, where valid characters for metric names and label names are limited.
|
|
// Support for arbitrary UTF-8 characters in those names is already partially
|
|
// implemented in this module (see model.ValidationScheme), but to actually use
|
|
// it on the wire, new content-type strings will have to be agreed upon and
|
|
// added here.
|
|
const (
|
|
TextVersion = "0.0.4"
|
|
ProtoType = `application/vnd.google.protobuf`
|
|
ProtoProtocol = `io.prometheus.client.MetricFamily`
|
|
// Deprecated: Use expfmt.NewFormat(expfmt.TypeProtoCompact) instead.
|
|
ProtoFmt = ProtoType + "; proto=" + ProtoProtocol + ";"
|
|
OpenMetricsType = `application/openmetrics-text`
|
|
OpenMetricsVersion_0_0_1 = "0.0.1"
|
|
OpenMetricsVersion_1_0_0 = "1.0.0"
|
|
|
|
// The Content-Type values for the different wire protocols. Do not do direct
|
|
// comparisons to these constants, instead use the comparison functions.
|
|
// Deprecated: Use expfmt.NewFormat(expfmt.TypeUnknown) instead.
|
|
FmtUnknown Format = `<unknown>`
|
|
// Deprecated: Use expfmt.NewFormat(expfmt.TypeTextPlain) instead.
|
|
FmtText Format = `text/plain; version=` + TextVersion + `; charset=utf-8`
|
|
// Deprecated: Use expfmt.NewFormat(expfmt.TypeProtoDelim) instead.
|
|
FmtProtoDelim Format = ProtoFmt + ` encoding=delimited`
|
|
// Deprecated: Use expfmt.NewFormat(expfmt.TypeProtoText) instead.
|
|
FmtProtoText Format = ProtoFmt + ` encoding=text`
|
|
// Deprecated: Use expfmt.NewFormat(expfmt.TypeProtoCompact) instead.
|
|
FmtProtoCompact Format = ProtoFmt + ` encoding=compact-text`
|
|
// Deprecated: Use expfmt.NewFormat(expfmt.TypeOpenMetrics) instead.
|
|
FmtOpenMetrics_1_0_0 Format = OpenMetricsType + `; version=` + OpenMetricsVersion_1_0_0 + `; charset=utf-8`
|
|
// Deprecated: Use expfmt.NewFormat(expfmt.TypeOpenMetrics) instead.
|
|
FmtOpenMetrics_0_0_1 Format = OpenMetricsType + `; version=` + OpenMetricsVersion_0_0_1 + `; charset=utf-8`
|
|
)
|
|
|
|
const (
|
|
hdrContentType = "Content-Type"
|
|
hdrAccept = "Accept"
|
|
)
|
|
|
|
// FormatType is a Go enum representing the overall category for the given
|
|
// Format. As the number of Format permutations increases, doing basic string
|
|
// comparisons are not feasible, so this enum captures the most useful
|
|
// high-level attribute of the Format string.
|
|
type FormatType int
|
|
|
|
const (
|
|
TypeUnknown FormatType = iota
|
|
TypeProtoCompact
|
|
TypeProtoDelim
|
|
TypeProtoText
|
|
TypeTextPlain
|
|
TypeOpenMetrics
|
|
)
|
|
|
|
// NewFormat generates a new Format from the type provided. Mostly used for
|
|
// tests, most Formats should be generated as part of content negotiation in
|
|
// encode.go. If a type has more than one version, the latest version will be
|
|
// returned.
|
|
func NewFormat(t FormatType) Format {
|
|
switch t {
|
|
case TypeProtoCompact:
|
|
return FmtProtoCompact
|
|
case TypeProtoDelim:
|
|
return FmtProtoDelim
|
|
case TypeProtoText:
|
|
return FmtProtoText
|
|
case TypeTextPlain:
|
|
return FmtText
|
|
case TypeOpenMetrics:
|
|
return FmtOpenMetrics_1_0_0
|
|
default:
|
|
return FmtUnknown
|
|
}
|
|
}
|
|
|
|
// NewOpenMetricsFormat generates a new OpenMetrics format matching the
|
|
// specified version number.
|
|
func NewOpenMetricsFormat(version string) (Format, error) {
|
|
if version == OpenMetricsVersion_0_0_1 {
|
|
return FmtOpenMetrics_0_0_1, nil
|
|
}
|
|
if version == OpenMetricsVersion_1_0_0 {
|
|
return FmtOpenMetrics_1_0_0, nil
|
|
}
|
|
return FmtUnknown, errors.New("unknown open metrics version string")
|
|
}
|
|
|
|
// WithEscapingScheme returns a copy of Format with the specified escaping
|
|
// scheme appended to the end. If an escaping scheme already exists it is
|
|
// removed.
|
|
func (f Format) WithEscapingScheme(s model.EscapingScheme) Format {
|
|
var terms []string
|
|
for _, p := range strings.Split(string(f), ";") {
|
|
toks := strings.Split(p, "=")
|
|
if len(toks) != 2 {
|
|
trimmed := strings.TrimSpace(p)
|
|
if len(trimmed) > 0 {
|
|
terms = append(terms, trimmed)
|
|
}
|
|
continue
|
|
}
|
|
key := strings.TrimSpace(toks[0])
|
|
if key != model.EscapingKey {
|
|
terms = append(terms, strings.TrimSpace(p))
|
|
}
|
|
}
|
|
terms = append(terms, model.EscapingKey+"="+s.String())
|
|
return Format(strings.Join(terms, "; "))
|
|
}
|
|
|
|
// FormatType deduces an overall FormatType for the given format.
|
|
func (f Format) FormatType() FormatType {
|
|
toks := strings.Split(string(f), ";")
|
|
params := make(map[string]string)
|
|
for i, t := range toks {
|
|
if i == 0 {
|
|
continue
|
|
}
|
|
args := strings.Split(t, "=")
|
|
if len(args) != 2 {
|
|
continue
|
|
}
|
|
params[strings.TrimSpace(args[0])] = strings.TrimSpace(args[1])
|
|
}
|
|
|
|
switch strings.TrimSpace(toks[0]) {
|
|
case ProtoType:
|
|
if params["proto"] != ProtoProtocol {
|
|
return TypeUnknown
|
|
}
|
|
switch params["encoding"] {
|
|
case "delimited":
|
|
return TypeProtoDelim
|
|
case "text":
|
|
return TypeProtoText
|
|
case "compact-text":
|
|
return TypeProtoCompact
|
|
default:
|
|
return TypeUnknown
|
|
}
|
|
case OpenMetricsType:
|
|
if params["charset"] != "utf-8" {
|
|
return TypeUnknown
|
|
}
|
|
return TypeOpenMetrics
|
|
case "text/plain":
|
|
v, ok := params["version"]
|
|
if !ok {
|
|
return TypeTextPlain
|
|
}
|
|
if v == TextVersion {
|
|
return TypeTextPlain
|
|
}
|
|
return TypeUnknown
|
|
default:
|
|
return TypeUnknown
|
|
}
|
|
}
|
|
|
|
// ToEscapingScheme returns an EscapingScheme depending on the Format. Iff the
|
|
// Format contains a escaping=allow-utf-8 term, it will select NoEscaping. If a valid
|
|
// "escaping" term exists, that will be used. Otherwise, the global default will
|
|
// be returned.
|
|
func (format Format) ToEscapingScheme() model.EscapingScheme {
|
|
for _, p := range strings.Split(string(format), ";") {
|
|
toks := strings.Split(p, "=")
|
|
if len(toks) != 2 {
|
|
continue
|
|
}
|
|
key, value := strings.TrimSpace(toks[0]), strings.TrimSpace(toks[1])
|
|
if key == model.EscapingKey {
|
|
scheme, err := model.ToEscapingScheme(value)
|
|
if err != nil {
|
|
return model.NameEscapingScheme
|
|
}
|
|
return scheme
|
|
}
|
|
}
|
|
return model.NameEscapingScheme
|
|
}
|