浏览代码

add some copy, move severs to /servers

raylu 11 年之前
父节点
当前提交
3514ca9759
共有 6 个文件被更改,包括 60 次插入18 次删除
  1. 3 0
      web/static/css/base.ccss
  2. 0 0
      web/static/css/home.ccss
  3. 12 6
      web/sysvitals_web.py
  4. 4 1
      web/templates/base.html
  5. 13 11
      web/templates/home.html
  6. 28 0
      web/templates/servers.html

+ 3 - 0
web/static/css/base.ccss

@@ -13,6 +13,9 @@ a:
 	color: #3ae
 	text-decoration: none
 
+p:
+	margin-top: 1em
+
 .wrapper:
 	width: 1200px
 	margin: 0 auto

+ 0 - 0
web/static/css/home.ccss


+ 12 - 6
web/sysvitals_web.py

@@ -42,12 +42,7 @@ class BaseHandler(tornado.web.RequestHandler):
 class MainHandler(BaseHandler):
 	@tornado.gen.coroutine
 	def get(self):
-		groups = servers = None
-		if self.current_user:
-			user_id = self.current_user['id']
-			groups = yield self.db.get_groups(user_id)
-			servers = yield self.db.get_servers(user_id)
-		self.render('home.html', groups=groups, servers=servers)
+		self.render('home.html')
 
 class RegisterHandler(BaseHandler):
 	@tornado.gen.coroutine
@@ -83,6 +78,16 @@ class LogoutHandler(BaseHandler):
 		self.clear_all_cookies()
 		self.redirect('/')
 
+class ServersHandler(BaseHandler):
+	@tornado.web.authenticated
+	@tornado.gen.coroutine
+	def get(self):
+		groups = servers = None
+		user_id = self.current_user['id']
+		groups = yield self.db.get_groups(user_id)
+		servers = yield self.db.get_servers(user_id)
+		self.render('servers.html', groups=groups, servers=servers)
+
 class StatsHandler(BaseHandler):
 	@tornado.web.authenticated
 	@tornado.gen.coroutine
@@ -129,6 +134,7 @@ if __name__ == '__main__':
 			(r'/register', RegisterHandler),
 			(r'/login', LoginHandler),
 			(r'/logout', LogoutHandler),
+			(r'/servers', ServersHandler),
 			(r'/stats/(\d+)/(\d+)', StatsHandler),
 			(r'/groups', GroupsHandler),
 			(r'/groups/create', GroupCreateHandler),

+ 4 - 1
web/templates/base.html

@@ -16,9 +16,12 @@
 <body>
 	<div class="wrapper">
 		<div class="topbar">
-			<div class="title"><a href="/">sysvitals.com</a></div>
+			<div class="title">
+				<a href="/">sysvitals.com</a>
+			</div>
 			<div class="nav">
 				{% if current_user %}
+					<a href="/servers">servers</a>
 					<a href="/groups">groups</a>
 					<a href="/logout">logout</a>
 				{% else %}

+ 13 - 11
web/templates/home.html

@@ -1,15 +1,17 @@
 {% extends "base.html" %}
 
+{% block css %}
+	<link rel="stylesheet" href="/css/home.css">
+{% end %}
+
 {% block main %}
-	{% if current_user %}
-		{% for group in groups %}
-			<p>
-				{{ group['name'] }}
-				{% for server in servers[group['id']] %}
-					<br>
-					<a href="/stats/{{ group['id'] }}/{{ server['id'] }}">{{ server['hostname'] }}</a>
-				{% end %}
-			</p>
-		{% end %}
-	{% end %}
+	<p>
+		sysvitals is system monitoring as a service. Think hosted <a href="http://munin-monitoring.org/" target="_blank">Munin</a>, but way faster, prettier, and easier.
+	</p>
+	<p>
+		The <a href="/client/sysvitals_client">client</a> sends CPU, memory, network, and disk usage data to the sysvitals API once a minute.
+	</p>
+	<p>
+		The site queries that same API to draw pretty <del>pictures</del> graphs.
+	</p>
 {% end %}

+ 28 - 0
web/templates/servers.html

@@ -0,0 +1,28 @@
+{% extends "base.html" %}
+
+{% block main %}
+	{% for group in groups %}
+		<p>
+			{{ group['name'] }}
+			{% for server in servers[group['id']] %}
+				<br>
+				<a href="/stats/{{ group['id'] }}/{{ server['id'] }}">{{ server['hostname'] }}</a>
+			{% end %}
+		</p>
+	{% end %}
+	{% if not groups %}
+		<p>
+			to get started, create a <a href="/groups">group</a>
+		</p>
+	{% end %}
+
+	<p>
+		Run the <a href="/client/sysvitals_client">client</a> on a machine with the <code>--configure</code> flag to set up a new server. Your API key can be found on the <a href="/groups">groups page</a>.
+		<br>
+		Run the client without arguments as a cronjob every minute:
+		<br>
+		<code>* * * * * /.../sysvitals_client</code>
+		<br>
+		and you're good to go!
+	</p>
+{% end %}