pizid/Web-Infra-Reports-IT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused PHP files related to Hyper-V and Storage dashboards

Browse Source 
- Deleted `cluster-detail2.php`, `constants.inc copy.php`, `D.php`, and `Dashboard2.php`. These files were no longer in use and contributed to unnecessary clutter in the codebase.
- Cleaned up references to removed files.
This commit is contained in:
e025532
2025-07-29 14:02:06 +02:00
parent 1f794e2273
commit 5c7ea9f3fc
70 changed files with 14141 additions and 6259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Inventory/Server-Detail.php
View File

@@ -32,10 +32,6 @@
animation: blink 1.2s infinite;
}
</style>
</head>
<body class="bg-light text-dark">
@@ -95,7 +91,10 @@
echo "</div></div></body></HTML>";
exit;
}
if(strpos($Qw[0]['DECOM'], '-') || strpos($Qx[0]['Decom'], '-')){
$isDecomInQw = is_array($Qw) && !empty($Qw[0]['DECOM']) && str_contains($Qw[0]['DECOM'], '-');
$isDecomInQx = is_array($Qx) && !empty($Qx[0]['Decom']) && str_contains($Qx[0]['Decom'], '-');
if($isDecomInQw || $isDecomInQx){
echo '<h1><span class="badge text-bg-danger font-weight-bold blinking" style="width:100%;">'. strtoupper($server) .' : DECOMMISSIONED !</span></h1>';
echo '<script src="/js/switch.js"></script>';
echo "</div></div></body></HTML>";
@@ -162,27 +161,40 @@
</div>
</div>
</div>
<script src="fillchart2.js"></script>
<script src="fillchart.js"></script>
</div>
<!-- Drives -->
<?php
// LUNs ?
$luns = Invoke_WebInfraTools("select count(*) as lun from storage_lun where hostname = '$server'");
if($luns[0]['lun'] >0 || $Qvm[0]['WWPNs'] != ""){
$wwpns = "";
if($luns[0]['lun'] == 0){$luns = "Some LUNs are owned by cluster";}else{$luns = $luns[0]['lun']." LUNs";}
if(is_array($Qvm)){$wwpns = str_replace("|",", ",$Qvm[0]['WWPNs']);}
echo "<div style=\"text-align: center;\"><span class='badge rounded-pill bg-primary text-light fs-5'>" .$luns."</span>";
if($wwpns != ""){echo "&nbsp;<span class='badge rounded-pill bg-secondary text-light fs-5'>WWPNs :".$wwpns."</span></div><br>";}else{echo "</div><br>";}
$luns_result = Invoke_WebInfraTools("select count(*) as lun from storage_lun where hostname = '$server'");
$lun_count = $luns_result[0]['lun'] ?? 0;
$wwpn_string = $Qvm[0]['WWPNs'] ?? '';
if ($lun_count > 0 || $wwpn_string !== '') {
if ($lun_count > 0) {
$luns_display = $lun_count . " LUNs";
} else {
$luns_display = "Some LUNs are owned by cluster";
}
$wwpns_display = str_replace("|", ", ", $wwpn_string);
echo "<div style=\"text-align: center;\">";
echo "<span class='badge rounded-pill bg-primary text-light fs-5'>$luns_display</span>";
if ($wwpns_display !== '') {
echo "&nbsp;<span class='badge rounded-pill bg-secondary text-light fs-5'>WWPNs: $wwpns_display</span>";
}
echo "</div><br>";
}
?>
<div class="row" id="drives">
<?php
// Drives
$drives = explode("|",$Qw[0]['drives']);
if($drives[0] === "O"){$drives = explode("|",$Qx[0]['Drives']);}
if($drives[0] != "O" && $drives[0] != ""){
if($OSType == "Windows"){
$drives = explode("|",$Qw[0]['drives'] ?? '');
}else{
$drives = explode("|",$Qx[0]['Drives'] ?? '');
}
if($drives[0] != ""){
foreach($drives as $drive){
echo "<div class='col-6'><div class='row'>";
$data = explode(",",$drive);

12
Inventory/Z_data_aix.php
View File

@@ -1,13 +1,9 @@
<?php
// Zabbix DB
$host = 'aztprdzabbix52.armony.net';
$dbname = 'zabbix';
$user = 'patrick';
$pass = 'showZabbix@dash1';
$pdo = new PDO("mysql:host=$host;dbname=$dbname", $user, $pass);
include $_SERVER['DOCUMENT_ROOT']."/../../include/db_connect.php" ;
$pdo = DB_ZABBIX();
$server = strtolower($_GET['c']);
$server = strtolower($_GET['c']);
$now = time();
$past_24h = $now - 86400; // 24H

12
Inventory/Z_data_linux.php
View File

@@ -1,13 +1,9 @@
<?php
// Zabbix DB
$host = 'aztprdzabbix52.armony.net';
$dbname = 'zabbix';
$user = 'patrick';
$pass = 'showZabbix@dash1';
$pdo = new PDO("mysql:host=$host;dbname=$dbname", $user, $pass);
include $_SERVER['DOCUMENT_ROOT']."/../../include/db_connect.php" ;
$pdo = DB_ZABBIX();
$server = strtolower($_GET['c']);
$server = strtolower($_GET['c']);
$now = time();
$past_24h = $now - 86400; // 24H

11
Inventory/Z_data_windows.php
View File

@@ -1,11 +1,6 @@
<?php /** @noinspection PhpIllegalStringOffsetInspection */
// Zabbix DB
$host = 'aztprdzabbix52.armony.net';
$dbname = 'zabbix';
$user = 'patrick';
$pass = 'showZabbix@dash1';
$pdo = new PDO("mysql:host=$host;dbname=$dbname", $user, $pass);
<?php
include $_SERVER['DOCUMENT_ROOT']."/../../include/db_connect.php" ;
$pdo = DB_ZABBIX();
$server = strtoupper($_GET['c']);
$now = time();

161
Inventory/fillchart.js
View File

@@ -1,55 +1,67 @@
let typ = document.getElementById("type").dataset.value;
let computer = document.getElementById("computer").dataset.value;
async function fetchAndDisplayData() {
try {
const response = await fetch(`z_data_${typ}.php?c=${computer}`);
const jsonData = await response.json();
const data = jsonData.data || jsonData;
const data = jsonData.data || jsonData; // Utilisation plus robuste
const cpuKey = Object.keys(data).find(key => key.includes('CPU'));
const ramKey = Object.keys(data).find(key => key.includes('Memory'));
const labels = [];
// Utilisation d'un Set pour collecter les labels uniques plus efficacement
const uniqueLabels = new Set();
if (cpuKey && data[cpuKey]) {
data[cpuKey].forEach(point => {
if (!labels.includes(point.datetime)) {
labels.push(point.datetime);
}
});
data[cpuKey].forEach(point => uniqueLabels.add(point.datetime));
}
if (ramKey && data[ramKey]) {
data[ramKey].forEach(point => {
if (!labels.includes(point.datetime)) {
labels.push(point.datetime);
}
});
data[ramKey].forEach(point => uniqueLabels.add(point.datetime));
}
labels.sort();
const cpuDataMap = {};
const ramDataMap = {};
if (cpuKey && data[cpuKey]) {
data[cpuKey].forEach(point => {
cpuDataMap[point.datetime] = parseFloat(point.avg_value);
});
}
if (ramKey && data[ramKey]) {
data[ramKey].forEach(point => {
ramDataMap[point.datetime] = parseFloat(point.avg_value);
});
}
const cpuChartData = labels.map(label => cpuDataMap[label] || null);
const ramChartData = labels.map(label => ramDataMap[label] || null);
const labels = Array.from(uniqueLabels).sort(); // Conversion en Array et tri
// Fonction pour créer une map de données
const createDataMap = (key, rawData) => {
const map = {};
if (key && rawData[key]) {
rawData[key].forEach(point => {
map[point.datetime] = parseFloat(point.avg_value);
});
}
return map;
};
const cpuDataMap = createDataMap(cpuKey, data);
const ramDataMap = createDataMap(ramKey, data);
// Fonction pour générer les données du graphique
const getChartData = (map, sortedLabels) => sortedLabels.map(label => map[label] ?? null);
const cpuChartData = getChartData(cpuDataMap, labels);
const ramChartData = getChartData(ramDataMap, labels);
// Formatage des labels pour l'axe X
const formattedLabels = labels.map(label => {
const date = new Date(label);
return date.toLocaleTimeString('fr-FR', {hour: '2-digit', minute: '2-digit'});
return !isNaN(date)
? date.toLocaleTimeString('fr-FR', { hour: '2-digit', minute: '2-digit' })
: 'Invalid Date';
});
if (cpuKey && data[cpuKey] && data[cpuKey].length > 0) {
const ctx1 = document.getElementById('cpuChart').getContext('2d');
new Chart(ctx1, {
// *** Fonction pour créer un graphique (adaptée pour v2.x) ***
const createChartV2 = (canvasId, label, chartData, formattedLabels) => {
const ctx = document.getElementById(canvasId)?.getContext('2d');
if (!ctx) {
console.error(`Canvas element with id "${canvasId}" not found.`);
return null;
}
return new Chart(ctx, {
type: 'line',
data: {
labels: formattedLabels,
datasets: [{
label: 'CPU (%)',
data: cpuChartData,
label: label, // Garde le label pour l'infobulle
data: chartData,
borderColor: 'rgb(54, 162, 235)',
backgroundColor: 'rgba(54, 162, 235, 0.1)',
fill: true,
@@ -58,40 +70,69 @@ async function fetchAndDisplayData() {
}]
},
options: {
legend: {display: false},
legend: {
display: false // Cacher la légende en v2
},
responsive: true,
maintainAspectRatio: false,
scales: {y: {beginAtZero: true}}
scales: {
yAxes: [{ // *** Utilisation de yAxes (tableau) pour v2.x ***
ticks: {
beginAtZero: true,
// Ajout de la fonction callback pour formater les labels de l'axe Y
callback: function(value, index, values) { // Note: le 3ème argument est 'values' en v2
return value + '%'; // Ajoute le symbole %
}
// max: 100, // Optionnel mais recommandé pour les pourcentages
// stepSize: 5 // Optionnel: pour suggérer un intervalle
}
// scaleLabel: { // Si vous vouliez un titre d'axe en v2 (ce que vous ne voulez pas)
// display: false,
// labelString: 'Utilisation (%)'
// }
}],
xAxes: [{ // *** xAxes doit aussi être dans un tableau en v2.x ***
// ... autres options pour l'axe X si nécessaire ...
}]
},
tooltips: { // *** 'tooltips' au pluriel en v2.x ***
callbacks: {
label: function(tooltipItem, data) { // Arguments différents en v2
let label = data.datasets[tooltipItem.datasetIndex].label || '';
if (label) {
label += ': ';
}
// tooltipItem.yLabel contient la valeur numérique en v2
if (tooltipItem.yLabel !== null && typeof tooltipItem.yLabel !== 'undefined') {
label += tooltipItem.yLabel + '%';
}
return label;
}
}
}
}
});
};
// Création des graphiques en utilisant la fonction adaptée pour v2.x
if (cpuKey && data[cpuKey]?.length > 0) {
createChartV2('cpuChart', 'CPU (%)', cpuChartData, formattedLabels);
} else {
const cpuChartElement = document.getElementById('cpuChart');
if (cpuChartElement) cpuChartElement.style.display = 'none';
console.log("Pas de données CPU à afficher.");
}
if (ramKey && data[ramKey] && data[ramKey].length > 0) {
const ctx2 = document.getElementById('ramChart').getContext('2d');
new Chart(ctx2, {
type: 'line',
data: {
labels: formattedLabels,
datasets: [{
label: 'Memory (%)',
data: ramChartData,
borderColor: 'rgb(54, 162, 235)',
backgroundColor: 'rgba(54, 162, 235, 0.1)',
fill: true,
tension: 0.3,
pointRadius: 0
}]
},
options: {
legend: {display: false},
responsive: true,
maintainAspectRatio: false,
scales: {y: {beginAtZero: true}}
}
});
if (ramKey && data[ramKey]?.length > 0) {
createChartV2('ramChart', 'Memory (%)', ramChartData, formattedLabels);
} else {
const ramChartElement = document.getElementById('ramChart');
if (ramChartElement) ramChartElement.style.display = 'none';
console.log("Pas de données RAM à afficher.");
}
} catch (error) {
console.error('Erreur:', error);
console.error('Erreur lors de la récupération ou de l\'affichage des données:', error);
}
}

98
Inventory/fillchart.js.old Normal file
View File

@@ -0,0 +1,98 @@
let typ = document.getElementById("type").dataset.value;
let computer = document.getElementById("computer").dataset.value;
async function fetchAndDisplayData() {
try {
const response = await fetch(`z_data_${typ}.php?c=${computer}`);
const jsonData = await response.json();
const data = jsonData.data || jsonData;
const cpuKey = Object.keys(data).find(key => key.includes('CPU'));
const ramKey = Object.keys(data).find(key => key.includes('Memory'));
const labels = [];
if (cpuKey && data[cpuKey]) {
data[cpuKey].forEach(point => {
if (!labels.includes(point.datetime)) {
labels.push(point.datetime);
}
});
}
if (ramKey && data[ramKey]) {
data[ramKey].forEach(point => {
if (!labels.includes(point.datetime)) {
labels.push(point.datetime);
}
});
}
labels.sort();
const cpuDataMap = {};
const ramDataMap = {};
if (cpuKey && data[cpuKey]) {
data[cpuKey].forEach(point => {
cpuDataMap[point.datetime] = parseFloat(point.avg_value);
});
}
if (ramKey && data[ramKey]) {
data[ramKey].forEach(point => {
ramDataMap[point.datetime] = parseFloat(point.avg_value);
});
}
const cpuChartData = labels.map(label => cpuDataMap[label] || null);
const ramChartData = labels.map(label => ramDataMap[label] || null);
const formattedLabels = labels.map(label => {
const date = new Date(label);
return date.toLocaleTimeString('fr-FR', {hour: '2-digit', minute: '2-digit'});
});
if (cpuKey && data[cpuKey] && data[cpuKey].length > 0) {
const ctx1 = document.getElementById('cpuChart').getContext('2d');
new Chart(ctx1, {
type: 'line',
data: {
labels: formattedLabels,
datasets: [{
label: 'CPU (%)',
data: cpuChartData,
borderColor: 'rgb(54, 162, 235)',
backgroundColor: 'rgba(54, 162, 235, 0.1)',
fill: true,
tension: 0.3,
pointRadius: 0
}]
},
options: {
legend: {display: false},
responsive: true,
maintainAspectRatio: false,
scales: {y: {beginAtZero: true}}
}
});
}
if (ramKey && data[ramKey] && data[ramKey].length > 0) {
const ctx2 = document.getElementById('ramChart').getContext('2d');
new Chart(ctx2, {
type: 'line',
data: {
labels: formattedLabels,
datasets: [{
label: 'Memory (%)',
data: ramChartData,
borderColor: 'rgb(54, 162, 235)',
backgroundColor: 'rgba(54, 162, 235, 0.1)',
fill: true,
tension: 0.3,
pointRadius: 0
}]
},
options: {
legend: {display: false},
responsive: true,
maintainAspectRatio: false,
scales: {y: {beginAtZero: true}}
}
});
}
} catch (error) {
console.error('Erreur:', error);
}
}
window.addEventListener('load', fetchAndDisplayData);

139
Inventory/fillchart2.js
View File

@@ -1,139 +0,0 @@
let typ = document.getElementById("type").dataset.value;
let computer = document.getElementById("computer").dataset.value;
async function fetchAndDisplayData() {
try {
const response = await fetch(`z_data_${typ}.php?c=${computer}`);
const jsonData = await response.json();
const data = jsonData.data || jsonData; // Utilisation plus robuste
const cpuKey = Object.keys(data).find(key => key.includes('CPU'));
const ramKey = Object.keys(data).find(key => key.includes('Memory'));
// Utilisation d'un Set pour collecter les labels uniques plus efficacement
const uniqueLabels = new Set();
if (cpuKey && data[cpuKey]) {
data[cpuKey].forEach(point => uniqueLabels.add(point.datetime));
}
if (ramKey && data[ramKey]) {
data[ramKey].forEach(point => uniqueLabels.add(point.datetime));
}
const labels = Array.from(uniqueLabels).sort(); // Conversion en Array et tri
// Fonction pour créer une map de données
const createDataMap = (key, rawData) => {
const map = {};
if (key && rawData[key]) {
rawData[key].forEach(point => {
map[point.datetime] = parseFloat(point.avg_value);
});
}
return map;
};
const cpuDataMap = createDataMap(cpuKey, data);
const ramDataMap = createDataMap(ramKey, data);
// Fonction pour générer les données du graphique
const getChartData = (map, sortedLabels) => sortedLabels.map(label => map[label] ?? null);
const cpuChartData = getChartData(cpuDataMap, labels);
const ramChartData = getChartData(ramDataMap, labels);
// Formatage des labels pour l'axe X
const formattedLabels = labels.map(label => {
const date = new Date(label);
return !isNaN(date)
? date.toLocaleTimeString('fr-FR', { hour: '2-digit', minute: '2-digit' })
: 'Invalid Date';
});
// *** Fonction pour créer un graphique (adaptée pour v2.x) ***
const createChartV2 = (canvasId, label, chartData, formattedLabels) => {
const ctx = document.getElementById(canvasId)?.getContext('2d');
if (!ctx) {
console.error(`Canvas element with id "${canvasId}" not found.`);
return null;
}
return new Chart(ctx, {
type: 'line',
data: {
labels: formattedLabels,
datasets: [{
label: label, // Garde le label pour l'infobulle
data: chartData,
borderColor: 'rgb(54, 162, 235)',
backgroundColor: 'rgba(54, 162, 235, 0.1)',
fill: true,
tension: 0.3,
pointRadius: 0
}]
},
options: {
legend: {
display: false // Cacher la légende en v2
},
responsive: true,
maintainAspectRatio: false,
scales: {
yAxes: [{ // *** Utilisation de yAxes (tableau) pour v2.x ***
ticks: {
beginAtZero: true,
// Ajout de la fonction callback pour formater les labels de l'axe Y
callback: function(value, index, values) { // Note: le 3ème argument est 'values' en v2
return value + '%'; // Ajoute le symbole %
}
// max: 100, // Optionnel mais recommandé pour les pourcentages
// stepSize: 5 // Optionnel: pour suggérer un intervalle
}
// scaleLabel: { // Si vous vouliez un titre d'axe en v2 (ce que vous ne voulez pas)
// display: false,
// labelString: 'Utilisation (%)'
// }
}],
xAxes: [{ // *** xAxes doit aussi être dans un tableau en v2.x ***
// ... autres options pour l'axe X si nécessaire ...
}]
},
tooltips: { // *** 'tooltips' au pluriel en v2.x ***
callbacks: {
label: function(tooltipItem, data) { // Arguments différents en v2
let label = data.datasets[tooltipItem.datasetIndex].label || '';
if (label) {
label += ': ';
}
// tooltipItem.yLabel contient la valeur numérique en v2
if (tooltipItem.yLabel !== null && typeof tooltipItem.yLabel !== 'undefined') {
label += tooltipItem.yLabel + '%';
}
return label;
}
}
}
}
});
};
// Création des graphiques en utilisant la fonction adaptée pour v2.x
if (cpuKey && data[cpuKey]?.length > 0) {
createChartV2('cpuChart', 'CPU (%)', cpuChartData, formattedLabels);
} else {
const cpuChartElement = document.getElementById('cpuChart');
if (cpuChartElement) cpuChartElement.style.display = 'none';
console.log("Pas de données CPU à afficher.");
}
if (ramKey && data[ramKey]?.length > 0) {
createChartV2('ramChart', 'Memory (%)', ramChartData, formattedLabels);
} else {
const ramChartElement = document.getElementById('ramChart');
if (ramChartElement) ramChartElement.style.display = 'none';
console.log("Pas de données RAM à afficher.");
}
} catch (error) {
console.error('Erreur lors de la récupération ou de l\'affichage des données:', error);
}
}
window.addEventListener('load', fetchAndDisplayData);

8
Inventory/search_servers.php
View File

@@ -1,14 +1,10 @@
<?php
header('Content-Type: application/json');
include $_SERVER['DOCUMENT_ROOT']."/include/db_connect.inc.php" ;
include $_SERVER['DOCUMENT_ROOT']."/../../include/db_connect.php" ;
if (isset($_GET['term'])) {
$term = $_GET['term'];
$query = "SELECT hostname AS serv FROM cmdb_srvall WHERE hostname LIKE '%$term%' UNION SELECT hostname AS serv FROM x_SRVALL WHERE hostname LIKE '%$term%'";
$user = "INFRA_dbo";
$pwd = "Q3pUz2x9YL2r6k";
$server = "DUN-PRD-R1MSSQL.armony.net\PRD";
$database = "INFRA";
$conn = odbc_connect("Driver={SQL Server};Server=$server;Database=$database;", $user, $pwd);
$conn = DB_INFRA();
$rs = odbc_exec($conn, $query);
while ($row = odbc_fetch_array($rs)) {
$servers[] = $row;