diff --git a/Hyper-V/VMs-Backups.php b/Hyper-V/VMs-Backups.php new file mode 100644 index 0000000..3b51ab4 --- /dev/null +++ b/Hyper-V/VMs-Backups.php @@ -0,0 +1,168 @@ + + + + + + + + + + Web Infra Reports IT + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+ +
+ +
+ +

+ + +
+ + + +
+ + + + + + + + + + + '; + echo ''; + echo ''; + echo ''; + }else{ + echo ''; + $date1 = date_create($row['LastGoodBackup']); + $diff = date_diff($date1, date_create(date("Y-m-d"))); + if ($diff->format("%R%a") > 3 || $row['LastGoodBackup'] == ""){ + echo ''; + $ok = 0; + }else{ + echo ''; + } + if($row['Result'] === "0"){ + echo ''; + }else{ + $ok = 0; + if($row['Result'] == " : FAILED"){ + echo ''; + }else{ + echo ''; + } + } + if ($diff->format("%R%a") > 3 || $row['LastGoodBackup'] == ""){ + echo ''; + $ok = 0; + }else{ + echo ''; + } + echo ''; + echo ''; + echo '' ; + } + if($ok ==0){$er++;} + } + ?> + +
VMLast BackupLast Good BackupOSHost
'.$row['VM'].'Excluded via VMM'.$row['OS'].''.$row['Host'].'
'.$row['VM'].''.$row['VM'].'OK SNAPSHOT FAILED ERROR '.$row['Result'].''.$row['LastGoodBackup'].''.$row['LastGoodBackup'].''.$row['OS'].''.$row['Host'].'
+
+
+
+ +
+
+
+ + + + + + + \ No newline at end of file diff --git a/crossover/Crossover-KPI.js b/crossover/Crossover-KPI.js index ba36ab0..e7579ac 100644 --- a/crossover/Crossover-KPI.js +++ b/crossover/Crossover-KPI.js @@ -15,8 +15,7 @@ $(function() { if ((dateDiffInDays($data[$i]['SCCMlu'].split(" ")[0]) > 7 || $data[$i]['SCCMlu'] == 'Missing') && $data[$i]['SCCM'] !== 'Missing'){ $nSCCM-- ;} if ($data[$i]['GLPI'] !== 'Missing') { $nGLPI++ ; } if ((dateDiffInDays($data[$i]['GLPIlu'].split(" ")[0]) > 7 || $data[$i]['GLPIlu'] == 'Missing') && $data[$i]['GLPI'] !== 'Missing'){ $nGLPI-- ;} - if ($data[$i]['EPO'] !== 'Missing') { $nEPO++ ; } - if ((dateDiffInDays($data[$i]['EPOlu'].split(" ")[0]) > 7 || $data[$i]['EPOlu'] == 'Missing') && $data[$i]['EPO'] !== 'Missing'){ $nEPO-- ;} + if ($data[$i]['NESSUS'] !== 'Missing') { $nEPO++ ; } if ($data[$i]['Backup'] !== 'Missing') { $nNBU++ ; } if ((dateDiffInDays($data[$i]['NBUlu'].split(" ")[0]) > 30 || $data[$i]['NBUlu'] == 'Missing') && $data[$i]['Backup'].split(" ")[0] !== 'Missing'){ $nNBU-- ;} if (($data[$i]['OS'].includes('XP') || $data[$i]['OS'].includes('2000') || $data[$i]['OS'].includes('2003') || $data[$i]['OS'].includes('2008') || $data[$i]['OS'].includes('2012') || $data[$i]['OS'].includes('7') || $data[$i]['OS'].includes('Windows NT')) == false && $data[$i]['OS'] !==' ') { $nOS++ ;} diff --git a/crossover/Detail.php b/crossover/Detail.php index de3ad0b..f60fba1 100644 --- a/crossover/Detail.php +++ b/crossover/Detail.php @@ -188,8 +188,8 @@ echo "
"; echo "
"; - // EPO - echo "

EPO

" ; + // Nessus + echo "

Nessus

" ; echo "
"; if(isset($row['EPO'])){ if($row['EPO']=="Y"){ @@ -198,24 +198,9 @@ echo "
"; } }else{ - echo "
"; + echo "
"; } - if(isset($row['EPOlu'])){ - echo "
Last Update
"; - $date1=date_create($row['EPOlu']); - $diff=date_diff($date1,date_create(date("Y-m-d"))); - if($diff->format("%R%a") > 7){ - echo "
format("%R%a"))." days)'>
"; - }else{ - echo "
format("%R%a"))." days)'>
"; - } - }else{ - if(!(isset($row['EPO']) && $row['EPO'] !=="Y")){ - echo "
Last Update
"; - echo "
"; - } - } - echo "
"; + echo "
"; echo "

