Merge branch 'master' into full-month-stats

[stg.git] / projects / stargazer / plugins / other / smux / STG-MIB.mib

diff --git a/projects/stargazer/plugins/other/smux/STG-MIB.mib b/projects/stargazer/plugins/other/smux/STG-MIB.mib
index cb48ecbcce7d9b1e30fe4b64bf5d268005c470cf..bccf5a28305c0cf71434380633b4927daab53e7e 100644 (file)
--- a/projects/stargazer/plugins/other/smux/STG-MIB.mib
+++ b/projects/stargazer/plugins/other/smux/STG-MIB.mib
@@ -3,9 +3,8 @@ STG-MIB DEFINITIONS ::= BEGIN
 IMPORTS
     enterprises,
     MODULE-IDENTITY, OBJECT-TYPE,
-    Integer32,
-    NOTIFICATION-TYPE               FROM SNMPv2-SMI
-    DisplayString                   FROM RFC1213-MIB;
+    Integer32                       FROM SNMPv2-SMI
+    DisplayString                   FROM SNMPv2-TC;
 
 stgMIB MODULE-IDENTITY
     LAST-UPDATED "201101060000Z"
@@ -19,13 +18,14 @@ stgMIB MODULE-IDENTITY
     DESCRIPTION "Initial revision"
     ::= { enterprises 38313 }
 
-stg-24 OBJECT IDENTIFIER ::= { stgMIB 1 }
+stg24 OBJECT IDENTIFIER ::= { stgMIB 1 }
 
-users OBJECT IDENTIFIER ::= { stg-24 1 }
-tariffs OBJECT IDENTIFIER ::= { stg-24 2 }
-admins OBJECT IDENTIFIER ::= { stg-24 3 }
-services OBJECT IDENTIFIER ::= { stg-24 4 }
-corporations OBJECT IDENTIFIER ::= { stg-24 5 }
+users OBJECT IDENTIFIER ::= { stg24 1 }
+tariffs OBJECT IDENTIFIER ::= { stg24 2 }
+admins OBJECT IDENTIFIER ::= { stg24 3 }
+services OBJECT IDENTIFIER ::= { stg24 4 }
+corporations OBJECT IDENTIFIER ::= { stg24 5 }
+traffcounter OBJECT IDENTIFIER ::= { stg24 6 }
 
 totalUsers OBJECT-TYPE
     SYNTAX      Integer32
@@ -72,115 +72,160 @@ noCashUsers OBJECT-TYPE
     DEFVAL { 0 }
     ::= { users 5 }
 
-tariffUsers OBJECT-TYPE
-    SYNTAX      SEQUENCE OF UsersByTariff
-    MAX-ACCESS  not-accessible
+disabledDetailStatsUsers OBJECT-TYPE
+    SYNTAX      Integer32
+    MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
-       "The number of users by each tariff"
+       "The number of users with disabled detail stats"
     DEFVAL { 0 }
     ::= { users 6 }
 
-usersByTariff OBJECT-TYPE
-    SYNTAX      UsersByTariff
-    MAX-ACCESS  not-accessible
+disabledUsers OBJECT-TYPE
+    SYNTAX      Integer32
+    MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
-        "A row describing a given tariff"
-    INDEX   { tariffId }
-    ::= {tariffUsers 1 }
-
-UsersByTariff ::= SEQUENCE {
-    tariffId Integer32,
-    tariffName DisplayString,
-    userCount Integer32
-}
+       "The number of disabled users"
+    DEFVAL { 0 }
+    ::= { users 7 }
 
-tariffId OBJECT-TYPE
-    SYNTAX      Integer32 (0..255)
+passiveUsers OBJECT-TYPE
+    SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
-        "The id of the tariff this table describes."
-    ::= { usersByTariff 1 }
+       "The number of passive users"
+    DEFVAL { 0 }
+    ::= { users 8 }
 
-tariffName OBJECT-TYPE
-    SYNTAX      DisplayString
+creditUsers OBJECT-TYPE
+    SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
-        "The name of the tariff this table describes."
-    ::= { usersByTariff 2 }
+       "The number of users with positive credit"
+    DEFVAL { 0 }
+    ::= { users 9 }
 
-userCount OBJECT-TYPE
+freeMbUsers OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
-        "The count fo users of the tariff this table describes."
-    ::= { usersByTariff 3 }
+       "The number of users with positive freeMb"
+    DEFVAL { 0 }
+    ::= { users 10 }
 
-disabledDetailStatsUsers OBJECT-TYPE
+tariffChangeUsers OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
-       "The number of users with disabled detail stats"
+       "The number of users changing tariff next month"
     DEFVAL { 0 }
-    ::= { users 7 }
+    ::= { users 11 }
 
-disabledUsers OBJECT-TYPE
+activeUsers OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
-       "The number of disabled users"
-    DEFVAL { 0 }
-    ::= { users 8 }
+        "The number of online users with traffic during session"
+    DEFVAL {0}
+    ::= { users 12 }
 
-passiveUsers OBJECT-TYPE
+totalTariffs OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
-       "The number of passive users"
+       "Total tariffs registered in the billing"
     DEFVAL { 0 }
-    ::= { users 9 }
+    ::= { tariffs 1 }
 
-creditUsers OBJECT-TYPE
+tariffUsageTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF TariffUsageTable
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+       "The number of users by each tariff"
+    DEFVAL { 0 }
+    ::= { tariffs 2 }
+
+tariffUsageTableEntry OBJECT-TYPE
+    SYNTAX      TariffUsageTable
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+        "A row describing a given tariff"
+    INDEX   { tariffIndex }
+    ::= {tariffUsageTable 1 }
+
+TariffUsageTable ::= SEQUENCE {
+    tariffIndex Integer32,
+    tariffName DisplayString,
+    userCount Integer32
+}
+
+tariffIndex OBJECT-TYPE
+    SYNTAX      Integer32 (0..255)
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+        "The id of the tariff this table describes."
+    ::= { tariffUsageTableEntry 1 }
+
+tariffName OBJECT-TYPE
+    SYNTAX      DisplayString
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The name of the tariff this table describes."
+    ::= { tariffUsageTableEntry 2 }
+
+userCount OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
-       "The number of users with positive credit"
+        "The count fo users of the tariff this table describes."
+    ::= { tariffUsageTableEntry 3 }
+
+totalAdmins OBJECT-TYPE
+    SYNTAX      Integer32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+       "Total admins registered in the billing"
     DEFVAL { 0 }
-    ::= { users 10 }
+    ::= { admins 1 }
 
-freeMbUsers OBJECT-TYPE
+totalServices OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
-       "The number of users with positive freeMb"
+       "Total services registered in the billing"
     DEFVAL { 0 }
-    ::= { users 11 }
+    ::= { services 1 }
 
-tariffChangeUsers OBJECT-TYPE
+totalCorporations OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
-       "The number of users changing tariff next month"
+       "Total corporations registered in the billing"
     DEFVAL { 0 }
-    ::= { users 12 }
+    ::= { corporations 1 }
 
-totalTariffs OBJECT-TYPE
+totalRules OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
-       "Total tariffs registered in the billing"
+        "Total traffic classification rules described by rules file"
     DEFVAL { 0 }
-    ::= { tariffs 1 }
+    ::= { traffcounter 1 }
 
 END