echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace old jrobin with rrd4j 3.5 (ticket #2684)

Browse Source 
2019-02-10
From https://github.com/rrd4j/rrd4j/releases
Copyright (c) 2001-2005 Sasa Markovic and Ciaran Treanor.
Copyright (c) 2011 The OpenNMS Group, Inc.
Copyright 2011 The RRD4J Authors.
Apache 2.0 and LGPLv2.1

Unmodified as a base for future merges, except for omitted
files listed below.
This rev will not work; font patch to follow in next revision.

Following directories and files omitted:
converter/
core/RrdBerkeleyDbBackendFactory.java
core/RrdBerkeleyDbBackend.java
core/RrdMongoDBBackendFactory.java
core/RrdMongoDBBackend.java
demo/
graph/RrdGraphDefTemplate.java
inspector/
eu/bengreen/data/utility/
This commit is contained in:
zzz
2020-02-25 14:04:21 +00:00
parent 4826bbd333
commit 5bed4a0d7f
188 changed files with 8582 additions and 24540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java
View File

@ -13,14 +13,16 @@ import net.i2p.util.Log;
import net.i2p.util.SecureFile;
import net.i2p.util.SecureFileOutputStream;
import org.jrobin.core.Archive;
import org.jrobin.core.RrdBackendFactory;
import org.jrobin.core.RrdDb;
import org.jrobin.core.RrdDef;
import org.jrobin.core.RrdException;
import org.jrobin.core.RrdMemoryBackendFactory;
import org.jrobin.core.RrdNioBackendFactory;
import org.jrobin.core.Sample;
import org.rrd4j.ConsolFun;
import org.rrd4j.DsType;
import org.rrd4j.core.Archive;
import org.rrd4j.core.RrdBackendFactory;
import org.rrd4j.core.RrdDb;
import org.rrd4j.core.RrdDef;
import org.rrd4j.core.RrdException;
import org.rrd4j.core.RrdMemoryBackendFactory;
import org.rrd4j.core.RrdNioBackendFactory;
import org.rrd4j.core.Sample;
/**
* Creates and updates the in-memory or on-disk RRD database,
@ -35,7 +37,8 @@ public class SummaryListener implements RateSummaryListener {
static final String RRD_DIR = "rrd";
private static final String RRD_PREFIX = "rrd-";
private static final String RRD_SUFFIX = ".jrb";
static final String CF = "AVERAGE";
static final ConsolFun CF = ConsolFun.AVERAGE;
static final DsType DS = DsType.GAUGE;
private static final double XFF = 0.9d;
private static final int STEPS = 1;
@ -88,14 +91,14 @@ public class SummaryListener implements RateSummaryListener {
stopListening();
if (path != null)
(new File(path)).delete();
} catch (IOException ioe) {
_log.error("Error adding", ioe);
stopListening();
} catch (RrdException re) {
// this can happen after the time slews backwards, so don't make it an error
// org.jrobin.core.RrdException: Bad sample timestamp 1264343107. Last update time was 1264343172, at least one second step is required
if (_log.shouldLog(Log.WARN))
_log.warn("Error adding", re);
} catch (IOException ioe) {
_log.error("Error adding", ioe);
stopListening();
}
}
}
@ -149,8 +152,8 @@ public class SummaryListener implements RateSummaryListener {
// for info on the heartbeat, xff, steps, etc, see the rrdcreate man page, aka
// http://www.jrobin.org/support/man/rrdcreate.html
long heartbeat = period*10/1000;
def.addDatasource(_name, "GAUGE", heartbeat, Double.NaN, Double.NaN);
def.addDatasource(_eventName, "GAUGE", heartbeat, 0, Double.NaN);
def.addDatasource(_name, DS, heartbeat, Double.NaN, Double.NaN);
def.addDatasource(_eventName, DS, heartbeat, 0, Double.NaN);
if (_isPersistent) {
_rows = (int) Math.max(MIN_ROWS, Math.min(MAX_ROWS, THREE_MONTHS / period));
} else {
@ -187,6 +190,7 @@ public class SummaryListener implements RateSummaryListener {
"\nContact packager.";
_log.log(Log.CRIT, s);
System.out.println(s);
StatSummarizer.setDisabled(_context);
} catch (Throwable t) {
_log.error("Error starting RRD for stat " + baseName, t);
}
@ -203,9 +207,7 @@ public class SummaryListener implements RateSummaryListener {
_rate.setSummaryListener(null);
if (!_isPersistent) {
// close() does not release resources for memory backend
try {
((RrdMemoryBackendFactory)RrdBackendFactory.getFactory(RrdMemoryBackendFactory.NAME)).delete(_db.getPath());
} catch (RrdException re) {}
((RrdMemoryBackendFactory)RrdBackendFactory.getFactory("MEMORY")).delete(_db.getPath());
}
_db = null;
}
@ -254,7 +256,7 @@ public class SummaryListener implements RateSummaryListener {
/** @since 0.8.7 */
String getBackendName() {
return _isPersistent ? RrdNioBackendFactory.NAME : RrdMemoryBackendFactory.NAME;
return _isPersistent ? "NIO" : "MEMORY";
}
/** @since 0.8.7 */

69
apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java
View File

@ -1,8 +1,10 @@
package net.i2p.router.web;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.Stroke;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.OutputStream;
@ -22,9 +24,11 @@ import static net.i2p.router.web.GraphConstants.*;
import net.i2p.util.Log;
import net.i2p.util.SystemVersion;
import org.jrobin.core.RrdException;
import org.jrobin.graph.RrdGraph;
import org.jrobin.graph.RrdGraphDef;
import org.rrd4j.ConsolFun;
import org.rrd4j.core.RrdException;
import org.rrd4j.graph.ElementsNames;
import org.rrd4j.graph.RrdGraph;
import org.rrd4j.graph.RrdGraphDef;
/**
* Generate the RRD graph png images,
@ -46,6 +50,8 @@ class SummaryRenderer {
private static final Color AREA_COLOR = new Color(100, 160, 200, 200);
private static final Color LINE_COLOR = new Color(0, 30, 110, 255);
private static final Color RESTART_BAR_COLOR = new Color(223, 13, 13, 255);
// hide the arrow, full transparent
private static final Color ARROW_COLOR = new Color(0, 0, 0, 0);
private static final boolean IS_WIN = SystemVersion.isWindows();
private static final String DEFAULT_FONT_NAME = IS_WIN ?
"Lucida Console" : "Monospaced";
@ -58,6 +64,8 @@ class SummaryRenderer {
private static final int SIZE_LEGEND = 10;
private static final int SIZE_TITLE = 13;
private static final long[] RATES = new long[] { 60*60*1000 };
// dotted line
private static final Stroke GRID_STROKE = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1, new float[] {1, 1}, 0);
public SummaryRenderer(I2PAppContext ctx, SummaryListener lsnr) {
_log = ctx.logManager().getLog(SummaryRenderer.class);
@ -78,35 +86,6 @@ class SummaryRenderer {
@Deprecated
public static synchronized void render(I2PAppContext ctx, OutputStream out, String filename) throws IOException {
throw new UnsupportedOperationException();
/*****
long end = ctx.clock().now() - 60*1000;
long start = end - 60*1000*SummaryListener.PERIODS;
try {
RrdGraphDefTemplate template = new RrdGraphDefTemplate(filename);
RrdGraphDef def = template.getRrdGraphDef();
def.setTimeSpan(start/1000, end/1000); // ignore the periods in the template
// FIXME not clear how to get the height and width from the template
int width = DEFAULT_X;
int height = DEFAULT_Y;
def.setWidth(width);
def.setHeight(height);
RrdGraph graph = new RrdGraph(def);
int totalWidth = graph.getRrdGraphInfo().getWidth();
int totalHeight = graph.getRrdGraphInfo().getHeight();
BufferedImage img = new BufferedImage(totalWidth, totalHeight, BufferedImage.TYPE_USHORT_565_RGB);
Graphics gfx = img.getGraphics();
graph.render(gfx);
ImageOutputStream ios = new MemoryCacheImageOutputStream(out);
ImageIO.write(img, "png", ios);
} catch (RrdException re) {
//_log.error("Error rendering " + filename, re);
throw new IOException("Error plotting: " + re.getLocalizedMessage());
} catch (IOException ioe) {
//_log.error("Error rendering " + filename, ioe);
throw ioe;
}
*****/
}
public void render(OutputStream out) throws IOException { render(out, DEFAULT_X, DEFAULT_Y,
@ -148,13 +127,14 @@ class SummaryRenderer {
RrdGraphDef def = new RrdGraphDef();
// Override defaults
def.setColor(RrdGraphDef.COLOR_BACK, BACK_COLOR);
def.setColor(RrdGraphDef.COLOR_SHADEA, SHADEA_COLOR);
def.setColor(RrdGraphDef.COLOR_SHADEB, SHADEB_COLOR);
def.setColor(RrdGraphDef.COLOR_GRID, GRID_COLOR);
def.setColor(RrdGraphDef.COLOR_MGRID, MGRID_COLOR);
def.setColor(RrdGraphDef.COLOR_FONT, FONT_COLOR);
def.setColor(RrdGraphDef.COLOR_FRAME, FRAME_COLOR);
def.setColor(ElementsNames.back, BACK_COLOR);
def.setColor(ElementsNames.shadea, SHADEA_COLOR);
def.setColor(ElementsNames.shadeb, SHADEB_COLOR);
def.setColor(ElementsNames.grid, GRID_COLOR);
def.setColor(ElementsNames.mgrid, MGRID_COLOR);
def.setColor(ElementsNames.font, FONT_COLOR);
def.setColor(ElementsNames.frame, FRAME_COLOR);
def.setColor(ElementsNames.arrow, ARROW_COLOR);
// improve text legibility
String lang = Messages.getLanguage(_context);
@ -176,6 +156,7 @@ class SummaryRenderer {
def.setFont(RrdGraphDef.FONTTAG_DEFAULT, small);
// AXIS is unused, we do not set any axis labels
def.setFont(RrdGraphDef.FONTTAG_AXIS, small);
// rrd4j sets UNIT = AXIS in RrdGraphConstants, may be bug, maybe not, no use setting them different here
def.setFont(RrdGraphDef.FONTTAG_UNIT, small);
def.setFont(RrdGraphDef.FONTTAG_LEGEND, legnd);
def.setFont(RrdGraphDef.FONTTAG_TITLE, large);
@ -234,8 +215,8 @@ class SummaryRenderer {
}
if (!hideLegend) {
def.gprint(plotName, SummaryListener.CF, " " + _t("Avg") + ": %.2f%s");
def.gprint(plotName, "MAX", ' ' + _t("Max") + ": %.2f%S");
def.gprint(plotName, "LAST", ' ' + _t("Now") + ": %.2f%S\\l");
def.gprint(plotName, ConsolFun.MAX, ' ' + _t("Max") + ": %.2f%S");
def.gprint(plotName, ConsolFun.LAST, ' ' + _t("Now") + ": %.2f%S\\l");
}
String plotName2 = null;
if (lsnr2 != null) {
@ -247,8 +228,8 @@ class SummaryRenderer {
def.line(plotName2, LINE_COLOR, descr2 + "\\l", 2);
if (!hideLegend) {
def.gprint(plotName2, SummaryListener.CF, " " + _t("Avg") + ": %.2f%s");
def.gprint(plotName2, "MAX", ' ' + _t("Max") + ": %.2f%S");
def.gprint(plotName2, "LAST", ' ' + _t("Now") + ": %.2f%S\\l");
def.gprint(plotName2, ConsolFun.MAX, ' ' + _t("Max") + ": %.2f%S");
def.gprint(plotName2, ConsolFun.LAST, ' ' + _t("Now") + ": %.2f%S\\l");
}
}
if (!hideLegend) {
@ -290,6 +271,8 @@ class SummaryRenderer {
}
//System.out.println("rendering: path=" + path + " dsNames[0]=" + dsNames[0] + " dsNames[1]=" + dsNames[1] + " lsnr.getName=" + _listener.getName());
def.setAntiAliasing(false);
def.setTextAntiAliasing(true);
def.setGridStroke(GRID_STROKE);
//System.out.println("Rendering: \n" + def.exportXmlTemplate());
//System.out.println("*****************\nData: \n" + _listener.getData().dump());
def.setWidth(width);