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 ---
179 lines
4.4 KiB
Go
179 lines
4.4 KiB
Go
// Copyright 2013 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 model
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
type FloatString float64
|
|
|
|
func (v FloatString) String() string {
|
|
return strconv.FormatFloat(float64(v), 'f', -1, 64)
|
|
}
|
|
|
|
func (v FloatString) MarshalJSON() ([]byte, error) {
|
|
return json.Marshal(v.String())
|
|
}
|
|
|
|
func (v *FloatString) UnmarshalJSON(b []byte) error {
|
|
if len(b) < 2 || b[0] != '"' || b[len(b)-1] != '"' {
|
|
return errors.New("float value must be a quoted string")
|
|
}
|
|
f, err := strconv.ParseFloat(string(b[1:len(b)-1]), 64)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
*v = FloatString(f)
|
|
return nil
|
|
}
|
|
|
|
type HistogramBucket struct {
|
|
Boundaries int32
|
|
Lower FloatString
|
|
Upper FloatString
|
|
Count FloatString
|
|
}
|
|
|
|
func (s HistogramBucket) MarshalJSON() ([]byte, error) {
|
|
b, err := json.Marshal(s.Boundaries)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
l, err := json.Marshal(s.Lower)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
u, err := json.Marshal(s.Upper)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
c, err := json.Marshal(s.Count)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return []byte(fmt.Sprintf("[%s,%s,%s,%s]", b, l, u, c)), nil
|
|
}
|
|
|
|
func (s *HistogramBucket) UnmarshalJSON(buf []byte) error {
|
|
tmp := []interface{}{&s.Boundaries, &s.Lower, &s.Upper, &s.Count}
|
|
wantLen := len(tmp)
|
|
if err := json.Unmarshal(buf, &tmp); err != nil {
|
|
return err
|
|
}
|
|
if gotLen := len(tmp); gotLen != wantLen {
|
|
return fmt.Errorf("wrong number of fields: %d != %d", gotLen, wantLen)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (s *HistogramBucket) Equal(o *HistogramBucket) bool {
|
|
return s == o || (s.Boundaries == o.Boundaries && s.Lower == o.Lower && s.Upper == o.Upper && s.Count == o.Count)
|
|
}
|
|
|
|
func (b HistogramBucket) String() string {
|
|
var sb strings.Builder
|
|
lowerInclusive := b.Boundaries == 1 || b.Boundaries == 3
|
|
upperInclusive := b.Boundaries == 0 || b.Boundaries == 3
|
|
if lowerInclusive {
|
|
sb.WriteRune('[')
|
|
} else {
|
|
sb.WriteRune('(')
|
|
}
|
|
fmt.Fprintf(&sb, "%g,%g", b.Lower, b.Upper)
|
|
if upperInclusive {
|
|
sb.WriteRune(']')
|
|
} else {
|
|
sb.WriteRune(')')
|
|
}
|
|
fmt.Fprintf(&sb, ":%v", b.Count)
|
|
return sb.String()
|
|
}
|
|
|
|
type HistogramBuckets []*HistogramBucket
|
|
|
|
func (s HistogramBuckets) Equal(o HistogramBuckets) bool {
|
|
if len(s) != len(o) {
|
|
return false
|
|
}
|
|
|
|
for i, bucket := range s {
|
|
if !bucket.Equal(o[i]) {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
}
|
|
|
|
type SampleHistogram struct {
|
|
Count FloatString `json:"count"`
|
|
Sum FloatString `json:"sum"`
|
|
Buckets HistogramBuckets `json:"buckets"`
|
|
}
|
|
|
|
func (s SampleHistogram) String() string {
|
|
return fmt.Sprintf("Count: %f, Sum: %f, Buckets: %v", s.Count, s.Sum, s.Buckets)
|
|
}
|
|
|
|
func (s *SampleHistogram) Equal(o *SampleHistogram) bool {
|
|
return s == o || (s.Count == o.Count && s.Sum == o.Sum && s.Buckets.Equal(o.Buckets))
|
|
}
|
|
|
|
type SampleHistogramPair struct {
|
|
Timestamp Time
|
|
// Histogram should never be nil, it's only stored as pointer for efficiency.
|
|
Histogram *SampleHistogram
|
|
}
|
|
|
|
func (s SampleHistogramPair) MarshalJSON() ([]byte, error) {
|
|
if s.Histogram == nil {
|
|
return nil, errors.New("histogram is nil")
|
|
}
|
|
t, err := json.Marshal(s.Timestamp)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
v, err := json.Marshal(s.Histogram)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return []byte(fmt.Sprintf("[%s,%s]", t, v)), nil
|
|
}
|
|
|
|
func (s *SampleHistogramPair) UnmarshalJSON(buf []byte) error {
|
|
tmp := []interface{}{&s.Timestamp, &s.Histogram}
|
|
wantLen := len(tmp)
|
|
if err := json.Unmarshal(buf, &tmp); err != nil {
|
|
return err
|
|
}
|
|
if gotLen := len(tmp); gotLen != wantLen {
|
|
return fmt.Errorf("wrong number of fields: %d != %d", gotLen, wantLen)
|
|
}
|
|
if s.Histogram == nil {
|
|
return errors.New("histogram is null")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (s SampleHistogramPair) String() string {
|
|
return fmt.Sprintf("%s @[%s]", s.Histogram, s.Timestamp)
|
|
}
|
|
|
|
func (s *SampleHistogramPair) Equal(o *SampleHistogramPair) bool {
|
|
return s == o || (s.Histogram.Equal(o.Histogram) && s.Timestamp.Equal(o.Timestamp))
|
|
}
|