diff --git a/CHANGELOG.md b/CHANGELOG.md index 79b84e2..052534d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ Released on Thu, 24 Oct 2019 > This release of the plugin requires binjr v2.10.0 or higher. + * _[New]_ New worksheets' time range are now automatically set to the last 24 hours from the last captured sample. diff --git a/UNRELEASED.md b/UNRELEASED.md index c66e12c..708a910 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -1 +1,2 @@ -* _[New]_ Plugin compatible with binjr v3.0.0 and higher \ No newline at end of file +* _[New]_ Plugin compatible with binjr v3.0.0 and higher +* _[New]_ Added a demo log file source. \ No newline at end of file diff --git a/build.gradle b/build.gradle index 5a3589a..e3aa646 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ import org.gradle.api.internal.file.copy.CopyActionProcessingStream import java.text.SimpleDateFormat /* - * Copyright 2019-2020 Frederic Thevenet + * Copyright 2019-2021 Frederic Thevenet * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -187,7 +187,7 @@ markdownToHtml { "
\n" + "
\n" + "

\n" + - " (c) 2016-2019 Frederic Thevenet\n" + + " (c) 2016-2021 Frederic Thevenet\n" + " https://binjr.eu\n" + "

\n" + "" diff --git a/distribution/info/README.md b/distribution/info/README.md index 75608ec..221093a 100644 --- a/distribution/info/README.md +++ b/distribution/info/README.md @@ -3,11 +3,13 @@ A plugin for binjr that provides data sources for demonstration purposes. +> This plugin requires *binjr* v3.0.0 or later. + ## Trying it out 1. Make sure [binjr](https://binjr.eu) is installed on your system (visit https://binjr.eu to get the latest release) and make a note of the folder it is installed in. -2. Download the `binjr-adapter-demo-1.x.x.zip` archive. -3. Copy the `binjr-adapter-demo-1.x.x.jar` file contained in the zip file into the `plugins` folder of your +2. Download the `binjr-adapter-demo-3.x.x.zip` archive. +3. Copy the `binjr-adapter-demo-3.x.x.jar` file contained in the zip file into the `plugins` folder of your [binjr](https://binjr.eu) installation. 4. Start [binjr](https://binjr.eu) (or restart it if it was runnning when you copied the plugin) and open the `demo.bjr` workspace contained in the zip (from the command menu, select `Workspaces > Open...`, or press Ctrl+O) @@ -16,7 +18,7 @@ A plugin for binjr that provides data sources for demonstration purposes. ## Troubleshooting * _"I get a `Could not find a registered adapter for key eu.binjr.sources.demo.adapters.DemoDataAdapter` error message when trying to open the demo.bjr workspace."_ - Please ensure that the `binjr-adapter-demo-1.x.x.jar` file is present in binjr's `plugins` folder and that is has been + Please ensure that the `binjr-adapter-demo-3.x.x.jar` file is present in binjr's `plugins` folder and that is has been properly loaded. - From the settings panel, expend the `Data Adapter` section and check that the "Demo Data Adpater" is listed in the Available Data Adpaters table. diff --git a/distribution/info/demo.bjr b/distribution/info/demo.bjr index 4bde9a6..28a8746 100644 --- a/distribution/info/demo.bjr +++ b/distribution/info/demo.bjr @@ -1,263 +1,169 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/main/resources/eu/binjr/demo/data/demoJrdsImg/perfmonitoring/config/hosts/Demo data, captured 2019-07-02 to 2019-10-07.xml b/src/main/resources/eu/binjr/demo/data/demoJrdsImg/perfmonitoring/config/hosts/Demo data, captured 2019-07-02 to 2019-10-07.xml index ae646b8..11d5430 100644 --- a/src/main/resources/eu/binjr/demo/data/demoJrdsImg/perfmonitoring/config/hosts/Demo data, captured 2019-07-02 to 2019-10-07.xml +++ b/src/main/resources/eu/binjr/demo/data/demoJrdsImg/perfmonitoring/config/hosts/Demo data, captured 2019-07-02 to 2019-10-07.xml @@ -15,7 +15,6 @@ --> - diff --git a/src/main/resources/eu/binjr/demo/data/demoJrdsImg/perfmonitoring/probe/Demo data, captured 2019-07-02 to 2019-10-07/jvmpool-front-server.rrd b/src/main/resources/eu/binjr/demo/data/demoJrdsImg/perfmonitoring/probe/Demo data, captured 2019-07-02 to 2019-10-07/jvmpool-front-server.rrd deleted file mode 100644 index 11559e0..0000000 --- a/src/main/resources/eu/binjr/demo/data/demoJrdsImg/perfmonitoring/probe/Demo data, captured 2019-07-02 to 2019-10-07/jvmpool-front-server.rrd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52a11469d5346904f923505768d5b83fcda048cff9a0161ea830d9debfc795db -size 2834912