JeroenED/custom-prometheus-exporter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: JeroenED:f06c804c249c397f63bed9e6b88dca91cf0a8606
Branches Tags
JeroenED:main
..
compare: JeroenED:8af61f97b06b79ea02b136dde4e2f16119f156f9
Branches Tags
JeroenED:main

2 Commits
f06c804c24 ... 8af61f97b0

Author SHA1 Message Date
Jeroen De Meerleer
8af61f97b0
Added /config endpoint and link in 404 page 
The update includes the addition of a new '/config' endpoint in index.php, which returns the application's configuration as a JSON response. A corresponding link to this new endpoint has also been added to the 404 error page.
 2024-06-13 17:43:32 +02:00
Jeroen De Meerleer
f75be1fcaf
Added git installation and version endpoint 
In the Dockerfile, a new command has been added to install git. This allows for more flexibility in managing code versions within the container. In addition, a new endpoint '/version' has been introduced in index.php which returns JSON data about the last commit, its timestamp and the current branch. This provides an easy way to check versioning information directly from the application.
 2024-06-13 17:42:18 +02:00
3 changed files with 17 additions and 0 deletions
Show Stats Expand all files Collapse all files

3
dockerfile
View File

@ -13,6 +13,9 @@ COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
# Activeer mod_rewrite # Activeer mod_rewrite
RUN a2enmod rewrite RUN a2enmod rewrite
# Installeer git
RUN DEBIAN_FRONTEND=noninteractive apt update && apt install -y git
# Installeer de Process Control extension # Installeer de Process Control extension
RUN curl -sSL https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions -o - | sh -s pcntl zip RUN curl -sSL https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions -o - | sh -s pcntl zip

12
index.php
View File

@ -6,6 +6,18 @@ if($_SERVER["REQUEST_URI"] == '/metrics') {
$phpbin = getenv('PHP_BINARY'); $phpbin = getenv('PHP_BINARY');
$output = shell_exec('CONFIG_FILE="' . $config . '" ' . $phpbin . ' ' . $_SERVER['DOCUMENT_ROOT'] . 'script.php'); $output = shell_exec('CONFIG_FILE="' . $config . '" ' . $phpbin . ' ' . $_SERVER['DOCUMENT_ROOT'] . 'script.php');
echo $output; echo $output;
} elseif ($_SERVER["REQUEST_URI"] == '/config') {
header('Content-Type: application/json');
require_once getenv('CONFIG_FILE');
echo json_encode($config);
} elseif ($_SERVER["REQUEST_URI"] == '/version') {
header('Content-Type: application/json');
$git = [
'lastCommit' => trim(shell_exec('git rev-parse HEAD')),
'lastCommitTimestamp' => trim(shell_exec('git log -1 --format=%cd')),
'branch' => trim(shell_exec('git rev-parse --abbrev-ref HEAD')),
];
echo json_encode($git);
} else { } else {
require_once('vendor/autoload.php'); require_once('vendor/autoload.php');
http_response_code(404); http_response_code(404);

2
templates/404.twig
View File

@ -8,5 +8,7 @@
<body> <body>
<h1>404 Uri {{ path }} not found</h1> <h1>404 Uri {{ path }} not found</h1>
<p><a href="/metrics">/metrics</a></p> <p><a href="/metrics">/metrics</a></p>
<p><a href="/config">/config</a></p>
<p><a href="/version">/version</a></p>
</body> </body>
</html> </html>