Skip to content

Commit 8b3cc58

Browse files
rob1998rob1998
committed
Merge branch 'develop' of https://github.com/Monitorr/Monitorr into develop
2 parents 9205e3c + 0c02930 commit 8b3cc58

30 files changed

Lines changed: 2307 additions & 960 deletions

‎README.md‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88

99
[![Docker build](https://img.shields.io/docker/build/monitorr/monitorr.svg?maxAge=2592000)](https://hub.docker.com/r/monitorr/monitorr/) [DOCKER]
1010

11-
1211
[![GitHub (pre-)release](https://img.shields.io/github/release/monitorr/monitorr/all.svg)](https://github.com/monitorr/monitorr/releases) [DEVELOP]
1312

1413

1514
**NOTICE** (18 MARCH 2018): If you are updating to any version prior to 1.0 updating via the UI by clicking on “check for update” in the footer MAY FAIL. It is recommended to clone a new copy of this repo starting with version 1.0. Please See [WIKI](https://github.com/Monitorr/Monitorr/wiki/NOTICE:-Updating-Monitorr) for further explanation.
1615

16+
1717
## Features:
1818

19-
**Latest major change:** Integrated settings page.
19+
**Latest major change:** Integrated settings page.
2020

2121
- LIVE! (w/ option to pause live updating)
2222
- Self-hosted
@@ -30,28 +30,31 @@
3030
- User customizable system threshold colors
3131

3232
**Features in development:**
33-
- Reverse proxy authentication
33+
- Option to choose which HD is used for system stats
34+
- Custom CSS
3435
- Alerting
3536

3637

3738
## Screenshots:
3839

3940
![](https://i.imgur.com/h8S1976.png)
4041
<img src="https://i.imgur.com/SwevXaG.png" width="46%"> <img src="https://i.imgur.com/eCyidGT.png" width="51%">
41-
<img src="https://i.imgur.com/ejNyp3j.jpg" width="32%"> <img src="https://i.imgur.com/Ql1ujZ5.png" width="32%"> <img src="https://i.imgur.com/YQV6FEJ.png" width="32%">
42+
<img src="https://i.imgur.com/ejNyp3j.jpg" width="32%"> <img src="https://i.imgur.com/btxGuuo.png" width="32%"> <img src="https://i.imgur.com/YQV6FEJ.png" width="32%">
43+
4244

4345

4446
### Mobile:
4547

46-
<img src="https://i.imgur.com/RKp2yiZ.jpg?1" width="32%">
48+
![](https://i.imgur.com/RKp2yiZ.jpg?1)
4749

4850

4951
## Prerequisites:
5052
1) [PHP](https://secure.php.net/downloads.php) (7.1+ recommended)
51-
2) [PHP PDO](http://php.net/manual/en/book.pdo.php)
52-
3) [PHP cURL](https://secure.php.net/manual/en/book.curl.php)
53-
4) [SQLite](https://www.sqlite.org/index.html)
54-
5) [GIT](https://git-scm.com/download/win) (Recommended for Windows hosts (see wiki)
53+
2) [PHP cURL](https://secure.php.net/manual/en/book.curl.php)
54+
3) [PHP ZipArchive](http://www.php.net/manual/en/zip.installation.php)
55+
4) [PHP PDO](http://php.net/manual/en/book.pdo.php)
56+
5) [SQLite](https://www.sqlite.org/index.html)
57+
6) [GIT](https://git-scm.com/download/win) (Recommended for Windows hosts (see wiki)
5558

5659
## Libraries used in this project:
5760
- [Alpaca](https://github.com/gitana/alpaca/)
@@ -63,7 +66,7 @@
6366
- See full configuration instructions in the WiKi: https://github.com/Monitorr/Monitorr/wiki
6467
1) Clone/download repository to your webserver
6568
2) Make sure the user account that runs your webserver has RW access to the monitorr folder (eg. for linux it's usually www-data:www-data) - this is for updates to work properly.
66-
3) Browse to <localhost\domain>/monitorr/index.php
69+
3) Browse to <localhost\domain>/monitorr/index.php
6770
4) Establish data directory, and user database.
6871
5) Configure Monitorr
6972
6) Chill

‎assets/config/_installation/_register.php‎

Lines changed: 98 additions & 107 deletions
Large diffs are not rendered by default.

‎assets/config/_installation/datadirtest.php‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
3+
$datafile = '../../data/datadir.json';
4+
$str = file_get_contents($datafile);
5+
$json = json_decode( $str, true);
6+
$datadir = $json['datadir'];
7+
8+
9+
echo "cwd: " . getcwd();
10+
echo "<br>";
11+
echo "datafile: " . $datafile;
12+
echo "<br>";
13+
echo "datafile real path: " . realpath($datafile), PHP_EOL;
14+
echo "<br>";
15+
echo "datadir: " . $datadir;
16+
echo "<br>";
17+
echo "datadir real path: " . realpath($datadir), PHP_EOL;
18+
echo "<br>";
19+
20+
echo "datadir contents START: ";
21+
echo "<br>";
22+
23+
$dir = $datadir;
24+
//$files1 = scandir($dir);
25+
$files2 = scandir($dir, 1);
26+
27+
//print_r($files1);
28+
print_r($files2) . PHP_EOL;
29+
30+
echo "<br>";
31+
32+
echo "datadir contents END. ";
33+
34+
35+
?>

‎assets/config/_installation/default/monitorr_data_directory_default.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Monitorr data directory
22
https://github.com/Monitorr/Monitorr
33

4+
** DO NOT DELETE THIS FILE **
45

56
- This directory and files within are components of the Monitorr web application.
67
- These files should NOT be edited manually.

‎assets/config/_installation/default/services_settings-data_default.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[
2-
{"serviceTitle":"Google","enabled":"Yes","image":"../img/google.gif","type":" Standard","checkurl":"https://google.com:443","linkurl":"https://google.com"},
3-
{"serviceTitle":"Monitorr","enabled":"Yes","image":"../img/monitorr.png","type":" Ping Only","checkurl":"http://localhost:80","linkurl":"http://localhost:80"}]
2+
{"serviceTitle":"Google","enabled":"Yes","image":"../img/google.gif","type":" Standard","link":"Yes","checkurl":"https://google.com:443","linkurl":"https://google.com"},
3+
{"serviceTitle":"Monitorr","enabled":"Yes","image":"../img/monitorr.png","type":" Ping Only","link":"Yes","checkurl":"http://localhost:80","linkurl":"http://localhost:80"}]

0 commit comments

Comments
 (0)