[PR #622] [MERGED] Merge branch hotfix/v7.3.3 into master #711

Closed
opened 2026-02-26 10:33:37 +03:00 by kerem · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/ONLYOFFICE/Docker-DocumentServer/pull/622
Author: @papacarlo
Created: 5/15/2023
Status: Merged
Merged: 5/15/2023
Merged by: @papacarlo

Base: masterHead: hotfix/v7.3.3


📝 Commits (3)

  • f03bc7e Add docker-compose with prometheus and grafana (#495)
  • 09b9a73 fix Bug 61960 - Add authentication for supervisord (#598)
  • 06fe403 Merge master into hotfix/v7.3.3

📊 Changes

7 files changed (+2883 additions, -0 deletions)

View changed files

📝 config/supervisor/supervisord.conf (+4 -0)
📝 run-document-server.sh (+1 -0)
tests/prometheus.yml (+46 -0)
tests/prometheus/grafana/conf/default-provider.yaml (+23 -0)
tests/prometheus/grafana/conf/prometheus.yml (+6 -0)
tests/prometheus/grafana/dashboards/documentserver-statsd-exporter.json (+2797 -0)
tests/prometheus/prometheus-scrape/statsd-exporter.yml (+6 -0)

📄 Description

  • Add docker-compose with prometheus and grafana (#495)
  • fix Bug 61960 - Add authentication for supervisord (#598)

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ONLYOFFICE/Docker-DocumentServer/pull/622 **Author:** [@papacarlo](https://github.com/papacarlo) **Created:** 5/15/2023 **Status:** ✅ Merged **Merged:** 5/15/2023 **Merged by:** [@papacarlo](https://github.com/papacarlo) **Base:** `master` ← **Head:** `hotfix/v7.3.3` --- ### 📝 Commits (3) - [`f03bc7e`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/f03bc7ec18f27ed0c6ae067a0f924789522ef266) Add docker-compose with prometheus and grafana (#495) - [`09b9a73`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/09b9a73637651a045b258a359fc678d243780e67) fix Bug 61960 - Add authentication for supervisord (#598) - [`06fe403`](https://github.com/ONLYOFFICE/Docker-DocumentServer/commit/06fe4034f0a8d222f79251f8d937843525a3c777) Merge master into hotfix/v7.3.3 ### 📊 Changes **7 files changed** (+2883 additions, -0 deletions) <details> <summary>View changed files</summary> 📝 `config/supervisor/supervisord.conf` (+4 -0) 📝 `run-document-server.sh` (+1 -0) ➕ `tests/prometheus.yml` (+46 -0) ➕ `tests/prometheus/grafana/conf/default-provider.yaml` (+23 -0) ➕ `tests/prometheus/grafana/conf/prometheus.yml` (+6 -0) ➕ `tests/prometheus/grafana/dashboards/documentserver-statsd-exporter.json` (+2797 -0) ➕ `tests/prometheus/prometheus-scrape/statsd-exporter.yml` (+6 -0) </details> ### 📄 Description - Add docker-compose with prometheus and grafana (#495) - fix Bug 61960 - Add authentication for supervisord (#598) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
kerem 2026-02-26 10:33:37 +03:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
starred/Docker-DocumentServer-ONLYOFFICE#711
No description provided.