Clone Tools
  • last updated a few seconds ago
Constraints: committers
Constraints: files
Constraints: dates

[bamboo] Automated branch merge (from foundation-2016:f0db6a643b7f6074b1e6b9193f3c39bdc594ff0f)

fix(rancid): avoid exception in output.log if RANCID is not configured

[bamboo] Automated branch merge (from foundation-2016:bcd9468a08d99bdff8a4d6a962b606e5cde296ec)

Merge remote-tracking branch 'origin/foundation' into foundation-2016

Merge pull request #1590 from OpenNMS/jira/NMS-9478

NMS-9478: Remove query parameter from OnmsRestService

[bamboo] Automated branch merge (from foundation-2016:855b1117897f0f271de4ce1243c33695772832ce)

Merge pull request #1593 from OpenNMS/jira/NMS-9476

[bamboo] Automated branch merge (from foundation-2016:17599d7066efa97482c70aaef712e5780d68d916)

Merge pull request #1591 from OpenNMS/jira/NMS-9478-docs

Merge pull request #1592 from OpenNMS/jira/NMS-9133

    • -0
    • +4

NMS-9476: Use parameterized SQL inside DefaultSurveillanceViewService

NMS-9133: Added RESTv2 API URL to CORS filter configuration

    • -0
    • +4

Merge pull request #1585 from OpenNMS/jira/NMS-9449

NMS-9449: Add support for retrieving the SNMPv2 agent address from a specific varbind.

NMS-9496: Don't index events if the UEI is matched by a mask element. (#1588)

Looks good to me, and the test I've designed seems to be passing according to Bamboo.

    • -0
    • +110

Merge pull request #1581 from OpenNMS/jira/NMS-8857

NMS-8857: Make an automation to clear pathOutage alarms

NMS-9478: Remove docs for query parameter

NMS-9478: Remove query parameter from OnmsRestService

Merge remote-tracking branch 'origin/foundation-2017' into jira/NMS-8857

HZN-1061: Add RESTv2 endpoint for alarms (#1567)

Basic end-points added.

The solution can be refactored.

Some tests are still failing.

  • NMS-9278: Fixing errors on JUnit tests.

  • NMS-9278: Refactoring AbstractDaoRestService to simplify implementations.

Now, by default, AbstractDaoRestService will reject any POST, PUT and

DELETE. It is up to the class that extends this abstract class to

override the appropriate methods to provide options for create, modify

and delete entities.

Fixing PUT logic.

Adding skeletons for JUnit tests (events, alarms).

Fixing end-point for alarms.

  • NMS-9278: Refactoring update logic (this time it works).

  • NMS-9278: Several improvements and adding IfServiceRestService.

  • NMS-9278: Adding proper support for node categories and hardware inventory.

  • NMS-9278: Adding location support for new end-points.

  • Creating a helper class for security checks, to have a common place

    for this kind of things.

  • Adding action updates for the alarms endpoint.
  • Adding ability to change sticky/journal memos for alarms.
  • Update AbstractDaoRestService to provide the security context.

  • NMS-9278: Improving support for JSON; Fixing POST events.

JSON support requires more work.

  • NMS-9278: Upgrading CXF and fixing the nested object filtering capabilities

CXF was upgraded because of the following issue:

  • NMS-9278: Fixing several issues found during runtime tests.

1. CriteriaBuilderSearchVisitor was not working properly when specifying

multiple filters.

2. The distinct operation is required on several places to avoid

duplicates. All the end-points have been updaged.

3. Added some tests for the events end-point.

  • NMS-9278: Make InetAddress fields mappable and allow searching alarms by and ipAddr string

  • NMS-9278: Extend AlarmRestService to allow create/update/delete tickets

  • NMS-9278: Minor cleanup in RESTv2 classes

  • NMS-9278: Removed most distinct() Criteria directives

Added TODOs for places that we need join conditions.

  • NMS-9278: Added orderBy tests for alarm and event services

  • Expanded Criteria API to support Restrictions.eqProperty()

Added support for setting a root alias on the Criteria.

  • NMS-9278: Updated join conditions with root aliases

  • NMS-9278: Cleaned up alias JOINs and added assetRecord aliases

  • NMS-9278: Added CriteriaBehavior + CXF SearchBean to RESTv2

Added ability to use the CXF SearchBean instead of the entity

object as the query capture bean. Added a CriteriaBehavior object that

can map query terms to new names, conversions, and actions. Added a common

set of aliases and behaviors that can be reused in different endpoints

when you are joining the same aliases.

  • NMS-9278: Added SQL restriction for category id and name

This works around a bug in our version of Hibernate (documented

in issue NMS-9470) when adding an alias with a join condition

on a many-to-many relationship (like node-to-category).

  • NMS-9278: Added distPoller alias to EventRestService

  • NMS-9278: Added IpLikeCriteriaBehavior

Enables iplike criteria against root entities of a REST service.

  • NMS-9278: More work on javadoc and making the RESTv2 services consistent

  • NMS-9278: Added README file for RESTv2 services

Minor cleanup in services.

  • NMS-9278: Added more orderBy tests to AlarmRestServiceIT

Added root alias iplike behaviors.

  • NMS-9278: Use parameterized CriteriaBuilder.sql()

  • NMS-9278: Finished criteria behaviors for notifications and outages

Pasted lots of test stanzas into the tests for events, notifications

and outages.

  • NMS-9278: Fix failing v2 rest service tests

  • NMS-9278: Fix iplike search for topology

  • NMS-9278: Implement DELETE on MonitoringLocationRestService and fix tests

  1. … 44 more files in changeset.

NMS-8857: Improving the logic for clearing path-outage alarms

handle resourceTypes without labels gracefully

add toString() to GenericIndexResourceType to aid debugging

this log should not be a warning, it is very noisy

NMS-9449: Add support for retrieving the SNMPv2 agent address from a specific varbind.

  • Pull the agent address from the snmpTrapAddress ( varbind when available.
  • Add a flag to trapd-configuration.xml that can be used to enable the feature.

[bamboo] Automated branch merge (from foundation-2016:8fc6044a082e3b1b5bf5bdbc24def6f04b098986)

Merge pull request #1580 from OpenNMS/jira/NMS-9475

NMS-9475: Document the logic behind the response time value reported by the SnmpMonitor

Update SnmpMonitor.adoc

NMS-9475: Applying formatting suggestions.

Merge remote-tracking branch 'origin/foundation-2016' into foundation-2017

Merge remote-tracking branch 'origin/foundation' into foundation-2016

Merge pull request #1569 from OpenNMS/jira/NMS-9460

NMS-9460: fix various JAXB issues