[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/admin/metrics.xml idp-conf/src/main/resou...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Oct  4 21:04:18 2016
New Revision: 8465

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8465&view=rev
Log:
IDP-857 - Create a status page with JSON output

https://issues.shibboleth.net/jira/browse/IDP-857

Initial gauge sets and wiring for contents of status page.

Added:
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/CoreGaugeSet.java   (with props)
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/IdPGaugeSet.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/admin/metrics.xml
    trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/admin/metrics.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/admin/metrics.xml?rev=8465&r1=8464&r2=8465&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/admin/metrics.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/admin/metrics.xml	Tue Oct  4 21:04:18 2016
@@ -16,7 +16,18 @@
     Uncomment to register one or more of the built-in system metric sets available.
     Each bean can register only one metric set at a time (artifact of the metrics API).
     -->
+
     <!--
+    <bean parent="shibboleth.metrics.RegisterMetricSet">
+        <property name="arguments">
+            <ref bean="shibboleth.metrics.CoreGaugeSet" />
+        </property>
+    </bean>
+    <bean parent="shibboleth.metrics.RegisterMetricSet">
+        <property name="arguments">
+            <ref bean="shibboleth.metrics.IdPGaugeSet" />
+        </property>
+    </bean>
     <bean parent="shibboleth.metrics.RegisterMetricSet">
         <property name="arguments">
             <bean class="com.codahale.metrics.jvm.CachedThreadStatesGaugeSet"
@@ -48,7 +59,10 @@
     com.codahale.metrics.MetricFilter interface to specify which metrics to include.
     -->
     <util:map id="shibboleth.metrics.MetricGroups">
-    
+        <!--
+        <entry key="core" value-ref="shibboleth.metrics.CoreGaugeSet" />
+        <entry key="idp" value-ref="shibboleth.metrics.IdPGaugeSet" />
+        -->
     </util:map>
         
     <!-- If you don't specify an alternate access policy, this named policy will be enforced. -->
@@ -62,11 +76,11 @@
     
     </util:map>
     
-    <!-- System Timing Configuration -->
+    <!-- IdP Metrics Configuration -->
     
     <!--
     A bean named shibboleth.metrics.MetricStrategy of type Function<ProfileRequestContext,Boolean>
-    can be defined to add timers and counters to a large number of objects in the system. Each timer is
+    can be defined to add timers and counters to a large range of objects in the system. Each timer is
     defined by a triple (timer name, start object, stop object). Counters are just object/counter pairs.
     
     The most common example is to start a timer when a particular flow action bean starts and

Modified: trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml?rev=8465&r1=8464&r2=8465&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml	Tue Oct  4 21:04:18 2016
@@ -62,5 +62,11 @@
         class="org.springframework.beans.factory.config.MethodInvokingBean"
         p:targetObject-ref="shibboleth.metrics.MetricRegistry"
         p:targetMethod="register" />
+    
+    <!-- Some predefined metric sets, only created if used. -->
+    <bean id="shibboleth.metrics.CoreGaugeSet" class="net.shibboleth.idp.metrics.CoreGaugeSet" lazy-init="true" />
+
+    <!-- Some predefined metric sets, only created if used. -->
+    <bean id="shibboleth.metrics.IdPGaugeSet" class="net.shibboleth.idp.metrics.IdPGaugeSet" lazy-init="true" />
         
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml?rev=8465&r1=8464&r2=8465&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml	Tue Oct  4 21:04:18 2016
@@ -37,7 +37,8 @@
         p:metricRegistry-ref="shibboleth.metrics.MetricRegistry"
         p:metricFilterMap-ref="shibboleth.metrics.MetricGroups"
         p:allowedOrigin="#{getObject('shibboleth.metrics.AllowedOrigin')}"
-        p:JSONPCallbackName="#{getObject('shibboleth.metrics.JSONPCallback')}" />
+        p:JSONPCallbackName="#{getObject('shibboleth.metrics.JSONPCallback')}"

[... 5 lines stripped ...]