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 ---
198 lines
6.8 KiB
Go
198 lines
6.8 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
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
|
|
"google.golang.org/protobuf/encoding/protodelim"
|
|
"google.golang.org/protobuf/encoding/prototext"
|
|
|
|
"github.com/prometheus/common/model"
|
|
|
|
"github.com/munnerz/goautoneg"
|
|
|
|
dto "github.com/prometheus/client_model/go"
|
|
)
|
|
|
|
// Encoder types encode metric families into an underlying wire protocol.
|
|
type Encoder interface {
|
|
Encode(*dto.MetricFamily) error
|
|
}
|
|
|
|
// Closer is implemented by Encoders that need to be closed to finalize
|
|
// encoding. (For example, OpenMetrics needs a final `# EOF` line.)
|
|
//
|
|
// Note that all Encoder implementations returned from this package implement
|
|
// Closer, too, even if the Close call is a no-op. This happens in preparation
|
|
// for adding a Close method to the Encoder interface directly in a (mildly
|
|
// breaking) release in the future.
|
|
type Closer interface {
|
|
Close() error
|
|
}
|
|
|
|
type encoderCloser struct {
|
|
encode func(*dto.MetricFamily) error
|
|
close func() error
|
|
}
|
|
|
|
func (ec encoderCloser) Encode(v *dto.MetricFamily) error {
|
|
return ec.encode(v)
|
|
}
|
|
|
|
func (ec encoderCloser) Close() error {
|
|
return ec.close()
|
|
}
|
|
|
|
// Negotiate returns the Content-Type based on the given Accept header. If no
|
|
// appropriate accepted type is found, FmtText is returned (which is the
|
|
// Prometheus text format). This function will never negotiate FmtOpenMetrics,
|
|
// as the support is still experimental. To include the option to negotiate
|
|
// FmtOpenMetrics, use NegotiateOpenMetrics.
|
|
func Negotiate(h http.Header) Format {
|
|
escapingScheme := Format(fmt.Sprintf("; escaping=%s", Format(model.NameEscapingScheme.String())))
|
|
for _, ac := range goautoneg.ParseAccept(h.Get(hdrAccept)) {
|
|
if escapeParam := ac.Params[model.EscapingKey]; escapeParam != "" {
|
|
switch Format(escapeParam) {
|
|
case model.AllowUTF8, model.EscapeUnderscores, model.EscapeDots, model.EscapeValues:
|
|
escapingScheme = Format("; escaping=" + escapeParam)
|
|
default:
|
|
// If the escaping parameter is unknown, ignore it.
|
|
}
|
|
}
|
|
ver := ac.Params["version"]
|
|
if ac.Type+"/"+ac.SubType == ProtoType && ac.Params["proto"] == ProtoProtocol {
|
|
switch ac.Params["encoding"] {
|
|
case "delimited":
|
|
return FmtProtoDelim + escapingScheme
|
|
case "text":
|
|
return FmtProtoText + escapingScheme
|
|
case "compact-text":
|
|
return FmtProtoCompact + escapingScheme
|
|
}
|
|
}
|
|
if ac.Type == "text" && ac.SubType == "plain" && (ver == TextVersion || ver == "") {
|
|
return FmtText + escapingScheme
|
|
}
|
|
}
|
|
return FmtText + escapingScheme
|
|
}
|
|
|
|
// NegotiateIncludingOpenMetrics works like Negotiate but includes
|
|
// FmtOpenMetrics as an option for the result. Note that this function is
|
|
// temporary and will disappear once FmtOpenMetrics is fully supported and as
|
|
// such may be negotiated by the normal Negotiate function.
|
|
func NegotiateIncludingOpenMetrics(h http.Header) Format {
|
|
escapingScheme := Format(fmt.Sprintf("; escaping=%s", Format(model.NameEscapingScheme.String())))
|
|
for _, ac := range goautoneg.ParseAccept(h.Get(hdrAccept)) {
|
|
if escapeParam := ac.Params[model.EscapingKey]; escapeParam != "" {
|
|
switch Format(escapeParam) {
|
|
case model.AllowUTF8, model.EscapeUnderscores, model.EscapeDots, model.EscapeValues:
|
|
escapingScheme = Format("; escaping=" + escapeParam)
|
|
default:
|
|
// If the escaping parameter is unknown, ignore it.
|
|
}
|
|
}
|
|
ver := ac.Params["version"]
|
|
if ac.Type+"/"+ac.SubType == ProtoType && ac.Params["proto"] == ProtoProtocol {
|
|
switch ac.Params["encoding"] {
|
|
case "delimited":
|
|
return FmtProtoDelim + escapingScheme
|
|
case "text":
|
|
return FmtProtoText + escapingScheme
|
|
case "compact-text":
|
|
return FmtProtoCompact + escapingScheme
|
|
}
|
|
}
|
|
if ac.Type == "text" && ac.SubType == "plain" && (ver == TextVersion || ver == "") {
|
|
return FmtText + escapingScheme
|
|
}
|
|
if ac.Type+"/"+ac.SubType == OpenMetricsType && (ver == OpenMetricsVersion_0_0_1 || ver == OpenMetricsVersion_1_0_0 || ver == "") {
|
|
switch ver {
|
|
case OpenMetricsVersion_1_0_0:
|
|
return FmtOpenMetrics_1_0_0 + escapingScheme
|
|
default:
|
|
return FmtOpenMetrics_0_0_1 + escapingScheme
|
|
}
|
|
}
|
|
}
|
|
return FmtText + escapingScheme
|
|
}
|
|
|
|
// NewEncoder returns a new encoder based on content type negotiation. All
|
|
// Encoder implementations returned by NewEncoder also implement Closer, and
|
|
// callers should always call the Close method. It is currently only required
|
|
// for FmtOpenMetrics, but a future (breaking) release will add the Close method
|
|
// to the Encoder interface directly. The current version of the Encoder
|
|
// interface is kept for backwards compatibility.
|
|
// In cases where the Format does not allow for UTF-8 names, the global
|
|
// NameEscapingScheme will be applied.
|
|
//
|
|
// NewEncoder can be called with additional options to customize the OpenMetrics text output.
|
|
// For example:
|
|
// NewEncoder(w, FmtOpenMetrics_1_0_0, WithCreatedLines())
|
|
//
|
|
// Extra options are ignored for all other formats.
|
|
func NewEncoder(w io.Writer, format Format, options ...EncoderOption) Encoder {
|
|
escapingScheme := format.ToEscapingScheme()
|
|
|
|
switch format.FormatType() {
|
|
case TypeProtoDelim:
|
|
return encoderCloser{
|
|
encode: func(v *dto.MetricFamily) error {
|
|
_, err := protodelim.MarshalTo(w, v)
|
|
return err
|
|
},
|
|
close: func() error { return nil },
|
|
}
|
|
case TypeProtoCompact:
|
|
return encoderCloser{
|
|
encode: func(v *dto.MetricFamily) error {
|
|
_, err := fmt.Fprintln(w, model.EscapeMetricFamily(v, escapingScheme).String())
|
|
return err
|
|
},
|
|
close: func() error { return nil },
|
|
}
|
|
case TypeProtoText:
|
|
return encoderCloser{
|
|
encode: func(v *dto.MetricFamily) error {
|
|
_, err := fmt.Fprintln(w, prototext.Format(model.EscapeMetricFamily(v, escapingScheme)))
|
|
return err
|
|
},
|
|
close: func() error { return nil },
|
|
}
|
|
case TypeTextPlain:
|
|
return encoderCloser{
|
|
encode: func(v *dto.MetricFamily) error {
|
|
_, err := MetricFamilyToText(w, model.EscapeMetricFamily(v, escapingScheme))
|
|
return err
|
|
},
|
|
close: func() error { return nil },
|
|
}
|
|
case TypeOpenMetrics:
|
|
return encoderCloser{
|
|
encode: func(v *dto.MetricFamily) error {
|
|
_, err := MetricFamilyToOpenMetrics(w, model.EscapeMetricFamily(v, escapingScheme), options...)
|
|
return err
|
|
},
|
|
close: func() error {
|
|
_, err := FinalizeOpenMetrics(w)
|
|
return err
|
|
},
|
|
}
|
|
}
|
|
panic(fmt.Errorf("expfmt.NewEncoder: unknown format %q", format))
|
|
}
|