[prev in list] [next in list] [prev in thread] [next in thread]
List: prelude-cvslog
Subject: [prelude-cvslog] r4551 - in
From: noreply () prelude-ids ! org
Date: 2004-12-09 18:31:26
Message-ID: 20041209183126.D31123B4397 () mail ! prelude-ids ! org
[Download RAW message or body]
Author: nicolas
Date: 2004-12-09 19:31:26 +0100 (Thu, 09 Dec 2004)
New Revision: 4551
Modified:
trunk/prewikka/prewikka/modules/content/main/main.py
trunk/prewikka/prewikka/modules/content/main/templates/AlertListing.tmpl
trunk/prewikka/prewikka/modules/content/main/templates/HeartbeatListing.tmpl
trunk/prewikka/prewikka/modules/content/main/templates/MessageListing.tmpl
Log:
user interface improvements
found and killed the nasty '/'
Modified: trunk/prewikka/prewikka/modules/content/main/main.py
===================================================================
--- trunk/prewikka/prewikka/modules/content/main/main.py 2004-12-09 15:29:27 UTC (rev \
4550)
+++ trunk/prewikka/prewikka/modules/content/main/main.py 2004-12-09 18:31:26 UTC (rev \
4551) @@ -150,7 +150,7 @@
class HeartbeatAnalyzePM(ParametersNormalizer.ParametersNormalizer):
def register(self):
- self.optional("analyzerid", long)
+ self.mandatory("analyzerid", long)
@@ -226,40 +226,39 @@
class View:
def _setView(self, dataset):
- dataset["interface.active_section"] = self._active_section
- dataset["interface.tabs"] = [ (name, utils.create_link(slot)) for name, slot \
in self._tabs ]
- dataset["interface.active_tab"] = self._active_tab
-
+ dataset["interface.active_section"] = self.active_section
+ dataset["interface.tabs"] = [ (name, utils.create_link(slot)) for name, slot \
in self.tabs ] + dataset["interface.active_tab"] = self.active_tab
-class AlertsView(View):
- _active_section = "Alerts"
- _tabs = [("Alerts", "main.alert_listing"), ("Filters", \
"main.alert_filter_edition")]
- _active_tab = "Alerts"
+class EventsView(View):
+ active_section = "Events"
+ tabs = [("Alerts", "main.alert_listing"),
+ ("Heartbeats", "main.heartbeat_listing"),
+ ("Filters", "main.alert_filter_edition")]
-class AlertFilterEditionView(AlertsView):
- _active_tab = "Filters"
+class AlertsView(EventsView):
+ active_tab = "Alerts"
-class HeartbeatsView(View):
- _active_section = "Heartbeats"
- _tabs = [("Analyze", "main.heartbeat_analyze"), ("Listing", \
"main.heartbeat_listing")]
- _active_tab = "Listing"
+class HeartbeatsView(EventsView):
+ active_tab = "Heartbeats"
-class HeartbeatAnalyzeView(HeartbeatsView):
- _active_tab = "Analyze"
+class AlertFilterEditionView(EventsView):
+ active_tab = "Filters"
+
class SensorsView(View):
- _active_section = "Agents"
- _tabs = [("Agents", "main.sensor_listing")]
- _active_tab = "Agents"
+ active_section = "Agents"
+ tabs = [("Agents", "main.sensor_listing")]
+ active_tab = "Agents"
@@ -596,8 +595,9 @@
traceroute_action = "heartbeat_traceroute"
time_criteria_format = "heartbeat.create_time >= '%s' && heartbeat.create_time < \
'%s'"
message_criteria_format = "heartbeat.analyzer.analyzerid == '%d' && \
heartbeat.messageid == '%d'"
- fields = [ ("address", "heartbeat.analyzer.node.address(0).address", \
"heartbeat.analyzer.node.address.address"),
- ("name", "heartbeat.analyzer.node.name", \
"heartbeat.analyzer.node.name"), + fields = [ ("agent", "heartbeat.analyzer.name", \
"heartbeat.analyzer.name"), + ("node_address", \
"heartbeat.analyzer.node.address(0).address", \
"heartbeat.analyzer.node.address.address"), + ("node_name", \
"heartbeat.analyzer.node.name", "heartbeat.analyzer.node.name"),
("type", "heartbeat.analyzer.model", "heartbeat.analyzer.model") ]
def countMessages(self, prelude, criteria):
@@ -613,9 +613,9 @@
return message["heartbeat.create_time"]
def _addMessageFields(self, request, fields, heartbeat):
- for name in "ident", "analyzerid", "name", "type":
+ for name in "ident", "analyzerid", "agent", "node_name", "type":
fields[name] = self._createMessageField(request.parameters, name, \
heartbeat[name])
- fields["address"] = self._createMessageHostField(request, "address", \
heartbeat["address"]) + fields["node_address"] = \
self._createMessageHostField(request, "address", \
heartbeat["node_address"])
fields["time"] = self._createMessageTimeField(heartbeat["time"], \
request.parameters["timezone"])
@@ -771,7 +771,7 @@
self.endSection(dataset)
def process(self, request):
- heartbeat = \
request.env.prelude.getHeartbeat(request.parameters.getAnalyzerid(), \
request.parameters.getMessageIdent()) + heartbeat = \
request.env.prelude.getHeartbeat(request.parameters["analyzerid"], \
request.parameters["ident"]) dataset = request.dataset
dataset["sections"] = [ ]
self.buildAnalyzer(dataset, heartbeat)
@@ -1162,12 +1162,17 @@
-class HeartbeatAnalyzeAction(HeartbeatAnalyzeView):
+class HeartbeatAnalyzeAction(SensorsView):
def __init__(self, config):
self._heartbeat_count = config.getOptionValue("heartbeat_count", 30)
self._heartbeat_error_margin = \
config.getOptionValue("heartbeat_error_margin", 3)
- def _getAnalyzer(self, dataset, prelude, analyzerid):
+ def process(self, request):
+ dataset = request.dataset
+ prelude = request.prelude
+ analyzerid = request.parameters["analyzerid"]
+ self._setView(dataset)
+
analyzer = prelude.getAnalyzer(analyzerid)
analyzer["last_heartbeat_time"] = str(analyzer["last_heartbeat_time"])
analyzer["events"] = [ ]
@@ -1233,22 +1238,10 @@
(self._heartbeat_count, total_interval / \
self._heartbeat_count), "type": "no_anomaly" })
- return analyzer
-
- def process(self, request):
- self._setView(request.dataset)
-
- if request.parameters.has_key("analyzerid"):
- request.dataset["analyzers"] = [ self._getAnalyzer(request.dataset, \
request.env.prelude,
- \
request.parameters["analyzerid"]) ]
- else:
- request.dataset["analyzers"] = [ self._getAnalyzer(request.dataset, \
request.env.prelude,
- analyzerid) \
- for analyzerid in \
request.env.prelude.getAnalyzerids() ] + dataset["analyzer"] = analyzer
-
class SensorAlertListingAction(SensorsView,
AlertListingAction):
listing_action = "sensor_alert_listing"
@@ -1455,8 +1448,7 @@
def load(env, config):
return {
- "sections": [("Alerts", "alert_listing"),
- ("Heartbeats", "heartbeat_analyze"),
+ "sections": [("Events", "alert_listing"),
("Agents", "sensor_listing")],
"default_slot": "alert_listing",
Modified: trunk/prewikka/prewikka/modules/content/main/templates/AlertListing.tmpl
===================================================================
--- trunk/prewikka/prewikka/modules/content/main/templates/AlertListing.tmpl 2004-12-09 \
15:29:27 UTC (rev 4550)
+++ trunk/prewikka/prewikka/modules/content/main/templates/AlertListing.tmpl 2004-12-09 \
18:31:26 UTC (rev 4551) @@ -36,13 +36,13 @@
<span>$message.source.value</span>
#end if
#if $message.suser_name.value
- <br/>$message.suser_name.value
+ <br/>user: $message.suser_name.value
#if $message.suser_uid.value != None
($message.suser_uid.value)
#end if
#end if
#if $message.sprocess_name.value
- <br/>$message.sprocess_name.value
+ <br/>process: $message.sprocess_name.value
#if $message.sprocess_pid.value != None
($message.sprocess_pid.value)
#end if
@@ -66,13 +66,13 @@
<span>$message.target.value</span>
#end if
#if $message.tuser_name.value
- <br/>$message.tuser_name.value
+ <br/>user: $message.tuser_name.value
#if $message.tuser_uid.value != None
($message.tuser_uid.value)
#end if
#end if
#if $message.tprocess_name.value
- <br/>$message.tprocess_name.value
+ <br/>process: $message.tprocess_name.value
#if $message.tprocess_pid.value != None
($message.tprocess_pid.value)
#end if
@@ -91,7 +91,7 @@
<td>
<a href='$message.sensor.inline_filter'>$message.sensor.value</a>
#if $message.sensor_node_name.value
- ($message.sensor_node_name.value)
+ (on $message.sensor_node_name.value)
#end if
</td>
<td>$message.time.value</td>
Modified: trunk/prewikka/prewikka/modules/content/main/templates/HeartbeatListing.tmpl
===================================================================
--- trunk/prewikka/prewikka/modules/content/main/templates/HeartbeatListing.tmpl 2004-12-09 \
15:29:27 UTC (rev 4550)
+++ trunk/prewikka/prewikka/modules/content/main/templates/HeartbeatListing.tmpl 2004-12-09 \
18:31:26 UTC (rev 4551) @@ -1,9 +1,9 @@
#extends prewikka.modules.content.main.templates.MessageListing
#block message_fields_header
-<td>Analyzerid</td>
-<td>Address</td>
-<td>Name</td>
+<td>Agent</td>
+<td>Node Address</td>
+<td>Node Name</td>
<td>Type</td>
<td>Time</td>
#end block message_fields_header
@@ -12,11 +12,11 @@
<td>
<ul id="popup_block">
- <li class="popup_title">$message.analyzerid.value
+ <li class="popup_title">$message.agent.value
<ul>
<li><a href="$message.details">Heartbeat detail</a></li>
<li><a href="$message.summary">Heartbeat summary</a></li>
- <li><a href="$message.analyzerid.inline_filter">Group by analyzerid</a></li>
+ <li><a href="$message.agent.inline_filter">Group by agent</a></li>
</ul>
</li>
</ul>
@@ -24,10 +24,10 @@
<td>
<ul id="popup_block">
- <li class="popup_title">$message.address.value
+ <li class="popup_title">$message.node_address.value
<ul>
- <li><a href="$message.address.inline_filter">Group by address</a></li>
- #for $name, $link in $message.address.host_commands
+ <li><a href="$message.node_address.inline_filter">Group by address</a></li>
+ #for $name, $link in $message.node_address.host_commands
<li><a href="$link">$name</a></li>
#end for
</ul>
@@ -35,7 +35,7 @@
</ul>
</td>
-<td><a href='$message.name.inline_filter'>$message.name.value</a></td>
+<td><a href='$message.node_name.inline_filter'>$message.node_name.value</a></td>
<td><a href='$message.type.inline_filter'>$message.type.value</a></td>
<td>$message.time.value</td>
Modified: trunk/prewikka/prewikka/modules/content/main/templates/MessageListing.tmpl
===================================================================
--- trunk/prewikka/prewikka/modules/content/main/templates/MessageListing.tmpl 2004-12-09 \
15:29:27 UTC (rev 4550)
+++ trunk/prewikka/prewikka/modules/content/main/templates/MessageListing.tmpl 2004-12-09 \
18:31:26 UTC (rev 4551) @@ -49,12 +49,14 @@
<table id="timeline">
<form action="?" method="get">
+
#def timeline_extra_content
#end def
$timeline_extra_content
#for $name, $value in $timeline.hidden_parameters.items()
<input type="hidden" name="$name" value="$value"/>
#end for
+
<tr>
<td id="timeline_step_label">Step:</td>
@@ -73,6 +75,7 @@
</td>
</tr>
+
<tr>
<td id="timezone_control_label">Tz:</td>
<td colspan="2">
@@ -94,12 +97,14 @@
<input type="submit" value="apply">
</td>
</tr>
-
+
+
</form>
+
<tr><td colspan="3" class="timeline_range">$timeline.start</td></tr>
<tr><td colspan="3" class="timeline_range">$timeline.end</td></tr>
- <tr><td colspan="3" class="timeline_range">$timeline.range_timezone</td>/<tr>
+ <tr><td colspan="3" class="timeline_range">$timeline.range_timezone</td><tr>
<tr>
<td colspan=3 style="text-align: center;">
@@ -113,6 +118,7 @@
</table>
+
<table id="message_list_nav">
<tr>
#if $nav.prev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic