Final commit, bit messy but oh well
This commit is contained in:
parent
8fce369780
commit
3652283345
13 changed files with 5908 additions and 1720030 deletions
BIN
GeoIP.dat
Normal file
BIN
GeoIP.dat
Normal file
Binary file not shown.
BIN
GeoLiteCity.dat
Normal file
BIN
GeoLiteCity.dat
Normal file
Binary file not shown.
|
@ -1,3 +0,0 @@
|
|||
UPDATE serverlist SET OS = "Linux" WHERE OS LIKE "Linux%";
|
||||
UPDATE serverlist SET OS = "AIX" WHERE OS LIKE "AIX%";
|
||||
UPDATE serverlist SET OS = "Windows" WHERE OS LIKE "Windows%";
|
BIN
Thumbs.db
Normal file
BIN
Thumbs.db
Normal file
Binary file not shown.
5785
bootstrap.css
vendored
Normal file
5785
bootstrap.css
vendored
Normal file
File diff suppressed because it is too large
Load diff
28
change.css
Normal file
28
change.css
Normal file
|
@ -0,0 +1,28 @@
|
|||
#intro {
|
||||
background: url(images/intro.png) 50% 0 fixed !important;
|
||||
height: auto !important;
|
||||
margin: 0 auto !important;
|
||||
width: 100% !important;
|
||||
position: relative !important;
|
||||
box-shadow: 0 0 50px rgba(0,0,0,0.8) !important;
|
||||
padding: 100px 0 !important;
|
||||
}
|
||||
#home {
|
||||
background: url(images/home.jpg) 50% 0 fixed !important;
|
||||
height: auto !important;
|
||||
margin: 0 auto !important;
|
||||
width: 100% !important;
|
||||
position: relative !important;
|
||||
box-shadow: 0 0 50px rgba(0,0,0,0.8) !important;
|
||||
padding: 200px 0 !important;
|
||||
}
|
||||
#about {
|
||||
background: url(images/about.png) 50% 0 fixed !important;
|
||||
height: auto !important;
|
||||
margin: 0 auto !important;
|
||||
width: 100% !important;
|
||||
position: relative !important;
|
||||
box-shadow: 0 0 50px rgba(0,0,0,0.8) !important;
|
||||
padding: 100px 0 !important;
|
||||
color: #fff !important;
|
||||
}
|
4
connect.php
Normal file
4
connect.php
Normal file
|
@ -0,0 +1,4 @@
|
|||
<?php
|
||||
$conn = mysqli_connect(#NOPE#);
|
||||
mysqli_select_db($conn, 'serverlist');
|
||||
?>
|
BIN
cosmos.png
Normal file
BIN
cosmos.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 45 KiB |
|
@ -6,6 +6,11 @@
|
|||
<style type="text/css">
|
||||
html, body, #map-canvas { height: 100%; margin: 0; padding: 0;}
|
||||
</style>
|
||||
<link rel="stylesheet" type="text/css" href="bootstrap.css">
|
||||
<link rel="stylesheet" type="text/css" href="change.css">
|
||||
|
||||
|
||||
|
||||
<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
|
||||
<script type="text/javascript" src="sorttable.js"></script>
|
||||
<script type="text/javascript">
|
||||
|
@ -5707,13 +5712,13 @@ OSData.addRows([
|
|||
]);
|
||||
// Set chart options
|
||||
var hostTypeOptions = {'title':'Types of Servers',
|
||||
'width':400,
|
||||
'width':350,
|
||||
'height':300};
|
||||
var CPUsOptions = {'title':'Number of Cores',
|
||||
'width':500,
|
||||
'width':400,
|
||||
'height':300};
|
||||
var OSOptions = {'title':'OS',
|
||||
'width':400,
|
||||
'width':350,
|
||||
'height':300};
|
||||
// Instantiate and draw our chart, passing in some options.
|
||||
var pie_chart1 = new google.visualization.PieChart(document.getElementById('pie_chart1'));
|
||||
|
@ -5748,12 +5753,94 @@ pie_chart2.draw(OSData, OSOptions);
|
|||
|
||||
|
||||
<body style="margin:0px; padding:0px;" onload="initialize()">
|
||||
<div id="map_canvas" style="width: 50%; height: 50%;"></div>
|
||||
|
||||
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="well" style="text-align:center;">
|
||||
<img src="cosmos.png">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="well">
|
||||
<div id="map_canvas" style="width: 80%; height: 50%; border-radius: 4px; margin:auto;"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="well" style="height: 340px;">
|
||||
<!--Div that will hold the pie chart-->
|
||||
<div id="pie_chart1" style="display: inline; float: left;"></div>
|
||||
<!--Div that will hold the bar chart-->
|
||||
<div id="bar_chart" style="display: inline; float: left;"></div>
|
||||
<!--Div that will hold the pie chart-->
|
||||
<div id="pie_chart2" style="display: inline; float: left;"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="well">
|
||||
|
||||
<div id="container"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
|
||||
|
||||
|
||||
<div class="bs-component">
|
||||
<table class="sortable table table-striped table-hover ">
|
||||
|
||||
|
||||
|
||||
<thead>
|
||||
<tr>
|
||||
<th>IP</th>
|
||||
<th>Operating System</th>
|
||||
<th>Amount of CPUs</th>
|
||||
<th>Name</th>
|
||||
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody
|
||||
|
||||
|
||||
|
||||
<?php
|
||||
include_once('connect.php');
|
||||
$result = mysqli_query($conn, "SELECT IPid, IP, OS, CPUamount, Name FROM serverlist;");
|
||||
|
||||
while($row = mysqli_fetch_row($result)){
|
||||
echo "<tr>";
|
||||
echo "<td><a href =\"asteroidinfopage.php?"."id=".$row[0]."\">".$row[1]."</a></td>";
|
||||
echo "<td><a href =\"asteroidinfopage.php?"."id=".$row[0]."\">".$row[2]."</a></td>";
|
||||
echo "<td><a href =\"asteroidinfopage.php?"."id=".$row[0]."\">".$row[3]."</a></td>";
|
||||
echo "<td><a href =\"asteroidinfopage.php?"."id=".$row[0]."\">".$row[4]."</a></td>";
|
||||
|
||||
|
||||
|
||||
echo "</tr>";
|
||||
}
|
||||
?>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
1390256
init_data.json
1390256
init_data.json
File diff suppressed because it is too large
Load diff
329543
init_data.xml
329543
init_data.xml
File diff suppressed because it is too large
Load diff
File diff suppressed because one or more lines are too long
164
page.php
164
page.php
|
@ -1,164 +0,0 @@
|
|||
<html>
|
||||
<head>
|
||||
<!--Connect to the database-->
|
||||
<?php
|
||||
// Database login details
|
||||
$DB_NAME = 'cl51-openminds';
|
||||
$DB_HOST = 'localhost';
|
||||
$DB_USER = 'cl51-openminds';
|
||||
$DB_PASS = 'hashtag';
|
||||
|
||||
// Connect to database server
|
||||
$mysqli = new mysqli($DB_HOST, $DB_USER, $DB_PASS, $DB_NAME);
|
||||
|
||||
if ($mysqli->connect_errno) {
|
||||
printf("Connect failed: %s\n", $mysqli->connect_error);
|
||||
exit();
|
||||
}
|
||||
|
||||
// Sets sql charset to utf-8
|
||||
$mysqli->set_charset("utf8");
|
||||
|
||||
// Pie: HostType
|
||||
// Bar: CPUs
|
||||
// Pie: OS
|
||||
|
||||
$i = 0;
|
||||
|
||||
$hostType = array();
|
||||
|
||||
$result = mysqli_query($mysqli, 'SELECT COUNT(HostType) AS "Num" FROM serverlist GROUP BY HostType;');
|
||||
while($row = mysqli_fetch_row($result)){
|
||||
// puts the value for COUNT(HostType) into $num{i}, so $num0, $num1, $num2, etc.
|
||||
$hostType[$i] = $row[0];
|
||||
$i = $i + 1;
|
||||
}
|
||||
|
||||
$i = 0;
|
||||
|
||||
$CPUamout = array();
|
||||
|
||||
$result = mysqli_query($mysqli, 'SELECT COUNT(CPUamount) AS "Num" FROM serverlist GROUP BY CPUamount;');
|
||||
while($row = mysqli_fetch_row($result)){
|
||||
$CPUamount[$i] = $row[0];
|
||||
$i = $i + 1;
|
||||
}
|
||||
|
||||
$i = 0;
|
||||
|
||||
$OS = array();
|
||||
|
||||
$result = mysqli_query($mysqli, 'SELECT COUNT(OS) AS "Num" FROM serverlist GROUP BY OS;');
|
||||
while($row = mysqli_fetch_row($result)){
|
||||
$OS[$i] = $row[0];
|
||||
$i = $i + 1;
|
||||
}
|
||||
?>
|
||||
<!--Load the AJAX API-->
|
||||
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
|
||||
<script type="text/javascript">
|
||||
// Load the Visualization API and the piechart package.
|
||||
google.load('visualization', '1.0', {'packages':['corechart']});
|
||||
|
||||
// Set a callback to run when the Google Visualization API is loaded.
|
||||
google.setOnLoadCallback(drawChart);
|
||||
|
||||
// Callback that creates and populates a data table,
|
||||
// instantiates the pie chart, passes in the data and
|
||||
// draws it.
|
||||
function drawChart() {
|
||||
|
||||
// Create the data table.
|
||||
var hostTypeData = new google.visualization.DataTable();
|
||||
hostTypeData.addColumn('string', 'hostType');
|
||||
hostTypeData.addColumn('number', 'hostTypeCount');
|
||||
hostTypeData.addRows([
|
||||
['CIT', <?php echo $hostType[0]; ?>],
|
||||
['DEV', <?php echo $hostType[1]; ?>],
|
||||
['DR', <?php echo $hostType[2]; ?>],
|
||||
['OAT', <?php echo $hostType[3]; ?>],
|
||||
['PROD', <?php echo $hostType[4]; ?>],
|
||||
['SIT', <?php echo $hostType[5]; ?>],
|
||||
['UAT', <?php echo $hostType[6]; ?>],
|
||||
['UNCLASSIFIED', <?php echo $hostType[7]; ?>]
|
||||
]);
|
||||
var CPUamountData = new google.visualization.DataTable();
|
||||
CPUamountData.addColumn('string', 'coreNum');
|
||||
CPUamountData.addColumn('number', 'coreNumNum');
|
||||
CPUamountData.addRows([
|
||||
['1', <?php echo $CPUamount[0]; ?>],
|
||||
['2', <?php echo $CPUamount[1]; ?>],
|
||||
['4', <?php echo $CPUamount[2]; ?>],
|
||||
['8', <?php echo $CPUamount[3]; ?>],
|
||||
['10', <?php echo $CPUamount[4]; ?>],
|
||||
['12', <?php echo $CPUamount[5]; ?>],
|
||||
['13', <?php echo $CPUamount[6]; ?>],
|
||||
['15', <?php echo $CPUamount[7]; ?>],
|
||||
['16', <?php echo $CPUamount[8]; ?>],
|
||||
['24', <?php echo $CPUamount[9]; ?>],
|
||||
['32', <?php echo $CPUamount[10]; ?>],
|
||||
['34', <?php echo $CPUamount[11]; ?>],
|
||||
['40', <?php echo $CPUamount[12]; ?>],
|
||||
['54', <?php echo $CPUamount[13]; ?>],
|
||||
['63', <?php echo $CPUamount[14]; ?>],
|
||||
['64', <?php echo $CPUamount[15]; ?>],
|
||||
['80', <?php echo $CPUamount[16]; ?>]
|
||||
]);
|
||||
var OSData = new google.visualization.DataTable();
|
||||
OSData.addColumn('string', 'OS');
|
||||
OSData.addColumn('number', 'OSCount');
|
||||
OSData.addRows([
|
||||
['AIX', <?php echo $OS[0]; ?>],
|
||||
['Linux', <?php echo $OS[1]; ?>],
|
||||
['Windows', <?php echo $OS[2]; ?>]
|
||||
]);
|
||||
|
||||
// Set chart options
|
||||
var hostTypeOptions = {'title':'Types of Servers',
|
||||
'width':400,
|
||||
'height':300};
|
||||
var CPUsOptions = {'title':'Number of Cores',
|
||||
'width':500,
|
||||
'height':300};
|
||||
var OSOptions = {'title':'Process OS',
|
||||
'width':400,
|
||||
'height':300};
|
||||
|
||||
// Instantiate and draw our chart, passing in some options.
|
||||
var pie_chart1 = new google.visualization.PieChart(document.getElementById('pie_chart1'));
|
||||
// Instantiate and draw our chart, passing in some options.
|
||||
var bar_chart = new google.visualization.BarChart(document.getElementById('bar_chart'));
|
||||
// Instantiate and draw our chart, passing in some options.
|
||||
var pie_chart2 = new google.visualization.PieChart(document.getElementById('pie_chart2'));
|
||||
|
||||
/*
|
||||
// The select handler. Call the chart's getSelection() method
|
||||
function selectHandler() {
|
||||
var selectedItem = pie_chart.getSelection()[0];
|
||||
if (selectedItem) {e
|
||||
var hostType = data.getValue(selectedItem.row, 1);
|
||||
var hostTypeNum = data.getValue(selectedItem.row, 0);
|
||||
alert('There are ' + hostType + ' machines running as ' + hostTypeNum);
|
||||
}
|
||||
}
|
||||
// Listen for the 'select' event, and call my function selectHandler() when
|
||||
// the user selects something on the chart.
|
||||
google.visualization.events.addListener(pie_chart, 'select', selectHandler);
|
||||
*/
|
||||
|
||||
pie_chart1.draw(hostTypeData, hostTypeOptions);
|
||||
bar_chart.draw(CPUamountData, CPUsOptions);
|
||||
pie_chart2.draw(OSData, OSOptions);
|
||||
}
|
||||
</script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<!--Div that will hold the pie chart-->
|
||||
<div id="pie_chart1" style="display: inline; float: left;"></div>
|
||||
<!--Div that will hold the bar chart-->
|
||||
<div id="bar_chart" style="display: inline; float: left;"></div>
|
||||
<!--Div that will hold the pie chart-->
|
||||
<div id="pie_chart2" style="display: inline; float: left;"></div>
|
||||
</body>
|
||||
</html>
|
Reference in a new issue