"; // NBU diff --git a/crossover/GlobalCrossover.php b/crossover/GlobalCrossover.php index 2180b41..34de483 100644 --- a/crossover/GlobalCrossover.php +++ b/crossover/GlobalCrossover.php @@ -40,7 +40,7 @@
-

Global Crossover

+

Global Crossover (Updated every 15mn)

@@ -66,9 +66,9 @@ $result = $conn->query("select * from GlobalCrossover where SCCM is null or (SCCMlu is not null and DATEDIFF(now(),SCCMlu) > 7) order by server"); echo "

Filter : SCCM non compliant

"; break; - case "EPO": - $result = $conn->query("select * from GlobalCrossover where EPO is null or (EPOlu is not null and DATEDIFF(now(),EPOlu) > 7) order by server"); - echo "

Filter : EPO non compliant

"; + case "NESSUS": + $result = $conn->query("select * from GlobalCrossover where EPO is null order by server"); + echo "

Filter : NESSUS non compliant

"; break; case "NBU": $result = $conn->query("select * from GlobalCrossover where NBU is null or (NBUlu is not null and DATEDIFF(now(),NBUlu) > 30) order by server"); @@ -107,8 +107,7 @@ Inventory SCCM
SCCM Last Heartbeat - EPO - EPO Last Update + NESSUS Backup Last Backup SCOM @@ -128,7 +127,7 @@ $nSCCM = 0; $nGLPI = 0; $nFI = 0; - $nEPO = 0; + $nNESSUS = 0; $nNBU = 0; $nDPM = 0; $nS1 = 0; @@ -148,7 +147,7 @@ $nOS++; echo "" . $row['OS'] . ""; } else { - echo "" . $row['OS'] . ""; + echo "" . $row['OS'] . ""; } } else { echo " "; @@ -176,7 +175,7 @@ echo " "; $nSCCM++; } else { - echo "Missing"; + echo "Missing"; echo " "; } } @@ -195,7 +194,7 @@ echo "" . $row['GLPIlu'] . ""; } else { echo "OK"; - echo "Missing"; + echo "Missing"; } } $nGLPI++; @@ -205,7 +204,7 @@ echo " "; $nGLPI++; } else { - echo "Missing"; + echo "Missing"; echo " "; } } @@ -228,31 +227,20 @@ echo " "; $nSCCM++; } else { - echo "Missing"; + echo "Missing"; echo " "; } } - // EPO - if ($row['EPO'] == 'Y') { - $date1 = date_create($row['EPOlu']); - $diff = date_diff($date1, date_create(date("Y-m-d"))); - if ($diff->format("%R%a") > 7) { - echo "OK"; - echo "" . $row['EPOlu'] . " (" . $diff->format("%R%a") . " days)"; - } else { - echo "OK"; - echo "" . $row['EPOlu'] . ""; - $nEPO++; - } + // NESSUS + if (strpos($row['EPO'], '.') !== false ) { + echo "".$row['EPO'].""; } else { - if (isset($row['EPO'])) { + if (isset($row['EPO']) && $row['EPO'] != 'Y' && $row['EPO'] != 'N') { echo "" . $row['EPO'] . ""; - echo " "; - $nEPO++; } else { - echo "Missing"; - echo " "; + echo "Missing"; + $nNESSUS++; } } @@ -289,7 +277,7 @@ echo "" . $row['DPM'] . ""; echo " "; } - echo "Missing"; + echo "Missing"; echo " "; } } @@ -302,41 +290,42 @@ if (isset($row['SCOM'])) { echo "" . $row['SCOM'] . ""; } else { - echo "Missing"; + echo "Missing"; } } // zabbix - if ($row['zabbix'] == 'Y') { - echo "OK"; + if ($row['zabbix'] == 'Y' || strpos($row['zabbix'], '.') !== false ) { + echo "".str_replace('Y','OK',$row['zabbix']).""; } else { if (isset($row['zabbix'])) { echo "" . $row['zabbix'] . ""; } else { - echo "Missing"; + echo "Missing"; } } // S1 - if ($row['S1'] == 'Y') { + if ($row['S1'] == 'Y' || strpos($row['S1'], '.') !== false) { $date1 = date_create($row['S1lu']); $diff = date_diff($date1, date_create(date("Y-m-d"))); if ($diff->format("%R%a") > 7) { - echo "OK"; + echo "".str_replace('Y','OK',$row['S1']).""; echo "" . $row['S1lu'] . " (" . $diff->format("%R%a") . " days)"; } else { - echo "OK"; + echo "".str_replace('Y','OK',$row['S1']).""; echo "" . $row['S1lu'] . ""; $nS1++; } } else { if (isset($row['S1'])) { + if($row['S1'] == "N"){$row['S1'] = "Non Supported OS";} echo "" . $row['S1'] . ""; echo " "; $nS1++; } else { - echo "Missing"; - echo " "; + echo "Missing"; + echo " "; } } echo ""; @@ -401,8 +390,8 @@
-
EPO
- +
NESSUS
+

