opennms

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

[bamboo] Automated branch merge (from foundation:9c5de2d9dd4404a8f9c58c94dc1b21c7927483a3)

Merge pull request #1552 from OpenNMS/jira/NMS-9415

NMS-9415: Check if ipAddressIfIndex contains any data

Merge branch 'pr/jira/NMS-9409' into foundation-2016

NMS-9409: Verify that the date from the reading is a valid timestamp in milliseconds.

Merge branch 'NMS-9409-TCP-persistence-millseconds' of https://github.com/tdefilip/opennms into pr/jira/NMS-9409

NMS-9415: Check if ipAddressIfIndex contains any data

If ipAddressIfIndex is null, print a warning before returning null.

(Recommit to base the pull request on release-20.0.1 instead of develop.)

NMS-9409: TCP persistence strategy should output time in milliseconds, not seconds

  • Timestamp needs to be converted from seconds to milliseconds.

[bamboo] Automated branch merge (from foundation:073db6f9343b3d05d17308c4d66f335c581100cd)

    • -1
    • +1
    /opennms-webapp/src/main/webapp/element/node.jsp
    • -4
    • +4
    /opennms-webapp/src/main/webapp/graph/index.jsp

Merge pull request #1527 from OpenNMS/features/xss-fixes-f16

NMS-9353: Escape the node label in the Growl message

Merge pull request #1526 from OpenNMS/features/xss-fixes

NMS-9353: NMS-9354: NMS-9355: Escape additional fields to help prevent XSS

Merge pull request #1523 from OpenNMS/jira/NMS-9361

NMS-9361: Fix thresholding for generic type resources built using the CollectionSetBuilder.

NMS-9354: Escape the error message output.

NMS-9355: Escape the application name and node label in the edit application page.

NMS-9353: Sanitize the node label to help prevent Persistent XSS related issues.

    • -1
    • +1
    /opennms-webapp/src/main/webapp/element/node.jsp
    • -4
    • +4
    /opennms-webapp/src/main/webapp/graph/index.jsp

NMS-9353: Sanitize the growl message to avoid XSS.

NMS-9361: Use the instance label in conjunction with the instance as the key for the thresholder's state.

This allows us to uniquely identify resources that share the same

instance, but whose path on disk may differ due to the use of a

StorageStrategy implementation such as the SiblingColumnStorageStrategy.

NMS-9361: Use the storage strategy to determine the resource name instead of always using the index.

Merge pull request #1502 from OpenNMS/jira/NMS-9361

NMS-9361: Fix thresholding for generic type resources built using the CollectionSetBuilder.

Merge pull request #1499 from OpenNMS/jira/NMS-9362

NMS-9362: Tweak Mattermost notification docs not to specify a channel

NMS-9362: Tweak Mattermost notification docs not to specify a channel

Reworked Mattermost and Slack sections. More basic starter example with full

enumeration of all currently supported options. Linked to incoming webhook docs

for both platforms.

Merge pull request #1495 from OpenNMS/jira/NMS-9261-2

NMS-9261: Make org.opennms.newts.nan_on_counter_wrap=true by default.

NMS-9361: Fix thresholding support for generic type resources built using the CollectionSetBuilder.

Merge pull request #1480 from OpenNMS/jira/NMS-9325

NMS-9325: Calculation of KSC reports timespans "Last Week" and "This Week" broken

NMS-9261: Make org.opennms.newts.nan_on_counter_wrap=true by default.

NMS-9325: removing an accidentally added file.

NMS-9325: Fixing end date.

    • -0
    • +2
    /opennms-webapp-rest/TODO

Fix for Bug NMS-9325

Calculation of KSC reports timespans "Last Week" and "This Week" broken

Merge pull request #1465 from OpenNMS/jira/NMS-8908

NMS-8908: Always update .meta files

Merge pull request #1463 from OpenNMS/jira/NMS-7148

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