Compare commits
No commits in common. "master" and "dnet-explore-metrics-1.0.2" have entirely different histories.
master
...
dnet-explo
4
pom.xml
4
pom.xml
|
@ -9,7 +9,7 @@
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>eu.dnetlib</groupId>
|
<groupId>eu.dnetlib</groupId>
|
||||||
<artifactId>dnet-explore-metrics</artifactId>
|
<artifactId>dnet-explore-metrics</artifactId>
|
||||||
<version>1.0.5-SNAPSHOT</version>
|
<version>1.0.2</version>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<name>dnet-explore-metrics</name>
|
<name>dnet-explore-metrics</name>
|
||||||
<description>Project for exposing Explore metrics</description>
|
<description>Project for exposing Explore metrics</description>
|
||||||
|
@ -20,7 +20,7 @@
|
||||||
<scm>
|
<scm>
|
||||||
<developerConnection>scm:git:https://code-repo.d4science.org/katerina.iatropoulou/dnet-explore-metrics.git</developerConnection>
|
<developerConnection>scm:git:https://code-repo.d4science.org/katerina.iatropoulou/dnet-explore-metrics.git</developerConnection>
|
||||||
<url>https://code-repo.d4science.org/katerina.iatropoulou/dnet-explore-metrics.git</url>
|
<url>https://code-repo.d4science.org/katerina.iatropoulou/dnet-explore-metrics.git</url>
|
||||||
<tag>dnet-explore-metrics-1.0.3</tag>
|
<tag>dnet-explore-metrics-1.0.2</tag>
|
||||||
</scm>
|
</scm>
|
||||||
|
|
||||||
<ciManagement>
|
<ciManagement>
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
filepath=/home/katerina/Documents
|
|
||||||
calculation.time.cron = 0 0/1 * * * *
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
#release configuration
|
||||||
|
#Tue Nov 23 13:14:42 EET 2021
|
||||||
|
project.dev.eu.dnetlib\:dnet-explore-metrics=1.0.1-SNAPSHOT
|
||||||
|
scm.tagNameFormat=@{project.artifactId}-@{project.version}
|
||||||
|
scm.tag=dnet-explore-metrics-1.0.0
|
||||||
|
pushChanges=true
|
||||||
|
scm.url=scm\:svn\:https\://svn.driver.research-infrastructures.eu/driver/dnet45/modules/dnet-parent/tags/dnet45-parent-1.0.0/dnet-explore-metrics
|
||||||
|
preparationGoals=clean verify
|
||||||
|
remoteTagging=true
|
||||||
|
scm.commentPrefix=[maven-release-plugin]
|
||||||
|
project.scm.eu.dnetlib\:dnet-explore-metrics.empty=true
|
||||||
|
exec.snapshotReleasePluginAllowed=false
|
||||||
|
completedPhase=run-preparation-goals
|
||||||
|
project.rel.eu.dnetlib\:dnet-explore-metrics=1.0.0
|
96
report.xml
96
report.xml
|
@ -1,96 +0,0 @@
|
||||||
<?xml version='1.0' encoding='UTF-8'?>
|
|
||||||
<dfxml xmloutputversion='1.0'>
|
|
||||||
<metadata
|
|
||||||
xmlns='http://afflib.org/tcpflow/'
|
|
||||||
xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
|
|
||||||
xmlns:dc='http://purl.org/dc/elements/1.1/'>
|
|
||||||
<dc:type>Feature Extraction</dc:type>
|
|
||||||
</metadata>
|
|
||||||
<creator version='1.0'>
|
|
||||||
<program>TCPFLOW</program>
|
|
||||||
<version>1.5.1</version>
|
|
||||||
<build_environment>
|
|
||||||
<compiler>9.3.0 (9.3.0)</compiler>
|
|
||||||
<CPPFLAGS>-pthread -I/usr/local/include -I/usr/local/include -Wdate-time -D_FORTIFY_SOURCE=2 -DUTC_OFFSET=+0000 </CPPFLAGS>
|
|
||||||
<CFLAGS>-g -pthread -g -O3 -fdebug-prefix-map=/build/tcpflow-yyzPLV/tcpflow-1.5.2+repack1=. -fstack-protector-strong -Wformat -Werror=format-security -MD -Wpointer-arith -Wmissing-declarations -Wmissing-prototypes -Wshadow -Wwrite-strings -Wcast-align -Waggregate-return -Wbad-function-cast -Wcast-qual -Wundef -Wredundant-decls -Wdisabled-optimization -Wfloat-equal -Wmultichar -Wc++-compat -Wmissing-noreturn -Wall -Wstrict-prototypes -MD -D_FORTIFY_SOURCE=2 -Wpointer-arith -Wmissing-declarations -Wmissing-prototypes -Wshadow -Wwrite-strings -Wcast-align -Waggregate-return -Wbad-function-cast -Wcast-qual -Wundef -Wredundant-decls -Wdisabled-optimization -Wfloat-equal -Wmultichar -Wc++-compat -Wmissing-noreturn -Wall -Wstrict-prototypes</CFLAGS>
|
|
||||||
<CXXFLAGS>-g -pthread -g -O3 -fdebug-prefix-map=/build/tcpflow-yyzPLV/tcpflow-1.5.2+repack1=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -MD -D_FORTIFY_SOURCE=2 -Wpointer-arith -Wshadow -Wwrite-strings -Wcast-align -Wredundant-decls -Wdisabled-optimization -Wfloat-equal -Wmultichar -Wmissing-noreturn -Woverloaded-virtual -Wsign-promo -funit-at-a-time -Weffc++ -Wno-address-of-packed-member -Wall -MD -D_FORTIFY_SOURCE=2 -Wpointer-arith -Wshadow -Wwrite-strings -Wcast-align -Wredundant-decls -Wdisabled-optimization -Wfloat-equal -Wmultichar -Wmissing-noreturn -Woverloaded-virtual -Wsign-promo -funit-at-a-time -Wstrict-null-sentinel -Weffc++ </CXXFLAGS>
|
|
||||||
<LDFLAGS>-L/usr/local/lib -L/usr/local/lib -Wl,-Bsymbolic-functions -Wl,-z,relro</LDFLAGS>
|
|
||||||
<LIBS>-lpcap -lcairo -lfontconfig -lfreetype -lpixman-1 -lexpat -lcrypto -lssl -lcrypto -ldl -lz </LIBS>
|
|
||||||
<compilation_date>2020-03-22T15:59:22</compilation_date>
|
|
||||||
<library name="boost" version="107100"/>
|
|
||||||
</build_environment>
|
|
||||||
<execution_environment>
|
|
||||||
<os_sysname>Linux</os_sysname>
|
|
||||||
<os_release>5.11.0-41-generic</os_release>
|
|
||||||
<os_version>#45~20.04.1-Ubuntu SMP Wed Nov 10 10:20:10 UTC 2021</os_version>
|
|
||||||
<host>rudie</host>
|
|
||||||
<arch>x86_64</arch>
|
|
||||||
<command_line>tcpflow -i any -C port 8280</command_line>
|
|
||||||
<uid>0</uid>
|
|
||||||
<username>root</username>
|
|
||||||
<start_time>2021-12-03T11:50:49Z</start_time>
|
|
||||||
</execution_environment>
|
|
||||||
</creator>
|
|
||||||
<configuration>
|
|
||||||
</configuration>
|
|
||||||
<tdelta>0</tdelta>
|
|
||||||
<configuration>
|
|
||||||
<fileobject>
|
|
||||||
<filename>195.134.066.145.08280-094.064.048.084.62228</filename>
|
|
||||||
<filesize>39674</filesize>
|
|
||||||
<tcpflow startime='2021-12-03T12:09:58.146180Z' endtime='2021-12-03T12:10:18.406979Z' mac_daddr='00:04:00:01:00:06' mac_saddr='b4:2e:99:b8:ec:51' family='2' src_ipn='195.134.66.145' dst_ipn='94.64.48.84' srcport='8280' dstport='62228' packets='33' len='41546' />
|
|
||||||
</fileobject>
|
|
||||||
<fileobject>
|
|
||||||
<filename>195.134.066.145.08280-195.134.066.216.60994</filename>
|
|
||||||
<filesize>954</filesize>
|
|
||||||
<tcpflow startime='2021-12-03T12:09:52.260596Z' endtime='2021-12-03T12:09:52.489805Z' mac_daddr='00:04:00:01:00:06' mac_saddr='b4:2e:99:b8:ec:51' family='2' src_ipn='195.134.66.145' dst_ipn='195.134.66.216' srcport='8280' dstport='60994' packets='5' len='1302' />
|
|
||||||
</fileobject>
|
|
||||||
<fileobject>
|
|
||||||
<filename>195.134.066.216.60994-195.134.066.145.08280</filename>
|
|
||||||
<filesize>310</filesize>
|
|
||||||
<tcpflow startime='2021-12-03T12:09:52.260524Z' endtime='2021-12-03T12:09:52.489936Z' mac_daddr='00:00:00:01:00:06' mac_saddr='e0:d5:5e:c9:d4:78' family='2' src_ipn='195.134.66.216' dst_ipn='195.134.66.145' srcport='60994' dstport='8280' packets='7' len='794' />
|
|
||||||
</fileobject>
|
|
||||||
<fileobject>
|
|
||||||
<filename>094.064.048.084.62228-195.134.066.145.08280</filename>
|
|
||||||
<filesize>516</filesize>
|
|
||||||
<tcpflow startime='2021-12-03T12:09:58.146112Z' endtime='2021-12-03T12:10:18.406906Z' mac_daddr='00:00:00:01:00:06' mac_saddr='00:23:04:dc:b9:80' family='2' src_ipn='94.64.48.84' dst_ipn='195.134.66.145' srcport='62228' dstport='8280' packets='18' len='1631' />
|
|
||||||
</fileobject>
|
|
||||||
<fileobject>
|
|
||||||
<filename>195.134.066.145.08280-195.134.066.145.41802</filename>
|
|
||||||
<filesize>1180</filesize>
|
|
||||||
<tcpflow startime='2021-12-03T11:50:54.973875Z' endtime='2021-12-03T11:51:17.806604Z' mac_daddr='00:00:03:04:00:06' family='2' src_ipn='195.134.66.145' dst_ipn='195.134.66.145' srcport='8280' dstport='41802' packets='8' len='1732' />
|
|
||||||
</fileobject>
|
|
||||||
<fileobject>
|
|
||||||
<filename>195.134.066.145.41802-195.134.066.145.08280</filename>
|
|
||||||
<filesize>525</filesize>
|
|
||||||
<tcpflow startime='2021-12-03T11:50:54.973864Z' endtime='2021-12-03T11:51:17.806599Z' mac_daddr='00:00:03:04:00:06' family='2' src_ipn='195.134.66.145' dst_ipn='195.134.66.145' srcport='41802' dstport='8280' packets='8' len='1077' />
|
|
||||||
</fileobject>
|
|
||||||
<fileobject>
|
|
||||||
<filename>195.134.066.145.08280-195.134.066.145.41800</filename>
|
|
||||||
<filesize>950</filesize>
|
|
||||||
<tcpflow startime='2021-12-03T11:50:54.971208Z' endtime='2021-12-03T11:51:17.806559Z' mac_daddr='00:00:03:04:00:06' family='2' src_ipn='195.134.66.145' dst_ipn='195.134.66.145' srcport='8280' dstport='41800' packets='8' len='1502' />
|
|
||||||
</fileobject>
|
|
||||||
<fileobject>
|
|
||||||
<filename>195.134.066.145.41800-195.134.066.145.08280</filename>
|
|
||||||
<filesize>695</filesize>
|
|
||||||
<tcpflow startime='2021-12-03T11:50:54.971198Z' endtime='2021-12-03T11:51:17.806549Z' mac_daddr='00:00:03:04:00:06' family='2' src_ipn='195.134.66.145' dst_ipn='195.134.66.145' srcport='41800' dstport='8280' packets='8' len='1247' />
|
|
||||||
</fileobject>
|
|
||||||
</configuration>
|
|
||||||
<summary />
|
|
||||||
<open_fds_at_end>0</open_fds_at_end>
|
|
||||||
<max_open_flows>0</max_open_flows>
|
|
||||||
<total_flows>8</total_flows>
|
|
||||||
<flow_map_size>8</flow_map_size>
|
|
||||||
<total_packets>95</total_packets>
|
|
||||||
<rusage>
|
|
||||||
<utime>0.030194</utime>
|
|
||||||
<stime>0.004313</stime>
|
|
||||||
<maxrss>10832</maxrss>
|
|
||||||
<minflt>1224</minflt>
|
|
||||||
<majflt>0</majflt>
|
|
||||||
<nswap>0</nswap>
|
|
||||||
<inblock>0</inblock>
|
|
||||||
<oublock>24</oublock>
|
|
||||||
<clocktime>1929.089744</clocktime>
|
|
||||||
</rusage>
|
|
||||||
</dfxml>
|
|
|
@ -39,7 +39,9 @@ public class MetricsService {
|
||||||
"reldatasourcecompatibilityid exact openaire-cris_1.1 or reldatasourcecompatibilityid exact openaire2.0_data" +
|
"reldatasourcecompatibilityid exact openaire-cris_1.1 or reldatasourcecompatibilityid exact openaire2.0_data" +
|
||||||
" or reldatasourcecompatibilityid exact hostedBy or relproject=*))&type=organizations&size=0&format=json";
|
" or reldatasourcecompatibilityid exact hostedBy or relproject=*))&type=organizations&size=0&format=json";
|
||||||
|
|
||||||
@Scheduled(cron = "${calculation.time.cron}")
|
|
||||||
|
//@Scheduled(cron = "0 0/1 * * * *")
|
||||||
|
@Scheduled(cron = "0 0 0 * * ?")
|
||||||
private void calculateMetrics() {
|
private void calculateMetrics() {
|
||||||
logger.info("Calculating metrics...");
|
logger.info("Calculating metrics...");
|
||||||
Metrics metrics = new Metrics();
|
Metrics metrics = new Metrics();
|
||||||
|
|
|
@ -13,7 +13,7 @@ public class PrometheusMetricsFormatter {
|
||||||
FUNDERS("# TYPE explore_total_funders gauge\nexplore_total_funders %s"),
|
FUNDERS("# TYPE explore_total_funders gauge\nexplore_total_funders %s"),
|
||||||
PROJECTS("# TYPE explore_total_projects gauge\nexplore_total_projects %s"),
|
PROJECTS("# TYPE explore_total_projects gauge\nexplore_total_projects %s"),
|
||||||
CONTENT_PROVIDERS("# TYPE explore_total_contentproviders gauge\nexplore_total_contentproviders %s"),
|
CONTENT_PROVIDERS("# TYPE explore_total_contentproviders gauge\nexplore_total_contentproviders %s"),
|
||||||
ORGANIZATIONS("# TYPE explore_total_organizations gauge\nexplore_total_organizations %s\n");
|
ORGANIZATIONS("# TYPE explore_total_organizations gauge \nexplore_total_organizations %s");
|
||||||
|
|
||||||
private String value;
|
private String value;
|
||||||
PrometheusMetrics(String value) {
|
PrometheusMetrics(String value) {
|
||||||
|
|
|
@ -4,7 +4,5 @@ server.port=8180
|
||||||
#management.endpoint.health.show-details=always
|
#management.endpoint.health.show-details=always
|
||||||
management.endpoints.web.base-path=/-
|
management.endpoints.web.base-path=/-
|
||||||
|
|
||||||
filepath=/home/katerina/Desktop
|
|
||||||
|
|
||||||
#every midnight
|
filepath=/home/katerina/Desktop
|
||||||
calculation.time.cron = 0 0 0 * * ?
|
|
Loading…
Reference in New Issue