diff --git a/crossover/GlobalCrossover2.php b/crossover/GlobalCrossover2.php index e755591..59f9520 100644 --- a/crossover/GlobalCrossover2.php +++ b/crossover/GlobalCrossover2.php @@ -8,6 +8,7 @@ Web Infra Reports + @@ -106,8 +107,6 @@ Inventory SCCM
SCCM Last Heartbeat - EPO - EPO Last Update Backup Last Backup SCOM @@ -127,7 +126,6 @@ $nSCCM = 0; $nGLPI = 0; $nFI = 0; - $nEPO = 0; $nNBU = 0; $nDPM = 0; $nS1 = 0; @@ -232,28 +230,6 @@ } } - // EPO - if ($row['EPO'] == 'Y') { - $date1 = date_create($row['EPOlu']); - $diff = date_diff($date1, date_create(date("Y-m-d"))); - if ($diff->format("%R%a") > 7) { - echo "OK"; - echo "" . $row['EPOlu'] . " (" . $diff->format("%R%a") . " days)"; - } else { - echo "OK"; - echo "" . $row['EPOlu'] . ""; - $nEPO++; - } - } else { - if (isset($row['EPO'])) { - echo "" . $row['EPO'] . ""; - echo " "; - $nEPO++; - } else { - echo "Missing"; - echo " "; - } - } // BACKUP if ($row['NBU'] == 'Y') { @@ -306,8 +282,8 @@ } // zabbix - if ($row['zabbix'] == 'Y') { - echo "OK"; + if ($row['zabbix'] == 'Y' || strpos($row['zabbix'], '.') !== false ) { + echo "".str_replace('Y','OK',$row['zabbix']).""; } else { if (isset($row['zabbix'])) { echo "" . $row['zabbix'] . ""; @@ -398,16 +374,6 @@
-
-
-
EPO
- -
-

-
- -
-
Backup
diff --git a/dashboard/EPO-Detail.php b/dashboard/EPO-Detail.php index 5d928d3..9a1c1c9 100644 --- a/dashboard/EPO-Detail.php +++ b/dashboard/EPO-Detail.php @@ -37,14 +37,14 @@
-

EPO

+

NESSUS

