From e8a31075d02f11bfd1b96292a9432a76f729bb28 Mon Sep 17 00:00:00 2001 From: Pascal Zarrad Date: Mon, 5 Jul 2021 20:38:12 +0200 Subject: [PATCH 1/6] Add Prometheus readme --- database/tsdb/prometheus/README.md | 16 ++++++++++++++++ database/tsdb/prometheus/egg-prometheus.json | 0 2 files changed, 16 insertions(+) create mode 100644 database/tsdb/prometheus/README.md create mode 100644 database/tsdb/prometheus/egg-prometheus.json diff --git a/database/tsdb/prometheus/README.md b/database/tsdb/prometheus/README.md new file mode 100644 index 00000000..94eea891 --- /dev/null +++ b/database/tsdb/prometheus/README.md @@ -0,0 +1,16 @@ +# Prometheus + +### From the [Prometheus](https://www.mongodb.com/) GitHub repository +The Prometheus monitoring system and time series database. + +### Resource consumption +As this is a database software, it can take up massive amounts of disk space. Due to Prometheus design, a huge memory consumption is also possible. +To get started, a minimum of 3GB RAM and >=2.5GB disk space is recommended. +Keep in mind that those numbers can grow pretty quick for large monitored environments! + +### Server Ports +Ports required to run the server in a table format. + +| Port | default | +|-------------------|---------| +| Prometheus server | 9090 | diff --git a/database/tsdb/prometheus/egg-prometheus.json b/database/tsdb/prometheus/egg-prometheus.json new file mode 100644 index 00000000..e69de29b From 944130c0c1c2f3ef97fc58e58326362f9f2229d9 Mon Sep 17 00:00:00 2001 From: Pascal Zarrad Date: Wed, 7 Jul 2021 19:44:30 +0200 Subject: [PATCH 2/6] Add Prometheus egg --- database/tsdb/prometheus/egg-prometheus.json | 41 ++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/database/tsdb/prometheus/egg-prometheus.json b/database/tsdb/prometheus/egg-prometheus.json index e69de29b..af98fd18 100644 --- a/database/tsdb/prometheus/egg-prometheus.json +++ b/database/tsdb/prometheus/egg-prometheus.json @@ -0,0 +1,41 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-07-07T19:53:13+02:00", + "name": "Prometheus", + "author": "p.zarrad@outlook.de", + "description": "The Prometheus monitoring system and time series database.", + "features": null, + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:base_debian" + ], + "file_denylist": [], + "startup": ".\/prometheus --web.listen-address=0.0.0.0:{{SERVER_PORT}} --config.file=\/home\/container\/prometheus.yml --storage.tsdb.path=\/home\/container\/data --web.console.templates=\/home\/container\/consoles --web.console.libraries=\/home\/container\/console_libraries --web.config.file=\/home\/container\/prometheus.web.yml", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Server is ready to receive web requests.\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/sh\r\nshopt -s extglob\r\n# Switch to mounted directory\r\ncd \/mnt\/server\r\n# Update installation system and install curl\r\napt-get update\r\napt-get install -y curl\r\n# Cleanup previous install if available\r\nif [ -f \"prometheus.yml\" ]; then mv prometheus.yml prometheus.yml.bak; fi\r\nif [ -f \"prometheus.web.yml\" ]; then mv prometheus.web.yml prometheus.web.yml.bak; fi\r\nrm -rfv !(data|prometheus.yml.bak|prometheus.web.yml.bak)\r\n# Download and extract Prometheus\r\nversion=${PROMETHEUS_VERSION}\r\nif [ \"$version\" = \"latest\" ]; then version=$(curl --silent \"https:\/\/api.github.com\/repos\/prometheus\/prometheus\/releases\/latest\" | grep '\"tag_name\":' | sed -E 's\/.*\"([^\"]+)\".*\/\\1\/' | cut -c2-); fi\r\ncurl -L https:\/\/github.com\/prometheus\/prometheus\/releases\/download\/v${version}\/prometheus-${version}.linux-amd64.tar.gz --output prometheus.tar.gz\r\ntar -zxvf prometheus.tar.gz\r\nmv -n prometheus-*\/* .\/\r\nrm -rf prometheus.tar.gz prometheus-*\/\r\n# Restore configuration if necessary\r\nif [ -f \"prometheus.yml.bak\" ]; then rm -rf prometheus.yml && mv prometheus.yml.bak prometheus.yml && rm -rf prometheus.yml.bak; fi\r\nif [ -f \"prometheus.web.yml.bak\" ]; then rm -rf prometheus.web.yml && mv prometheus.web.yml.bak prometheus.web.yml && rm -rf prometheus.web.yml.bak; fi\r\n# Create dummy prometheus.web.yml as a placeholder\r\nif [ ! -f \"prometheus.web.yml\" ]; then touch prometheus.web.yml; fi", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Prometheus Version", + "description": "The version of Prometheus to install. By default the latest version is being installed.", + "env_variable": "PROMETHEUS_VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + } + ] +} From a20a618f8bb35bdc7bd201048e4da3301de06237 Mon Sep 17 00:00:00 2001 From: Pascal Zarrad Date: Wed, 7 Jul 2021 19:54:40 +0200 Subject: [PATCH 3/6] Add Prometheus to README --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index c1df35db..7e715440 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,9 @@ If you are reading this it looks like you are looking to add an egg to your serv * [MariaDB](/database/sql/mariadb) * [PostgreSQL](/database/sql/postgres) +### Timeseries Databases +* [Prometheus](/database/tsdb/prometheus) + ## Voice Servers * [Lavalink](/voice_servers/lavalink) * [TeaSpeak](/voice_servers/teaspeak) From ea4606574ed6c3339d186d25d54d5d4a084602b9 Mon Sep 17 00:00:00 2001 From: Pascal Zarrad Date: Wed, 7 Jul 2021 20:16:24 +0200 Subject: [PATCH 4/6] Fix repository URL --- database/tsdb/prometheus/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/database/tsdb/prometheus/README.md b/database/tsdb/prometheus/README.md index 94eea891..4766566b 100644 --- a/database/tsdb/prometheus/README.md +++ b/database/tsdb/prometheus/README.md @@ -1,10 +1,10 @@ # Prometheus -### From the [Prometheus](https://www.mongodb.com/) GitHub repository +### From the [Prometheus](https://github.com/prometheus/prometheus) GitHub repository The Prometheus monitoring system and time series database. ### Resource consumption -As this is a database software, it can take up massive amounts of disk space. Due to Prometheus design, a huge memory consumption is also possible. +As Prometheus is a monitoring software that saves data in a timeseries database, it can take up massive amounts of disk space. Due to Prometheus design, a huge memory consumption is also possible. To get started, a minimum of 3GB RAM and >=2.5GB disk space is recommended. Keep in mind that those numbers can grow pretty quick for large monitored environments! From 1c93964fda114de700679aef092075a01efcbffe Mon Sep 17 00:00:00 2001 From: Pascal Zarrad Date: Wed, 7 Jul 2021 20:39:04 +0200 Subject: [PATCH 5/6] Move Prometheus to dedicated monitoring directory --- README.md | 7 ++++--- {database/tsdb => monitoring}/prometheus/README.md | 0 .../tsdb => monitoring}/prometheus/egg-prometheus.json | 0 3 files changed, 4 insertions(+), 3 deletions(-) rename {database/tsdb => monitoring}/prometheus/README.md (100%) rename {database/tsdb => monitoring}/prometheus/egg-prometheus.json (100%) diff --git a/README.md b/README.md index 7e715440..d6b8f66f 100644 --- a/README.md +++ b/README.md @@ -62,9 +62,6 @@ If you are reading this it looks like you are looking to add an egg to your serv * [MariaDB](/database/sql/mariadb) * [PostgreSQL](/database/sql/postgres) -### Timeseries Databases -* [Prometheus](/database/tsdb/prometheus) - ## Voice Servers * [Lavalink](/voice_servers/lavalink) * [TeaSpeak](/voice_servers/teaspeak) @@ -232,6 +229,10 @@ If you are reading this it looks like you are looking to add an egg to your serv [Xonotic](/xonotic/xonotic) +## [Monitoring](/monitoring/) +### Prometheus +* [Prometheus](/monitoring/prometheus) + ## [Storage](/storage/) ### S3 Storage * [minio](/storage/minio) diff --git a/database/tsdb/prometheus/README.md b/monitoring/prometheus/README.md similarity index 100% rename from database/tsdb/prometheus/README.md rename to monitoring/prometheus/README.md diff --git a/database/tsdb/prometheus/egg-prometheus.json b/monitoring/prometheus/egg-prometheus.json similarity index 100% rename from database/tsdb/prometheus/egg-prometheus.json rename to monitoring/prometheus/egg-prometheus.json From 8c7473492d4b06f943f18d1d63156bf8409f254f Mon Sep 17 00:00:00 2001 From: KolakZ <79867267+KolakZ@users.noreply.github.com> Date: Mon, 12 Jul 2021 19:59:51 -0500 Subject: [PATCH 6/6] Fix typo --- game_eggs/minecraft/java/feather/egg-feather.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/java/feather/egg-feather.json b/game_eggs/minecraft/java/feather/egg-feather.json index add0b5d6..882e525a 100644 --- a/game_eggs/minecraft/java/feather/egg-feather.json +++ b/game_eggs/minecraft/java/feather/egg-feather.json @@ -26,7 +26,7 @@ "variables": [ { "name": "Generate World", - "description": "Do you want the installer to generate a world you you?", + "description": "Do you want the installer to generate a world for you?", "env_variable": "GEN_WORLD", "default_value": "0", "user_viewable": true, @@ -34,4 +34,4 @@ "rules": "required|boolean" } ] -} \ No newline at end of file +}