AMBARI-18611 Ambari MIB Should Be Included with Installation Bits (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/83aebdaa Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/83aebdaa Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/83aebdaa Branch: refs/heads/branch-feature-AMBARI-18456 Commit: 83aebdaa577b526a8e123cfda53cea27d1138a1e Parents: e68cc10 Author: Dmytro Sen <d...@apache.org> Authored: Tue Oct 18 18:57:47 2016 +0300 Committer: Dmytro Sen <d...@apache.org> Committed: Tue Oct 18 18:57:47 2016 +0300 ---------------------------------------------------------------------- ambari-server/src/main/assemblies/server.xml | 4 + .../src/main/resources/APACHE-AMBARI-MIB.txt | 206 +++++++++++++++++++ contrib/alert-snmp-mib/APACHE-AMBARI-MIB.txt | 206 ------------------- contrib/alert-snmp-mib/README.md | 2 +- 4 files changed, 211 insertions(+), 207 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/83aebdaa/ambari-server/src/main/assemblies/server.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/assemblies/server.xml b/ambari-server/src/main/assemblies/server.xml index 9252c56..11f940a 100644 --- a/ambari-server/src/main/assemblies/server.xml +++ b/ambari-server/src/main/assemblies/server.xml @@ -295,6 +295,10 @@ <outputDirectory>/var/lib/ambari-server/resources</outputDirectory> </file> <file> + <source>src/main/resources/APACHE-AMBARI-MIB.txt</source> + <outputDirectory>/var/lib/ambari-server/resources</outputDirectory> + </file> + <file> <source>src/main/resources/slider_resources/README.txt</source> <outputDirectory>/var/lib/ambari-server/resources/apps</outputDirectory> </file> http://git-wip-us.apache.org/repos/asf/ambari/blob/83aebdaa/ambari-server/src/main/resources/APACHE-AMBARI-MIB.txt ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/APACHE-AMBARI-MIB.txt b/ambari-server/src/main/resources/APACHE-AMBARI-MIB.txt new file mode 100644 index 0000000..85ec3cd --- /dev/null +++ b/ambari-server/src/main/resources/APACHE-AMBARI-MIB.txt @@ -0,0 +1,206 @@ +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. + + +APACHE-AMBARI-MIB DEFINITIONS ::= BEGIN + +IMPORTS + MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE, Integer32, enterprises + FROM SNMPv2-SMI + MODULE-COMPLIANCE, OBJECT-GROUP, NOTIFICATION-GROUP + FROM SNMPv2-CONF + TEXTUAL-CONVENTION + FROM SNMPv2-TC + ; + +apacheAmbari MODULE-IDENTITY + LAST-UPDATED "201508310000Z" + ORGANIZATION "ambari.apache.org" + CONTACT-INFO + "email: u...@ambari.apache.org" + DESCRIPTION + "Apache Ambari MIB Module" + -- Revisions + REVISION "201508310000Z" + DESCRIPTION + "First Apache Ambari MIB" + ::= { apache 16 } + +apache OBJECT IDENTIFIER ::= { enterprises 18060 } +apacheAmbariTraps OBJECT IDENTIFIER ::= { apacheAmbari 0 } +apacheAmbariAlerts OBJECT IDENTIFIER ::= { apacheAmbari 1 } + +AlertStateType ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION + "A string indicating the state of the Alert." + SYNTAX INTEGER { + ok(0), + unknown(1), + warning(2), + critical(3) + } + +apacheAmbariAlertTable OBJECT-TYPE + SYNTAX SEQUENCE OF AlertEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Table of Apache Ambari Alerts" + ::= { apacheAmbariAlerts 1 } + +AlertEntry ::= SEQUENCE { + alertDefinitionId Integer32, + alertDefinitionName OCTET STRING, + alertDefinitionHash OCTET STRING, + alertName OCTET STRING, + alertText OCTET STRING, + alertState AlertStateType, + alertHost OCTET STRING, + alertService OCTET STRING, + alertComponent OCTET STRING + } + +apacheAmbariAlertEntry OBJECT-TYPE + SYNTAX AlertEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Each Alert Event" + INDEX { alertDefinitionId } + ::= { apacheAmbariAlertTable 1 } + +alertDefinitionId OBJECT-TYPE + SYNTAX Integer32 (-2147483648..2147483647) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ID of the Alert" + ::= { apacheAmbariAlertEntry 1 } + +alertDefinitionName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS accessible-for-notify + STATUS current + DESCRIPTION + "Alert Definition Name" + ::= { apacheAmbariAlertEntry 2 } + +alertDefinitionHash OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS accessible-for-notify + STATUS current + DESCRIPTION + "Alert Definition Hash" + ::= { apacheAmbariAlertEntry 3 } + +alertName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS accessible-for-notify + STATUS current + DESCRIPTION + "Name of the Alert" + ::= { apacheAmbariAlertEntry 4 } + +alertText OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS accessible-for-notify + STATUS current + DESCRIPTION + "Text output of the Alert" + ::= { apacheAmbariAlertEntry 5 } + +alertState OBJECT-TYPE + SYNTAX AlertStateType + MAX-ACCESS accessible-for-notify + STATUS current + DESCRIPTION + "Severity of the Alert" + ::= { apacheAmbariAlertEntry 6 } + +alertHost OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS accessible-for-notify + STATUS current + DESCRIPTION + "Affected Host" + ::= { apacheAmbariAlertEntry 7 } + +alertService OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS accessible-for-notify + STATUS current + DESCRIPTION + "Affected Service" + ::= { apacheAmbariAlertEntry 8 } + +alertComponent OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS accessible-for-notify + STATUS current + DESCRIPTION + "Affected Component" + ::= { apacheAmbariAlertEntry 9 } + +apacheAmbariAlert NOTIFICATION-TYPE + OBJECTS { + alertDefinitionName, alertDefinitionHash, + alertName, alertText, alertState, alertHost, alertService, + alertComponent + } + STATUS current + DESCRIPTION + "The SNMP trap that is generated as a result of an alert." + ::= { apacheAmbariTraps 1 } + +apacheAmbariConformance OBJECT IDENTIFIER ::= + { apacheAmbariAlerts 3 } +apacheAmbariCompliances OBJECT IDENTIFIER ::= + { apacheAmbariConformance 1 } +apacheAmbariConformanceGroups OBJECT IDENTIFIER ::= + { apacheAmbariConformance 2 } + +apacheAmbariMIBCompliance MODULE-COMPLIANCE + STATUS current + DESCRIPTION + "Compliance statement for entities which implement this MIB." + MODULE + MANDATORY-GROUPS { + apacheAmbariAlertGroup, + apacheAmbariAlertObjectGroup + } + ::= { apacheAmbariCompliances 2 } + +apacheAmbariAlertGroup NOTIFICATION-GROUP + NOTIFICATIONS { + apacheAmbariAlert + } + STATUS current + DESCRIPTION + "Notification objects." + ::= { apacheAmbariConformanceGroups 2 } + +apacheAmbariAlertObjectGroup OBJECT-GROUP + OBJECTS { + alertDefinitionName, alertDefinitionHash, + alertName, alertText, alertState, alertHost, alertService, + alertComponent + } + STATUS current + DESCRIPTION + "Event Objects" + ::= { apacheAmbariConformanceGroups 3 } +END http://git-wip-us.apache.org/repos/asf/ambari/blob/83aebdaa/contrib/alert-snmp-mib/APACHE-AMBARI-MIB.txt ---------------------------------------------------------------------- diff --git a/contrib/alert-snmp-mib/APACHE-AMBARI-MIB.txt b/contrib/alert-snmp-mib/APACHE-AMBARI-MIB.txt deleted file mode 100644 index 85ec3cd..0000000 --- a/contrib/alert-snmp-mib/APACHE-AMBARI-MIB.txt +++ /dev/null @@ -1,206 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - - -APACHE-AMBARI-MIB DEFINITIONS ::= BEGIN - -IMPORTS - MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE, Integer32, enterprises - FROM SNMPv2-SMI - MODULE-COMPLIANCE, OBJECT-GROUP, NOTIFICATION-GROUP - FROM SNMPv2-CONF - TEXTUAL-CONVENTION - FROM SNMPv2-TC - ; - -apacheAmbari MODULE-IDENTITY - LAST-UPDATED "201508310000Z" - ORGANIZATION "ambari.apache.org" - CONTACT-INFO - "email: u...@ambari.apache.org" - DESCRIPTION - "Apache Ambari MIB Module" - -- Revisions - REVISION "201508310000Z" - DESCRIPTION - "First Apache Ambari MIB" - ::= { apache 16 } - -apache OBJECT IDENTIFIER ::= { enterprises 18060 } -apacheAmbariTraps OBJECT IDENTIFIER ::= { apacheAmbari 0 } -apacheAmbariAlerts OBJECT IDENTIFIER ::= { apacheAmbari 1 } - -AlertStateType ::= TEXTUAL-CONVENTION - STATUS current - DESCRIPTION - "A string indicating the state of the Alert." - SYNTAX INTEGER { - ok(0), - unknown(1), - warning(2), - critical(3) - } - -apacheAmbariAlertTable OBJECT-TYPE - SYNTAX SEQUENCE OF AlertEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "Table of Apache Ambari Alerts" - ::= { apacheAmbariAlerts 1 } - -AlertEntry ::= SEQUENCE { - alertDefinitionId Integer32, - alertDefinitionName OCTET STRING, - alertDefinitionHash OCTET STRING, - alertName OCTET STRING, - alertText OCTET STRING, - alertState AlertStateType, - alertHost OCTET STRING, - alertService OCTET STRING, - alertComponent OCTET STRING - } - -apacheAmbariAlertEntry OBJECT-TYPE - SYNTAX AlertEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "Each Alert Event" - INDEX { alertDefinitionId } - ::= { apacheAmbariAlertTable 1 } - -alertDefinitionId OBJECT-TYPE - SYNTAX Integer32 (-2147483648..2147483647) - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "ID of the Alert" - ::= { apacheAmbariAlertEntry 1 } - -alertDefinitionName OBJECT-TYPE - SYNTAX OCTET STRING - MAX-ACCESS accessible-for-notify - STATUS current - DESCRIPTION - "Alert Definition Name" - ::= { apacheAmbariAlertEntry 2 } - -alertDefinitionHash OBJECT-TYPE - SYNTAX OCTET STRING - MAX-ACCESS accessible-for-notify - STATUS current - DESCRIPTION - "Alert Definition Hash" - ::= { apacheAmbariAlertEntry 3 } - -alertName OBJECT-TYPE - SYNTAX OCTET STRING - MAX-ACCESS accessible-for-notify - STATUS current - DESCRIPTION - "Name of the Alert" - ::= { apacheAmbariAlertEntry 4 } - -alertText OBJECT-TYPE - SYNTAX OCTET STRING - MAX-ACCESS accessible-for-notify - STATUS current - DESCRIPTION - "Text output of the Alert" - ::= { apacheAmbariAlertEntry 5 } - -alertState OBJECT-TYPE - SYNTAX AlertStateType - MAX-ACCESS accessible-for-notify - STATUS current - DESCRIPTION - "Severity of the Alert" - ::= { apacheAmbariAlertEntry 6 } - -alertHost OBJECT-TYPE - SYNTAX OCTET STRING - MAX-ACCESS accessible-for-notify - STATUS current - DESCRIPTION - "Affected Host" - ::= { apacheAmbariAlertEntry 7 } - -alertService OBJECT-TYPE - SYNTAX OCTET STRING - MAX-ACCESS accessible-for-notify - STATUS current - DESCRIPTION - "Affected Service" - ::= { apacheAmbariAlertEntry 8 } - -alertComponent OBJECT-TYPE - SYNTAX OCTET STRING - MAX-ACCESS accessible-for-notify - STATUS current - DESCRIPTION - "Affected Component" - ::= { apacheAmbariAlertEntry 9 } - -apacheAmbariAlert NOTIFICATION-TYPE - OBJECTS { - alertDefinitionName, alertDefinitionHash, - alertName, alertText, alertState, alertHost, alertService, - alertComponent - } - STATUS current - DESCRIPTION - "The SNMP trap that is generated as a result of an alert." - ::= { apacheAmbariTraps 1 } - -apacheAmbariConformance OBJECT IDENTIFIER ::= - { apacheAmbariAlerts 3 } -apacheAmbariCompliances OBJECT IDENTIFIER ::= - { apacheAmbariConformance 1 } -apacheAmbariConformanceGroups OBJECT IDENTIFIER ::= - { apacheAmbariConformance 2 } - -apacheAmbariMIBCompliance MODULE-COMPLIANCE - STATUS current - DESCRIPTION - "Compliance statement for entities which implement this MIB." - MODULE - MANDATORY-GROUPS { - apacheAmbariAlertGroup, - apacheAmbariAlertObjectGroup - } - ::= { apacheAmbariCompliances 2 } - -apacheAmbariAlertGroup NOTIFICATION-GROUP - NOTIFICATIONS { - apacheAmbariAlert - } - STATUS current - DESCRIPTION - "Notification objects." - ::= { apacheAmbariConformanceGroups 2 } - -apacheAmbariAlertObjectGroup OBJECT-GROUP - OBJECTS { - alertDefinitionName, alertDefinitionHash, - alertName, alertText, alertState, alertHost, alertService, - alertComponent - } - STATUS current - DESCRIPTION - "Event Objects" - ::= { apacheAmbariConformanceGroups 3 } -END http://git-wip-us.apache.org/repos/asf/ambari/blob/83aebdaa/contrib/alert-snmp-mib/README.md ---------------------------------------------------------------------- diff --git a/contrib/alert-snmp-mib/README.md b/contrib/alert-snmp-mib/README.md index 37fbc0a..1d08e8e 100644 --- a/contrib/alert-snmp-mib/README.md +++ b/contrib/alert-snmp-mib/README.md @@ -29,7 +29,7 @@ Install SNMP Utils Make SNMP Utils aware of the Apache Ambari MIB - cp APACHE-AMBARI-MIB.txt /usr/share/snmp/mibs + cp /var/lib/ambari-server/resources/APACHE-AMBARI-MIB.txt /usr/share/snmp/mibs Startup a simple SNMP trap daemon to log all traps to the `/tmp/traps.log` file for testing purposes.