query("SELECT * FROM GlobalCrossover where epo = 'Y' order by server"); + $result = $conn->query("SELECT * FROM GlobalCrossover where epo like '%.%' order by server"); ?> - + @@ -61,12 +61,7 @@ while ($row = mysqli_fetch_array($result)) { echo ""; echo ""; - $lu=date_create($row['EPOlu']); - $diff=date_diff($lu,date_create(date("Y-m-d"))); - if($diff->format("%R%a") > 7){ - echo ""; - }else{ - echo ""; + echo ""; } echo ""; } diff --git a/dashboard/Nessus-Detail.php b/dashboard/Nessus-Detail.php new file mode 100644 index 0000000..f45e574 --- /dev/null +++ b/dashboard/Nessus-Detail.php @@ -0,0 +1,79 @@ + + + + + + + + + Web Infra Reports + + + + + + + + + + + + + + + + + + + + +
+
+ +
+ +
+ +
+ +

NESSUS

+ + +
+ + query("SELECT * FROM GlobalCrossover where epo like '%.%' order by server"); + ?> + +
NameLast UpdateVersion
".$row['Server']."".$row['EPOlu']."".$row['EPOlu']."".$row['EPO']."
+ + + + + + + "; + echo ""; + echo ""; + echo ""; + } + ?> + +
NameVersion
".$row['Server']."".$row['EPO']."
+ +
+
+
+ + + + + + diff --git a/dashboard/S1-Detail.php b/dashboard/S1-Detail.php index 41e9502..51afd7d 100644 --- a/dashboard/S1-Detail.php +++ b/dashboard/S1-Detail.php @@ -44,7 +44,7 @@ query("SELECT * FROM GlobalCrossover where S1 = 'Y' order by server"); + $result = $conn->query("SELECT * FROM GlobalCrossover where S1 like '%.%' order by server"); ?> format("%R%a") > 7){ - echo ""; + echo ""; }else{ - echo ""; + echo ""; } echo ""; } diff --git a/include/db_connect.inc.php b/include/db_connect.inc.php index 797bbc4..f7582c1 100644 --- a/include/db_connect.inc.php +++ b/include/db_connect.inc.php @@ -82,6 +82,26 @@ function Invoke_WebInfraTools($request) } } +// MySQL web-infra-tools sur DUN-SUP-S2ENTRY +function Invoke_WebInfraReports($request) +{ + $user = "admin"; + $pwd = "Arth3m1s&*0"; + $server = "dun-sup-s2entry.armony.net:3306"; + $database = "web-infra-reports"; + $conn = new mysqli($server, $user, $pwd, $database); + if (!($conn)) { + echo "Pas de connexion"; + } + $rs = $conn->query($request); + while ($row = mysqli_fetch_array($rs)) { + $answer[] = $row; + } + if (isset($answer)) { + return $answer; + } +} + //INFRA sur DUN-PRD-R1MSSQL\PRD function Invoke_Infra($request) { diff --git a/index.php b/index.php index baad522..76ba22b 100644 --- a/index.php +++ b/index.php @@ -114,16 +114,16 @@ -
+
-
EPO
+
NESSUS
query("SELECT count(*) as nbepo FROM GlobalCrossover where epo = 'Y'"); - $nbepo = mysqli_fetch_array($result)['nbepo']; + $result = $conn->query("SELECT count(*) as nbnessus FROM GlobalCrossover where epo like '%.%'"); + $nbnessus = mysqli_fetch_array($result)['nbnessus']; ?> -

Agents

+

Agents

@@ -133,7 +133,7 @@
SentinelOne
query("SELECT count(*) as nbS1 FROM GlobalCrossover where S1 = 'Y'"); + $result = $conn->query("SELECT count(*) as nbS1 FROM GlobalCrossover where S1 like '%.%'"); $nbS1 = mysqli_fetch_array($result)['nbS1']; ?>

Agents

diff --git a/navbar.html b/navbar.html index d088e05..c2dfd7f 100644 --- a/navbar.html +++ b/navbar.html @@ -54,6 +54,8 @@
".$row['EPOlu']."".$row['S1lu']."".$row['EPOlu']."".$row['S1lu']."