Branch: refs/heads/release/jon3.3.x Home: https://github.com/rhq-project/rhq Commit: 964dc56144cdacf3eb45661a974230673417a99f https://github.com/rhq-project/rhq/commit/964dc56144cdacf3eb45661a9742306734... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-08-20 (Wed, 20 Aug 2014)
Changed paths: M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsBaselineCalculatorTest.java
Log Message: ----------- Fix test failure due to API change.
Cherry-pick of master 8a22587813c5434d48caa99368a70aeb52934a47
Commit: 563aafb2ae77e5602309cf86d30a10374db2fbf6 https://github.com/rhq-project/rhq/commit/563aafb2ae77e5602309cf86d30a10374d... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-08-20 (Wed, 20 Aug 2014)
Changed paths: M modules/core/dbutils/pom.xml M modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/intentional-api-changes-since-4.12.0.xml M modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java M modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/AlertFormatUtility.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/ConditionEditor.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/alert/engine/internal/AgentConditionCache.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/EventCacheElement.java
Log Message: ----------- [BZ 1070257 + BZ 911432] - Increasing the size of db column RHQ_ALERT_CONDITION_LOG and adding an explicit way to match alert condition on event source
messages from squashed commits: * [BZ 1070257 + BZ 911432] - UI for alert definitions of type Event Detection and the ability to match on a source location regular expression. * [BZ 1070257 + BZ 911432] - i18n * [BZ 1070257 + BZ 911432] - There was a change in public constant in core/domain -> adding it as intentional api change * [BZ 1070257 + BZ 911432] - rhq_alert_condition_log.value: VARCHAR2(512) -> VARCHAR2(4000); fixing the situation when one or both regular expressions are empty (getValueAsString() returns 'null' as a string if the form field is blank - http://forums.smartclient.com/showthread.php?t=21516)
Cherry-pick of master: 880124918391f97ac7f2c2362310de79f36a5365
Commit: 10431676f3a027f3b5d93e26489dd4e02f008f65 https://github.com/rhq-project/rhq/commit/10431676f3a027f3b5d93e26489dd4e02f... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-08-20 (Wed, 20 Aug 2014)
Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionLogManagerBean.java
Log Message: ----------- [BZ 1070257 + BZ 911432] - ensuring the value passed to AlertConditionLog.setValue satisfies the db constraint (for Postgres it is AlertConditionLog.MAX_LOG_LENGTH chars and for Oracle AlertConditionLog.MAX_LOG_LENGTH bytes).
Cherry-pick master eb5114f2dcc2ce690c925daef2ceab0e21bb7a45
Commit: 55151a79fa16d890401aeb7346d4e8461601e027 https://github.com/rhq-project/rhq/commit/55151a79fa16d890401aeb7346d4e84616... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-08-20 (Wed, 20 Aug 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionLogManagerBean.java
Log Message: ----------- [1070257] (JON3-36) Extend length of Details field of alert notifications One additional commit to the PR. Just use DatabaseTypeFactory.getDefaultDatabaseType() instead of figuring it out manually.
Cherry-pick master c0e7effaca68ffb8afc8690d340f3738ce6b5f8e
Compare: https://github.com/rhq-project/rhq/compare/e5f5ea48a230...55151a79fa16
rhq-commits@lists.fedorahosted.org
-
Jay Shaughnessy