diff --git a/prometheus-2.55.yaml b/prometheus-2.55.yaml deleted file mode 100644 index a0318ebf47e..00000000000 --- a/prometheus-2.55.yaml +++ /dev/null @@ -1,151 +0,0 @@ -package: - name: prometheus-2.55 - version: 2.55.1 - epoch: 0 - description: The Prometheus monitoring system and time series database. - copyright: - - license: Apache-2.0 - dependencies: - provides: - - prometheus=${{package.full-version}} - -environment: - contents: - packages: - - bash - - busybox - - ca-certificates-bundle - - go - - nodejs - - npm - -pipeline: - - uses: git-checkout - with: - expected-commit: 6d7569113f1ca814f1e149f74176656540043b8d - repository: https://github.com/prometheus/prometheus - tag: v${{package.version}} - - - uses: patch - with: - patches: disable-pprof.patch - - - runs: | - GOLDFLAGS="-s -w -X github.com/prometheus/common/version.Version=${{package.version}} - -X github.com/prometheus/common/version.Revision=WolfiLinux - -X github.com/prometheus/common/version.Branch=master - -X github.com/prometheus/common/version.BuildUser=$USER@$HOSTNAME - -X github.com/prometheus/common/version.BuildDate=$(date -u "+%Y%m%d-%H:%M:%S" ${SOURCE_DATE_EPOCH:+-d @$SOURCE_DATE_EPOCH}) - " - if [ -n "$LDFLAGS" ]; then - # LDFLAGS (and only LDFLAGS) should be passed to -extldflags. - GOLDFLAGS="$GOLDFLAGS -extldflags '$LDFLAGS'" - fi - - # set -j1 to run things in the correct order in makefile - # actual go building is still parallel - make -j1 assets-compress - - go build \ - -trimpath \ - -mod=readonly \ - -ldflags "$GOLDFLAGS" \ - -tags netgo,builtinassets \ - ./cmd/prometheus - go build \ - -trimpath \ - -mod=readonly \ - -ldflags "$GOLDFLAGS" \ - ./cmd/promtool - - - runs: | - install -Dm755 prometheus "${{targets.destdir}}"/usr/bin/prometheus - install -Dm755 promtool "${{targets.destdir}}"/usr/bin/promtool - - install -Dm644 prometheus.confd \ - "${{targets.destdir}}"/etc/conf.d/prometheus - - install -dm644 "${{targets.destdir}}"/var/lib/prometheus/data - - install -Dm644 -t "${{targets.destdir}}"/etc/prometheus \ - documentation/examples/prometheus.yml - - mkdir -p "${{targets.destdir}}"/etc/prometheus/console_libraries - for file in console_libraries/* - do - install -Dm644 -t "${{targets.destdir}}"/etc/prometheus/console_libraries/ "$file" - done - - mkdir -p "${{targets.destdir}}"/etc/prometheus/consoles - for file in consoles/* - do - install -Dm644 -t "${{targets.destdir}}"/etc/prometheus/consoles/ "$file" - done - - - uses: strip - -subpackages: - - name: ${{package.name}}-bitnami-compat - dependencies: - provides: - - prometheus-bitnami-compat=${{package.full-version}} - description: "compat package with bitnami/prometheus image" - pipeline: - - uses: bitnami/compat - with: - image: prometheus - version-path: 2/debian-12 - - runs: | - mkdir -p ${{targets.subpkgdir}}/opt/bitnami/prometheus/bin/ - mkdir -p ${{targets.subpkgdir}}/opt/bitnami/prometheus/conf - - chmod g+rwX ${{targets.subpkgdir}}/opt/bitnami - - cp ${{targets.destdir}}/usr/bin/prometheus ${{targets.subpkgdir}}/opt/bitnami/prometheus/bin/prometheus - cp ${{targets.destdir}}/usr/bin/promtool ${{targets.subpkgdir}}/opt/bitnami/prometheus/bin/promtool - cp -r ${{targets.destdir}}/etc/prometheus/* ${{targets.subpkgdir}}/opt/bitnami/prometheus/conf/ - cp -r ${{targets.destdir}}/var/lib/prometheus/data ${{targets.subpkgdir}}/opt/bitnami/prometheus/data - -update: - ignore-regex-patterns: - - '\+stringlabels' # looks like stringlabels are still experimental, let's stick to the main version stream. - enabled: true - github: - identifier: prometheus/prometheus - strip-prefix: v - tag-filter-prefix: v2.55 - -test: - environment: - contents: - packages: - - curl - pipeline: - - name: Check Prometheus Rules - runs: | - cat << 'EOF' > rules.example - groups: - - name: http - rules: - - record: job:http_inprogress_requests:sum - expr: sum(http_inprogress_requests) by (job) - EOF - promtool check rules rules.example - prometheus --version - prometheus --help - promtool --version - promtool --help - - name: Verify Prometheus Installation and Server Running Capability - runs: | - cat << 'EOF' > prometheus.yml - global: - scrape_interval: 15s - - scrape_configs: - - job_name: "prometheus" - static_configs: - - targets: ["localhost:9090"] - EOF - prometheus --config.file=./prometheus.yml --web.listen-address=127.0.0.1:9090 & - sleep 5 - curl -s "http://127.0.0.1:9090/-/healthy" | grep -q "Prometheus Server is Healthy." diff --git a/prometheus-2.55/disable-pprof.patch b/prometheus-2.55/disable-pprof.patch deleted file mode 100644 index 11097d5f1e4..00000000000 --- a/prometheus-2.55/disable-pprof.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go -index 1d844ddba..efcdacf1f 100644 ---- a/cmd/prometheus/main.go -+++ b/cmd/prometheus/main.go -@@ -22,7 +22,6 @@ import ( - "math/bits" - "net" - "net/http" -- _ "net/http/pprof" // Comment this line to disable pprof endpoint. - "net/url" - "os" - "os/signal" -diff --git a/web/web.go b/web/web.go -index 9426ed935..afedb193b 100644 ---- a/web/web.go -+++ b/web/web.go -@@ -23,7 +23,6 @@ import ( - "math" - "net" - "net/http" -- "net/http/pprof" - "net/url" - "os" - "path" -@@ -476,9 +475,6 @@ func New(logger log.Logger, o *Options) *Handler { - w.Write([]byte("Only POST or PUT requests allowed")) - }) - -- router.Get("/debug/*subpath", serveDebug) -- router.Post("/debug/*subpath", serveDebug) -- - router.Get("/-/healthy", func(w http.ResponseWriter, r *http.Request) { - w.WriteHeader(http.StatusOK) - fmt.Fprintf(w, o.AppName+" is Healthy.\n") -@@ -497,36 +493,6 @@ func New(logger log.Logger, o *Options) *Handler { - return h - } - --func serveDebug(w http.ResponseWriter, req *http.Request) { -- ctx := req.Context() -- subpath := route.Param(ctx, "subpath") -- -- if subpath == "/pprof" { -- http.Redirect(w, req, req.URL.Path+"/", http.StatusMovedPermanently) -- return -- } -- -- if !strings.HasPrefix(subpath, "/pprof/") { -- http.NotFound(w, req) -- return -- } -- subpath = strings.TrimPrefix(subpath, "/pprof/") -- -- switch subpath { -- case "cmdline": -- pprof.Cmdline(w, req) -- case "profile": -- pprof.Profile(w, req) -- case "symbol": -- pprof.Symbol(w, req) -- case "trace": -- pprof.Trace(w, req) -- default: -- req.URL.Path = "/debug/pprof/" + subpath -- pprof.Index(w, req) -- } --} -- - // SetReady sets the ready status of our web Handler. - func (h *Handler) SetReady(v bool) { - if v { diff --git a/prometheus-2.55/prometheus.confd b/prometheus-2.55/prometheus.confd deleted file mode 100644 index 8cf02ffdc1e..00000000000 --- a/prometheus-2.55/prometheus.confd +++ /dev/null @@ -1,6 +0,0 @@ -prometheus_config_file=/etc/prometheus/prometheus.yml -prometheus_storage_path=/var/lib/prometheus/data -prometheus_retention_time=15d - -output_log=/var/log/prometheus.log -error_log=/var/log/prometheus.log