[rhq-project/rhq] bdecf5: updating logic for determining most recent raw dat...
by John Sanda
Branch: refs/heads/jsanda/metrics-schema
Home: https://github.com/rhq-project/rhq
Commit: bdecf569cf9e24060b04b3407ee79051193148a0
https://github.com/rhq-project/rhq/commit/bdecf569cf9e24060b04b3407ee7905...
Author: John Sanda <jsanda(a)redhat.com>
Date: 2014-03-28 (Fri, 28 Mar 2014)
Changed paths:
M modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementSchedule.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerLocal.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJob.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/AggregationManager.java
M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/AggregationTests.java
M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
Log Message:
-----------
updating logic for determining most recent raw data after server outage
This commit also remove the logic around the min/max scheudle ids. Previously
we needed the min and max schedule ids in order to determine the possible set
of rows in metrics_cache. This is no longer necessary though since we track the
schedule ids in metrics_cache_index.
10 years, 1 month
[rhq-project/rhq] 937962: major refactoring to consolidate common aggregatio...
by John Sanda
Branch: refs/heads/jsanda/metrics-schema
Home: https://github.com/rhq-project/rhq
Commit: 9379626d52dbb16bd32ff2515c4e4a27e04d5bc0
https://github.com/rhq-project/rhq/commit/9379626d52dbb16bd32ff2515c4e4a2...
Author: John Sanda <jsanda(a)redhat.com>
Date: 2014-03-28 (Fri, 28 Mar 2014)
Changed paths:
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/AggregationManager.java
R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/Aggregator.java
A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BaseAggregator.java
R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BatchResult.java
A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/CacheAggregator.java
A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/CacheIterator.java
R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/ComputeMetric.java
A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/IndexAggregatesPair.java
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/PastDataAggregator.java
R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/ProcessBatch.java
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/CacheIndexEntry.java
M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/AggregationTests.java
M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsPerfTests.java
M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsTest.java
Log Message:
-----------
major refactoring to consolidate common aggregation functions
After adding initial support for aggregating old/past data, it was evident that
there was a lot of duplicate functionality around aggregating past and current
data. This commit introduces a new class, BaseAggregator, which contains common
functions. Aggregation has been renamed to CacheAggregator since it only works
with data out of the metrics_cache table.
This is also the initial commit for CacheIterator. The computeAggregates
function, in its previous forms, took a list of result sets as input. The
computations to be performed for past and current data is the same, but the
format of the input differed. Now the input is an Iterable so that the function
can be used with both past and current data.
10 years, 1 month
[rhq-project/rhq] 5cbbd1: [BZ 1075575] Update Cassandra to a version special...
by John Mazzitelli
Branch: refs/heads/feature/bz1069606-rebase-eap-63
Home: https://github.com/rhq-project/rhq
Commit: 5cbbd1cac8ee864d4bc7080a543a7a3be6a0229c
https://github.com/rhq-project/rhq/commit/5cbbd1cac8ee864d4bc7080a543a7a3...
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: 2014-03-25 (Tue, 25 Mar 2014)
Changed paths:
M pom.xml
Log Message:
-----------
[BZ 1075575] Update Cassandra to a version specially crafted to not print the superfluous warning about OpenJDK.
Commit: df3f406aeb122317db12b0cd8787f046846052a8
https://github.com/rhq-project/rhq/commit/df3f406aeb122317db12b0cd8787f04...
Author: John Mazzitelli <mazz(a)redhat.com>
Date: 2014-03-25 (Tue, 25 Mar 2014)
Changed paths:
M modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build.xml
Log Message:
-----------
BZ 823965 Maintain existing agent-configuration.xml and log4j.xml files after agent auto-update.
The new configuration will be kept in agent-configuration.xml.new and log4j.xml.new
so that we at least provide the user with the updated defaults in case they want to manually merge them.
Commit: fc0737027e46c7298c591122d5cd42dd7883dfad
https://github.com/rhq-project/rhq/commit/fc0737027e46c7298c591122d5cd42d...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: 2014-03-26 (Wed, 26 Mar 2014)
Changed paths:
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
Log Message:
-----------
BZ_1080171 - defer adding of "WHERE" keyword until we know that it is needed.
Commit: ce4e2505c0907544d83cd2d27df8cc9dfeda8af3
https://github.com/rhq-project/rhq/commit/ce4e2505c0907544d83cd2d27df8cc9...
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: 2014-03-26 (Wed, 26 Mar 2014)
Changed paths:
M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LinkManager.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/PortletFactory.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java
A modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/events/AbstractRecentEventsPortlet.java
A modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/events/RecentEventsPortlet.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/event/EventCompositeDatasource.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/event/EventCompositeHistoryView.java
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java
Log Message:
-----------
[BZ 1070243] - (JON3-31) Add "Recent Events" portlet into JON
Dashboard
To make the filtering (based on resource name) working, I had to add also
the new method to the EventCriteria class.
To sum it up, it is possible to filter by:
* time ("from, to" or "last n mins/hours/days")
* resource name - only for global Recent Alerts portlet; it accepts also a substring of a name
* event source path - it accepts also a substring of a path
* severity (almost the same as alert priority filtering)
* result counts (5 is default)
Having that said, the performance shouldn't be an issue, because the
filters may be set to fetch only a few records.
Commit: 42471d8cbb8cc92da2c55fb06347f465b8a4d239
https://github.com/rhq-project/rhq/commit/42471d8cbb8cc92da2c55fb06347f46...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: 2014-03-28 (Fri, 28 Mar 2014)
Changed paths:
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
Log Message:
-----------
Updated checks after comments from @metlos.
Commit: e2eac63b80ed7f7fe2051c50dfc48f4df834718f
https://github.com/rhq-project/rhq/commit/e2eac63b80ed7f7fe2051c50dfc48f4...
Author: Lukas Krejci <metlos(a)users.noreply.github.com>
Date: 2014-03-28 (Fri, 28 Mar 2014)
Changed paths:
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
Log Message:
-----------
Merge pull request #17 from pilhuhn/bz1080171
BZ_1080171 - defer adding of "WHERE" keyword until we know that it is needed.
Commit: c8386827c162bcb723be533b32e5c07310e5cd4d
https://github.com/rhq-project/rhq/commit/c8386827c162bcb723be533b32e5c07...
Author: John Mazzitelli <mazz(a)redhat.com>
Date: 2014-03-28 (Fri, 28 Mar 2014)
Changed paths:
M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java
M modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build.xml
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LinkManager.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/PortletFactory.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java
A modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/events/AbstractRecentEventsPortlet.java
A modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/events/RecentEventsPortlet.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/event/EventCompositeDatasource.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/event/EventCompositeHistoryView.java
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
M pom.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
Compare: https://github.com/rhq-project/rhq/compare/f2b7ea32d76e...c8386827c162
10 years, 1 month
[rhq-project/rhq] 7af677: [BZ 1078546] Relax remote client version check so...
by Jiri Kremser
Branch: refs/heads/feature/cumulative
Home: https://github.com/rhq-project/rhq
Commit: 7af6778815a7569b1b7b4a86cb84aacd16e08b61
https://github.com/rhq-project/rhq/commit/7af6778815a7569b1b7b4a86cb84aac...
Author: Simeon Pinder <spinder(a)redhat.com>
Date: 2014-03-24 (Mon, 24 Mar 2014)
Changed paths:
M modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClient.java
Log Message:
-----------
[BZ 1078546] Relax remote client version check so that patched but non-breaking api changes accepted.
Commit: e84817f43c7e9bb999be0b2655b54d221881dc42
https://github.com/rhq-project/rhq/commit/e84817f43c7e9bb999be0b2655b54d2...
Author: Simeon Pinder <spinder(a)redhat.com>
Date: 2014-03-27 (Thu, 27 Mar 2014)
Changed paths:
M modules/core/domain/src/main/java/org/rhq/core/domain/common/ProductInfo.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/AboutModalWindow.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java
A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/ProductUpdates.java
Log Message:
-----------
[BZ 1081564] Update rhq ui to support patch update increments when available.
Commit: c0c4cec2ec0ab917983954aebd371294827b5442
https://github.com/rhq-project/rhq/commit/c0c4cec2ec0ab917983954aebd37129...
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: 2014-03-27 (Thu, 27 Mar 2014)
Changed paths:
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/util/rpc/TrackingRequestCallback.java
Log Message:
-----------
[BZ 970181] - RHQ doesn't work after restart with open GUI in web browser. - if the server restarts at the background, the session id is lost on the server therefore we can't allow the logged user to continue sending the requests without a new AuthN. It would be a security risk to allow it. Now, if the server restarts the UI requires the new log in (the login form is displayed).
(cherry picked from commit 50aed986a19b2e1cbd7d13e179c0342857d22854)
Signed-off-by: Libor Zoubek <lzoubek(a)redhat.com>
Commit: e1443ab60422d15c5ea3abcd44de8cf169c4a7e9
https://github.com/rhq-project/rhq/commit/e1443ab60422d15c5ea3abcd44de8cf...
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: 2014-03-27 (Thu, 27 Mar 2014)
Changed paths:
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LoginView.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/storage/StorageNodeAdminView.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/AutoRefreshUtil.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTitleBar.java
Log Message:
-----------
UI: Improvement to auto refreshable views: the refresh() method is not performed if the session has expired. If the user logs in again the refresh() method will be regularly called again.
(cherry picked from commit 25706c31e65c006eb0b2c08ef5686bb70566964a)
Signed-off-by: Libor Zoubek <lzoubek(a)redhat.com>
Commit: 405ea3f75270bb3fc806e88c1b3297d3d4ce859e
https://github.com/rhq-project/rhq/commit/405ea3f75270bb3fc806e88c1b3297d...
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: 2014-03-27 (Thu, 27 Mar 2014)
Changed paths:
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
Log Message:
-----------
[BZ 1038270] - NPE when accessing the storage node view immediately after the install - NPE check added
(cherry picked from commit df44d50f6fbbfd570335a7f40a8b98d9d8152a9a)
Signed-off-by: Lukas Krejci <lkrejci(a)redhat.com>
Compare: https://github.com/rhq-project/rhq/compare/152b37228e0d...405ea3f75270
10 years, 1 month
[rhq-project/rhq] 087b3e: adding initial support for aggregating late/past d...
by John Sanda
Branch: refs/heads/jsanda/metrics-schema
Home: https://github.com/rhq-project/rhq
Commit: 087b3ec83a72726726bb067c1192bba38346fa54
https://github.com/rhq-project/rhq/commit/087b3ec83a72726726bb067c1192bba...
Author: John Sanda <jsanda(a)redhat.com>
Date: 2014-03-26 (Wed, 26 Mar 2014)
Changed paths:
M modules/common/cassandra-schema/src/main/resources/schema/update/0002.xml
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DateTimeService.java
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/AggregationManager.java
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/Aggregator.java
A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/PastDataAggregator.java
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/ProcessBatch.java
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/CacheIndexEntryMapper.java
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/NumericMetric.java
M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/AggregationTests.java
M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/InMemoryMetricsDB.java
M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java
M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsTest.java
Log Message:
-----------
adding initial support for aggregating late/past data
There are two main changes in this commit. The first is the initial suppport
for aggregating late data. That is, raw data that is stored after its time
slice has already passed.
The schema for metrics_cache_index is changed slightly as well. We now order by
the time column before the start_schedule_id column. And we are always storing
the day, i.e., hour zero in the time_slice column. This reduces the number of
queries that need to be performed when looking to see if there is past data to
aggregate.
There is still work to do for handling late data along with a bunch of clean
up and refactoring. I am trying to consolidate the logic as much as possible
for aggregating past data and for current data so as to avoid a lot of the code
duplication that is going on right now.
10 years, 1 month