diff --git a/cacti_graph_template_hp_msm_aps_-_averagesnr.xml b/cacti_graph_template_hp_msm_aps_-_averagesnr.xml
new file mode 100644
index 0000000..ec872ee
--- /dev/null
+++ b/cacti_graph_template_hp_msm_aps_-_averagesnr.xml
@@ -0,0 +1,369 @@
+
+
+ HP MSM APs - AverageSNR
+
+
+ |host_description| - AverageSNR
+
+ 1
+
+ 120
+
+ 500
+
+ on
+
+ on
+
+ 2
+
+
+
+
+
+
+
+ on
+
+ on
+
+ 0
+
+ 0
+
+ 1000
+
+
+
+
+
+ dBm
+
+
+
+ hash_08002443efcf14fab6f954feed56d79bfdb422
+ FF6044
+ FF
+ 5
+ 3
+ 0
+
+ hash_060024e9c43831e54eca8069317a2ce8c6f751
+ SNR
+
+ 1
+
+
+ hash_08002443efcf14fab6f954feed56d79bfdb422
+ 0
+ FF
+ 9
+ 4
+ 0
+
+ hash_060024e9c43831e54eca8069317a2ce8c6f751
+ Last:
+
+ 2
+
+
+ hash_08002443efcf14fab6f954feed56d79bfdb422
+ 0
+ FF
+ 9
+ 1
+ 0
+
+ hash_060024e9c43831e54eca8069317a2ce8c6f751
+ Avg:
+
+ 3
+
+
+ hash_08002443efcf14fab6f954feed56d79bfdb422
+ 0
+ FF
+ 9
+ 2
+ 0
+
+ hash_060024e9c43831e54eca8069317a2ce8c6f751
+ Min:
+
+ 4
+
+
+ hash_08002443efcf14fab6f954feed56d79bfdb422
+ 0
+ FF
+ 9
+ 3
+ 0
+
+ hash_060024e9c43831e54eca8069317a2ce8c6f751
+ Max:
+ on
+ 5
+
+
+
+
+ Data Source [msmAPAverageSNR]
+
+ task_item_id
+ hash_000024a79838e8ea21db3001a5062d975c60f4|hash_000024c44b05b97d3c262a72a84baab62a8eac|hash_000024d996c1b63089fd66ba707d679c732364|hash_000024cec5434da63bf5a2d3636c7d687301c1|hash_000024ddb070c63106a7d20c52abdf868a6d99
+
+
+
+
+ HP MSM APs - AverageSNR
+
+ on
+ |host_description| - AverageSNR
+ hash_030024bf566c869ac6443b0c75d1c32b5a350e
+
+
+ 300
+
+ on
+ hash_150024c21df5178e5c955013591239eb0afd46|hash_1500240d9c0af8b8acdc7807943937b3208e29|hash_1500246fc2d038fb42950138b0ce3e9874cc60|hash_150024e36f3adb9f152adfa5dc50fd2b23337e|hash_150024283ea2bf1634d92ce081ec82a634f513
+
+
+
+
+ msmAPAverageSNR
+
+ 0
+
+ 0
+
+ 1
+
+ 600
+
+ 0
+
+
+
+
+ hash_070024617cdc8a230615e59f06f361ef6e7728
+
+
+
+
+ hash_070024acb449d1451e8a2a655c2c99d31142c7
+
+
+
+
+ hash_070024f4facc5e2ca7ebee621f09bc6d9fc792
+
+
+
+
+ hash_0700241cc1493a6781af2c478fa4de971531cf
+
+
+
+
+ hash_070024b5c23f246559df38662c255f4aa21d6b
+
+
+
+
+ hash_0700246027a919c7c7731fbe095b6f53ab127b
+ on
+
+
+
+ hash_070024cbbe5c1ddfb264a6e5d509ce1c78c95f
+ on
+
+
+
+ hash_070024e6deda7be0f391399c5130e7c4a48b28
+ on
+
+
+
+ hash_070024c1f36ee60c3dc98945556d57f26e475b
+
+
+
+
+ hash_0700242cf7129ad3ff819a7a7ac189bee48ce8
+
+
+
+
+ hash_0700246b13ac0a0194e171d241d4b06f913158
+
+
+
+
+ hash_0700243a33d4fc65b8329ab2ac46a36da26b72
+
+
+
+
+
+
+ Get SNMP Data (Indexed)
+ 3
+
+
+
+ SNMP IP Address
+
+
+
+ hostname
+ in
+ management_ip
+
+
+ SNMP Community
+
+
+
+ snmp_community
+ in
+ snmp_community
+
+
+ SNMP Username (v3)
+
+
+ on
+ snmp_username
+ in
+ snmp_username
+
+
+ SNMP Password (v3)
+
+
+ on
+ snmp_password
+ in
+ snmp_password
+
+
+ SNMP Version (1, 2, or 3)
+
+
+
+ snmp_version
+ in
+ snmp_version
+
+
+ Index Type
+
+
+
+ index_type
+ in
+ index_type
+
+
+ Index Value
+
+
+
+ index_value
+ in
+ index_value
+
+
+ Output Type ID
+
+
+
+ output_type
+ in
+ output_type
+
+
+ SNMP Port
+
+
+
+ snmp_port
+ in
+ snmp_port
+
+
+ SNMP Authenticaion Protocol (v3)
+
+
+
+ snmp_auth_protocol
+ in
+ snmp_auth_protocol
+
+
+ SNMP Privacy Passphrase (v3)
+
+
+
+ snmp_priv_passphrase
+ in
+ snmp_priv_passphrase
+
+
+ SNMP Privacy Protocol (v3)
+
+
+
+ snmp_priv_protocol
+ in
+ snmp_priv_protocol
+
+
+
+
+ Daily (5 Minute Average)
+ 0.5
+ 1
+ 600
+ 86400
+ 1|3
+
+
+ Weekly (30 Minute Average)
+ 0.5
+ 6
+ 700
+ 604800
+ 1|3
+
+
+ Monthly (2 Hour Average)
+ 0.5
+ 24
+ 775
+ 2678400
+ 1|3
+
+
+ Yearly (1 Day Average)
+ 0.5
+ 288
+ 797
+ 33053184
+ 1|3
+
+
+ Hourly (1 Minute Average)
+ 0.5
+ 1
+ 500
+ 14400
+ 1|3
+
+
+ Normal
+ %8.2lf %s
+
+
\ No newline at end of file
diff --git a/cacti_graph_template_hp_msm_aps_-_numberusers.xml b/cacti_graph_template_hp_msm_aps_-_numberusers.xml
new file mode 100644
index 0000000..7896a59
--- /dev/null
+++ b/cacti_graph_template_hp_msm_aps_-_numberusers.xml
@@ -0,0 +1,369 @@
+
+
+ HP MSM APs - NumberUsers
+
+
+ |host_description| - NumberUsers
+
+ 1
+
+ 120
+
+ 500
+
+ on
+
+ on
+
+ 2
+
+
+
+
+
+
+
+ on
+
+ on
+
+ 0
+
+ 0
+
+ 1000
+
+
+
+
+
+
+
+
+
+ hash_0800241d566a0794ea62cc0cbc760c559e5b0d
+ 0000FF
+ FF
+ 7
+ 3
+ 0
+
+ hash_060024e9c43831e54eca8069317a2ce8c6f751
+ Number Users
+
+ 1
+
+
+ hash_0800241d566a0794ea62cc0cbc760c559e5b0d
+ 0
+ FF
+ 9
+ 4
+ 0
+
+ hash_060024e9c43831e54eca8069317a2ce8c6f751
+ Last:
+
+ 2
+
+
+ hash_0800241d566a0794ea62cc0cbc760c559e5b0d
+ 0
+ FF
+ 9
+ 1
+ 0
+
+ hash_060024e9c43831e54eca8069317a2ce8c6f751
+ Avg:
+
+ 3
+
+
+ hash_0800241d566a0794ea62cc0cbc760c559e5b0d
+ 0
+ FF
+ 9
+ 2
+ 0
+
+ hash_060024e9c43831e54eca8069317a2ce8c6f751
+ Min:
+
+ 4
+
+
+ hash_0800241d566a0794ea62cc0cbc760c559e5b0d
+ 0
+ FF
+ 9
+ 3
+ 0
+
+ hash_060024e9c43831e54eca8069317a2ce8c6f751
+ Max:
+ on
+ 5
+
+
+
+
+ Data Source [msmAPNumberUsers]
+
+ task_item_id
+ hash_0000249e545fba8515fdde96fe180649e334c9|hash_0000247541b634ec5e2a1d671730aedf6f8600|hash_0000242669edcaba17b347b110236a83138b7b|hash_000024a590c99b6f8e71901394a85570683379|hash_0000249c12c50a8bda9fff5f5a628fe59e1f8e
+
+
+
+
+ HP MSM APs - NumberUsers
+
+ on
+ |host_description| - NumberUsers
+ hash_030024bf566c869ac6443b0c75d1c32b5a350e
+
+
+ 300
+
+ on
+ hash_150024c21df5178e5c955013591239eb0afd46|hash_1500240d9c0af8b8acdc7807943937b3208e29|hash_1500246fc2d038fb42950138b0ce3e9874cc60|hash_150024e36f3adb9f152adfa5dc50fd2b23337e|hash_150024283ea2bf1634d92ce081ec82a634f513
+
+
+
+
+ msmAPNumberUsers
+
+ 0
+
+ 0
+
+ 1
+
+ 600
+
+ 0
+
+
+
+
+ hash_070024617cdc8a230615e59f06f361ef6e7728
+
+
+
+
+ hash_070024acb449d1451e8a2a655c2c99d31142c7
+
+
+
+
+ hash_070024f4facc5e2ca7ebee621f09bc6d9fc792
+
+
+
+
+ hash_0700241cc1493a6781af2c478fa4de971531cf
+
+
+
+
+ hash_070024b5c23f246559df38662c255f4aa21d6b
+
+
+
+
+ hash_0700246027a919c7c7731fbe095b6f53ab127b
+ on
+
+
+
+ hash_070024cbbe5c1ddfb264a6e5d509ce1c78c95f
+ on
+
+
+
+ hash_070024e6deda7be0f391399c5130e7c4a48b28
+ on
+
+
+
+ hash_070024c1f36ee60c3dc98945556d57f26e475b
+
+
+
+
+ hash_0700242cf7129ad3ff819a7a7ac189bee48ce8
+
+
+
+
+ hash_0700246b13ac0a0194e171d241d4b06f913158
+
+
+
+
+ hash_0700243a33d4fc65b8329ab2ac46a36da26b72
+
+
+
+
+
+
+ Get SNMP Data (Indexed)
+ 3
+
+
+
+ SNMP IP Address
+
+
+
+ hostname
+ in
+ management_ip
+
+
+ SNMP Community
+
+
+
+ snmp_community
+ in
+ snmp_community
+
+
+ SNMP Username (v3)
+
+
+ on
+ snmp_username
+ in
+ snmp_username
+
+
+ SNMP Password (v3)
+
+
+ on
+ snmp_password
+ in
+ snmp_password
+
+
+ SNMP Version (1, 2, or 3)
+
+
+
+ snmp_version
+ in
+ snmp_version
+
+
+ Index Type
+
+
+
+ index_type
+ in
+ index_type
+
+
+ Index Value
+
+
+
+ index_value
+ in
+ index_value
+
+
+ Output Type ID
+
+
+
+ output_type
+ in
+ output_type
+
+
+ SNMP Port
+
+
+
+ snmp_port
+ in
+ snmp_port
+
+
+ SNMP Authenticaion Protocol (v3)
+
+
+
+ snmp_auth_protocol
+ in
+ snmp_auth_protocol
+
+
+ SNMP Privacy Passphrase (v3)
+
+
+
+ snmp_priv_passphrase
+ in
+ snmp_priv_passphrase
+
+
+ SNMP Privacy Protocol (v3)
+
+
+
+ snmp_priv_protocol
+ in
+ snmp_priv_protocol
+
+
+
+
+ Daily (5 Minute Average)
+ 0.5
+ 1
+ 600
+ 86400
+ 1|3
+
+
+ Weekly (30 Minute Average)
+ 0.5
+ 6
+ 700
+ 604800
+ 1|3
+
+
+ Monthly (2 Hour Average)
+ 0.5
+ 24
+ 775
+ 2678400
+ 1|3
+
+
+ Yearly (1 Day Average)
+ 0.5
+ 288
+ 797
+ 33053184
+ 1|3
+
+
+ Hourly (1 Minute Average)
+ 0.5
+ 1
+ 500
+ 14400
+ 1|3
+
+
+ Normal
+ %8.2lf %s
+
+
\ No newline at end of file
diff --git a/hp-msmAP-AverageSNR.xml b/hp-msmAP-AverageSNR.xml
new file mode 100644
index 0000000..753c9aa
--- /dev/null
+++ b/hp-msmAP-AverageSNR.xml
@@ -0,0 +1,36 @@
+
+ HP MSM AP - Average SNR
+ Queries average SNR from HP MSM APs
+ .1.3.6.1.4.1.8744.5.4.1.1.1.6
+ OID/REGEXP:.*\.([0-9]{1,3}\.[0-9]{1,3})$
+ numeric
+
+
+ Index
+ OID/REGEXP:.*\.([0-9]{1,3}\.[0-9]{1,3})$
+ input
+ .1.3.6.1.4.1.8744.5.4.1.1.1.6
+
+
+ SSID
+ walk
+ value
+ input
+ .1.3.6.1.4.1.8744.5.11.1.1.1.1.2
+
+
+ BSSID
+ walk
+ value
+ input
+ .1.3.6.1.4.1.8744.5.4.1.1.1.11
+
+
+ Average SNR
+ walk
+ value
+ output
+ .1.3.6.1.4.1.8744.5.4.1.1.1.10
+
+
+
diff --git a/hp-msmAP-NumberUsers.xml b/hp-msmAP-NumberUsers.xml
new file mode 100644
index 0000000..822cbf7
--- /dev/null
+++ b/hp-msmAP-NumberUsers.xml
@@ -0,0 +1,36 @@
+
+ HP MSM AP - Number of users
+ Queries number of users from HP MSM APs
+ .1.3.6.1.4.1.8744.5.4.1.1.1.6
+ OID/REGEXP:.*\.([0-9]{1,3}\.[0-9]{1,3})$
+ numeric
+
+
+ Index
+ OID/REGEXP:.*\.([0-9]{1,3}\.[0-9]{1,3})$
+ input
+ .1.3.6.1.4.1.8744.5.4.1.1.1.6
+
+
+ SSID
+ walk
+ value
+ input
+ .1.3.6.1.4.1.8744.5.11.1.1.1.1.2
+
+
+ BSSID
+ walk
+ value
+ input
+ .1.3.6.1.4.1.8744.5.4.1.1.1.11
+
+
+ Number of Users
+ walk
+ value
+ output
+ .1.3.6.1.4.1.8744.5.4.1.1.1.6
+
+
+