Skip to content

Commit

Permalink
Release v0.0.5 csv data sources, json data source, odbc data source, …
Browse files Browse the repository at this point in the history 
…general logs data source, performance improvements
  • Loading branch information
@jpfxgood
jpfxgood committed Aug 9, 2020
1 parent f785a6b commit 50a9baf
Show file tree
Hide file tree
Showing 21 changed files with 8,887 additions and 80 deletions.
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.4
0.0.5
16 changes: 10 additions & 6 deletions char_draw/graph.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -548,12 +548,16 @@ def get_bbox(self):
idx = 0
points = []
for c in data_table.ColumnIterator(column):
y_value = c.get_float_value()
x_value = x_values[idx][0]
scaled_x = (x_value-x_min)*x_scale
scaled_y = (y_value-y_min)*y_scale
points.append((x+scaled_x,y-scaled_y))
idx += 1
y_value = c.get_float_value()
if idx < len(x_values):
x_value = x_values[idx][0]
scaled_x = (x_value-x_min)*x_scale
scaled_y = (y_value-y_min)*y_scale
points.append((x+scaled_x,y-scaled_y))
idx += 1
else:
break

if self.area:
p1 = (points[-1][0],y)
if p1 not in points:
Expand Down
10 changes: 5 additions & 5 deletions config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
],
"log_lookback" : [ 1, 0, 0 ]
},
{"name": "remote_syslog", "type":"RemoteDataTable", "refresh_minutes":1, "ssh_spec":"ssh://james@james-server:22002",
"table_def": {"name": "syslog", "type": "SyslogDataTable", "refresh_minutes": 1}},
{"name": "testdata", "type":"ODBCDataTable", "refresh_minutes":1,
"sql_spec":"odbc://james@localhost/myodbc8w/james:5432",
"sql_query":"select byhour.hour,sum(case byhour.type when 'error' then 1 else 0 end) as errors,sum(case byhour.type when 'warning' then 1 else 0 end) as warnings, sum(case byhour.type when 'info' then 1 else 0 end) as infos from ( select extract( hour from log_time) as hour, type from testdata ) as byhour group by byhour.hour order by byhour.hour;",
"sql_map": [ [ "hour", "Hour"],[ "errors","Number of Errors" ],[ "warnings", "Number of Warnings" ], ["infos","Number of Info Messages"]]
},
{"name": "remote_syslog", "type":"RemoteDataTable", "refresh_minutes":1, "ssh_spec":"ssh://james@james-server:22002",
"table_def": {"name": "syslog", "type": "SyslogDataTable", "refresh_minutes": 1}},
{"name": "syslog", "type": "SyslogDataTable", "refresh_minutes": 1},
{"name": "procdata", "type": "ProcDataTable", "refresh_minutes": 1},
{
Expand Down Expand Up @@ -333,7 +333,7 @@
"panels": [
{
"graphs": [
{ "title" :"Remote Syslog", "type": "LineGraph", "table": "remote_syslog", "xseries": "Time Stamps", "yseries": ["Messages by Time","Errors by Time","Warnings by Time"], "yunit":"Number of Messages"}
{ "title" :"Database Summary", "type": "LineGraph", "table": "testdata", "xseries": "Hour", "yseries": ["Number of Errors","Number of Warnings","Number of Info Messages"], "yunit":"Number of Messages"}
]
}
]
Expand All @@ -342,11 +342,11 @@
"panels": [
{
"graphs": [
{ "title" :"Database Summary", "type": "LineGraph", "table": "testdata", "xseries": "Hour", "yseries": ["Number of Errors","Number of Warnings","Number of Info Messages"], "yunit":"Number of Messages"}
{ "title" :"Remote Syslog", "type": "LineGraph", "table": "remote_syslog", "xseries": "Time Stamps", "yseries": ["Messages by Time","Errors by Time","Warnings by Time"], "yunit":"Number of Messages"}
]
}
]
},
},
{
"panels": [
{
Expand Down
2 changes: 1 addition & 1 deletion dashboard/dashboard.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ def main( self ):
""" main input and redraw loop for the dashboard """
self.window.nodelay(1)
self.window.notimeout(0)
self.window.timeout(0)
self.window.timeout(1000)
self.window.keypad(1)
curses.curs_set(0)
curses.raw()
Expand Down
2 changes: 1 addition & 1 deletion dashboard/version.py
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.0.4'
__version__ = '0.0.5'
2 changes: 1 addition & 1 deletion data_sources/data_table.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ def perform_refresh( self ):
if time.time() - start_time >= self.refresh_minutes*60.0:
self.refresh()
start_time = time.time()
time.sleep(0)
time.sleep(1)

def stop_refresh( self ):
""" Stop the background refresh thread """
Expand Down
4 changes: 2 additions & 2 deletions data_sources/remote_data.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def get_stdout_line( self ):
with self.reader_lock:
if len(self.stdout_lines):
return self.stdout_lines.pop(0)
time.sleep(0)
time.sleep(1)

@sync_connection
def get_stderr_line( self ):
Expand All @@ -74,7 +74,7 @@ def get_stderr_line( self ):
with self.reader_lock:
if len(self.stderr_lines):
return self.stderr_lines.pop(0)
time.sleep(0)
time.sleep(1)

@sync_connection
def open( self, client ):
Expand Down
48 changes: 30 additions & 18 deletions docs/char_draw/graph.m.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2189,12 +2189,16 @@ <h1 class="title"><span class="name">char_draw.graph</span> module</h1>
<span class="n">idx</span> <span class="o">=</span> <span class="mi">0</span>
<span class="n">points</span> <span class="o">=</span> <span class="p">[]</span>
<span class="k">for</span> <span class="n">c</span> <span class="ow">in</span> <span class="n">data_table</span><span class="o">.</span><span class="n">ColumnIterator</span><span class="p">(</span><span class="n">column</span><span class="p">):</span>
<span class="n">y_value</span> <span class="o">=</span> <span class="n">c</span><span class="o">.</span><span class="n">get_float_value</span><span class="p">()</span>
<span class="n">x_value</span> <span class="o">=</span> <span class="n">x_values</span><span class="p">[</span><span class="n">idx</span><span class="p">][</span><span class="mi">0</span><span class="p">]</span>
<span class="n">scaled_x</span> <span class="o">=</span> <span class="p">(</span><span class="n">x_value</span><span class="o">-</span><span class="n">x_min</span><span class="p">)</span><span class="o">*</span><span class="n">x_scale</span>
<span class="n">scaled_y</span> <span class="o">=</span> <span class="p">(</span><span class="n">y_value</span><span class="o">-</span><span class="n">y_min</span><span class="p">)</span><span class="o">*</span><span class="n">y_scale</span>
<span class="n">points</span><span class="o">.</span><span class="n">append</span><span class="p">((</span><span class="n">x</span><span class="o">+</span><span class="n">scaled_x</span><span class="p">,</span><span class="n">y</span><span class="o">-</span><span class="n">scaled_y</span><span class="p">))</span>
<span class="n">idx</span> <span class="o">+=</span> <span class="mi">1</span>
<span class="n">y_value</span> <span class="o">=</span> <span class="n">c</span><span class="o">.</span><span class="n">get_float_value</span><span class="p">()</span>
<span class="k">if</span> <span class="n">idx</span> <span class="o">&lt;</span> <span class="nb">len</span><span class="p">(</span><span class="n">x_values</span><span class="p">):</span>
<span class="n">x_value</span> <span class="o">=</span> <span class="n">x_values</span><span class="p">[</span><span class="n">idx</span><span class="p">][</span><span class="mi">0</span><span class="p">]</span>
<span class="n">scaled_x</span> <span class="o">=</span> <span class="p">(</span><span class="n">x_value</span><span class="o">-</span><span class="n">x_min</span><span class="p">)</span><span class="o">*</span><span class="n">x_scale</span>
<span class="n">scaled_y</span> <span class="o">=</span> <span class="p">(</span><span class="n">y_value</span><span class="o">-</span><span class="n">y_min</span><span class="p">)</span><span class="o">*</span><span class="n">y_scale</span>
<span class="n">points</span><span class="o">.</span><span class="n">append</span><span class="p">((</span><span class="n">x</span><span class="o">+</span><span class="n">scaled_x</span><span class="p">,</span><span class="n">y</span><span class="o">-</span><span class="n">scaled_y</span><span class="p">))</span>
<span class="n">idx</span> <span class="o">+=</span> <span class="mi">1</span>
<span class="k">else</span><span class="p">:</span>
<span class="k">break</span>

<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">area</span><span class="p">:</span>
<span class="n">p1</span> <span class="o">=</span> <span class="p">(</span><span class="n">points</span><span class="p">[</span><span class="o">-</span><span class="mi">1</span><span class="p">][</span><span class="mi">0</span><span class="p">],</span><span class="n">y</span><span class="p">)</span>
<span class="k">if</span> <span class="n">p1</span> <span class="ow">not</span> <span class="ow">in</span> <span class="n">points</span><span class="p">:</span>
Expand Down Expand Up @@ -7305,12 +7309,16 @@ <h3>Instance variables</h3>
<span class="n">idx</span> <span class="o">=</span> <span class="mi">0</span>
<span class="n">points</span> <span class="o">=</span> <span class="p">[]</span>
<span class="k">for</span> <span class="n">c</span> <span class="ow">in</span> <span class="n">data_table</span><span class="o">.</span><span class="n">ColumnIterator</span><span class="p">(</span><span class="n">column</span><span class="p">):</span>
<span class="n">y_value</span> <span class="o">=</span> <span class="n">c</span><span class="o">.</span><span class="n">get_float_value</span><span class="p">()</span>
<span class="n">x_value</span> <span class="o">=</span> <span class="n">x_values</span><span class="p">[</span><span class="n">idx</span><span class="p">][</span><span class="mi">0</span><span class="p">]</span>
<span class="n">scaled_x</span> <span class="o">=</span> <span class="p">(</span><span class="n">x_value</span><span class="o">-</span><span class="n">x_min</span><span class="p">)</span><span class="o">*</span><span class="n">x_scale</span>
<span class="n">scaled_y</span> <span class="o">=</span> <span class="p">(</span><span class="n">y_value</span><span class="o">-</span><span class="n">y_min</span><span class="p">)</span><span class="o">*</span><span class="n">y_scale</span>
<span class="n">points</span><span class="o">.</span><span class="n">append</span><span class="p">((</span><span class="n">x</span><span class="o">+</span><span class="n">scaled_x</span><span class="p">,</span><span class="n">y</span><span class="o">-</span><span class="n">scaled_y</span><span class="p">))</span>
<span class="n">idx</span> <span class="o">+=</span> <span class="mi">1</span>
<span class="n">y_value</span> <span class="o">=</span> <span class="n">c</span><span class="o">.</span><span class="n">get_float_value</span><span class="p">()</span>
<span class="k">if</span> <span class="n">idx</span> <span class="o">&lt;</span> <span class="nb">len</span><span class="p">(</span><span class="n">x_values</span><span class="p">):</span>
<span class="n">x_value</span> <span class="o">=</span> <span class="n">x_values</span><span class="p">[</span><span class="n">idx</span><span class="p">][</span><span class="mi">0</span><span class="p">]</span>
<span class="n">scaled_x</span> <span class="o">=</span> <span class="p">(</span><span class="n">x_value</span><span class="o">-</span><span class="n">x_min</span><span class="p">)</span><span class="o">*</span><span class="n">x_scale</span>
<span class="n">scaled_y</span> <span class="o">=</span> <span class="p">(</span><span class="n">y_value</span><span class="o">-</span><span class="n">y_min</span><span class="p">)</span><span class="o">*</span><span class="n">y_scale</span>
<span class="n">points</span><span class="o">.</span><span class="n">append</span><span class="p">((</span><span class="n">x</span><span class="o">+</span><span class="n">scaled_x</span><span class="p">,</span><span class="n">y</span><span class="o">-</span><span class="n">scaled_y</span><span class="p">))</span>
<span class="n">idx</span> <span class="o">+=</span> <span class="mi">1</span>
<span class="k">else</span><span class="p">:</span>
<span class="k">break</span>

<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">area</span><span class="p">:</span>
<span class="n">p1</span> <span class="o">=</span> <span class="p">(</span><span class="n">points</span><span class="p">[</span><span class="o">-</span><span class="mi">1</span><span class="p">][</span><span class="mi">0</span><span class="p">],</span><span class="n">y</span><span class="p">)</span>
<span class="k">if</span> <span class="n">p1</span> <span class="ow">not</span> <span class="ow">in</span> <span class="n">points</span><span class="p">:</span>
Expand Down Expand Up @@ -7446,12 +7454,16 @@ <h3>Static methods</h3>
<span class="n">idx</span> <span class="o">=</span> <span class="mi">0</span>
<span class="n">points</span> <span class="o">=</span> <span class="p">[]</span>
<span class="k">for</span> <span class="n">c</span> <span class="ow">in</span> <span class="n">data_table</span><span class="o">.</span><span class="n">ColumnIterator</span><span class="p">(</span><span class="n">column</span><span class="p">):</span>
<span class="n">y_value</span> <span class="o">=</span> <span class="n">c</span><span class="o">.</span><span class="n">get_float_value</span><span class="p">()</span>
<span class="n">x_value</span> <span class="o">=</span> <span class="n">x_values</span><span class="p">[</span><span class="n">idx</span><span class="p">][</span><span class="mi">0</span><span class="p">]</span>
<span class="n">scaled_x</span> <span class="o">=</span> <span class="p">(</span><span class="n">x_value</span><span class="o">-</span><span class="n">x_min</span><span class="p">)</span><span class="o">*</span><span class="n">x_scale</span>
<span class="n">scaled_y</span> <span class="o">=</span> <span class="p">(</span><span class="n">y_value</span><span class="o">-</span><span class="n">y_min</span><span class="p">)</span><span class="o">*</span><span class="n">y_scale</span>
<span class="n">points</span><span class="o">.</span><span class="n">append</span><span class="p">((</span><span class="n">x</span><span class="o">+</span><span class="n">scaled_x</span><span class="p">,</span><span class="n">y</span><span class="o">-</span><span class="n">scaled_y</span><span class="p">))</span>
<span class="n">idx</span> <span class="o">+=</span> <span class="mi">1</span>
<span class="n">y_value</span> <span class="o">=</span> <span class="n">c</span><span class="o">.</span><span class="n">get_float_value</span><span class="p">()</span>
<span class="k">if</span> <span class="n">idx</span> <span class="o">&lt;</span> <span class="nb">len</span><span class="p">(</span><span class="n">x_values</span><span class="p">):</span>
<span class="n">x_value</span> <span class="o">=</span> <span class="n">x_values</span><span class="p">[</span><span class="n">idx</span><span class="p">][</span><span class="mi">0</span><span class="p">]</span>
<span class="n">scaled_x</span> <span class="o">=</span> <span class="p">(</span><span class="n">x_value</span><span class="o">-</span><span class="n">x_min</span><span class="p">)</span><span class="o">*</span><span class="n">x_scale</span>
<span class="n">scaled_y</span> <span class="o">=</span> <span class="p">(</span><span class="n">y_value</span><span class="o">-</span><span class="n">y_min</span><span class="p">)</span><span class="o">*</span><span class="n">y_scale</span>
<span class="n">points</span><span class="o">.</span><span class="n">append</span><span class="p">((</span><span class="n">x</span><span class="o">+</span><span class="n">scaled_x</span><span class="p">,</span><span class="n">y</span><span class="o">-</span><span class="n">scaled_y</span><span class="p">))</span>
<span class="n">idx</span> <span class="o">+=</span> <span class="mi">1</span>
<span class="k">else</span><span class="p">:</span>
<span class="k">break</span>

<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">area</span><span class="p">:</span>
<span class="n">p1</span> <span class="o">=</span> <span class="p">(</span><span class="n">points</span><span class="p">[</span><span class="o">-</span><span class="mi">1</span><span class="p">][</span><span class="mi">0</span><span class="p">],</span><span class="n">y</span><span class="p">)</span>
<span class="k">if</span> <span class="n">p1</span> <span class="ow">not</span> <span class="ow">in</span> <span class="n">points</span><span class="p">:</span>
Expand Down
Loading

0 comments on commit 50a9baf

Please sign in to comment.