diff --git a/.agents/skills/add-os-support/SKILL.md b/.agents/skills/add-os-support/SKILL.md index bf509d7c345..55ce04b6710 100644 --- a/.agents/skills/add-os-support/SKILL.md +++ b/.agents/skills/add-os-support/SKILL.md @@ -17,8 +17,8 @@ Use this workflow when LibreNMS does not yet support the operating system. 2. Create detection YAML in `resources/definitions/os_detection/.yaml`. 3. Create discovery YAML in `resources/definitions/os_discovery/.yaml`. 4. Add an icon to `html/images/os/.svg` and optionally a logo to `html/images/logos/.svg`. Prefer vector (SVG) over bitmap (PNG). -5. Capture real SNMP test data in `tests/snmpsim/_.snmprec`. -6. Generate test data JSON with `./lnms dev:generate-test-data --variant=""`. +5. Capture real SNMP test data in `tests/snmpsim/_.snmprec` with `./lnms dev:collect-snmprec -M `. +6. Generate test data JSON with `./lnms dev:generate-test-data _`. 7. Verify all tests pass with `./lnms dev:check unit -o `. ### Workflow 2: Update an Existing OS @@ -30,8 +30,8 @@ Use this workflow when you add sensors, processors, mempools, or support for a n - Use `skip_values` with identical indexes when defining alternative definitions of the same physical sensor. 4. Add vendor MIBs to `mibs//` if needed. 5. Update test fixtures: - - To update modules in existing fixtures: `./lnms dev:generate-test-data -m `. - - To add a new hardware variant: record `tests/snmpsim/_.snmprec` and generate with `./lnms dev:generate-test-data --variant=""`. + - To update modules in existing fixtures: `./lnms dev:generate-test-data _ -m `. The argument is a file name prefix: `_` matches only the fixtures of that OS, while `` also matches other OSes that start with the same name. + - To add a new hardware model: run `./lnms dev:collect-snmprec -M ` and generate with `./lnms dev:generate-test-data _`. 6. Run fast verification with `./lnms dev:check unit -o --os-modules-only`. --- @@ -74,8 +74,8 @@ Use this workflow when you add sensors, processors, mempools, or support for a n - Do not include standard RFC MIBs in vendor directories. - Include only the MIBs that LibreNMS uses. 10. **Mandatory Real Test Data**: - - Every OS must include test data (`tests/snmpsim/_.snmprec` and `tests/data/_.json`). - - Always name a variant: the lowercase hardware model or similar (for example, `ios_2960x`). Do not create a bare `.snmprec`. + - Every OS must include test data (`tests/snmpsim/_.snmprec` and `tests/data/_.json`). + - Always name a model: the lowercase hardware model or similar (for example, `ios_2960x`). Do not create a bare `.snmprec`. - Do not fabricate `snmprec` files. You must only capture `snmprec` files from an actual device or convert them from `snmpwalk` output from an actual device. - Do not break the data when you sanitize it. - Tests must pass before you finish. @@ -91,8 +91,8 @@ Use this workflow when you add sensors, processors, mempools, or support for a n | Vendor MIBs | `mibs//` | File name equals MIB module, no extension | | OS Icon | `html/images/os/.svg` | Square, no padding. Vector (SVG) preferred; PNG at least 32x32 px | | OS Logo | `html/images/logos/.svg` | Optional wide logo. Vector (SVG) preferred over bitmap (PNG) | -| SNMP Recording | `tests/snmpsim/_.snmprec` | SNMP test data from a real device; variant is the lowercase model | -| Test Data JSON | `tests/data/_.json` | Expected database dump | +| SNMP Recording | `tests/snmpsim/_.snmprec` | SNMP test data from a real device; the model is lowercase | +| Test Data JSON | `tests/data/_.json` | Expected database dump | --- @@ -346,32 +346,32 @@ Save the image files. Prefer vector (SVG) over bitmap (PNG, saved as `.png` Tests verify OS detection and module polling. Every OS must have test files. -### 1. SNMP Recording (`tests/snmpsim/_.snmprec`) +### 1. SNMP Recording (`tests/snmpsim/_.snmprec`) -Always name a variant: the lowercase hardware model or similar (for example, `ios_2960x`). Do not create a bare `.snmprec`. +Always name a model: the lowercase hardware model or similar (for example, `ios_2960x`). Do not create a bare `.snmprec`. Do not fabricate `snmprec` files. You must only capture `snmprec` files from an actual device or convert them from `snmpwalk` output from an actual device. Methods to acquire `.snmprec` data: 1. Capture from a device added to LibreNMS (`` is the device ID, IP, or hostname), after the OS detection and discovery definitions are in place and the device has been rediscovered. By default this collects only the OIDs that discovery and polling use: ```bash - ./lnms dev:collect-snmprec --variant="" + ./lnms dev:collect-snmprec -M ``` - Add `--full` to walk the whole device instead, or `--modules=,` to limit collection to specific modules. + The command rejects a device that is still detected as generic. It always replaces the snmprec file and never merges with earlier data, so `--modules=,` leaves only the OIDs of those modules in the file. To walk the whole device into another file instead, use `--full --output=`. 2. Convert `snmpwalk` output from the actual device: Convert walk output into `||` format using snmpsim tools or scripts. > **Important**: Sanitize the recording to remove real credentials, SNMP community strings, public IP addresses, and private names. Do not break the data format or SNMP types when sanitizing. Add all OIDs that your OS discovery and polling definitions query. -### 2. Generate Test Data JSON (`tests/data/_.json`) +### 2. Generate Test Data JSON (`tests/data/_.json`) -The variant must be lowercase and match the snmprec file name: +Use the exact name of the snmprec file, without the extension: ```bash -./lnms dev:generate-test-data --variant="" +./lnms dev:generate-test-data _ ``` -> **Note**: You must pass `--variant` when creating a new fixture for the first time. Without it, the tool searches only for existing fixtures and will exit with an error. +> **Note**: The argument is a file name prefix that matches existing JSON fixtures. To create a new fixture, you must give the exact snmprec file name. Otherwise the tool finds no fixtures and exits with an error. -Do not edit `tests/data/_.json` manually. Always use `dev:generate-test-data` to update it. +Do not edit `tests/data/_.json` manually. Always use `dev:generate-test-data` to update it. --- diff --git a/.github/linters/.yamllint.yml b/.github/linters/.yamllint.yml new file mode 100644 index 00000000000..73d0cbb590c --- /dev/null +++ b/.github/linters/.yamllint.yml @@ -0,0 +1,20 @@ +--- +# Used by super-linter (see .github/workflows/lint.yml). +# Only flag problems that break parsing or are likely mistakes, not style. +extends: relaxed + +rules: + braces: disable + brackets: disable + colons: disable + commas: disable + comments: disable + comments-indentation: disable + document-start: disable + empty-lines: disable + indentation: disable + line-length: disable + truthy: disable + new-line-at-end-of-file: disable + trailing-spaces: disable + hyphens: disable diff --git a/.github/workflows/auto-format.yml b/.github/workflows/auto-format.yml index 1a61ccd0d14..d2ce1ff087b 100644 --- a/.github/workflows/auto-format.yml +++ b/.github/workflows/auto-format.yml @@ -22,7 +22,7 @@ jobs: github.repository_owner != 'librenms' && vars.ENABLE_AUTO_FORMAT == 'true' && github.ref_name != github.event.repository.default_branch - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 permissions: contents: write @@ -57,7 +57,6 @@ jobs: uses: ./.github/actions/composer-install with: cache-matched-key: ${{ steps.composer-restore.outputs.cache-matched-key }} - dump-autoload: false - name: Format Code env: @@ -66,6 +65,7 @@ jobs: git fetch origin "$DEFAULT_BRANCH" DIFF_TARGET=$(git merge-base "origin/$DEFAULT_BRANCH" HEAD 2>/dev/null || echo "origin/$DEFAULT_BRANCH") + ./vendor/bin/rector process --no-progress-bar --ansi --memory-limit=1G ./vendor/bin/pint --parallel --diff="$DIFF_TARGET" - name: Commit and push changes diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 859c4f8044c..9f729172952 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -49,7 +49,7 @@ jobs: phpstan: name: PHP Static Analysis - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 strategy: fail-fast: false matrix: @@ -137,7 +137,7 @@ jobs: rector: name: Rector (dry-run) - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 steps: # start checkout last, it can fail reading the event payload while other steps start @@ -173,7 +173,7 @@ jobs: pint: name: Pint (dry-run) - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 steps: # start checkout last, it can fail reading the event payload while other steps start diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b59a664138e..8bed7e3de18 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,16 +42,16 @@ jobs: name: PHP 8.5 Other php-version: pre-installed database: mysql - arguments: --full --exclude-phpunit-group=browser,mibs,external-dependencies,os + arguments: --full --exclude-phpunit-group=browser,mibs,os - - name: PHP 8.2 Other - php-version: 8.2 + name: PHP 8.4 Other + php-version: 8.4 database: ghcr.io/mariadb/mariadb:lts - arguments: --full --exclude-phpunit-group=browser,mibs,external-dependencies,os + arguments: --full --exclude-phpunit-group=browser,mibs,os env: # keep in sync with LibreNMS/Util/Snmpsim.php - SNMPSIM_VERSION: 2.0.1 + SNMPSIM_VERSION: 2.0.3 steps: - # mysql is the runner's own MySQL, anything else is a docker image @@ -109,6 +109,14 @@ jobs: key: ${{ runner.os }}-vendor- restore-keys: ${{ runner.os }}-vendor- + # only the rrd backend and svn tests need these, the os tests have rrd disabled. + # setup-php installs the extension of other versions + - name: Install test dependencies + if: contains(matrix.arguments, '--full') + run: | + sudo apt update + sudo apt install -y rrdtool rrdcached subversion php8.5-rrd + - name: Checkout uses: actions/checkout@v7 - @@ -124,14 +132,19 @@ jobs: # returns once snmpsim answers, fails with the error otherwise .python_venvs/snmpsim/bin/snmpsim-command-responder-lite --daemonize --pid-file=/tmp/snmpsimd.pid --data-dir=tests/snmpsim --agent-udpv4-endpoint=127.1.6.2:1162 --log-level=error --logging-method=file:/tmp/snmpsimd.log - - # pre-installed uses the runner's PHP as is, a version number makes - # setup-php update it. The runner already has composer + # pre-installed uses the runner's PHP as is, it already has composer name: Set up PHP + if: matrix.php-version != 'pre-installed' uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-version }} + extensions: rrd tools: none coverage: none + - + name: Disable Xdebug + background: true + run: sudo phpdismod xdebug - name: Init env run: | @@ -171,7 +184,7 @@ jobs: wait: database - name: Migrate Database - run: php artisan migrate + run: php artisan migrate --seed - name: Wait for SNMPSIM diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml index dc0a8eef7cd..e81a544561c 100644 --- a/.github/workflows/web.yml +++ b/.github/workflows/web.yml @@ -15,7 +15,7 @@ concurrency: jobs: dusk-php: - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 steps: - name: Start Database id: database diff --git a/.gitignore b/.gitignore index 63aff5d1ece..05963ba43c2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*.log # Ignore all dotfiles # ####################### .* @@ -6,6 +7,7 @@ !/.editorconfig !/.php_cs !/.github/ +!/.github/linters/.yamllint.yml !/.mention-bot !/.env.example diff --git a/LibreNMS/Alert/AlertData.php b/LibreNMS/Alert/AlertData.php index b7793aa7828..b9c8af94fd3 100644 --- a/LibreNMS/Alert/AlertData.php +++ b/LibreNMS/Alert/AlertData.php @@ -53,7 +53,7 @@ public static function testData(Device $device, array $faults = []): array 'os' => $device->os, 'type' => $device->type, 'ip' => $device->ip, - 'display' => $device->displayName(), + 'display' => $device->display, 'version' => $device->version, 'hardware' => $device->hardware, 'features' => $device->features, diff --git a/LibreNMS/Alert/AlertUtil.php b/LibreNMS/Alert/AlertUtil.php index 71fdaac5880..7fce3b12772 100644 --- a/LibreNMS/Alert/AlertUtil.php +++ b/LibreNMS/Alert/AlertUtil.php @@ -54,7 +54,7 @@ class AlertUtil * Map of alert-query id columns to registered morph aliases (see AppServiceProvider). * Used to resolve the entity a problem is about (Port, Sensor, ...). */ - private const ENTITY_COLUMN_MAP = [ + private const array ENTITY_COLUMN_MAP = [ 'port_id' => 'interface', 'sensor_id' => 'sensor', 'bgpPeer_id' => 'bgppeer', diff --git a/LibreNMS/Alert/RunAlerts.php b/LibreNMS/Alert/RunAlerts.php index 7df3e9699b8..b249fbdfe4a 100644 --- a/LibreNMS/Alert/RunAlerts.php +++ b/LibreNMS/Alert/RunAlerts.php @@ -44,9 +44,9 @@ use LibreNMS\Enum\AlertRuleOperationPhase; use LibreNMS\Enum\AlertState; use LibreNMS\Enum\MaintenanceStatus; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Enum\Severity; use LibreNMS\Exceptions\AlertTransportDeliveryException; -use LibreNMS\Polling\ConnectivityHelper; use LibreNMS\Util\Time; class RunAlerts @@ -104,7 +104,7 @@ public function describeAlert($alert) $obj['hostname'] = $device->hostname; $obj['sysName'] = $device->sysName; - $obj['display'] = $device->displayName(); + $obj['display'] = $device->display; $obj['sysDescr'] = $device->sysDescr; $obj['sysContact'] = $device->sysContact; $obj['os'] = $device->os; @@ -129,7 +129,7 @@ public function describeAlert($alert) $obj['status'] = $device->status; $obj['status_reason'] = $device->status_reason; - if ((new ConnectivityHelper($device))->icmpIsEnabled()) { + if ($device->polling()->isEnabled(PollingMethodType::Icmp)) { if ($device->stats) { $obj['ping_timestamp'] = $device->stats->ping_last_timestamp; $obj['ping_loss'] = $device->stats->ping_loss_last; @@ -616,7 +616,7 @@ public function runAlerts() $this->dispatchOpenRecoveries($alert); $rule = AlertRule::query()->find($alert['rule_id']); if ($rule !== null) { - (new AlertRules($alert['device_id']))->syncAlertState($rule); + new AlertRules($alert['device_id'])->syncAlertState($rule); } if ($sentAck) { @@ -796,7 +796,7 @@ private function dispatchOpenRecoveries(array $alert): void ->where('state', '!=', AlertState::RECOVERED) ->count(); $entityCount = $remaining + $recovered->count(); - if ($rule !== null && AlertUtil::shouldNotifyPerEntity($rule, $entityCount)) { + if ($rule !== null && (AlertUtil::shouldNotifyPerEntity($rule, $entityCount) || ($remaining === 0 && $this->deviceCanNotify((int) $alert['device_id'])))) { $recoveryAlert = $alert; $recoveryAlert['state'] = AlertState::RECOVERED; $this->issueAlert($recoveryAlert); @@ -816,6 +816,13 @@ private function closeRecoveredFaults(int $ruleId, int $deviceId): void ->update(['open' => 0]); } + private function deviceCanNotify(int $deviceId): bool + { + $device = DB::table('devices')->where('device_id', $deviceId)->first(['ignore', 'disabled']); + + return $device !== null && ! $device->ignore && ! $device->disabled && ! $this->isParentDown($deviceId); + } + /** * Run external transports * diff --git a/LibreNMS/Alert/Transport/Browserpush.php b/LibreNMS/Alert/Transport/Browserpush.php index c7c2bc8c187..17c988051b8 100644 --- a/LibreNMS/Alert/Transport/Browserpush.php +++ b/LibreNMS/Alert/Transport/Browserpush.php @@ -50,10 +50,16 @@ public function deliverAlert(array $alert_data): bool public static function configTemplate(): array { - $users = [__('All Users') => 0]; - foreach (User::get(['user_id', 'username', 'realname']) as $user) { - $users[htmlentities((string) $user->realname ?: (string) $user->username)] = $user->user_id; - } + $users = User::get(['user_id', 'username', 'realname']); + $nameCounts = $users->countBy(fn ($user) => (string) ($user->realname ?: $user->username)); + $options = $users->mapWithKeys(function ($user) use ($nameCounts) { + $label = (string) ($user->realname ?: $user->username); + if ($nameCounts[$label] > 1) { + $label .= " ($user->username)"; + } + + return [htmlentities($label) => $user->user_id]; + })->all(); return [ 'config' => [ @@ -62,7 +68,7 @@ public static function configTemplate(): array 'name' => 'user', 'descr' => 'LibreNMS User', 'type' => 'select', - 'options' => $users, + 'options' => [__('All Users') => 0] + $options, ], ], 'validation' => [ diff --git a/LibreNMS/Alert/Transport/Telegram.php b/LibreNMS/Alert/Transport/Telegram.php index a6f8c1ffe18..9855f997c3b 100644 --- a/LibreNMS/Alert/Transport/Telegram.php +++ b/LibreNMS/Alert/Transport/Telegram.php @@ -33,7 +33,7 @@ class Telegram extends Transport { - private const BASE_URL = 'https://api.telegram.org/bot'; + private const string BASE_URL = 'https://api.telegram.org/bot'; private $message = []; @@ -113,7 +113,7 @@ private function embedGraphs(): array $regex = '##'; $this->message['text'] = preg_replace_callback($regex, function ($match) { - $this->message['images'][] = Graph::getImage($match[1]); + $this->message['images'][] = Graph::getImage($match[1])->data; return ''; }, (string) $this->message['text']); diff --git a/LibreNMS/Alert/Transport/Weechatbot.php b/LibreNMS/Alert/Transport/Weechatbot.php index 792ab51a7f1..c9e72794cb9 100644 --- a/LibreNMS/Alert/Transport/Weechatbot.php +++ b/LibreNMS/Alert/Transport/Weechatbot.php @@ -39,7 +39,7 @@ public function deliverAlert(array $alert_data): bool $pre .= "{$this->config['irc-channel']} "; try { - $fp = (new \Socket\Raw\Factory()) + $fp = new \Socket\Raw\Factory() ->createClient("udp://{$this->config['bot-hostname']}:{$this->config['bot-port']}"); } catch (\Socket\Raw\Exception $e) { throw new AlertTransportDeliveryException($alert_data, $e->getCode(), $e->getMessage()); diff --git a/LibreNMS/Alerting/QueryBuilderParser.php b/LibreNMS/Alerting/QueryBuilderParser.php index 6ee69127a37..f49353ff6fb 100644 --- a/LibreNMS/Alerting/QueryBuilderParser.php +++ b/LibreNMS/Alerting/QueryBuilderParser.php @@ -289,9 +289,10 @@ protected function generateGlue(string $target = 'devices'): array foreach ($tables as $table) { $path = $this->schema->findRelationshipPath($table, $target); if ($path) { - foreach (array_pairs($path) as $pair) { - [$left, $right] = $pair; - $glue[] = $this->getGlue($left, $right); + foreach ($path as $i => $left) { + if (isset($path[$i + 1])) { + $glue[] = $this->getGlue($left, $path[$i + 1]); + } } } } diff --git a/LibreNMS/Authentication/LdapAuthorizer.php b/LibreNMS/Authentication/LdapAuthorizer.php index 602d3488d04..175decd3f93 100644 --- a/LibreNMS/Authentication/LdapAuthorizer.php +++ b/LibreNMS/Authentication/LdapAuthorizer.php @@ -337,6 +337,7 @@ private function ldapToUser(array $entry): array 'realname' => $entry['cn'][0] ?? null, 'user_id' => $entry[$uid_attr][0] ?? null, 'email' => $entry[LibrenmsConfig::get('auth_ldap_emailattr', 'mail')][0] ?? null, + 'phone' => $entry[LibrenmsConfig::get('auth_ldap_phoneattr', 'mobile')][0] ?? null, ]; } diff --git a/LibreNMS/Authentication/MysqlAuthorizer.php b/LibreNMS/Authentication/MysqlAuthorizer.php index e4285162d11..def221296ba 100644 --- a/LibreNMS/Authentication/MysqlAuthorizer.php +++ b/LibreNMS/Authentication/MysqlAuthorizer.php @@ -3,6 +3,7 @@ namespace LibreNMS\Authentication; use App\Models\User; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Facades\Hash; use LibreNMS\Exceptions\AuthenticationException; @@ -12,12 +13,33 @@ class MysqlAuthorizer extends AuthorizerBase protected static $CAN_UPDATE_USER = true; protected static $CAN_UPDATE_PASSWORDS = true; + private bool $fallback = false; + + /** + * Authorizer for local users when auth_fallback_local is enabled + */ + public static function asFallback(): self + { + $authorizer = new self(); + $authorizer->fallback = true; + + return $authorizer; + } + + /** + * @return Builder + */ + private function users(): Builder + { + return $this->fallback ? User::where('auth_type', 'mysql') : User::thisAuth(); + } + public function authenticate($credentials) { $username = $credentials['username'] ?? null; $password = $credentials['password'] ?? null; - $user_data = User::thisAuth()->whereNotNull('password')->firstWhere(['username' => $username]); + $user_data = $this->users()->whereNotNull('password')->firstWhere(['username' => $username]); if (! $user_data) { throw new AuthenticationException(); @@ -55,19 +77,19 @@ public function canUpdatePasswords($username = '') } elseif (empty($username) || ! $this->userExists($username)) { return true; } else { - return User::thisAuth()->where('username', $username)->value('can_modify_passwd'); + return $this->users()->where('username', $username)->value('can_modify_passwd'); } } public function userExists($username, $throw_exception = false) { - return User::thisAuth()->where('username', $username)->exists(); + return $this->users()->where('username', $username)->exists(); } public function getUserid($username) { // for mysql user_id == auth_id - return User::thisAuth()->where('username', $username)->value('user_id'); + return $this->users()->where('username', $username)->value('user_id'); } public function getUser($user_id) diff --git a/LibreNMS/Billing.php b/LibreNMS/Billing.php index d319533d2c3..b9192b591ec 100644 --- a/LibreNMS/Billing.php +++ b/LibreNMS/Billing.php @@ -4,6 +4,9 @@ use App\Facades\DeviceCache; use App\Facades\LibrenmsConfig; +use App\Models\Bill; +use App\Models\BillData; +use App\Models\BillHistory; use DateTime; use DateTimeZone; use Illuminate\Support\Str; @@ -104,28 +107,28 @@ public static function getValue($device_id, $id, $inout): ?int return is_numeric($value) ? (int) $value : null; } - private static function get95thagg($bill_id, $datefrom, $dateto): float + /** + * @return array{rate_agg: float, rate_in: float, rate_out: float} + */ + private static function getPercentileRates($bill_id, $datefrom, $dateto, int $percentile = 95): array { - $sum_data = dbFetchRows('SELECT (SUM(delta) / SUM(period) * 8) as rate, FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300) AS bucket_start FROM bill_data WHERE bill_id = ? AND timestamp > ? AND timestamp <= ? GROUP BY bill_id, bucket_start ORDER BY rate ASC', [$bill_id, $datefrom, $dateto]); - $measurement_95th = max(0, (int) round(count($sum_data) / 100 * 95) - 2); + $buckets = BillData::query() + ->selectRaw('SUM(delta) / SUM(period) * 8 as rate_agg, SUM(in_delta) / SUM(period) * 8 as rate_in, SUM(out_delta) / SUM(period) * 8 as rate_out') + ->selectRaw('FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300) AS bucket_start') + ->where('bill_id', $bill_id) + ->inBillingPeriod($datefrom, $dateto) + ->groupBy('bucket_start') + ->toBase() + ->get(); + + $measurement = max(0, (int) round($buckets->count() / 100 * $percentile) - 2); + $rate_at = fn (string $rate): float => round($buckets->pluck($rate)->map(fn ($value) => (float) $value)->sort()->values()[$measurement] ?? 0, 2); - return round($sum_data[$measurement_95th]['rate'] ?? 0, 2); - } - - private static function get95thIn($bill_id, $datefrom, $dateto): float - { - $sum_data = dbFetchRows('SELECT (SUM(in_delta) / SUM(period) * 8) as rate, FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300) AS bucket_start FROM bill_data WHERE bill_id = ? AND timestamp > ? AND timestamp <= ? GROUP BY bill_id, bucket_start ORDER BY rate ASC', [$bill_id, $datefrom, $dateto]); - $measurement_95th = max(0, (int) round(count($sum_data) / 100 * 95) - 2); - - return round($sum_data[$measurement_95th]['rate'] ?? 0, 2); - } - - private static function get95thout($bill_id, $datefrom, $dateto): float - { - $sum_data = dbFetchRows('SELECT (SUM(out_delta) / SUM(period) * 8) as rate, FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300) AS bucket_start FROM bill_data WHERE bill_id = ? AND timestamp > ? AND timestamp <= ? GROUP BY bill_id, bucket_start ORDER BY rate ASC', [$bill_id, $datefrom, $dateto]); - $measurement_95th = max(0, (int) round(count($sum_data) / 100 * 95) - 2); - - return round($sum_data[$measurement_95th]['rate'] ?? 0, 2); + return [ + 'rate_agg' => $rate_at('rate_agg'), + 'rate_in' => $rate_at('rate_in'), + 'rate_out' => $rate_at('rate_out'), + ]; } public static function getRates($bill_id, $datefrom, $dateto, $dir_95th): array @@ -133,16 +136,17 @@ public static function getRates($bill_id, $datefrom, $dateto, $dir_95th): array $data = []; $sum_data = self::getSum($bill_id, $datefrom, $dateto); - $mtot = $sum_data['total']; - $mtot_in = $sum_data['inbound']; - $mtot_out = $sum_data['outbound']; - $ptot = $sum_data['period']; + $mtot = $sum_data->total; + $mtot_in = $sum_data->inbound; + $mtot_out = $sum_data->outbound; + $ptot = $sum_data->period; - $data['rate_95th_in'] = self::get95thIn($bill_id, $datefrom, $dateto); - $data['rate_95th_out'] = self::get95thout($bill_id, $datefrom, $dateto); + $rates_95th = self::getPercentileRates($bill_id, $datefrom, $dateto); + $data['rate_95th_in'] = $rates_95th['rate_in']; + $data['rate_95th_out'] = $rates_95th['rate_out']; if ($dir_95th == 'agg') { - $data['rate_95th'] = self::get95thagg($bill_id, $datefrom, $dateto); + $data['rate_95th'] = $rates_95th['rate_agg']; $data['dir_95th'] = 'agg'; } else { if ($data['rate_95th_out'] > $data['rate_95th_in']) { @@ -166,32 +170,43 @@ public static function getRates($bill_id, $datefrom, $dateto, $dir_95th): array private static function getSum($bill_id, $datefrom, $dateto) { - $sum = dbFetchRow('SELECT SUM(period) as period, SUM(delta) as total, SUM(in_delta) as inbound, SUM(out_delta) as outbound FROM bill_data WHERE bill_id = ? AND timestamp > ? AND timestamp <= ?', [$bill_id, $datefrom, $dateto]); - - return $sum; + return BillData::query() + ->selectRaw('SUM(period) as period, SUM(delta) as total, SUM(in_delta) as inbound, SUM(out_delta) as outbound') + ->where('bill_id', $bill_id) + ->inBillingPeriod($datefrom, $dateto) + ->toBase() + ->first(); } public static function getPeriod($bill_id, $datefrom, $dateto): array { - $ptot = dbFetchRow('SELECT SUM(period) as `period`, MAX(in_delta) as `peak_in`, MAX(out_delta) as `peak_out` FROM bill_data WHERE bill_id = ? AND timestamp > ? AND timestamp <= ?', [$bill_id, $datefrom, $dateto]); - - return $ptot; + return (array) BillData::query() + ->selectRaw('SUM(period) as period, MAX(in_delta) as peak_in, MAX(out_delta) as peak_out') + ->where('bill_id', $bill_id) + ->inBillingPeriod($datefrom, $dateto) + ->toBase() + ->first(); } public static function getHistoryBitsGraphData($bill_id, $bill_hist_id, $reducefactor): ?array { - $histrow = dbFetchRow('SELECT UNIX_TIMESTAMP(bill_datefrom) as `from`, UNIX_TIMESTAMP(bill_dateto) AS `to`, rate_95th, rate_average, bill_type FROM bill_history WHERE bill_id = ? AND bill_hist_id = ?', [$bill_id, $bill_hist_id]); + $histrow = BillHistory::query() + ->selectRaw('UNIX_TIMESTAMP(bill_datefrom) as `from`, UNIX_TIMESTAMP(bill_dateto) as `to`, rate_95th, rate_average, bill_type') + ->where('bill_id', $bill_id) + ->where('bill_hist_id', $bill_hist_id) + ->toBase() + ->first(); if (is_null($histrow)) { return null; } - $graph_data = self::getBitsGraphData($bill_id, $histrow['from'], $histrow['to'], $reducefactor); + $graph_data = self::getBitsGraphData($bill_id, $histrow->from, $histrow->to, $reducefactor); // Overwrite the rate data with the historical version - $graph_data['rate_95th'] = $histrow['rate_95th']; - $graph_data['rate_average'] = $histrow['rate_average']; - $graph_data['bill_type'] = $histrow['bill_type']; + $graph_data['rate_95th'] = $histrow->rate_95th; + $graph_data['rate_average'] = $histrow->rate_average; + $graph_data['bill_type'] = $histrow->bill_type; return $graph_data; } @@ -225,17 +240,26 @@ public static function getBitsGraphData($bill_id, $from, $to, $reducefactor): ar $reducefactor = max(1, floor($expectedpoints / $desiredpoints)); } - $bill_data = dbFetchRow('SELECT * from `bills` WHERE `bill_id`= ? LIMIT 1', [$bill_id]); + $bill = Bill::findOrFail($bill_id); + + $billdata = BillData::query() + ->select('*') + ->selectRaw('UNIX_TIMESTAMP(`timestamp`) AS formatted_date') + ->where('bill_id', $bill_id) + ->betweenUnixTimes($from, $to) + ->orderBy('timestamp') + ->toBase() + ->get(); - foreach (dbFetchRows('SELECT *, UNIX_TIMESTAMP(timestamp) AS formatted_date FROM bill_data WHERE bill_id = ? AND `timestamp` >= FROM_UNIXTIME( ? ) AND `timestamp` <= FROM_UNIXTIME( ? ) ORDER BY timestamp ASC', [$bill_id, $from, $to]) as $row) { - $timestamp = $row['formatted_date']; + foreach ($billdata as $row) { + $timestamp = $row->formatted_date; if (! $first) { $first = $timestamp; } - $period = $row['period']; - $in_delta = $row['in_delta'] * 8; - $out_delta = $row['out_delta'] * 8; + $period = $row->period; + $in_delta = $row->in_delta * 8; + $out_delta = $row->out_delta * 8; $last = $timestamp; $iter_in += $in_delta; @@ -263,7 +287,7 @@ public static function getBitsGraphData($bill_id, $from, $to, $reducefactor): ar } }//end foreach - if (! empty($iter_in)) { // Write last element + if ($iter_period > 0) { // Write last element $out_data[$i] = round($iter_out / $iter_period, 2); $in_data[$i] = round($iter_in / $iter_period, 2); $tot_data[$i] = ($out_data[$i] + $in_data[$i]); @@ -281,9 +305,9 @@ public static function getBitsGraphData($bill_id, $from, $to, $reducefactor): ar 'tot_data' => $tot_data, 'ticks' => $ticks, - 'rate_95th' => $bill_data['rate_95th'], - 'rate_average' => $bill_data['rate_average'], - 'bill_type' => $bill_data['bill_type'], + 'rate_95th' => $bill->rate_95th, + 'rate_average' => $bill->rate_average, + 'bill_type' => $bill->bill_type, ]; if ($period) { @@ -311,17 +335,24 @@ public static function getHistoricTransferGraphData($bill_id): array $ticklabels = []; $allowed_val = null; - foreach (dbFetchRows('SELECT * FROM `bill_history` WHERE `bill_id` = ? ORDER BY `bill_datefrom` DESC LIMIT 12', [$bill_id]) as $data) { - $datefrom = date('Y-m-d', strtotime((string) $data['bill_datefrom'])); - $dateto = date('Y-m-d', strtotime((string) $data['bill_dateto'])); + $billhist = BillHistory::query() + ->where('bill_id', $bill_id) + ->orderByDesc('bill_datefrom') + ->limit(12) + ->toBase() + ->get(); + + foreach ($billhist as $data) { + $datefrom = date('Y-m-d', strtotime((string) $data->bill_datefrom)); + $dateto = date('Y-m-d', strtotime((string) $data->bill_dateto)); $datelabel = $datefrom . ' - ' . $dateto; array_push($ticklabels, $datelabel); - array_push($in_data, $data['traf_in']); - array_push($out_data, $data['traf_out']); - array_push($tot_data, $data['traf_total']); - array_push($allow_data, $allowed_val = ($data['bill_type'] == 'Quota' ? $data['bill_allowed'] : 0)); - array_push($overuse_data, $data['bill_type'] == 'Quota' ? $data['bill_overuse'] : 0); + array_push($in_data, $data->traf_in); + array_push($out_data, $data->traf_out); + array_push($tot_data, $data->traf_total); + array_push($allow_data, $allowed_val = ($data->bill_type == 'Quota' ? $data->bill_allowed : 0)); + array_push($overuse_data, $data->bill_type == 'Quota' ? $data->bill_overuse : 0); $i++; }//end foreach @@ -355,13 +386,18 @@ public static function getHistoricTransferGraphData($bill_id): array public static function getBandwidthGraphData($bill_id, $bill_hist_id, $from, $to, $imgtype): ?array { if (is_numeric($bill_hist_id)) { - $histrow = dbFetchRow('SELECT UNIX_TIMESTAMP(bill_datefrom) as `from`, UNIX_TIMESTAMP(bill_dateto) AS `to`, rate_95th, rate_average FROM bill_history WHERE bill_id = ? AND bill_hist_id = ?', [$bill_id, $bill_hist_id]); + $histrow = BillHistory::query() + ->selectRaw('UNIX_TIMESTAMP(bill_datefrom) as `from`, UNIX_TIMESTAMP(bill_dateto) as `to`, rate_95th, rate_average') + ->where('bill_id', $bill_id) + ->where('bill_hist_id', $bill_hist_id) + ->toBase() + ->first(); if (is_null($histrow)) { return null; } - $from = $histrow['from']; - $to = $histrow['to']; + $from = $histrow->from; + $to = $histrow->to; } else { if (! is_numeric($from) || ! is_numeric($to)) { throw new \Exception('Must supply from and to if bill_hist_id is not supplied'); @@ -379,12 +415,21 @@ public static function getBandwidthGraphData($bill_id, $bill_hist_id, $from, $to $data = []; $average = 0; if ($imgtype == 'day') { - foreach (dbFetchRows('SELECT UNIX_TIMESTAMP(MIN(timestamp)) as timestamp, SUM(delta) as traf_total, SUM(in_delta) as traf_in, SUM(out_delta) as traf_out FROM bill_data WHERE `bill_id` = ? AND `timestamp` >= FROM_UNIXTIME(?) AND `timestamp` <= FROM_UNIXTIME(?) GROUP BY DATE(timestamp) ORDER BY DATE(timestamp) ASC', [$bill_id, $from, $to]) as $data) { - array_push($ticklabels, date('Y-m-d', $data['timestamp'])); - array_push($in_data, $data['traf_in'] ?? 0); - array_push($out_data, $data['traf_out'] ?? 0); - array_push($tot_data, $data['traf_total'] ?? 0); - $average += $data['traf_total']; + $billdata = BillData::query() + ->selectRaw('UNIX_TIMESTAMP(MIN(`timestamp`)) as formatted_timestamp, SUM(delta) as traf_total, SUM(in_delta) as traf_in, SUM(out_delta) as traf_out') + ->where('bill_id', $bill_id) + ->betweenUnixTimes($from, $to) + ->groupByRaw('DATE(`timestamp`)') + ->orderByRaw('DATE(`timestamp`) ASC') + ->toBase() + ->get(); + + foreach ($billdata as $data) { + array_push($ticklabels, date('Y-m-d', $data->formatted_timestamp)); + array_push($in_data, $data->traf_in ?? 0); + array_push($out_data, $data->traf_out ?? 0); + array_push($tot_data, $data->traf_total ?? 0); + $average += $data->traf_total; } $ave_count = count($tot_data); @@ -398,17 +443,26 @@ public static function getBandwidthGraphData($bill_id, $bill_hist_id, $from, $to array_push($tot_data, 0); } } elseif ($imgtype == 'hour') { - foreach (dbFetchRows('SELECT DISTINCT HOUR(timestamp) as hour, SUM(delta) as traf_total, SUM(in_delta) as traf_in, SUM(out_delta) as traf_out FROM bill_data WHERE `bill_id` = ? AND `timestamp` >= FROM_UNIXTIME(?) AND `timestamp` <= FROM_UNIXTIME(?) GROUP BY HOUR(timestamp) ORDER BY HOUR(timestamp) ASC', [$bill_id, $from, $to]) as $data) { - array_push($ticklabels, sprintf('%02d', $data['hour']) . ':00'); - array_push($in_data, $data['traf_in'] ?? 0); - array_push($out_data, $data['traf_out'] ?? 0); - array_push($tot_data, $data['traf_total'] ?? 0); - $average += $data['traf_total']; + $billdata = BillData::query() + ->selectRaw('HOUR(`timestamp`) as hour, SUM(delta) as traf_total, SUM(in_delta) as traf_in, SUM(out_delta) as traf_out') + ->where('bill_id', $bill_id) + ->betweenUnixTimes($from, $to) + ->groupByRaw('HOUR(`timestamp`)') + ->orderByRaw('HOUR(`timestamp`) ASC') + ->toBase() + ->get(); + + foreach ($billdata as $data) { + array_push($ticklabels, sprintf('%02d', $data->hour) . ':00'); + array_push($in_data, $data->traf_in ?? 0); + array_push($out_data, $data->traf_out ?? 0); + array_push($tot_data, $data->traf_total ?? 0); + $average += $data->traf_total; } $ave_count = count($tot_data); } else { - exit("Unknown graph type $imgtype"); + throw new \InvalidArgumentException('Unknown graph type, expected day or hour'); }//end if $average = $ave_count ? ($average / $ave_count) : 0; diff --git a/LibreNMS/ComposerHelper.php b/LibreNMS/ComposerHelper.php index c4e8b12398d..63519f23d91 100644 --- a/LibreNMS/ComposerHelper.php +++ b/LibreNMS/ComposerHelper.php @@ -68,12 +68,14 @@ public static function addPlugin(string $package, ?string $version = null): int { return self::execComposerCommand( ['require', '--no-update', $package . ($version ? ":$version" : '')], - ['COMPOSER' => 'composer.plugins.json'], + ['COMPOSER' => self::getPluginsFile()], ); } public static function addPackage(string $package, ?string $version = null): int { + self::prepareComposerFile(); + return self::execComposerCommand( ['require', '--update-no-dev', $package . ($version ? ":$version" : '')], ['FORCE' => 1], @@ -84,23 +86,45 @@ public static function removePlugin(string $package): int { return self::execComposerCommand( ['remove', '--no-update', $package], - ['COMPOSER' => 'composer.plugins.json'], + ['COMPOSER' => self::getPluginsFile()], ); } public static function removePackage(string $package): int { + self::prepareComposerFile(); + return self::execComposerCommand( ['remove', '--update-no-dev', $package], ['FORCE' => 1], ); } + /** + * Install all packages listed in the plugins file + */ + public static function installPlugins(): int + { + $packages = []; + foreach (self::getPlugins() as $package => $version) { + $packages[] = "$package:$version"; + } + + if (empty($packages)) { + return 0; + } + + self::prepareComposerFile(); + + return self::execComposerCommand( + ['require', '--update-no-dev', ...$packages], + ['FORCE' => 1], + ); + } + public static function getPlugins(): array { - // Not cwd-relative: also reached from the web UI, where cwd is the - // document root. Not base_path(): this class runs as a composer script. - $file = realpath(__DIR__ . '/..') . '/composer.plugins.json'; + $file = self::getPluginsFile(); $plugins = is_file($file) && is_readable($file) ? json_decode((string) file_get_contents($file), true) : []; @@ -108,6 +132,43 @@ public static function getPlugins(): array return $plugins['require'] ?? []; } + /** + * The file that records the packages added by plugin:add + */ + public static function getPluginsFile(): string + { + // Not cwd-relative: also reached from the web UI, where cwd is the + // document root. Not base_path(): this class runs as a composer script. + return getenv('LIBRENMS_COMPOSER_PLUGINS') ?: self::installDir() . '/composer.plugins.json'; + } + + /** + * When composer is pointed at another composer.json with the COMPOSER + * environment variable, start it from the one LibreNMS ships. + */ + private static function prepareComposerFile(): void + { + $file = getenv('COMPOSER'); + if (! $file || is_file($file)) { + return; + } + + $dir = dirname($file); + if (! is_dir($dir)) { + mkdir($dir, 0775, true); + } + + copy(self::installDir() . '/composer.json', $file); + + $lock = pathinfo($file, PATHINFO_EXTENSION) === 'json' ? substr($file, 0, -4) . 'lock' : $file . '.lock'; + copy(self::installDir() . '/composer.lock', $lock); + } + + private static function installDir(): string + { + return (string) realpath(__DIR__ . '/..'); + } + /** * Initially populate .env file */ @@ -184,7 +245,7 @@ private static function execComposerCommand(array $command, array $env = []): in { $cli = []; foreach ($env as $key => $value) { - $cli[] = "$key=$value"; + $cli[] = $key . '=' . escapeshellarg((string) $value); } $cli[] = PHP_BINARY; $cli[] = realpath(__DIR__ . '/../scripts/composer_wrapper.php'); diff --git a/LibreNMS/DB/BulkTableSync.php b/LibreNMS/DB/BulkTableSync.php new file mode 100644 index 00000000000..64af355a794 --- /dev/null +++ b/LibreNMS/DB/BulkTableSync.php @@ -0,0 +1,240 @@ + fillable columns this class may write, as keys */ + private array $writable; + + /** + * @param HasMany $relation + */ + public function __construct(private HasMany $relation, private string $lookupColumn) + { + $model = $relation->getRelated(); + if (! $model instanceof Keyable) { + throw new InvalidArgumentException('Bulk sync requires a Keyable model.'); + } + + $createdAt = $model->getCreatedAtColumn(); + $updatedAt = $model->getUpdatedAtColumn(); + if (! $model->usesTimestamps() || $createdAt === null || $updatedAt === null) { + throw new InvalidArgumentException('Bulk sync requires a model with timestamps.'); + } + + $this->keyModel = clone $model; + $this->primaryKey = $model->getKeyName(); + $this->foreignKey = $relation->getForeignKeyName(); + $this->createdAt = $createdAt; + $this->updatedAt = $updatedAt; + $managed = [$this->primaryKey, $this->foreignKey, $createdAt, $updatedAt]; + $this->writable = array_flip(array_diff($model->getFillable(), $managed)); + + if (! isset($this->writable[$lookupColumn])) { + throw new InvalidArgumentException("Bulk sync lookup column $lookupColumn must be fillable."); + } + } + + /** + * Rows sharing a key: the last one wins. $timestamp defaults to now. + * $merge adjusts a matched row before comparison, e.g. to keep existing values. + * + * @param iterable> $rows + * @param (Closure(array $row, array $existing): array)|null $merge + * @return array{inserted: int, updated: int, unchanged: int, deleted: int} + */ + public function sync(iterable $rows, ?string $timestamp = null, ?Closure $merge = null): array + { + $timestamp ??= $this->relation->getRelated()->freshTimestampString(); + $counts = ['inserted' => 0, 'updated' => 0, 'unchanged' => 0, 'deleted' => 0]; + + foreach (array_chunk($this->prepare($rows), self::CHUNK_SIZE, true) as $chunk) { + foreach ($this->syncChunk($chunk, $timestamp, $merge) as $type => $count) { + $counts[$type] += $count; + } + } + + return $counts; + } + + /** + * @param iterable> $rows + * @return array> keyed by composite key + */ + private function prepare(iterable $rows): array + { + $parentKey = $this->relation->getParentKey(); + $prepared = []; + + foreach ($rows as $row) { + $row = array_intersect_key($row instanceof Model ? $row->getAttributes() : $row, $this->writable); + if (! isset($row[$this->lookupColumn])) { + // whereIn() can never find a null, so the row would be inserted again on every run + throw new InvalidArgumentException("Bulk sync rows require a non-null $this->lookupColumn."); + } + $row[$this->foreignKey] = $parentKey; + $prepared[$this->key($row)] = $row; + } + + return $prepared; + } + + /** + * Matched rows only needing a new last-seen time share one narrow UPDATE. + * Changed rows go into one upsert of their full records, which keeps + * their primary keys and created_at. + * + * @param array> $pending rows keyed by composite key + * @param (Closure(array, array): array)|null $merge + * @return array{inserted: int, updated: int, unchanged: int, deleted: int} + */ + private function syncChunk(array $pending, string $timestamp, ?Closure $merge): array + { + $matched = $unchanged = $changed = $duplicates = []; + + foreach ($this->existing($pending) as $record) { + $key = $this->key($record); + if (isset($matched[$key])) { + $duplicates[] = $record[$this->primaryKey]; + continue; + } + if (! isset($pending[$key])) { + continue; // history sharing the lookup value + } + + $row = $pending[$key]; + unset($pending[$key]); + $matched[$key] = true; + + $changes = $this->changes($merge ? $merge($row, $record) : $row, $record); + if ($changes) { + $changed[] = array_replace($record, $changes, [$this->updatedAt => $timestamp]); + } else { + $unchanged[] = $record[$this->primaryKey]; + } + } + + if ($unchanged) { + $this->query()->whereIntegerInRaw($this->primaryKey, $unchanged)->update([$this->updatedAt => $timestamp]); + } + if ($changed) { + $this->query()->upsert($changed, [$this->primaryKey], [...array_keys($this->writable), $this->updatedAt]); + } + foreach (array_chunk($duplicates, self::CHUNK_SIZE) as $ids) { + $this->query()->whereIntegerInRaw($this->primaryKey, $ids)->delete(); + } + $this->insert($pending, $timestamp); // rows left over matched nothing + + return ['inserted' => count($pending), 'updated' => count($changed), 'unchanged' => count($unchanged), 'deleted' => count($duplicates)]; + } + + /** + * Records sharing a lookup value with the rows, oldest first. + * + * @param array> $rows + * @return list> + */ + private function existing(array $rows): array + { + $lookup = array_values(array_unique(array_column($rows, $this->lookupColumn), SORT_STRING)); + + return array_map(fn (object $record) => (array) $record, $this->query()->reorder() + ->whereIn($this->lookupColumn, $lookup) + ->orderBy($this->primaryKey) + ->get()->all()); + } + + /** + * Writable values in $values that differ from $record. + * Values compare as strings, because the database returns strings for some types. + * + * @param array $values + * @param array $record + * @return array + */ + private function changes(array $values, array $record): array + { + $changes = []; + foreach (array_intersect_key($values, $this->writable) as $column => $value) { + $current = $record[$column] ?? null; + if (is_bool($value)) { + $value = (int) $value; // what Laravel binds + } + if (($value === null) !== ($current === null) || (string) $value !== (string) $current) { + $changes[$column] = $value; + } + } + + return $changes; + } + + /** + * @param array> $rows + */ + private function insert(array $rows, string $timestamp): void + { + // A multi-row INSERT needs the same columns in every row + $byColumns = []; + foreach ($rows as $row) { + $row[$this->createdAt] = $row[$this->updatedAt] = $timestamp; + ksort($row); + $byColumns[implode(',', array_keys($row))][] = $row; + } + + foreach ($byColumns as $group) { + $this->query()->insert($group); + } + } + + /** + * A fresh query scoped to the relation's parent. + * toBase() can return a shared builder, so clone it before adding clauses. + */ + private function query(): Builder + { + return clone $this->relation->toBase(); + } + + /** + * @param array $row + */ + private function key(array $row): string + { + $this->keyModel->setRawAttributes($row); + + return (string) $this->keyModel->getCompositeKey(); + } +} diff --git a/LibreNMS/DB/SyncsModels.php b/LibreNMS/DB/SyncsModels.php index 514d12a8165..5cb33284d75 100644 --- a/LibreNMS/DB/SyncsModels.php +++ b/LibreNMS/DB/SyncsModels.php @@ -31,6 +31,7 @@ use Illuminate\Database\Eloquent\Relations\HasManyThrough; use Illuminate\Support\Arr; use Illuminate\Support\Collection; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Models\HasSyncProtectedAttributes; use LibreNMS\Interfaces\Models\Keyable; @@ -84,6 +85,17 @@ protected function syncModels($parentModel, $relationship, $models, $existing = return $existing->map->first()->merge($new); } + /** + * Sync models of a module that walks VRF contexts. + * Rows of contexts that were not walked (disabled or not answering) are kept until the VRF is gone. + * + * @param \Illuminate\Support\Collection $models + */ + protected function syncVrfContextModels(Device $device, string $relationship, Collection $models): Collection + { + return $this->syncModels($device, $relationship, $models, $device->$relationship->whereNotIn('context_name', $device->getSkippedVrfContexts())); + } + /** * Sync a sub-group of models to the database * @@ -106,6 +118,19 @@ public function syncModelsByGroup(Device $device, string $relationship, Collecti return $this->syncModels($device, $relationship, $models->when($where, $filter), $device->$relationship->when($where, $filter)); } + /** + * Sync models discovered by one polling method, they replace the models of every method. + * Models are linked to their method by a polling_method attribute cast to PollingMethodType. + * + * @template TModel of Model&Keyable + * + * @param Collection $models + */ + protected function syncModelsFromMethod(Device $device, string $relationship, PollingMethodType $type, Collection $models): Collection + { + return $this->syncModels($device, $relationship, $models->each(fn (Model $model) => $model->setAttribute('polling_method', $type))); + } + /** * Combine a list of existing and potentially new models * If the model exists fill any new data from the new models diff --git a/LibreNMS/Data/Graphing/GraphParameters.php b/LibreNMS/Data/Graphing/GraphParameters.php deleted file mode 100644 index a2ed2a331b3..00000000000 --- a/LibreNMS/Data/Graphing/GraphParameters.php +++ /dev/null @@ -1,328 +0,0 @@ -. - * - * @link https://www.librenms.org - * - * @copyright 2022 Tony Murray - * @author Tony Murray - */ - -namespace LibreNMS\Data\Graphing; - -use App\Facades\DeviceCache; -use App\Facades\LibrenmsConfig; -use Illuminate\Support\Str; -use LibreNMS\Enum\ImageFormat; -use LibreNMS\Util\Clean; -use LibreNMS\Util\Time; - -class GraphParameters implements \Stringable -{ - public readonly array $visibleElements; - - public string $title = ''; - public readonly ?string $user_title; - public readonly string $type; - public readonly string $subtype; - public readonly ImageFormat $imageFormat; - - public readonly string $style; - public readonly string $font; - public readonly string $font_color; - public readonly int $font_size; - public readonly string $background; - public readonly string $canvas; - - public readonly int $width; - public readonly int $height; - public readonly bool $full_size; - public readonly bool $is_small; - - public readonly int $from; - public readonly int $to; - public readonly int $period; - public readonly int $prev_from; - - public readonly bool $inverse; - public readonly string $in; - public readonly string $out; - public ?int $scale_max = null; - public ?int $scale_min = null; - public ?bool $scale_rigid = null; - public bool $sloped = true; - public ?int $base = null; - public ?int $units_exponent = null; - public bool $logarithmic = false; - public bool $alt_y_grid = false; - - public int $float_precision = 2; - - public ?string $right_axis = null; - public ?string $right_axis_label = null; - public ?string $left_axis_format = null; - public ?int $units_length = null; - public ?string $vertical_label = null; - - private const TINY = 99; - private const SMALL = 224; - private const MEDIUM_SMALL = 300; - private const MEDIUM = 350; - - public function __construct(array $vars) - { - // jpgraph based bill graphs only support png - $this->imageFormat = str_starts_with($vars['type'] ?? '', 'bill_historic') ? ImageFormat::Png : ImageFormat::forGraph($vars['graph_type'] ?? null); - [$this->type, $this->subtype] = $this->extractType($vars['type'] ?? ''); - - $this->width = (int) ($vars['width'] ?? 400); - $this->height = (int) ($vars['height'] ?? $this->width / 3); - $this->full_size = ! empty($vars['absolute']); - $this->is_small = $this->width < self::SMALL; - - $this->style = $vars['style'] ?? ''; - $this->font = LibrenmsConfig::get('mono_font'); - $this->font_color = Clean::alphaDash($vars['font'] ?? ''); - $this->font_size = $this->width <= self::MEDIUM_SMALL ? 7 : 8; - - $this->canvas = Clean::alphaDash($vars['bg'] ?? ''); - $this->background = Clean::alphaDash($vars['bbg'] ?? ''); - - $this->user_title = $vars['graph_title'] ?? null; // if the user sets a title, show it - $this->visibleElements = [ - 'title' => isset($this->user_title) || (isset($vars['title']) && $vars['title'] !== 'no'), - 'legend' => empty($vars['legend']) || $vars['legend'] !== 'no', - 'total' => ! ($vars['nototal'] ?? $this->is_small), - 'details' => ! ($vars['nodetails'] ?? $this->is_small), - 'aggregate' => ! empty($vars['noagg']), - 'previous' => isset($vars['previous']) && $vars['previous'] == 'yes', - ]; - - $this->from = Time::parseAt($vars['from'] ?? '-1d'); - $this->to = empty($vars['to']) ? time() : Time::parseAt($vars['to']); - $this->period = $this->to - $this->from; - $this->prev_from = $this->from - $this->period; - $this->scale_min = $vars['scale_min'] ?? null; - $this->scale_max = $vars['scale_max'] ?? null; - $this->scale_rigid = isset($vars['scale_rigid']) ? $vars['scale_rigid'] && $vars['scale_rigid'] !== 'no' : null; - - $this->inverse = ! empty($vars['inverse']); - $this->in = $this->inverse ? 'out' : 'in'; - $this->out = $this->inverse ? 'in' : 'out'; - } - - public function visible(string $element): bool - { - return $this->visibleElements[$element] ?? true; - } - - public function all(): array - { - $variables = get_object_vars($this); - - // legacy compat - $variables['nototal'] = ! $this->visibleElements['total']; - $variables['nodetails'] = ! $this->visibleElements['details']; - $variables['noagg'] = ! $this->visibleElements['aggregate']; - $variables['title'] = $this->visibleElements['title']; - - return $variables; - } - - public function toRrdOptions(): array - { - $options = ['--start', $this->from, '--end', $this->to, '--width', $this->width, '--height', $this->height]; - - // image must fit final dimensions - if ($this->full_size) { - $options[] = '--full-size-mode'; - } - - if ($this->imageFormat === ImageFormat::Svg) { - $options[] = '--imgformat=SVG'; - if ($this->width < self::MEDIUM) { - array_push($options, '-m', 0.75, '-R', 'light'); - } - } - - // set up fonts - array_push($options, '--font', 'TITLE:' . $this->font_size . ':' . $this->font); - array_push($options, '--font', 'LEGEND:' . $this->font_size . ':' . $this->font); - array_push($options, '--font', 'AXIS:' . ($this->font_size - 1) . ':' . $this->font); - array_push($options, '--font-render-mode', 'normal'); - - // set up colors - foreach ($this->graphColors() as $name => $color) { - array_push($options, '-c', $name . '#' . $color); - } - - // set up scaling scaling - if ($this->scale_min === null && $this->scale_max === null) { - $options[] = '--alt-autoscale-max'; - $this->scale_rigid ??= true; - } - if ($this->scale_min !== null) { - array_push($options, '-l', $this->scale_min); - } - if ($this->scale_max !== null) { - array_push($options, '-u', $this->scale_max); - } - if ($this->scale_rigid) { - $options[] = '--rigid'; - } - - if ($this->sloped) { - $options[] = '--slope-mode'; - } - - if ($this->alt_y_grid) { - $options[] = '--alt-y-grid'; - } - if ($this->base !== null) { - array_push($options, '--base', $this->base); - } - if ($this->units_exponent !== null) { - array_push($options, '--units-exponent', $this->units_exponent); - } - if ($this->logarithmic) { - $options[] = '--logarithmic'; - } - - // remove all text, height is too small - if ($this->height < self::TINY) { - $options[] = '--only-graph'; - } - - if (! $this->visible('legend')) { - $options[] = '-g'; - } - - if ($this->visible('title')) { - $options[] = '--title=' . $this->escapeParameter($this->formatTitle()); - } - - if ($this->right_axis !== null) { - array_push($options, '--right-axis', $this->escapeParameter($this->right_axis)); - } - if ($this->right_axis_label !== null) { - array_push($options, '--right-axis-label', $this->escapeParameter($this->right_axis_label)); - } - if ($this->left_axis_format !== null) { - array_push($options, '--left-axis-format', $this->escapeParameter($this->left_axis_format)); - } - if ($this->units_length !== null) { - array_push($options, '--units-length', $this->units_length); - } - if ($this->vertical_label !== null) { - array_push($options, '--vertical-label', $this->escapeParameter($this->vertical_label)); - } - - return $options; - } - - public function __toString(): string - { - return implode(' ', $this->toRrdOptions()); - } - - /** - * Get the graph title. In order: - * - User set title - * - Graph set title - * - Fallback default title - */ - public function getTitle(): string - { - return $this->user_title ?? $this->title ?: $this->defaultTitle(); - } - - private function graphColors(): array - { - $style = $this->style ?: session('applied_site_style'); - $def_colors = LibrenmsConfig::get($style == 'dark' ? 'rrdgraph_def_text_dark' : 'rrdgraph_def_text'); - $def_font = ltrim(LibrenmsConfig::get($style == 'dark' ? 'rrdgraph_def_text_color_dark' : 'rrdgraph_def_text_color'), '#'); - - preg_match_all('/-c ([A-Z]+)#([0-9A-Fa-f]{6,8})/', $def_colors, $matches); - $colors = ['FONT' => $def_font]; - foreach ($matches[1] as $index => $key) { - $colors[$key] = $matches[2][$index]; - } - - // user overrides - if ($this->font_color) { - $colors['FONT'] = $this->font_color; - } - - if ($this->canvas) { - $colors['CANVAS'] = $this->canvas; - } - - if ($this->background) { - $colors['BACK'] = $this->background; - } - - return $colors; - } - - private function extractType(string $type): array - { - preg_match('/^(?P[A-Za-z0-9]+)_(?P.+)/', $type, $graphtype); - $type = basename($graphtype['type']); - $subtype = basename($graphtype['subtype']); - - return [$type, $subtype]; - } - - private function defaultTitle(): string - { - $title = DeviceCache::getPrimary()->display ?: ucfirst($this->type); - $title .= '::'; - $title .= Str::title(str_replace('_', ' ', $this->subtype)); - - return $title; - } - - private function formatTitle(): string - { - $title = $this->getTitle(); - - // linear approximation - $slope = 0.1332; - $intercept = 15.55; - $sizeAdjustment = 8 / $this->font_size; // Adjust the slope if the font size deviates from 8 - $adjustedSlope = $slope * $sizeAdjustment; - - $maxChars = (int) floor($this->width * $adjustedSlope + $intercept); - - if ($maxChars <= 0) { - return ''; - } - - if (strlen($title) <= $maxChars) { - return $title; - } - - return substr($title, 0, max(0, $maxChars - 3)) . '...'; - } - - private function escapeParameter(string $input): string - { - return str_replace(["'", '"', "\n", "\r"], '', $input); - } -} diff --git a/LibreNMS/Data/Source/Ipmitool.php b/LibreNMS/Data/Source/Ipmitool.php index 242394e90ae..9b95ab1c77c 100644 --- a/LibreNMS/Data/Source/Ipmitool.php +++ b/LibreNMS/Data/Source/Ipmitool.php @@ -57,8 +57,8 @@ public static function init(?Device $device = null, ?IpmiConfig $config = null): return null; } - $ipmi = $config ?? $device->polling()->ipmi(); - if (! $ipmi->hostname) { + $ipmi = $config ?? $device->polling()->get(PollingMethodType::Ipmi); + if (! $ipmi instanceof IpmiConfig || ! $ipmi->hostname) { return null; } diff --git a/LibreNMS/Data/Source/Snmp/PhpSnmp.php b/LibreNMS/Data/Source/Snmp/PhpSnmp.php index 31f487bba4c..bbbf23088d9 100644 --- a/LibreNMS/Data/Source/Snmp/PhpSnmp.php +++ b/LibreNMS/Data/Source/Snmp/PhpSnmp.php @@ -42,14 +42,15 @@ public function get(string $target, array $oids, SnmpConfig $config, SnmpQueryOp { $snmp = $this->buildSnmp($target, $config, $options); - return $snmp ? $this->runCommand('get', $snmp, $config, $oids, $options) : (new NetSnmp())->get($target, $oids, $config, $options); + return $snmp ? $this->runCommand('get', $snmp, $config, $oids, $options) : new NetSnmp()->get($target, $oids, $config, $options); } public function walk(string $target, string $oid, SnmpConfig $config, SnmpQueryOptions $options): SnmpResponse { - $snmp = $this->buildSnmp($target, $config, $options); + // php-snmp always walks v2c/v3 with GETBULK, net-snmp can walk without it + $snmp = $config->bulk && $options->allowBulk ? $this->buildSnmp($target, $config, $options) : null; - return $snmp ? $this->runCommand('walk', $snmp, $config, [$oid], $options) : (new NetSnmp())->walk($target, $oid, $config, $options); + return $snmp ? $this->runCommand('walk', $snmp, $config, [$oid], $options) : new NetSnmp()->walk($target, $oid, $config, $options); } /** @@ -59,7 +60,7 @@ public function next(string $target, array $oids, SnmpConfig $config, SnmpQueryO { $snmp = $this->buildSnmp($target, $config, $options); - return $snmp ? $this->runCommand('next', $snmp, $config, $oids, $options) : (new NetSnmp())->next($target, $oids, $config, $options); + return $snmp ? $this->runCommand('getnext', $snmp, $config, $oids, $options) : new NetSnmp()->next($target, $oids, $config, $options); } /** @@ -71,19 +72,15 @@ public function buildSnmp(string $target, SnmpConfig $config, SnmpQueryOptions $ return null; } - $community = $config->community ?: 'public'; - if ($options->context) { - $community .= '@' . $options->context; - } - $snmp = new \SNMP( $this->snmpver($config->version), Rewrite::addIpv6Brackets($target) . ':' . $config->port, - $community, + $this->communityOrUsername($config, $options->context), $config->timeout * 1000000, $config->retries, ); + $snmp->max_oids = max($config->maxOid, 1); $this->setSecurityOptions($snmp, $config, $options->context); $this->setOptions($snmp, $options); $this->initMibs($options); @@ -91,6 +88,17 @@ public function buildSnmp(string $target, SnmpConfig $config, SnmpQueryOptions $ return $snmp; } + private function communityOrUsername(SnmpConfig $config, string $context): string + { + if ($config->version === 'v3') { + return $config->authname ?: 'root'; + } + + $community = $config->community ?: 'public'; + + return $context ? "$community@$context" : $community; + } + /** * Does php-snmp work for the config/options */ @@ -109,12 +117,22 @@ private function worksFor(SnmpConfig $config, SnmpQueryOptions $options): bool return false; } + // Do not use php-snmp if bulk operations are not allowed + if(! $config->bulk || ! $options->allowBulk) { + return false; + } + + // php-snmp does not support display hits being disabled (non-default) + if(! $options->applyDisplayHints) { + return false; + } + if ($config->version == 'v3') { // Dummy SNMP object to check security settings are supported $snmp = new \SNMP(\SNMP::VERSION_3, 'localhost', 'root', 1000000, 3); try { - $this->setSecurityOptions($snmp, $config, $options->context); - } catch (\Exception) { + return $this->setSecurityOptions($snmp, $config, $options->context); + } catch (\Exception|\Error) { return false; } } @@ -122,15 +140,29 @@ private function worksFor(SnmpConfig $config, SnmpQueryOptions $options): bool return true; } - private function setSecurityOptions(\SNMP $snmp, SnmpConfig $config, ?string $context): void + private function setSecurityOptions(\SNMP $snmp, SnmpConfig $config, ?string $context): bool { - if ($config->authlevel === 'authpriv') { - $snmp->setSecurity('authPriv', $config->authalgo, $config->authpass, $config->cryptoalgo, $config->cryptopass, $context ?: ''); - } elseif ($config->authlevel === 'authnopriv') { - $snmp->setSecurity('authNoPriv', $config->authalgo, $config->authpass, '', '', $context ?: ''); /** @phpstan-ignore argument.type */ - } else { - $snmp->setSecurity('noAuthNoPriv', '', '', '', '', $context ?: ''); /** @phpstan-ignore argument.type, argument.type */ + $authlevel = strtolower((string) $config->authlevel); + $authalgo = match (strtoupper((string) $config->authalgo)) { + 'SHA-256' => 'SHA256', + 'SHA-512' => 'SHA512', + default => $config->authalgo, + }; + $cryptoalgo = match (strtoupper((string) $config->cryptoalgo)) { + 'AES-192' => 'AES192', + 'AES-256' => 'AES256', + 'AES-192-C' => 'AES192C', + 'AES-256-C' => 'AES256C', + default => $config->cryptoalgo, + }; + + if ($authlevel === 'authpriv') { + return (bool) $snmp->setSecurity('authPriv', $authalgo, $config->authpass, $cryptoalgo, $config->cryptopass, $context ?: ''); + } elseif ($authlevel === 'authnopriv') { + return (bool) $snmp->setSecurity('authNoPriv', $authalgo, $config->authpass, '', '', $context ?: ''); /** @phpstan-ignore argument.type */ } + + return (bool) $snmp->setSecurity('noAuthNoPriv', '', '', '', '', $context ?: ''); /** @phpstan-ignore argument.type, argument.type */ } /** diff --git a/LibreNMS/Data/Source/Snmp/SnmpQueryBuilder.php b/LibreNMS/Data/Source/Snmp/SnmpQueryBuilder.php index 52c0d6077af..b4fe49b9dc4 100644 --- a/LibreNMS/Data/Source/Snmp/SnmpQueryBuilder.php +++ b/LibreNMS/Data/Source/Snmp/SnmpQueryBuilder.php @@ -204,6 +204,16 @@ public function enumStrings(): SnmpQueryInterface return $this; } + /** + * Apply MIB DISPLAY-HINTs to output values (default is true). + */ + public function displayHints(bool $apply = true): SnmpQueryInterface + { + $this->options->applyDisplayHints = $apply; + + return $this; + } + public function bulk(bool $allow = true): SnmpQueryInterface { $this->options->allowBulk = $allow; diff --git a/LibreNMS/Data/Source/Snmp/SnmpQueryInterface.php b/LibreNMS/Data/Source/Snmp/SnmpQueryInterface.php index 4dd06a2d668..f321c2b539d 100644 --- a/LibreNMS/Data/Source/Snmp/SnmpQueryInterface.php +++ b/LibreNMS/Data/Source/Snmp/SnmpQueryInterface.php @@ -103,6 +103,12 @@ public function bulk(bool $allow = true): SnmpQueryInterface; */ public function enumStrings(): SnmpQueryInterface; + /** + * Apply MIB DISPLAY-HINTs to output values (default is true). + * Disabling outputs raw values, for example 793 instead of 79.3 or a hex string instead of a MAC. + */ + public function displayHints(bool $apply = true): SnmpQueryInterface; + /** * Set option(s) for net-snmp command line. * Some options may break parsing, but you can manually parse the raw output if needed. diff --git a/LibreNMS/Data/Source/Snmp/SnmpResponse.php b/LibreNMS/Data/Source/Snmp/SnmpResponse.php index 796eea77540..156ba35d95e 100644 --- a/LibreNMS/Data/Source/Snmp/SnmpResponse.php +++ b/LibreNMS/Data/Source/Snmp/SnmpResponse.php @@ -28,13 +28,14 @@ use Illuminate\Support\Arr; use Illuminate\Support\Collection; +use LibreNMS\Exceptions\SnmpException; use LibreNMS\Util\Oid; use Log; class SnmpResponse implements \Stringable { protected const KEY_VALUE_DELIMITER = ' = '; - protected const STDERR_ERROR_REGEX = '/(Timeout: No Response from .*|Unknown user name|Authentication failure|Error: OID not increasing: .*)/'; + protected const STDERR_ERROR_REGEX = '/(Timeout: No Response from .*|snmp\w+: Timeout|Unknown user name|Authentication failure|Error: OID not increasing: .*)/'; protected const BAD_STRING_REGEX = '/(No Such Instance|No Such Object|No more variables left).*/'; protected const BAD_VALUE_REGEX = '/(No Such Instance|No Such Object|at this OID|this MIB View|End of MIB| = NULL$).*/'; @@ -113,6 +114,28 @@ protected function findBadString(): ?string return $this->badString; } + /** + * The agent did not answer or rejected the request, as opposed to having no data for it + */ + public function hasConnectionError(): bool + { + return (bool) preg_match('/Timeout: No Response from|snmp\w+: Timeout|No response from|Unknown user name|Authentication failure|authorizationError/i', $this->stderr); + } + + /** + * For queries whose result must be known, for example before removing data the device no longer reports + * + * @throws SnmpException + */ + public function throwIfConnectionError(): static + { + if ($this->hasConnectionError()) { + throw new SnmpException(trim($this->stderr)); + } + + return $this; + } + public function isEmpty(): bool { return empty($this->values); diff --git a/LibreNMS/Data/Store/BaseDatastore.php b/LibreNMS/Data/Store/BaseDatastore.php index b7a0cf40e3d..86b451a67ec 100644 --- a/LibreNMS/Data/Store/BaseDatastore.php +++ b/LibreNMS/Data/Store/BaseDatastore.php @@ -26,6 +26,7 @@ namespace LibreNMS\Data\Store; +use App\Data\TimeSeries\MetricIdentity; use App\Facades\DeviceCache; use App\Models\Device; use App\Polling\Measure\Measurement; @@ -65,6 +66,23 @@ protected function getDevice(array $meta): Device return DeviceCache::getPrimary(); } + /** + * The tags that tell series apart. A metric identity carries what the series belongs to in its own tags, + * usually hostname, other writes belong to the device and are tagged with its hostname. + * + * @param array $tags + * @param array $meta + * @return array + */ + protected function seriesTags(array $tags, array $meta): array + { + if (($meta['metric'] ?? null) instanceof MetricIdentity) { + return $tags; + } + + return ['hostname' => $this->getDevice($meta)->hostname, ...$tags]; + } + public function __destruct() { $this->terminate(); diff --git a/LibreNMS/Data/Store/Datastore.php b/LibreNMS/Data/Store/Datastore.php index d228eb27255..a5e1e88b0d8 100644 --- a/LibreNMS/Data/Store/Datastore.php +++ b/LibreNMS/Data/Store/Datastore.php @@ -26,6 +26,7 @@ namespace LibreNMS\Data\Store; +use App\Data\TimeSeries\MetricIdentity; use App\Facades\DeviceCache; use App\Facades\LibrenmsConfig; use App\Models\Device; @@ -67,7 +68,7 @@ public static function init(array $options = []): Datastore * * @param DatastoreContract[] $stores */ - public function __construct(protected array $stores) + public function __construct(protected array $stores, private readonly MetricNames $metricNames = new MetricNames) { } @@ -104,7 +105,7 @@ public function disable(string $name): void * rrd_oldname array|string: old rrd filename to rename, will be processed with rrd_name() * rrd_step int: rrd step, defaults to 300 * - * @param array $device + * @param array|\App\Models\Device $device * @param string $measurement Name of this measurement * @param array $tags tags for the data (or to control rrdtool) * @param array|mixed $fields The data to update in an associative array, the order must be consistent with rrd_def, @@ -138,6 +139,20 @@ public function put($device, $measurement, $tags, $fields): void */ public function write(string $measurement, array $fields, array $tags = [], array $meta = []): void { + $metric = $meta['metric'] ?? null; + $legacy = $metric instanceof MetricIdentity ? $this->metricNames->storedAs($metric) : null; + + if ($legacy !== null) { + // stored under the names it always had + $measurement = $legacy->measurement; + $tags = $legacy->tagsOf($metric); + unset($meta['metric']); + + if ($rrdName = $legacy->rrdNameOf($metric)) { + $meta['rrd_name'] = $rrdName; + } + } + foreach ($this->stores as $store) { $store->write($measurement, $fields, $tags, $meta); } diff --git a/LibreNMS/Data/Store/Graphite.php b/LibreNMS/Data/Store/Graphite.php index bbdd9973720..0796779ae7c 100644 --- a/LibreNMS/Data/Store/Graphite.php +++ b/LibreNMS/Data/Store/Graphite.php @@ -27,6 +27,7 @@ namespace LibreNMS\Data\Store; +use App\Data\TimeSeries\MetricIdentity; use App\Facades\LibrenmsConfig; use App\Polling\Measure\Measurement; use Carbon\Carbon; @@ -87,7 +88,8 @@ public function write(string $measurement, array $fields, array $tags = [], arra $measurement = 'ports|' . $tags['ifName']; } - $hostname = $this->getDevice($meta)->hostname; + $identity = $meta['metric'] ?? null; + $hostname = $identity instanceof MetricIdentity ? $identity->group() : $this->getDevice($meta)->hostname; // metrics will be built as prefix.hostname.measurement.field value timestamp // metric fields can not contain . as this is used by graphite as a field separator @@ -95,7 +97,7 @@ public function write(string $measurement, array $fields, array $tags = [], arra $measurement = preg_replace(['/\./', '/\//'], '_', $measurement); $measurement = preg_replace('/\|/', '.', (string) $measurement); - $measurement_name = preg_replace('/\./', '_', $meta['rrd_name'] ?? ''); // FIXME don't use rrd_name + $measurement_name = preg_replace('/\./', '_', $identity instanceof MetricIdentity ? array_values($identity->tagsInGroup()) : ($meta['rrd_name'] ?? '')); // FIXME don't use rrd_name $ms_name = is_array($measurement_name) ? implode('.', $measurement_name) : $measurement_name; // remove the port-id tags from the metric if (preg_match('/^port-id\d+/', (string) $ms_name)) { diff --git a/LibreNMS/Data/Store/InfluxDB.php b/LibreNMS/Data/Store/InfluxDB.php index 8f4aedc4cb2..147575d1b3c 100644 --- a/LibreNMS/Data/Store/InfluxDB.php +++ b/LibreNMS/Data/Store/InfluxDB.php @@ -45,21 +45,6 @@ public function __construct(private readonly Database $connection) parent::__construct(); $this->batchSize = LibrenmsConfig::get('influxdb.batch_size', 0); $this->measurements = LibrenmsConfig::get('influxdb.measurements', []); - - // if the database doesn't exist, create it. - // When using UDP transport, the call to exists() fails - // since the transport doesn't support querying. That said - // the database will be created automatically upon data - // reception. - if (LibrenmsConfig::get('influxdb.transport', 'http') !== 'udp') { - try { - if (! $this->connection->exists()) { - $this->connection->create(); - } - } catch (\Exception) { - Log::warning('InfluxDB: Could not create database'); - } - } } public function terminate(): void @@ -90,8 +75,8 @@ public function write(string $measurement, array $fields, array $tags = [], arra $stat = Measurement::start('write'); $tmp_fields = []; - $tmp_tags['hostname'] = $this->getDevice($meta)->hostname; - foreach ($tags as $k => $v) { + $tmp_tags = []; + foreach ($this->seriesTags($tags, $meta) as $k => $v) { if (empty($v)) { $v = '_blank_'; } diff --git a/LibreNMS/Data/Store/InfluxDBv2.php b/LibreNMS/Data/Store/InfluxDBv2.php index 834b2eba2cc..4d4629474ca 100644 --- a/LibreNMS/Data/Store/InfluxDBv2.php +++ b/LibreNMS/Data/Store/InfluxDBv2.php @@ -131,8 +131,8 @@ public function write(string $measurement, array $fields, array $tags = [], arra $stat = Measurement::start('write'); $tmp_fields = []; - $tmp_tags['hostname'] = $device->hostname; - foreach ($tags as $k => $v) { + $tmp_tags = []; + foreach ($this->seriesTags($tags, $meta) as $k => $v) { if (empty($v)) { $v = '_blank_'; } @@ -165,7 +165,6 @@ public function write(string $measurement, array $fields, array $tags = [], arra try { // Construct data points using the InfluxDB2\Point class $point = Point::measurement($measurement) - ->addTag('hostname', $device->hostname) ->time(microtime(true)); // Assuming you want to use the current time // Write the data points to the database using the WriteApi instance diff --git a/LibreNMS/Data/Store/Kafka.php b/LibreNMS/Data/Store/Kafka.php index fe7f3c51d2f..b9832e45b79 100644 --- a/LibreNMS/Data/Store/Kafka.php +++ b/LibreNMS/Data/Store/Kafka.php @@ -18,7 +18,7 @@ class Kafka extends BaseDatastore private $excluded_groups = []; private $excluded_measurement = []; - public function __construct(private Producer $client) + public function __construct(private ?Producer $client) { parent::__construct(); @@ -220,7 +220,7 @@ public function write(string $measurement, array $fields, array $tags = [], arra $stat = Measurement::start('write'); // remove tags with empty values - $tags = array_filter($tags, fn ($value) => $value !== '' && $value !== null); + $tags = array_filter($this->seriesTags($tags, $meta), fn ($value) => $value !== '' && $value !== null); if (empty($fields)) { Log::warning('KAFKA: All fields empty, skipping update', [ @@ -232,7 +232,6 @@ public function write(string $measurement, array $fields, array $tags = [], arra // add current sent time in unix timestamp format $tags['current_polled_time'] = Carbon::now()->timestamp; - $tags['hostname'] ??= $device_data->hostname; $resultArr = [ 'measurement' => $measurement, diff --git a/LibreNMS/Data/Store/MetricNames.php b/LibreNMS/Data/Store/MetricNames.php new file mode 100644 index 00000000000..558ec7b7b9d --- /dev/null +++ b/LibreNMS/Data/Store/MetricNames.php @@ -0,0 +1,39 @@ +isCanonical() ? null : $this->legacyOf($metric); + } + + /** + * The names the metric had before its identity was cleaned up, null when it was always stored as identified + */ + public function legacyOf(MetricIdentity $metric): ?LegacyMetric + { + return match ($metric->measurement) { + 'processor' => new LegacyMetric('processors', ['type' => 'processor_type', 'index' => 'processor_index'], ['processor', '{type}', '{index}']), + default => null, + }; + } +} diff --git a/LibreNMS/Data/Store/OpenTSDB.php b/LibreNMS/Data/Store/OpenTSDB.php index 4a8ae241cc3..d3982b3dc3e 100644 --- a/LibreNMS/Data/Store/OpenTSDB.php +++ b/LibreNMS/Data/Store/OpenTSDB.php @@ -74,14 +74,14 @@ public function write(string $measurement, array $fields, array $tags = [], arra } $timestamp = Carbon::now()->timestamp; - $tmp_tags = 'hostname=' . $this->getDevice($meta)->hostname; - - foreach ($tags as $k => $v) { - $v = str_replace([' ', ',', '='], '_', $v); + $tmp_tags = []; + foreach ($this->seriesTags($tags, $meta) as $k => $v) { + $v = str_replace([' ', ',', '='], '_', (string) $v); if (! empty($v)) { - $tmp_tags = $tmp_tags . ' ' . $k . '=' . $v; + $tmp_tags[] = $k . '=' . $v; } } + $tmp_tags = implode(' ', $tmp_tags); if ($measurement == 'ports') { foreach ($fields as $k => $v) { diff --git a/LibreNMS/Data/Store/Prometheus.php b/LibreNMS/Data/Store/Prometheus.php index 59bcbe7cabe..7d5838d984d 100644 --- a/LibreNMS/Data/Store/Prometheus.php +++ b/LibreNMS/Data/Store/Prometheus.php @@ -27,6 +27,7 @@ namespace LibreNMS\Data\Store; +use App\Data\TimeSeries\MetricIdentity; use App\Facades\LibrenmsConfig; use App\Polling\Measure\Measurement; use Illuminate\Http\Client\ConnectionException; @@ -107,7 +108,10 @@ public function write(string $measurement, array $fields, array $tags = [], arra } } - $promurl = $device->hostname . $promtags; + // the instance is what the series belongs to + $metric = $meta['metric'] ?? null; + $instance = $metric instanceof MetricIdentity ? $metric->group() : $device->hostname; + $promurl = $instance . $promtags; $promurl = str_replace(' ', '-', $promurl); // Prometheus doesn't handle tags with spaces in url Log::debug("Prometheus put $promurl: ", [ diff --git a/LibreNMS/Data/Store/Rrd.php b/LibreNMS/Data/Store/Rrd.php index e274e0524db..2cfe7f66ec3 100644 --- a/LibreNMS/Data/Store/Rrd.php +++ b/LibreNMS/Data/Store/Rrd.php @@ -26,6 +26,7 @@ namespace LibreNMS\Data\Store; +use App\Data\TimeSeries\MetricIdentity; use App\Facades\LibrenmsConfig; use App\Models\Device; use App\Models\Eventlog; @@ -33,42 +34,24 @@ use Carbon\Carbon; use LibreNMS\Enum\Severity; use LibreNMS\Exceptions\RrdException; -use LibreNMS\Exceptions\RrdFileExistsException; -use LibreNMS\Exceptions\RrdGraphException; use LibreNMS\Exceptions\RrdNotFoundException; use LibreNMS\Exceptions\RrdStoreException; +use LibreNMS\RRD\Backend\RrdBackendInterface; use LibreNMS\RRD\RrdPath; -use LibreNMS\RRD\RrdProcess; -use LibreNMS\Util\Debug; use LibreNMS\Util\Rewrite; -use LibreNMS\Util\Version; use Log; class Rrd extends BaseDatastore { - private const FAILURE_THRESHOLD = 3; - private const BACKOFF_BASE = 30; // seconds - private const BACKOFF_MAX = 600; // seconds + private const int FAILURE_THRESHOLD = 3; + private const int BACKOFF_BASE = 30; // seconds + private const int BACKOFF_MAX = 600; // seconds private int $consecutiveErrors = 0; private int $trips = 0; private int $suspendedUntil = 0; - private ?RrdProcess $rrd = null; - /** set by the user or detected when needed */ - private ?string $version; - /** @var string */ - private $rrdcached; - - private array $rra; - /** @var int */ - private $step; - - public function __construct() - { - parent::__construct(); - $this->loadConfig(); - } + private ?RrdBackendInterface $backend = null; public function getName(): string { @@ -80,37 +63,12 @@ public static function isEnabled(): bool return LibrenmsConfig::get('rrd.enable', true); } - protected function loadConfig(): void - { - $this->rrdcached = LibrenmsConfig::get('rrdcached', false); - $this->step = LibrenmsConfig::get('rrd.step', 300); - $this->rra = preg_split('/\s+/', trim(LibrenmsConfig::get( - 'rrd_rra', - 'RRA:AVERAGE:0.5:1:2016 RRA:AVERAGE:0.5:6:1440 RRA:AVERAGE:0.5:24:1440 RRA:AVERAGE:0.5:288:1440 ' . - ' RRA:MIN:0.5:1:2016 RRA:MIN:0.5:6:1440 RRA:MIN:0.5:24:1440 RRA:MIN:0.5:288:1440 ' . - ' RRA:MAX:0.5:1:2016 RRA:MAX:0.5:6:1440 RRA:MAX:0.5:24:1440 RRA:MAX:0.5:288:1440 ' . - ' RRA:LAST:0.5:1:2016 ' - ))); - $this->version = LibrenmsConfig::get('rrdtool_version') ?: null; - } - - private function version(): string - { - return $this->version ??= Version::get()->rrdtool() ?: '1.4'; - } - - public function init(int $timeout = 600): void - { - $this->rrd ??= app(RrdProcess::class, ['timeout' => $timeout]); - } - /** - * Close rrdtool process. - * This should be done before exiting + * Resolved on first use, so requests that only build rrd paths don't start a process or connect */ - public function terminate(): void + private function backend(): RrdBackendInterface { - $this->rrd?->stop(); + return $this->backend ??= resolve(RrdBackendInterface::class); } /** @@ -118,51 +76,52 @@ public function terminate(): void */ public function write(string $measurement, array $fields, array $tags = [], array $meta = []): void { + if ($this->isSuspended()) { + return; + } + $device_model = $this->getDevice($meta); $rrd_name = $meta['rrd_name'] ?? $measurement; - $step = $meta['rrd_step'] ?? $this->step; if (! empty($meta['rrd_oldname'])) { self::renameFile($device_model, $meta['rrd_oldname'], $rrd_name); } - if (isset($meta['rrd_proxmox_name'])) { - $pmxvars = $meta['rrd_proxmox_name']; - $rrd = self::proxmoxName($pmxvars['pmxcluster'], $pmxvars['vmid'], $pmxvars['vmport']); - self::checkDirExists(RrdPath::proxmox($pmxvars['pmxcluster'])); + $metric = $meta['metric'] ?? null; + if ($metric instanceof MetricIdentity) { + self::checkDirExists(RrdPath::make($metric->group())); // not always a device, those are created when polling starts + $rrd = $this->metricName($metric); } else { $rrd = RrdPath::make($device_model->hostname, self::filenameString($rrd_name) . '.rrd'); } if (isset($meta['rrd_def'])) { $rrd_def = $meta['rrd_def']; + if (isset($meta['rrd_step'])) { + $rrd_def = (clone $rrd_def)->setStep((int) $meta['rrd_step']); + } - // filter out data not in the definition - $fields = array_filter($fields, function ($key) use ($rrd_def) { - $valid = $rrd_def->isValidDataset($key); - if (! $valid) { + foreach (array_keys($fields) as $key) { + if (! $rrd_def->isValidDataset($key)) { Log::debug("RRD warning: unused data sent $key"); } - - return $valid; - }, ARRAY_FILTER_USE_KEY); - } - - if ($this->isSuspended()) { - if (! LibrenmsConfig::get('hide_rrd_disabled')) { - Log::debug('[%rRRD Disabled%n]', ['color' => true]); } - return; + // values must be in the same order as the data sources in the file + $values = $rrd_def->orderValues($fields); + } else { + $values = array_values($fields); } try { try { - $this->update($rrd, $fields); + $this->update($rrd, $values); } catch (RrdNotFoundException) { if (isset($rrd_def)) { - $this->command('create', $rrd, ['--step', $step, ...$rrd_def->getArguments(), ...$this->rra]); - $this->update($rrd, $fields); + $stat = Measurement::start('create'); + $this->backend()->create($rrd, $rrd_def); + $this->recordStatistic($stat->end()); + $this->update($rrd, $values); } } $this->recordSuccess($device_model); @@ -174,9 +133,20 @@ public function write(string $measurement, array $fields, array $tags = [], arra } } + /** + * Writes are skipped while suspended, reads are still allowed + */ private function isSuspended(): bool { - return Carbon::now()->getTimestamp() < $this->suspendedUntil; + if (Carbon::now()->getTimestamp() >= $this->suspendedUntil) { + return false; + } + + if (! LibrenmsConfig::get('hide_rrd_disabled')) { + Log::debug('[%rRRD Disabled%n]', ['color' => true]); + } + + return true; } private function recordSuccess(Device $device): void @@ -204,74 +174,53 @@ private function recordStoreFailure(RrdStoreException $e, Device $device): void } /** - * Updates an rrd database at $filename using $options - * Where $options is an array, each entry which is not a number is replaced with "U" + * Updates an rrd database with the given values in data source order + * Non-numeric values are stored as unknown * - * @param string[] $data + * @param array $values + * @param int|null $timestamp unix time of the values, defaults to now * * @throws RrdException * * @internal */ - public function update(RrdPath $rrd, array $data): void + public function update(RrdPath $rrd, array $values, ?int $timestamp = null): void { - $data = 'N:' . implode(':', array_map(fn ($v) => is_numeric($v) ? $v : 'U', $data)); + if ($this->isSuspended()) { + return; + } - $this->command('update', $rrd, [$data]); + $stat = Measurement::start('update'); + $this->backend()->update($rrd, array_values($values), $timestamp); + $this->recordStatistic($stat->end()); } /** - * Modify an rrd file's max value and trim the peaks as defined by rrdtool + * Change the minimum and/or maximum values of data sources in an existing rrd file + * + * @param array $limits data source name => limits + * @return bool true if the file was tuned */ - public function tune(string $type, RrdPath $rrd, int $max): bool + public function tune(RrdPath $rrd, array $limits): bool { - $fields = []; - if ($type === 'port') { - if ($max < 10000000) { - return false; - } - $max /= 8; - $fields = [ - 'INOCTETS', - 'OUTOCTETS', - 'INERRORS', - 'OUTERRORS', - 'INUCASTPKTS', - 'OUTUCASTPKTS', - 'INNUCASTPKTS', - 'OUTNUCASTPKTS', - 'INDISCARDS', - 'OUTDISCARDS', - 'INUNKNOWNPROTOS', - 'INBROADCASTPKTS', - 'OUTBROADCASTPKTS', - 'INMULTICASTPKTS', - 'OUTMULTICASTPKTS', - ]; - } - if (count($fields) > 0) { - $options = []; - foreach ($fields as $field) { - array_push($options, '--maximum', $field . ':' . $max); - } - try { - $this->command('tune', $rrd->fullPath(), $options); - } catch (RrdException $e) { - if (! $e instanceof RrdNotFoundException) { - Log::debug('RRD tune failed: ' . $e->getMessage()); - } - } + if ($this->isSuspended() || empty($limits)) { + return false; } - return true; - } + $stat = Measurement::start('other'); + try { + $this->backend()->tune($rrd, $limits); - /** - * Generates a filename for a proxmox cluster rrd - */ - public function proxmoxName(string $pmxcluster, string $vmid, string $vmport): RrdPath - { - return RrdPath::proxmox($pmxcluster, $vmid . '_netif_' . $vmport . '.rrd'); + return true; + } catch (RrdException $e) { + if (! $e instanceof RrdNotFoundException) { + Log::debug('RRD tune failed: ' . $e->getMessage()); + } + + return false; + } finally { + $this->recordStatistic($stat->end()); + } } /** @@ -309,7 +258,7 @@ public function renameFile(Device $device, $oldname, $newname): bool } // a remote rrdcached server cannot rename files, notify once (before the new file is created) - if ($this->rrdcached && ! is_file($oldrrd) && ! $this->checkRrdExists($newpath) && $this->checkRrdExists($oldpath)) { + if (LibrenmsConfig::get('rrdcached') && ! is_file($oldrrd) && ! $this->checkRrdExists($newpath) && $this->checkRrdExists($oldpath)) { Eventlog::log("Unable to rename {$oldpath->relativePath()} to {$newpath->relativePath()} on remote rrdcached server, rename manually to keep history", $device, 'poller', Severity::Warning); } @@ -326,101 +275,64 @@ public function name(string $hostname, array|string $filename): RrdPath } /** - * Generates and pipes a command to rrdtool - * - * @internal - * - * @param string $command create, update, updatev, graph, graphv, dump, restore, fetch, tune, first, last, lastupdate, info, resize, xport, flushcached - * @param string $filename The full patth to the rrd file - * @param array $options rrdtool command options - * @return string the output of the command - * - * @throws RrdException thrown when the rrdtool process(s) cannot be started + * The rrd file of a metric: in the directory of its group, named after the measurement and the other tag values. */ - private function command(string $command, string $filename, array $options = []): string + public function metricName(MetricIdentity $metric): RrdPath { - $stat = Measurement::start($this->coalesceStatisticType($command)); - $output = ''; - - try { - $cmd = self::buildCommand($command, $filename, $options); - } catch (RrdFileExistsException) { - Log::debug("RRD[%g$filename already exists%n]", ['color' => true]); - - return $output; - } - - $commandLine = implode(' ', $cmd); - - // do not write rrd files, but allow read-only commands - $ro_commands = ['graph', 'graphv', 'dump', 'fetch', 'first', 'last', 'lastupdate', 'info', 'xport']; - if ($this->isSuspended() && ! in_array($command, $ro_commands)) { - if (! LibrenmsConfig::get('hide_rrd_disabled')) { - Log::debug('[%rRRD Disabled%n]', ['color' => true]); - } - - return $output; - } - - $this->init(); - $output = $this->rrd->run($commandLine); - - if (Debug::isVerbose() && $output) { - Log::debug('RRDtool Output: ' . $output); - } - - $this->recordStatistic($stat->end()); - - return $output; + return $this->name($metric->group(), [$metric->measurement, ...array_values($metric->tagsInGroup())]); } /** - * Build a command array for rrdtool - * Shortens the filename as needed - * Determines if --daemon should be used - * - * @param string $command The base rrdtool command. Usually create, update, last. - * @param string $filename The full path to the rrd file - * @param array $options Options for the command possibly including the rrd definition - * @return array returns a full command array ready to be used by rrdtool + * The rrd files a metric may be kept in, the one the poller writes to first. + * A metric whose identity was cleaned up may still be kept in the file it had before. * - * @throws RrdFileExistsException if rrdtool <1.4.3 and the rrd file exists locally + * @return list */ - public function buildCommand(string $command, string $filename, array $options = []): array + public function metricNames(MetricIdentity $metric): array { - if ($command == 'create') { - // <1.4.3 doesn't support -O, so make sure the file doesn't exist - if (version_compare($this->version(), '1.4.3', '<')) { - if (is_file($filename)) { - throw new RrdFileExistsException(); - } - } else { - $options[] = '-O'; + if ($metric->group() === '') { + return []; + } + + $names = app(MetricNames::class); + $paths = [$this->metricName($metric)]; + + if ($legacy = $names->legacyOf($metric)) { + $legacyPath = $this->name($metric->group(), $legacy->rrdNameOf($metric) ?? $legacy->measurement); + + // some metrics kept their file name when the identity was cleaned up + if ($legacyPath->relativePath() !== $paths[0]->relativePath()) { + $paths[] = $legacyPath; } } - return [$command, $filename, ...$options]; + return $names->isCanonical() ? $paths : array_reverse($paths); } /** - * Get array of all rrd files for a device, - * via rrdached or localdisk. + * Get array of all rrd files for a device * * @param string|string[] $prefix limit returned results to files matching this prefix - * @return string[] array of rrd files for this host + * @return string[] array of rrd files for this host, relative to the rrd directory */ public function getRrdFiles(string $hostname, string|array $prefix = ''): array { $prefix = self::safeName(is_array($prefix) ? implode('-', $prefix) : $prefix); - $rrdpath = RrdPath::make($hostname); - if ($this->rrdcached) { - $output = $this->command('list', '/' . $rrdpath); - $files = array_filter(explode("\n", trim($output)), fn ($file) => str_starts_with((string) $file, $prefix)); + if ($this->backend()->remote()) { + $stat = Measurement::start('other'); + try { + $paths = $this->backend()->list($hostname, $prefix); + } finally { + $this->recordStatistic($stat->end()); + } } else { - $files = glob($rrdpath . DIRECTORY_SEPARATOR . $prefix . '*.rrd') ?: []; + $files = glob(RrdPath::make($hostname)->fullPath() . DIRECTORY_SEPARATOR . $prefix . '*.rrd') ?: []; + $paths = array_map(fn (string $file) => RrdPath::make($hostname, basename($file)), $files); } + $files = array_map(fn (RrdPath $path) => $path->relativePath(), $paths); + sort($files); return $files; @@ -465,21 +377,23 @@ public function getRrdApplicationArrays($device, $app_id, $app_name, $category = /** * Checks if the rrd file exists on the server - * This will perform a remote check if using rrdcached and rrdtool >= 1.5 */ public function checkRrdExists(RrdPath $rrdpath): bool { - if ($this->rrdcached && version_compare($this->version(), '1.5', '>=')) { - try { - $check_output = $this->command('last', $rrdpath); - - return ! (str_contains($check_output, $rrdpath) && str_contains($check_output, 'No such file or directory')); - } catch (RrdNotFoundException) { - return false; - } - } else { + if (! $this->backend()->remote()) { return is_file($rrdpath->fullPath()); } + + $stat = Measurement::start('other'); + try { + $this->backend()->last($rrdpath); + + return true; + } catch (RrdNotFoundException) { + return false; + } finally { + $this->recordStatistic($stat->end()); + } } /** @@ -530,30 +444,6 @@ public function purge(?string $hostname, string $prefix): void } } - /** - * Generates a graph file at $graph_file using $options - * Graphs are a single command per run, so this just runs rrdtool - * - * @param array $options - * @return string - * - * @throws RrdGraphException - */ - public function graph(array $options): string - { - try { - $command = $this->buildCommand('graph', '-', $options); - - $this->init(300); - $image = $this->rrd->run('"' . implode('" "', $command) . '"'); - $this->rrd->stop(); - - return $image; - } catch (RrdException $e) { - throw new RrdGraphException($e->getMessage(), 'Error'); - } - } - /** * Remove invalid characters from the rrd file name */ @@ -603,17 +493,6 @@ public static function fixedSafeDescr($descr, $length): string return $result . ' '; } - /** - * Only track update and create primarily, just put all others in an "other" bin - * - * @param string $type - * @return string - */ - private function coalesceStatisticType($type): string - { - return ($type == 'update' || $type == 'create') ? $type : 'other'; - } - /** * @param string|string[] $filename */ diff --git a/LibreNMS/Device/Processor.php b/LibreNMS/Device/Processor.php deleted file mode 100644 index de6d4e42c54..00000000000 --- a/LibreNMS/Device/Processor.php +++ /dev/null @@ -1,326 +0,0 @@ -. - * - * @link https://www.librenms.org - * - * @copyright 2017 Tony Murray - * @author Tony Murray - */ - -namespace LibreNMS\Device; - -use App\Facades\LibrenmsConfig; -use App\Models\Eventlog; -use Illuminate\Support\Facades\Log; -use Illuminate\Support\Str; -use LibreNMS\Enum\Severity; -use LibreNMS\Interfaces\Discovery\DiscoveryItem; -use LibreNMS\Interfaces\Discovery\DiscoveryModule; -use LibreNMS\Interfaces\Polling\PollerModule; -use LibreNMS\Interfaces\Polling\ProcessorPolling; -use LibreNMS\Model; -use LibreNMS\OS; -use LibreNMS\RRD\RrdDefinition; -use LibreNMS\Util\Oid; -use LibreNMS\Util\ProgressList; - -class Processor extends Model implements DiscoveryModule, PollerModule, DiscoveryItem -{ - protected static $table = 'processors'; - protected static $primaryKey = 'processor_id'; - - private $valid = true; - - public $processor_id; - public $device_id; - public $processor_type; - public $processor_usage; - public $processor_oid; - public $processor_index; - public $processor_descr; - public $processor_precision; - public $entPhysicalIndex; - public $hrDeviceIndex; - public $processor_perc_warn; - - /** - * Processor constructor. - * - * @param string $type - * @param int $device_id - * @param string $oid - * @param int|string $index - * @param string $description - * @param int $precision The returned value will be divided by this number (should be factor of 10) If negative this oid returns idle cpu - * @param int|null $current_usage - * @param int|null $warn_percent - * @param int|null $entPhysicalIndex - * @param int|null $hrDeviceIndex - * @return static - */ - public static function discover( - $type, - $device_id, - $oid, - $index, - $description = 'Processor', - $precision = 1, - $current_usage = null, - $warn_percent = null, - $entPhysicalIndex = null, - $hrDeviceIndex = null - ) { - $proc = new static(); - $proc->processor_type = $type; - $proc->device_id = $device_id; - $proc->processor_index = (string) $index; - $proc->processor_descr = $description; - $proc->processor_precision = $precision; - $proc->processor_usage = $current_usage; - $proc->entPhysicalIndex = $entPhysicalIndex; - $proc->hrDeviceIndex = $hrDeviceIndex; - - // handle string indexes - if (Str::contains($oid, '"')) { - $oid = preg_replace_callback('/"([^"]+)"/', fn ($matches) => Oid::encodeString($matches[1])->oid, $oid); - } - $proc->processor_oid = '.' . ltrim((string) $oid, '.'); - - $proc->processor_perc_warn = $warn_percent ?? LibrenmsConfig::get('processor_perc_warn', 75); - - // validity not checked yet - if (is_null($proc->processor_usage)) { - $data = snmp_get(device_by_id_cache($proc->device_id), $proc->processor_oid, '-Ovq'); - $proc->valid = ($data !== false); - if (! $proc->valid) { - return $proc; - } - $proc->processor_usage = self::processData($data, $proc->processor_precision); - } - - d_echo('Discovered ' . static::class . ' ' . print_r($proc->toArray(), true)); - - return $proc; - } - - public static function fromYaml(OS $os, $index, array $data) - { - $precision = empty($data['precision']) ? 1 : $data['precision']; - - return static::discover( - empty($data['type']) ? $os->getName() : $data['type'], - $os->getDeviceId(), - $data['num_oid'], - $data['index'] ?? $index, - empty($data['descr']) ? 'Processor' : trim((string) $data['descr']), - $precision, - self::processData($data['value'], $precision), - $data['warn_percent'] ?? null, - $data['entPhysicalIndex'] ?? null, - $data['hrDeviceIndex'] ?? null - ); - } - - public static function runDiscovery(OS $os) - { - // check yaml first - $processors = self::processYaml($os); - - // if no processors found, check OS discovery (which will fall back to HR and UCD if not implemented - if (empty($processors)) { - $processors = $os->discoverProcessors(); - } - - foreach ($processors as $processor) { - $processor->processor_descr = substr((string) $processor->processor_descr, 0, 64); - $processor->processor_type = substr((string) $processor->processor_type, 0, 16); - } - - if (isset($processors) && is_array($processors)) { - $progress = ProgressList::start('Processors'); - self::sync( - $os->getDeviceId(), - $processors, - ['device_id', 'processor_index', 'processor_type'], - ['processor_usage', 'processor_perc_warn'] - ); - $progress->end(); - } - - \App\Models\Processor::deleteOrphans(); - } - - public static function poll(OS $os) - { - $processors = dbFetchRows('SELECT * FROM processors WHERE device_id=?', [$os->getDeviceId()]); - - if ($os instanceof ProcessorPolling) { - $data = $os->pollProcessors($processors); - } else { - $data = self::pollProcessors($os, $processors); - } - - $rrd_def = RrdDefinition::make()->addDataset('usage', 'GAUGE', -273, 1000); - - foreach ($processors as $processor) { - extract($processor); // extract db fields to variables - /** @var int $processor_id */ - /** @var string $processor_type */ - /** @var int $processor_index */ - /** @var int $processor_usage */ - /** @var string $processor_descr */ - if (array_key_exists($processor_id, $data)) { - $usage = round($data[$processor_id], 2); - Log::info("$processor_descr: $usage%"); - - $rrd_name = ['processor', $processor_type, $processor_index]; - $fields = ['usage' => $usage]; - $tags = ['processor_type' => $processor_type, 'processor_index' => $processor_index, 'rrd_name' => $rrd_name, 'rrd_def' => $rrd_def]; - app('Datastore')->put($os->getDeviceArray(), 'processors', $tags, $fields); - - if ($usage != $processor_usage) { - dbUpdate(['processor_usage' => $usage], 'processors', '`processor_id` = ?', [$processor_id]); - } - } - } - } - - private static function pollProcessors(OS $os, $processors) - { - if (empty($processors)) { - return []; - } - - $oids = array_column($processors, 'processor_oid'); - - // don't fetch too many at a time TODO build into snmp_get_multi_oid? - $snmp_data = []; - foreach (array_chunk($oids, get_device_oid_limit($os->getDeviceArray())) as $oid_chunk) { - $multi_data = snmp_get_multi_oid($os->getDeviceArray(), $oid_chunk); - $snmp_data = array_merge($snmp_data, $multi_data); - } - - d_echo($snmp_data); - - $results = []; - foreach ($processors as $processor) { - if (isset($snmp_data[$processor['processor_oid']])) { - $value = self::processData( - $snmp_data[$processor['processor_oid']], - $processor['processor_precision'] - ); - } else { - $value = 0; - } - - $results[$processor['processor_id']] = $value; - } - - return $results; - } - - private static function processData($data, $precision) - { - if (preg_match('/([0-9]{1,5}(\.[0-9]+)?)/', (string) $data, $matches) !== 1) { - return null; - } - $value = (float) $matches[1]; - - if ($precision < 0) { - // idle value, subtract from 100 - $value = 100 - ($value / ($precision * -1)); - } elseif ($precision > 1) { - $value /= $precision; - } - - return $value; - } - - public static function processYaml(OS $os) - { - $discovery = $os->getDiscovery('processors'); - - if (empty($discovery)) { - d_echo("No YAML Discovery data.\n"); - - return []; - } - - return YamlDiscovery::discover($os, static::class, $discovery); - } - - /** - * Is this sensor valid? - * If not, it should not be added to or in the database - * - * @return bool - */ - public function isValid() - { - return $this->valid; - } - - /** - * Get an array of this sensor with fields that line up with the database. - * - * @param array $exclude exclude columns - * @return array - */ - public function toArray($exclude = []) - { - $array = [ - 'processor_id' => $this->processor_id, - 'entPhysicalIndex' => (int) $this->entPhysicalIndex, - 'hrDeviceIndex' => (int) $this->hrDeviceIndex, - 'device_id' => $this->device_id, - 'processor_oid' => $this->processor_oid, - 'processor_index' => $this->processor_index, - 'processor_type' => $this->processor_type, - 'processor_usage' => $this->processor_usage, - 'processor_descr' => $this->processor_descr, - 'processor_precision' => (int) $this->processor_precision, - 'processor_perc_warn' => (int) $this->processor_perc_warn, - ]; - - return array_diff_key($array, array_flip($exclude)); - } - - /** - * @param static $processor - */ - public static function onCreate($processor) - { - $message = "Processor Discovered: {$processor->processor_type} {$processor->processor_index} {$processor->processor_descr}"; - Eventlog::log($message, $processor->device_id, static::$table, Severity::Notice, $processor->processor_id); - - parent::onCreate($processor); - } - - /** - * @param static $processor - */ - public static function onDelete($processor) - { - $message = "Processor Removed: {$processor->processor_type} {$processor->processor_index} {$processor->processor_descr}"; - Eventlog::log($message, $processor->device_id, static::$table, Severity::Notice, $processor->processor_id); - - parent::onDelete($processor); // TODO: Change the autogenerated stub - } -} diff --git a/LibreNMS/Device/YamlDiscovery.php b/LibreNMS/Device/YamlDiscovery.php index b1d0bf7c1e9..f19581901c9 100644 --- a/LibreNMS/Device/YamlDiscovery.php +++ b/LibreNMS/Device/YamlDiscovery.php @@ -31,7 +31,6 @@ use Illuminate\Support\Arr; use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; -use LibreNMS\Interfaces\Discovery\DiscoveryItem; use LibreNMS\OS; use LibreNMS\Util\Compare; use LibreNMS\Util\IP; @@ -41,86 +40,6 @@ class YamlDiscovery { - /** - * @param OS $os - * @param DiscoveryItem|string $class - * @param array $yaml_data - * @return array - */ - public static function discover(OS $os, $class, $yaml_data) - { - $pre_cache = $os->preCache(); - $items = []; - - // convert to class name for static call below - if (is_object($class)) { - $class = $class::class; - } - - d_echo('YAML Discovery Data: '); - d_echo($yaml_data); - - foreach ($yaml_data as $first_key => $first_yaml) { - if ($first_key == 'pre-cache' || $first_key == 'additional_oids') { - continue; - } - - $group_options = $first_yaml['options'] ?? []; - - // find the data array, we could already be at for simple modules - if (isset($data['data'])) { - $first_yaml = $first_yaml['data']; - } elseif ($first_key !== 'data') { - continue; - } - - foreach ($first_yaml as $data) { - $raw_data = (array) $pre_cache[$data['oid']]; - - d_echo("Data {$data['oid']}: "); - d_echo($raw_data); - - $count = 0; - foreach ($raw_data as $index => $snmp_data) { - $count++; - $current_data = []; - - $data['value'] ??= $data['oid']; - - // determine numeric oid automatically if not specified - if (! isset($data['num_oid'])) { - try { - $data['num_oid'] = static::computeNumericalOID($os, $data); - } catch (\Exception) { - d_echo('Error: We cannot find a numerical OID for ' . $data['value'] . '. Skipping this one...'); - continue; - } - } - - foreach ($data as $name => $value) { - if (! in_array($name, ['oid', 'skip_values', 'snmp_flags', 'rrd_type'])) { - $current_data[$name] = self::fillValues($name, $index, $data, $count, $pre_cache, $value); - } else { - $current_data[$name] = $value; - } - } - - if (static::canSkipItem($current_data['value'], $index, $current_data, $group_options, $snmp_data)) { - continue; - } - - $item = $class::fromYaml($os, $index, $current_data); - - if ($item->isValid()) { - $items[] = $item; - } - } - } - } - - return $items; - } - /** * @param string $name The oid of the value we are searching for * @param int|string $index The index of the current entity we are searching from @@ -156,7 +75,7 @@ public static function computeNumericalOID(OS $os, array $data): string $search_mib = $os->getDiscovery()['mib']; $mib_prefix_data_oid = Str::before($data['oid'], '::'); if (! empty($mib_prefix_data_oid) && empty(Str::before($data['value'], '::'))) { - // We should search value in this mib first, as it is explicitely specified + // We should search value in this mib first, as it is explicitly specified $search_mib = $mib_prefix_data_oid . ':' . $search_mib; } @@ -199,7 +118,7 @@ public static function replaceValues($name, $index, $count, $def, $pre_cache = [ } // if($pre_cache) dd($pre_cache, $def); - $value = (string) (new SimpleTemplate($def[$name] ?? '', $variables))->keepEmptyTemplates(); + $value = (string) new SimpleTemplate($def[$name] ?? '', $variables)->keepEmptyTemplates(); // search discovery data for values $template = new SimpleTemplate($value); @@ -445,12 +364,7 @@ public static function canSkipItem($value, $index, array $yaml_item_data, array } $skip_value_gt = array_replace((array) ($group_options['skip_value_gt'] ?? []), (array) ($yaml_item_data['skip_value_gt'] ?? [])); - foreach ($skip_value_gt as $skip_value) { - if ($value > $skip_value) { - return true; - } - } - return false; + return array_any($skip_value_gt, fn ($skip_value) => $value > $skip_value); } } diff --git a/LibreNMS/Discovery/Neighbors/NeighborFinder.php b/LibreNMS/Discovery/Neighbors/NeighborFinder.php index a22af92c37f..d2549453331 100644 --- a/LibreNMS/Discovery/Neighbors/NeighborFinder.php +++ b/LibreNMS/Discovery/Neighbors/NeighborFinder.php @@ -44,6 +44,8 @@ class NeighborFinder private array $os = []; /** @var array device_id by neighbor identifiers, many neighbors are seen more than once */ private array $deviceIds = []; + /** @var array */ + private array $ipOwners = []; /** * Find a known device, trying the most reliable identifiers first: @@ -51,18 +53,22 @@ class NeighborFinder * 2. management ip: the device's ip or an ip assigned to one of its ports * 3. port mac, then chassis mac: a mac assigned to one of the device's ports * 4. sysName: names are frequently reused or left at defaults, so this is the weakest - * Each identifier must match exactly one device, ambiguous matches fall through to the next identifier. + * Ambiguous IPs restrict MAC/sysName matching to the address owners. Only MAC-less + * CDP/FDP retain the unique direct management match when those names cannot resolve. */ public function findDevice(Neighbor $neighbor): ?Device { - $key = implode('|', [$neighbor->sysName, $neighbor->managementIp, $neighbor->portMac, $neighbor->chassisMac]); + $key = implode('|', [$neighbor->protocol, $neighbor->sysName, $neighbor->managementIp, $neighbor->portMac, $neighbor->chassisMac]); if (! array_key_exists($key, $this->deviceIds)) { - $this->deviceIds[$key] = $this->byHostname($neighbor->sysName) - ?? $this->byIp($neighbor->managementIp) - ?? $this->byMac($neighbor->portMac) - ?? $this->byMac($neighbor->chassisMac) - ?? $this->bySysName($neighbor->sysName); + $nameIp = IP::parse($neighbor->sysName, true); + $ambiguousAddressName = $nameIp !== null + && $nameIp->compressed() === IP::parse($neighbor->managementIp ?? '', true)?->compressed() + && $this->hasAmbiguousIp($neighbor); + + // Repeating a shared management IP as a name adds no independent identity. + $this->deviceIds[$key] = ($ambiguousAddressName ? null : $this->byHostname($neighbor->sysName)) + ?? $this->byNeighborIdentifiers($neighbor, $ambiguousAddressName); } $device_id = $this->deviceIds[$key]; @@ -70,6 +76,35 @@ public function findDevice(Neighbor $neighbor): ?Device return $device_id ? DeviceCache::get($device_id) : null; } + public function hasAmbiguousIp(Neighbor $neighbor): bool + { + return count($this->ipCandidates($neighbor->managementIp)['all']) > 1; + } + + private function byNeighborIdentifiers(Neighbor $neighbor, bool $ambiguousAddressName): ?int + { + $owners = $this->ipCandidates($neighbor->managementIp); + if (count($owners['all']) === 1) { + return $owners['all'][0]; + } + + $candidates = $owners['all'] ?: null; + $match = $this->byMac($neighbor->portMac, $candidates) + ?? $this->byMac($neighbor->chassisMac, $candidates) + ?? ($ambiguousAddressName ? null : $this->bySysName($neighbor->sysName, $candidates)); + + // CDP/FDP parsers generally have only a management IP and a device name. + // Preserve their direct-address fallback, but never apply it to LLDP or + // ignore advertised MAC evidence that failed to identify an IP owner. + if ($match === null && in_array($neighbor->protocol, ['cdp', 'fdp'], true) + && $neighbor->portMac === null && $neighbor->chassisMac === null + && count($owners['direct']) === 1) { + return $owners['direct'][0]; + } + + return $match; + } + /** * Find the neighbor's port on the given device. * The device's OS may resolve its own port names, otherwise generic matching is used. @@ -108,13 +143,16 @@ private function byHostname(string $name): ?int return null; } - private function bySysName(string $name): ?int + /** @param int[]|null $candidates */ + private function bySysName(string $name, ?array $candidates = null): ?int { if ($name === '') { return null; } - $device_ids = Device::query()->whereIn('sysName', $this->nameVariants($name))->limit(2)->pluck('device_id'); + $device_ids = Device::query()->whereIn('sysName', $this->nameVariants($name)) + ->when($candidates !== null, fn ($query) => $query->whereIn('device_id', $candidates)) + ->limit(2)->pluck('device_id'); if ($device_ids->count() > 1) { Log::debug("More than one device found with sysName '$name'"); @@ -125,43 +163,51 @@ private function bySysName(string $name): ?int return $device_ids->first(); } - private function byIp(?string $ip): ?int + /** @return array{all: int[], direct: int[]} */ + private function ipCandidates(?string $ip): array { $ip = $ip === null ? null : IP::parse($ip, true); if ($ip === null) { - return null; + return ['all' => [], 'direct' => []]; } - $device_id = Device::query() - ->where(fn ($query) => $query - ->whereIn('hostname', [$ip->compressed(), $ip->uncompressed()]) - ->orWhere('ip', $ip->packed())) - ->value('device_id'); - - if ($device_id) { - return $device_id; + $key = $ip->compressed(); + if (isset($this->ipOwners[$key])) { + return $this->ipOwners[$key]; } - // ip assigned to a port, only if a single device has it $relation = $ip->getFamily() == 'ipv4' ? 'ipv4' : 'ipv6'; - $device_ids = Port::query() - ->whereHas($relation, fn ($query) => $query->where("{$relation}_address", $ip->uncompressed())) - ->distinct()->limit(2)->pluck('device_id'); + $port_devices = Port::query()->selectRaw('ports.device_id, 0 AS direct') + ->join("{$relation}_addresses", 'ports.port_id', '=', "{$relation}_addresses.port_id") + ->where("{$relation}_address", $ip->uncompressed()) + ->isNotDeleted()->distinct(); - return $device_ids->count() == 1 ? $device_ids->first() : null; + // Keep every distinct owner so a third candidate can still be disambiguated. + $owners = Device::query()->selectRaw('device_id, 1 AS direct') + ->where(fn ($query) => $query + ->whereIn('hostname', [$ip->compressed(), $ip->uncompressed()]) + ->orWhere('ip', $ip->packed())) + ->union($port_devices)->toBase()->get(); + + return $this->ipOwners[$key] = [ + 'all' => $owners->pluck('device_id')->unique()->values()->all(), + 'direct' => $owners->where('direct', 1)->pluck('device_id')->all(), + ]; } /** * Find a device with a port that has this mac, only if a single device has it */ - private function byMac(?string $mac): ?int + private function byMac(?string $mac, ?array $candidates = null): ?int { if ($mac === null) { return null; } - $device_ids = Port::query()->where('ifPhysAddress', $mac)->distinct()->limit(2)->pluck('device_id'); + $device_ids = Port::query()->where('ifPhysAddress', $mac)->isNotDeleted() + ->when($candidates !== null, fn ($query) => $query->whereIn('device_id', $candidates)) + ->distinct()->limit(2)->pluck('device_id'); return $device_ids->count() == 1 ? $device_ids->first() : null; } diff --git a/LibreNMS/Discovery/Yaml/YamlDiscoveryField.php b/LibreNMS/Discovery/Yaml/YamlDiscoveryField.php index a7115000c3d..d8506ff0252 100644 --- a/LibreNMS/Discovery/Yaml/YamlDiscoveryField.php +++ b/LibreNMS/Discovery/Yaml/YamlDiscoveryField.php @@ -50,6 +50,8 @@ public function calculateValue(array $yaml, array $data, string $index, int $cou { if (array_key_exists($this->key, $yaml)) { $key = $this->key; + } elseif ($this->key === 'value' && ! array_key_exists('value', $yaml) && array_key_exists('oid', $yaml)) { + $key = 'oid'; } else { $key = is_int($this->default) ? $this->default : (string) $this->default; $yaml = [$key => $this->default]; @@ -74,6 +76,29 @@ public function calculateValue(array $yaml, array $data, string $index, int $cou $this->setValue($value); } + /** + * Get the numeric oid field name in yaml and the numeric oid database column name + * + * @return string[] + */ + public function getNumericNames(): array + { + if ($this->key === 'value') { + // only one oid + $prefix = strstr($this->model_column, '_', true) ?: $this->model_column; + + return [ + 'num_oid', + $prefix . '_oid', + ]; + } + + return [ + $this->key . '_num_oid', + $this->model_column . '_oid', + ]; + } + private function setValue(mixed $value): void { if (is_callable($this->callback)) { diff --git a/LibreNMS/Discovery/YamlDiscoveryDefinition.php b/LibreNMS/Discovery/YamlDiscoveryDefinition.php index 3e5b564b1a3..c76cf8e9e6d 100644 --- a/LibreNMS/Discovery/YamlDiscoveryDefinition.php +++ b/LibreNMS/Discovery/YamlDiscoveryDefinition.php @@ -30,6 +30,7 @@ use App\View\SimpleTemplate; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; +use LibreNMS\Data\Source\Snmp\SnmpQueryInterface; use LibreNMS\Device\YamlDiscovery; use LibreNMS\Discovery\Yaml\YamlDiscoveryField; use LibreNMS\Exceptions\InvalidOidException; @@ -116,20 +117,12 @@ public function discover($yaml, $attributes = []): Collection $snmp_data = []; if (! empty($numeric_oids)) { - $snmpQuery = SnmpQuery::numeric(); - if (isset($yamlItem['snmp_flags'])) { - $snmpQuery->options($yamlItem['snmp_flags']); - } - $snmp_data = $snmpQuery->get($numeric_oids)->values(); + $snmp_data = $this->snmpQuery($yamlItem)->numeric()->get($numeric_oids)->values(); $fetchedData = array_merge($fetchedData, $snmp_data); } if (! empty($oids)) { - $snmpQuery = SnmpQuery::enumStrings()->numericIndex(); - if (isset($yamlItem['snmp_flags'])) { - $snmpQuery->options($yamlItem['snmp_flags']); - } - $response = $snmpQuery->walk($oids); + $response = $this->snmpQuery($yamlItem, enumStrings: true)->walk($oids); $response->valuesByIndex($snmp_data); // load into the $snmp_data array $response->valuesByIndex($fetchedData); // load into the $fetchedData array } @@ -137,7 +130,8 @@ public function discover($yaml, $attributes = []): Collection $count = 0; foreach ($snmp_data as $index => $snmpItem) { - if (YamlDiscovery::canSkipItem(null, $index, $yamlItem, $yaml, $fetchedData)) { + $rawSingleValue = $snmpItem[$yamlItem['value'] ?? $yamlItem['oid'] ?? ''] ?? null; + if (YamlDiscovery::canSkipItem($rawSingleValue, $index, $yamlItem, $yaml, $fetchedData)) { Log::debug('Data at index ' . $index . ' skipped due to skip_values'); Log::info('x'); continue; @@ -149,8 +143,10 @@ public function discover($yaml, $attributes = []): Collection /** @var YamlDiscoveryField $field */ foreach ($this->fields as $field) { // fill attributes - $field->calculateValue($yamlItem, $fetchedData, $index, $count); - $modelAttributes[$field->model_column] = $field->value; + if ($field->model_column !== null) { + $field->calculateValue($yamlItem, $fetchedData, $index, $count); + $modelAttributes[$field->model_column] = $field->value; + } } // if no pollable oid found, skip this index @@ -184,13 +180,24 @@ private function preFetch(array $yaml): array Eventlog::log('This device discovery yaml is using deprecated pre-cache key, use additional_oids instead. pre-cache will be removed in a future version.'); } - $query = SnmpQuery::enumStrings()->numericIndex(); + return $this->snmpQuery($data, enumStrings: true)->walk($data['oids'])->valuesByIndex(); + } - if (isset($data['snmp_flags'])) { - $query->options($data['snmp_flags']); + /** + * Build an snmp query for a yaml section. Indexes are numeric (so numeric oids can be built from them) unless + * snmp_flags override the options. Display hints are always disabled to match the raw values seen when polling. + * + * @param array{snmp_flags?: string|string[]} $yaml + */ + private function snmpQuery(array $yaml, bool $enumStrings = false): SnmpQueryInterface + { + if (isset($yaml['snmp_flags'])) { + return SnmpQuery::options($yaml['snmp_flags'])->displayHints(false); } - return $query->walk($data['oids'])->valuesByIndex(); + $query = $enumStrings ? SnmpQuery::enumStrings() : SnmpQuery::make(); + + return $query->numericIndex()->displayHints(false); } private function fillNumericOids(array &$modelAttributes, array $yaml, int|string $index): bool @@ -200,12 +207,11 @@ private function fillNumericOids(array &$modelAttributes, array $yaml, int|strin foreach ($this->fields as $field) { if ($field->isOid) { $num_oid = null; + [$field_name, $column_name] = $field->getNumericNames(); if (call_user_func($field->should_poll, $this)) { - $yaml_num_oid_field_name = $field->key . '_num_oid'; - - if (isset($yaml[$yaml_num_oid_field_name])) { - $num_oid = SimpleTemplate::parse($yaml[$yaml_num_oid_field_name], ['index' => $index]); + if (isset($yaml[$field_name])) { + $num_oid = SimpleTemplate::parse($yaml[$field_name], ['index' => $index]); $num_oid_found = true; } elseif (isset($yaml[$field->key])) { if (Oid::of($yaml[$field->key])->isNumeric()) { @@ -213,7 +219,7 @@ private function fillNumericOids(array &$modelAttributes, array $yaml, int|strin $num_oid = $yaml[$field->key]; $num_oid_found = true; } else { - Log::debug("$yaml_num_oid_field_name should be added to the discovery yaml to increase discovery performance"); + Log::debug("$field_name should be added to the discovery yaml to increase discovery performance"); try { // if index is numeric, exclude it so we can cache the translation if (Oid::of($index)->isNumeric()) { @@ -230,7 +236,7 @@ private function fillNumericOids(array &$modelAttributes, array $yaml, int|strin } } - $modelAttributes[$field->model_column . '_oid'] = $num_oid; + $modelAttributes[$column_name] = $num_oid; } } diff --git a/LibreNMS/Enum/DeviceType.php b/LibreNMS/Enum/DeviceType.php new file mode 100644 index 00000000000..7993169a56a --- /dev/null +++ b/LibreNMS/Enum/DeviceType.php @@ -0,0 +1,68 @@ +value); + } + + /** + * Configured icon per device type, keyed by type + * + * @return array + */ + public static function icons(): array + { + $icons = []; + foreach (LibrenmsConfig::get('device_types', []) as $type => $icon) { + // legacy list format: [['type' => 'x', 'icon' => 'y']] + if (is_array($icon)) { + if (isset($icon['type'], $icon['icon'])) { + $icons[$icon['type']] = $icon['icon']; + } + + continue; + } + + $icons[$type] = $icon; + } + + return $icons; + } + + /** + * Display name for any type string, including user defined types + */ + public static function labelFor(string $type): string + { + return self::tryFrom($type)?->label() ?? ucfirst($type); + } +} diff --git a/LibreNMS/Enum/ImageFormat.php b/LibreNMS/Enum/ImageFormat.php index 586f01dcf55..5c895269099 100644 --- a/LibreNMS/Enum/ImageFormat.php +++ b/LibreNMS/Enum/ImageFormat.php @@ -38,7 +38,7 @@ public static function forGraph(?string $type = null): ImageFormat return ImageFormat::tryFrom($type ?? LibrenmsConfig::get('webui.graph_type')) ?? ImageFormat::Png; } - public function contentType(): string + public function mediaType(): string { return $this->value == 'svg' ? 'image/svg+xml' : 'image/png'; } diff --git a/LibreNMS/Enum/PollingMethodType.php b/LibreNMS/Enum/PollingMethodType.php index 6653d185d5c..d3e82ae26a2 100644 --- a/LibreNMS/Enum/PollingMethodType.php +++ b/LibreNMS/Enum/PollingMethodType.php @@ -2,12 +2,19 @@ namespace LibreNMS\Enum; +use LibreNMS\Traits\HasUnknownCase; + enum PollingMethodType: string { + use HasUnknownCase; + case Icmp = 'icmp'; case Ipmi = 'ipmi'; + case ProxmoxApi = 'proxmox-api'; case Snmp = 'snmp'; case UnixAgent = 'unix-agent'; + /** Stored types this version does not know, such as ones from a development branch */ + case Unknown = 'unknown'; public function label(): string { diff --git a/LibreNMS/Enum/PowerState.php b/LibreNMS/Enum/PowerState.php index a6ac43743b9..05dcdfc72f7 100644 --- a/LibreNMS/Enum/PowerState.php +++ b/LibreNMS/Enum/PowerState.php @@ -27,16 +27,13 @@ abstract class PowerState const SUSPENDED = 2; const UNKNOWN = 3; - const STATES = [ - 'powered off' => self::OFF, - 'poweredoff' => self::OFF, - 'shut off' => self::OFF, - - 'powered on' => self::ON, - 'poweredon' => self::ON, - 'running' => self::ON, - - 'suspended' => self::SUSPENDED, - 'paused' => self::SUSPENDED, - ]; + public static function parse(string $state): int + { + return match (strtolower($state)) { + 'powered off', 'poweredoff', 'shut off', 'stopped' => self::OFF, + 'powered on', 'poweredon', 'running' => self::ON, + 'suspended', 'paused' => self::SUSPENDED, + default => self::UNKNOWN, + }; + } } diff --git a/LibreNMS/Enum/SecretType.php b/LibreNMS/Enum/SecretType.php index 428963acbdd..71c612b81c9 100644 --- a/LibreNMS/Enum/SecretType.php +++ b/LibreNMS/Enum/SecretType.php @@ -26,14 +26,35 @@ namespace LibreNMS\Enum; +use LibreNMS\Polling\Secrets\Data\IpmiSecretData; +use LibreNMS\Polling\Secrets\Data\ProxmoxApiSecretData; +use LibreNMS\Polling\Secrets\Data\SecretData; +use LibreNMS\Polling\Secrets\Data\SnmpCommunitySecretData; +use LibreNMS\Polling\Secrets\Data\SnmpV3SecretData; +use LibreNMS\Polling\Secrets\Data\UnknownSecretData; use LibreNMS\Polling\Secrets\Definitions\IpmiSecretDefinition; +use LibreNMS\Polling\Secrets\Definitions\ProxmoxApiSecretDefinition; use LibreNMS\Polling\Secrets\Definitions\SecretDefinition; -use LibreNMS\Polling\Secrets\Definitions\SnmpSecretDefinition; +use LibreNMS\Polling\Secrets\Definitions\SnmpCommunitySecretDefinition; +use LibreNMS\Polling\Secrets\Definitions\SnmpV3SecretDefinition; +use LibreNMS\Polling\Secrets\Definitions\UnknownSecretDefinition; +use LibreNMS\Traits\HasUnknownCase; enum SecretType: string { - case Snmp = 'snmp'; + use HasUnknownCase; + + case SnmpCommunity = 'snmp-community'; + case SnmpV3 = 'snmp-v3'; case Ipmi = 'ipmi'; + case ProxmoxApi = 'proxmox-api'; + /** Stored types this version does not know, such as ones from a development branch */ + case Unknown = 'unknown'; + + public function label(): string + { + return __('poller.secret_types.' . $this->value); + } /** * The fields (form, validation rules) of this secret type. @@ -41,8 +62,27 @@ enum SecretType: string public function definition(): SecretDefinition { return match ($this) { - self::Snmp => new SnmpSecretDefinition, + self::SnmpCommunity => new SnmpCommunitySecretDefinition, + self::SnmpV3 => new SnmpV3SecretDefinition, self::Ipmi => new IpmiSecretDefinition, + self::ProxmoxApi => new ProxmoxApiSecretDefinition, + self::Unknown => new UnknownSecretDefinition, + }; + } + + /** + * The typed data of a secret of this type. + * + * @param array $data + */ + public function data(array $data): SecretData + { + return match ($this) { + self::SnmpCommunity => SnmpCommunitySecretData::fromArray($data), + self::SnmpV3 => SnmpV3SecretData::fromArray($data), + self::Ipmi => IpmiSecretData::fromArray($data), + self::ProxmoxApi => ProxmoxApiSecretData::fromArray($data), + self::Unknown => new UnknownSecretData($data), }; } } diff --git a/LibreNMS/Enum/SensorCategory.php b/LibreNMS/Enum/SensorCategory.php index e74a08c4754..374b7c3917b 100644 --- a/LibreNMS/Enum/SensorCategory.php +++ b/LibreNMS/Enum/SensorCategory.php @@ -11,16 +11,22 @@ enum SensorCategory: string { use EnumToArray; + case AccessPoint = 'access-point'; + case Cluster = 'cluster'; + case License = 'license'; case Stack = 'stack'; - public function label(): string + public function label(int $count = 1): string { - return __("sensors.category.$this->value"); + return trans_choice("sensors.category.$this->value", $count); } public function icon(): string { return match ($this) { + self::AccessPoint => 'wifi', + self::Cluster => 'sitemap', + self::License => 'key', self::Stack => 'th-large', }; } diff --git a/LibreNMS/Enum/SensorState.php b/LibreNMS/Enum/SensorState.php index 0a41209d8c9..25c97a41609 100644 --- a/LibreNMS/Enum/SensorState.php +++ b/LibreNMS/Enum/SensorState.php @@ -8,4 +8,24 @@ enum SensorState: int case Warning = 1; case Error = 2; case Unknown = 3; + + public static function fromDescr(string $descr): Severity + { + return match ($descr) { + 'On', 'Okay', 'Ok' => Severity::Ok, + 'Standby', 'Idle', 'Maintenance' => Severity::Warning, + 'Under', 'Over' => Severity::Error, + default => Severity::Unknown, + }; + } + + public function toSeverity(): Severity + { + return match ($this) { + self::Ok => Severity::Ok, + self::Warning => Severity::Warning, + self::Error => Severity::Error, + self::Unknown => Severity::Unknown, + }; + } } diff --git a/LibreNMS/Enum/Severity.php b/LibreNMS/Enum/Severity.php index 03545bac1af..112ee9a1ef1 100644 --- a/LibreNMS/Enum/Severity.php +++ b/LibreNMS/Enum/Severity.php @@ -23,4 +23,21 @@ public static function fromAlertRule(?string $severity): self default => self::Unknown, }; } + + /** + * Convert the severity to the matching SensorState. + * Derived from SensorState::toSeverity() to keep a single source of truth. + * + * @throws \Exception If the severity is not supported for state sensors + */ + public function toSensorState(): SensorState + { + foreach (SensorState::cases() as $state) { + if ($state->toSeverity() === $this) { + return $state; + } + } + + throw new \Exception("Severity $this->name is not supported for state sensors"); + } } diff --git a/LibreNMS/Exceptions/DatabaseInconsistentException.php b/LibreNMS/Exceptions/DatabaseInconsistentException.php index c043f2f33c4..c3d2594fc31 100644 --- a/LibreNMS/Exceptions/DatabaseInconsistentException.php +++ b/LibreNMS/Exceptions/DatabaseInconsistentException.php @@ -54,7 +54,7 @@ public static function upgrade(Throwable $exception): ?static if ($exception instanceof QueryException || $exception->getPrevious() instanceof QueryException) { try { $validator = new Validator(); - (new Database())->validate($validator); + new Database()->validate($validator); // get only failed results $results = array_filter($validator->getResults('database'), fn (ValidationResult $result) => $result->getStatus() === ValidationResult::FAILURE); diff --git a/LibreNMS/Exceptions/GraphException.php b/LibreNMS/Exceptions/GraphException.php new file mode 100644 index 00000000000..3ffea1ca538 --- /dev/null +++ b/LibreNMS/Exceptions/GraphException.php @@ -0,0 +1,26 @@ +image_output; - } - - public function generateErrorImage(): string - { - return Graph::error( - $this->getMessage(), - $this->short_text, - empty($this->width) ? 300 : (int) $this->width, - empty($this->height) ? null : (int) $this->height, - ); - } } diff --git a/LibreNMS/Exceptions/RrdSourceException.php b/LibreNMS/Exceptions/RrdSourceException.php new file mode 100644 index 00000000000..dfd294f00a1 --- /dev/null +++ b/LibreNMS/Exceptions/RrdSourceException.php @@ -0,0 +1,10 @@ +id has the type {$secret->typeName()}, which this version of LibreNMS does not know."); + } +} diff --git a/LibreNMS/IRCBot.php b/LibreNMS/IRCBot.php index 491ba2bc1ba..4fe58e92be5 100644 --- a/LibreNMS/IRCBot.php +++ b/LibreNMS/IRCBot.php @@ -802,7 +802,8 @@ private function _log($params) /** @var Eventlog $logline */ foreach ($tmp as $logline) { $response = $logline->datetime . ' '; - $response .= $this->_color($logline->device->displayName(), null, null, 'bold') . ' '; + $device = $logline->device; + $response .= $this->_color($device->display, null, null, 'bold') . ' '; if ($this->config['irc_alert_utf8']) { if (preg_match('/critical alert/', (string) $logline->message)) { $response .= preg_replace('/critical alert/', (string) $this->_color('critical alert', 'red'), (string) $logline->message) . ' '; @@ -844,9 +845,9 @@ private function _log($params) private function _down($params) { $devices = Device::hasAccess($this->user['user'])->isDown() - ->select(['device_id', 'hostname', 'sysName', 'display', 'ip'])->get(); + ->select(['device_id', 'display'])->get(); - $msg = $devices->map->displayName()->implode(', '); + $msg = $devices->pluck('display')->implode(', '); return $this->respond($msg ?: 'Nothing to show :)'); } @@ -866,7 +867,7 @@ private function _device($params) $status .= $device->ignore ? '*Ignored*' : ''; $status .= $device->disabled ? '*Disabled*' : ''; - return $this->respond($device->displayName() . ': ' . $device->os . ' ' . $device->version . ' ' . $device->features . ' ' . $status); + return $this->respond($device->display . ': ' . $device->os . ' ' . $device->version . ' ' . $device->features . ' ' . $status); } //end _device() diff --git a/LibreNMS/Interfaces/ConfigBackupProvider.php b/LibreNMS/Interfaces/ConfigBackupProvider.php index c7fbbc84293..85c3ad19b87 100644 --- a/LibreNMS/Interfaces/ConfigBackupProvider.php +++ b/LibreNMS/Interfaces/ConfigBackupProvider.php @@ -43,7 +43,7 @@ public function supportsDevice(Device $device): bool; public function name(): string; /** - * @return array{backups: list, total: int, totalPages: int, page: int}|null + * @return array{backups: list, total: int, totalPages: int, page: int}|null */ public function backups(Device $device, int $page = 0): ?array; diff --git a/LibreNMS/Interfaces/Data/DataStorageInterface.php b/LibreNMS/Interfaces/Data/DataStorageInterface.php index 844be82bee0..b1697283d55 100644 --- a/LibreNMS/Interfaces/Data/DataStorageInterface.php +++ b/LibreNMS/Interfaces/Data/DataStorageInterface.php @@ -13,7 +13,7 @@ interface DataStorageInterface * rrd_oldname array|string: old rrd filename to rename, will be processed with rrd_name() * rrd_step int: rrd step, defaults to 300 * - * @param array $device + * @param array|\App\Models\Device $device * @param string $measurement Name of this measurement * @param array $tags tags for the data (or to control rrdtool) * @param array|mixed $fields The data to update in an associative array, the order must be consistent with rrd_def, diff --git a/LibreNMS/Interfaces/Data/Graphing/GraphInterface.php b/LibreNMS/Interfaces/Data/Graphing/GraphInterface.php new file mode 100644 index 00000000000..dd13f244668 --- /dev/null +++ b/LibreNMS/Interfaces/Data/Graphing/GraphInterface.php @@ -0,0 +1,46 @@ + $peers discovered sessions + * @return Collection + * + * @throws SnmpException when the device did not answer, existing address families are kept + */ + public function discoverBgpAddressFamilies(Collection $peers): Collection; +} diff --git a/LibreNMS/Interfaces/Discovery/BgpPeerDiscovery.php b/LibreNMS/Interfaces/Discovery/BgpPeerDiscovery.php new file mode 100644 index 00000000000..7797f19f6ed --- /dev/null +++ b/LibreNMS/Interfaces/Discovery/BgpPeerDiscovery.php @@ -0,0 +1,28 @@ +getDevice()->getVrfContexts(). + * Set context_name to the context the session was read from and vrf_id to its VRF. + * Call throwIfConnectionError() on the queries that list the sessions, so a device that did not + * answer is not mistaken for a device without sessions. + * + * @return Collection + * + * @throws SnmpException when the device did not answer, existing sessions are kept + */ + public function discoverBgpPeers(): Collection; + + /** + * The local AS of the device, null if it is not known + */ + public function discoverBgpLocalAs(): ?int; +} diff --git a/LibreNMS/Interfaces/Discovery/DiscoveryItem.php b/LibreNMS/Interfaces/Discovery/DiscoveryItem.php deleted file mode 100644 index 9d0589e5c16..00000000000 --- a/LibreNMS/Interfaces/Discovery/DiscoveryItem.php +++ /dev/null @@ -1,33 +0,0 @@ - + */ + public function discoverFdbTable(): Collection; +} diff --git a/LibreNMS/Interfaces/Discovery/DiscoveryModule.php b/LibreNMS/Interfaces/Discovery/MefDiscovery.php similarity index 66% rename from LibreNMS/Interfaces/Discovery/DiscoveryModule.php rename to LibreNMS/Interfaces/Discovery/MefDiscovery.php index 401a904ebeb..4af3465e200 100644 --- a/LibreNMS/Interfaces/Discovery/DiscoveryModule.php +++ b/LibreNMS/Interfaces/Discovery/MefDiscovery.php @@ -1,9 +1,9 @@ */ namespace LibreNMS\Interfaces\Discovery; -use LibreNMS\OS; +use App\Models\MefInfo; +use Illuminate\Support\Collection; -interface DiscoveryModule +interface MefDiscovery { - public static function runDiscovery(OS $os); + /** + * Discover MEF EVCs and return a Collection of MefInfo models. + * Returns null if the device did not answer, so existing EVCs are kept. + * + * @return Collection|null + */ + public function discoverMef(): ?Collection; } diff --git a/LibreNMS/Interfaces/Discovery/ProcessorDiscovery.php b/LibreNMS/Interfaces/Discovery/ProcessorDiscovery.php index 3e0a3a297bd..b319ba9652f 100644 --- a/LibreNMS/Interfaces/Discovery/ProcessorDiscovery.php +++ b/LibreNMS/Interfaces/Discovery/ProcessorDiscovery.php @@ -26,13 +26,17 @@ namespace LibreNMS\Interfaces\Discovery; +use App\Models\Processor; +use Illuminate\Support\Collection; + interface ProcessorDiscovery { /** * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered + * Returns a Collection of Processor models that have been discovered. + * Processors without a usage value are discarded. * - * @return array Processors + * @return Collection */ - public function discoverProcessors(); + public function discoverProcessors(): Collection; } diff --git a/LibreNMS/Interfaces/Discovery/VminfoDiscovery.php b/LibreNMS/Interfaces/Discovery/VminfoDiscovery.php index b57f18d4824..dc3ed2a25e8 100644 --- a/LibreNMS/Interfaces/Discovery/VminfoDiscovery.php +++ b/LibreNMS/Interfaces/Discovery/VminfoDiscovery.php @@ -28,8 +28,9 @@ use App\Models\Vminfo; use Illuminate\Support\Collection; +use LibreNMS\Interfaces\VminfoSource; -interface VminfoDiscovery +interface VminfoDiscovery extends VminfoSource { /** * Discover all the VMs and return a collection of Vminfo models diff --git a/LibreNMS/Interfaces/Discovery/VrfDiscovery.php b/LibreNMS/Interfaces/Discovery/VrfDiscovery.php new file mode 100644 index 00000000000..4537342a729 --- /dev/null +++ b/LibreNMS/Interfaces/Discovery/VrfDiscovery.php @@ -0,0 +1,23 @@ + + * + * @throws SnmpException when the device did not answer, existing VRFs are kept + */ + public function discoverVrfs(): Collection; +} diff --git a/LibreNMS/Interfaces/Discovery/VrfPortDiscovery.php b/LibreNMS/Interfaces/Discovery/VrfPortDiscovery.php new file mode 100644 index 00000000000..15ed4c6b53c --- /dev/null +++ b/LibreNMS/Interfaces/Discovery/VrfPortDiscovery.php @@ -0,0 +1,21 @@ + $vrfs saved VRFs + * @return Collection + * + * @throws SnmpException when the device did not answer, existing members are kept + */ + public function discoverVrfPorts(Collection $vrfs): Collection; +} diff --git a/LibreNMS/Interfaces/Models/HasMetrics.php b/LibreNMS/Interfaces/Models/HasMetrics.php new file mode 100644 index 00000000000..59a427aecfa --- /dev/null +++ b/LibreNMS/Interfaces/Models/HasMetrics.php @@ -0,0 +1,13 @@ + */ - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool; + public function pollingMethods(Device $device): array; /** - * Should polling run for this device? + * Should discovery run for this device? Only called when the module is enabled. */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool; + public function shouldDiscover(OS $os): bool; + + /** + * Should polling run for this device? Only called when the module is enabled. + */ + public function shouldPoll(OS $os): bool; /** * Discover this module. Heavier processes can be run here @@ -62,10 +70,11 @@ public function discover(OS $os): void; * Try to keep this efficient and only run if discovery has indicated there is a reason to run. * Run frequently (default every 5 minutes) * + * Modules may declare just the interface they use, new code should use WriteInterface. + * * @param OS $os - * @param DataStorageInterface $datastore */ - public function poll(OS $os, DataStorageInterface $datastore): void; + public function poll(OS $os, DataStorageInterface&WriteInterface $datastore): void; /** * Check if data exists for this module diff --git a/LibreNMS/Interfaces/Polling/PollerModule.php b/LibreNMS/Interfaces/Polling/MefPolling.php similarity index 64% rename from LibreNMS/Interfaces/Polling/PollerModule.php rename to LibreNMS/Interfaces/Polling/MefPolling.php index 0d6ce92908c..44b3d72e741 100644 --- a/LibreNMS/Interfaces/Polling/PollerModule.php +++ b/LibreNMS/Interfaces/Polling/MefPolling.php @@ -1,9 +1,9 @@ */ namespace LibreNMS\Interfaces\Polling; -use LibreNMS\OS; +use App\Models\MefInfo; +use Illuminate\Support\Collection; -interface PollerModule +interface MefPolling { - public static function poll(OS $os); + /** + * Poll the given MEF EVCs and update their attributes. + * EVCs the device no longer reports are left unchanged. + * + * @param Collection $mefs + * @return Collection + */ + public function pollMef(Collection $mefs): Collection; } diff --git a/LibreNMS/Interfaces/Polling/MempoolsPolling.php b/LibreNMS/Interfaces/Polling/MempoolsPolling.php index ab27cd821f6..c2580941465 100644 --- a/LibreNMS/Interfaces/Polling/MempoolsPolling.php +++ b/LibreNMS/Interfaces/Polling/MempoolsPolling.php @@ -31,8 +31,10 @@ interface MempoolsPolling { /** + * Update the usage of mempools this source discovered. + * * @param Collection $mempools - * @return Collection + * @return Collection the mempools that were polled */ - public function pollMempools(Collection $mempools); + public function pollMempools(Collection $mempools): Collection; } diff --git a/LibreNMS/Interfaces/Polling/ProcessorPolling.php b/LibreNMS/Interfaces/Polling/ProcessorPolling.php index c61c0cf250d..4b31e294755 100644 --- a/LibreNMS/Interfaces/Polling/ProcessorPolling.php +++ b/LibreNMS/Interfaces/Polling/ProcessorPolling.php @@ -26,13 +26,18 @@ namespace LibreNMS\Interfaces\Polling; +use App\Models\Processor; +use Illuminate\Support\Collection; + interface ProcessorPolling { /** * Poll processor data. This can be implemented if custom polling is needed. * - * @param array $processors Array of processor entries from the database that need to be polled - * @return array of polled data + * Set processor_usage on each processor (raw value, precision is applied by the model). Leave it null if polling failed. + * + * @param Collection $processors Processors from the database that need to be polled, processor_usage is null + * @return Collection */ - public function pollProcessors(array $processors); + public function pollProcessors(Collection $processors): Collection; } diff --git a/LibreNMS/Interfaces/Polling/VminfoPolling.php b/LibreNMS/Interfaces/Polling/VminfoPolling.php index b2e6318d271..4c423ba78ac 100644 --- a/LibreNMS/Interfaces/Polling/VminfoPolling.php +++ b/LibreNMS/Interfaces/Polling/VminfoPolling.php @@ -26,16 +26,19 @@ namespace LibreNMS\Interfaces\Polling; +use App\Data\TimeSeries\MetricCollector; use App\Models\Vminfo; use Illuminate\Support\Collection; +use LibreNMS\Interfaces\VminfoSource; -interface VminfoPolling +interface VminfoPolling extends VminfoSource { /** * Poll the given VMs * - * @param Collection $vms - * @return Collection + * @param Collection $vms + * @param MetricCollector $metrics + * @return Collection */ - public function pollVminfo(Collection $vms): Collection; + public function pollVminfo(Collection $vms, MetricCollector $metrics): Collection; } diff --git a/LibreNMS/Interfaces/Polling/VrfPolling.php b/LibreNMS/Interfaces/Polling/VrfPolling.php new file mode 100644 index 00000000000..05513248147 --- /dev/null +++ b/LibreNMS/Interfaces/Polling/VrfPolling.php @@ -0,0 +1,20 @@ + $vrfs + * @return Collection + * + * @throws SnmpException when the device did not answer, existing VRFs are kept + */ + public function pollVrfs(Collection $vrfs): Collection; +} diff --git a/LibreNMS/Interfaces/RemovesMethodData.php b/LibreNMS/Interfaces/RemovesMethodData.php new file mode 100644 index 00000000000..5ca7942d10c --- /dev/null +++ b/LibreNMS/Interfaces/RemovesMethodData.php @@ -0,0 +1,17 @@ + + */ + public function clusterVms(): Collection; + + /** + * The VMs on this node. Unsaved, with only what identifies them. + * + * @return Collection + */ + public function localVms(): Collection; +} diff --git a/LibreNMS/Interfaces/VminfoMetricSource.php b/LibreNMS/Interfaces/VminfoMetricSource.php new file mode 100644 index 00000000000..6fcb734bd4c --- /dev/null +++ b/LibreNMS/Interfaces/VminfoMetricSource.php @@ -0,0 +1,10 @@ +fill($data); - - return $instance; - } - - protected function fill(array $data = []) - { - foreach ($data as $field => $value) { - $this->$field = $value; - } - } - - /** - * Save Models and remove invalid Models - * This the sensors array should contain all the sensors of a specific class - * It may contain sensors from multiple tables and devices, but that isn't the primary use - * - * @param int $device_id - * @param array $models - * @param array $unique_fields fields to search for an existing entry - * @param array $ignored_update_fields Don't compare these field when updating - */ - final public static function sync($device_id, array $models, $unique_fields = [], $ignored_update_fields = []) - { - // save and collect valid ids - $valid_ids = []; - foreach ($models as $model) { - /** @var $this $model */ - if ($model->isValid()) { - $valid_ids[] = $model->save($unique_fields, $ignored_update_fields); - } - } - - // delete invalid sensors - self::clean($device_id, $valid_ids); - } - - /** - * Remove invalid Models. Passing an empty array will remove all models related to $device_id - * - * @param int $device_id - * @param array $model_ids valid Model ids - */ - protected static function clean($device_id, $model_ids) - { - $table = static::$table; - $key = static::$primaryKey; - - $params = [$device_id]; - $where = '`device_id`=?'; - - if (! empty($model_ids)) { - $where .= " AND `$key` NOT IN " . dbGenPlaceholders(count($model_ids)); - $params = array_merge($params, $model_ids); - } - - $rows = dbFetchRows("SELECT * FROM `$table` WHERE $where", $params); - foreach ($rows as $row) { - static::onDelete(static::create($row)); - } - if (! empty($rows)) { - DB::table($table)->whereRaw($where, $params)->delete(); - } - } - - /** - * Save this Model to the database. - * - * @param array $unique_fields fields to search for an existing entry - * @param array $ignored_update_fields Don't compare these field when updating - * @return int the id of this model in the database - */ - final public function save($unique_fields = [], $ignored_update_fields = []) - { - $db_model = $this->fetch($unique_fields); - $key = static::$primaryKey; - - if ($db_model) { - $new_model = $this->toArray(array_merge([$key], $ignored_update_fields)); - $update = array_diff($new_model, $db_model); - - if (empty($update)) { - static::onNoUpdate(); - } else { - dbUpdate($update, static::$table, "`$key`=?", [$this->$key]); - static::onUpdate($this); - } - } else { - $new_model = $this->toArray([$key]); - $this->$key = dbInsert($new_model, static::$table); - if ($this->$key !== null) { - static::onCreate($this); - } - } - - return $this->$key; - } - - /** - * Fetch the sensor from the database. - * If it doesn't exist, returns null. - * - * @param array $unique_fields fields to search for an existing entry - * @return array|null - */ - protected function fetch($unique_fields = []) - { - $table = static::$table; - $key = static::$primaryKey; - - if (isset($this->id)) { - return dbFetchRow( - "SELECT `$table` FROM ? WHERE `$key`=?", - [$this->$key] - ); - } - - $where = []; - $params = []; - foreach ($unique_fields as $field) { - if (isset($this->$field)) { - $where[] = " $field=?"; - $params[] = $this->$field; - } - } - - if (empty($params)) { - return null; - } - - $row = dbFetchRow( - "SELECT * FROM `$table` WHERE " . implode(' AND', $where), - $params - ); - - if (is_array($row)) { - $this->$key = $row[$key]; - - return $row; - } - - return null; - } - - /** - * Convert this Model to an array with fields that match the database - * - * @param array $exclude Exclude the listed fields - * @return array - */ - abstract public function toArray($exclude = []); - - /** - * Returns if this model passes validation and should be saved to the database - * - * @return bool - */ - abstract public function isValid(); - - /** - * @param static $model - */ - public static function onDelete($model) - { - if (app()->runningInConsole()) { - Log::info('-', ['nlb' => true]); - } - } - - /** - * @param static $model - */ - public static function onCreate($model) - { - if (app()->runningInConsole()) { - Log::info('+', ['nlb' => true]); - } - } - - /** - * @param static $model - */ - public static function onUpdate($model) - { - if (app()->runningInConsole()) { - Log::info('U', ['nlb' => true]); - } - } - - public static function onNoUpdate() - { - if (app()->runningInConsole()) { - Log::info('.', ['nlb' => true]); - } - } -} diff --git a/LibreNMS/Modules/ArpTable.php b/LibreNMS/Modules/ArpTable.php index 67a9ea15463..5089b35e456 100644 --- a/LibreNMS/Modules/ArpTable.php +++ b/LibreNMS/Modules/ArpTable.php @@ -11,18 +11,19 @@ use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Discovery\ArpTableDiscovery; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; use LibreNMS\Util\Mac; use SnmpQuery; class ArpTable implements Module { use SyncsModels; + use RequiresPollingMethod; /** * @inheritDoc @@ -32,20 +33,9 @@ public function dependencies(): array return ['ports']; } - /** - * @inheritDoc - */ - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool - { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); - } - - /** - * @inheritDoc - */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** @@ -58,7 +48,7 @@ public function discover(OS $os): void : $this->discoverArpFromIpMib($os->getDevice()); ModuleModelObserver::observe(Ipv4Mac::class); - $this->syncModels($os->getDevice(), 'macs', $arp); + $this->syncVrfContextModels($os->getDevice(), 'macs', $arp); } /** diff --git a/LibreNMS/Modules/Availability.php b/LibreNMS/Modules/Availability.php index 9e2f53f00da..68ddcced27a 100644 --- a/LibreNMS/Modules/Availability.php +++ b/LibreNMS/Modules/Availability.php @@ -33,8 +33,6 @@ use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\RRD\RrdDefinition; use LibreNMS\Util\Time; @@ -48,7 +46,18 @@ public function dependencies(): array return []; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + /** + * The methods of the device that affect availability, only they are checked for it. + */ + public function pollingMethods(Device $device): array + { + return array_values(array_filter( + PollingMethodType::cases(), + fn (PollingMethodType $type): bool => (bool) $device->pollingMethod($type)?->affects_availability, + )); + } + + public function shouldDiscover(OS $os): bool { return false; } @@ -63,9 +72,9 @@ public function discover(OS $os): void /** * @inheritDoc */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldPoll(OS $os): bool { - return $status->isEnabled() && $connectivity->hasAvailability(); + return $os->getDevice()->polling()->hasAvailabilityCheck(); } /** diff --git a/LibreNMS/Modules/BgpPeers.php b/LibreNMS/Modules/BgpPeers.php new file mode 100644 index 00000000000..fa9fa78ddec --- /dev/null +++ b/LibreNMS/Modules/BgpPeers.php @@ -0,0 +1,296 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace LibreNMS\Modules; + +use App\Actions\Device\AutoDiscoverDevice; +use App\Facades\LibrenmsConfig; +use App\Models\BgpPeer; +use App\Models\BgpPeerCbgp; +use App\Models\Device; +use App\Models\Eventlog; +use App\Observers\ModuleModelObserver; +use Illuminate\Support\Collection; +use Illuminate\Support\Facades\Log; +use LibreNMS\Data\Store\Rrd; +use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; +use LibreNMS\Enum\Severity; +use LibreNMS\Exceptions\SnmpException; +use LibreNMS\Interfaces\Data\DataStorageInterface; +use LibreNMS\Interfaces\Discovery\BgpAddressFamilyDiscovery; +use LibreNMS\Interfaces\Module; +use LibreNMS\OS; +use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Traits\RequiresPollingMethod; +use LibreNMS\Util\AutonomousSystem; +use LibreNMS\Util\IP; +use LibreNMS\Util\Rewrite; + +class BgpPeers implements Module +{ + use SyncsModels; + use RequiresPollingMethod; + + /** Values for columns that are required, but may not be reported by every table */ + private const array PEER_DEFAULTS = [ + 'bgpPeerState' => 'idle', + 'bgpPeerAdminStatus' => 'stop', + 'bgpLocalAddr' => '0.0.0.0', + 'bgpPeerInUpdates' => 0, + 'bgpPeerOutUpdates' => 0, + 'bgpPeerInTotalMessages' => 0, + 'bgpPeerOutTotalMessages' => 0, + 'bgpPeerFsmEstablishedTime' => 0, + 'bgpPeerInUpdateElapsedTime' => 0, + ]; + + /** + * @return string[] + */ + public function dependencies(): array + { + return ['ports', 'vrf', 'ipv4-addresses', 'ipv6-addresses']; + } + + public function pollingMethods(Device $device): array + { + return [PollingMethodType::Snmp]; + } + + public function discover(OS $os): void + { + $device = $os->getDevice(); + + try { + [$peers, $addressFamilies] = $this->fetch($os); + } catch (SnmpException $e) { + Log::warning('Device did not answer, BGP sessions were not updated: ' . $e->getMessage()); + + return; + } + + $device->bgpLocalAs = $os->discoverBgpLocalAs(); + $device->save(); + Log::info('Local AS: ' . ($device->bgpLocalAs ?? 'none')); + + $peers->each(function (BgpPeer $peer): void { + $peer->fill(array_diff_key(self::PEER_DEFAULTS, $peer->getAttributes())); + $peer->astext = AutonomousSystem::get($peer->bgpPeerRemoteAs)->name(); + }); + $addressFamilies->each(fn (BgpPeerCbgp $family) => $family->forceFill(array_merge(BgpPeerCbgp::emptyCounters(), $family->getAttributes()))); + + ModuleModelObserver::observe(BgpPeer::class); + $synced = $this->syncVrfContextModels($device, 'bgppeers', $peers); + ModuleModelObserver::done(); + $device->unsetRelation('bgppeers'); + + // a failed address family walk must not remove the families of sessions that still exist + if ($addressFamilies->isNotEmpty() || $peers->isEmpty() || ! $os instanceof BgpAddressFamilyDiscovery) { + ModuleModelObserver::observe(BgpPeerCbgp::class, 'Address families'); + $this->syncVrfContextModels($device, 'bgpPeersCbgp', $addressFamilies); + ModuleModelObserver::done(); + $device->unsetRelation('bgpPeersCbgp'); + } + + if (LibrenmsConfig::get('autodiscovery.bgp')) { + $synced->filter(fn (BgpPeer $peer) => $peer->wasRecentlyCreated && IP::isValid($peer->bgpPeerIdentifier))->each(function (BgpPeer $peer) use ($device): void { + app(AutoDiscoverDevice::class)->execute(gethostbyaddr($peer->bgpPeerIdentifier) ?: $peer->bgpPeerIdentifier, $device, 'BGP'); + }); + } + } + + public function poll(OS $os, DataStorageInterface $datastore): void + { + $device = $os->getDevice(); + $peers = $device->bgppeers()->whereIn('context_name', $device->getVrfContexts())->get(); + + if ($peers->isEmpty()) { + return; + } + + try { + [$polledPeers, $polledFamilies] = $this->fetch($os, $device->bgpPeersCbgp()->exists()); + } catch (SnmpException $e) { + Log::warning('Device did not answer, BGP sessions were not polled: ' . $e->getMessage()); + + return; + } + + $polledPeers = $polledPeers->keyBy->getCompositeKey(); + $polledFamilies = $polledFamilies->keyBy->getCompositeKey(); + + foreach ($peers as $peer) { + $polled = $polledPeers->get($peer->getCompositeKey()); + if ($polled === null) { + Log::debug("BGP peer $peer->bgpPeerIdentifier ($peer->context_name) not found"); + continue; + } + + $peer->fill($polled->getAttributes()); + $this->logStateChange($peer, $device); + $peer->save(); + + $datastore->put($os->getDeviceArray(), 'bgp', [ + 'bgpPeerIdentifier' => $peer->bgpPeerIdentifier, + 'rrd_name' => Rrd::safeName('bgp-' . $peer->bgpPeerIdentifier), + 'rrd_oldname' => $this->uncompressedRrdName($peer->bgpPeerIdentifier, 'bgp-'), + 'rrd_def' => RrdDefinition::make() + ->addDataset('bgpPeerOutUpdates', 'COUNTER', null, 100000000000) + ->addDataset('bgpPeerInUpdates', 'COUNTER', null, 100000000000) + ->addDataset('bgpPeerOutTotal', 'COUNTER', null, 100000000000) + ->addDataset('bgpPeerInTotal', 'COUNTER', null, 100000000000) + ->addDataset('bgpPeerEstablished', 'GAUGE', 0), + ], [ + 'bgpPeerOutUpdates' => $peer->bgpPeerOutUpdates, + 'bgpPeerInUpdates' => $peer->bgpPeerInUpdates, + 'bgpPeerOutTotal' => $peer->bgpPeerOutTotalMessages, + 'bgpPeerInTotal' => $peer->bgpPeerInTotalMessages, + 'bgpPeerEstablished' => $peer->bgpPeerFsmEstablishedTime, + ]); + } + + foreach ($device->bgpPeersCbgp()->get() as $addressFamily) { + $polled = $polledFamilies->get($addressFamily->getCompositeKey()); + if ($polled === null) { + continue; + } + + foreach (BgpPeerCbgp::PREFIX_COUNTERS as $counter) { + $value = (int) $polled->$counter; + if (in_array($counter, BgpPeerCbgp::DELTA_COUNTERS)) { + $addressFamily->{$counter . '_prev'} = (int) $addressFamily->$counter; + $addressFamily->{$counter . '_delta'} = $value - (int) $addressFamily->$counter; + } + $addressFamily->$counter = $value; + } + $addressFamily->save(); + + $datastore->put($os->getDeviceArray(), 'cbgp', [ + 'bgpPeerIdentifier' => $addressFamily->bgpPeerIdentifier, + 'afi' => $addressFamily->afi, + 'safi' => $addressFamily->safi, + 'rrd_name' => Rrd::safeName("cbgp-$addressFamily->bgpPeerIdentifier.$addressFamily->afi.$addressFamily->safi"), + 'rrd_oldname' => $this->uncompressedRrdName($addressFamily->bgpPeerIdentifier, 'cbgp-', ".$addressFamily->afi.$addressFamily->safi"), + 'rrd_def' => RrdDefinition::make() + ->addDataset('AcceptedPrefixes', 'GAUGE', null, 100000000000) + ->addDataset('DeniedPrefixes', 'GAUGE', null, 100000000000) + ->addDataset('AdvertisedPrefixes', 'GAUGE', null, 100000000000) + ->addDataset('SuppressedPrefixes', 'GAUGE', null, 100000000000) + ->addDataset('WithdrawnPrefixes', 'GAUGE', null, 100000000000), + ], $addressFamily->only(BgpPeerCbgp::DELTA_COUNTERS)); + } + } + + public function dataExists(Device $device): bool + { + return $device->bgppeers()->exists() || $device->bgpPeersCbgp()->exists(); + } + + public function cleanup(Device $device): int + { + return $device->bgppeers()->delete() + $device->bgpPeersCbgp()->delete(); + } + + /** + * @return array|null + */ + public function dump(Device $device, string $type): ?array + { + return [ + 'bgpPeers' => $device->bgppeers() + ->leftJoin('devices', 'bgpPeers.device_id', '=', 'devices.device_id') + ->leftJoin('vrfs', 'bgpPeers.vrf_id', '=', 'vrfs.vrf_id') + ->select(['bgpPeers.*', 'devices.bgpLocalAs', 'vrfs.vrf_name']) + ->orderBy('bgpPeerIdentifier')->orderBy('context_name')->orderBy('vrf_name') + ->get()->map->makeHidden(['bgpPeer_id', 'device_id', 'vrf_id']), + 'bgpPeers_cbgp' => $device->bgpPeersCbgp() + ->orderBy('bgpPeerIdentifier')->orderBy('afi')->orderBy('safi') + ->get()->map->makeHidden(['device_id']), + ]; + } + + /** + * Address families are only kept for the sessions found, the first one reported wins + * + * @return array{0: Collection, 1: Collection} + * + * @throws SnmpException + */ + private function fetch(OS $os, bool $addressFamilies = true): array + { + $peers = $os->discoverBgpPeers(); + foreach ($peers->countBy('context_name') as $context => $count) { + Log::info(($context ? "$context: " : '') . "$count peers"); + } + + if (! $addressFamilies || ! $os instanceof BgpAddressFamilyDiscovery) { + return [$peers, new Collection]; + } + + $sessions = $peers->map(fn (BgpPeer $peer) => "$peer->bgpPeerIdentifier|$peer->context_name")->flip(); + $families = $os->discoverBgpAddressFamilies($peers) + ->filter(fn (BgpPeerCbgp $family) => $sessions->has("$family->bgpPeerIdentifier|$family->context_name")) + ->unique(fn (BgpPeerCbgp $family) => $family->getCompositeKey()) + ->values(); + + return [$peers, $families]; + } + + /** + * Some MIBs used to store IPv6 peers uncompressed, the datastore renames that rrd file before writing to the compressed one + */ + private function uncompressedRrdName(string $identifier, string $prefix, string $suffix = ''): ?string + { + $ip = IP::parse($identifier, true); + + return $ip?->getFamily() == 'ipv6' ? Rrd::safeName($prefix . $ip->uncompressed() . $suffix) : null; + } + + private function logStateChange(BgpPeer $peer, Device $device): void + { + if (! $peer->bgpPeerFsmEstablishedTime || ! ($peer->isDirty('bgpPeerState') || $peer->bgpPeerFsmEstablishedTime < $peer->getOriginal('bgpPeerFsmEstablishedTime'))) { + return; + } + + $whitelist = LibrenmsConfig::get('alerts.bgp.whitelist'); + if (is_array($whitelist) && ! in_array($peer->bgpPeerRemoteAs, $whitelist)) { + return; + } + + $description = "$peer->bgpPeerIdentifier (AS$peer->bgpPeerRemoteAs $peer->bgpPeerDescr)"; + $error = Rewrite::bgpErrorCode($peer->bgpPeerLastErrorCode ?? '', $peer->bgpPeerLastErrorSubCode ?? ''); + + if (! $peer->isDirty('bgpPeerState')) { + Eventlog::log("BGP Session Flap: $description, last error: $error", $device, 'bgpPeer', Severity::Warning, $peer->bgpPeerIdentifier); + } elseif ($peer->bgpPeerState == 'established') { + Eventlog::log("BGP Session Up: $description", $device, 'bgpPeer', Severity::Ok, $peer->bgpPeerIdentifier); + } elseif ($peer->getOriginal('bgpPeerState') == 'established') { + Eventlog::log("BGP Session Down: $description, last error: $error", $device, 'bgpPeer', Severity::Error, $peer->bgpPeerIdentifier); + } + } +} diff --git a/LibreNMS/Modules/CiscoCef.php b/LibreNMS/Modules/CiscoCef.php new file mode 100644 index 00000000000..3d663b2e0ef --- /dev/null +++ b/LibreNMS/Modules/CiscoCef.php @@ -0,0 +1,228 @@ +getDevice(); + + $cefs = SnmpQuery::hideMib()->walk('CISCO-CEF-MIB::cefSwitchingPath')->table(3); + if (empty($cefs)) { + return; + } + + $entities = $this->entityNames($device); + + $models = collect(); + foreach ($cefs as $entity => $afis) { + $entity_name = $this->entityName($entities, $entity); + Log::info("\n$entity $entity_name"); + foreach ($afis as $afi => $paths) { + Log::info(" |- $afi"); + foreach ($paths as $path => $path_name) { + Log::info(' | |-' . $path . ': ' . $path_name['cefSwitchingPath']); + $models->push(new CefSwitching([ + 'device_id' => $device->device_id, + 'entPhysicalIndex' => (int) $entity, + 'afi' => $afi, + 'cef_index' => (int) $path, + 'cef_path' => $path_name['cefSwitchingPath'], + ])); + } + } + } + + ModuleModelObserver::observe(CefSwitching::class, 'CISCO CEF'); + $this->syncModels($device, 'cefSwitching', $models); + } + + /** + * @inheritDoc + */ + public function poll(OS $os, DataStorageInterface $datastore): void + { + $device = $os->getDevice(); + if ($os->getDeviceArray()['os_group'] !== 'cisco') { + return; + } + + $cefs = SnmpQuery::hideMib()->walk('CISCO-CEF-MIB::cefSwitchingStatsTable')->table(3); + if (empty($cefs)) { + return; + } + + $entities = $this->entityNames($device); + $polled = time(); + + $existing = $device->cefSwitching() + ->get() + ->keyBy(fn (CefSwitching $cef) => $cef->getCompositeKey()); + + $models = collect(); + foreach ($cefs as $entity => $afis) { + $entity_name = $this->entityName($entities, $entity); + Log::info("\n$entity $entity_name"); + foreach ($afis as $afi => $paths) { + Log::info(" |- $afi"); + foreach ($paths as $index => $stat) { + Log::info(' | |-' . $index . ': ' . ($stat['cefSwitchingPath'] ?? ''), ['nlb' => true]); + + $model = new CefSwitching([ + 'device_id' => $device->device_id, + 'entPhysicalIndex' => (int) $entity, + 'afi' => $afi, + 'cef_index' => (int) $index, + 'cef_path' => $stat['cefSwitchingPath'] ?? '', + ]); + $old = $existing->get($model->getCompositeKey()); + + // Copy the 64-bit (HC) counters over the 32-bit ones where available + $drop = $stat['cefSwitchingDrop'] ?? 0; + $punt = $stat['cefSwitchingPunt'] ?? 0; + $punt2host = $stat['cefSwitchingPunt2Host'] ?? 0; + if (is_numeric($stat['cefSwitchingHCDrop'] ?? null)) { + $drop = $stat['cefSwitchingHCDrop']; + } + if (is_numeric($stat['cefSwitchingHCPunt'] ?? null)) { + $punt = $stat['cefSwitchingHCPunt']; + } + if (is_numeric($stat['cefSwitchingHCPunt2Host'] ?? null)) { + $punt2host = $stat['cefSwitchingHCPunt2Host']; + } + + // Track the previous values so the UI can compute a rate + $model->drop = $drop; + $model->punt = $punt; + $model->punt2host = $punt2host; + $model->drop_prev = $old === null ? 0 : (int) $old->drop; + $model->punt_prev = $old === null ? 0 : (int) $old->punt; + $model->punt2host_prev = $old === null ? 0 : (int) $old->punt2host; + $model->updated = $polled; + $model->updated_prev = $old === null ? 0 : (int) $old->updated; + + $models->push($model); + + $tags = [ + 'entity' => $entity, + 'afi' => $afi, + 'index' => $index, + 'rrd_name' => ['cefswitching', $entity, $afi, $index], + 'rrd_def' => RrdDefinition::make() + ->addDataset('drop', 'DERIVE', 0, 1000000) + ->addDataset('punt', 'DERIVE', 0, 1000000) + ->addDataset('hostpunt', 'DERIVE', 0, 1000000), + ]; + $fields = [ + 'drop' => $drop, + 'punt' => $punt, + 'hostpunt' => $punt2host, + ]; + $datastore->put($os->getDeviceArray(), 'cefswitching', $tags, $fields); + } + } + } + + ModuleModelObserver::observe(CefSwitching::class, 'CISCO CEF'); + $this->syncModels($device, 'cefSwitching', $models); + } + + /** + * @inheritDoc + */ + public function dataExists(Device $device): bool + { + return $device->cefSwitching()->exists(); + } + + /** + * @inheritDoc + */ + public function cleanup(Device $device): int + { + return $device->cefSwitching()->delete(); + } + + /** + * @return array{cef_switching: Collection}|null + */ + public function dump(Device $device, string $type): ?array + { + if ($type != 'discovery') { + return null; + } + + return [ + 'cef_switching' => $device->cefSwitching() + ->get() + ->sort(fn (CefSwitching $a, CefSwitching $b) => $a->entPhysicalIndex <=> $b->entPhysicalIndex) + ->values() + ->makeHidden(['cef_switching_id']), + ]; + } + + /** + * entPhysicalIndex => entity metadata for display in the logs. + * + * @return Collection + */ + private function entityNames(Device $device): Collection + { + return $device->entityPhysical() + ->get(['entPhysicalIndex', 'entPhysicalName', 'entPhysicalModelName']) + ->keyBy('entPhysicalIndex'); + } + + /** + * @param Collection $entities + * @param int $entity + */ + private function entityName(Collection $entities, $entity): string + { + $ent = $entities->get($entity); + if ($ent === null) { + return ''; + } + + return ($ent->entPhysicalName ?? '') . ' - ' . ($ent->entPhysicalModelName ?? ''); + } +} diff --git a/LibreNMS/Modules/Core.php b/LibreNMS/Modules/Core.php index 76dd2922b2c..2c27d4834e5 100644 --- a/LibreNMS/Modules/Core.php +++ b/LibreNMS/Modules/Core.php @@ -31,14 +31,13 @@ use App\Models\Device; use App\Models\Eventlog; use App\Observers\DeviceObserver; +use Illuminate\Support\Str; use LibreNMS\Data\Source\Icmp\FpingResponse; use LibreNMS\Enum\PollingMethodType; use LibreNMS\Enum\Severity; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\RRD\RrdDefinition; use LibreNMS\Util\Compare; use LibreNMS\Util\Number; @@ -56,18 +55,35 @@ public function dependencies(): array return []; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + /** + * ICMP alone is enough to poll uptime and availability. + */ + public function pollingMethods(Device $device): array + { + return [PollingMethodType::Snmp, PollingMethodType::Icmp]; + } + + public function shouldDiscover(OS $os): bool { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return $os->getMethodResults()->isAvailable(PollingMethodType::Snmp); } public function discover(OS $os): void { - $snmpdata = SnmpQuery::numeric()->get([ + $response = SnmpQuery::numeric()->get([ 'SNMPv2-MIB::sysObjectID.0', 'SNMPv2-MIB::sysDescr.0', 'SNMPv2-MIB::sysName.0', - ])->values(); + ]); + + if ($response->hasConnectionError()) { + // device stopped answering after shouldDiscover(), keep what we have like poll() does + Log::warning('Core discovery: SNMP connection error, keeping os ' . $os->getDevice()->os); + + return; + } + + $snmpdata = $response->values(); $snmp_engine = SnmpQuery::get('SNMP-FRAMEWORK-MIB::snmpEngineID.0')->value(); @@ -100,9 +116,9 @@ public function discover(OS $os): void } } - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldPoll(OS $os): bool { - return $status->isEnabled() && ($connectivity->snmpIsAvailable() || $connectivity->icmpIsEnabled()); + return $os->getMethodResults()->isAvailable(PollingMethodType::Snmp) || $os->getDevice()->polling()->isEnabled(PollingMethodType::Icmp); } public function poll(OS $os, DataStorageInterface $datastore): void @@ -286,11 +302,11 @@ protected static function checkDiscovery(Device $device, array $array, $mibdir, return false; } } elseif ($key === 'sysDescr_regex') { - if (preg_match_any($sysDescr, $value) === $check) { + if (Str::isMatch($value, $sysDescr) === $check) { return false; } } elseif ($key === 'sysObjectID_regex') { - if (preg_match_any($sysObjectID, $value) === $check) { + if (Str::isMatch($value, $sysObjectID) === $check) { return false; } } elseif ($key === 'snmpget') { diff --git a/LibreNMS/Modules/DiscoveryArp.php b/LibreNMS/Modules/DiscoveryArp.php index 7a31bdc6062..d812e38d05c 100644 --- a/LibreNMS/Modules/DiscoveryArp.php +++ b/LibreNMS/Modules/DiscoveryArp.php @@ -9,17 +9,19 @@ use Illuminate\Contracts\Database\Eloquent\Builder; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Log; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Enum\Severity; use LibreNMS\Exceptions\InvalidIpException; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; use LibreNMS\Util\IPv4; class DiscoveryArp implements Module { + use RequiresPollingMethod; + /** * @inheritDoc */ @@ -28,18 +30,15 @@ public function dependencies(): array return ['arp-table']; } - /** - * @inheritDoc - */ - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** * @inheritDoc */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldPoll(OS $os): bool { return false; } diff --git a/LibreNMS/Modules/DiscoveryProtocols.php b/LibreNMS/Modules/DiscoveryProtocols.php index a68147c190c..06bf13d38cf 100644 --- a/LibreNMS/Modules/DiscoveryProtocols.php +++ b/LibreNMS/Modules/DiscoveryProtocols.php @@ -39,17 +39,18 @@ use LibreNMS\Discovery\Neighbors\Neighbor; use LibreNMS\Discovery\Neighbors\NeighborFinder; use LibreNMS\Enum\LldpPortIdSubtype; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; use LibreNMS\Util\IP; use LibreNMS\Util\Mac; class DiscoveryProtocols implements Module { use SyncsModels; + use RequiresPollingMethod; private NeighborFinder $finder; /** @var array autodiscovery results by target, so each target is only tried once */ @@ -63,18 +64,15 @@ public function dependencies(): array return ['ports']; } - /** - * @inheritDoc - */ - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** * @inheritDoc */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldPoll(OS $os): bool { return false; } @@ -211,8 +209,14 @@ private function autoDiscover(Neighbor $neighbor, Device $device): ?Device return null; } + $ambiguousIp = $this->finder->hasAmbiguousIp($neighbor); $targets = [$neighbor->sysName]; - if (LibrenmsConfig::get('discovery_by_ip', false)) { + if ($ambiguousIp && IP::parse($neighbor->sysName, true)?->compressed() === IP::parse($neighbor->managementIp ?? '', true)?->compressed()) { + $targets = []; + } + // Reprobing an address already shared by monitored devices cannot resolve + // its identity. A new DNS name may still discover a legitimate neighbor. + if (LibrenmsConfig::get('discovery_by_ip', false) && ! $ambiguousIp) { $targets[] = $neighbor->managementIp; } diff --git a/LibreNMS/Modules/EntityPhysical.php b/LibreNMS/Modules/EntityPhysical.php index c84a793a14d..0df89f72c46 100644 --- a/LibreNMS/Modules/EntityPhysical.php +++ b/LibreNMS/Modules/EntityPhysical.php @@ -6,15 +6,16 @@ use App\Models\EntPhysical; use App\Observers\ModuleModelObserver; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; class EntityPhysical implements Module { use SyncsModels; + use RequiresPollingMethod; /** * @inheritDoc @@ -24,20 +25,9 @@ public function dependencies(): array return []; } - /** - * @inheritDoc - */ - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool - { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); - } - - /** - * @inheritDoc - */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** diff --git a/LibreNMS/Modules/FdbTable.php b/LibreNMS/Modules/FdbTable.php new file mode 100644 index 00000000000..e718a135cd0 --- /dev/null +++ b/LibreNMS/Modules/FdbTable.php @@ -0,0 +1,96 @@ +getDevice(); + + $rows = $os->discoverFdbTable() + ->filter(fn (PortsFdb $fdb) => strlen((string) $fdb->mac_address) === 12); + $sync = new BulkTableSync($device->portsFdb(), 'mac_address'); + // Retain history, refresh last-seen time, and preserve known ports when + // an agent returns an incomplete bridge port table. + $counts = $sync->sync($rows, Carbon::now()->toDateTimeString(), function (array $row, array $existing): array { + $row['port_id'] = $row['port_id'] ?: $existing['port_id']; + + return $row; + }); + Log::info("FDB: {$counts['inserted']} added, {$counts['updated']} updated, {$counts['unchanged']} unchanged, {$counts['deleted']} duplicates removed"); + } + + /** + * @inheritDoc + */ + public function poll(OS $os, DataStorageInterface $datastore): void + { + $this->discover($os); + } + + /** + * @inheritDoc + */ + public function dataExists(Device $device): bool + { + return $device->portsFdb()->exists(); + } + + /** + * @inheritDoc + */ + public function cleanup(Device $device): int + { + return $device->portsFdb()->delete(); + } + + /** + * @return array{ports_fdb: Collection}|null + */ + public function dump(Device $device, string $type): ?array + { + if ($type != 'discovery') { + return null; + } + + return [ + 'ports_fdb' => $device->portsFdb() + ->leftJoin('ports', 'ports_fdb.port_id', 'ports.port_id') + ->orderBy('ports.ifIndex')->orderBy('ports_fdb.vlan')->orderBy('ports_fdb.mac_address') + ->select(['ports_fdb.*', 'ports.ifIndex']) + ->get() + ->makeHidden(['ports_fdb_id', 'device_id', 'port_id', 'created_at', 'updated_at']), + ]; + } +} diff --git a/LibreNMS/Modules/HrDevice.php b/LibreNMS/Modules/HrDevice.php index d7e02606893..7c9fc3847cb 100644 --- a/LibreNMS/Modules/HrDevice.php +++ b/LibreNMS/Modules/HrDevice.php @@ -5,15 +5,16 @@ use App\Models\Device; use App\Observers\ModuleModelObserver; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; class HrDevice implements Module { use SyncsModels; + use RequiresPollingMethod; /** * @inheritDoc @@ -23,18 +24,15 @@ public function dependencies(): array return []; } - /** - * @inheritDoc - */ - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** * @inheritDoc */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldPoll(OS $os): bool { return false; } diff --git a/LibreNMS/Modules/IpSystemStats.php b/LibreNMS/Modules/IpSystemStats.php index ca35affe69b..4a6ebaeb917 100644 --- a/LibreNMS/Modules/IpSystemStats.php +++ b/LibreNMS/Modules/IpSystemStats.php @@ -25,16 +25,18 @@ use App\Models\Device; use Illuminate\Support\Facades\Log; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Traits\RequiresPollingMethod; use SnmpQuery; class IpSystemStats implements Module { + use RequiresPollingMethod; + /** * @inheritDoc */ @@ -43,28 +45,25 @@ public function dependencies(): array return []; } - /** - * @inheritDoc - */ - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return false; + return [PollingMethodType::Snmp]; } /** * @inheritDoc */ - public function discover(OS $os): void + public function shouldDiscover(OS $os): bool { - // no discovery + return false; } /** * @inheritDoc */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function discover(OS $os): void { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + // no discovery } /** diff --git a/LibreNMS/Modules/Ipmi.php b/LibreNMS/Modules/Ipmi.php index d8d14491439..bdc07dd07f8 100644 --- a/LibreNMS/Modules/Ipmi.php +++ b/LibreNMS/Modules/Ipmi.php @@ -36,14 +36,15 @@ use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Traits\RequiresPollingMethod; use LibreNMS\Util\Number; use LibreNMS\Util\ProgressList; class Ipmi implements Module { + use RequiresPollingMethod; + /** * @return string[] */ @@ -52,9 +53,9 @@ public function dependencies(): array return []; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->ipmiIsAvailable(); + return [PollingMethodType::Ipmi]; } /** @@ -108,13 +109,11 @@ public function discover(OS $os): void /** * @inheritDoc */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldPoll(OS $os): bool { // without discovered sensors there is nothing to poll, don't check IPMI - return $status->isEnabled() - && $connectivity->ipmiIsEnabled() - && $this->dataExists($os->getDevice()) - && $connectivity->ipmiIsAvailable(); + return $this->dataExists($os->getDevice()) + && $this->hasAvailableMethod($os); } /** diff --git a/LibreNMS/Modules/Ipv4Addresses.php b/LibreNMS/Modules/Ipv4Addresses.php index e7a8d56b837..58c501cbad7 100644 --- a/LibreNMS/Modules/Ipv4Addresses.php +++ b/LibreNMS/Modules/Ipv4Addresses.php @@ -34,19 +34,20 @@ use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Exceptions\InvalidIpException; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Discovery\Ipv4AddressDiscovery; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; use LibreNMS\Util\IPv4; use SnmpQuery; class Ipv4Addresses implements Module { use SyncsModels; + use RequiresPollingMethod; /** * @inheritDoc @@ -56,18 +57,15 @@ public function dependencies(): array return ['ports']; } - /** - * @inheritDoc - */ - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** * @inheritDoc */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldPoll(OS $os): bool { return false; } @@ -144,7 +142,7 @@ public function discover(OS $os): void }); ModuleModelObserver::observe(Ipv4Address::class); - $this->syncModels($os->getDevice(), 'ipv4', $ips); + $this->syncVrfContextModels($os->getDevice(), 'ipv4', $ips); } /** diff --git a/LibreNMS/Modules/Ipv6Addresses.php b/LibreNMS/Modules/Ipv6Addresses.php index 66687610f35..98455eaf06e 100644 --- a/LibreNMS/Modules/Ipv6Addresses.php +++ b/LibreNMS/Modules/Ipv6Addresses.php @@ -10,13 +10,13 @@ use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Exceptions\InvalidIpException; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Discovery\Ipv6AddressDiscovery; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; use LibreNMS\Util\IP; use LibreNMS\Util\IPv4; use LibreNMS\Util\IPv6; @@ -25,6 +25,7 @@ class Ipv6Addresses implements Module { use SyncsModels; + use RequiresPollingMethod; /** * @inheritDoc @@ -34,18 +35,15 @@ public function dependencies(): array return ['ports']; } - /** - * @inheritDoc - */ - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** * @inheritDoc */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldPoll(OS $os): bool { return false; } @@ -97,7 +95,7 @@ public function discover(OS $os): void }); ModuleModelObserver::observe(Ipv6Address::class); - $this->syncModels($os->getDevice(), 'ipv6', $ips); + $this->syncVrfContextModels($os->getDevice(), 'ipv6', $ips); } /** @@ -146,11 +144,12 @@ private function discoverIpMib(Device $device): Collection { $ips = new Collection; foreach ($device->getVrfContexts() as $context_name) { + $prefixOrigins = null; // only walked if a row needs it $ips = $ips->merge(SnmpQuery::context($context_name) ->enumStrings() ->walk([ 'IP-MIB::ipAddressTable', - ])->mapTable(function ($data, $ipAddressAddrType, $ipAddressAddr = '') use ($context_name, $device) { + ])->mapTable(function ($data, $ipAddressAddrType, $ipAddressAddr = '') use ($context_name, $device, &$prefixOrigins) { if (! in_array($ipAddressAddrType, ['ipv6', 'ipv6z'])) { return null; } @@ -164,7 +163,7 @@ private function discoverIpMib(Device $device): Collection 'port_id' => PortCache::getIdFromIfIndex($ifIndex, $device), 'ipv6_address' => $ip->uncompressed(), 'ipv6_compressed' => $ip->compressed(), - 'ipv6_prefixlen' => $this->parsePrefixLen($data, $ipAddressAddrType, $ip), + 'ipv6_prefixlen' => $this->parsePrefixLen($data, $ipAddressAddrType, $ip, $context_name, $prefixOrigins), 'ipv6_origin' => $data['IP-MIB::ipAddressOrigin'] ?? 'unknown', 'context_name' => $context_name, ]); @@ -232,7 +231,7 @@ private function parseIp(string $ipAddressAddr): IP|IPv4|IPv6|null return IPv6::fromHexString($cleanHexIp); } - private function parsePrefixLen(array $snmpRowData, string $ipAddressAddrType, IP $ip): int + private function parsePrefixLen(array $snmpRowData, string $ipAddressAddrType, IP $ip, string $context_name, ?array &$prefixOrigins): int { $prefix = $snmpRowData['IP-MIB::ipAddressPrefix'] ?? ''; @@ -241,14 +240,15 @@ private function parsePrefixLen(array $snmpRowData, string $ipAddressAddrType, I return (int) substr($prefix, strrpos($prefix, '.') + 1); } - if (preg_match('/(\d{1,3})]$/', $prefix, $prefix_match)) { + if (preg_match('/]\[(\d{1,3})]$/', $prefix, $prefix_match)) { return (int) $prefix_match[1]; } // try IP-MIB::ipAddressPrefixTable to get the prefix length if (isset($snmpRowData['IP-MIB::ipAddressIfIndex'])) { - $origins = SnmpQuery::cache()->walk('IP-MIB::ipAddressPrefixOrigin')->table(4); // walk this and parse from index - foreach ($origins[$snmpRowData['IP-MIB::ipAddressIfIndex']][$ipAddressAddrType] ?? [] as $prefix => $prefixData) { + $prefixOrigins ??= SnmpQuery::context($context_name)->cache()->walk('IP-MIB::ipAddressPrefixOrigin')->table(4); // walk this and parse from index + $longestPrefixLen = 0; + foreach ($prefixOrigins[$snmpRowData['IP-MIB::ipAddressIfIndex']][$ipAddressAddrType] ?? [] as $prefix => $prefixData) { foreach (array_keys($prefixData) as $prefixLen) { try { // broken output, parse from raw index @@ -260,14 +260,16 @@ private function parsePrefixLen(array $snmpRowData, string $ipAddressAddrType, I } if ($ip->inNetwork($this->parseIp($prefix)->getNetwork($prefixLen))) { - return (int) $prefixLen; + $longestPrefixLen = max($longestPrefixLen, (int) $prefixLen); } } catch (InvalidIpException) { - // ignore failures and return 0 if no matches found + // ignore failures, the result is 0 if no matches found Log::debug("Failed to parse ipv6 prefix: $prefix"); } } } + + return $longestPrefixLen; } return 0; diff --git a/LibreNMS/Modules/Ipv6Nd.php b/LibreNMS/Modules/Ipv6Nd.php index d6c663d4f06..802c9cc69d8 100644 --- a/LibreNMS/Modules/Ipv6Nd.php +++ b/LibreNMS/Modules/Ipv6Nd.php @@ -8,13 +8,13 @@ use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Exceptions\InvalidIpException; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Discovery\Ipv6NdDiscovery; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; use LibreNMS\Util\IPv6; use LibreNMS\Util\Mac; use SnmpQuery; @@ -22,6 +22,7 @@ class Ipv6Nd implements Module { use SyncsModels; + use RequiresPollingMethod; /** * @inheritDoc @@ -31,18 +32,15 @@ public function dependencies(): array return ['ports']; } - /** - * @inheritDoc - */ - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** * @inheritDoc */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldPoll(OS $os): bool { return false; } @@ -57,7 +55,7 @@ public function discover(OS $os): void : $this->discoverNeighborsFromIpMib($os->getDevice()); ModuleModelObserver::observe(\App\Models\Ipv6Nd::class); - $this->syncModels($os->getDevice(), 'nd', $arp); + $this->syncVrfContextModels($os->getDevice(), 'nd', $arp); } /** diff --git a/LibreNMS/Modules/Isis.php b/LibreNMS/Modules/Isis.php index 191ba777995..7f974f64a5a 100644 --- a/LibreNMS/Modules/Isis.php +++ b/LibreNMS/Modules/Isis.php @@ -34,18 +34,20 @@ use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Discovery\IsIsDiscovery; use LibreNMS\Interfaces\Module; use LibreNMS\Interfaces\Polling\IsIsPolling; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; use LibreNMS\Util\IP; +use SnmpQuery; class Isis implements Module { use SyncsModels; + use RequiresPollingMethod; protected $isis_codes = [ 'l1IntermediateSystem' => 'L1', @@ -62,9 +64,9 @@ public function dependencies(): array return ['ports']; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** @@ -83,11 +85,6 @@ public function discover(OS $os): void $this->syncModels($os->getDevice(), 'isisAdjacencies', $adjacencies); } - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool - { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); - } - /** * Poll data for this module and update the DB / RRD. * Try to keep this efficient and only run if discovery has indicated there is a reason to run. @@ -99,7 +96,7 @@ public function poll(OS $os, DataStorageInterface $datastore): void { $adjacencies = $os->getDevice()->isisAdjacencies; - if (empty($adjacencies)) { + if ($adjacencies->isEmpty()) { return; // no data to poll } @@ -113,46 +110,50 @@ public function poll(OS $os, DataStorageInterface $datastore): void public function discoverIsIsMib(OS $os): Collection { // Check if the device has any ISIS enabled interfaces - $circuits = snmpwalk_cache_oid($os->getDeviceArray(), 'ISIS-MIB::isisCirc', []); + $circuits = SnmpQuery::enumStrings()->walk('ISIS-MIB::isisCirc'); $adjacencies = new Collection; - if (! empty($circuits)) { - $adjacencies_data = snmpwalk_cache_twopart_oid($os->getDeviceArray(), 'ISIS-MIB::isisISAdj', [], null, null, '-OQUstx'); - - // No ISIS enabled interfaces -> delete the component - foreach ($circuits as $circuit_id => $circuit_data) { - if (! isset($circuit_data['isisCircIfIndex'])) { - continue; - } + if ($circuits->isValid()) { + $adjacencies_data = SnmpQuery::enumStrings()->displayHints(false)->walk('ISIS-MIB::isisISAdj')->table(2); - if ($circuit_data['isisCircPassiveCircuit'] == 'true') { - continue; // Do not poll passive interfaces + $adjacencies = $circuits->mapTable(function (array $circuit_data, string $circuit_id) use ($os, $adjacencies_data): ?Collection { + if (! isset($circuit_data['ISIS-MIB::isisCircIfIndex'])) { + return null; } - $adjacency_data = Arr::last($adjacencies_data[$circuit_id] ?? [[]]); - - $attributes = [ - 'device_id' => $os->getDeviceId(), - 'ifIndex' => $circuit_data['isisCircIfIndex'], - 'port_id' => PortCache::getIdFromIfIndex($circuit_data['isisCircIfIndex'], $os->getDevice()), - 'isisCircAdminState' => $circuit_data['isisCircAdminState'] ?? 'down', - 'isisISAdjState' => $adjacency_data['isisISAdjState'] ?? 'down', - ]; - - if (! empty($adjacency_data)) { - $attributes = array_merge($attributes, [ - 'isisISAdjNeighSysType' => Arr::get($this->isis_codes, $adjacency_data['isisISAdjNeighSysType'] ?? 'unknown', 'unknown'), - 'isisISAdjNeighSysID' => str_replace(' ', '.', trim($adjacency_data['isisISAdjNeighSysID'] ?? '')), - 'isisISAdjNeighPriority' => $adjacency_data['isisISAdjNeighPriority'] ?? '', - 'isisISAdjLastUpTime' => $this->parseAdjacencyTime($adjacency_data), - 'isisISAdjAreaAddress' => str_replace(' ', '.', trim($adjacency_data['isisISAdjAreaAddress'] ?? '')), - 'isisISAdjIPAddrType' => $adjacency_data['isisISAdjIPAddrType'] ?? '', - 'isisISAdjIPAddrAddress' => (string) IP::fromHexString($adjacency_data['isisISAdjIPAddrAddress'] ?? null, true), - ]); + if ($circuit_data['ISIS-MIB::isisCircPassiveCircuit'] == 'true') { + return null; // Do not poll passive interfaces } - $adjacencies->push(new IsisAdjacency($attributes)); - } + return collect($adjacencies_data[$circuit_id] ?? [[]]) + ->map(function (array $adjacency_data, $adjacency_index) use ($os, $circuit_data, $circuit_id): IsisAdjacency { + $attributes = [ + 'device_id' => $os->getDeviceId(), + 'index' => $adjacency_index === 0 ? null : "$circuit_id.$adjacency_index", + 'ifIndex' => $circuit_data['ISIS-MIB::isisCircIfIndex'], + 'port_id' => PortCache::getIdFromIfIndex($circuit_data['ISIS-MIB::isisCircIfIndex'], $os->getDevice()), + 'isisCircAdminState' => $circuit_data['ISIS-MIB::isisCircAdminState'] ?? 'down', + 'isisISAdjState' => $adjacency_data['ISIS-MIB::isisISAdjState'] ?? 'down', + ]; + + if (! empty($adjacency_data)) { + $addresses = $adjacency_data['ISIS-MIB::isisISAdjIPAddrAddress'] ?? []; + $addressIndex = array_key_last($addresses); + + $attributes = array_merge($attributes, [ + 'isisISAdjNeighSysType' => Arr::get($this->isis_codes, $adjacency_data['ISIS-MIB::isisISAdjNeighSysType'] ?? 'unknown', 'unknown'), + 'isisISAdjNeighSysID' => str_replace(' ', '.', trim($adjacency_data['ISIS-MIB::isisISAdjNeighSysID'] ?? '')), + 'isisISAdjNeighPriority' => $adjacency_data['ISIS-MIB::isisISAdjNeighPriority'] ?? '', + 'isisISAdjLastUpTime' => $this->parseAdjacencyTime($adjacency_data), + 'isisISAdjAreaAddress' => str_replace(' ', '.', trim(Arr::last($adjacency_data['ISIS-MIB::isisISAdjAreaAddress'] ?? []) ?? '')), + 'isisISAdjIPAddrType' => $adjacency_data['ISIS-MIB::isisISAdjIPAddrType'][$addressIndex] ?? '', + 'isisISAdjIPAddrAddress' => (string) IP::fromHexString($addresses[$addressIndex] ?? '', true), + ]); + } + + return new IsisAdjacency($attributes); + }); + })->filter()->flatten(1)->values(); } return $adjacencies; @@ -160,31 +161,58 @@ public function discoverIsIsMib(OS $os): Collection public function pollIsIsMib(Collection $adjacencies, OS $os): Collection { - $data = snmpwalk_cache_twopart_oid($os->getDeviceArray(), 'isisISAdjState', [], 'ISIS-MIB'); + $data = SnmpQuery::enumStrings()->walk('ISIS-MIB::isisISAdjState')->table(2); + + $realAdjacencies = $adjacencies->filter(fn (IsisAdjacency $adjacency) => $adjacency->index !== null || ! empty($adjacency->isisISAdjNeighSysID)); + + $missingAdjacency = $realAdjacencies->contains(function (IsisAdjacency $adjacency) use ($data): bool { + if ($adjacency->index === null) { + return false; + } - if (count($data) !== $adjacencies->where('isisISAdjState', 'up')->count()) { + [$circuit, $index] = explode('.', $adjacency->index, 2); + + return ! isset($data[$circuit][$index]['ISIS-MIB::isisISAdjState']); + }); + + if (collect($data)->sum(fn (array $rows) => count($rows)) !== $realAdjacencies->count() || $missingAdjacency) { Log::info('New Adjacencies, running discovery'); - // don't enable, might be a bad heuristic - return $this->fillNew($adjacencies, $this->discoverIsIsMib($os)); + $discovered = $this->discoverIsIsMib($os); + if ($discovered->isNotEmpty()) { + $discoveredKeys = $discovered->keyBy->getCompositeKey(); + $obsolete = $realAdjacencies->reject(fn (IsisAdjacency $adjacency) => $discoveredKeys->has($adjacency->getCompositeKey())); + $obsolete->each->delete(); + $adjacencies = $adjacencies->diff($obsolete); + } + + return $this->fillNew($adjacencies, $discovered); } - $data = snmpwalk_cache_twopart_oid($os->getDeviceArray(), 'isisISAdjLastUpTime', $data, 'ISIS-MIB', null, '-OQUst'); + SnmpQuery::enumStrings()->walk('ISIS-MIB::isisISAdjLastUpTime')->table(2, $data); + + $circuits = $realAdjacencies->whereNull('index')->isNotEmpty() + ? collect(SnmpQuery::walk('ISIS-MIB::isisCircIfIndex')->pluck())->flip() + : collect(); + + $realAdjacencies->each(function (IsisAdjacency $adjacency) use ($data, $circuits): void { + [$circuit, $index] = array_pad(explode('.', $adjacency->index ?? ''), 2, null); + if ($index === null) { + $circuit = $circuits->get($adjacency->ifIndex); + $index = array_key_last($data[$circuit] ?? []); + } - $adjacencies->each(function (IsisAdjacency $adjacency) use (&$data): void { - $adjacency_data = Arr::last($data[$adjacency->ifIndex] ?? []); - $adjacency->isisISAdjState = $adjacency_data['isisISAdjState'] ?? $adjacency->isisISAdjState; + $adjacency_data = $data[$circuit][$index] ?? []; + $adjacency->isisISAdjState = $adjacency_data['ISIS-MIB::isisISAdjState'] ?? $adjacency->isisISAdjState; $adjacency->isisISAdjLastUpTime = $this->parseAdjacencyTime($adjacency_data); - $adjacency->save(); - unset($data[$adjacency->ifIndex]); }); return $adjacencies; } - protected function parseAdjacencyTime($data): int + protected function parseAdjacencyTime(?array $data): int { - return (int) (max($data['isisISAdjLastUpTime'] ?? 1, 1) / 100); + return (int) (max($data['ISIS-MIB::isisISAdjLastUpTime'] ?? 1, 1) / 100); } public function dataExists(Device $device): bool diff --git a/LibreNMS/Modules/JunoseAtmVp.php b/LibreNMS/Modules/JunoseAtmVp.php new file mode 100644 index 00000000000..57283ccec34 --- /dev/null +++ b/LibreNMS/Modules/JunoseAtmVp.php @@ -0,0 +1,205 @@ +isJunoseAtmVpEnabled($os) && $this->hasAvailableMethod($os); + } + + /** + * @inheritDoc + */ + public function shouldPoll(OS $os): bool + { + return $this->isJunoseAtmVpEnabled($os) && $this->hasAvailableMethod($os); + } + + /** + * @inheritDoc + */ + public function discover(OS $os): void + { + $device = $os->getDevice(); + + $vp_array = SnmpQuery::mibs(['Juniper-UNI-ATM-MIB'])->hideMib()->cache()->walk('juniAtmVpStatsInCells')->valuesByIndex(); + $valid_vp = []; + + $progress = ProgressList::start('ATM VPs'); + foreach ($vp_array as $index => $entry) { + $parts = explode('.', (string) $index); + if (count($parts) !== 2) { + continue; + } + + [$ifIndex, $vp_id] = $parts; + + $port_id = PortCache::getIdFromIfIndex($ifIndex, $device->device_id); + + if ($port_id && is_numeric($vp_id)) { + Log::debug("Discover Juniper ATM VP: $port_id, $vp_id"); + + if (! JuniAtmVp::where('port_id', $port_id)->where('vp_id', $vp_id)->exists()) { + // vp_descr and juniAtmVp_id are NOT NULL without defaults; the legacy dbInsert() + // (INSERT IGNORE) stored ''/0 here, so mirror those values + $vp = JuniAtmVp::create(['port_id' => $port_id, 'vp_id' => $vp_id, 'vp_descr' => '', 'juniAtmVp_id' => 0]); + Eventlog::log("Juniper ATM VP Added: port $port_id vp $vp_id", $device->device_id, 'juniAtmVp', Severity::Notice, $vp->id); + $progress->mark('+'); + } else { + $progress->mark('.'); + } + + $valid_vp[$port_id][$vp_id] = 1; + } + } + $progress->end(); + + // Remove ATM vps which weren't redetected here + $device->juniAtmVps() + ->get() + ->reject(fn (JuniAtmVp $vp) => ! empty($valid_vp[$vp->port_id][$vp->vp_id])) + ->each(function (JuniAtmVp $vp): void { + Log::debug("Removing stale Juniper ATM VP: port {$vp->port_id} vp {$vp->vp_id}"); + $vp->delete(); + }); + } + + /** + * @inheritDoc + */ + public function poll(OS $os, DataStorageInterface $datastore): void + { + // port_id is the owner key the ports are matched back by, it must be selected + $vp_rows = $os->getDevice()->juniAtmVps()->with('port:port_id,ifIndex')->get(); + + if ($vp_rows->isEmpty()) { + return; + } + + $vp_cache = SnmpQuery::mibs(['Juniper-UNI-ATM-MIB'])->hideMib()->cache()->walk([ + 'juniAtmVpStatsInCells', + 'juniAtmVpStatsInPackets', + 'juniAtmVpStatsInPacketOctets', + 'juniAtmVpStatsInPacketErrors', + 'juniAtmVpStatsOutCells', + 'juniAtmVpStatsOutPackets', + 'juniAtmVpStatsOutPacketOctets', + 'juniAtmVpStatsOutPacketErrors', + ])->valuesByIndex(); + + $rrd_def = RrdDefinition::make() + ->addDataset('incells', 'DERIVE', 0, 125000000000) + ->addDataset('outcells', 'DERIVE', 0, 125000000000) + ->addDataset('inpackets', 'DERIVE', 0, 125000000000) + ->addDataset('outpackets', 'DERIVE', 0, 125000000000) + ->addDataset('inpacketoctets', 'DERIVE', 0, 125000000000) + ->addDataset('outpacketoctets', 'DERIVE', 0, 125000000000) + ->addDataset('inpacketerrors', 'DERIVE', 0, 125000000000) + ->addDataset('outpacketerrors', 'DERIVE', 0, 125000000000); + + $progress = ProgressList::start('ATM VPs'); + foreach ($vp_rows as $vp) { + $progress->mark('.'); + + $ifIndex = $vp->port->ifIndex; + $vp_id = $vp->vp_id; + $oid = "$ifIndex.$vp_id"; + + Log::debug("ATM VP $oid"); + + $t_vp = $vp_cache[$oid] ?? []; + + $rrd_name = ['vp', $ifIndex, $vp_id]; + + $fields = [ + 'incells' => $t_vp['juniAtmVpStatsInCells'] ?? null, + 'outcells' => $t_vp['juniAtmVpStatsOutCells'] ?? null, + 'inpackets' => $t_vp['juniAtmVpStatsInPackets'] ?? null, + 'outpackets' => $t_vp['juniAtmVpStatsOutPackets'] ?? null, + 'inpacketoctets' => $t_vp['juniAtmVpStatsInPacketOctets'] ?? null, + 'outpacketoctets' => $t_vp['juniAtmVpStatsOutPacketOctets'] ?? null, + 'inpacketerrors' => $t_vp['juniAtmVpStatsInPacketErrors'] ?? null, + 'outpacketerrors' => $t_vp['juniAtmVpStatsOutPacketErrors'] ?? null, + ]; + + $tags = ['ifIndex' => $ifIndex, 'vp_id' => $vp_id, 'rrd_name' => $rrd_name, 'rrd_def' => $rrd_def]; + $datastore->put($os->getDeviceArray(), 'atm-vp', $tags, $fields); + } + $progress->end(); + } + + /** + * @inheritDoc + */ + public function dataExists(Device $device): bool + { + return $device->juniAtmVps()->exists(); + } + + /** + * @inheritDoc + */ + public function cleanup(Device $device): int + { + return $device->juniAtmVps()->delete(); + } + + /** + * @return array{juniAtmVp: Collection}|null + */ + public function dump(Device $device, string $type): ?array + { + if ($type == 'polling') { + return null; + } + + return [ + 'juniAtmVp' => $device->juniAtmVps()->get() + ->sort(fn (JuniAtmVp $a, JuniAtmVp $b) => $a->port_id <=> $b->port_id ?: $a->vp_id <=> $b->vp_id) + ->values() + ->makeHidden(['id', 'juniAtmVp_id', 'laravel_through_key']), + ]; + } + + private function isJunoseAtmVpEnabled(OS $os): bool + { + return $os->getDevice()->os === 'junose' && (bool) LibrenmsConfig::get('enable_ports_junoseatmvp', false); + } +} diff --git a/LibreNMS/Modules/LegacyModule.php b/LibreNMS/Modules/LegacyModule.php index 0a1890573f6..173e989b52e 100644 --- a/LibreNMS/Modules/LegacyModule.php +++ b/LibreNMS/Modules/LegacyModule.php @@ -31,24 +31,23 @@ use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; use LibreNMS\Component; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\Interfaces\SupportsSubmodules; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; use LibreNMS\Util\Debug; use Symfony\Component\Yaml\Yaml; class LegacyModule implements Module, SupportsSubmodules { + use RequiresPollingMethod; + private array $module_deps = [ 'arp-table' => ['ports'], - 'bgp-peers' => ['ports', 'vrf', 'ipv4-addresses', 'ipv6-addresses'], - 'fdb-table' => ['ports', 'vlans'], 'transceivers' => ['ports'], 'vlans' => ['ports'], - 'vrf' => ['ports'], ]; /** @@ -59,6 +58,11 @@ public function dependencies(): array return $this->module_deps[$this->name] ?? []; } + public function pollingMethods(Device $device): array + { + return [PollingMethodType::Snmp]; + } + /** @var string[]|null */ private ?array $submodules = null; @@ -71,11 +75,6 @@ public function setSubmodules(?array $submodules): void $this->submodules = $submodules; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool - { - return $this->shouldPoll($os, $status, $connectivity); - } - public function discover(OS $os): void { if (! \LibreNMS\Util\Module::legacyDiscoveryExists($this->name)) { @@ -98,12 +97,6 @@ public function discover(OS $os): void } } - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool - { - // all legacy modules require snmp - return $status->isEnabled() && $connectivity->snmpIsAvailable(); - } - public function poll(OS $os, DataStorageInterface $datastore): void { if (! \LibreNMS\Util\Module::legacyPollingExists($this->name)) { @@ -216,7 +209,7 @@ private function moduleDumpDefinition(): array private function collectComponents(int $device_id): array { - $components = (new Component())->getComponents($device_id)[$device_id] ?? []; + $components = new Component()->getComponents($device_id)[$device_id] ?? []; $components = Arr::sort($components, fn ($item) => $item['type'] . $item['label']); return array_values($components); diff --git a/LibreNMS/Modules/MacAccounting.php b/LibreNMS/Modules/MacAccounting.php index da8d57cf7a4..036d12b5071 100644 --- a/LibreNMS/Modules/MacAccounting.php +++ b/LibreNMS/Modules/MacAccounting.php @@ -29,17 +29,19 @@ use App\Facades\PortCache; use App\Models\Device; use App\Observers\ModuleModelObserver; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Discovery\MacAccountingDiscovery; use LibreNMS\Interfaces\Module; use LibreNMS\Interfaces\Polling\MacAccountingPolling; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Traits\RequiresPollingMethod; class MacAccounting implements Module { + use RequiresPollingMethod; + /** * @inheritDoc */ @@ -48,20 +50,9 @@ public function dependencies(): array return ['ports']; } - /** - * @inheritDoc - */ - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool - { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); - } - - /** - * @inheritDoc - */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** diff --git a/LibreNMS/Modules/Mef.php b/LibreNMS/Modules/Mef.php new file mode 100644 index 00000000000..bb63967ce69 --- /dev/null +++ b/LibreNMS/Modules/Mef.php @@ -0,0 +1,107 @@ +discoverMef(); + + if ($mefs === null) { + return; + } + + ModuleModelObserver::observe(MefInfo::class); + $this->syncModels($os->getDevice(), 'mefInfo', $mefs); + ModuleModelObserver::done(); + } + + /** + * @inheritDoc + */ + public function poll(OS $os, DataStorageInterface $datastore): void + { + $device = $os->getDevice(); + $mef_links = $device->mefInfo()->get(); + + if ($mef_links->isEmpty()) { + return; + } + + foreach ($os->pollMef($mef_links) as $mef) { + $mefIdent = $mef->getOriginal('mefIdent'); + if ($mefIdent !== null) { + foreach ($mef->getDirty() as $property => $value) { + Eventlog::log('MEF Link : ' . $mefIdent . ' (' . preg_replace('/^mef/', '', (string) $mef->getOriginal($property)) . ') -> ' . $value, $device->device_id); + } + } + + $mef->save(); + } + } + + /** + * @inheritDoc + */ + public function dataExists(Device $device): bool + { + return $device->mefInfo()->exists(); + } + + /** + * @inheritDoc + */ + public function cleanup(Device $device): int + { + return $device->mefInfo()->delete(); + } + + /** + * @return array{mefinfo: Collection}|null + */ + public function dump(Device $device, string $type): ?array + { + if ($type != 'discovery') { + return null; + } + + return [ + 'mefinfo' => $device->mefInfo()->get() + ->sort(fn (MefInfo $a, MefInfo $b) => $a->mefID <=> $b->mefID) + ->values() + ->makeHidden(['id', 'device_id']), + ]; + } +} diff --git a/LibreNMS/Modules/Mempools.php b/LibreNMS/Modules/Mempools.php index d197e4fd37d..42130f08d63 100644 --- a/LibreNMS/Modules/Mempools.php +++ b/LibreNMS/Modules/Mempools.php @@ -29,19 +29,21 @@ use App\Models\Device; use App\Models\Mempool; use App\Observers\ModuleModelObserver; +use Illuminate\Database\Eloquent\Collection as EloquentCollection; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; +use LibreNMS\Interfaces\Discovery\MempoolsDiscovery; use LibreNMS\Interfaces\Module; use LibreNMS\Interfaces\Polling\MempoolsPolling; +use LibreNMS\Interfaces\RemovesMethodData; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\RRD\RrdDefinition; use LibreNMS\Util\Number; -class Mempools implements Module +class Mempools implements Module, RemovesMethodData { use SyncsModels; @@ -53,57 +55,75 @@ public function dependencies(): array return []; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + /** + * In order of preference, SNMP knows more about the device than the agent, so its mempools are preferred. + */ + public function pollingMethods(Device $device): array + { + return [PollingMethodType::Snmp, PollingMethodType::UnixAgent]; + } + + public function shouldDiscover(OS $os): bool { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return $this->preferredMethod($os) !== null; } + /** + * Mempools come from one method: the most preferred enabled method that has mempools for this device. + * Its mempools replace those of other methods, so a device polled by several methods has no duplicates. + * Methods after one that is down are not tried, so mempools do not move to another method while it is down. + * When no method has mempools, the existing ones are kept, so an incomplete agent output does not remove them. + */ public function discover(OS $os): void { - $mempools = $os->discoverMempools()->filter(function (Mempool $mempool) { - if ($mempool->isValid()) { - return true; + foreach ($this->enabledMethods($os->getDevice()) as $type) { + if (! $os->getMethodResults()->isAvailable($type)) { + break; } - $reason = 'Not enough data'; - if ($mempool->mempool_total <= 0) { - $reason = "Invalid total value $mempool->mempool_total"; - } + $mempools = $this->discoverValid($os, $type); + if ($mempools->isNotEmpty()) { + // check if linux or similar and calculate available ram + $this->calculateAvailable($mempools); - Log::debug("Rejecting Mempool $mempool->mempool_index $mempool->mempool_descr: $reason"); - Log::info('x'); + ModuleModelObserver::observe(Mempool::class); + $this->syncModelsFromMethod($os->getDevice(), 'mempools', $type, $mempools); - return false; - }); + Log::info(''); + $mempools->each($this->printMempool(...)); - // check if linux or similar and calculate available ram - $this->calculateAvailable($mempools); - - ModuleModelObserver::observe(Mempool::class); - $this->syncModels($os->getDevice(), 'mempools', $mempools); + return; + } + } - Log::info(''); - $mempools->each($this->printMempool(...)); + Log::info('No mempools found, keeping existing mempools'); } - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + /** + * Methods are only checked when the device has mempools from an enabled method. + */ + public function shouldPoll(OS $os): bool { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + $methods = $this->enabledMethods($os->getDevice()); + + return $os->getDevice()->mempools->contains(fn (Mempool $mempool): bool => in_array($mempool->polling_method, $methods, true)); } + /** + * Each mempool is polled by the method that discovered it, mempools of unavailable methods are skipped. + */ public function poll(OS $os, DataStorageInterface $datastore): void { - $mempools = $os->getDevice()->mempools; + $polled = new EloquentCollection; - if ($mempools->isEmpty()) { - return; + foreach ($os->getDevice()->mempools->groupBy(fn (Mempool $mempool): string => $mempool->polling_method->value) as $type => $mempools) { + $source = $os->dataSource(PollingMethodType::from($type), MempoolsPolling::class); + if ($source !== null) { + $polled = $polled->merge($source->pollMempools($mempools)); + } } - $os instanceof MempoolsPolling - ? $os->pollMempools($mempools) - : $this->defaultPolling($os, $mempools); - - $this->calculateAvailable($mempools)->each(function (Mempool $mempool) use ($os, $datastore): void { + $this->calculateAvailable($polled)->each(function (Mempool $mempool) use ($os, $datastore): void { $this->printMempool($mempool); if (empty($mempool->mempool_class)) { @@ -135,27 +155,46 @@ public function poll(OS $os, DataStorageInterface $datastore): void } /** - * @param OS $os - * @param Collection $mempools - * @return Collection + * The valid mempools of a method. + * + * @return Collection */ - private function defaultPolling($os, $mempools) + private function discoverValid(OS $os, PollingMethodType $type): Collection { - // fetch all data - $oids = $mempools->map->only(['mempool_perc_oid', 'mempool_used_oid', 'mempool_free_oid', 'mempool_total_oid']) - ->flatten()->filter()->unique()->values()->all(); - $data = snmp_get_multi_oid($os->getDeviceArray(), $oids); - - $mempools->each(function (Mempool $mempool) use ($data): void { - $mempool->fillUsage( - $data[(string) $mempool->mempool_used_oid] ?? null, - $data[(string) $mempool->mempool_total_oid] ?? null, - $data[(string) $mempool->mempool_free_oid] ?? null, - $data[(string) $mempool->mempool_perc_oid] ?? null - ); + return ($os->dataSource($type, MempoolsDiscovery::class)?->discoverMempools() ?? new Collection)->filter(function (Mempool $mempool) { + if ($mempool->isValid()) { + return true; + } + + $reason = 'Not enough data'; + if ($mempool->mempool_total <= 0) { + $reason = "Invalid total value $mempool->mempool_total"; + } + + Log::debug("Rejecting Mempool $mempool->mempool_index $mempool->mempool_descr: $reason"); + Log::info('x'); + + return false; }); + } - return $mempools; + /** + * The most preferred enabled method, null when it is not available. + * Does not fall back to other methods, so mempools are kept while the preferred method is down. + */ + private function preferredMethod(OS $os): ?PollingMethodType + { + $type = $this->enabledMethods($os->getDevice())[0] ?? null; + + return $type !== null && $os->getMethodResults()->isAvailable($type) ? $type : null; + } + + /** + * @return list + */ + private function enabledMethods(Device $device): array + { + return array_values(array_filter($this->pollingMethods($device), $device->polling()->isEnabled(...))); } public function dataExists(Device $device): bool @@ -163,6 +202,11 @@ public function dataExists(Device $device): bool return $device->mempools()->exists(); } + public function removeMethodData(Device $device, PollingMethodType $type): void + { + $device->mempools()->where('polling_method', $type)->delete(); + } + public function cleanup(Device $device): int { return $device->mempools()->delete(); @@ -175,7 +219,7 @@ public function dump(Device $device, string $type): ?array { return [ 'mempools' => $device->mempools()->orderBy('mempool_type')->orderBy('mempool_id') - ->get()->map->makeHidden(['device_id', 'mempool_id']), + ->get()->map->makeHidden(['device_id', 'mempool_id', 'polling_method']), // test data is all snmp ]; } diff --git a/LibreNMS/Modules/Mpls.php b/LibreNMS/Modules/Mpls.php index 0885d66643c..d8f87dc3997 100644 --- a/LibreNMS/Modules/Mpls.php +++ b/LibreNMS/Modules/Mpls.php @@ -31,17 +31,18 @@ use App\Models\Device; use App\Observers\ModuleModelObserver; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Discovery\MplsDiscovery; use LibreNMS\Interfaces\Module; use LibreNMS\Interfaces\Polling\MplsPolling; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; class Mpls implements Module { use SyncsModels; + use RequiresPollingMethod; /** * @inheritDoc @@ -51,9 +52,14 @@ public function dependencies(): array return ['ports', 'vrf']; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable() && $os instanceof MplsDiscovery; + return [PollingMethodType::Snmp]; + } + + public function shouldDiscover(OS $os): bool + { + return $this->hasAvailableMethod($os) && $os instanceof MplsDiscovery; } /** @@ -99,9 +105,9 @@ public function discover(OS $os): void } } - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldPoll(OS $os): bool { - return $status->isEnabled() && $connectivity->snmpIsAvailable() && $os instanceof MplsPolling; + return $this->hasAvailableMethod($os) && $os instanceof MplsPolling; } /** diff --git a/LibreNMS/Modules/Nac.php b/LibreNMS/Modules/Nac.php index 1f14535b9d4..e7ab09c0cca 100644 --- a/LibreNMS/Modules/Nac.php +++ b/LibreNMS/Modules/Nac.php @@ -30,15 +30,17 @@ use App\Models\PortsNac; use App\Observers\ModuleModelObserver; use Illuminate\Support\Facades\DB; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\Interfaces\Polling\NacPolling; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; class Nac implements Module { + use RequiresPollingMethod; + /** * @inheritDoc */ @@ -47,7 +49,12 @@ public function dependencies(): array return ['ports']; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array + { + return [PollingMethodType::Snmp]; + } + + public function shouldDiscover(OS $os): bool { return false; } @@ -63,9 +70,9 @@ public function discover(OS $os): void // not implemented } - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldPoll(OS $os): bool { - return $status->isEnabled() && $connectivity->snmpIsAvailable() && $os instanceof NacPolling; + return $this->hasAvailableMethod($os) && $os instanceof NacPolling; } /** diff --git a/LibreNMS/Modules/Netstats.php b/LibreNMS/Modules/Netstats.php index 53aae0ddd68..c2aab634808 100644 --- a/LibreNMS/Modules/Netstats.php +++ b/LibreNMS/Modules/Netstats.php @@ -28,6 +28,7 @@ use App\Models\Device; use Illuminate\Support\Facades\Log; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\Interfaces\Polling\Netstats\IcmpNetstatsPolling; @@ -37,12 +38,13 @@ use LibreNMS\Interfaces\Polling\Netstats\TcpNetstatsPolling; use LibreNMS\Interfaces\Polling\Netstats\UdpNetstatsPolling; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Traits\RequiresPollingMethod; class Netstats implements Module { + use RequiresPollingMethod; + /** * @inheritDoc */ @@ -51,6 +53,11 @@ public function dependencies(): array return []; } + public function pollingMethods(Device $device): array + { + return [PollingMethodType::Snmp]; + } + /** * @var string[][] */ @@ -179,7 +186,7 @@ public function dependencies(): array 'tcp' => TcpNetstatsPolling::class, ]; - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldDiscover(OS $os): bool { return false; } @@ -192,11 +199,6 @@ public function discover(OS $os): void // no discovery } - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool - { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); - } - /** * @inheritDoc */ @@ -205,7 +207,7 @@ public function poll(OS $os, DataStorageInterface $datastore): void foreach ($this->types as $type => $interface) { if ($os instanceof $interface) { Log::info("$type "); - $method = (new \ReflectionClass($interface))->getMethods()[0]->getName(); + $method = new \ReflectionClass($interface)->getMethods()[0]->getName(); $data = $os->$method($this->oids[$type]); // we have data, update it diff --git a/LibreNMS/Modules/Os.php b/LibreNMS/Modules/Os.php index 18e96824bdb..a960ee07d0a 100644 --- a/LibreNMS/Modules/Os.php +++ b/LibreNMS/Modules/Os.php @@ -31,17 +31,19 @@ use App\Models\Location; use App\Observers\DeviceObserver; use Illuminate\Support\Facades\Log; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Enum\Severity; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\Interfaces\Polling\OSPolling; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; use LibreNMS\Util\Url; use SnmpQuery; class Os implements Module { + use RequiresPollingMethod; + /** * @inheritDoc */ @@ -50,9 +52,9 @@ public function dependencies(): array return []; } - public function shouldDiscover(\LibreNMS\OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } public function discover(\LibreNMS\OS $os): void @@ -80,11 +82,6 @@ public function discover(\LibreNMS\OS $os): void $this->handleChanges($os); } - public function shouldPoll(\LibreNMS\OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool - { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); - } - public function poll(\LibreNMS\OS $os, DataStorageInterface $datastore): void { $deviceModel = $os->getDevice(); /** @var Device $deviceModel */ diff --git a/LibreNMS/Modules/Ospf.php b/LibreNMS/Modules/Ospf.php index d7757998eaa..454c2d78ae3 100644 --- a/LibreNMS/Modules/Ospf.php +++ b/LibreNMS/Modules/Ospf.php @@ -35,16 +35,18 @@ use App\Observers\ModuleModelObserver; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Traits\RequiresPollingMethod; use SnmpQuery; class Ospf implements Module { + use RequiresPollingMethod; + /** * @inheritDoc */ @@ -53,7 +55,12 @@ public function dependencies(): array return ['ports']; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array + { + return [PollingMethodType::Snmp]; + } + + public function shouldDiscover(OS $os): bool { return false; } @@ -66,11 +73,6 @@ public function discover(OS $os): void // no discovery } - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool - { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); - } - /** * @inheritDoc */ @@ -129,7 +131,7 @@ public function poll(OS $os, DataStorageInterface $datastore): void Log::info("Total processes: $instance_count"); if ($instance_count == 0) { // if there are no instances, don't check for areas, neighbors, and ports - return; + continue; } ModuleModelObserver::observe(OspfArea::class, 'Areas'); @@ -248,6 +250,13 @@ public function poll(OS $os, DataStorageInterface $datastore): void $tags = ['rrd_def' => $rrd_def]; $datastore->put($os->getDeviceArray(), 'ospf-statistics', $tags, $fields); } + + // contexts that are not walked keep their data until their VRF is gone + $device = $os->getDevice(); + $contexts = [...$device->getVrfContexts(), ...$device->getSkippedVrfContexts()]; + foreach (['ospfInstances', 'ospfAreas', 'ospfPorts', 'ospfNbrs'] as $relationship) { + $device->$relationship()->whereNotIn('context_name', $contexts)->delete(); + } } public function dataExists(Device $device): bool diff --git a/LibreNMS/Modules/Ospfv3.php b/LibreNMS/Modules/Ospfv3.php index 49b3788a1a4..52f8cfbe344 100644 --- a/LibreNMS/Modules/Ospfv3.php +++ b/LibreNMS/Modules/Ospfv3.php @@ -36,13 +36,13 @@ use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Models\Keyable; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Traits\RequiresPollingMethod; use LibreNMS\Util\IP; use LibreNMS\Util\IPv4; use SnmpQuery; @@ -50,6 +50,7 @@ class Ospfv3 implements Module { use SyncsModels; + use RequiresPollingMethod; /** * @inheritDoc @@ -59,9 +60,9 @@ public function dependencies(): array return ['ports', 'vrf']; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** @@ -98,7 +99,7 @@ public function discover(OS $os): void return; } - $this->syncModels($os->getDevice(), 'ospfv3Instances', $instances); + $this->syncVrfContextModels($os->getDevice(), 'ospfv3Instances', $instances); Log::info(' (Total processes: ' . $instances->count() . ')'); ModuleModelObserver::observe(Ospfv3Area::class, 'Areas'); @@ -107,7 +108,7 @@ public function discover(OS $os): void ->walk('OSPFV3-MIB::ospfv3AreaTable') ->mapTable(fn ($ospf_area, $ospfv3AreaId) => $this->createArea($ospfv3AreaId, $instance, $ospf_area)))->flatten(); // flatten one level - $ospf_areas = $this->syncModels($os->getDevice(), 'ospfv3Areas', $ospf_areas); + $ospf_areas = $this->syncVrfContextModels($os->getDevice(), 'ospfv3Areas', $ospf_areas); Log::info(' (Total areas: ' . $ospf_areas->count() . ')'); ModuleModelObserver::observe(Ospfv3Port::class, 'Ports'); @@ -116,7 +117,7 @@ public function discover(OS $os): void ->walk('OSPFV3-MIB::ospfv3IfTable') ->mapTable(fn ($ospf_port, $ospfv3IfIndex, $ospfv3IfInstId) => $this->createPort($ospfv3IfIndex, $ospfv3IfInstId, $instance, $ospf_areas, $ospf_port)))->flatten(); // flatten one level - $this->syncModels($os->getDevice(), 'ospfv3Ports', $ospf_ports); + $this->syncVrfContextModels($os->getDevice(), 'ospfv3Ports', $ospf_ports); Log::info(' (Total ports: ' . $ospf_ports->count() . ')'); ModuleModelObserver::observe(Ospfv3Nbr::class, 'Neighbors'); @@ -125,22 +126,17 @@ public function discover(OS $os): void ->walk('OSPFV3-MIB::ospfv3NbrTable') ->mapTable(fn ($ospf_nbr, $ospfv3NbrIfIndex, $ospfv3NbrIfInstId, $ospfv3NbrRtrId) => $this->createNeighbor($ospfv3NbrIfIndex, $ospfv3NbrIfInstId, $ospfv3NbrRtrId, $instance, $ospf_nbr)))->flatten(); // flatten one level - $this->syncModels($os->getDevice(), 'ospfv3Nbrs', $ospf_neighbors); + $this->syncVrfContextModels($os->getDevice(), 'ospfv3Nbrs', $ospf_neighbors); Log::info(' (Total neighbors: ' . $ospf_neighbors->count() . ')'); } - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool - { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); - } - /** * @inheritDoc */ public function poll(OS $os, DataStorageInterface $datastore): void { $device = $os->getDevice(); - $instances = $device->ospfv3Instances; + $instances = $device->ospfv3Instances->whereIn('context_name', $device->getVrfContexts()); if ($instances->isEmpty()) { return; @@ -172,7 +168,7 @@ public function poll(OS $os, DataStorageInterface $datastore): void // fill data in new areas $this->fillNew($device->ospfv3Areas, $ospf_areas, $this->fetchAndFillArea(...)); - $ospf_areas = $this->syncModels($device, 'ospfv3Areas', $ospf_areas); + $ospf_areas = $this->syncVrfContextModels($device, 'ospfv3Areas', $ospf_areas); ModuleModelObserver::done(); // Ports @@ -188,7 +184,7 @@ public function poll(OS $os, DataStorageInterface $datastore): void ])->mapTable(fn ($ospf_port, $ospfv3IfIndex, $ospfv3IfInstId) => $this->createPort($ospfv3IfIndex, $ospfv3IfInstId, $instance, $ospf_areas, $ospf_port)))->flatten(); $this->fillNew($device->ospfv3Ports, $ospf_ports, $this->fetchAndFillPort(...)); - $this->syncModels($device, 'ospfv3Ports', $ospf_ports); + $this->syncVrfContextModels($device, 'ospfv3Ports', $ospf_ports); ModuleModelObserver::done(); // Neighbors @@ -201,7 +197,7 @@ public function poll(OS $os, DataStorageInterface $datastore): void ])->mapTable(fn ($ospf_nbr, $ospfv3NbrIfIndex, $ospfv3NbrIfInstId, $ospfv3NbrRtrId) => $this->createNeighbor($ospfv3NbrIfIndex, $ospfv3NbrIfInstId, $ospfv3NbrRtrId, $instance, $ospf_nbr)))->flatten(); $this->fillNew($device->ospfv3Nbrs, $ospf_neighbors, $this->fetchAndFillNeighbor(...)); - $this->syncModels($device, 'ospfv3Nbrs', $ospf_neighbors); + $this->syncVrfContextModels($device, 'ospfv3Nbrs', $ospf_neighbors); ModuleModelObserver::done(); // Create device-wide statistics RRD diff --git a/LibreNMS/Modules/PortSecurity.php b/LibreNMS/Modules/PortSecurity.php index f81c962b8a1..d96baf6243f 100644 --- a/LibreNMS/Modules/PortSecurity.php +++ b/LibreNMS/Modules/PortSecurity.php @@ -29,17 +29,18 @@ use App\Models\Device; use App\Observers\ModuleModelObserver; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Discovery\PortSecurityDiscovery; use LibreNMS\Interfaces\Module; use LibreNMS\Interfaces\Polling\PortSecurityPolling; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; class PortSecurity implements Module { use SyncsModels; + use RequiresPollingMethod; /** * @inheritDoc @@ -49,9 +50,14 @@ public function dependencies(): array return []; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable() && $os instanceof PortSecurityDiscovery; + return [PollingMethodType::Snmp]; + } + + public function shouldDiscover(OS $os): bool + { + return $this->hasAvailableMethod($os) && $os instanceof PortSecurityDiscovery; } /** @@ -62,9 +68,9 @@ public function discover(OS $os): void $this->poll($os, app('Datastore')); } - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldPoll(OS $os): bool { - return $status->isEnabled() && $connectivity->snmpIsAvailable() && $os instanceof PortSecurityPolling; + return $this->hasAvailableMethod($os) && $os instanceof PortSecurityPolling; } /** diff --git a/LibreNMS/Modules/PortsStack.php b/LibreNMS/Modules/PortsStack.php index c094cb93740..aabb6756088 100644 --- a/LibreNMS/Modules/PortsStack.php +++ b/LibreNMS/Modules/PortsStack.php @@ -32,15 +32,16 @@ use App\Observers\ModuleModelObserver; use Illuminate\Support\Facades\Log; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; class PortsStack implements Module { use SyncsModels; + use RequiresPollingMethod; /** * @inheritDoc @@ -50,20 +51,9 @@ public function dependencies(): array return ['ports']; } - /** - * @inheritDoc - */ - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool - { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); - } - - /** - * @inheritDoc - */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** diff --git a/LibreNMS/Modules/PrinterSupplies.php b/LibreNMS/Modules/PrinterSupplies.php index d4453dab3c8..a18b8e4f2ea 100644 --- a/LibreNMS/Modules/PrinterSupplies.php +++ b/LibreNMS/Modules/PrinterSupplies.php @@ -29,14 +29,14 @@ use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Enum\Severity; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\Interfaces\PrinterSuppliesContext; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Traits\RequiresPollingMethod; use LibreNMS\Util\Number; use LibreNMS\Util\StringHelpers; use SnmpQuery; @@ -44,6 +44,7 @@ class PrinterSupplies implements Module { use SyncsModels; + use RequiresPollingMethod; /** * @inheritDoc @@ -53,9 +54,9 @@ public function dependencies(): array return []; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** @@ -81,11 +82,6 @@ public function discover(OS $os): void ModuleModelObserver::done(); } - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool - { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); - } - /** * Poll data for this module and update the DB / RRD. * Try to keep this efficient and only run if discovery has indicated there is a reason to run. diff --git a/LibreNMS/Modules/Processors.php b/LibreNMS/Modules/Processors.php new file mode 100644 index 00000000000..11f24c8bf61 --- /dev/null +++ b/LibreNMS/Modules/Processors.php @@ -0,0 +1,127 @@ +discoverProcessors()->filter(function (Processor $processor) { + if ($processor->processor_usage !== null) { + return true; + } + + Log::debug("Rejecting Processor $processor->processor_type $processor->processor_index $processor->processor_descr: no usage value"); + + return false; + }); + + ModuleModelObserver::observe(Processor::class); + $this->syncModels($os->getDevice(), 'processors', $processors); + ModuleModelObserver::done(); + } + + /** + * @inheritDoc + */ + public function poll(OS $os, WriteInterface $datastore): void + { + $processors = $os->getDevice()->processors; + + if ($processors->isEmpty()) { + return; + } + + $processors->each(fn (Processor $p) => $p->processor_usage = null); + + if ($os instanceof ProcessorPolling) { + $processors = $os->pollProcessors($processors); + } else { + $oids = $processors->pluck('processor_oid')->filter()->all(); + if ($oids) { + $data = SnmpQuery::numeric()->get($oids)->values(); + foreach ($processors as $processor) { + if (array_key_exists($processor->processor_oid, $data)) { + $processor->processor_usage = $data[$processor->processor_oid]; + } + } + } + } + + // update + $rrd_def = RrdDefinition::make()->addDataset('usage', 'GAUGE', -273, 1000); + foreach ($processors as $processor) { + $usage = $processor->processor_usage === null ? null : round($processor->processor_usage, 2); + Log::info("$processor->processor_descr: $usage%"); + + $metric = $processor->setRelation('device', $os->getDevice())->metricIdentity('processor'); + $datastore->write($metric->measurement, ['usage' => $usage], $metric->tags, ['metric' => $metric, 'rrd_def' => $rrd_def]); + + // store null usage when polling fails so a stale value is not shown + $processor->save(); + } + } + + /** + * @inheritDoc + */ + public function dataExists(Device $device): bool + { + return $device->processors()->exists(); + } + + /** + * @inheritDoc + */ + public function cleanup(Device $device): int + { + return $device->processors()->delete(); + } + + /** + * @return array{processors: Collection} + */ + public function dump(Device $device, string $type): ?array + { + return [ + 'processors' => $device->processors()->get() + ->sort(fn (Processor $a, Processor $b) => strcmp($a->processor_type, $b->processor_type) ?: strnatcmp($a->processor_index, $b->processor_index)) + ->values() + ->makeHidden(['device_id', 'processor_id', 'processor_perc_warn_custom']), + ]; + } +} diff --git a/LibreNMS/Modules/Qos.php b/LibreNMS/Modules/Qos.php index 32f49e973ad..5d6ca9f7424 100644 --- a/LibreNMS/Modules/Qos.php +++ b/LibreNMS/Modules/Qos.php @@ -27,18 +27,19 @@ use App\Models\Device; use App\Observers\ModuleModelObserver; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Discovery\QosDiscovery; use LibreNMS\Interfaces\Module; use LibreNMS\Interfaces\Polling\QosPolling; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Traits\RequiresPollingMethod; class Qos implements Module { use SyncsModels; + use RequiresPollingMethod; /** * @inheritDoc @@ -48,9 +49,14 @@ public function dependencies(): array return []; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable() && $os instanceof QosDiscovery; + return [PollingMethodType::Snmp]; + } + + public function shouldDiscover(OS $os): bool + { + return $this->hasAvailableMethod($os) && $os instanceof QosDiscovery; } /** @@ -69,9 +75,9 @@ public function discover(OS $os): void } } - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldPoll(OS $os): bool { - return $status->isEnabled() && $connectivity->snmpIsAvailable() && $os instanceof QosPolling; + return $this->hasAvailableMethod($os) && $os instanceof QosPolling; } /** diff --git a/LibreNMS/Modules/Routes.php b/LibreNMS/Modules/Routes.php index 741a59aa222..ac649e00a4c 100644 --- a/LibreNMS/Modules/Routes.php +++ b/LibreNMS/Modules/Routes.php @@ -30,18 +30,17 @@ use App\Facades\PortCache; use App\Models\Device; use App\Models\Route; -use App\Observers\ModuleModelObserver; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; -use LibreNMS\DB\SyncsModels; +use LibreNMS\DB\BulkTableSync; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Exceptions\InvalidIpException; use LibreNMS\Exceptions\TooManyRoutes; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Discovery\RouteDiscovery; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; use LibreNMS\Util\IPv4; use LibreNMS\Util\IPv6; use LibreNMS\Util\Number; @@ -49,7 +48,7 @@ class Routes implements Module { - use SyncsModels; + use RequiresPollingMethod; /** * @inheritDoc @@ -59,18 +58,15 @@ public function dependencies(): array return ['ports']; } - /** - * @inheritDoc - */ - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** * @inheritDoc */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldPoll(OS $os): bool { return false; } @@ -80,7 +76,7 @@ public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $con */ public function discover(OS $os): void { - $update_timestamp = \Carbon\Carbon::now(); + $update_timestamp = \Carbon\Carbon::now()->toDateTimeString(); $max_routes = (int) LibrenmsConfig::get('routes_max_number') ?: 1000; $routesFromOs = new Collection; @@ -102,7 +98,7 @@ public function discover(OS $os): void } } - $routes = $routesFromOs->merge($routesFromDiscovery)->filter(function ($data) use ($update_timestamp) { + $routes = $routesFromOs->merge($routesFromDiscovery)->filter(function ($data) { $dst = trim(str_replace('"', '', $data->inetCidrRouteDest ?? '')); $hop = trim(str_replace('"', '', $data->inetCidrRouteNextHop ?? '')); $context = trim(str_replace('"', '', $data->context_name ?? '')); @@ -143,7 +139,6 @@ public function discover(OS $os): void return null; } - $data->updated_at = $update_timestamp; $data->port_id ??= 0; $data->context_name = $context; $data->inetCidrRouteIfIndex = intval($data->inetCidrRouteIfIndex); @@ -161,16 +156,11 @@ public function discover(OS $os): void return $data; }); - ModuleModelObserver::observe(Route::class); - - $routesExisting = $os->getDevice()->routes()->get()->transform(function ($row) { - unset($row->route_id); - - return $row; - }); - $this->syncModels($os->getDevice(), 'routes', $this->fillNew($routesExisting, $routes)); - // We add (or update) routes, but old ones are kept for history - // Cleaning is done in `daily`. + $sync = new BulkTableSync($os->getDevice()->routes(), 'inetCidrRouteDest'); + // Only observed routes are refreshed; absent routes remain as history + // until daily cleanup removes them. + $counts = $sync->sync($routes, $update_timestamp); + Log::info("Routes: {$counts['inserted']} added, {$counts['updated']} updated, {$counts['unchanged']} unchanged, {$counts['deleted']} duplicates removed"); } /** diff --git a/LibreNMS/Modules/Services.php b/LibreNMS/Modules/Services.php index 23b06dd5d08..503eafa0d04 100644 --- a/LibreNMS/Modules/Services.php +++ b/LibreNMS/Modules/Services.php @@ -27,15 +27,18 @@ use App\Http\Controllers\ServiceTemplateController; use App\Models\Device; use App\Models\Service; +use LibreNMS\Enum\DeviceType; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\Services as ServicesHelper; +use LibreNMS\Traits\RequiresPollingMethod; use SnmpQuery; class Services implements Module { + use RequiresPollingMethod; + /** * @inheritDoc */ @@ -44,20 +47,25 @@ public function dependencies(): array return []; } + public function pollingMethods(Device $device): array + { + return [PollingMethodType::Snmp]; + } + /** * @inheritDoc */ - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldDiscover(OS $os): bool { $device = $os->getDevice(); - if (! $status->isEnabled() || ! $connectivity->snmpIsAvailable()) { + if (! $this->hasAvailableMethod($os)) { return false; } // Run discovery when either templates or service autodiscovery are enabled. return LibrenmsConfig::get('discover_services_templates') - || (LibrenmsConfig::get('discover_services') && $device->type === 'server'); + || (LibrenmsConfig::get('discover_services') && $device->type === DeviceType::Server->value); } /** @@ -68,14 +76,14 @@ public function discover(OS $os): void $device = $os->getDeviceArray(); if (LibrenmsConfig::get('discover_services_templates')) { - (new ServiceTemplateController())->applyDeviceAll($device['device_id']); + new ServiceTemplateController()->applyDeviceAll($device['device_id']); } if (! LibrenmsConfig::get('discover_services')) { return; } - if (($device['type'] ?? null) !== 'server') { + if (($device['type'] ?? null) !== DeviceType::Server->value) { return; } @@ -104,7 +112,7 @@ public function discover(OS $os): void /** * @inheritDoc */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldPoll(OS $os): bool { // Services currently only support discovery, not polling. return false; diff --git a/LibreNMS/Modules/Slas.php b/LibreNMS/Modules/Slas.php index c1f5b814512..a6fc428f46d 100644 --- a/LibreNMS/Modules/Slas.php +++ b/LibreNMS/Modules/Slas.php @@ -25,18 +25,19 @@ use App\Models\Sla; use App\Observers\ModuleModelObserver; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Discovery\SlaDiscovery; use LibreNMS\Interfaces\Module; use LibreNMS\Interfaces\Polling\SlaPolling; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Traits\RequiresPollingMethod; class Slas implements Module { use SyncsModels; + use RequiresPollingMethod; /** * @inheritDoc @@ -46,9 +47,14 @@ public function dependencies(): array return []; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable() && $os instanceof SlaDiscovery; + return [PollingMethodType::Snmp]; + } + + public function shouldDiscover(OS $os): bool + { + return $this->hasAvailableMethod($os) && $os instanceof SlaDiscovery; } /** @@ -66,9 +72,9 @@ public function discover(OS $os): void } } - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldPoll(OS $os): bool { - return $status->isEnabled() && $connectivity->snmpIsAvailable() && $os instanceof SlaPolling; + return $this->hasAvailableMethod($os) && $os instanceof SlaPolling; } /** diff --git a/LibreNMS/Modules/Storage.php b/LibreNMS/Modules/Storage.php index cdcbc892137..4eff187b7fe 100644 --- a/LibreNMS/Modules/Storage.php +++ b/LibreNMS/Modules/Storage.php @@ -31,27 +31,29 @@ use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; +use LibreNMS\Exceptions\UncorrectableNegativeException; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\Interfaces\Polling\StoragePolling; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Traits\RequiresPollingMethod; use LibreNMS\Util\Number; class Storage implements Module { use SyncsModels; + use RequiresPollingMethod; public function dependencies(): array { return []; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** @@ -68,11 +70,6 @@ public function discover(OS $os): void $saved->each($this->printStorage(...)); } - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool - { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); - } - /** * @inheritDoc */ @@ -126,9 +123,20 @@ private function defaultPolling(Collection $storages): Collection $data = \SnmpQuery::numeric()->get($oids)->values(); return $storages->each(function (\App\Models\Storage $storage) use ($data): void { + $used = $data[(string) $storage->storage_used_oid] ?? null; + $total = $storage->storage_units ? $storage->storage_size / $storage->storage_units : null; + if ($storage->type == 'hrstorage' && is_numeric($used) && $used < 0) { + // signed Integer32 wrap, see HostResources::discoverStorage(), -1 is commonly "unknown" + try { + $used = ($used < -1 && $total) ? Number::correctIntegerOverflow($used, (int) $total) : null; + } catch (UncorrectableNegativeException) { + $used = null; + } + } + $storage->fillUsage( - $data[(string) $storage->storage_used_oid] ?? null, - $storage->storage_units ? $storage->storage_size / $storage->storage_units : null, + $used, + $total, $data[(string) $storage->storage_free_oid] ?? null, $data[(string) $storage->storage_perc_oid] ?? null, ); diff --git a/LibreNMS/Modules/Stp.php b/LibreNMS/Modules/Stp.php index 8478de21e4c..3b4872b58a6 100644 --- a/LibreNMS/Modules/Stp.php +++ b/LibreNMS/Modules/Stp.php @@ -30,15 +30,16 @@ use App\Models\PortStp; use App\Observers\ModuleModelObserver; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; class Stp implements Module { use SyncsModels; + use RequiresPollingMethod; /** * @inheritDoc @@ -48,9 +49,9 @@ public function dependencies(): array return ['ports', 'vlans']; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } public function discover(OS $os): void @@ -68,11 +69,6 @@ public function discover(OS $os): void ModuleModelObserver::done(); } - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool - { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); - } - public function poll(OS $os, DataStorageInterface $datastore): void { $device = $os->getDevice(); diff --git a/LibreNMS/Modules/Transceivers.php b/LibreNMS/Modules/Transceivers.php index 8f0392d9486..79882b7359c 100644 --- a/LibreNMS/Modules/Transceivers.php +++ b/LibreNMS/Modules/Transceivers.php @@ -30,28 +30,34 @@ use App\Models\Transceiver; use App\Observers\ModuleModelObserver; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Discovery\TransceiverDiscovery; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; class Transceivers implements Module { use SyncsModels; + use RequiresPollingMethod; public function dependencies(): array { return ['ports']; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable() && $os instanceof TransceiverDiscovery; + return [PollingMethodType::Snmp]; } - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldDiscover(OS $os): bool + { + return $this->hasAvailableMethod($os) && $os instanceof TransceiverDiscovery; + } + + public function shouldPoll(OS $os): bool { return false; } diff --git a/LibreNMS/Modules/UcdDiskio.php b/LibreNMS/Modules/UcdDiskio.php index 4a5f9e39659..625dd21a0e6 100644 --- a/LibreNMS/Modules/UcdDiskio.php +++ b/LibreNMS/Modules/UcdDiskio.php @@ -33,17 +33,18 @@ use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Traits\RequiresPollingMethod; use SnmpQuery; class UcdDiskio implements Module { use SyncsModels; + use RequiresPollingMethod; /** * @inheritDoc @@ -53,20 +54,9 @@ public function dependencies(): array return []; } - /** - * @inheritDoc - */ - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool - { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); - } - - /** - * @inheritDoc - */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** diff --git a/LibreNMS/Modules/UnixAgent.php b/LibreNMS/Modules/UnixAgent.php index 00d0bb30ccd..3bcf247bb79 100644 --- a/LibreNMS/Modules/UnixAgent.php +++ b/LibreNMS/Modules/UnixAgent.php @@ -41,9 +41,8 @@ use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Traits\RequiresPollingMethod; use LibreNMS\Util\Number; use LibreNMS\Util\ProgressList; @@ -68,10 +67,12 @@ */ class UnixAgent implements Module { + use RequiresPollingMethod; + /** * Agent sections that are applications and will be automatically enabled */ - private const AGENT_APPS = [ + private const array AGENT_APPS = [ 'apache', 'bind', 'ceph', @@ -81,7 +82,6 @@ class UnixAgent implements Module 'php-fpm', 'powerdns', 'powerdns-recursor', - 'proxmox', 'redis', 'rrdcached', 'tinydns', @@ -96,24 +96,21 @@ public function dependencies(): array return []; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return false; + return [PollingMethodType::UnixAgent]; } - /** - * @inheritDoc - */ - public function discover(OS $os): void + public function shouldDiscover(OS $os): bool { + return false; } /** * @inheritDoc */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function discover(OS $os): void { - return $status->isEnabled() && $connectivity->unixAgentIsAvailable(); } /** diff --git a/LibreNMS/Modules/Vlans.php b/LibreNMS/Modules/Vlans.php index fabebbaaeac..adc66351e2c 100644 --- a/LibreNMS/Modules/Vlans.php +++ b/LibreNMS/Modules/Vlans.php @@ -33,15 +33,16 @@ use App\Models\Vlan; use App\Observers\ModuleModelObserver; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Traits\RequiresPollingMethod; class Vlans implements Module { use SyncsModels; + use RequiresPollingMethod; /** * @inheritDoc @@ -51,24 +52,21 @@ public function dependencies(): array return ['ports']; } - /** - * @inheritDoc - */ - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** * @inheritDoc */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldPoll(OS $os): bool { if (defined('PHPUNIT_RUNNING')) { return false; // FIXME improve test suite to skip polling when polling data is null } - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return $this->hasAvailableMethod($os); } /** diff --git a/LibreNMS/Modules/Vminfo.php b/LibreNMS/Modules/Vminfo.php index 97c9b1def88..34aaaf97ae1 100644 --- a/LibreNMS/Modules/Vminfo.php +++ b/LibreNMS/Modules/Vminfo.php @@ -26,18 +26,28 @@ namespace LibreNMS\Modules; -use App\Facades\LibrenmsConfig; +use App\Data\TimeSeries\MetricCollector; use App\Models\Device; +use App\Models\Eventlog; +use App\Models\Vminfo as VminfoModel; use App\Observers\ModuleModelObserver; +use Illuminate\Support\Collection; use LibreNMS\DB\SyncsModels; -use LibreNMS\Interfaces\Data\DataStorageInterface; +use LibreNMS\Enum\PollingMethodType; +use LibreNMS\Enum\PowerState; +use LibreNMS\Enum\Severity; +use LibreNMS\Interfaces\Data\WriteInterface; use LibreNMS\Interfaces\Discovery\VminfoDiscovery; use LibreNMS\Interfaces\Polling\VminfoPolling; +use LibreNMS\Interfaces\RemovesMethodData; +use LibreNMS\Interfaces\VminfoClusterSource; +use LibreNMS\Interfaces\VminfoSource; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; +use LibreNMS\Polling\Method\PollingMethodRegistry; +use LibreNMS\RRD\RrdDefinition; +use Throwable; -class Vminfo implements \LibreNMS\Interfaces\Module +class Vminfo implements \LibreNMS\Interfaces\Module, RemovesMethodData { use SyncsModels; @@ -49,52 +59,183 @@ public function dependencies(): array return []; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - // libvirt does not use snmp, only ssh tunnels - return $status->isEnabled() - && (LibrenmsConfig::get('enable_libvirt') || $connectivity->snmpIsAvailable()) - && $os instanceof VminfoDiscovery; + // the OS is mostly a data source with snmp + return [...app(PollingMethodRegistry::class)->providing(VminfoDiscovery::class), PollingMethodType::Snmp]; + } + + public function removeMethodData(Device $device, PollingMethodType $type): void + { + $source = app(PollingMethodRegistry::class)->get($type)->dataSourceClass(); + + if ($source !== null && is_a($source, VminfoSource::class, true)) { + $device->vminfo()->whereIn('vm_type', $source::vmTypes())->delete(); + } + } + + public function shouldDiscover(OS $os): bool + { + return $os->dataSources(VminfoDiscovery::class) !== []; } /** - * @inheritDoc + * Each source syncs only the VMs of its types, so VMs from several sources are merged. */ public function discover(OS $os): void { - if ($os instanceof VminfoDiscovery) { - $vms = $os->discoverVminfo(); + $device = $os->getDevice(); + ModuleModelObserver::observe(VminfoModel::class); + + foreach ($os->dataSources(VminfoDiscovery::class) as $source) { + $this->isolated($device, $source, function () use ($source, $device): void { + $types = $source::vmTypes(); + $vms = $source->discoverVminfo()->whereIn('vm_type', $types); + + if ($source instanceof VminfoClusterSource) { + $this->syncClusterVms($device, $source, $vms); - ModuleModelObserver::observe(\App\Models\Vminfo::class); - $this->syncModels($os->getDevice(), 'vminfo', $vms); + return; + } + + $this->syncModels($device, 'vminfo', $vms, $device->vminfo->whereIn('vm_type', $types)); + }); } } - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function shouldPoll(OS $os): bool { - return $status->isEnabled() && $connectivity->snmpIsAvailable() && $os instanceof VminfoPolling; + // without discovered VMs there is nothing to poll, don't check the sources + // but a VM may migrate to a node of a cluster that has no VMs yet + if (! $this->dataExists($os->getDevice()) && $os->dataSources(VminfoClusterSource::class) === []) { + return false; + } + + return $os->dataSources(VminfoPolling::class) !== []; } /** * @inheritDoc */ - public function poll(OS $os, DataStorageInterface $datastore): void + public function poll(OS $os, WriteInterface $datastore): void { - if ($os->getDevice()->vminfo->isEmpty()) { - return; + $device = $os->getDevice(); + $definitions = $this->metricDefinitions(); + $metrics = new MetricCollector(array_keys($definitions)); + ModuleModelObserver::observe(VminfoModel::class); + + foreach ($os->dataSources(VminfoPolling::class) as $source) { + $this->isolated($device, $source, function () use ($source, $device, $metrics): void { + if ($source instanceof VminfoClusterSource) { + $this->claimMigratedVms($device, $source->clusterId(), $source->localVms()->map->getCompositeKey()->all()); + } + + $existing = $device->vminfo->whereIn('vm_type', $source::vmTypes()); + if ($existing->isEmpty()) { + return; + } + + $vms = $source->pollVminfo($existing->values(), $metrics); + $this->syncModels($device, 'vminfo', $vms, $existing); + }); } - if ($os instanceof VminfoPolling) { - $vms = $os->pollVminfo($os->getDevice()->vminfo); + foreach ($metrics->entries() as $entry) { + $metric = $entry->identity; + $datastore->write($metric->measurement, $entry->fields, $metric->tags, [ + 'metric' => $metric, + 'rrd_def' => $definitions[$metric->measurement], + ]); + } + } - ModuleModelObserver::observe(\App\Models\Vminfo::class); - $this->syncModels($os->getDevice(), 'vminfo', $vms); + /** + * Sync the VMs of one node of a cluster. A VM on another node is not removed: that node claims it, also if it is offline now. + * Only rows of this device are removed, a token may not see the whole cluster. + * + * @param Collection $vms the VMs of this node + */ + private function syncClusterVms(Device $device, VminfoClusterSource $source, Collection $vms): void + { + $local = $vms->map->getCompositeKey()->all(); + $this->claimMigratedVms($device, $source->clusterId(), $local); - return; + [$here, $others] = $device->vminfo->whereIn('vm_type', $source::vmTypes()) + ->partition(fn (VminfoModel $vm): bool => in_array($vm->getCompositeKey(), $local, true)); + + $inCluster = $source->clusterVms()->map->getCompositeKey()->all(); + [$elsewhere, $removed] = $others->partition(fn (VminfoModel $vm): bool => in_array($vm->getCompositeKey(), $inCluster, true)); + + $removed->each->delete(); + + // no node runs it right now, or the node that does is not polled + $elsewhere->each(fn (VminfoModel $vm) => $vm->fill(['vmwVmState' => PowerState::UNKNOWN])->save()); + + $this->syncModels($device, 'vminfo', $vms, $here); + } + + /** + * Move the VMs that migrated to this node here, they keep their row and metrics. + * + * @param list $local the composite keys of the VMs on this node + */ + private function claimMigratedVms(Device $device, string $clusterId, array $local): void + { + VminfoModel::where('cluster_id', $clusterId)->where('device_id', '!=', $device->device_id)->get() + ->filter(fn (VminfoModel $vm): bool => in_array($vm->getCompositeKey(), $local, true)) + ->each(function (VminfoModel $vm) use ($device): void { + $vm->device_id = $device->device_id; + $vm->save(); + }); + + $device->unsetRelation('vminfo'); + } + + /** + * A source that fails must not stop the other sources or lose their metrics. + * + * @param callable(): void $work + */ + private function isolated(Device $device, object $source, callable $work): void + { + try { + $work(); + } catch (Throwable $e) { + Eventlog::log('Error reading VMs from ' . class_basename($source) . ': ' . class_basename($e) . '. Check log file for more details.', $device, 'vminfo', Severity::Error); + report($e); } + } - // just run discovery again - $this->discover($os); + /** + * The measurements a data source may record. + * + * @return array + */ + private function metricDefinitions(): array + { + return [ + 'vm.cpu' => RrdDefinition::make() + ->addDataset('usage', 'GAUGE', 0), + 'vm.memory' => RrdDefinition::make() + ->addDataset('used', 'GAUGE', 0) + ->addDataset('total', 'GAUGE', 0), + 'vm.disk' => RrdDefinition::make() + ->addDataset('used', 'GAUGE', 0) + ->addDataset('total', 'GAUGE', 0), + 'vm.diskio' => RrdDefinition::make() + ->addDataset('read_bytes', 'DERIVE', 0) + ->addDataset('write_bytes', 'DERIVE', 0), + 'vm.diskops' => RrdDefinition::make() + ->addDataset('read_ops', 'DERIVE', 0) + ->addDataset('write_ops', 'DERIVE', 0) + ->addDataset('read_time_ns', 'DERIVE', 0) + ->addDataset('write_time_ns', 'DERIVE', 0) + ->addDataset('failed_reads', 'DERIVE', 0) + ->addDataset('failed_writes', 'DERIVE', 0), + 'vm.net' => RrdDefinition::make() + ->addDataset('in', 'DERIVE', 0) + ->addDataset('out', 'DERIVE', 0), + ]; } public function dataExists(Device $device): bool @@ -117,7 +258,7 @@ public function dump(Device $device, string $type): ?array { return [ 'vminfo' => $device->vminfo()->orderBy('vmwVmVMID') - ->get()->map->makeHidden(['id', 'device_id']), + ->get()->map->makeHidden(['id', 'device_id', 'cluster_id']), // only sources without test data set the cluster ]; } } diff --git a/LibreNMS/Modules/Vrf.php b/LibreNMS/Modules/Vrf.php new file mode 100644 index 00000000000..be67851b77b --- /dev/null +++ b/LibreNMS/Modules/Vrf.php @@ -0,0 +1,296 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace LibreNMS\Modules; + +use App\Models\Device; +use App\Models\Port; +use App\Models\Vrf as VrfModel; +use App\Observers\ModuleModelObserver; +use Illuminate\Support\Collection; +use Illuminate\Support\Facades\Log; +use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; +use LibreNMS\Exceptions\SnmpException; +use LibreNMS\Interfaces\Data\DataStorageInterface; +use LibreNMS\Interfaces\Module; +use LibreNMS\Interfaces\Polling\VrfPolling; +use LibreNMS\OS; +use LibreNMS\Traits\RequiresPollingMethod; +use SnmpQuery; + +class Vrf implements Module +{ + use SyncsModels; + use RequiresPollingMethod; + + /** a context that answered before is walked until it fails this many discoveries in a row */ + public const CONTEXT_FAILURE_LIMIT = 3; + + /** @var array */ + private array $answers = []; + + /** + * @return string[] + */ + public function dependencies(): array + { + return ['ports']; + } + + public function pollingMethods(Device $device): array + { + return [PollingMethodType::Snmp]; + } + + /** + * @inheritDoc + */ + public function discover(OS $os): void + { + $this->answers = []; + $this->syncVrfs($os, fn () => $os->discoverVrfs(), true); + } + + /** + * VRFs are polled with the OS polling if it has one, otherwise discovery runs again. + * Contexts are only checked by discovery, so a context that does not answer only delays discovery. + * + * @inheritDoc + */ + public function poll(OS $os, DataStorageInterface $datastore): void + { + if ($os->getDevice()->vrfs->isEmpty()) { + return; + } + + $this->syncVrfs($os, fn () => $os instanceof VrfPolling ? $os->pollVrfs($os->getDevice()->vrfs) : $os->discoverVrfs(), false); + } + + /** + * @inheritDoc + */ + public function dataExists(Device $device): bool + { + return $device->vrfs()->exists(); + } + + /** + * @inheritDoc + */ + public function cleanup(Device $device): int + { + $device->ports()->where('ifVrf', '!=', 0)->update(['ifVrf' => 0]); + + return $device->vrfs()->delete(); + } + + /** + * @return array{vrfs: array>} + */ + public function dump(Device $device, string $type): ?array + { + $ifIndexes = $device->ports()->where('ifVrf', '!=', 0)->orderBy('ifIndex')->get(['ifVrf', 'ifIndex'])->groupBy('ifVrf'); + + return [ + 'vrfs' => $device->vrfs()->orderBy('vrf_oid')->get()->map(fn (VrfModel $vrf) => $vrf->makeHidden(['vrf_id', 'device_id', 'context_failures', 'context_enabled', 'context_manual', 'vrf_manual'])->toArray() + [ + 'ifIndices' => $ifIndexes->has($vrf->vrf_id) ? $ifIndexes->get($vrf->vrf_id)->pluck('ifIndex')->implode(',') : null, + ])->all(), + ]; + } + + /** + * OS implementations throw SnmpException when the device did not answer a query whose result must be known. + * VRFs are left as they are then, removing them would remove their contexts and the data of every module. + * + * @param callable(): Collection $fetch + */ + private function syncVrfs(OS $os, callable $fetch, bool $checkContexts): void + { + $device = $os->getDevice(); + // copies, VrfPolling gets the saved VRFs and may return them changed + $existing = $device->vrfs->map(fn (VrfModel $vrf) => clone $vrf)->keyBy->getCompositeKey(); + $manual = $existing->where('context_manual', true); + + try { + $vrfs = $fetch(); + } catch (SnmpException $e) { + Log::warning('Device did not answer, VRFs were not updated: ' . $e->getMessage()); + + return; + } + + $vrfs = $vrfs->filter(fn (VrfModel $vrf) => $vrf->vrf_oid !== null && $vrf->vrf_oid !== '' && $vrf->vrf_name && ! $vrf->vrf_manual) + ->map(function (VrfModel $vrf): VrfModel { + if ($vrf->context_manual) { + $vrf->context_name = null; // VrfPolling hands back the saved VRFs, contexts users set are added below + } + + return $vrf->fill(['context_manual' => false, 'vrf_manual' => false]); + }); + $vrfs = $this->addManualContexts($vrfs, $manual); + + foreach ($vrfs as $vrf) { + $vrf->mplsVpnVrfDescription ??= ''; + if ($vrf->isDefault()) { + $vrf->context_name = null; // the default VRF is walked without a context + } + + $this->updateContextStatus($vrf, $existing->get($vrf->getCompositeKey()), $checkContexts); + } + + ModuleModelObserver::observe(VrfModel::class); + $synced = $this->syncModels($device, 'vrfs', $vrfs)->values(); + ModuleModelObserver::done(); + $device->unsetRelation('vrfs'); // load database defaults of new VRFs + + try { + $this->syncPorts($device, $os->discoverVrfPorts($synced)); + } catch (SnmpException $e) { + Log::warning('Device did not answer, VRF interfaces were not updated: ' . $e->getMessage()); + } + } + + /** + * Only discovery checks contexts. A context that answered before stays walked until it + * fails several discoveries in a row, so a single lost reply does not drop a VRF's data. + */ + private function updateContextStatus(VrfModel $vrf, ?VrfModel $existing, bool $checkContexts): void + { + if ($vrf->context_name === null) { + $vrf->context_verified = false; + $vrf->context_failures = 0; + + return; + } + + $enabled = $existing->context_enabled ?? true; + $changed = $existing === null || $existing->context_name !== $vrf->context_name; + + if (! $checkContexts || ! $enabled) { + if ($changed) { + // not checked yet + $vrf->context_verified = false; + $vrf->context_failures = 0; + } + + return; // keep the result of the last discovery + } + + if ($this->contextAnswers($vrf->context_name)) { + $vrf->context_verified = true; + $vrf->context_failures = 0; + + return; + } + + $vrf->context_failures = $changed ? 1 : min($existing->context_failures + 1, 255); + $vrf->context_verified = ! $changed && $existing->context_verified && $vrf->context_failures < self::CONTEXT_FAILURE_LIMIT; + + Log::warning("SNMP context $vrf->context_name of VRF $vrf->vrf_name did not answer ($vrf->context_failures in a row)" + . ($vrf->context_verified ? '' : ', it will not be polled')); + } + + /** + * Keep the contexts users set. The context mapping of the device wins. + * A context set on a VRF follows the VRF, matched by index and name, then by name (renumbered), then by index (renamed). + * When the device no longer lists the VRF, it is kept as a VRF only known through its context until it is listed again. + * + * @param Collection $vrfs VRFs the device lists + * @param Collection $manual copies of the saved VRFs with a context users set + * @return Collection + */ + private function addManualContexts(Collection $vrfs, Collection $manual): Collection + { + foreach ($manual as $existing) { + $context = (string) $existing->context_name; + if ($vrfs->contains(fn (VrfModel $vrf) => $vrf->context_name === $context)) { + Log::debug("Ignoring context $context, the device maps it"); + continue; + } + + $sameName = fn (VrfModel $vrf) => strcasecmp((string) $vrf->vrf_name, (string) $existing->vrf_name) == 0; + $vrf = $existing->vrf_manual + ? $vrfs->first($sameName) + : ($vrfs->first(fn (VrfModel $vrf) => $vrf->vrf_oid === $existing->vrf_oid && $sameName($vrf)) + ?? $vrfs->first($sameName) + ?? $vrfs->firstWhere('vrf_oid', $existing->vrf_oid)); + + if ($vrf === null) { + $vrfs->push(new VrfModel([ + ...$existing->only(['vrf_name', 'context_name', 'context_enabled', 'bgpLocalAs', 'mplsVpnVrfRouteDistinguisher', 'mplsVpnVrfDescription']), + 'vrf_oid' => VrfModel::contextOnlyOid($context), + 'context_manual' => true, + 'vrf_manual' => true, + ])); + + continue; + } + + if ($vrf->context_name !== null || $vrf->isDefault()) { + Log::debug("Ignoring context $context, VRF $vrf->vrf_name is mapped to context $vrf->context_name"); + continue; + } + + $vrf->context_name = $context; + $vrf->context_manual = true; + } + + return $vrfs; + } + + /** + * Contexts that don't answer would make every module that walks them wait for a timeout, + * so a context is only walked after it answered a single request. + */ + private function contextAnswers(string $context): bool + { + return $this->answers[$context] ??= $this->checkContext($context); + } + + protected function checkContext(string $context): bool + { + $response = SnmpQuery::numeric()->context($context)->next('.1.3.6.1'); + + return $response->isValid() || str_starts_with($response->getErrorMessage(), 'No more variables'); + } + + /** + * Save the VRF of member ports and clear it from ports that left their VRF + * + * @param Collection $members ports with ifVrf set + */ + private function syncPorts(Device $device, Collection $members): void + { + $members->each(fn (Port $port) => $port->isDirty('ifVrf') && $port->save()); + + $device->ports()->where('ifVrf', '!=', 0)->whereNotIn('port_id', $members->pluck('port_id'))->get() + ->each(function (Port $port): void { + $port->ifVrf = 0; + $port->save(); + }); + } +} diff --git a/LibreNMS/Modules/Wireless.php b/LibreNMS/Modules/Wireless.php index 0a145d2cb0a..619551818b8 100644 --- a/LibreNMS/Modules/Wireless.php +++ b/LibreNMS/Modules/Wireless.php @@ -8,20 +8,21 @@ use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; use LibreNMS\DB\SyncsModels; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Enum\WirelessSensorType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\Interfaces\SupportsSubmodules; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Traits\RequiresPollingMethod; use LibreNMS\Util\StringHelpers; use SnmpQuery; class Wireless implements Module, SupportsSubmodules { use SyncsModels; + use RequiresPollingMethod; /** @var string[]|null */ private ?array $submodules = null; @@ -39,20 +40,9 @@ public function dependencies(): array return ['os', 'ports']; } - /** - * @inheritDoc - */ - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool - { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); - } - - /** - * @inheritDoc - */ - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** diff --git a/LibreNMS/Modules/Xdsl.php b/LibreNMS/Modules/Xdsl.php index 80d8d0170c2..9102bf3dc96 100644 --- a/LibreNMS/Modules/Xdsl.php +++ b/LibreNMS/Modules/Xdsl.php @@ -36,17 +36,18 @@ use Illuminate\Support\Facades\Log; use LibreNMS\DB\SyncsModels; use LibreNMS\Enum\IntegerType; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Interfaces\Data\DataStorageInterface; use LibreNMS\Interfaces\Module; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Traits\RequiresPollingMethod; use LibreNMS\Util\Number; class Xdsl implements Module { use SyncsModels; + use RequiresPollingMethod; /** @var string[] */ private $trimAdminString = ['adslAtucInvVendorID', 'adslAturInvVendorID', 'adslAturInvVersionNumber', 'adslAtucInvVersionNumber']; @@ -65,9 +66,9 @@ public function dependencies(): array return ['ports']; } - public function shouldDiscover(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool + public function pollingMethods(Device $device): array { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); + return [PollingMethodType::Snmp]; } /** @@ -80,11 +81,6 @@ public function discover(OS $os): void $this->pollVdsl($os); } - public function shouldPoll(OS $os, ModuleStatus $status, ConnectivityHelper $connectivity): bool - { - return $status->isEnabled() && $connectivity->snmpIsAvailable(); - } - /** * Poll data for this module and update the DB / RRD. * Try to keep this efficient and only run if discovery has indicated there is a reason to run. diff --git a/LibreNMS/OS.php b/LibreNMS/OS.php index c543907d1f8..9229f97e52b 100644 --- a/LibreNMS/OS.php +++ b/LibreNMS/OS.php @@ -29,12 +29,18 @@ use App\Facades\LibrenmsConfig; use App\Models\Device; use App\Models\DeviceGraph; +use App\Models\Mempool; use DeviceCache; +use Illuminate\Database\Eloquent\Collection as EloquentCollection; use Illuminate\Support\Collection; use Illuminate\Support\Str; use LibreNMS\Device\WirelessSensor; use LibreNMS\Device\YamlDiscovery; +use LibreNMS\Enum\PollingMethodType; +use LibreNMS\Interfaces\Discovery\BgpPeerDiscovery; use LibreNMS\Interfaces\Discovery\EntityPhysicalDiscovery; +use LibreNMS\Interfaces\Discovery\FdbTableDiscovery; +use LibreNMS\Interfaces\Discovery\MefDiscovery; use LibreNMS\Interfaces\Discovery\MempoolsDiscovery; use LibreNMS\Interfaces\Discovery\NeighborDiscovery; use LibreNMS\Interfaces\Discovery\OSDiscovery; @@ -44,6 +50,10 @@ use LibreNMS\Interfaces\Discovery\StpPortDiscovery; use LibreNMS\Interfaces\Discovery\VlanDiscovery; use LibreNMS\Interfaces\Discovery\VlanPortDiscovery; +use LibreNMS\Interfaces\Discovery\VrfDiscovery; +use LibreNMS\Interfaces\Discovery\VrfPortDiscovery; +use LibreNMS\Interfaces\Polling\MefPolling; +use LibreNMS\Interfaces\Polling\MempoolsPolling; use LibreNMS\Interfaces\Polling\Netstats\IcmpNetstatsPolling; use LibreNMS\Interfaces\Polling\Netstats\IpForwardNetstatsPolling; use LibreNMS\Interfaces\Polling\Netstats\IpNetstatsPolling; @@ -53,30 +63,39 @@ use LibreNMS\Interfaces\Polling\StpInstancePolling; use LibreNMS\Interfaces\Polling\StpPortPolling; use LibreNMS\OS\Generic; +use LibreNMS\OS\Traits\Bgp4Mib; use LibreNMS\OS\Traits\BridgeMib; use LibreNMS\OS\Traits\EntityMib; use LibreNMS\OS\Traits\HostResources; use LibreNMS\OS\Traits\LldpMib; +use LibreNMS\OS\Traits\MefUniEvcMib; +use LibreNMS\OS\Traits\MplsVpnMib; use LibreNMS\OS\Traits\NetstatsPolling; use LibreNMS\OS\Traits\QBridgeMib; use LibreNMS\OS\Traits\UcdResources; use LibreNMS\OS\Traits\YamlMempoolsDiscovery; use LibreNMS\OS\Traits\YamlOSDiscovery; +use LibreNMS\OS\Traits\YamlProcessorDiscovery; use LibreNMS\OS\Traits\YamlStorageDiscovery; use LibreNMS\Polling\PerDeviceMethodResults; use LibreNMS\Util\StringHelpers; class OS implements + BgpPeerDiscovery, ProcessorDiscovery, OSDiscovery, MempoolsDiscovery, + MempoolsPolling, StpInstanceDiscovery, StpPortDiscovery, EntityPhysicalDiscovery, + FdbTableDiscovery, IcmpNetstatsPolling, NeighborDiscovery, IpNetstatsPolling, IpForwardNetstatsPolling, + MefDiscovery, + MefPolling, SnmpNetstatsPolling, StorageDiscovery, StpInstancePolling, @@ -84,7 +103,9 @@ class OS implements TcpNetstatsPolling, UdpNetstatsPolling, VlanDiscovery, - VlanPortDiscovery + VlanPortDiscovery, + VrfDiscovery, + VrfPortDiscovery { use HostResources { HostResources::discoverProcessors as discoverHrProcessors; @@ -98,11 +119,15 @@ class OS implements } use YamlOSDiscovery; use YamlMempoolsDiscovery; + use YamlProcessorDiscovery; use YamlStorageDiscovery; use NetstatsPolling; + use Bgp4Mib; use BridgeMib; use EntityMib; use LldpMib; + use MefUniEvcMib; + use MplsVpnMib; use QBridgeMib; /** @@ -169,6 +194,45 @@ public function setMethodResults(PerDeviceMethodResults $methodResults): void $this->methodResults = $methodResults; } + /** + * The sources of a module's data for this device: the data sources of the polling methods, + * then this OS when it implements the interface, most of its data is read with SNMP. + * + * @template T of object + * + * @param class-string $interface + * @return list + */ + public function dataSources(string $interface): array + { + $sources = $this->getMethodResults()->dataSources($interface); + $os = $this->dataSource(PollingMethodType::Snmp, $interface); + + if ($os !== null) { + $sources[] = $os; + } + + return $sources; + } + + /** + * The source of a module's data from one polling method, for modules that prefer one method. SNMP data comes from this OS. + * Null when the method is not available or does not have data for the interface. + * + * @template T of object + * + * @param class-string $interface + * @return T|null + */ + public function dataSource(PollingMethodType $type, string $interface): ?object + { + if ($type !== PollingMethodType::Snmp) { + return $this->getMethodResults()->dataSource($type, $interface); + } + + return $this instanceof $interface && $this->getMethodResults()->isAvailable($type) ? $this : null; + } + /** * Enable a graph for this device * @@ -209,6 +273,8 @@ public function preCache() * @param string $mib mib for this oid * @param string $snmpflags snmpflags for this oid * @return array|null array indexed by the snmp index with the value as the data returned by snmp + * + * @deprecated Please use SnmpQuery instead */ public function getCacheByIndex($oid, $mib = null, $snmpflags = '-OQUs') { @@ -235,6 +301,8 @@ public function getCacheByIndex($oid, $mib = null, $snmpflags = '-OQUs') * @param string $mib mib for this oid (optional) * @param int $depth depth for snmpwalk_group (optional) * @return array|null array indexed by the snmp index with the value as the data returned by snmp + * + * @deprecated Use SnmpQuery */ public function getCacheTable($oid, $mib = null, $depth = 1) { @@ -254,6 +322,8 @@ public function getCacheTable($oid, $mib = null, $depth = 1) * * @param string $oid * @return bool + * + * @deprecated Only applies to getCacheByIndex(), use SnmpQuery::cache() instead */ public function isCached($oid) { @@ -347,19 +417,23 @@ protected function pollWirelessChannelAsFrequency($sensors, $callback = null) /** * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered + * Returns a Collection of Processor models that have been discovered * - * @return array Processors + * @return Collection */ - public function discoverProcessors() + public function discoverProcessors(): Collection { - $processors = $this->discoverHrProcessors(); + $processors = $this->discoverYamlProcessors(); + if ($processors->isNotEmpty()) { + return $processors; + } - if (empty($processors)) { - $processors = $this->discoverUcdProcessors(); + $processors = $this->discoverHrProcessors(); + if ($processors->isNotEmpty()) { + return collect($processors); } - return $processors; + return $this->discoverUcdProcessors(); } public function discoverMempools() @@ -376,6 +450,30 @@ public function discoverMempools() return $this->discoverUcdMempools(); } + /** + * Read the OIDs set when the mempools were discovered. + */ + public function pollMempools(EloquentCollection $mempools): EloquentCollection + { + $oids = $mempools->map->only(['mempool_perc_oid', 'mempool_used_oid', 'mempool_free_oid', 'mempool_total_oid']) + ->flatten()->filter()->unique()->values()->all(); + + if (empty($oids)) { + return $mempools; + } + + $data = \SnmpQuery::numeric()->get($oids)->values(); + + return $mempools->each(function (Mempool $mempool) use ($data): void { + $mempool->fillUsage( + $data[(string) $mempool->mempool_used_oid] ?? null, + $data[(string) $mempool->mempool_total_oid] ?? null, + $data[(string) $mempool->mempool_free_oid] ?? null, + $data[(string) $mempool->mempool_perc_oid] ?? null + ); + }); + } + public function discoverStorage(): Collection { if ($this->hasYamlDiscovery('storage')) { diff --git a/LibreNMS/OS/Aen.php b/LibreNMS/OS/Aen.php index c03f3a2aea9..0e73f1aedd8 100644 --- a/LibreNMS/OS/Aen.php +++ b/LibreNMS/OS/Aen.php @@ -26,34 +26,18 @@ namespace LibreNMS\OS; -use LibreNMS\Device\Processor; -use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; +use Illuminate\Support\Collection; use LibreNMS\OS; -class Aen extends OS implements ProcessorDiscovery +class Aen extends OS { - /** - * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered - * - * @return array Processors - */ - public function discoverProcessors() + public function discoverProcessors(): Collection { - $device = $this->getDeviceArray(); - // don't poll v5.3.1_22558 devices due to bug that crashes snmpd - if ($device['version'] == 'AEN_5.3.1_22558') { - return []; + if ($this->getDevice()->version == 'AEN_5.3.1_22558') { + return new Collection; } - return [ - Processor::discover( - $this->getName(), - $this->getDeviceId(), - '.1.3.6.1.4.1.22420.1.1.20.0', // ACD-DESC-MIB::acdDescCpuUsageCurrent - 0 - ), - ]; + return parent::discoverProcessors(); } } diff --git a/LibreNMS/OS/Alaxala.php b/LibreNMS/OS/Alaxala.php index 9f6094eb3e0..321a73fa17b 100644 --- a/LibreNMS/OS/Alaxala.php +++ b/LibreNMS/OS/Alaxala.php @@ -4,8 +4,9 @@ use App\Models\Device; use App\Models\Mempool; +use App\Models\Processor; +use Illuminate\Support\Collection; use Illuminate\Support\Str; -use LibreNMS\Device\Processor; use LibreNMS\Interfaces\Discovery\MempoolsDiscovery; use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; use LibreNMS\OS; @@ -222,12 +223,13 @@ public function discoverOS(Device $device): void } } - public function discoverProcessors() + public function discoverProcessors(): Collection { + $processors = new Collection; $device = $this->getDevice(); $mib = $this->findMib(); if (! $mib) { - return []; + return $processors; } $profiles = [ @@ -382,25 +384,29 @@ public function discoverProcessors() $cpu = $this->firstSnmpValueWithOid($device, $profile['cpu'], $mib); if (! $cpu) { - return []; + return $processors; } $proc_oid = $this->numericOid($device, $mib, $cpu['oid']); if (! $proc_oid) { - return []; + return $processors; } - return [ - Processor::discover( - $this->getName(), - $this->getDeviceId(), - $proc_oid, - 0 - ), - ]; + $processors->push(new Processor([ + 'processor_type' => $this->getName(), + 'processor_oid' => $proc_oid, + 'processor_index' => 0, + 'processor_descr' => 'Processor', + 'processor_precision' => 1, + 'hrDeviceIndex' => null, + 'processor_perc_warn' => null, + 'processor_usage' => $cpu['value'], + ])); + + return $processors; } - return []; + return $processors; } public function discoverMempools() diff --git a/LibreNMS/OS/Aos.php b/LibreNMS/OS/Aos.php deleted file mode 100644 index a98f4a2b26d..00000000000 --- a/LibreNMS/OS/Aos.php +++ /dev/null @@ -1,68 +0,0 @@ -. - * - * @link https://www.librenms.org - * - * @copyright 2017 Tony Murray - * @author Tony Murray - */ - -namespace LibreNMS\OS; - -use LibreNMS\Device\Processor; -use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; -use LibreNMS\OS; - -class Aos extends OS implements ProcessorDiscovery -{ - /** - * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered - * - * @return array Processors - */ - public function discoverProcessors() - { - $processor = Processor::discover( - 'aos-system', - $this->getDeviceId(), - '.1.3.6.1.4.1.6486.800.1.2.1.16.1.1.1.13.0', // ALCATEL-IND1-HEALTH-MIB::healthDeviceCpuLatest - 0, - 'Device CPU' - ); - - if (! $processor->isValid()) { - // AOS7 devices use a different OID for CPU load. Not all Switches have - // healthModuleCpuLatest so we use healthModuleCpu1MinAvg which makes no - // difference for a 5 min. polling interval. - // Note: This OID shows (a) the CPU load of a single switch or (b) the - // average CPU load of all CPUs in a stack of switches. - $processor = Processor::discover( - 'aos-system', - $this->getDeviceId(), - '.1.3.6.1.4.1.6486.801.1.2.1.16.1.1.1.1.1.11.0', - 0, - 'Device CPU' - ); - } - - return [$processor]; - } -} diff --git a/LibreNMS/OS/Aos6.php b/LibreNMS/OS/Aos6.php index 1e094c3ab92..54ab5ae287b 100644 --- a/LibreNMS/OS/Aos6.php +++ b/LibreNMS/OS/Aos6.php @@ -18,27 +18,40 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * + * Base Alcatel-Lucent OS (AOS6) + * * @link https://www.librenms.org * * @copyright 2025 Peca Nesovanovic * @copyright 2025 Tony Murray * @author Peca Nesovanovic * @author Tony Murray + * @author Paul Iercosan */ namespace LibreNMS\OS; use App\Facades\PortCache; +use App\Models\PortsNac; use App\Models\PortVlan; +use App\Models\Transceiver; use App\Models\Vlan; use Illuminate\Support\Collection; +use LibreNMS\Interfaces\Discovery\TransceiverDiscovery; use LibreNMS\Interfaces\Discovery\VlanDiscovery; use LibreNMS\Interfaces\Discovery\VlanPortDiscovery; +use LibreNMS\Interfaces\Polling\NacPolling; use LibreNMS\OS; +use LibreNMS\OS\Traits\AlcatelMacAddressMib; +use LibreNMS\Util\Mac; use SnmpQuery; -class Aos6 extends OS implements VlanDiscovery, VlanPortDiscovery +class Aos6 extends OS implements VlanDiscovery, VlanPortDiscovery, TransceiverDiscovery, NacPolling { + private const int PORTS_NAC_STR_MAX = 50; + + use AlcatelMacAddressMib; + public function discoverVlans(): Collection { if (($QBridgeMibVlans = parent::discoverVlans())->isNotEmpty()) { @@ -61,11 +74,338 @@ public function discoverVlanPorts(Collection $vlans): Collection } return SnmpQuery::walk('ALCATEL-IND1-VLAN-MGR-MIB::vpaType') - ->mapTable(fn ($data, $vpaVlanNumber, $vpaIfIndex = null) => new Portvlan([ + ->mapTable(fn ($data, $vpaVlanNumber, $vpaIfIndex = null) => new PortVlan([ 'vlan' => $vpaVlanNumber, 'baseport' => $this->bridgePortFromIfIndex($vpaIfIndex), 'untagged' => ($data['ALCATEL-IND1-VLAN-MGR-MIB::vpaType'] == 1 ? 1 : 0), - 'port_id' => PortCache::getIdFromIfIndex($vpaIfIndex, $this->getDeviceId()) ?? 0, // ifIndex from device + 'port_id' => PortCache::getIdFromIfIndex($vpaIfIndex, $this->getDeviceId()) ?? 0, + ])); + } + + public function pollNac(): Collection + { + $rows = collect( + SnmpQuery::mibDir('nokia/aos6') + ->walk('ALCATEL-IND1-DOT1X-MIB::alaDot1xDeviceStatusTable') + ->valuesByIndex() + ); + + if ($rows->isEmpty()) { + return collect(); + } + + /* + * AOS6 does not expose the RADIUS server used per session. + * Use the configured 802.1X/MAC authentication server lists instead. + */ + $authByDot1x = $this->getNacRadiusServers( + 'ALCATEL-IND1-AAA-MIB::aaaAuth8021xTable', + [ + 'ALCATEL-IND1-AAA-MIB::aaatxName1', + 'ALCATEL-IND1-AAA-MIB::aaatxName2', + 'ALCATEL-IND1-AAA-MIB::aaatxName3', + 'ALCATEL-IND1-AAA-MIB::aaatxName4', + ] + ); + + $authByMac = $this->getNacRadiusServers( + 'ALCATEL-IND1-AAA-MIB::aaaAuthMACTable', + [ + 'ALCATEL-IND1-AAA-MIB::aaaMacSrvrName1', + 'ALCATEL-IND1-AAA-MIB::aaaMacSrvrName2', + 'ALCATEL-IND1-AAA-MIB::aaaMacSrvrName3', + 'ALCATEL-IND1-AAA-MIB::aaaMacSrvrName4', + ] + ); + + $uptimeTicks = (int) SnmpQuery::get('SNMPv2-MIB::sysUpTime.0')->value(); + $mib = 'ALCATEL-IND1-DOT1X-MIB::alaDot1xDeviceStatus'; + $nac = collect(); + $authenticatedMacs = []; // port_id => [mac => true] + + foreach ($rows as $row) { + $slot = (int) ($row[$mib . 'SlotNumber'] ?? 0); + $port = (int) ($row[$mib . 'PortNumber'] ?? 0); + + if ($slot <= 0 || $port <= 0) { + continue; + } + + // AOS6 physical ifIndex is slot * 1000 + port. + $ifIndex = ($slot * 1000) + $port; + $portId = PortCache::getIdFromIfIndex($ifIndex, $this->getDeviceId()); + + if (! $portId) { + continue; + } + + $mac = Mac::parse((string) ($row[$mib . 'MACAddress'] ?? '')); + + if (! $mac->isValid()) { + continue; + } + + $vlan = (int) ($row[$mib . 'Vlan'] ?? 0); + + $profile = trim((string) ($row[$mib . 'ProfileUsed'] ?? '')); + $domain = ($profile !== '' && $profile !== '--') ? $profile : 'UNP'; + + $username = trim((string) ($row[$mib . 'UserName'] ?? '')); + + if ($username === '' || $username === '--') { + $username = $mac->readable(); + } + + $method = match ((int) ($row[$mib . 'AuthType'] ?? 0)) { + 1 => 'dot1x', + 2 => 'mab', + 3 => 'captivePortal', + default => 'unknown', + }; + + $authBy = match ($method) { + 'dot1x' => $authByDot1x, + 'mab' => $authByMac, + default => 'RADIUS', + }; + + $authResult = (int) ($row[$mib . 'AuthResult'] ?? 0); + + $authcStatus = match ($authResult) { + 1 => 'authcInProgress', + 2 => 'authcSuccess', + 3 => 'authcFail', + default => 'authcUnknown', + }; + + $authzStatus = match ($authResult) { + 1 => 'authzInProgress', + 2 => 'authzSuccess', + 3 => 'authzFail', + default => 'authzUnknown', + }; + + if ($authResult === 2) { + // The table is indexed by query type first, so a client can be listed more than once: count each MAC once. + $authenticatedMacs[$portId][$mac->hex()] = true; + } + + $nac->push(new PortsNac([ + 'port_id' => $portId, + 'auth_id' => sprintf('%d-%s-%d', $ifIndex, $mac->hex(), $vlan), + 'domain' => $this->limitString($domain), + 'username' => $this->limitString($username), + 'mac_address' => $mac->hex(), + 'ip_address' => $this->normalizeIpAddress($row[$mib . 'IPAddress'] ?? null), + 'host_mode' => 'singleHost', + 'authz_status' => $authzStatus, + 'authz_by' => $this->limitString($authBy), + 'authc_status' => $authcStatus, + 'method' => $method, + 'timeout' => 0, + 'time_left' => null, + 'vlan' => $vlan, + 'time_elapsed' => $this->elapsedFromTimeLearned((int) ($row[$mib . 'TimeLearned'] ?? 0), $uptimeTicks), ])); + } + + return $nac->each(function (PortsNac $entry) use ($authenticatedMacs): void { + if (count($authenticatedMacs[$entry->port_id] ?? []) > 1) { + $entry->host_mode = 'multiAuth'; + } + }); + } + + public function discoverTransceivers(): Collection + { + // Only fetch the identity and mapping columns needed for transceivers. + $entities = SnmpQuery::walk([ + 'ENTITY-MIB::entPhysicalContainedIn', + 'ENTITY-MIB::entPhysicalParentRelPos', + 'ENTITY-MIB::entPhysicalName', + 'ENTITY-MIB::entPhysicalSerialNum', + 'ENTITY-MIB::entPhysicalMfgName', + 'ENTITY-MIB::entPhysicalModelName', + 'ENTITY-MIB::entPhysicalClass', + 'ALCATEL-IND1-CHASSIS-MIB::chasEntPhysNiNum', + 'ALCATEL-IND1-CHASSIS-MIB::chasEntPhysGbicNum', + ])->valuesByIndex(); + + $slots = []; + + foreach ($entities as $entityIndex => $entity) { + if (preg_match('/^NI-(\d+)$/', (string) ($entity['ENTITY-MIB::entPhysicalName'] ?? ''), $matches)) { + $slots[$entityIndex] = (int) $matches[1]; + } + } + + $entitiesByIfIndex = []; + $hasPortMapping = collect($entities)->contains(fn ($entity) => (int) ($entity['ALCATEL-IND1-CHASSIS-MIB::chasEntPhysNiNum'] ?? 0) > 0 && + (int) ($entity['ALCATEL-IND1-CHASSIS-MIB::chasEntPhysGbicNum'] ?? 0) > 0 + ); + + foreach ($entities as $entityIndex => $entity) { + $slot = (int) ($entity['ALCATEL-IND1-CHASSIS-MIB::chasEntPhysNiNum'] ?? 0); + $port = (int) ($entity['ALCATEL-IND1-CHASSIS-MIB::chasEntPhysGbicNum'] ?? 0); + + if (! $hasPortMapping) { + // Older agents may omit the vendor mapping. Expansion cards also have class port(10), + // but their OSxxxx model identifies the card rather than a pluggable transceiver. + if ((int) ($entity['ENTITY-MIB::entPhysicalClass'] ?? 0) !== 10 || + preg_match('/^OS\d/', (string) ($entity['ENTITY-MIB::entPhysicalModelName'] ?? ''))) { + continue; + } + + $parent = (int) ($entity['ENTITY-MIB::entPhysicalContainedIn'] ?? 0); + $slot = $slots[$parent] ?? 0; + $port = (int) ($entity['ENTITY-MIB::entPhysicalParentRelPos'] ?? 0); + } + + if ($slot > 0 && $port > 0) { + $entitiesByIfIndex[($slot * 1000) + $port] = ['index' => $entityIndex, 'entity' => $entity]; + } + } + + $transceivers = collect(); + + foreach (SnmpQuery::walk('ALCATEL-IND1-PORT-MIB::ddmSupplyVoltage')->valuesByIndex() as $index => $ddm) { + /* + * Same presence test as the DDM sensors: an empty cage reports no supply voltage. + * Tx bias cannot be used, it is also zero for installed modules without a laser (copper, DAC). + */ + if ((int) ($ddm['ALCATEL-IND1-PORT-MIB::ddmSupplyVoltage'] ?? 0) <= 0) { + continue; + } + + $ifIndex = (int) $index; + $portId = PortCache::getIdFromIfIndex($ifIndex, $this->getDeviceId()); + + if (! $portId) { + continue; + } + + $mappedEntity = $entitiesByIfIndex[$ifIndex] ?? []; + $entity = $mappedEntity['entity'] ?? []; + $part = $entity['ENTITY-MIB::entPhysicalModelName'] ?? null; + + $transceivers->push(new Transceiver([ + 'port_id' => $portId, + 'index' => $ifIndex, + 'type' => ! empty($part) && $part !== 'OEM' ? $part : 'SFP/Transceiver', + 'vendor' => $entity['ENTITY-MIB::entPhysicalMfgName'] ?? null, + 'model' => $part, + 'serial' => $entity['ENTITY-MIB::entPhysicalSerialNum'] ?? null, + 'revision' => null, + // AOS6 DDM sensors use ifIndex as entPhysicalIndex (measured against ports). + 'entity_physical_index' => $ifIndex, + 'ddm' => 1, + ])); + } + + return $transceivers; + } + + /** + * AOS6 exposes configured RADIUS servers, not the server used by each session. + */ + private function getNacRadiusServers(string $tableOid, array $serverOids): string + { + $table = collect( + SnmpQuery::mibDir('nokia/aos6') + ->walk($tableOid) + ->valuesByIndex() + ); + + if ($table->isEmpty()) { + return 'RADIUS'; + } + + $row = (array) $table->first(); + $servers = []; + + foreach ($serverOids as $oid) { + $server = trim((string) ($row[$oid] ?? '')); + + if ($server !== '') { + $servers[] = $server; + } + } + + if (empty($servers)) { + return 'RADIUS'; + } + + return $this->limitString(implode(',', array_unique($servers))); + } + + /** + * AOS6 can return IPv4 as dotted notation or an unsigned 32-bit integer. + */ + private function normalizeIpAddress(mixed $value): string + { + if (is_array($value)) { + $value = reset($value); + } + + $value = trim((string) ($value ?? '')); + + if ($value === '' || $value === '0' || $value === '0.0.0.0') { + return '0.0.0.0'; + } + + if (filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) { + return $value; + } + + if (ctype_digit($value)) { + $integer = (int) $value; + + if ($integer > 0 && $integer <= 4294967295) { + $ip = inet_ntop(pack('N', $integer)); + + if ($ip !== false) { + return $ip; + } + } + } + + return $value; + } + + /** + * The MIB declares TimeStamp, but AOS 6.4.6 also reports Unix seconds. + * Accept epoch values within this boot; otherwise interpret the value as uptime ticks. + */ + private function elapsedFromTimeLearned(int $learned, int $uptimeTicks): ?int + { + $uptime = (int) $this->getDevice()->uptime; + + if ($learned <= 0 || $uptime <= 0) { + return null; + } + + $now = now()->timestamp; + if ($learned >= $now - $uptime && $learned <= $now) { + return $now - $learned; + } + + // TimeStamp is relative to the SNMP agent, which may have restarted since the device booted. + if ($uptimeTicks <= 0 || $learned > $uptimeTicks) { + return null; + } + + return intdiv($uptimeTicks - $learned, 100); + } + + private function limitString(string $value): string + { + return substr($value, 0, self::PORTS_NAC_STR_MAX); + } + + public function discoverFdbTable(): Collection + { + $fdb = $this->alcatelDispositionFdb(); + + return $fdb->isNotEmpty() ? $fdb : parent::discoverFdbTable(); } } diff --git a/LibreNMS/OS/Aos7.php b/LibreNMS/OS/Aos7.php index 7cb069b0c9b..47898b3f762 100644 --- a/LibreNMS/OS/Aos7.php +++ b/LibreNMS/OS/Aos7.php @@ -29,17 +29,24 @@ namespace LibreNMS\OS; use App\Facades\PortCache; +use App\Models\BgpPeer; +use App\Models\BgpPeerCbgp; use App\Models\PortVlan; use App\Models\Vlan; use Illuminate\Support\Collection; use LibreNMS\Discovery\Neighbors\NeighborParser; +use LibreNMS\Interfaces\Discovery\BgpAddressFamilyDiscovery; use LibreNMS\Interfaces\Discovery\VlanDiscovery; use LibreNMS\Interfaces\Discovery\VlanPortDiscovery; use LibreNMS\OS; +use LibreNMS\OS\Traits\AlcatelMacAddressMib; +use LibreNMS\Util\Bgp; use SnmpQuery; -class Aos7 extends OS implements VlanDiscovery, VlanPortDiscovery +class Aos7 extends OS implements BgpAddressFamilyDiscovery, VlanDiscovery, VlanPortDiscovery { + use AlcatelMacAddressMib; + public function discoverVlans(): Collection { if (($QBridgeMibVlans = parent::discoverVlans())->isNotEmpty()) { @@ -86,4 +93,62 @@ protected function lldpLocalPortId(int $lldpPortNum): ?int return $this->lldpLocalPorts()->byDescr($descr)?->port_id; } + + /** + * Sessions are read from BGP4-MIB, ALCATEL-IND1-BGP-MIB adds their name + * + * @return Collection + */ + public function discoverBgpPeers(): Collection + { + $peers = new Collection; + + foreach ($this->getDevice()->getVrfContexts() as $context) { + $names = []; + foreach ($this->walkBgpTable($context, 'ALCATEL-IND1-BGP-MIB', ['bgpPeerDescr' => 'alaBgpPeerName']) as $index => $row) { + $parts = explode('.', (string) $index); + $names[(string) Bgp::shiftIp($parts)?->compressed()] = $row['bgpPeerDescr']; + } + + $peers = $peers->merge($this->discoverBgp4MibPeers($context)->each(function (BgpPeer $peer) use ($names): void { + $peer->bgpPeerDescr = $names[$peer->bgpPeerIdentifier] ?? $peer->bgpPeerDescr; + })); + } + + return $peers->values(); + } + + /** + * Only received IPv4 unicast prefixes are reported + * + * @return Collection + */ + public function discoverBgpAddressFamilies(Collection $peers): Collection + { + $families = new Collection; + + foreach ($peers->pluck('context_name')->unique() as $context) { + foreach ($this->walkBgpTable($context, 'ALCATEL-IND1-BGP-MIB', ['AcceptedPrefixes' => 'alaBgpPeerRcvdPrefixes']) as $index => $counters) { + $parts = explode('.', (string) $index); + $families->push($this->makeBgpAddressFamily(Bgp::shiftIp($parts), null, $context, 'ipv4', 'unicast', $counters)); + } + } + + return $families->filter()->values(); + } + + public function discoverFdbTable(): Collection + { + $fdb = SnmpQuery::walk('ALCATEL-IND1-MAC-ADDRESS-MIB::slMacAddressGblManagement') + ->mapTable(fn ($data, $domain, $locale, $bridgePort, $vlan, $subId, $mac) => $subId == 0 + ? $this->alcatelFdbEntry($vlan, $mac, (int) $bridgePort, $this->bridgePortIfIndexes()) + : null) + ->filter(); + + if ($fdb->isEmpty()) { + $fdb = $this->alcatelDispositionFdb(); + } + + return $fdb->isNotEmpty() ? $fdb : parent::discoverFdbTable(); + } } diff --git a/LibreNMS/OS/ArubaInstant.php b/LibreNMS/OS/ArubaInstant.php index ff076d003fc..a9f6dcd97ab 100644 --- a/LibreNMS/OS/ArubaInstant.php +++ b/LibreNMS/OS/ArubaInstant.php @@ -29,9 +29,9 @@ use App\Models\Device; use App\Models\EntPhysical; +use App\Models\Processor; use Illuminate\Support\Arr; use Illuminate\Support\Collection; -use LibreNMS\Device\Processor; use LibreNMS\Device\WirelessSensor; use LibreNMS\Enum\WirelessSensorType; use LibreNMS\Interfaces\Discovery\OSDiscovery; @@ -71,11 +71,11 @@ public function discoverOS(Device $device): void /** * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered + * Returns a Collection of Processor models that have been discovered * - * @return array Processors + * @return Collection */ - public function discoverProcessors(): array + public function discoverProcessors(): Collection { return SnmpQuery::cache()->walk('AI-AP-MIB::aiAccessPointTable') ->mapTable(function ($data, $aiAPMACAddress) { @@ -83,8 +83,15 @@ public function discoverProcessors(): array $oid = '.1.3.6.1.4.1.14823.2.3.3.1.2.1.1.7.' . $mac->oid(); $description = $data['AI-AP-MIB::aiAPSerialNum']; - return Processor::discover('aruba-instant', $this->getDeviceId(), $oid, $mac->hex(), $description, 1, $data['AI-AP-MIB::aiAPCPUUtilization']); - })->all(); + return new Processor([ + 'processor_type' => 'aruba-instant', + 'processor_oid' => $oid, + 'processor_index' => $mac->hex(), + 'processor_descr' => $description, + 'processor_precision' => 1, + 'processor_usage' => $data['AI-AP-MIB::aiAPCPUUtilization'], + ]); + }); } /** diff --git a/LibreNMS/OS/Arubaos.php b/LibreNMS/OS/Arubaos.php index 7a544f4d717..c089850a210 100644 --- a/LibreNMS/OS/Arubaos.php +++ b/LibreNMS/OS/Arubaos.php @@ -26,6 +26,7 @@ namespace LibreNMS\OS; +use App\Facades\PortCache; use App\Models\Device; use LibreNMS\Device\WirelessSensor; use LibreNMS\Enum\WirelessSensorType; @@ -107,7 +108,7 @@ public function discoverWirelessApCount(): array // If AP count is less than twice the default critical threshold, // then set the critical threshold to roughly half the current AP count. if ($apCount < $low_limit_const * 2) { - $low_limit = round($apCount / 2, 0, PHP_ROUND_HALF_DOWN); + $low_limit = round($apCount / 2, 0, \RoundingMode::HalfTowardsZero); } // If AP count is less than the default warning hreshold, // then don't bother setting thresholds. @@ -218,4 +219,17 @@ public function pollWirelessFrequency(array $sensors) { return $this->pollWirelessChannelAsFrequency($sensors, $this->decodeChannel(...)); } + + /** + * Bridge ports may only be reported in the context of the VLAN the MAC address is in. + * Unknown bridge ports are not ifIndexes. + */ + protected function fdbPortId(int|string $bridgePort, int|string $vlan): ?int + { + // VLAN 0 means the table has no VLANs, so there is no context to walk + $vlanContext = $vlan ? (string) $vlan : ''; + $ifIndex = $this->bridgePortIfIndexes($vlanContext)[$bridgePort] ?? $this->bridgePortIfIndexes()[$bridgePort] ?? null; + + return PortCache::getIdFromIfIndex($ifIndex, $this->getDeviceId()) ?? 0; + } } diff --git a/LibreNMS/OS/AviatWtm.php b/LibreNMS/OS/AviatWtm.php index 794af9225d6..32917fa4a65 100644 --- a/LibreNMS/OS/AviatWtm.php +++ b/LibreNMS/OS/AviatWtm.php @@ -35,6 +35,7 @@ use LibreNMS\Interfaces\Discovery\Sensors\WirelessRssiDiscovery; use LibreNMS\Interfaces\Discovery\Sensors\WirelessSnrDiscovery; use LibreNMS\OS; +use SnmpQuery; class AviatWtm extends OS implements OSDiscovery, @@ -53,7 +54,7 @@ class AviatWtm extends OS implements public function discoverWirelessFrequency() { $sensors = []; - $name = $this->getCacheByIndex('entPhysicalName', 'ENTITY-MIB'); + $name = SnmpQuery::cache()->walk('ENTITY-MIB::entPhysicalName')->pluck(); $frequency = snmpwalk_cache_oid($this->getDeviceArray(), 'aviatRfFreqTx', [], 'AVIAT-RF-MIB:'); foreach ($frequency as $index => $data) { $sensors[] = new WirelessSensor( @@ -62,7 +63,7 @@ public function discoverWirelessFrequency() ".1.3.6.1.4.1.2509.9.5.2.1.1.1.$index", 'aviat-wtm-carrier-tx-freq', $index, - "TX Frequency ({$name[$index]})", + 'TX Frequency (' . ($name[$index] ?? '') . ')', $data['aviatRfFreqTx'], 1, 1000 @@ -81,7 +82,7 @@ public function discoverWirelessFrequency() public function discoverWirelessRate() { $sensors = []; - $name = $this->getCacheByIndex('entPhysicalName', 'ENTITY-MIB'); + $name = SnmpQuery::cache()->walk('ENTITY-MIB::entPhysicalName')->pluck(); $tx = snmpwalk_cache_oid($this->getDeviceArray(), 'aviatModemCurCapacityTx', [], 'AVIAT-MODEM-MIB'); foreach ($tx as $index => $data) { @@ -91,7 +92,7 @@ public function discoverWirelessRate() ".1.3.6.1.4.1.2509.9.3.2.1.1.11.$index", 'aviat-wtm-carrier-tx-rate', $index, - "TX Capacity ({$name[$index]})", + 'TX Capacity (' . ($name[$index] ?? '') . ')', $data['aviatModemCurCapacityTx'], 1000 ); @@ -105,7 +106,7 @@ public function discoverWirelessRate() ".1.3.6.1.4.1.2509.9.3.2.1.1.12.$index", 'aviat-wtm-carrier-rx-rate', $index, - "TX Capacity ({$name[$index]})", + 'TX Capacity (' . ($name[$index] ?? '') . ')', $data['aviatModemCurCapacityRx'], 1000 ); @@ -123,7 +124,7 @@ public function discoverWirelessRate() public function discoverWirelessRssi() { $sensors = []; - $name = $this->getCacheByIndex('entPhysicalName', 'ENTITY-MIB'); + $name = SnmpQuery::cache()->walk('ENTITY-MIB::entPhysicalName')->pluck(); $rsl = snmpwalk_cache_oid($this->getDeviceArray(), 'aviatRxPerformRslReadingCurrent', [], 'AVIAT-RXPERFORMANCE-MIB'); foreach ($rsl as $index => $data) { @@ -133,7 +134,7 @@ public function discoverWirelessRssi() ".1.3.6.1.4.1.2509.9.15.2.2.1.4.$index", 'aviat-wtm-carrier-rsl', $index, - "RSL ({$name[$index]})", + 'RSL (' . ($name[$index] ?? '') . ')', $data['aviatRxPerformRslReadingCurrent'], 1, 10 @@ -152,7 +153,7 @@ public function discoverWirelessRssi() public function discoverWirelessSnr() { $sensors = []; - $name = $this->getCacheByIndex('entPhysicalName', 'ENTITY-MIB'); + $name = SnmpQuery::cache()->walk('ENTITY-MIB::entPhysicalName')->pluck(); $snr = snmpwalk_cache_oid($this->getDeviceArray(), 'aviatRxPerformCinrReadingCurrent', [], 'AVIAT-RXPERFORMANCE-EX-MIB'); foreach ($snr as $index => $data) { @@ -162,7 +163,7 @@ public function discoverWirelessSnr() ".1.3.6.1.4.1.2509.9.33.2.2.1.3.$index", 'aviat-wtm-carrier-snr', $index, - "SNR ({$name[$index]})", + 'SNR (' . ($name[$index] ?? '') . ')', $data['aviatRxPerformCinrReadingCurrent'], 1, 10 @@ -181,7 +182,7 @@ public function discoverWirelessSnr() public function discoverWirelessPower() { $sensors = []; - $name = $this->getCacheByIndex('entPhysicalName', 'ENTITY-MIB'); + $name = SnmpQuery::cache()->walk('ENTITY-MIB::entPhysicalName')->pluck(); $power = snmpwalk_cache_oid($this->getDeviceArray(), 'aviatRxPerformTxpowReadingCurrent', [], 'AVIAT-RXPERFORMANCE-EX-MIB'); foreach ($power as $index => $data) { @@ -191,7 +192,7 @@ public function discoverWirelessPower() ".1.3.6.1.4.1.2509.9.33.2.2.1.7.$index", 'aviat-wtm-carrier-txpower', $index, - "TX Power ({$name[$index]})", + 'TX Power (' . ($name[$index] ?? '') . ')', $data['aviatRxPerformTxpowReadingCurrent'], 1, 10 diff --git a/LibreNMS/OS/Boss.php b/LibreNMS/OS/Boss.php index 9db49d626a5..765cc96229b 100644 --- a/LibreNMS/OS/Boss.php +++ b/LibreNMS/OS/Boss.php @@ -33,17 +33,14 @@ use App\Models\PortVlan; use App\Models\Vlan; use Illuminate\Support\Collection; -use Illuminate\Support\Str; -use LibreNMS\Device\Processor; use LibreNMS\Interfaces\Discovery\OSDiscovery; -use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; use LibreNMS\Interfaces\Discovery\VlanDiscovery; use LibreNMS\Interfaces\Discovery\VlanPortDiscovery; use LibreNMS\OS; use LibreNMS\Util\StringHelpers; use SnmpQuery; -class Boss extends OS implements OSDiscovery, ProcessorDiscovery, VlanDiscovery, VlanPortDiscovery +class Boss extends OS implements OSDiscovery, VlanDiscovery, VlanPortDiscovery { public function discoverOS(Device $device): void { @@ -77,35 +74,6 @@ public function discoverOS(Device $device): void } } - /** - * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered - * - * @return array Processors - */ - public function discoverProcessors() - { - $data = snmpwalk_group($this->getDeviceArray(), 's5ChasUtilCPUUsageLast10Minutes', 'S5-CHASSIS-MIB'); - - $processors = []; - $count = 1; - foreach ($data as $index => $entry) { - $processors[] = Processor::discover( - 'avaya-ers', - $this->getDeviceId(), - ".1.3.6.1.4.1.45.1.6.3.8.1.1.6.$index", - Str::padLeft((string) $count, 2, '0'), - "Unit $count processor", - 1, - $entry['sgProxyCpuCoreBusyPerCent'] ?? null - ); - - $count++; - } - - return $processors; - } - public function discoverVlans(): Collection { if (($QBridgeMibVlans = parent::discoverVlans())->isNotEmpty()) { diff --git a/LibreNMS/OS/Ceraos.php b/LibreNMS/OS/Ceraos.php index b4e0c7c86fc..48145ee76c2 100644 --- a/LibreNMS/OS/Ceraos.php +++ b/LibreNMS/OS/Ceraos.php @@ -72,7 +72,7 @@ public function discoverOS(Device $device): void public function discoverWirelessXpi() { - $ifNames = $this->getCacheByIndex('ifName', 'IF-MIB'); + $ifNames = SnmpQuery::cache()->walk('IF-MIB::ifName')->pluck(); $sensors = []; $divisor = 100; @@ -85,7 +85,7 @@ public function discoverWirelessXpi() '.1.3.6.1.4.1.2281.10.7.1.1.5.' . $index, 'ceraos', $index, - $ifNames[$index], + ($ifNames[$index] ?? ''), $data['MWRM-RADIO-MIB::genEquipRadioStatusXPI'] / $divisor, 1, $divisor @@ -144,7 +144,7 @@ public function discoverWirelessFrequency() */ public function discoverWirelessRate() { - $ifNames = $this->getCacheByIndex('ifName', 'IF-MIB'); + $ifNames = SnmpQuery::cache()->walk('IF-MIB::ifName')->pluck(); $sensors = []; @@ -156,7 +156,7 @@ public function discoverWirelessRate() '.1.3.6.1.4.1.2281.10.7.4.1.1.7.' . $index, 'ceraos-tx', $index, - $ifNames[$index] . ' TX Bitrate', + ($ifNames[$index] ?? '') . ' TX Bitrate', $data['MWRM-RADIO-MIB::genEquipRadioMRMCCurrTxBitrate'], 1000 ); @@ -170,7 +170,7 @@ public function discoverWirelessRate() '.1.3.6.1.4.1.2281.10.7.4.1.1.11.' . $index, 'ceraos-rx', $index, - $ifNames[$index] . ' RX Bitrate', + ($ifNames[$index] ?? '') . ' RX Bitrate', $data['MWRM-RADIO-MIB::genEquipRadioMRMCCurrRxBitrate'], 1000 ); @@ -187,7 +187,7 @@ public function discoverWirelessRate() */ public function discoverWirelessErrors() { - $ifNames = $this->getCacheByIndex('ifName', 'IF-MIB'); + $ifNames = SnmpQuery::cache()->walk('IF-MIB::ifName')->pluck(); $sensors = []; @@ -199,7 +199,7 @@ public function discoverWirelessErrors() '.1.3.6.1.4.1.2281.10.7.1.1.3.' . $index, 'ceraos', $index, - $ifNames[$index] . ' Defected Blocks', + ($ifNames[$index] ?? '') . ' Defected Blocks', $data['MWRM-RADIO-MIB::genEquipRadioStatusDefectedBlocks'] ); } @@ -215,7 +215,7 @@ public function discoverWirelessErrors() */ public function discoverWirelessMse() { - $ifNames = $this->getCacheByIndex('ifName', 'IF-MIB'); + $ifNames = SnmpQuery::cache()->walk('IF-MIB::ifName')->pluck(); $sensors = []; $divisor = 100; @@ -228,7 +228,7 @@ public function discoverWirelessMse() '.1.3.6.1.4.1.2281.10.7.1.1.2.' . $index, 'ceraos', $index, - $ifNames[$index], + ($ifNames[$index] ?? ''), $data['MWRM-RADIO-MIB::genEquipRadioStatusMSE'] / $divisor, 1, $divisor @@ -246,7 +246,7 @@ public function discoverWirelessMse() */ public function discoverWirelessPower() { - $ifNames = $this->getCacheByIndex('ifName', 'IF-MIB'); + $ifNames = SnmpQuery::cache()->walk('IF-MIB::ifName')->pluck(); $sensors = []; @@ -258,7 +258,7 @@ public function discoverWirelessPower() '.1.3.6.1.4.1.2281.10.5.1.1.3.' . $index, 'ceraos-tx', $index, - $ifNames[$index] . ' TX', + ($ifNames[$index] ?? '') . ' TX', $data['MWRM-RADIO-MIB::genEquipRfuStatusTxLevel'] ); } @@ -271,7 +271,7 @@ public function discoverWirelessPower() '.1.3.6.1.4.1.2281.10.5.1.1.2.' . $index, 'ceraos-main-rx', $index, - $ifNames[$index] . ' RX Main', + ($ifNames[$index] ?? '') . ' RX Main', $data['MWRM-RADIO-MIB::genEquipRfuStatusRxLevel'] ); } @@ -284,7 +284,7 @@ public function discoverWirelessPower() '.1.3.6.1.4.1.2281.10.5.1.1.10.' . $index, 'ceraos-diversity-rx', $index, - $ifNames[$index] . ' RX Diversity', + ($ifNames[$index] ?? '') . ' RX Diversity', $data['MWRM-RADIO-MIB::genEquipRfuStatusRxLevelDiversity'] ); } diff --git a/LibreNMS/OS/Ciscowlc.php b/LibreNMS/OS/Ciscowlc.php index d5e56165f28..f29fc441391 100644 --- a/LibreNMS/OS/Ciscowlc.php +++ b/LibreNMS/OS/Ciscowlc.php @@ -151,15 +151,15 @@ public function pollOS(DataStorageInterface $datastore): void */ public function discoverWirelessClients() { - $counts = $this->getCacheByIndex('bsnDot11EssNumberOfMobileStations', 'AIRESPACE-WIRELESS-MIB'); + $counts = SnmpQuery::walk('AIRESPACE-WIRELESS-MIB::bsnDot11EssNumberOfMobileStations')->pluck(); if (empty($counts)) { return []; // no counts to be had } - $ssids = $this->getCacheByIndex('bsnDot11EssSsid', 'AIRESPACE-WIRELESS-MIB'); + $ssids = SnmpQuery::walk('AIRESPACE-WIRELESS-MIB::bsnDot11EssSsid')->pluck(); if (empty($ssids)) { // Try to check the LWAPP mib - $ssids = $this->getCacheByIndex('cLWlanSsid', 'CISCO-LWAPP-WLAN-MIB'); + $ssids = SnmpQuery::walk('CISCO-LWAPP-WLAN-MIB::cLWlanSsid')->pluck(); } $sensors = []; @@ -176,7 +176,7 @@ public function discoverWirelessClients() $oid, 'ciscowlc-ssid', $index, - 'SSID: ' . $ssids[$index], + 'SSID: ' . ($ssids[$index] ?? ''), $count ); } diff --git a/LibreNMS/OS/Comware.php b/LibreNMS/OS/Comware.php index db4a80dc724..d9ad39b218e 100644 --- a/LibreNMS/OS/Comware.php +++ b/LibreNMS/OS/Comware.php @@ -31,11 +31,11 @@ use App\Models\Mempool; use App\Models\Transceiver; use Illuminate\Support\Collection; -use LibreNMS\Device\Processor; use LibreNMS\Interfaces\Discovery\MempoolsDiscovery; use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; use LibreNMS\Interfaces\Discovery\TransceiverDiscovery; use LibreNMS\OS; +use SnmpQuery; class Comware extends OS implements MempoolsDiscovery, ProcessorDiscovery, TransceiverDiscovery { @@ -48,41 +48,6 @@ public function discoverOS(Device $device): void $this->getDevice()->serial = $serial_nums[0]; // use the first s/n } - /** - * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered - * - * @return array Processors - */ - public function discoverProcessors() - { - $processors = []; - $procdata = snmpwalk_group($this->getDeviceArray(), 'hh3cEntityExtCpuUsage', 'HH3C-ENTITY-EXT-MIB'); - - if (empty($procdata)) { - return $processors; - } - $entity_data = $this->getCacheByIndex('entPhysicalName', 'ENTITY-MIB'); - - foreach ($procdata as $index => $usage) { - if ($usage['hh3cEntityExtCpuUsage'] != 0) { - $processors[] = Processor::discover( - $this->getName(), - $this->getDeviceId(), - ".1.3.6.1.4.1.25506.2.6.1.1.1.1.6.$index", - $index, - $entity_data[$index], - 1, - $usage['hh3cEntityExtCpuUsage'], - null, - $index - ); - } - } - - return $processors; - } - public function discoverMempools() { $mempools = new Collection(); @@ -93,19 +58,19 @@ public function discoverMempools() } $data = snmpwalk_group($this->getDeviceArray(), 'hh3cEntityExtMemSize', 'HH3C-ENTITY-EXT-MIB', 1, $data); - $entity_name = $this->getCacheByIndex('entPhysicalName', 'ENTITY-MIB'); - $entity_class = $this->getCacheByIndex('entPhysicalClass', 'ENTITY-MIB'); + $entity_name = SnmpQuery::walk('ENTITY-MIB::entPhysicalName')->pluck(); + $entity_class = SnmpQuery::enumStrings()->walk('ENTITY-MIB::entPhysicalClass')->pluck(); foreach ($data as $index => $entry) { - if ($entity_class[$index] == 'module' && $entry['hh3cEntityExtMemUsage'] > 0) { - $mempools->push((new Mempool([ + if (($entity_class[$index] ?? null) == 'module' && $entry['hh3cEntityExtMemUsage'] > 0) { + $mempools->push(new Mempool([ 'mempool_index' => $index, 'mempool_type' => 'comware', 'mempool_class' => 'system', - 'mempool_descr' => $entity_name[$index], + 'mempool_descr' => $entity_name[$index] ?? "Module $index", 'mempool_precision' => 1, 'mempool_perc_oid' => ".1.3.6.1.4.1.25506.2.6.1.1.1.1.8.$index", - ]))->fillUsage(null, $entry['hh3cEntityExtMemSize'] ?? null, null, $entry['hh3cEntityExtMemUsage'] ?? null)); + ])->fillUsage(null, $entry['hh3cEntityExtMemSize'] ?? null, null, $entry['hh3cEntityExtMemUsage'] ?? null)); } } diff --git a/LibreNMS/OS/Coriant.php b/LibreNMS/OS/Coriant.php index 1f2a0c764c1..beeef58a87d 100644 --- a/LibreNMS/OS/Coriant.php +++ b/LibreNMS/OS/Coriant.php @@ -27,8 +27,10 @@ namespace LibreNMS\OS; use App\Models\Eventlog; +use App\Models\MefInfo; use App\Models\TnmsneInfo; use App\Observers\ModuleModelObserver; +use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; use LibreNMS\Enum\Severity; use LibreNMS\Interfaces\Data\DataStorageInterface; @@ -73,4 +75,17 @@ public function pollOS(DataStorageInterface $datastore): void Eventlog::log("Coriant enmsNETable Hardware $ne->neName at $ne->neLocation Removed", $this->getDevice(), 'system', Severity::Info, $ne->neID); } } + + /** + * Coriant MEF-EVC is a bit strange: the MTU is sometimes set to 0 + */ + public function discoverMef(): ?Collection + { + return parent::discoverMef()?->each(fn (MefInfo $mef) => $mef->mefMTU = $mef->mefMTU === 0 ? 1600 : $mef->mefMTU); + } + + public function pollMef(Collection $mefs): Collection + { + return parent::pollMef($mefs)->each(fn (MefInfo $mef) => $mef->mefMTU = $mef->mefMTU === 0 ? 1600 : $mef->mefMTU); + } } diff --git a/LibreNMS/OS/Cumulus.php b/LibreNMS/OS/Cumulus.php index 3246f1c359a..52341d1bf17 100644 --- a/LibreNMS/OS/Cumulus.php +++ b/LibreNMS/OS/Cumulus.php @@ -26,10 +26,33 @@ namespace LibreNMS\OS; +use App\Models\BgpPeer; use App\Models\Device; +use App\Models\Vrf; +use Illuminate\Support\Arr; +use Illuminate\Support\Collection; +use LibreNMS\Util\Bgp; +use LibreNMS\Util\IP; +use SnmpQuery; class Cumulus extends \LibreNMS\OS { + /** BgpPeer column to the column of both CUMULUS-BGPVRF-MIB and CUMULUS-BGPUN-MIB */ + private const array BGP_COLUMNS = [ + 'bgpPeerRemoteAs' => 'bgpPeerRemoteAs', + 'bgpPeerState' => 'bgpPeerState', + 'bgpPeerAdminStatus' => 'bgpPeerAdminStatus', + 'bgpLocalAddr' => 'bgpPeerLocalAddr', + 'bgpPeerDescr' => 'bgpPeerDesc', + 'bgpPeerLastError' => 'bgpPeerLastError', + 'bgpPeerFsmEstablishedTime' => 'bgpPeerFsmEstablishedTime', + 'bgpPeerInUpdateElapsedTime' => 'bgpPeerInUpdateElapsedTime', + 'bgpPeerInUpdates' => 'bgpPeerInUpdates', + 'bgpPeerOutUpdates' => 'bgpPeerOutUpdates', + 'bgpPeerInTotalMessages' => 'bgpPeerInTotalMessages', + 'bgpPeerOutTotalMessages' => 'bgpPeerOutTotalMessages', + ]; + public function discoverOS(Device $device): void { $response = \SnmpQuery::next([ @@ -42,4 +65,58 @@ public function discoverOS(Device $device): void $device->serial = $response->value('ENTITY-MIB::entPhysicalSerialNum') ?: null; $device->version = preg_replace('/^Cumulus Linux /', '', (string) $response->value('ENTITY-MIB::entPhysicalSoftwareRev')) ?: null; } + + /** + * CUMULUS-BGPVRF-MIB lists the VRFs by their id + */ + public function discoverVrfs(): Collection + { + return SnmpQuery::hideMib()->walk('CUMULUS-BGPVRF-MIB::bgpVrfName')->throwIfConnectionError()->mapTable(fn ($data, $vrfId) => new Vrf([ + 'vrf_oid' => (string) $vrfId, + 'vrf_name' => $data['bgpVrfName'] ?? '', + 'mplsVpnVrfDescription' => '', + ]))->filter(fn (Vrf $vrf) => $vrf->vrf_name !== '')->values(); + } + + public function discoverVrfPorts(Collection $vrfs): Collection + { + return new Collection; + } + + /** + * CUMULUS-BGPVRF-MIB lists the sessions of every VRF, indexed by VRF id. + * Older releases only have CUMULUS-BGPUN-MIB, which adds unnumbered sessions to BGP4-MIB. + * + * @return Collection + */ + public function discoverBgpPeers(): Collection + { + $peers = collect($this->walkBgpTable('', 'CUMULUS-BGPVRF-MIB', [ + ...self::BGP_COLUMNS, + 'address' => 'bgpPeerRemoteAddr', + 'iface' => 'bgpPeerIfindex', + ]))->map(function (array $row, int|string $index): ?BgpPeer { + $address = IP::fromHexString($row['address'] ?? '', true); + $vrfId = $this->bgpVrfId(explode('.', (string) $index)[0]); + + return $this->makeBgpPeer($address, $row['iface'] ?? null, '', $vrfId, Arr::except($row, ['address', 'iface'])); + })->filter()->values(); + + if ($peers->isNotEmpty()) { + return $peers; + } + + $peers = collect($this->walkBgpTable('', 'CUMULUS-BGPUN-MIB', [...self::BGP_COLUMNS, 'iface' => 'bgpPeerIface']))->map(function (array $row, int|string $index): ?BgpPeer { + $parts = explode('.', (string) $index); + + return $this->makeBgpPeer(Bgp::shiftIp($parts), $row['iface'] ?? null, '', null, Arr::except($row, ['iface'])); + })->filter()->values(); + + return $peers->isNotEmpty() ? $peers : $this->discoverBgp4MibPeers(''); + } + + public function discoverBgpLocalAs(): ?int + { + return $this->bgpLocalAsFallback(parent::discoverBgpLocalAs(), 'CUMULUS-BGPVRF-MIB::bgpLocalAs'); + } } diff --git a/LibreNMS/OS/DellOs10.php b/LibreNMS/OS/DellOs10.php new file mode 100644 index 00000000000..b9e1672099a --- /dev/null +++ b/LibreNMS/OS/DellOs10.php @@ -0,0 +1,55 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace LibreNMS\OS; + +use Illuminate\Support\Collection; +use LibreNMS\Interfaces\Discovery\BgpAddressFamilyDiscovery; +use LibreNMS\OS; +use LibreNMS\OS\Traits\Bgp4V2Mib; + +class DellOs10 extends OS implements BgpAddressFamilyDiscovery +{ + use Bgp4V2Mib; + + /** + * The instance of the sessions is their VRF + */ + public function discoverBgpPeers(): Collection + { + return $this->discoverBgp4V2Peers('DELLEMC-OS10-BGP4V2-MIB', 'os10bgp4V2', instanceIsVrf: true); + } + + public function discoverBgpAddressFamilies(Collection $peers): Collection + { + return $this->discoverBgp4V2AddressFamilies($peers, 'DELLEMC-OS10-BGP4V2-MIB', 'os10bgp4V2'); + } + + public function discoverBgpLocalAs(): ?int + { + return $this->bgpLocalAsFallback(parent::discoverBgpLocalAs(), 'DELLEMC-OS10-BGP4V2-MIB::os10bgp4V2PeerLocalAs'); + } +} diff --git a/LibreNMS/OS/Dlinkap.php b/LibreNMS/OS/Dlinkap.php index b4ada4410b9..d4531fcf187 100644 --- a/LibreNMS/OS/Dlinkap.php +++ b/LibreNMS/OS/Dlinkap.php @@ -28,11 +28,12 @@ use App\Models\Device; use App\Models\Mempool; +use App\Models\Processor; use Illuminate\Support\Collection; -use LibreNMS\Device\Processor; use LibreNMS\Interfaces\Discovery\MempoolsDiscovery; use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; use LibreNMS\OS; +use SnmpQuery; class Dlinkap extends OS implements MempoolsDiscovery, ProcessorDiscovery { @@ -47,39 +48,46 @@ public function discoverOS(Device $device): void /** * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered + * Returns a Collection of Processor models that have been discovered * - * @return array Processors + * @return Collection */ - public function discoverProcessors() + public function discoverProcessors(): Collection { - return [ - Processor::discover( - 'dlinkap-cpu', - $this->getDeviceId(), - $this->getDevice()->sysObjectID . '.5.1.3.0', // different OID for each model - 0, - 'Processor', - 100 - ), - ]; + $oid = $this->getDevice()->sysObjectID . '.5.1.3.0'; + $value = SnmpQuery::get($oid)->value(); + + if (! is_numeric($value)) { + return new Collection; + } + + return collect([ + new Processor([ + 'processor_type' => 'dlinkap-cpu', + 'processor_oid' => $oid, + 'processor_index' => 0, + 'processor_descr' => 'Processor', + 'processor_precision' => 100, + 'processor_usage' => $value, + ]), + ]); } public function discoverMempools() { $oid = $this->getDevice()->sysObjectID . '.5.1.4.0'; - $memory = snmp_get($this->getDeviceArray(), $oid, '-OQv'); + $memory = SnmpQuery::get($oid)->value(); - if ($memory === false) { - return new Collection(); + if (! is_numeric($memory)) { + return new Collection; } - return collect()->push((new Mempool([ + return collect()->push(new Mempool([ 'mempool_index' => 0, 'mempool_type' => 'dlinkap', 'mempool_class' => 'system', 'mempool_descr' => 'Memory', 'mempool_perc_oid' => $oid, - ]))->fillUsage(null, null, null, $memory)); + ])->fillUsage(null, null, null, $memory)); } } diff --git a/LibreNMS/OS/Dnos.php b/LibreNMS/OS/Dnos.php index ea915e74b75..2a4bf3f31ad 100644 --- a/LibreNMS/OS/Dnos.php +++ b/LibreNMS/OS/Dnos.php @@ -26,96 +26,19 @@ namespace LibreNMS\OS; -use Illuminate\Support\Str; -use LibreNMS\Device\Processor; -use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; +use App\Models\Processor; +use Illuminate\Support\Collection; use LibreNMS\OS; -class Dnos extends OS implements ProcessorDiscovery +class Dnos extends OS { - /** - * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered - * - * @return array Processors - */ - public function discoverProcessors() + public function discoverProcessors(): Collection { - $device = $this->getDeviceArray(); - $processors = []; + $processors = parent::discoverProcessors(); - if (Str::startsWith($device['sysObjectID'], '.1.3.6.1.4.1.6027.1.3')) { - d_echo('Dell S Series Chassis'); - $this->findProcessors( - $processors, - 'chStackUnitCpuUtil5Sec', - 'F10-S-SERIES-CHASSIS-MIB', - '.1.3.6.1.4.1.6027.3.10.1.2.9.1.2', - 'Stack Unit' - ); - } elseif (Str::startsWith($device['sysObjectID'], '.1.3.6.1.4.1.6027.1.2')) { - d_echo('Dell C Series Chassis'); - $this->findProcessors( - $processors, - 'chRpmCpuUtil5Sec', - 'F10-C-SERIES-CHASSIS-MIB', - '.1.3.6.1.4.1.6027.3.8.1.3.7.1.3', - 'Route Process Module', - $this->getName() . '-rpm' - ); - $this->findProcessors( - $processors, - 'chLineCardCpuUtil5Sec', - 'F10-C-SERIES-CHASSIS-MIB', - '.1.3.6.1.4.1.6027.3.8.1.5.1.1.1', - 'Line Card' - ); - } elseif (Str::startsWith($device['sysObjectID'], '.1.3.6.1.4.1.6027.1.4')) { - d_echo('Dell M Series Chassis'); - $this->findProcessors( - $processors, - 'chStackUnitCpuUtil5Sec', - 'F10-M-SERIES-CHASSIS-MIB', - '.1.3.6.1.4.1.6027.3.19.1.2.8.1.2', - 'Stack Unit' - ); - } elseif (Str::startsWith($device['sysObjectID'], '.1.3.6.1.4.1.6027.1.5')) { - d_echo('Dell Z Series Chassis'); - $this->findProcessors( - $processors, - 'chSysCpuUtil5Sec', - 'F10-Z-SERIES-CHASSIS-MIB', - '.1.3.6.1.4.1.6027.3.25.1.2.3.1.1', - 'Chassis' - ); - } + // the F10 chassis tables report the same cpus, only use them when dellNetCpuUtilTable is missing + $dellNet = $processors->filter(fn (Processor $processor) => str_starts_with((string) $processor->processor_index, 'dellNetCpuUtil')); - return $processors; - } - - /** - * Find processors and append them to the $processors array - * - * @param array $processors - * @param string $oid Textual OIDf - * @param string $mib MIB - * @param string $num_oid Numerical OID - * @param string $name Name prefix to display to user - * @param string $type custom type (if there are multiple in one chassis) - */ - private function findProcessors(&$processors, $oid, $mib, $num_oid, $name, $type = null) - { - $data = $this->getCacheByIndex($oid, $mib); - foreach ($data as $index => $usage) { - $processors[] = Processor::discover( - $type ?: $this->getName(), - $this->getDeviceId(), - "$num_oid.$index", - $index, - "$name $index CPU", - 1, - $usage - ); - } + return $dellNet->isNotEmpty() ? $dellNet->values() : $processors; } } diff --git a/LibreNMS/OS/Edgecos.php b/LibreNMS/OS/Edgecos.php index 6776edf3397..ffe756b4ca6 100644 --- a/LibreNMS/OS/Edgecos.php +++ b/LibreNMS/OS/Edgecos.php @@ -31,10 +31,10 @@ use App\Facades\PortCache; use App\Models\Device; use App\Models\Mempool; +use App\Models\Processor; use App\Models\Transceiver; use Illuminate\Support\Collection; use Illuminate\Support\Str; -use LibreNMS\Device\Processor; use LibreNMS\Interfaces\Discovery\MempoolsDiscovery; use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; use LibreNMS\Interfaces\Discovery\TransceiverDiscovery; @@ -117,49 +117,52 @@ public function discoverOS(Device $device): void /** * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered + * Returns a Collection of Processor models that have been discovered * - * @return array Processors + * @return Collection */ - public function discoverProcessors() + public function discoverProcessors(): \Illuminate\Support\Collection { $device = $this->getDevice(); - if (Str::startsWith($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.24.')) { //ECS4510 + if (str_starts_with($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.24.')) { //ECS4510 $oid = '.1.3.6.1.4.1.259.10.1.24.1.39.2.1.0'; - } elseif (Str::startsWith($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.22.')) { //ECS3528 + } elseif (str_starts_with($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.22.')) { //ECS3528 $oid = '.1.3.6.1.4.1.259.10.1.22.1.39.2.1.0'; - } elseif (Str::startsWith($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.39.')) { //ECS4110 + } elseif (str_starts_with($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.39.')) { //ECS4110 $oid = '.1.3.6.1.4.1.259.10.1.39.1.39.2.1.0'; - } elseif (Str::startsWith($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.45.')) { //ECS4120 + } elseif (str_starts_with($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.45.')) { //ECS4120 $oid = '.1.3.6.1.4.1.259.10.1.45.1.39.2.1.0'; - } elseif (Str::startsWith($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.55.')) { //ECS4150 + } elseif (str_starts_with($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.55.')) { //ECS4150 $oid = '.1.3.6.1.4.1.259.10.1.55.1.39.2.1.0'; - } elseif (Str::startsWith($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.42.')) { //ECS4210 + } elseif (str_starts_with($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.42.')) { //ECS4210 $oid = '.1.3.6.1.4.1.259.10.1.42.101.1.39.2.1.0'; - } elseif (Str::startsWith($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.58.')) { //ECS4650 + } elseif (str_starts_with($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.58.')) { //ECS4650 $oid = '.1.3.6.1.4.1.259.10.1.58.1.39.2.1.0'; - } elseif (Str::startsWith($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.51.')) { //ECS5520 + } elseif (str_starts_with($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.51.')) { //ECS5520 $oid = '.1.3.6.1.4.1.259.10.1.51.1.39.2.1.0'; - } elseif (Str::startsWith($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.27.')) { //ECS3510 + } elseif (str_starts_with($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.27.')) { //ECS3510 $oid = '.1.3.6.1.4.1.259.10.1.27.1.39.2.1.0'; - } elseif (Str::startsWith($device->sysObjectID, '.1.3.6.1.4.1.259.8.1.11.')) { //ES3510MA + } elseif (str_starts_with($device->sysObjectID, '.1.3.6.1.4.1.259.8.1.11.')) { //ES3510MA $oid = '.1.3.6.1.4.1.259.8.1.11.1.39.2.1.0'; - } elseif (Str::startsWith($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.46.')) { //ECS4100-52T + } elseif (str_starts_with($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.46.')) { //ECS4100-52T $oid = '.1.3.6.1.4.1.259.10.1.46.1.39.2.1.0'; - } elseif (Str::startsWith($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.5')) { //ECS4610-24F + } elseif (str_starts_with($device->sysObjectID, '.1.3.6.1.4.1.259.10.1.5')) { //ECS4610-24F $oid = '.1.3.6.1.4.1.259.10.1.5.1.39.2.1.0'; } if (isset($oid)) { - return [ - Processor::discover( - $this->getName(), - $this->getDeviceId(), - $oid, - 0 - ), - ]; + $value = \SnmpQuery::get($oid)->value(); + if (is_numeric($value)) { + return collect([ + new Processor([ + 'processor_type' => $this->getName(), + 'processor_oid' => $oid, + 'processor_index' => 0, + 'processor_usage' => $value, + ]), + ]); + } } return parent::discoverProcessors(); diff --git a/LibreNMS/OS/Edgeswitch.php b/LibreNMS/OS/Edgeswitch.php index bffff10d217..3a9bd8ce5af 100644 --- a/LibreNMS/OS/Edgeswitch.php +++ b/LibreNMS/OS/Edgeswitch.php @@ -28,6 +28,7 @@ use App\Facades\PortCache; use App\Models\Ipv4Mac; +use App\Models\PortsFdb; use Illuminate\Support\Collection; use LibreNMS\Interfaces\Discovery\ArpTableDiscovery; use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; @@ -48,4 +49,18 @@ public function discoverArpTable(): Collection 'ipv4_address' => $data['EdgeSwitch-SWITCHING-MIB::agentDynamicDsBindingIpAddr'], ])); } + + /** + * The binding table only holds DHCP snooped clients, so it adds to the standard FDB, which wins when both have an entry. + */ + public function discoverFdbTable(): Collection + { + return \SnmpQuery::walk('EdgeSwitch-SWITCHING-MIB::agentDynamicDsBindingTable') + ->mapTable(fn ($data, $mac) => new PortsFdb([ + 'port_id' => PortCache::getIdFromIfIndex($data['EdgeSwitch-SWITCHING-MIB::agentDynamicDsBindingIfIndex'] ?? null, $this->getDeviceId()) ?? 0, + 'mac_address' => Mac::parse($mac)->hex(), + 'vlan' => (int) ($data['EdgeSwitch-SWITCHING-MIB::agentDynamicDsBindingVlanId'] ?? 0) ?: null, + ])) + ->merge(parent::discoverFdbTable()); + } } diff --git a/LibreNMS/OS/Enterasys.php b/LibreNMS/OS/Enterasys.php index 5876f314d3c..3ba1db6b08c 100644 --- a/LibreNMS/OS/Enterasys.php +++ b/LibreNMS/OS/Enterasys.php @@ -46,7 +46,7 @@ public function discoverMempools() $descr = 'Slot #' . substr((string) $index, -1) . " $descr"; } - $mempools->push((new Mempool([ + $mempools->push(new Mempool([ 'mempool_index' => $index, 'mempool_type' => 'enterasys', 'mempool_class' => 'system', @@ -54,7 +54,7 @@ public function discoverMempools() 'mempool_precision' => 1024, 'mempool_free_oid' => ".1.3.6.1.4.1.5624.1.2.49.1.3.1.1.5.$index.2.$mem_id", 'mempool_perc_warn' => 90, - ]))->fillUsage(null, $ram['etsysResourceStorageSize'] ?? null, $ram['etsysResourceStorageAvailable'] ?? null)); + ])->fillUsage(null, $ram['etsysResourceStorageSize'] ?? null, $ram['etsysResourceStorageAvailable'] ?? null)); } } @@ -68,14 +68,14 @@ public function discoverStorage(): Collection $free = SnmpQuery::get('ENTERASYS-RESOURCE-UTILIZATION-MIB::etsysResourceStorageAvailable.3.flash.0')->value(); $total = SnmpQuery::get('ENTERASYS-RESOURCE-UTILIZATION-MIB::etsysResourceStorageSize.3.flash.0')->value(); if (is_numeric($free) && is_numeric($total)) { - $storage->push((new Storage([ + $storage->push(new Storage([ 'type' => 'enterasys', 'storage_type' => 'Flash', 'storage_descr' => 'Internal Flash Storage', 'storage_units' => 1024, 'storage_index' => 0, 'storage_free_oid' => '.1.3.6.1.4.1.5624.1.2.49.1.3.1.1.5.3.3.0', - ]))->fillUsage(total: $total, free: $free)); + ])->fillUsage(total: $total, free: $free)); } return $storage; diff --git a/LibreNMS/OS/Equallogic.php b/LibreNMS/OS/Equallogic.php index 61035d14922..46987265837 100644 --- a/LibreNMS/OS/Equallogic.php +++ b/LibreNMS/OS/Equallogic.php @@ -13,13 +13,13 @@ public function discoverStorage(): Collection return \SnmpQuery::mibDir('equallogic')->walk([ 'EQLVOLUME-MIB::eqliscsiVolumeTable', 'EQLVOLUME-MIB::eqliscsiVolumeStatusTable', - ])->mapTable(fn ($data, $eqliscsiLocalMemberId, $eqliscsiVolumeIndex) => (new Storage([ + ])->mapTable(fn ($data, $eqliscsiLocalMemberId, $eqliscsiVolumeIndex) => new Storage([ 'type' => 'equallogic', 'storage_type' => $data['EQLVOLUME-MIB::eqliscsiVolumeAdminStatus'] ?? null, 'storage_descr' => $data['EQLVOLUME-MIB::eqliscsiVolumeName'] ?? "volume $eqliscsiVolumeIndex", 'storage_index' => "$eqliscsiLocalMemberId.$eqliscsiVolumeIndex", 'storage_units' => 1000000, 'storage_used_oid' => ".1.3.6.1.4.1.12740.5.1.7.7.1.13.$eqliscsiLocalMemberId.$eqliscsiVolumeIndex", - ]))->fillUsage($data['EQLVOLUME-MIB::eqliscsiVolumeStatusAllocatedSpace'] ?? null, $data['EQLVOLUME-MIB::eqliscsiVolumeSize'] ?? null)); + ])->fillUsage($data['EQLVOLUME-MIB::eqliscsiVolumeStatusAllocatedSpace'] ?? null, $data['EQLVOLUME-MIB::eqliscsiVolumeSize'] ?? null)); } } diff --git a/LibreNMS/OS/Ericsson6600.php b/LibreNMS/OS/Ericsson6600.php index d966f4eb767..48406cca673 100644 --- a/LibreNMS/OS/Ericsson6600.php +++ b/LibreNMS/OS/Ericsson6600.php @@ -33,6 +33,7 @@ use LibreNMS\Interfaces\Discovery\Sensors\WirelessRateDiscovery; use LibreNMS\Interfaces\Discovery\Sensors\WirelessSnrDiscovery; use LibreNMS\OS; +use SnmpQuery; class Ericsson6600 extends OS implements WirelessFrequencyDiscovery, @@ -45,7 +46,7 @@ public function discoverWirelessSnr() $sensors = []; $data = snmpwalk_cache_oid($this->getDeviceArray(), 'xfCarrierTermSNIR', [], 'XF-RADIOLINK-RLT-MIB'); - $carrier = $this->getCacheTable('xfCarrierTermDistinguishedName', 'XF-RADIOLINK-RLT-MIB'); + $carrier = SnmpQuery::cache()->walk('XF-RADIOLINK-RLT-MIB::xfCarrierTermDistinguishedName')->pluck(); foreach ($data as $index => $entry) { $sensors[] = new WirelessSensor( WirelessSensorType::Snr, @@ -53,7 +54,7 @@ public function discoverWirelessSnr() '.1.3.6.1.4.1.193.81.3.4.5.1.3.1.17.' . $index, 'ericsson-6600', $index, - 'SNR: ' . $carrier[$index]['xfCarrierTermDistinguishedName'], + 'SNR: ' . ($carrier[$index] ?? ''), null, 1, 10 @@ -68,7 +69,7 @@ public function discoverWirelessRate() $sensors = []; $data = snmpwalk_cache_oid($this->getDeviceArray(), 'xfCarrierTermActualCapacity', [], 'XF-RADIOLINK-RLT-MIB'); - $carrier = $this->getCacheTable('xfCarrierTermDistinguishedName', 'XF-RADIOLINK-RLT-MIB'); + $carrier = SnmpQuery::cache()->walk('XF-RADIOLINK-RLT-MIB::xfCarrierTermDistinguishedName')->pluck(); foreach ($data as $index => $entry) { $sensors[] = new WirelessSensor( WirelessSensorType::Rate, @@ -76,7 +77,7 @@ public function discoverWirelessRate() '.1.3.6.1.4.1.193.81.3.4.5.1.3.1.13.' . $index, 'ericsson-6600', $index, - 'Rate: ' . $carrier[$index]['xfCarrierTermDistinguishedName'], + 'Rate: ' . ($carrier[$index] ?? ''), null, 1000, 1 @@ -92,7 +93,7 @@ public function discoverWirelessFrequency() $data_tx = snmpwalk_cache_oid($this->getDeviceArray(), 'xfRFBaseTxFrequency', [], 'XF-RADIOLINK-PTP-RADIO-MIB'); $data_rx = snmpwalk_cache_oid($this->getDeviceArray(), 'xfRFBaseRxFrequency', [], 'XF-RADIOLINK-PTP-RADIO-MIB'); - $ifname = $this->getCacheTable('ifName', 'IF-MIB'); + $ifname = SnmpQuery::cache()->walk('IF-MIB::ifName')->pluck(); foreach ($data_tx as $index => $entry) { $sensors[] = new WirelessSensor( WirelessSensorType::Frequency, @@ -100,7 +101,7 @@ public function discoverWirelessFrequency() '.1.3.6.1.4.1.193.81.3.4.3.1.2.1.1.' . $index, 'ericsson-6600', $index . 'tx', - 'TX Frequency: ' . $ifname[$index]['ifName'], + 'TX Frequency: ' . ($ifname[$index] ?? ''), null, 1, 1000 @@ -113,7 +114,7 @@ public function discoverWirelessFrequency() '.1.3.6.1.4.1.193.81.3.4.3.1.2.1.2.' . $index, 'ericsson-6600', $index . 'rx', - 'RX Frequency: ' . $ifname[$index]['ifName'], + 'RX Frequency: ' . ($ifname[$index] ?? ''), null, 1, 1000 @@ -129,7 +130,7 @@ public function discoverWirelessPower() $data_tx = snmpwalk_cache_oid($this->getDeviceArray(), 'xfRfCurrentOutputPower', [], 'XF-RADIOLINK-PTP-RADIO-MIB'); $data_rx = snmpwalk_cache_oid($this->getDeviceArray(), 'xfRfCurrentInputPower', [], 'XF-RADIOLINK-PTP-RADIO-MIB'); - $ifname = $this->getCacheTable('ifName', 'IF-MIB'); + $ifname = SnmpQuery::cache()->walk('IF-MIB::ifName')->pluck(); foreach ($data_tx as $index => $entry) { $sensors[] = new WirelessSensor( WirelessSensorType::Power, @@ -137,7 +138,7 @@ public function discoverWirelessPower() '.1.3.6.1.4.1.193.81.3.4.3.1.8.1.3.' . $index, 'ericsson-6600', $index . 'tx', - 'Output power: ' . $ifname[$index]['ifName'], + 'Output power: ' . ($ifname[$index] ?? ''), ); } foreach ($data_rx as $index => $entry) { @@ -147,7 +148,7 @@ public function discoverWirelessPower() '.1.3.6.1.4.1.193.81.3.4.3.1.8.1.7.' . $index, 'ericsson-6600', $index . 'rx', - 'Input power: ' . $ifname[$index]['ifName'], + 'Input power: ' . ($ifname[$index] ?? ''), null, 1, 10 diff --git a/LibreNMS/OS/EricssonTn.php b/LibreNMS/OS/EricssonTn.php index 0410d9700d7..4027441873e 100644 --- a/LibreNMS/OS/EricssonTn.php +++ b/LibreNMS/OS/EricssonTn.php @@ -33,6 +33,7 @@ use LibreNMS\Interfaces\Discovery\Sensors\WirelessPowerDiscovery; use LibreNMS\Interfaces\Discovery\Sensors\WirelessRateDiscovery; use LibreNMS\OS; +use SnmpQuery; class EricssonTn extends OS implements WirelessMseDiscovery, @@ -45,7 +46,7 @@ public function discoverWirelessMSE() $sensors = []; $data = snmpwalk_cache_oid($this->getDeviceArray(), 'xfModemEntry', [], 'XF-RADIOLINK-PTP-MODEM-MIB'); - $ifname = $this->getCacheTable('entPhysicalName', 'ENTITY-MIB'); + $ifname = SnmpQuery::cache()->walk('ENTITY-MIB::entPhysicalName')->pluck(); foreach ($data as $index => $entry) { $sensors[] = new WirelessSensor( WirelessSensorType::Mse, @@ -53,7 +54,7 @@ public function discoverWirelessMSE() '.1.3.6.1.4.1.193.81.3.4.2.1.1.1.15.' . $index, 'ericsson-tn', $index, - 'MSE RAU: ' . ($ifname[$index]['entPhysicalName'] ?? null), + 'MSE RAU: ' . ($ifname[$index] ?? null), null, 1, 10 @@ -68,7 +69,7 @@ public function discoverWirelessRate() $sensors = []; $data = snmpwalk_cache_oid($this->getDeviceArray(), 'xfTermBitPipeCapacity', [], 'XF-RADIOLINK-PTP-TERMINAL-MIB'); - $carrier = $this->getCacheTable('xfTermSysName', 'XF-RADIOLINK-PTP-TERMINAL-MIB'); + $carrier = SnmpQuery::walk('XF-RADIOLINK-PTP-TERMINAL-MIB::xfTermSysName')->pluck(); foreach ($data as $index => $entry) { $sensors[] = new WirelessSensor( WirelessSensorType::Rate, @@ -76,7 +77,7 @@ public function discoverWirelessRate() '.1.3.6.1.4.1.193.81.3.4.1.1.14.1.7.' . $index, 'ericsson-tn', $index, - 'Rate: ' . $carrier[$index]['xfTermSysName'], + 'Rate: ' . ($carrier[$index] ?? ''), null, 1000, 1 @@ -92,7 +93,7 @@ public function discoverWirelessFrequency() $data_tx = snmpwalk_cache_oid($this->getDeviceArray(), 'xfRFBaseTxFrequency', [], 'XF-RADIOLINK-PTP-RADIO-MIB'); $data_rx = snmpwalk_cache_oid($this->getDeviceArray(), 'xfRFBaseRxFrequency', [], 'XF-RADIOLINK-PTP-RADIO-MIB'); - $ifname = $this->getCacheTable('ifName', 'IF-MIB'); + $ifname = SnmpQuery::cache()->walk('IF-MIB::ifName')->pluck(); foreach ($data_tx as $index => $entry) { $sensors[] = new WirelessSensor( WirelessSensorType::Frequency, @@ -100,7 +101,7 @@ public function discoverWirelessFrequency() '.1.3.6.1.4.1.193.81.3.4.3.1.2.1.1.' . $index, 'ericsson-tn', $index . 'tx', - 'TX Frequency: ' . $ifname[$index]['ifName'], + 'TX Frequency: ' . ($ifname[$index] ?? ''), null, 1, 1000 @@ -113,7 +114,7 @@ public function discoverWirelessFrequency() '.1.3.6.1.4.1.193.81.3.4.3.1.2.1.2.' . $index, 'ericsson-tn', $index . 'rx', - 'RX Frequency: ' . $ifname[$index]['ifName'], + 'RX Frequency: ' . ($ifname[$index] ?? ''), null, 1, 1000 @@ -129,7 +130,7 @@ public function discoverWirelessPower() $data_tx = snmpwalk_cache_oid($this->getDeviceArray(), 'xfRFCurrentOutputPower', [], 'XF-RADIOLINK-PTP-RADIO-MIB'); $data_rx = snmpwalk_cache_oid($this->getDeviceArray(), 'xfRFCurrentInputPower', [], 'XF-RADIOLINK-PTP-RADIO-MIB'); - $ifname = $this->getCacheTable('ifName', 'IF-MIB'); + $ifname = SnmpQuery::cache()->walk('IF-MIB::ifName')->pluck(); foreach ($data_tx as $index => $entry) { $sensors[] = new WirelessSensor( WirelessSensorType::Power, @@ -137,7 +138,7 @@ public function discoverWirelessPower() '.1.3.6.1.4.1.193.81.3.4.3.1.3.1.1.' . $index, 'ericsson-tn', $index . 'tx', - 'Output power: ' . $ifname[$index]['ifName'], + 'Output power: ' . ($ifname[$index] ?? ''), ); } foreach ($data_rx as $index => $entry) { @@ -147,7 +148,7 @@ public function discoverWirelessPower() '.1.3.6.1.4.1.193.81.3.4.3.1.3.1.10.' . $index, 'ericsson-tn', $index . 'rx', - 'Input power: ' . $ifname[$index]['ifName'], + 'Input power: ' . ($ifname[$index] ?? ''), null, 1, 10 diff --git a/LibreNMS/OS/Ewc.php b/LibreNMS/OS/Ewc.php index 909c54f72d3..2f95dd5ba1d 100644 --- a/LibreNMS/OS/Ewc.php +++ b/LibreNMS/OS/Ewc.php @@ -37,6 +37,7 @@ use LibreNMS\Interfaces\Discovery\Sensors\WirelessSnrDiscovery; use LibreNMS\Interfaces\Discovery\Sensors\WirelessUtilizationDiscovery; use LibreNMS\OS; +use SnmpQuery; class Ewc extends OS implements WirelessApCountDiscovery, @@ -109,11 +110,11 @@ public function discoverWirelessClients() ]; $apstats = snmpwalk_cache_oid($this->getDeviceArray(), 'apStatsMuCounts', [], 'HIPATH-WIRELESS-HWC-MIB'); - $apnames = $this->getCacheByIndex('apName', 'HIPATH-WIRELESS-HWC-MIB'); + $apnames = SnmpQuery::cache()->walk('HIPATH-WIRELESS-HWC-MIB::apName')->pluck(); foreach ($apstats as $index => $entry) { $apStatsMuCounts = $entry['apStatsMuCounts']; - $name = $apnames[$index]; + $name = $apnames[$index] ?? ''; $sensors[] = new WirelessSensor( WirelessSensorType::Clients, $this->getDeviceId(), @@ -126,10 +127,10 @@ public function discoverWirelessClients() } $wlanstats = snmpwalk_cache_oid($this->getDeviceArray(), 'wlanStatsAssociatedClients', [], 'HIPATH-WIRELESS-HWC-MIB'); - $wlannames = $this->getCacheByIndex('wlanName', 'HIPATH-WIRELESS-HWC-MIB'); + $wlannames = SnmpQuery::walk('HIPATH-WIRELESS-HWC-MIB::wlanName')->pluck(); foreach ($wlanstats as $index => $entry) { - $name = $wlannames[$index]; + $name = $wlannames[$index] ?? ''; $sensors[] = new WirelessSensor( WirelessSensorType::Clients, $this->getDeviceId(), @@ -152,11 +153,11 @@ public function discoverWirelessClients() public function discoverWirelessErrors() { $oids = snmpwalk_cache_oid($this->getDeviceArray(), 'apPerfRadioPktRetx', [], 'HIPATH-WIRELESS-HWC-MIB'); - $ap_interfaces = $this->getCacheByIndex('apName', 'HIPATH-WIRELESS-HWC-MIB'); + $ap_interfaces = SnmpQuery::cache()->walk('HIPATH-WIRELESS-HWC-MIB::apName')->pluck(); $sensors = []; foreach ($oids as $index => $entry) { - $name = $ap_interfaces[explode('.', (string) $index)[0]]; + $name = $ap_interfaces[explode('.', (string) $index)[0]] ?? ''; $sensors[] = new WirelessSensor( WirelessSensorType::Errors, $this->getDeviceId(), @@ -179,11 +180,11 @@ public function discoverWirelessErrors() public function discoverWirelessFrequency() { $oids = snmpwalk_cache_oid($this->getDeviceArray(), 'apRadioStatusChannel', [], 'HIPATH-WIRELESS-HWC-MIB'); - $ap_interfaces = $this->getCacheByIndex('ifName', 'IF-MIB'); + $ap_interfaces = SnmpQuery::cache()->walk('IF-MIB::ifName')->pluck(); $sensors = []; foreach ($oids as $index => $entry) { - $name = $ap_interfaces[$index]; + $name = $ap_interfaces[$index] ?? ''; $sensors[] = new WirelessSensor( WirelessSensorType::Frequency, $this->getDeviceId(), @@ -206,11 +207,11 @@ public function discoverWirelessFrequency() public function discoverWirelessNoiseFloor() { $oids = snmpwalk_cache_oid($this->getDeviceArray(), 'dot11ExtRadioMaxNfCount', [], 'HIPATH-WIRELESS-DOT11-EXTNS-MIB'); - $ap_interfaces = $this->getCacheByIndex('ifName', 'IF-MIB'); + $ap_interfaces = SnmpQuery::cache()->walk('IF-MIB::ifName')->pluck(); $sensors = []; foreach ($oids as $index => $entry) { - $name = $ap_interfaces[$index]; + $name = $ap_interfaces[$index] ?? ''; $noisefloor = $entry['dot11ExtRadioMaxNfCount']; $sensors[] = new WirelessSensor( WirelessSensorType::NoiseFloor, @@ -240,11 +241,11 @@ public function discoverWirelessNoiseFloor() public function discoverWirelessRssi() { $oids = snmpwalk_cache_oid($this->getDeviceArray(), 'apPerfRadioCurrentRSS', [], 'HIPATH-WIRELESS-HWC-MIB'); - $ap_interfaces = $this->getCacheByIndex('apName', 'HIPATH-WIRELESS-HWC-MIB'); + $ap_interfaces = SnmpQuery::cache()->walk('HIPATH-WIRELESS-HWC-MIB::apName')->pluck(); $sensors = []; foreach ($oids as $index => $entry) { - $name = $ap_interfaces[explode('.', (string) $index)[0]]; + $name = $ap_interfaces[explode('.', (string) $index)[0]] ?? ''; $sensors[] = new WirelessSensor( WirelessSensorType::Rssi, $this->getDeviceId(), @@ -267,11 +268,11 @@ public function discoverWirelessRssi() public function discoverWirelessSnr() { $oids = snmpwalk_cache_oid($this->getDeviceArray(), 'apPerfRadioCurrentSNR', [], 'HIPATH-WIRELESS-HWC-MIB'); - $ap_interfaces = $this->getCacheByIndex('apName', 'HIPATH-WIRELESS-HWC-MIB'); + $ap_interfaces = SnmpQuery::cache()->walk('HIPATH-WIRELESS-HWC-MIB::apName')->pluck(); $sensors = []; foreach ($oids as $index => $entry) { - $name = $ap_interfaces[explode('.', (string) $index)[0]]; + $name = $ap_interfaces[explode('.', (string) $index)[0]] ?? ''; $sensors[] = new WirelessSensor( WirelessSensorType::Snr, $this->getDeviceId(), @@ -294,11 +295,11 @@ public function discoverWirelessSnr() public function discoverWirelessUtilization() { $oids = snmpwalk_cache_oid($this->getDeviceArray(), 'apPerfRadioCurrentChannelUtilization', [], 'HIPATH-WIRELESS-HWC-MIB'); - $ap_interfaces = $this->getCacheByIndex('apName', 'HIPATH-WIRELESS-HWC-MIB'); + $ap_interfaces = SnmpQuery::cache()->walk('HIPATH-WIRELESS-HWC-MIB::apName')->pluck(); $sensors = []; foreach ($oids as $index => $entry) { - $name = $ap_interfaces[explode('.', (string) $index)[0]]; + $name = $ap_interfaces[explode('.', (string) $index)[0]] ?? ''; $sensors[] = new WirelessSensor( WirelessSensorType::Utilization, $this->getDeviceId(), diff --git a/LibreNMS/OS/Fabos.php b/LibreNMS/OS/Fabos.php index acbfe9cbe0a..275cfeb6453 100644 --- a/LibreNMS/OS/Fabos.php +++ b/LibreNMS/OS/Fabos.php @@ -38,91 +38,124 @@ class Fabos extends OS implements OSDiscovery, TransceiverDiscovery { + private const array MODELS = [ + '1' => 'Brocade 1000 Switch', + '2' => 'Brocade 2800 Switch', + '3' => 'Brocade 2100/2400 Switch', + '4' => 'Brocade 20x0 Switch', + '5' => 'Brocade 22x0 Switch', + '6' => 'Brocade 2800 Switch', + '7' => 'Brocade 2000 Switch', + '9' => 'Brocade 3800 Switch', + '10' => 'Brocade 12000 Director', + '12' => 'Brocade 3900 Switch', + '16' => 'Brocade 3200 Switch', + '18' => 'Brocade 3000 Switch', + '21' => 'Brocade 24000 Director', + '22' => 'Brocade 3016 Switch', + '26' => 'Brocade 3850 Switch', + '27' => 'Brocade 3250 Switch', + '29' => 'Brocade 4012 Embedded Switch', + '32' => 'Brocade 4100 Switch', + '33' => 'Brocade 3014 Switch', + '34' => 'Brocade 200E Switch', + '37' => 'Brocade 4020 Embedded Switch', + '38' => 'Brocade 7420 SAN Router', + '40' => 'Fibre Channel Routing (FCR) Front Domain', + '41' => 'Fibre Channel Routing (FCR) Xlate Domain', + '42' => 'Brocade 48000 Director', + '43' => 'Brocade 4024 Embedded Switch', + '44' => 'Brocade 4900 Switch', + '45' => 'Brocade 4016 Embedded Switch', + '46' => 'Brocade 7500 Switch', + '51' => 'Brocade 4018 Embedded Switch', + '55.2' => 'Brocade 7600 Switch', + '58' => 'Brocade 5000 Switch', + '61' => 'Brocade 4424 Embedded Switch', + '62' => 'Brocade DCX Backbone', + '64' => 'Brocade 5300 Switch', + '66' => 'Brocade 5100 Switch', + '67' => 'Brocade Encryption Switch', + '69' => 'Brocade 5410 Blade', + '70' => 'Brocade 5410 Embedded Switch', + '71' => 'Brocade 300 Switch', + '72' => 'Brocade 5480 Embedded Switch', + '73' => 'Brocade 5470 Embedded Switch', + '75' => 'Brocade M5424 Embedded Switch', + '76' => 'Brocade 8000 Switch', + '77' => 'Brocade DCX-4S Backbone', + '83' => 'Brocade 7800 Extension Switch', + '86' => 'Brocade 5450 Embedded Switch', + '87' => 'Brocade 5460 Embedded Switch', + '90' => 'Brocade 8470 Embedded Switch', + '92' => 'Brocade VA-40FC Switch', + '95' => 'Brocade VDX 6720-24 Data Center Switch', + '96' => 'Brocade VDX 6730-32 Data Center Switch', + '97' => 'Brocade VDX 6720-60 Data Center Switch', + '98' => 'Brocade VDX 6720-76 Data Center Switch', + '108' => 'Dell M84280k FCoE Embedded Switch', + '109' => 'Brocade 6510 Switch', + '116' => 'Brocade VDX 6710 Data Center Switch', + '117' => 'Brocade 6547 Embedded Switch', + '118' => 'Brocade 6505 Switch', + '120' => 'Brocade DCX 8510-8 Backbone', + '121' => 'Brocade DCX 8510-4 Backbone', + '124' => 'Brocade 5430 Switch', + '125' => 'Brocade 5431 Switch', + '129' => 'Brocade 6548 Switch', + '130' => 'Brocade M6505 Switch', + '133' => 'Brocade 6520 Switch', + '134' => 'Brocade 5432 Switch', + '148' => 'Brocade 7840 Switch', + '162' => 'Brocade G620 Switch', + '165' => 'Brocade X6-4 Director', + '166' => 'Brocade X6-8 Director', + '170' => 'Brocade G610 Switch', + '173' => 'Brocade G630 Switch', + '178' => 'Brocade 7810 Extension Switch', + '179' => 'Brocade X7-4 Director', + '180' => 'Brocade X7-8 Director', + '181' => 'Brocade G720 Switch', + '183' => 'Brocade G620 Switch', + '184' => 'Brocade G630 Switch', + '189' => 'Brocade G730 Switch', + '190' => 'Brocade 7850 Extension Switch', + '191' => 'Brocade G710 Switch', + '202' => 'Brocade X8-4 Director', + '203' => 'Brocade X8-8 Director', + '205' => 'Brocade G820 Switch', + ]; + public function discoverOS(Device $device): void { - $device->version = snmp_get($this->getDeviceArray(), 'swFirmwareVersion.0', '-Ovq', 'SYSTEM-MIB'); + parent::discoverOS($device); // yaml - $module = snmp_get($this->getDeviceArray(), 'fcFeModuleObjectID.1', '-Ovqn', 'FIBRE-CHANNEL-FE-MIB'); - $revboard = str_replace('.1.3.6.1.4.1.1588.2.1.1.', '', $module); - $device->hardware = $this->fcSwitchModelToName($revboard); + // yaml hardware (entity description, eg. "BrocadeG720" or "Dell6505") is kept when the switch type is unknown + $device->hardware = $this->getHardware() ?? $device->hardware; } - protected function fcSwitchModelToName($model) + private function getHardware(): ?string { - $models = [ - '1' => 'Brocade 1000 Switch', - '2' => 'Brocade 2800 Switch', - '3' => 'Brocade 2100/2400 Switch', - '4' => 'Brocade 20x0 Switch', - '5' => 'Brocade 22x0 Switch', - '6' => 'Brocade 2800 Switch', - '7' => 'Brocade 2000 Switch', - '9' => 'Brocade 3800 Switch', - '10' => 'Brocade 12000 Director', - '12' => 'Brocade 3900 Switch', - '16' => 'Brocade 3200 Switch', - '18' => 'Brocade 3000 Switch', - '21' => 'Brocade 24000 Director', - '22' => 'Brocade 3016 Switch', - '26' => 'Brocade 3850 Switch', - '27' => 'Brocade 3250 Switch', - '29' => 'Brocade 4012 Embedded Switch', - '32' => 'Brocade 4100 Switch', - '33' => 'Brocade 3014 Switch', - '34' => 'Brocade 200E Switch', - '37' => 'Brocade 4020 Embedded Switch', - '38' => 'Brocade 7420 SAN Router', - '40' => 'Fibre Channel Routing (FCR) Front Domain', - '41' => 'Fibre Channel Routing (FCR) Xlate Domain', - '42' => 'Brocade 48000 Director', - '43' => 'Brocade 4024 Embedded Switch', - '44' => 'Brocade 4900 Switch', - '45' => 'Brocade 4016 Embedded Switch', - '46' => 'Brocade 7500 Switch', - '51' => 'Brocade 4018 Embedded Switch', - '55.2' => 'Brocade 7600 Switch', - '58' => 'Brocade 5000 Switch', - '61' => 'Brocade 4424 Embedded Switch', - '62' => 'Brocade DCX Backbone', - '64' => 'Brocade 5300 Switch', - '66' => 'Brocade 5100 Switch', - '67' => 'Brocade Encryption Switch', - '69' => 'Brocade 5410 Blade', - '70' => 'Brocade 5410 Embedded Switch', - '71' => 'Brocade 300 Switch', - '72' => 'Brocade 5480 Embedded Switch', - '73' => 'Brocade 5470 Embedded Switch', - '75' => 'Brocade M5424 Embedded Switch', - '76' => 'Brocade 8000 Switch', - '77' => 'Brocade DCX-4S Backbone', - '83' => 'Brocade 7800 Extension Switch', - '86' => 'Brocade 5450 Embedded Switch', - '87' => 'Brocade 5460 Embedded Switch', - '90' => 'Brocade 8470 Embedded Switch', - '92' => 'Brocade VA-40FC Switch', - '95' => 'Brocade VDX 6720-24 Data Center Switch', - '96' => 'Brocade VDX 6730-32 Data Center Switch', - '97' => 'Brocade VDX 6720-60 Data Center Switch', - '98' => 'Brocade VDX 6720-76 Data Center Switch', - '108' => 'Dell M84280k FCoE Embedded Switch', - '109' => 'Brocade 6510 Switch', - '116' => 'Brocade VDX 6710 Data Center Switch', - '117' => 'Brocade 6547 Embedded Switch', - '118' => 'Brocade 6505 Switch', - '120' => 'Brocade DCX 8510-8 Backbone', - '121' => 'Brocade DCX 8510-4 Backbone', - '124' => 'Brocade 5430 Switch', - '125' => 'Brocade 5431 Switch', - '129' => 'Brocade 6548 Switch', - '130' => 'Brocade M6505 Switch', - '133' => 'Brocade 6520 Switch', - '134' => 'Brocade 5432 Switch', - '148' => 'Brocade 7840 Switch', - '162' => 'Brocade G620 Switch', - '170' => 'Brocade G610 Switch', - ]; + // the "Hardware version" revision holds the switch type, eg. "118.1" + $switchType = ''; + $revs = SnmpQuery::numericIndex()->walk(['FCMGMT-MIB::connUnitRevsDescription', 'FCMGMT-MIB::connUnitRevsRevId'])->valuesByIndex(); + foreach ($revs as $rev) { + if (strcasecmp(trim($rev['FCMGMT-MIB::connUnitRevsDescription'] ?? ''), 'Hardware version') === 0) { + $switchType = trim($rev['FCMGMT-MIB::connUnitRevsRevId'] ?? ''); + break; + } + } + + // newer FabricOS returns the generic .1.3.6.1.4.1.1588.2.1.1.1 here, so only use it as a fallback + if ($switchType === '') { + $module = SnmpQuery::numeric()->get('FIBRE-CHANNEL-FE-MIB::fcFeModuleObjectID.1')->value(); + if ($module !== '.1.3.6.1.4.1.1588.2.1.1.1') { + $switchType = str_replace('.1.3.6.1.4.1.1588.2.1.1.', '', $module); + } + } - return $models[$model] ?? 'Unknown Brocade FC Switch'; + // switch type may include a revision suffix + return self::MODELS[$switchType] ?? self::MODELS[explode('.', $switchType)[0]] ?? null; } public function discoverTransceivers(): Collection diff --git a/LibreNMS/OS/Firebrick.php b/LibreNMS/OS/Firebrick.php new file mode 100644 index 00000000000..7dbf66890eb --- /dev/null +++ b/LibreNMS/OS/Firebrick.php @@ -0,0 +1,87 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace LibreNMS\OS; + +use App\Models\BgpPeer; +use App\Models\Vrf; +use Illuminate\Support\Collection; +use LibreNMS\OS; +use LibreNMS\Util\Bgp; +use SnmpQuery; + +class Firebrick extends OS +{ + /** + * Sessions of every routing table are listed in the default context, with the table id as VRF + * + * @return Collection + */ + public function discoverBgpPeers(): Collection + { + $peers = collect($this->walkBgpTable('', 'FIREBRICK-BGP-MIB', [ + 'bgpPeerRemoteAs' => 'fbBgpPeerRemoteAS', + 'vrf' => 'fbBgpPeerTableId', + 'bgpPeerState' => 'fbBgpPeerState', + 'bgpLocalAddr' => 'fbBgpPeerLocalAddress', + 'bgpPeerDescr' => 'fbBgpPeerName', + ]))->map(function (array $row, int|string $index): ?BgpPeer { + $parts = explode('.', (string) $index); + $address = Bgp::shiftInetAddress($parts); + $vrfId = $this->bgpVrfId($row['vrf'] ?? null); + if (($row['bgpPeerState'] ?? null) == 'openWait') { + $row['bgpPeerState'] = 'active'; + } + unset($row['vrf']); + + return $this->makeBgpPeer($address, null, '', $vrfId, $row + ['bgpPeerAdminStatus' => 'start']); + })->filter()->values(); + + return $peers->isNotEmpty() ? $peers : $this->discoverBgp4MibPeers(''); + } + + public function discoverBgpLocalAs(): ?int + { + return $this->bgpLocalAsFallback(parent::discoverBgpLocalAs(), 'FIREBRICK-BGP-MIB::fbBgpPeerLocalAS'); + } + + /** + * Routing tables are only listed by the BGP sessions in them, table 0 is the default + */ + public function discoverVrfs(): Collection + { + return collect(SnmpQuery::hideMib()->walk('FIREBRICK-BGP-MIB::fbBgpPeerTableId')->throwIfConnectionError()->values()) + ->unique() + ->filter(fn ($tableId) => is_numeric($tableId) && $tableId > 0) + ->map(fn ($tableId) => new Vrf(['vrf_oid' => (string) $tableId, 'vrf_name' => (string) $tableId, 'mplsVpnVrfDescription' => ''])) + ->values(); + } + + public function discoverVrfPorts(Collection $vrfs): Collection + { + return new Collection; + } +} diff --git a/LibreNMS/OS/Fortiap.php b/LibreNMS/OS/Fortiap.php index 828a333a910..c12d0b36e59 100644 --- a/LibreNMS/OS/Fortiap.php +++ b/LibreNMS/OS/Fortiap.php @@ -21,6 +21,7 @@ use LibreNMS\Interfaces\Discovery\Sensors\WirelessPowerDiscovery; use LibreNMS\Interfaces\Polling\Sensors\WirelessFrequencyPolling; use LibreNMS\OS; +use SnmpQuery; class Fortiap extends OS implements WirelessClientsDiscovery, @@ -34,11 +35,11 @@ public function discoverWirelessClients() if (empty($fapVapStaInfoCounts)) { return []; } - $fapVapSSIDs = $this->getCacheByIndex('fapVapSSID', 'FORTINET-FORTIAP-MIB'); + $fapVapSSIDs = SnmpQuery::walk('FORTINET-FORTIAP-MIB::fapVapSSID')->pluck(); $ssids = []; foreach ($fapVapStaInfoCounts as $index => $entry) { - $ssid = $fapVapSSIDs[$index]; + $ssid = $fapVapSSIDs[$index] ?? null; if (empty($ssid)) { continue; } @@ -73,7 +74,7 @@ public function discoverWirelessClients() public function discoverWirelessFrequency() { - $fapRadioChannelOper = $this->getCacheByIndex('fapRadioChannelOper', 'FORTINET-FORTIAP-MIB'); + $fapRadioChannelOper = SnmpQuery::walk('FORTINET-FORTIAP-MIB::fapRadioChannelOper')->pluck(); $sensors = []; @@ -99,7 +100,7 @@ public function pollWirelessFrequency(array $sensors) public function discoverWirelessPower() { - $fapRadioTxPowerOper = $this->getCacheByIndex('fapRadioTxPowerOper', 'FORTINET-FORTIAP-MIB'); + $fapRadioTxPowerOper = SnmpQuery::walk('FORTINET-FORTIAP-MIB::fapRadioTxPowerOper')->pluck(); $sensors = []; diff --git a/LibreNMS/OS/Fortigate.php b/LibreNMS/OS/Fortigate.php index f093279bb9a..4a1d3e1e0fe 100644 --- a/LibreNMS/OS/Fortigate.php +++ b/LibreNMS/OS/Fortigate.php @@ -37,6 +37,8 @@ use LibreNMS\Interfaces\Polling\OSPolling; use LibreNMS\OS; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Util\Bgp; +use LibreNMS\Util\IP; use SnmpQuery; class Fortigate extends OS implements @@ -49,6 +51,27 @@ public function discoverOS(Device $device): void parent::discoverOS($device); // yaml } + /** + * With append-index enabled (config system snmp sysinfo, FortiOS 7.2.8+ and 7.4.4+), + * bgpLocalAs is returned at the VDOM snmp-index instead of .0 + */ + public function discoverBgpLocalAs(): ?int + { + return $this->bgpLocalAsFallback(parent::discoverBgpLocalAs(), 'BGP4-MIB::bgpLocalAs'); + } + + /** + * With append-index enabled, FortiOS appends the VDOM snmp-index to bgpPeerTable indexes + * instead of using SNMP contexts. Multi VDOM units need it enabled to return peers from every VDOM. + * The extra index is dropped, so the same peer address in two VDOMs is seen as one session. + * + * @param string[] $parts + */ + protected function bgp4MibPeerAddress(array $parts): ?IP + { + return Bgp::shiftIp($parts, count($parts) == 5 ? 1 : 0); + } + public function pollOS(DataStorageInterface $datastore): void { $sessions = snmp_get($this->getDeviceArray(), 'FORTINET-FORTIGATE-MIB::fgSysSesCount.0', '-Ovq'); diff --git a/includes/discovery/fdb-table/fortiswitch.inc.php b/LibreNMS/OS/Fortiswitch.php similarity index 53% rename from includes/discovery/fdb-table/fortiswitch.inc.php rename to LibreNMS/OS/Fortiswitch.php index f71c83d421f..0778c661a6e 100644 --- a/includes/discovery/fdb-table/fortiswitch.inc.php +++ b/LibreNMS/OS/Fortiswitch.php @@ -1,7 +1,7 @@ */ -use Illuminate\Support\Facades\Log; -use LibreNMS\Util\Mac; +namespace LibreNMS\OS; -$macTable = SnmpQuery::hideMib()->walk('BRIDGE-MIB::dot1dTpFdbAddress')->table(); -$portTable = SnmpQuery::hideMib()->walk('BRIDGE-MIB::dot1dTpFdbPort')->table(); -$basePortTable = SnmpQuery::hideMib()->walk('BRIDGE-MIB::dot1dBasePort')->table(); -$basePortIfIndexTable = SnmpQuery::hideMib()->walk('BRIDGE-MIB::dot1dBasePortIfIndex')->table(); +use App\Facades\PortCache; +use LibreNMS\OS; +use SnmpQuery; -foreach ($macTable['dot1dTpFdbAddress'] as $dot1dTpFdbPort => $mac) { - $fdbPort = $portTable['dot1dTpFdbPort'][$dot1dTpFdbPort]; - $dot1dBasePort = array_search($fdbPort, $basePortTable['dot1dBasePort']); - $dot1dBasePortIfIndex = $basePortIfIndexTable['dot1dBasePortIfIndex'][$dot1dBasePort]; +class Fortiswitch extends OS +{ + /** @var array|null dot1dBasePort index keyed by its value */ + private ?array $basePortIndexes = null; - $port_id = PortCache::getIdFromIfIndex($dot1dBasePortIfIndex); - $vlan_id = 0; // Bug 9239914 + protected function fdbPortId(int|string $bridgePort, int|string $vlan): ?int + { + $this->basePortIndexes ??= array_flip(SnmpQuery::walk('BRIDGE-MIB::dot1dBasePort')->pluck()); + $basePort = $this->basePortIndexes[$bridgePort] ?? $bridgePort; - $mac_address = Mac::parse($mac)->hex(); // pad zeros and remove colons - - if ($port_id == null) { - Log::debug("No port known for $mac\n"); - continue; - } - - if (strlen($mac_address) != 12) { - Log::debug("MAC address padding failed for $mac\n"); - continue; + return PortCache::getIdFromIfIndex($this->bridgePortIfIndexes()[$basePort] ?? null, $this->getDeviceId()); } - - $insert[$vlan_id][$mac_address]['port_id'] = $port_id; - Log::debug("vlan $vlan_id mac $mac_address port ($dot1dBasePort) $port_id\n"); } - -echo PHP_EOL; diff --git a/LibreNMS/OS/FsGbn.php b/LibreNMS/OS/FsGbn.php index 416b83b2c95..9736459d2ed 100644 --- a/LibreNMS/OS/FsGbn.php +++ b/LibreNMS/OS/FsGbn.php @@ -26,7 +26,8 @@ namespace LibreNMS\OS; -use LibreNMS\Device\Processor; +use App\Models\Processor; +use Illuminate\Support\Collection; use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; use LibreNMS\OS; @@ -34,29 +35,31 @@ class FsGbn extends OS implements ProcessorDiscovery { /** * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered + * Returns a Collection of Processor models that have been discovered * - * @return array Processors + * @return Collection */ - public function discoverProcessors() + public function discoverProcessors(): Collection { - $processors = []; + $response = \SnmpQuery::get([ + 'GBNPlatformOAM-MIB::cpuDescription.0', + 'GBNPlatformOAM-MIB::cpuIdle.0', + ]); - // Test first pair of OIDs from GBNPlatformOAM-MIB - $processors_data = snmpwalk_cache_oid($this->getDeviceArray(), 'cpuDescription', [], 'GBNPlatformOAM-MIB', 'fs'); - $processors_data = snmpwalk_cache_oid($this->getDeviceArray(), 'cpuIdle', $processors_data, 'GBNPlatformOAM-MIB', 'fs'); - foreach ($processors_data as $index => $entry) { - $processors[] = Processor::discover( - $this->getName(), - $this->getDeviceId(), - '.1.3.6.1.4.1.13464.1.2.1.1.2.11.' . $index, //GBNPlatformOAM-MIB::cpuIdle.0 = INTEGER: 95 - $index, - $entry['cpuDescription'], - -1, - 100 - $entry['cpuIdle'] - ); + $idle = $response->value('GBNPlatformOAM-MIB::cpuIdle'); + if (is_numeric($idle)) { + $description = $response->value('GBNPlatformOAM-MIB::cpuDescription'); + + return collect([new Processor([ + 'processor_type' => $this->getName(), + 'processor_oid' => '.1.3.6.1.4.1.13464.1.2.1.1.2.11.0', + 'processor_index' => '0', + 'processor_descr' => $description, + 'processor_precision' => -1, + 'processor_usage' => $idle, + ])]); } - return $processors; + return new Collection; } } diff --git a/LibreNMS/OS/FsSwitch.php b/LibreNMS/OS/FsSwitch.php index 7e7581099c0..1c5ee0b87b5 100644 --- a/LibreNMS/OS/FsSwitch.php +++ b/LibreNMS/OS/FsSwitch.php @@ -26,7 +26,6 @@ namespace LibreNMS\OS; -use LibreNMS\Device\Processor; use LibreNMS\OS; class FsSwitch extends OS @@ -50,32 +49,4 @@ public static function normalizeTransceiverValuesCurrent($value): float return $value; } - - /** - * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered - * - * @return array Processors - */ - public function discoverProcessors() - { - $processors = []; - - // Tests OID from SWITCH MIB. - $processors_data = snmpwalk_cache_oid($this->getDeviceArray(), 'ssCpuIdle', [], 'SWITCH', 'fs'); - - foreach ($processors_data as $index => $entry) { - $processors[] = Processor::discover( - 'fs-SWITCHMIB', - $this->getDeviceId(), - '.1.3.6.1.4.1.27975.1.2.11.' . $index, - $index, - 'CPU', - -1, - 100 - $entry['ssCpuIdle'] - ); - } - - return $processors; - } } diff --git a/LibreNMS/OS/HiveosWireless.php b/LibreNMS/OS/HiveosWireless.php index 0e9bd5834f1..5a663a25b96 100644 --- a/LibreNMS/OS/HiveosWireless.php +++ b/LibreNMS/OS/HiveosWireless.php @@ -26,10 +26,8 @@ namespace LibreNMS\OS; -use LibreNMS\Device\Processor; use LibreNMS\Device\WirelessSensor; use LibreNMS\Enum\WirelessSensorType; -use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; use LibreNMS\Interfaces\Discovery\Sensors\WirelessClientsDiscovery; use LibreNMS\Interfaces\Discovery\Sensors\WirelessFrequencyDiscovery; use LibreNMS\Interfaces\Discovery\Sensors\WirelessNoiseFloorDiscovery; @@ -37,6 +35,7 @@ use LibreNMS\Interfaces\Polling\Sensors\WirelessFrequencyPolling; use LibreNMS\Interfaces\Polling\Sensors\WirelessNoiseFloorPolling; use LibreNMS\OS; +use SnmpQuery; class HiveosWireless extends OS implements WirelessClientsDiscovery, @@ -44,27 +43,8 @@ class HiveosWireless extends OS implements WirelessFrequencyPolling, WirelessNoiseFloorDiscovery, WirelessNoiseFloorPolling, - WirelessPowerDiscovery, - ProcessorDiscovery + WirelessPowerDiscovery { - /** - * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered - * - * @return array Processors - */ - public function discoverProcessors(): array - { - return [ - Processor::discover( - $this->getName(), - $this->getDeviceId(), - '1.3.6.1.4.1.26928.1.2.3.0', // AH-SYSTEM-MIB::ahCpuUtilization - 0 - ), - ]; - } - /** * Discover wireless client counts. Type is clients. * Returns an array of LibreNMS\Device\Sensor objects that have been discovered @@ -93,7 +73,7 @@ public function pollWirelessFrequency(array $sensors) public function discoverWirelessFrequency() { - $ahRadioName = $this->getCacheByIndex('ahIfName', 'AH-INTERFACE-MIB'); + $ahRadioName = SnmpQuery::cache()->walk('AH-INTERFACE-MIB::ahIfName')->pluck(); $data = snmpwalk_group($this->getDeviceArray(), 'ahRadioChannel', 'AH-INTERFACE-MIB'); $sensors = []; foreach ($data as $index => $frequency) { @@ -103,7 +83,7 @@ public function discoverWirelessFrequency() '.1.3.6.1.4.1.26928.1.1.1.2.1.5.1.1.' . $index, 'hiveos-wireless', $index, - $ahRadioName[$index], + ($ahRadioName[$index] ?? ''), WirelessSensor::channelToFrequency($frequency['ahRadioChannel']) ); } @@ -121,7 +101,7 @@ public function discoverWirelessPower() { $sensors = []; - $ahRadioName = $this->getCacheByIndex('ahIfName', 'AH-INTERFACE-MIB'); + $ahRadioName = SnmpQuery::cache()->walk('AH-INTERFACE-MIB::ahIfName')->pluck(); $ahTxPow = snmpwalk_group($this->getDeviceArray(), 'ahRadioTxPower', 'AH-INTERFACE-MIB'); foreach ($ahTxPow as $index => $entry) { $sensors[] = new WirelessSensor( @@ -130,7 +110,7 @@ public function discoverWirelessPower() '.1.3.6.1.4.1.26928.1.1.1.2.1.5.1.2.' . $index, 'hiveos-wireless', $index, - 'Tx Power: ' . $ahRadioName[$index], + 'Tx Power: ' . ($ahRadioName[$index] ?? ''), $entry['ahRadioTxPower'] ); } @@ -140,7 +120,7 @@ public function discoverWirelessPower() public function discoverWirelessNoiseFloor() { - $ahRadioName = $this->getCacheByIndex('ahIfName', 'AH-INTERFACE-MIB'); + $ahRadioName = SnmpQuery::cache()->walk('AH-INTERFACE-MIB::ahIfName')->pluck(); $ahRadioNoiseFloor = snmpwalk_group($this->getDeviceArray(), 'ahRadioNoiseFloor', 'AH-INTERFACE-MIB'); $sensors = []; foreach ($ahRadioNoiseFloor as $index => $entry) { @@ -150,7 +130,7 @@ public function discoverWirelessNoiseFloor() '.1.3.6.1.4.1.26928.1.1.1.2.1.5.1.3.' . $index, 'hiveos-wireless', $index, - 'Noise floor ' . $ahRadioName[$index], + 'Noise floor ' . ($ahRadioName[$index] ?? ''), $entry['ahRadioNoiseFloor'] - 256 ); } diff --git a/LibreNMS/OS/IhseDraco.php b/LibreNMS/OS/IhseDraco.php new file mode 100644 index 00000000000..c4828c5a337 --- /dev/null +++ b/LibreNMS/OS/IhseDraco.php @@ -0,0 +1,50 @@ + 'intelliflash-pl', 'storage_index' => $poolIndex, 'storage_type' => $data['TEGILE-MIB::poolState'], @@ -25,14 +25,14 @@ public function discoverStorage(): Collection 'storage_size' => $size, 'storage_used' => $used, 'storage_units' => 1, - ]))->fillUsage($used, $size); + ])->fillUsage($used, $size); }); $projects = SnmpQuery::walk('TEGILE-MIB::projectTable')->mapTable(function ($data, $poolIndex, $projectIndex) { $used = ($data['TEGILE-MIB::projectDataSizeHigh'] << 32) + $data['TEGILE-MIB::projectDataSizeLow']; $free = ($data['TEGILE-MIB::projectFreeSizeHigh'] << 32) + $data['TEGILE-MIB::projectFreeSizeLow']; - return (new Storage([ + return new Storage([ 'type' => 'intelliflash-pr', 'storage_index' => "$poolIndex.$projectIndex", 'storage_type' => $data['TEGILE-MIB::projectCompressionEnabled'], @@ -40,7 +40,7 @@ public function discoverStorage(): Collection 'storage_used' => $used, 'storage_free' => $free, 'storage_units' => 1, - ]))->fillUsage($used, free: $free); + ])->fillUsage($used, free: $free); }); return $pools->merge($projects); diff --git a/LibreNMS/OS/Jetstream.php b/LibreNMS/OS/Jetstream.php index 4cce172d023..85fe1442f19 100644 --- a/LibreNMS/OS/Jetstream.php +++ b/LibreNMS/OS/Jetstream.php @@ -35,6 +35,7 @@ use Illuminate\Support\Facades\Log; use LibreNMS\Discovery\Neighbors\Neighbor; use LibreNMS\Discovery\Neighbors\NeighborParser; +use LibreNMS\Discovery\Neighbors\PortFinder; use LibreNMS\Enum\LldpPortIdSubtype; use LibreNMS\Exceptions\InvalidIpException; use LibreNMS\Interfaces\Discovery\Ipv6AddressDiscovery; @@ -47,6 +48,8 @@ class Jetstream extends OS implements Ipv6AddressDiscovery, RouteDiscovery, VlanDiscovery, VlanPortDiscovery { + private ?PortFinder $portFinder = null; + public function discoverIpv6Addresses(): Collection { return \SnmpQuery::allowUnordered()->enumStrings()->walk('TPLINK-IPV6ADDR-MIB::ipv6ParaConfigAddrTable') @@ -254,4 +257,28 @@ private static function lldpPortIdSubtype(string $type): LldpPortIdSubtype default => LldpPortIdSubtype::Local, }; } + + /** + * @inheritDoc + */ + protected function fdbBridgePorts(): array + { + $table = SnmpQuery::allowUnordered()->walk('Q-BRIDGE-MIB::dot1qTpFdbPort')->table(1); + + return array_map(fn ($data) => $this->fixFdbMacIndexes($data['Q-BRIDGE-MIB::dot1qTpFdbPort'] ?? []), $table) ?: parent::fdbBridgePorts(); + } + + protected function fdbPortId(int|string $bridgePort, int|string $vlan): ?int + { + // TP-Link JetStream: ifIndex = bridge port + 49152 + $port_id = PortCache::getIdFromIfIndex((int) $bridgePort + 49152, $this->getDeviceId()); + if ($port_id) { + return $port_id; + } + + // fallback: try name match (with and without space) + $this->portFinder ??= PortFinder::forDevice($this->getDeviceId()); + + return ($this->portFinder->byDescr('gigabitEthernet 1/0/' . $bridgePort) ?? $this->portFinder->byName('gigabitEthernet1/0/' . $bridgePort))->port_id ?? 0; + } } diff --git a/LibreNMS/OS/Junos.php b/LibreNMS/OS/Junos.php index 1398d5b94bc..9a2d647296c 100644 --- a/LibreNMS/OS/Junos.php +++ b/LibreNMS/OS/Junos.php @@ -29,6 +29,8 @@ namespace LibreNMS\OS; use App\Facades\PortCache; +use App\Models\BgpPeer; +use App\Models\BgpPeerCbgp; use App\Models\Device; use App\Models\EntPhysical; use App\Models\PortVlan; @@ -39,6 +41,7 @@ use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; use LibreNMS\Interfaces\Data\DataStorageInterface; +use LibreNMS\Interfaces\Discovery\BgpAddressFamilyDiscovery; use LibreNMS\Interfaces\Discovery\SlaDiscovery; use LibreNMS\Interfaces\Discovery\TransceiverDiscovery; use LibreNMS\Interfaces\Discovery\VlanDiscovery; @@ -47,9 +50,11 @@ use LibreNMS\Interfaces\Polling\SlaPolling; use LibreNMS\OS\Traits\EntityMib; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Util\Bgp; +use LibreNMS\Util\IP; use SnmpQuery; -class Junos extends \LibreNMS\OS implements SlaDiscovery, OSPolling, SlaPolling, TransceiverDiscovery, VlanDiscovery, VlanPortDiscovery +class Junos extends \LibreNMS\OS implements BgpAddressFamilyDiscovery, SlaDiscovery, OSPolling, SlaPolling, TransceiverDiscovery, VlanDiscovery, VlanPortDiscovery { use EntityMib { EntityMib::discoverEntityPhysical as discoverBaseEntityPhysical; @@ -511,4 +516,91 @@ public function discoverVlanPorts(Collection $vlans): Collection return $legacyPorts; // if no legacy data, use Q-BRIDGE-MIB } + + /** + * Sessions are indexed by instance, local and remote address, and read in each VRF context. + * BGP4-MIB is read when the table has no sessions. + * + * @return Collection + */ + public function discoverBgpPeers(): Collection + { + $peers = new Collection; + + foreach ($this->getDevice()->getVrfContexts() as $context) { + $vrfId = $this->getDevice()->vrfIdForContext($context); + $found = collect($this->walkBgpTable($context, 'BGP4-V2-MIB-JUNIPER', [ + 'bgpPeerRemoteAs' => 'jnxBgpM2PeerRemoteAs', + 'bgpPeerState' => 'jnxBgpM2PeerState', + 'bgpPeerAdminStatus' => 'jnxBgpM2PeerStatus', + 'bgpLocalAddr' => 'jnxBgpM2PeerLocalAddr', + 'bgpPeerLastError' => 'jnxBgpM2PeerLastErrorReceived', + 'bgpPeerLastErrorText' => 'jnxBgpM2PeerLastErrorReceivedText', + 'bgpPeerFsmEstablishedTime' => 'jnxBgpM2PeerFsmEstablishedTime', + 'bgpPeerInUpdateElapsedTime' => 'jnxBgpM2PeerInUpdatesElapsedTime', + 'bgpPeerInUpdates' => 'jnxBgpM2PeerInUpdates', + 'bgpPeerOutUpdates' => 'jnxBgpM2PeerOutUpdates', + 'bgpPeerInTotalMessages' => 'jnxBgpM2PeerInTotalMessages', + 'bgpPeerOutTotalMessages' => 'jnxBgpM2PeerOutTotalMessages', + ]))->map(function (array $row, int|string $index) use ($context, $vrfId): ?BgpPeer { + $address = $this->jnxBgpM2RemoteAddress((string) $index, $zone); + + return $this->makeBgpPeer($address, $zone, $context, $vrfId, $row); + })->filter(); + + $peers = $peers->merge($found->isNotEmpty() ? $found : $this->discoverBgp4MibPeers($context)); + } + + return $peers->values(); + } + + public function discoverBgpLocalAs(): ?int + { + return $this->bgpLocalAsFallback(parent::discoverBgpLocalAs(), 'BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerLocalAs'); + } + + /** + * Prefix counts are indexed by the peer index of the session + * + * @return Collection + */ + public function discoverBgpAddressFamilies(Collection $peers): Collection + { + $families = new Collection; + + foreach ($peers->pluck('context_name')->unique() as $context) { + $addresses = []; + foreach ($this->walkBgpTable($context, 'BGP4-V2-MIB-JUNIPER', ['peer_index' => 'jnxBgpM2PeerIndex']) as $index => $row) { + $zone = null; + $addresses[$row['peer_index']] = [$this->jnxBgpM2RemoteAddress((string) $index, $zone), $zone]; + } + + $rows = $this->walkBgpTable($context, 'BGP4-V2-MIB-JUNIPER', [ + 'AcceptedPrefixes' => 'jnxBgpM2PrefixInPrefixesAccepted', + 'DeniedPrefixes' => 'jnxBgpM2PrefixInPrefixesRejected', + 'AdvertisedPrefixes' => 'jnxBgpM2PrefixOutPrefixes', + ]); + + foreach ($rows as $index => $counters) { + [$peerIndex, $afi, $safi] = explode('.', (string) $index) + [null, null, null]; + if (isset($addresses[$peerIndex], $afi, $safi)) { + $families->push($this->makeBgpAddressFamily($addresses[$peerIndex][0], $addresses[$peerIndex][1], $context, $afi, $safi, $counters)); + } + } + } + + return $families->filter()->values(); + } + + /** + * The session index is the instance, then the local and remote address, which are the same family + */ + private function jnxBgpM2RemoteAddress(string $index, ?int &$zone): ?IP + { + $parts = explode('.', $index); + array_shift($parts); // instance + Bgp::shiftInetAddress($parts, intdiv(count($parts), 2)); // local address + + return Bgp::shiftInetAddress($parts, 0, $zone); + } } diff --git a/LibreNMS/OS/Lcos.php b/LibreNMS/OS/Lcos.php index 8921ce788e3..056aebd9f3d 100644 --- a/LibreNMS/OS/Lcos.php +++ b/LibreNMS/OS/Lcos.php @@ -40,6 +40,7 @@ use LibreNMS\Util\Mac; use LibreNMS\Util\Number; use LibreNMS\Util\Oid; +use SnmpQuery; class Lcos extends OS implements WirelessFrequencyDiscovery, @@ -60,11 +61,11 @@ class Lcos extends OS implements public function discoverWirelessFrequency() { $data = snmpwalk_cache_oid($this->getDeviceArray(), 'lcsStatusWlanRadiosEntryRadioChannel', [], 'LCOS-MIB'); - $radios = $this->getCacheByIndex('lcsStatusWlanRadiosEntryIfc', 'LCOS-MIB'); + $radios = SnmpQuery::cache()->walk('LCOS-MIB::lcsStatusWlanRadiosEntryIfc')->table(1); $sensors = []; foreach ($data as $index => $entry) { - $radio = $radios[$index]; + $radio = $radios[$index]['LCOS-MIB::lcsStatusWlanRadiosEntryIfc']; if (isset($sensors[$radio])) { continue; } @@ -103,11 +104,11 @@ public function pollWirelessFrequency(array $sensors) public function discoverWirelessCapacity() { $data = snmpwalk_cache_oid($this->getDeviceArray(), 'lcsStatusWlanRadiosEntryModemLoad', [], 'LCOS-MIB'); - $radios = $this->getCacheByIndex('lcsStatusWlanRadiosEntryIfc', 'LCOS-MIB'); + $radios = SnmpQuery::cache()->walk('LCOS-MIB::lcsStatusWlanRadiosEntryIfc')->table(1); $sensors = []; foreach ($data as $index => $entry) { - $radio = $radios[$index]; + $radio = $radios[$index]['LCOS-MIB::lcsStatusWlanRadiosEntryIfc']; if (isset($sensors[$radio])) { continue; } @@ -134,11 +135,11 @@ public function discoverWirelessCapacity() public function discoverWirelessNoiseFloor() { $data = snmpwalk_cache_oid($this->getDeviceArray(), 'lcsStatusWlanRadiosEntryNoiseLevel', [], 'LCOS-MIB'); - $radios = $this->getCacheByIndex('lcsStatusWlanRadiosEntryIfc', 'LCOS-MIB'); + $radios = SnmpQuery::cache()->walk('LCOS-MIB::lcsStatusWlanRadiosEntryIfc')->table(1); $sensors = []; foreach ($data as $index => $entry) { - $radio = $radios[$index]; + $radio = $radios[$index]['LCOS-MIB::lcsStatusWlanRadiosEntryIfc']; if (isset($sensors[$radio])) { continue; } @@ -165,12 +166,12 @@ public function discoverWirelessNoiseFloor() public function discoverWirelessPower() { $data = snmpwalk_cache_oid($this->getDeviceArray(), 'lcsStatusWlanRadiosEntryTransmitPower', [], 'LCOS-MIB'); - $radios = $this->getCacheByIndex('lcsStatusWlanRadiosEntryIfc', 'LCOS-MIB'); + $radios = SnmpQuery::cache()->walk('LCOS-MIB::lcsStatusWlanRadiosEntryIfc')->table(1); $sensors = []; foreach ($data as $index => $entry) { - $radio = $radios[$index]; + $radio = $radios[$index]['LCOS-MIB::lcsStatusWlanRadiosEntryIfc']; if (isset($sensors[$radio])) { continue; } @@ -196,14 +197,16 @@ public function discoverWirelessPower() */ public function discoverWirelessCcq() { - $data = snmpwalk_cache_oid($this->getDeviceArray(), 'lcsStatusWlanCompetingNetworksEntryPhySignal', [], 'LCOS-MIB'); - $data = snmpwalk_cache_oid($this->getDeviceArray(), 'lcsStatusWlanCompetingNetworksEntryInterpointPeerName', $data, 'LCOS-MIB'); - $bssids = $this->getCacheByIndex('lcsStatusWlanCompetingNetworksEntryBssid', 'LCOS-MIB'); + $data = SnmpQuery::walk('LCOS-MIB::lcsStatusWlanCompetingNetworksEntryPhySignal')->valuesByIndex(); + $data = SnmpQuery::cache()->walk([ + 'LCOS-MIB::lcsStatusWlanCompetingNetworksEntryInterpointPeerName', + 'LCOS-MIB::lcsStatusWlanCompetingNetworksEntryBssid', + ])->valuesByIndex($data); $sensors = []; - foreach ($data as $index => $entry) { - $bssid = $bssids[$index]; - if (isset($sensors[$bssid]) || ! array_key_exists('lcsStatusWlanCompetingNetworksEntryPhySignal', $entry)) { + foreach ($data as $entry) { + $bssid = $entry['LCOS-MIB::lcsStatusWlanCompetingNetworksEntryBssid'] ?? null; + if ($bssid === null || isset($sensors[$bssid]) || ! array_key_exists('LCOS-MIB::lcsStatusWlanCompetingNetworksEntryPhySignal', $entry)) { continue; } @@ -213,8 +216,8 @@ public function discoverWirelessCcq() '.1.3.6.1.4.1.2356.11.1.3.44.1.10.' . Mac::parse($bssid)->oid() . '.0', 'lcos', $bssid, - 'CCQ ' . $entry['lcsStatusWlanCompetingNetworksEntryInterpointPeerName'] . " $bssid", - $entry['lcsStatusWlanCompetingNetworksEntryPhySignal'] + 'CCQ ' . $entry['LCOS-MIB::lcsStatusWlanCompetingNetworksEntryInterpointPeerName'] . " $bssid", + $entry['LCOS-MIB::lcsStatusWlanCompetingNetworksEntryPhySignal'] ); } @@ -229,14 +232,16 @@ public function discoverWirelessCcq() */ public function discoverWirelessRate() { - $data = snmpwalk_cache_oid($this->getDeviceArray(), 'lcsStatusWlanCompetingNetworksEntryEffRate', [], 'LCOS-MIB'); - $data = snmpwalk_cache_oid($this->getDeviceArray(), 'lcsStatusWlanCompetingNetworksEntryInterpointPeerName', $data, 'LCOS-MIB'); - $bssids = $this->getCacheByIndex('lcsStatusWlanCompetingNetworksEntryBssid', 'LCOS-MIB'); + $data = SnmpQuery::walk('LCOS-MIB::lcsStatusWlanCompetingNetworksEntryEffRate')->valuesByIndex(); + $data = SnmpQuery::cache()->walk([ + 'LCOS-MIB::lcsStatusWlanCompetingNetworksEntryInterpointPeerName', + 'LCOS-MIB::lcsStatusWlanCompetingNetworksEntryBssid', + ])->valuesByIndex($data); $sensors = []; - foreach ($data as $index => $entry) { - $bssid = $bssids[$index]; - if (isset($sensors[$bssid]) || ! array_key_exists('lcsStatusWlanCompetingNetworksEntryEffRate', $entry)) { + foreach ($data as $entry) { + $bssid = $entry['LCOS-MIB::lcsStatusWlanCompetingNetworksEntryBssid'] ?? null; + if ($bssid === null || isset($sensors[$bssid]) || ! array_key_exists('LCOS-MIB::lcsStatusWlanCompetingNetworksEntryEffRate', $entry)) { continue; } @@ -246,8 +251,8 @@ public function discoverWirelessRate() '.1.3.6.1.4.1.2356.11.1.3.44.1.35.' . Mac::parse($bssid)->oid() . '.0', 'lcos-tx', $bssid, - 'TX Rate ' . ($entry['lcsStatusWlanCompetingNetworksEntryInterpointPeerName'] ?? '') . " $bssid", - $entry['lcsStatusWlanCompetingNetworksEntryEffRate'], + 'TX Rate ' . ($entry['LCOS-MIB::lcsStatusWlanCompetingNetworksEntryInterpointPeerName'] ?? '') . " $bssid", + $entry['LCOS-MIB::lcsStatusWlanCompetingNetworksEntryEffRate'], 1000000 ); } @@ -263,15 +268,17 @@ public function discoverWirelessRate() */ public function discoverWirelessRssi() { - $data = snmpwalk_cache_oid($this->getDeviceArray(), 'lcsStatusWlanCompetingNetworksEntrySignalLevel', [], 'LCOS-MIB'); - $data = snmpwalk_cache_oid($this->getDeviceArray(), 'lcsStatusWlanCompetingNetworksEntryInterpointPeerName', $data, 'LCOS-MIB'); - $bssids = $this->getCacheByIndex('lcsStatusWlanCompetingNetworksEntryBssid', 'LCOS-MIB'); + $data = SnmpQuery::walk('LCOS-MIB::lcsStatusWlanCompetingNetworksEntrySignalLevel')->valuesByIndex(); + $data = SnmpQuery::cache()->walk([ + 'LCOS-MIB::lcsStatusWlanCompetingNetworksEntryInterpointPeerName', + 'LCOS-MIB::lcsStatusWlanCompetingNetworksEntryBssid', + ])->valuesByIndex($data); $sensors = []; - foreach ($data as $index => $entry) { - $bssid = $bssids[$index] ?? null; - if (isset($sensors[$bssid]) || ! array_key_exists('lcsStatusWlanCompetingNetworksEntrySignalLevel', $entry)) { + foreach ($data as $entry) { + $bssid = $entry['LCOS-MIB::lcsStatusWlanCompetingNetworksEntryBssid'] ?? null; + if ($bssid === null || isset($sensors[$bssid]) || ! array_key_exists('LCOS-MIB::lcsStatusWlanCompetingNetworksEntrySignalLevel', $entry)) { continue; } @@ -281,8 +288,8 @@ public function discoverWirelessRssi() '.1.3.6.1.4.1.2356.11.1.3.44.1.26.' . Mac::parse($bssid)->oid() . '.0', 'lcos', $bssid, - 'RSSI ' . ($entry['lcsStatusWlanCompetingNetworksEntryInterpointPeerName'] ?? '') . " $bssid", - $entry['lcsStatusWlanCompetingNetworksEntrySignalLevel'] + 'RSSI ' . ($entry['LCOS-MIB::lcsStatusWlanCompetingNetworksEntryInterpointPeerName'] ?? '') . " $bssid", + $entry['LCOS-MIB::lcsStatusWlanCompetingNetworksEntrySignalLevel'] ); } diff --git a/LibreNMS/OS/Lcoslx.php b/LibreNMS/OS/Lcoslx.php index 05aac3d98f0..436fee3d760 100644 --- a/LibreNMS/OS/Lcoslx.php +++ b/LibreNMS/OS/Lcoslx.php @@ -38,6 +38,7 @@ use LibreNMS\Interfaces\Polling\Sensors\WirelessFrequencyPolling; use LibreNMS\OS; use LibreNMS\Util\Mac; +use SnmpQuery; class Lcoslx extends OS implements WirelessFrequencyDiscovery, @@ -187,18 +188,20 @@ public function discoverWirelessPower() */ public function discoverWirelessCcq() { - $data = snmpwalk_cache_oid($this->getDeviceArray(), 'lcosLXStatusWLANStationEntryPhySignal', [], 'LCOS-LX-MIB'); - $data = snmpwalk_cache_oid($this->getDeviceArray(), 'lcosLXStatusWLANStationEntryNetworkName', $data, 'LCOS-LX-MIB'); - $ipv4addresses = $this->getCacheByIndex('lcosLXStatusWLANStationEntryIPv4Address', 'LCOS-LX-MIB'); + $data = SnmpQuery::walk('LCOS-LX-MIB::lcosLXStatusWLANStationEntryPhySignal')->valuesByIndex(); + $data = SnmpQuery::cache()->walk([ + 'LCOS-LX-MIB::lcosLXStatusWLANStationEntryNetworkName', + 'LCOS-LX-MIB::lcosLXStatusWLANStationEntryIPv4Address', + ])->valuesByIndex($data); $sensors = []; foreach ($data as $index => $entry) { - $bssid = $ipv4addresses[$index]; - if (isset($sensors[$bssid])) { + $bssid = $entry['LCOS-LX-MIB::lcosLXStatusWLANStationEntryIPv4Address'] ?? null; + if ($bssid === null || isset($sensors[$bssid])) { continue; } - if (! isset($entry['lcosLXStatusWLANStationEntryPhySignal'])) { + if (! isset($entry['LCOS-LX-MIB::lcosLXStatusWLANStationEntryPhySignal'])) { continue; } @@ -208,8 +211,8 @@ public function discoverWirelessCcq() '.1.3.6.1.4.1.2356.13.1.3.44.1.10.' . Mac::parse($bssid)->oid() . '.0', 'lcoslx', $index, - 'CCQ ' . $entry['lcosLXStatusWLANStationEntryNetworkName'] . " $bssid", - $entry['lcosLXStatusWLANStationEntryPhySignal'] + 'CCQ ' . $entry['LCOS-LX-MIB::lcosLXStatusWLANStationEntryNetworkName'] . " $bssid", + $entry['LCOS-LX-MIB::lcosLXStatusWLANStationEntryPhySignal'] ); } @@ -224,39 +227,43 @@ public function discoverWirelessCcq() */ public function discoverWirelessRate() { - $data = snmpwalk_cache_oid($this->getDeviceArray(), 'lcosLXStatusWLANStationEntryEffTxRate', [], 'LCOS-LX-MIB'); - $data = snmpwalk_cache_oid($this->getDeviceArray(), 'lcosLXStatusWLANStationEntryEffRxRate', $data, 'LCOS-LX-MIB'); - $data = snmpwalk_cache_oid($this->getDeviceArray(), 'lcosLXStatusWLANStationEntryNetworkName', $data, 'LCOS-LX-MIB'); - $ipv4addresses = $this->getCacheByIndex('lcosLXStatusWLANStationEntryIPv4Address', 'LCOS-LX-MIB'); + $data = SnmpQuery::walk([ + 'LCOS-LX-MIB::lcosLXStatusWLANStationEntryEffTxRate', + 'LCOS-LX-MIB::lcosLXStatusWLANStationEntryEffRxRate', + ])->valuesByIndex(); + $data = SnmpQuery::cache()->walk([ + 'LCOS-LX-MIB::lcosLXStatusWLANStationEntryNetworkName', + 'LCOS-LX-MIB::lcosLXStatusWLANStationEntryIPv4Address', + ])->valuesByIndex($data); $sensors = []; - foreach ($data as $index => $entry) { - $bssid = $ipv4addresses[$index]; - if (isset($sensors[$bssid])) { + foreach ($data as $entry) { + $bssid = $entry['LCOS-LX-MIB::lcosLXStatusWLANStationEntryIPv4Address'] ?? null; + if ($bssid === null || isset($sensors[$bssid])) { continue; } - if (isset($entry['lcosLXStatusWLANStationEntryEffTxRate'])) { + if (isset($entry['LCOS-LX-MIB::lcosLXStatusWLANStationEntryEffTxRate'])) { $sensors['tx-' . $bssid] = new WirelessSensor( WirelessSensorType::Rate, $this->getDeviceId(), '.1.3.6.1.4.1.2356.13.1.3.32.1.50.' . Mac::parse($bssid)->oid() . '.0', 'lcos-tx', $bssid, - 'TX Rate ' . $entry['lcosLXStatusWLANStationEntryNetworkName'] . " $bssid", - $entry['lcosLXStatusWLANStationEntryEffTxRate'], + 'TX Rate ' . $entry['LCOS-LX-MIB::lcosLXStatusWLANStationEntryNetworkName'] . " $bssid", + $entry['LCOS-LX-MIB::lcosLXStatusWLANStationEntryEffTxRate'], 1000000 ); } - if (isset($entry['lcosLXStatusWLANStationEntryEffRxRate'])) { + if (isset($entry['LCOS-LX-MIB::lcosLXStatusWLANStationEntryEffRxRate'])) { $sensors['rx-' . $bssid] = new WirelessSensor( WirelessSensorType::Rate, $this->getDeviceId(), '.1.3.6.1.4.1.2356.13.1.3.32.1.51.' . Mac::parse($bssid)->oid() . '.0', 'lcos-rx', $bssid, - 'RX Rate ' . $entry['lcosLXStatusWLANStationEntryNetworkName'] . " $bssid", - $entry['lcosLXStatusWLANStationEntryEffRxRate'], + 'RX Rate ' . $entry['LCOS-LX-MIB::lcosLXStatusWLANStationEntryNetworkName'] . " $bssid", + $entry['LCOS-LX-MIB::lcosLXStatusWLANStationEntryEffRxRate'], 1000000 ); } @@ -273,15 +280,17 @@ public function discoverWirelessRate() */ public function discoverWirelessRssi() { - $data = snmpwalk_cache_oid($this->getDeviceArray(), 'lcosLXStatusWLANCompetingNetworksEntrySignalLevel', [], 'LCOS-LX-MIB'); - $data = snmpwalk_cache_oid($this->getDeviceArray(), 'lcosLXStatusWLANCompetingNetworksEntryInterpointPeerName', $data, 'LCOS-LX-MIB'); - $bssids = $this->getCacheByIndex('lcosLXStatusWLANCompetingNetworksEntryBssid', 'LCOS-LX-MIB'); + $data = SnmpQuery::walk([ + 'LCOS-LX-MIB::lcosLXStatusWLANCompetingNetworksEntrySignalLevel', + 'LCOS-LX-MIB::lcosLXStatusWLANCompetingNetworksEntryInterpointPeerName', + 'LCOS-LX-MIB::lcosLXStatusWLANCompetingNetworksEntryBssid', + ])->valuesByIndex(); $sensors = []; - foreach ($data as $index => $entry) { - $bssid = $bssids[$index]; - if (isset($sensors[$bssid])) { + foreach ($data as $entry) { + $bssid = $entry['LCOS-LX-MIB::lcosLXStatusWLANCompetingNetworksEntryBssid'] ?? null; + if ($bssid === null || isset($sensors[$bssid]) || ! isset($entry['LCOS-LX-MIB::lcosLXStatusWLANCompetingNetworksEntrySignalLevel'])) { continue; } @@ -291,8 +300,8 @@ public function discoverWirelessRssi() '.1.3.6.1.4.1.2356.13.1.3.44.1.26.' . Mac::parse($bssid)->oid() . '.0', 'lcoslx', $bssid, - 'RSSI ' . $entry['lcosLXStatusWLANCompetingNetworksEntryInterpointPeerName'] . " $bssid", - $entry['lcosLXStatusWLANCompetingNetworksEntrySignalLevel'] + 'RSSI ' . ($entry['LCOS-LX-MIB::lcosLXStatusWLANCompetingNetworksEntryInterpointPeerName'] ?? '') . " $bssid", + $entry['LCOS-LX-MIB::lcosLXStatusWLANCompetingNetworksEntrySignalLevel'] ); } diff --git a/LibreNMS/OS/Lcossx.php b/LibreNMS/OS/Lcossx.php index 72488ea42d0..1e3896803b5 100644 --- a/LibreNMS/OS/Lcossx.php +++ b/LibreNMS/OS/Lcossx.php @@ -26,7 +26,8 @@ namespace LibreNMS\OS; -use LibreNMS\Device\Processor; +use App\Models\Processor; +use Illuminate\Support\Collection; use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; use LibreNMS\Interfaces\Polling\ProcessorPolling; use LibreNMS\OS; @@ -36,7 +37,7 @@ class Lcossx extends OS implements ProcessorDiscovery, ProcessorPolling private string $procOid = '1.3.6.1.4.1.2356.14.1.1.1.24.0'; // OID string value example: 100ms:87%, 1s:49%, 10s:42% - private function convertProcessorData(array $input) + private function convertProcessorData(array $input): array { $data = []; $cpuList = explode(',', (string) reset($input)[0]); @@ -50,49 +51,53 @@ private function convertProcessorData(array $input) return $data; } - public function discoverProcessors() + /** + * @return Collection + */ + public function discoverProcessors(): Collection { $data = snmpwalk_array_num($this->getDeviceArray(), $this->procOid); if ($data === false) { - return []; + return new Collection; } $processors = []; $count = 0; foreach ($this->convertProcessorData($data) as $cpuName => $cpuPerc) { - $processors[] = Processor::discover( - 'lcossx', - $this->getDeviceId(), - $this->procOid, - $count, - 'Processor ' . $cpuName, - 1, - $cpuPerc, - 100 - ); + $processors[] = new Processor([ + 'processor_type' => 'lcossx', + 'processor_oid' => $this->procOid, + 'processor_index' => $count, + 'processor_descr' => 'Processor ' . $cpuName, + 'processor_precision' => 1, + 'hrDeviceIndex' => null, + 'processor_perc_warn' => 100, + 'processor_usage' => $cpuPerc, + ]); $count++; } - return $processors; + return collect($processors); } - public function pollProcessors(array $processors) + /** + * @param Collection $processors + * @return Collection + */ + public function pollProcessors(Collection $processors): Collection { $data = snmpwalk_array_num($this->getDeviceArray(), $this->procOid); if (get_debug_type($data) != 'array') { - return []; + return $processors; // usage stays null } $cpuList = $this->convertProcessorData($data); - $data = []; foreach ($processors as $processor) { - $processor_id = $processor['processor_id']; - $key = explode(' ', (string) $processor['processor_descr'])[1]; - $value = $cpuList[$key]; - $data[$processor_id] = $value; + $key = explode(' ', (string) $processor->processor_descr, 2)[1] ?? ''; + $processor->processor_usage = $cpuList[$key] ?? null; } - return $data; + return $processors; } } diff --git a/LibreNMS/OS/Ligoos.php b/LibreNMS/OS/Ligoos.php index 71f994ced39..0be3715d8d4 100644 --- a/LibreNMS/OS/Ligoos.php +++ b/LibreNMS/OS/Ligoos.php @@ -31,6 +31,7 @@ use LibreNMS\Interfaces\Discovery\Sensors\WirelessNoiseFloorDiscovery; use LibreNMS\Interfaces\Discovery\Sensors\WirelessQualityDiscovery; use LibreNMS\OS; +use SnmpQuery; class Ligoos extends OS implements WirelessClientsDiscovery, @@ -41,18 +42,18 @@ class Ligoos extends OS implements public function discoverWirelessClients() { $sensors = []; - $data = $this->getCacheTable('LIGO-WIRELESS-MIB::ligoWiIfConfTable'); + $data = SnmpQuery::cache()->walk('LIGO-WIRELESS-MIB::ligoWiIfConfTable')->table(1); foreach ($data as $index => $entry) { - $freq = $entry['ligoWiIfFrequency'] ? substr((string) $entry['ligoWiIfFrequency'], 0, 1) . 'G' : 'SSID'; + $freq = $entry['LIGO-WIRELESS-MIB::ligoWiIfFrequency'] ? substr((string) $entry['LIGO-WIRELESS-MIB::ligoWiIfFrequency'], 0, 1) . 'G' : 'SSID'; $sensors[] = new WirelessSensor( WirelessSensorType::Clients, $this->getDeviceId(), '.1.3.6.1.4.1.32750.3.10.1.2.1.1.16.' . $index, 'ligoos', $index, - "$freq: " . $entry['ligoWiIfESSID'], - $entry['ligoWiIfAssocNodeCount'] + "$freq: " . $entry['LIGO-WIRELESS-MIB::ligoWiIfESSID'], + $entry['LIGO-WIRELESS-MIB::ligoWiIfAssocNodeCount'] ); } @@ -62,18 +63,18 @@ public function discoverWirelessClients() public function discoverWirelessFrequency() { $sensors = []; - $data = $this->getCacheTable('LIGO-WIRELESS-MIB::ligoWiIfConfTable'); + $data = SnmpQuery::cache()->walk('LIGO-WIRELESS-MIB::ligoWiIfConfTable')->table(1); foreach ($data as $index => $entry) { - $freq = substr((string) $entry['ligoWiIfFrequency'], 0, 1) . 'G'; + $freq = substr((string) $entry['LIGO-WIRELESS-MIB::ligoWiIfFrequency'], 0, 1) . 'G'; $sensors[] = new WirelessSensor( WirelessSensorType::Frequency, $this->getDeviceId(), '.1.3.6.1.4.1.32750.3.10.1.2.1.1.6.' . $index, 'ligoos', $index, - "$freq: " . $entry['ligoWiIfESSID'], - $entry['ligoWiIfFrequency'] + "$freq: " . $entry['LIGO-WIRELESS-MIB::ligoWiIfESSID'], + $entry['LIGO-WIRELESS-MIB::ligoWiIfFrequency'] ); } @@ -83,18 +84,18 @@ public function discoverWirelessFrequency() public function discoverWirelessNoiseFloor() { $sensors = []; - $data = $this->getCacheTable('LIGO-WIRELESS-MIB::ligoWiIfConfTable'); + $data = SnmpQuery::cache()->walk('LIGO-WIRELESS-MIB::ligoWiIfConfTable')->table(1); foreach ($data as $index => $entry) { - $freq = $entry['ligoWiIfFrequency'] ? substr((string) $entry['ligoWiIfFrequency'], 0, 1) . 'G' : 'SSID'; + $freq = $entry['LIGO-WIRELESS-MIB::ligoWiIfFrequency'] ? substr((string) $entry['LIGO-WIRELESS-MIB::ligoWiIfFrequency'], 0, 1) . 'G' : 'SSID'; $sensors[] = new WirelessSensor( WirelessSensorType::NoiseFloor, $this->getDeviceId(), '.1.3.6.1.4.1.32750.3.10.1.2.1.1.15.' . $index, 'ligoos', $index, - "$freq: " . $entry['ligoWiIfESSID'], - $entry['ligoWiIfNoiseLevel'] + "$freq: " . $entry['LIGO-WIRELESS-MIB::ligoWiIfESSID'], + $entry['LIGO-WIRELESS-MIB::ligoWiIfNoiseLevel'] ); } @@ -104,18 +105,18 @@ public function discoverWirelessNoiseFloor() public function discoverWirelessQuality() { $sensors = []; - $data = $this->getCacheTable('LIGO-WIRELESS-MIB::ligoWiIfConfTable'); + $data = SnmpQuery::cache()->walk('LIGO-WIRELESS-MIB::ligoWiIfConfTable')->table(1); foreach ($data as $index => $entry) { - $freq = $entry['ligoWiIfFrequency'] ? substr((string) $entry['ligoWiIfFrequency'], 0, 1) . 'G' : 'SSID'; + $freq = $entry['LIGO-WIRELESS-MIB::ligoWiIfFrequency'] ? substr((string) $entry['LIGO-WIRELESS-MIB::ligoWiIfFrequency'], 0, 1) . 'G' : 'SSID'; $sensors[] = new WirelessSensor( WirelessSensorType::Quality, $this->getDeviceId(), '.1.3.6.1.4.1.32750.3.10.1.2.1.1.12.' . $index, 'ligoos', $index, - "$freq: " . $entry['ligoWiIfESSID'], - $entry['ligoWiIfLinkQuality'] + "$freq: " . $entry['LIGO-WIRELESS-MIB::ligoWiIfESSID'], + $entry['LIGO-WIRELESS-MIB::ligoWiIfLinkQuality'] ); } diff --git a/LibreNMS/OS/Linux.php b/LibreNMS/OS/Linux.php index d35d44dae99..512da028cd7 100644 --- a/LibreNMS/OS/Linux.php +++ b/LibreNMS/OS/Linux.php @@ -26,12 +26,13 @@ namespace LibreNMS\OS; +use App\Facades\LibrenmsConfig; use App\Models\EntPhysical; use Illuminate\Support\Collection; use LibreNMS\Interfaces\Discovery\VminfoDiscovery; -use LibreNMS\OS\Traits\VminfoLibvirt; use LibreNMS\OS\Traits\VminfoVmware; use LibreNMS\OS\Traits\VminfoXcpNg; +use LibreNMS\Polling\Method\DataSources\LibvirtDataSource; use LibreNMS\Util\StringHelpers; use SnmpQuery; @@ -39,25 +40,43 @@ class Linux extends Shared\Unix implements VminfoDiscovery { // NOTE: Only Linux specific stuff should go here, most things should be in Unix - use VminfoLibvirt, VminfoVmware, VminfoXcpNg { - VminfoLibvirt::discoverVminfo as discoverLibvirtVminfo; + use VminfoVmware, VminfoXcpNg { VminfoVmware::discoverVmInfo as discoverVmwareVminfo; VminfoXcpNg::discoverVmInfo as discoverXcpNgVminfo; } - public function discoverVmInfo(): Collection + /** + * @return string[] + */ + public static function vmTypes(): array { - if (preg_match('/^XCP-ng/', (string) $this->getDevice()->features)) { - return $this->discoverXcpNgVminfo(); - } + return ['vmware', 'xcp-ng']; + } - $vms = $this->discoverLibvirtVminfo(); + /** + * libvirt does not use snmp, only ssh tunnels, so it is a source of its own. + * It stays a source while the device has its VMs, so they are removed when libvirt is disabled. + */ + public function dataSources(string $interface): array + { + $sources = parent::dataSources($interface); - if ($vms->isNotEmpty()) { - return $vms; + if ($interface === VminfoDiscovery::class && ! $this->isXcpNg() + && (LibrenmsConfig::get('enable_libvirt') || $this->getDevice()->vminfo->contains('vm_type', 'libvirt'))) { + $sources[] = new LibvirtDataSource($this->getDevice()); } - return $this->discoverVmwareVminfo(); + return $sources; + } + + public function discoverVmInfo(): Collection + { + return $this->isXcpNg() ? $this->discoverXcpNgVminfo() : $this->discoverVmwareVminfo(); + } + + private function isXcpNg(): bool + { + return (bool) preg_match('/^XCP-ng/', (string) $this->getDevice()->features); } public function discoverEntityPhysical(): Collection diff --git a/LibreNMS/OS/Merakimr.php b/LibreNMS/OS/Merakimr.php index 0dc3f19faf3..267681ac840 100644 --- a/LibreNMS/OS/Merakimr.php +++ b/LibreNMS/OS/Merakimr.php @@ -19,6 +19,7 @@ use LibreNMS\Interfaces\Discovery\Sensors\WirelessFrequencyDiscovery; use LibreNMS\Interfaces\Polling\Sensors\WirelessFrequencyPolling; use LibreNMS\OS; +use SnmpQuery; class Merakimr extends OS implements WirelessFrequencyDiscovery, @@ -26,7 +27,7 @@ class Merakimr extends OS implements { public function discoverWirelessFrequency() { - $mrRadioChannelOper = $this->getCacheByIndex('dot11CurrentChannel', 'IEEE802dot11-MIB'); + $mrRadioChannelOper = SnmpQuery::walk('IEEE802dot11-MIB::dot11CurrentChannel')->pluck(); $sensors = []; $lastChannel = null; diff --git a/LibreNMS/OS/Mimosa.php b/LibreNMS/OS/Mimosa.php index da8234d4035..212e862dab1 100644 --- a/LibreNMS/OS/Mimosa.php +++ b/LibreNMS/OS/Mimosa.php @@ -35,6 +35,7 @@ use LibreNMS\Interfaces\Discovery\Sensors\WirelessRateDiscovery; use LibreNMS\Interfaces\Discovery\Sensors\WirelessSnrDiscovery; use LibreNMS\OS; +use SnmpQuery; class Mimosa extends OS implements WirelessErrorRatioDiscovery, @@ -92,8 +93,8 @@ public function discoverWirelessFrequency() $sensors = []; // ptp radios - $polar = $this->getCacheByIndex('mimosaPolarization', 'MIMOSA-NETWORKS-BFIVE-MIB'); - $bfiveFreq = $this->getCacheByIndex('mimosaCenterFreq', 'MIMOSA-NETWORKS-BFIVE-MIB'); + $polar = SnmpQuery::cache()->enumStrings()->walk('MIMOSA-NETWORKS-BFIVE-MIB::mimosaPolarization')->pluck(); + $bfiveFreq = SnmpQuery::walk('MIMOSA-NETWORKS-BFIVE-MIB::mimosaCenterFreq')->pluck(); // both chains should be the same frequency, make sure if (count($bfiveFreq) == 1) { @@ -109,13 +110,13 @@ public function discoverWirelessFrequency() '.1.3.6.1.4.1.43356.2.1.2.6.1.1.6.' . $index, 'mimosa-ptp', $index, - sprintf($descr, $this->getPolarization($polar[$index])), + sprintf($descr, $this->getPolarization($polar[$index] ?? null)), $frequency ); } // ptmp radios - $ptmpRadioName = $this->getCacheByIndex('mimosaPtmpChPwrRadioName', 'MIMOSA-NETWORKS-PTMP-MIB'); + $ptmpRadioName = SnmpQuery::cache()->walk('MIMOSA-NETWORKS-PTMP-MIB::mimosaPtmpChPwrRadioName')->pluck(); $ptmpFreq = snmpwalk_group($this->getDeviceArray(), 'mimosaPtmpChPwrCntrFreqCur', 'MIMOSA-NETWORKS-PTMP-MIB'); foreach ($ptmpFreq as $index => $frequency) { @@ -125,7 +126,7 @@ public function discoverWirelessFrequency() '.1.3.6.1.4.1.43356.2.1.2.9.3.3.1.7.' . $index, 'mimosa', $index, - $ptmpRadioName[$index], + ($ptmpRadioName[$index] ?? ''), $frequency['mimosaPtmpChPwrCntrFreqCur'] ); } @@ -147,7 +148,7 @@ private function getPolarization($polarization) public function discoverWirelessNoiseFloor() { // FIXME: is Noise different from Noise Floor? - $polar = $this->getCacheByIndex('mimosaPolarization', 'MIMOSA-NETWORKS-BFIVE-MIB'); + $polar = SnmpQuery::cache()->enumStrings()->walk('MIMOSA-NETWORKS-BFIVE-MIB::mimosaPolarization')->pluck(); $oids = snmpwalk_cache_oid($this->getDeviceArray(), 'mimosaRxNoise', [], 'MIMOSA-NETWORKS-BFIVE-MIB'); $sensors = []; @@ -158,7 +159,7 @@ public function discoverWirelessNoiseFloor() '.1.3.6.1.4.1.43356.2.1.2.6.1.1.4.' . $index, 'mimosa', $index, - sprintf('Rx Noise: %s Chain', $this->getPolarization($polar[$index])), + sprintf('Rx Noise: %s Chain', $this->getPolarization($polar[$index] ?? null)), $entry['mimosaRxNoise'], 1, 10 @@ -179,7 +180,7 @@ public function discoverWirelessPower() $sensors = []; // ptp radios - $polar = $this->getCacheByIndex('mimosaPolarization', 'MIMOSA-NETWORKS-BFIVE-MIB'); + $polar = SnmpQuery::cache()->enumStrings()->walk('MIMOSA-NETWORKS-BFIVE-MIB::mimosaPolarization')->pluck(); $oids = snmpwalk_cache_oid($this->getDeviceArray(), 'mimosaTxPower', [], 'MIMOSA-NETWORKS-BFIVE-MIB'); $oids = snmpwalk_cache_oid($this->getDeviceArray(), 'mimosaRxPower', $oids, 'MIMOSA-NETWORKS-BFIVE-MIB'); @@ -190,7 +191,7 @@ public function discoverWirelessPower() '.1.3.6.1.4.1.43356.2.1.2.6.1.1.2.' . $index, 'mimosa-ptp-tx', $index, - sprintf('Tx Power: %s Chain', $this->getPolarization($polar[$index])), + sprintf('Tx Power: %s Chain', $this->getPolarization($polar[$index] ?? null)), $entry['mimosaTxPower'], 1, 10 @@ -201,7 +202,7 @@ public function discoverWirelessPower() '.1.3.6.1.4.1.43356.2.1.2.6.1.1.3.' . $index, 'mimosa-ptp-rx', $index, - sprintf('Rx Power: %s Chain', $this->getPolarization($polar[$index])), + sprintf('Rx Power: %s Chain', $this->getPolarization($polar[$index] ?? null)), $entry['mimosaRxPower'], 1, 10 @@ -209,7 +210,7 @@ public function discoverWirelessPower() } // ptmp radios - $ptmpRadioName = $this->getCacheByIndex('mimosaPtmpChPwrRadioName', 'MIMOSA-NETWORKS-PTMP-MIB'); + $ptmpRadioName = SnmpQuery::cache()->walk('MIMOSA-NETWORKS-PTMP-MIB::mimosaPtmpChPwrRadioName')->pluck(); $ptmpTxPow = snmpwalk_group($this->getDeviceArray(), 'mimosaPtmpChPwrTxPowerCur', 'MIMOSA-NETWORKS-PTMP-MIB'); foreach ($ptmpTxPow as $index => $entry) { @@ -219,7 +220,7 @@ public function discoverWirelessPower() '.1.3.6.1.4.1.43356.2.1.2.9.3.3.1.10.' . $index, 'mimosa-tx', $index, - 'Tx Power: ' . $ptmpRadioName[$index], + 'Tx Power: ' . ($ptmpRadioName[$index] ?? ''), $entry['mimosaPtmpChPwrTxPowerCur'] ); } @@ -233,7 +234,7 @@ public function discoverWirelessPower() '.1.3.6.1.4.1.43356.2.1.2.9.3.3.1.12.' . $index, 'mimosa-rx', $index, - 'Min Rx Power: ' . $ptmpRadioName[$index], + 'Min Rx Power: ' . ($ptmpRadioName[$index] ?? ''), $entry['mimosaPtmpChPwrMinRxPower'] ); } @@ -287,7 +288,7 @@ public function discoverWirelessRate() */ public function discoverWirelessSnr() { - $polar = $this->getCacheByIndex('mimosaPolarization', 'MIMOSA-NETWORKS-BFIVE-MIB'); + $polar = SnmpQuery::cache()->enumStrings()->walk('MIMOSA-NETWORKS-BFIVE-MIB::mimosaPolarization')->pluck(); $oids = snmpwalk_cache_oid($this->getDeviceArray(), 'mimosaSNR', [], 'MIMOSA-NETWORKS-BFIVE-MIB'); $sensors = []; @@ -298,7 +299,7 @@ public function discoverWirelessSnr() '.1.3.6.1.4.1.43356.2.1.2.6.1.1.5.' . $index, 'mimosa', $index, - sprintf('SNR: %s Chain', $this->getPolarization($polar[$index])), + sprintf('SNR: %s Chain', $this->getPolarization($polar[$index] ?? null)), $entry['mimosaSNR'], 1, 10 diff --git a/LibreNMS/OS/MoxaEtherdevice.php b/LibreNMS/OS/MoxaEtherdevice.php index 17e13ab2b90..47e871ae9cc 100644 --- a/LibreNMS/OS/MoxaEtherdevice.php +++ b/LibreNMS/OS/MoxaEtherdevice.php @@ -26,34 +26,35 @@ namespace LibreNMS\OS; -use LibreNMS\Device\Processor; +use App\Models\Processor; +use Illuminate\Support\Collection; use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; use LibreNMS\OS; +use SnmpQuery; class MoxaEtherdevice extends OS implements ProcessorDiscovery { /** * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered + * Returns a Collection of Processor models that have been discovered * - * @return array Processors + * @return Collection */ - public function discoverProcessors() + public function discoverProcessors(): Collection { - $device = $this->getDeviceArray(); - // Moxa people enjoy creating MIBs for each model! // .1.3.6.1.4.1.8691.7.116.1.54.0 = MOXA-IKS6726A-MIB::cpuLoading30s.0 // .1.3.6.1.4.1.8691.7.69.1.54.0 = MOXA-EDSG508E-MIB::cpuLoading30s.0 - $oid = $device['sysObjectID'] . '.1.54.0'; + $oid = $this->getDevice()->sysObjectID . '.1.54.0'; + $value = SnmpQuery::get($oid)->value(); - return [ - Processor::discover( - $this->getName(), - $this->getDeviceId(), - $oid, - 0 - ), - ]; + return collect([ + new Processor([ + 'processor_type' => $this->getName(), + 'processor_oid' => $oid, + 'processor_index' => 0, + 'processor_usage' => $value, + ]), + ]); } } diff --git a/LibreNMS/OS/Nimbleos.php b/LibreNMS/OS/Nimbleos.php index f3d05e35f95..57752709d27 100644 --- a/LibreNMS/OS/Nimbleos.php +++ b/LibreNMS/OS/Nimbleos.php @@ -18,13 +18,13 @@ public function discoverStorage(): Collection $used = ($data['NIMBLE-MIB::volUsageHigh'] << 32) + $data['NIMBLE-MIB::volUsageLow']; $size = ($data['NIMBLE-MIB::volSizeHigh'] << 32) + $data['NIMBLE-MIB::volSizeLow']; - return (new Storage([ + return new Storage([ 'type' => 'nimbleos', 'storage_index' => $volIndex, 'storage_type' => $data['NIMBLE-MIB::volOnline'], 'storage_descr' => $data['NIMBLE-MIB::volName'], 'storage_units' => 1048576, - ]))->fillUsage($used, $size); + ])->fillUsage($used, $size); }); } diff --git a/LibreNMS/OS/Nxos.php b/LibreNMS/OS/Nxos.php new file mode 100644 index 00000000000..36748b3e407 --- /dev/null +++ b/LibreNMS/OS/Nxos.php @@ -0,0 +1,56 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace LibreNMS\OS; + +use App\Models\Vrf; +use Illuminate\Support\Collection; +use SnmpQuery; + +class Nxos extends Shared\Cisco +{ + /** + * NX-OS only fills the VRF MIBs when MPLS L3VPN is configured, + * so VRFs with BGP sessions are taken from cbgpPeer3Table + */ + public function discoverVrfs(): Collection + { + $vrfs = parent::discoverVrfs(); + if ($vrfs->isNotEmpty()) { + return $vrfs; + } + + $names = []; + foreach (SnmpQuery::hideMib()->numericIndex()->walk('CISCO-BGP4-MIB::cbgpPeer3VrfName')->throwIfConnectionError()->pluck('cbgpPeer3VrfName') as $index => $name) { + $names[explode('.', (string) $index)[0]] = (string) $name; // cbgpPeer3VrfId, type, address + } + + return collect($names) + ->reject(fn (string $name) => $name === '' || Vrf::isDefaultName($name)) + ->map(fn (string $name, $vrfId) => new Vrf(['vrf_oid' => (string) $vrfId, 'vrf_name' => $name, 'mplsVpnVrfDescription' => ''])) + ->values(); + } +} diff --git a/LibreNMS/OS/Pbn.php b/LibreNMS/OS/Pbn.php index 809f6859f05..7d28dac8e00 100644 --- a/LibreNMS/OS/Pbn.php +++ b/LibreNMS/OS/Pbn.php @@ -26,12 +26,10 @@ namespace LibreNMS\OS; -use LibreNMS\Device\Processor; -use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; use LibreNMS\OS; use LibreNMS\OS\Traits\NmsLldpMib; -class Pbn extends OS implements ProcessorDiscovery +class Pbn extends OS { use NmsLldpMib; @@ -45,22 +43,4 @@ public function __construct(&$device) } } } - - /** - * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered - * - * @return array Processors - */ - public function discoverProcessors(): array - { - return [ - Processor::discover( - 'pbn-cpu', - $this->getDeviceId(), - '.1.3.6.1.4.1.11606.10.9.109.1.1.1.1.5.1', // NMS-PROCESS-MIB::nmspmCPUTotal5min - 0 - ), - ]; - } } diff --git a/LibreNMS/OS/Powerconnect.php b/LibreNMS/OS/Powerconnect.php index 553b94e3a79..b7b2a9fe5ca 100644 --- a/LibreNMS/OS/Powerconnect.php +++ b/LibreNMS/OS/Powerconnect.php @@ -28,9 +28,9 @@ use App\Facades\PortCache; use App\Models\PortsNac; +use App\Models\Processor; use Illuminate\Support\Collection; use Illuminate\Support\Str; -use LibreNMS\Device\Processor; use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; use LibreNMS\Interfaces\Polling\NacPolling; use LibreNMS\Interfaces\Polling\ProcessorPolling; @@ -48,11 +48,11 @@ class Powerconnect extends OS implements ProcessorDiscovery, ProcessorPolling, N /** * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered + * Returns a Collection of Processor models that have been discovered * - * @return array Processors + * @return Collection */ - public function discoverProcessors() + public function discoverProcessors(): Collection { $device = $this->getDeviceArray(); if (Str::startsWith($device['sysObjectID'], [ @@ -64,14 +64,22 @@ public function discoverProcessors() ])) { d_echo('Dell Powerconnect 55xx'); - return [ - Processor::discover( - 'powerconnect-nv', - $this->getDeviceId(), - '.1.3.6.1.4.1.89.1.7.0', - 0 - ), - ]; + $usage = SnmpQuery::get('.1.3.6.1.4.1.89.1.7.0')->value(); + $processors = new Collection; + if (is_numeric($usage)) { + $processors->push(new Processor([ + 'processor_type' => 'powerconnect-nv', + 'processor_oid' => '.1.3.6.1.4.1.89.1.7.0', + 'processor_index' => 0, + 'processor_descr' => 'Processor', + 'processor_precision' => 1, + 'hrDeviceIndex' => null, + 'processor_perc_warn' => null, + 'processor_usage' => $usage, + ])); + } + + return $processors; } elseif (Str::startsWith($device['sysObjectID'], [ '.1.3.6.1.4.1.674.10895.3024', '.1.3.6.1.4.1.674.10895.3042', @@ -101,22 +109,21 @@ public function discoverProcessors() /** * Poll processor data. This can be implemented if custom polling is needed. * - * @param array $processors Array of processor entries from the database that need to be polled - * @return array of polled data + * @param Collection $processors Array of processor entries from the database that need to be polled + * @return Collection of polled data */ - public function pollProcessors(array $processors) + public function pollProcessors(Collection $processors): Collection { - $data = []; - foreach ($processors as $processor) { - if ($processor['processor_type'] == 'powerconnect-nv') { - $data[$processor['processor_id']] = snmp_get($this->getDeviceArray(), $processor['processor_oid'], '-Oqv'); + $value = SnmpQuery::get($processor->processor_oid)->value(); + if ($processor->processor_type == 'powerconnect-nv') { + $processor->processor_usage = $value; } else { - $data += $this->pollVxworksProcessors([$processor]); + $processor->processor_usage = $this->parseCpuUsageString($value); } } - return $data; + return $processors; } private static function decode_string(string $s): string diff --git a/LibreNMS/OS/Routeros.php b/LibreNMS/OS/Routeros.php index 7f9859db43c..85c3e061a0c 100644 --- a/LibreNMS/OS/Routeros.php +++ b/LibreNMS/OS/Routeros.php @@ -91,13 +91,13 @@ public function discoverWirelessCcq() { $sensors = []; - $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWlApTable'); + $data = SnmpQuery::cache()->walk('MIKROTIK-MIB::mtxrWlApTable')->table(1); foreach ($data as $index => $entry) { // skip sensors with no data (nv2 should report 1 client, but doesn't report ccq) - if ($entry['mtxrWlApClientCount'] > 0 && $entry['mtxrWlApOverallTxCCQ'] == 0) { + if ($entry['MIKROTIK-MIB::mtxrWlApClientCount'] > 0 && $entry['MIKROTIK-MIB::mtxrWlApOverallTxCCQ'] == 0) { continue; } - $freq = $entry['mtxrWlApFreq'] ? substr((string) $entry['mtxrWlApFreq'], 0, 1) . 'G' : 'SSID'; + $freq = $entry['MIKROTIK-MIB::mtxrWlApFreq'] ? substr((string) $entry['MIKROTIK-MIB::mtxrWlApFreq'], 0, 1) . 'G' : 'SSID'; $sensors[] = new WirelessSensor( WirelessSensorType::Ccq, @@ -105,15 +105,15 @@ public function discoverWirelessCcq() '.1.3.6.1.4.1.14988.1.1.1.3.1.10.' . $index, 'mikrotik', $index, - "$freq: " . $entry['mtxrWlApSsid'], - $entry['mtxrWlApOverallTxCCQ'] + "$freq: " . $entry['MIKROTIK-MIB::mtxrWlApSsid'], + $entry['MIKROTIK-MIB::mtxrWlApOverallTxCCQ'] ); } - $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWlStatTable'); + $data = SnmpQuery::cache()->walk('MIKROTIK-MIB::mtxrWlStatTable')->table(1); foreach ($data as $index => $entry) { - $freq = $entry['mtxrWlStatFreq'] ? substr((string) $entry['mtxrWlStatFreq'], 0, 1) . 'G' : 'SSID'; - if (empty($entry['mtxrWlStatTxCCQ']) && empty($entry['mtxrWlStatRxCCQ'])) { + $freq = $entry['MIKROTIK-MIB::mtxrWlStatFreq'] ? substr((string) $entry['MIKROTIK-MIB::mtxrWlStatFreq'], 0, 1) . 'G' : 'SSID'; + if (empty($entry['MIKROTIK-MIB::mtxrWlStatTxCCQ']) && empty($entry['MIKROTIK-MIB::mtxrWlStatRxCCQ'])) { continue; } @@ -123,8 +123,8 @@ public function discoverWirelessCcq() '.1.3.6.1.4.1.14988.1.1.1.1.1.9.' . $index, 'mikrotik-tx-ccq', $index, - "$freq: " . $entry['mtxrWlStatSsid'] . ' Tx', - $entry['mtxrWlStatTxCCQ'] + "$freq: " . $entry['MIKROTIK-MIB::mtxrWlStatSsid'] . ' Tx', + $entry['MIKROTIK-MIB::mtxrWlStatTxCCQ'] ); $sensors[] = new WirelessSensor( WirelessSensorType::Ccq, @@ -132,8 +132,8 @@ public function discoverWirelessCcq() '.1.3.6.1.4.1.14988.1.1.1.1.1.10.' . $index, 'mikrotik-rx-ccq', $index, - "$freq: " . $entry['mtxrWlStatSsid'] . ' Rx', - $entry['mtxrWlStatRxCCQ'] + "$freq: " . $entry['MIKROTIK-MIB::mtxrWlStatSsid'] . ' Rx', + $entry['MIKROTIK-MIB::mtxrWlStatRxCCQ'] ); } @@ -148,9 +148,9 @@ public function discoverWirelessCcq() public function discoverWirelessClients() { $sensors = []; - $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWlApTable'); + $data = SnmpQuery::cache()->walk('MIKROTIK-MIB::mtxrWlApTable')->table(1); foreach ($data as $index => $entry) { - $freq = $entry['mtxrWlApFreq'] ? substr((string) $entry['mtxrWlApFreq'], 0, 1) . 'G' : 'SSID'; + $freq = $entry['MIKROTIK-MIB::mtxrWlApFreq'] ? substr((string) $entry['MIKROTIK-MIB::mtxrWlApFreq'], 0, 1) . 'G' : 'SSID'; $sensors[] = new WirelessSensor( WirelessSensorType::Clients, @@ -158,8 +158,8 @@ public function discoverWirelessClients() '.1.3.6.1.4.1.14988.1.1.1.3.1.6.' . $index, 'mikrotik', $index, - "$freq: " . $entry['mtxrWlApSsid'], - $entry['mtxrWlApClientCount'] + "$freq: " . $entry['MIKROTIK-MIB::mtxrWlApSsid'], + $entry['MIKROTIK-MIB::mtxrWlApClientCount'] ); } @@ -175,41 +175,41 @@ public function discoverWirelessClients() public function discoverWirelessFrequency() { $sensors = []; - $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWlApTable'); + $data = SnmpQuery::cache()->walk('MIKROTIK-MIB::mtxrWlApTable')->table(1); foreach ($data as $index => $entry) { - if ($entry['mtxrWlApFreq'] === '0') { + if ($entry['MIKROTIK-MIB::mtxrWlApFreq'] === '0') { continue; } - $freq = substr((string) $entry['mtxrWlApFreq'], 0, 1) . 'G'; + $freq = substr((string) $entry['MIKROTIK-MIB::mtxrWlApFreq'], 0, 1) . 'G'; $sensors[] = new WirelessSensor( WirelessSensorType::Frequency, $this->getDeviceId(), '.1.3.6.1.4.1.14988.1.1.1.3.1.7.' . $index, 'mikrotik', $index, - "$freq: " . $entry['mtxrWlApSsid'], - $entry['mtxrWlApFreq'] + "$freq: " . $entry['MIKROTIK-MIB::mtxrWlApSsid'], + $entry['MIKROTIK-MIB::mtxrWlApFreq'] ); } - $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWlStatTable'); + $data = SnmpQuery::cache()->walk('MIKROTIK-MIB::mtxrWlStatTable')->table(1); foreach ($data as $index => $entry) { - if ($entry['mtxrWlStatFreq'] === '0') { + if ($entry['MIKROTIK-MIB::mtxrWlStatFreq'] === '0') { continue; } - $freq = substr((string) $entry['mtxrWlStatFreq'], 0, 1) . 'G'; + $freq = substr((string) $entry['MIKROTIK-MIB::mtxrWlStatFreq'], 0, 1) . 'G'; $sensors[] = new WirelessSensor( WirelessSensorType::Frequency, $this->getDeviceId(), '.1.3.6.1.4.1.14988.1.1.1.1.1.7.' . $index, 'mikrotik', $index, - "$freq: " . $entry['mtxrWlStatSsid'], - $entry['mtxrWlStatFreq'] + "$freq: " . $entry['MIKROTIK-MIB::mtxrWlStatSsid'], + $entry['MIKROTIK-MIB::mtxrWlStatFreq'] ); } - $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWl60GTable'); + $data = SnmpQuery::cache()->walk('MIKROTIK-MIB::mtxrWl60GTable')->table(1); foreach ($data as $index => $entry) { $sensors[] = new WirelessSensor( WirelessSensorType::Frequency, @@ -217,8 +217,8 @@ public function discoverWirelessFrequency() '.1.3.6.1.4.1.14988.1.1.1.8.1.6.' . $index, 'mikrotik-60g', $index, - '60G: ' . $entry['mtxrWl60GSsid'], - $entry['mtxrWl60GFreq'] + '60G: ' . $entry['MIKROTIK-MIB::mtxrWl60GSsid'], + $entry['MIKROTIK-MIB::mtxrWl60GFreq'] ); } @@ -234,7 +234,7 @@ public function discoverWirelessFrequency() public function discoverWirelessRssi() { $sensors = []; - $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWl60GTable'); + $data = SnmpQuery::cache()->walk('MIKROTIK-MIB::mtxrWl60GTable')->table(1); foreach ($data as $index => $entry) { $sensors[] = new WirelessSensor( @@ -243,8 +243,8 @@ public function discoverWirelessRssi() '.1.3.6.1.4.1.14988.1.1.1.8.1.12.' . $index, 'mikrotik', $index, - '60G: ' . $entry['mtxrWl60GSsid'], - $entry['mtxrWl60GRssi'] + '60G: ' . $entry['MIKROTIK-MIB::mtxrWl60GSsid'], + $entry['MIKROTIK-MIB::mtxrWl60GRssi'] ); } @@ -260,7 +260,7 @@ public function discoverWirelessRssi() public function discoverWirelessQuality() { $sensors = []; - $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWl60GTable'); + $data = SnmpQuery::cache()->walk('MIKROTIK-MIB::mtxrWl60GTable')->table(1); foreach ($data as $index => $entry) { $sensors[] = new WirelessSensor( @@ -269,8 +269,8 @@ public function discoverWirelessQuality() '.1.3.6.1.4.1.14988.1.1.1.8.1.8.' . $index, 'mikrotik', $index, - '60G: ' . $entry['mtxrWl60GSsid'], - $entry['mtxrWl60GSignal'] + '60G: ' . $entry['MIKROTIK-MIB::mtxrWl60GSsid'], + $entry['MIKROTIK-MIB::mtxrWl60GSignal'] ); } @@ -285,10 +285,10 @@ public function discoverWirelessQuality() public function discoverWirelessNoiseFloor() { $sensors = []; - $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWlApTable'); + $data = SnmpQuery::cache()->walk('MIKROTIK-MIB::mtxrWlApTable')->table(1); foreach ($data as $index => $entry) { - $freq = $entry['mtxrWlApFreq'] ? substr((string) $entry['mtxrWlApFreq'], 0, 1) . 'G' : 'SSID'; + $freq = $entry['MIKROTIK-MIB::mtxrWlApFreq'] ? substr((string) $entry['MIKROTIK-MIB::mtxrWlApFreq'], 0, 1) . 'G' : 'SSID'; $sensors[] = new WirelessSensor( WirelessSensorType::NoiseFloor, @@ -296,8 +296,8 @@ public function discoverWirelessNoiseFloor() '.1.3.6.1.4.1.14988.1.1.1.3.1.9.' . $index, 'mikrotik', $index, - "$freq: " . $entry['mtxrWlApSsid'], - $entry['mtxrWlApNoiseFloor'] + "$freq: " . $entry['MIKROTIK-MIB::mtxrWlApSsid'], + $entry['MIKROTIK-MIB::mtxrWlApNoiseFloor'] ); } @@ -314,21 +314,21 @@ public function discoverWirelessRate() { $sensors = []; - $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWlApTable'); + $data = SnmpQuery::cache()->walk('MIKROTIK-MIB::mtxrWlApTable')->table(1); foreach ($data as $index => $entry) { - if ($entry['mtxrWlApTxRate'] === '0' && $entry['mtxrWlApRxRate'] === '0') { + if ($entry['MIKROTIK-MIB::mtxrWlApTxRate'] === '0' && $entry['MIKROTIK-MIB::mtxrWlApRxRate'] === '0') { continue; // no data } - $freq = $entry['mtxrWlApFreq'] ? substr((string) $entry['mtxrWlApFreq'], 0, 1) . 'G' : 'SSID'; + $freq = $entry['MIKROTIK-MIB::mtxrWlApFreq'] ? substr((string) $entry['MIKROTIK-MIB::mtxrWlApFreq'], 0, 1) . 'G' : 'SSID'; $sensors[] = new WirelessSensor( WirelessSensorType::Rate, $this->getDeviceId(), '.1.3.6.1.4.1.14988.1.1.1.3.1.2.' . $index, 'mikrotik-tx', $index, - "$freq: " . $entry['mtxrWlApSsid'] . ' Tx', - $entry['mtxrWlApTxRate'] + "$freq: " . $entry['MIKROTIK-MIB::mtxrWlApSsid'] . ' Tx', + $entry['MIKROTIK-MIB::mtxrWlApTxRate'] ); $sensors[] = new WirelessSensor( WirelessSensorType::Rate, @@ -336,25 +336,25 @@ public function discoverWirelessRate() '.1.3.6.1.4.1.14988.1.1.1.3.1.3.' . $index, 'mikrotik-rx', $index, - "$freq: " . $entry['mtxrWlApSsid'] . ' Rx', - $entry['mtxrWlApRxRate'] + "$freq: " . $entry['MIKROTIK-MIB::mtxrWlApSsid'] . ' Rx', + $entry['MIKROTIK-MIB::mtxrWlApRxRate'] ); } - $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWlStatTable'); + $data = SnmpQuery::cache()->walk('MIKROTIK-MIB::mtxrWlStatTable')->table(1); foreach ($data as $index => $entry) { - if ($entry['mtxrWlStatTxRate'] === '0' && $entry['mtxrWlStatRxRate'] === '0') { + if ($entry['MIKROTIK-MIB::mtxrWlStatTxRate'] === '0' && $entry['MIKROTIK-MIB::mtxrWlStatRxRate'] === '0') { continue; // no data } - $freq = $entry['mtxrWlStatFreq'] ? substr((string) $entry['mtxrWlStatFreq'], 0, 1) . 'G' : 'SSID'; + $freq = $entry['MIKROTIK-MIB::mtxrWlStatFreq'] ? substr((string) $entry['MIKROTIK-MIB::mtxrWlStatFreq'], 0, 1) . 'G' : 'SSID'; $sensors[] = new WirelessSensor( WirelessSensorType::Rate, $this->getDeviceId(), '.1.3.6.1.4.1.14988.1.1.1.1.1.2.' . $index, 'mikrotik-tx', $index, - "$freq: " . $entry['mtxrWlStatSsid'] . ' Tx', - $entry['mtxrWlStatTxRate'] + "$freq: " . $entry['MIKROTIK-MIB::mtxrWlStatSsid'] . ' Tx', + $entry['MIKROTIK-MIB::mtxrWlStatTxRate'] ); $sensors[] = new WirelessSensor( WirelessSensorType::Rate, @@ -362,12 +362,12 @@ public function discoverWirelessRate() '.1.3.6.1.4.1.14988.1.1.1.1.1.3.' . $index, 'mikrotik-rx', $index, - "$freq: " . $entry['mtxrWlStatSsid'] . ' Rx', - $entry['mtxrWlStatRxRate'] + "$freq: " . $entry['MIKROTIK-MIB::mtxrWlStatSsid'] . ' Rx', + $entry['MIKROTIK-MIB::mtxrWlStatRxRate'] ); } - $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWl60GTable'); + $data = SnmpQuery::cache()->walk('MIKROTIK-MIB::mtxrWl60GTable')->table(1); foreach ($data as $index => $entry) { $sensors[] = new WirelessSensor( WirelessSensorType::Rate, @@ -375,8 +375,8 @@ public function discoverWirelessRate() '.1.3.6.1.4.1.14988.1.1.1.8.1.13.' . $index, 'mikrotik-60g-tx', $index, - '60G: ' . $entry['mtxrWl60GSsid'], - $entry['mtxrWl60GPhyRate'], + '60G: ' . $entry['MIKROTIK-MIB::mtxrWl60GSsid'], + $entry['MIKROTIK-MIB::mtxrWl60GPhyRate'], 1000000 ); } @@ -394,7 +394,7 @@ public function discoverWirelessDistance() { $sensors = []; - $data = $this->getCacheTable('MIKROTIK-MIB::mtxrWl60GStaTable'); + $data = SnmpQuery::walk('MIKROTIK-MIB::mtxrWl60GStaTable')->table(1); foreach ($data as $index => $entry) { $sensors[] = new WirelessSensor( WirelessSensorType::Distance, @@ -402,8 +402,8 @@ public function discoverWirelessDistance() '.1.3.6.1.4.1.14988.1.1.1.9.1.10.' . $index, 'mikrotik', $index, - '60G: Sta > ' . $entry['mtxrWl60GStaRemote'], - $entry['mtxrWl60GStaDistance'], + '60G: Sta > ' . $entry['MIKROTIK-MIB::mtxrWl60GStaRemote'], + $entry['MIKROTIK-MIB::mtxrWl60GStaDistance'], 1, 100000 ); @@ -420,19 +420,19 @@ public function discoverWirelessDistance() */ public function discoverWirelessRsrq() { - $data = $this->getCacheTable('MIKROTIK-MIB::mtxrLTEModemTable'); + $data = SnmpQuery::cache()->walk('MIKROTIK-MIB::mtxrLTEModemTable')->table(1); $sensors = []; foreach ($data as $index => $entry) { - $name = $this->getCacheByIndex('MIKROTIK-MIB::mtxrInterfaceStatsName'); + $name = SnmpQuery::cache()->walk('MIKROTIK-MIB::mtxrInterfaceStatsName')->pluck(); $sensors[] = new WirelessSensor( WirelessSensorType::Rsrq, $this->getDeviceId(), '.1.3.6.1.4.1.14988.1.1.16.1.1.3.' . $index, 'routeros', $index, - $name[$index] . ': Signal RSRQ', - $entry['mtxrLTEModemSignalRSRQ'] + ($name[$index] ?? '') . ': Signal RSRQ', + $entry['MIKROTIK-MIB::mtxrLTEModemSignalRSRQ'] ); } @@ -447,19 +447,19 @@ public function discoverWirelessRsrq() */ public function discoverWirelessRsrp() { - $data = $this->getCacheTable('MIKROTIK-MIB::mtxrLTEModemTable'); + $data = SnmpQuery::cache()->walk('MIKROTIK-MIB::mtxrLTEModemTable')->table(1); $sensors = []; foreach ($data as $index => $entry) { - $name = $this->getCacheByIndex('MIKROTIK-MIB::mtxrInterfaceStatsName'); + $name = SnmpQuery::cache()->walk('MIKROTIK-MIB::mtxrInterfaceStatsName')->pluck(); $sensors[] = new WirelessSensor( WirelessSensorType::Rsrp, $this->getDeviceId(), '.1.3.6.1.4.1.14988.1.1.16.1.1.4.' . $index, 'routeros', $index, - $name[$index] . ': Signal RSRP', - $entry['mtxrLTEModemSignalRSRP'] + ($name[$index] ?? '') . ': Signal RSRP', + $entry['MIKROTIK-MIB::mtxrLTEModemSignalRSRP'] ); } @@ -474,19 +474,19 @@ public function discoverWirelessRsrp() */ public function discoverWirelessSinr() { - $data = $this->getCacheTable('MIKROTIK-MIB::mtxrLTEModemTable'); + $data = SnmpQuery::cache()->walk('MIKROTIK-MIB::mtxrLTEModemTable')->table(1); $sensors = []; foreach ($data as $index => $entry) { - $name = $this->getCacheByIndex('MIKROTIK-MIB::mtxrInterfaceStatsName'); + $name = SnmpQuery::cache()->walk('MIKROTIK-MIB::mtxrInterfaceStatsName')->pluck(); $sensors[] = new WirelessSensor( WirelessSensorType::Sinr, $this->getDeviceId(), '.1.3.6.1.4.1.14988.1.1.16.1.1.7.' . $index, 'routeros', $index, - $name[$index] . ': Signal SINR', - $entry['mtxrLTEModemSignalSINR'] + ($name[$index] ?? '') . ': Signal SINR', + $entry['MIKROTIK-MIB::mtxrLTEModemSignalSINR'] ); } @@ -791,7 +791,7 @@ private function discoverMikrotikLldpNeighbors(array $entries): Collection $interfaceIds = SnmpQuery::hideMib()->walk('MIKROTIK-MIB::mtxrNeighborInterfaceID')->pluck(); $interfaceNames = SnmpQuery::hideMib()->walk('MIKROTIK-MIB::mtxrInterfaceStatsName')->pluck(); - return (new Collection($entries))->filter(fn ($entry) => is_array($entry))->map(function (array $entry, $index) use ($interfaceIds, $interfaceNames) { + return new Collection($entries)->filter(fn ($entry) => is_array($entry))->map(function (array $entry, $index) use ($interfaceIds, $interfaceNames) { $ifName = isset($interfaceIds[$index]) ? $interfaceNames[hexdec((string) $interfaceIds[$index])] ?? null : null; return NeighborParser::fromLldpRemEntry($entry, $this->lldpLocalPorts()->byDescr($ifName)?->port_id); diff --git a/LibreNMS/OS/Ruckuswireless.php b/LibreNMS/OS/Ruckuswireless.php index c93deb928f0..6ecd1acbbde 100644 --- a/LibreNMS/OS/Ruckuswireless.php +++ b/LibreNMS/OS/Ruckuswireless.php @@ -7,6 +7,7 @@ use LibreNMS\Interfaces\Discovery\Sensors\WirelessApCountDiscovery; use LibreNMS\Interfaces\Discovery\Sensors\WirelessClientsDiscovery; use LibreNMS\OS; +use SnmpQuery; class Ruckuswireless extends OS implements WirelessClientsDiscovery, @@ -16,8 +17,8 @@ public function discoverWirelessClients() { // Find Per SSID Client Count $sensors = []; - $ssids = $this->getCacheByIndex('ruckusZDWLANSSID', 'RUCKUS-ZD-WLAN-MIB'); - $counts = $this->getCacheByIndex('ruckusZDWLANNumSta', 'RUCKUS-ZD-WLAN-MIB'); + $ssids = SnmpQuery::walk('RUCKUS-ZD-WLAN-MIB::ruckusZDWLANSSID')->pluck(); + $counts = SnmpQuery::walk('RUCKUS-ZD-WLAN-MIB::ruckusZDWLANNumSta')->pluck(); $total_oids = []; $total = 0; @@ -33,7 +34,7 @@ public function discoverWirelessClients() $oid, 'ruckuswireless', $index, - 'SSID: ' . $ssids[$index], + 'SSID: ' . ($ssids[$index] ?? ''), $count ); } diff --git a/LibreNMS/OS/RutosOtd.php b/LibreNMS/OS/RutosOtd.php index ad6129c4d3c..66e0344fb5d 100644 --- a/LibreNMS/OS/RutosOtd.php +++ b/LibreNMS/OS/RutosOtd.php @@ -32,6 +32,7 @@ use LibreNMS\Interfaces\Discovery\Sensors\WirelessRssiDiscovery; use LibreNMS\Interfaces\Discovery\Sensors\WirelessSinrDiscovery; use LibreNMS\OS; +use SnmpQuery; class RutosOtd extends OS implements WirelessRssiDiscovery, @@ -86,15 +87,15 @@ public function discoverWirelessCell(): array private function buildModemSensors(WirelessSensorType $type, string $oidLeaf, string $label, string $field): array { $sensors = []; - foreach ($this->getCacheTable('TELTONIKA-OTD-MIB::modemTable') as $index => $entry) { + foreach (SnmpQuery::cache()->walk('TELTONIKA-OTD-MIB::modemTable')->table(1) as $index => $entry) { $sensors[] = new WirelessSensor( $type, $this->getDeviceId(), '.1.3.6.1.4.1.48690.2.2.1.' . $oidLeaf . '.' . $index, 'rutos-otd', $index, - 'Modem ' . ($entry['mIndex'] ?? null) . ' ' . $label, - $entry[$field] ?? null + 'Modem ' . ($entry['TELTONIKA-OTD-MIB::mIndex'] ?? null) . ' ' . $label, + $entry['TELTONIKA-OTD-MIB::' . $field] ?? null ); } diff --git a/LibreNMS/OS/RutosRutx.php b/LibreNMS/OS/RutosRutx.php index 0e4c1a0a111..a33d810f3e0 100644 --- a/LibreNMS/OS/RutosRutx.php +++ b/LibreNMS/OS/RutosRutx.php @@ -33,6 +33,7 @@ use LibreNMS\Interfaces\Discovery\Sensors\WirelessRssiDiscovery; use LibreNMS\Interfaces\Discovery\Sensors\WirelessSinrDiscovery; use LibreNMS\OS; +use SnmpQuery; class RutosRutx extends OS implements WirelessRssiDiscovery, @@ -43,7 +44,7 @@ class RutosRutx extends OS implements { public function discoverWirelessRssi(): array { - $data = $this->getCacheTable('TELTONIKA-RUTX-MIB::modemTable'); + $data = SnmpQuery::cache()->walk('TELTONIKA-RUTX-MIB::modemTable')->table(1); $sensors = []; foreach ($data as $index => $entry) { @@ -53,8 +54,8 @@ public function discoverWirelessRssi(): array '.1.3.6.1.4.1.48690.2.2.1.12.' . $index, 'rutos-rutx', $index, - 'Modem ' . ($entry['mIndex'] ?? null) . ' RSSI', - $entry['mSignal'] + 'Modem ' . ($entry['TELTONIKA-RUTX-MIB::mIndex'] ?? null) . ' RSSI', + $entry['TELTONIKA-RUTX-MIB::mSignal'] ); } @@ -63,7 +64,7 @@ public function discoverWirelessRssi(): array public function discoverWirelessRsrp(): array { - $data = $this->getCacheTable('TELTONIKA-RUTX-MIB::modemTable'); + $data = SnmpQuery::cache()->walk('TELTONIKA-RUTX-MIB::modemTable')->table(1); $sensors = []; foreach ($data as $index => $entry) { @@ -73,8 +74,8 @@ public function discoverWirelessRsrp(): array '.1.3.6.1.4.1.48690.2.2.1.20.' . $index, 'rutos-rutx', $index, - 'Modem ' . ($entry['mIndex'] ?? null) . ' RSRP', - $entry['mRSRP'] + 'Modem ' . ($entry['TELTONIKA-RUTX-MIB::mIndex'] ?? null) . ' RSRP', + $entry['TELTONIKA-RUTX-MIB::mRSRP'] ); } @@ -83,7 +84,7 @@ public function discoverWirelessRsrp(): array public function discoverWirelessRsrq(): array { - $data = $this->getCacheTable('TELTONIKA-RUTX-MIB::modemTable'); + $data = SnmpQuery::cache()->walk('TELTONIKA-RUTX-MIB::modemTable')->table(1); $sensors = []; foreach ($data as $index => $entry) { @@ -93,8 +94,8 @@ public function discoverWirelessRsrq(): array '.1.3.6.1.4.1.48690.2.2.1.21.' . $index, 'rutos-rutx', $index, - 'Modem ' . ($entry['mIndex'] ?? null) . ' RSRQ', - $entry['mRSRQ'] + 'Modem ' . ($entry['TELTONIKA-RUTX-MIB::mIndex'] ?? null) . ' RSRQ', + $entry['TELTONIKA-RUTX-MIB::mRSRQ'] ); } @@ -103,7 +104,7 @@ public function discoverWirelessRsrq(): array public function discoverWirelessSinr(): array { - $data = $this->getCacheTable('TELTONIKA-RUTX-MIB::modemTable'); + $data = SnmpQuery::cache()->walk('TELTONIKA-RUTX-MIB::modemTable')->table(1); $sensors = []; foreach ($data as $index => $entry) { @@ -113,8 +114,8 @@ public function discoverWirelessSinr(): array '.1.3.6.1.4.1.48690.2.2.1.19.' . $index, 'rutos-rutx', $index, - 'Modem ' . ($entry['mIndex'] ?? null) . ' SINR', - $entry['mSINR'] + 'Modem ' . ($entry['TELTONIKA-RUTX-MIB::mIndex'] ?? null) . ' SINR', + $entry['TELTONIKA-RUTX-MIB::mSINR'] ); } @@ -123,7 +124,7 @@ public function discoverWirelessSinr(): array public function discoverWirelessCell(): array { - $data = $this->getCacheTable('TELTONIKA-RUTX-MIB::modemTable'); + $data = SnmpQuery::cache()->walk('TELTONIKA-RUTX-MIB::modemTable')->table(1); $sensors = []; foreach ($data as $index => $entry) { @@ -133,8 +134,8 @@ public function discoverWirelessCell(): array '.1.3.6.1.4.1.48690.2.2.1.18.' . $index, 'rutos-rutx', $index, - 'Modem ' . ($entry['mIndex'] ?? null) . ' CELL ID', - $entry['CELLID'] ?? null + 'Modem ' . ($entry['TELTONIKA-RUTX-MIB::mIndex'] ?? null) . ' CELL ID', + $entry['TELTONIKA-RUTX-MIB::mCellID'] ?? null ); } diff --git a/LibreNMS/OS/Scalance.php b/LibreNMS/OS/Scalance.php deleted file mode 100644 index ea532b164c5..00000000000 --- a/LibreNMS/OS/Scalance.php +++ /dev/null @@ -1,78 +0,0 @@ -. - * - * @link https://www.librenms.org - * - * @copyright 2018 Tony Murray - * @author Tony Murray - */ - -namespace LibreNMS\OS; - -use App\Models\Mempool; -use Illuminate\Support\Collection; -use LibreNMS\Device\Processor; -use LibreNMS\Interfaces\Discovery\MempoolsDiscovery; -use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; -use LibreNMS\OS; - -class Scalance extends OS implements MempoolsDiscovery, ProcessorDiscovery -{ - /** - * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered - * - * @return array Processors - */ - public function discoverProcessors() - { - $oid = '.1.3.6.1.4.1.4329.20.1.1.1.1.79.3.1.13.0'; - - return [ - Processor::discover( - 'scalance-cpu', - $this->getDeviceId(), - $oid, - 0, - 'Processor', - ), - ]; - } - - public function discoverMempools() - { - $perc_oid = '.1.3.6.1.4.1.4329.20.1.1.1.1.79.3.1.13.1'; - $warn_oid = '.1.3.6.1.4.1.4329.20.1.1.1.1.79.3.1.16.1'; - $mempool_data = snmp_get_multi_oid($this->getDeviceArray(), [$perc_oid, $warn_oid]); - - if ($mempool_data[$perc_oid] === false) { - return new Collection(); - } - - return collect()->push((new Mempool([ - 'mempool_index' => 0, - 'mempool_type' => 'scalance', - 'mempool_class' => 'system', - 'mempool_descr' => 'Memory', - 'mempool_perc_oid' => $perc_oid, - 'mempool_perc_warn' => $mempool_data[$warn_oid], - ]))->fillUsage(null, null, null, $mempool_data[$perc_oid])); - } -} diff --git a/LibreNMS/OS/Sgos.php b/LibreNMS/OS/Sgos.php index c6b72e28ca3..1a237ef2957 100644 --- a/LibreNMS/OS/Sgos.php +++ b/LibreNMS/OS/Sgos.php @@ -27,15 +27,12 @@ namespace LibreNMS\OS; use Illuminate\Support\Facades\Log; -use Illuminate\Support\Str; -use LibreNMS\Device\Processor; use LibreNMS\Interfaces\Data\DataStorageInterface; -use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; use LibreNMS\Interfaces\Polling\OSPolling; use LibreNMS\OS; use LibreNMS\RRD\RrdDefinition; -class Sgos extends OS implements ProcessorDiscovery, OSPolling +class Sgos extends OS implements OSPolling { public function pollOS(DataStorageInterface $datastore): void { @@ -149,33 +146,4 @@ public function pollOS(DataStorageInterface $datastore): void Log::info(' Server Conn Idle'); } } - - /** - * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered - * - * @return array Processors - */ - public function discoverProcessors() - { - $data = snmpwalk_group($this->getDeviceArray(), 'sgProxyCpuCoreBusyPerCent', 'BLUECOAT-SG-PROXY-MIB'); - - $processors = []; - $count = 1; - foreach ($data as $index => $entry) { - $processors[] = Processor::discover( - $this->getName(), - $this->getDeviceId(), - ".1.3.6.1.4.1.3417.2.11.2.4.1.8.$index", - Str::padLeft($index, 2, '0'), - "Processor $count", - 1, - $entry['sgProxyCpuCoreBusyPerCent'] - ); - - $count++; - } - - return $processors; - } } diff --git a/LibreNMS/OS/Shared/Arista.php b/LibreNMS/OS/Shared/Arista.php new file mode 100644 index 00000000000..23a1816a172 --- /dev/null +++ b/LibreNMS/OS/Shared/Arista.php @@ -0,0 +1,79 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace LibreNMS\OS\Shared; + +use App\Models\Vrf; +use Illuminate\Support\Collection; +use LibreNMS\Interfaces\Discovery\BgpAddressFamilyDiscovery; +use LibreNMS\OS; +use LibreNMS\OS\Traits\Bgp4V2Mib; +use LibreNMS\Util\Oid; +use LibreNMS\Util\RouteDistinguisher; +use SnmpQuery; + +class Arista extends OS implements BgpAddressFamilyDiscovery +{ + use Bgp4V2Mib; + + public function discoverBgpPeers(): Collection + { + return $this->discoverBgp4V2Peers('ARISTA-BGP4V2-MIB', 'aristaBgp4V2'); + } + + public function discoverBgpAddressFamilies(Collection $peers): Collection + { + return $this->discoverBgp4V2AddressFamilies($peers, 'ARISTA-BGP4V2-MIB', 'aristaBgp4V2'); + } + + public function discoverBgpLocalAs(): ?int + { + return $this->bgpLocalAsFallback(parent::discoverBgpLocalAs(), 'ARISTA-BGP4V2-MIB::aristaBgp4V2PeerLocalAs'); + } + + /** + * ARISTA-VRF-MIB is indexed by the length prefixed VRF name + */ + public function discoverVrfs(): Collection + { + $rds = SnmpQuery::hideMib()->numericIndex()->walk('ARISTA-VRF-MIB::aristaVrfRouteDistinguisher')->throwIfConnectionError()->pluck('aristaVrfRouteDistinguisher'); + + return collect($rds)->map(fn ($rd, $index) => new Vrf([ + 'vrf_oid' => (string) $index, + 'vrf_name' => Oid::stringFromOid((string) $index), + 'mplsVpnVrfRouteDistinguisher' => RouteDistinguisher::parse($rd), + 'mplsVpnVrfDescription' => '', + ]))->values(); + } + + public function discoverVrfPorts(Collection $vrfs): Collection + { + $vrfOids = $vrfs->pluck('vrf_oid', 'vrf_name'); + $members = array_map(fn ($name) => $vrfOids->get($name, ''), SnmpQuery::hideMib()->walk('ARISTA-VRF-MIB::aristaVrfIfMembership')->throwIfConnectionError()->pluck('aristaVrfIfMembership')); + + return $this->vrfMemberPorts($members, $vrfs); + } +} diff --git a/LibreNMS/OS/Shared/Cisco.php b/LibreNMS/OS/Shared/Cisco.php index abe6f868cb3..198447eb944 100644 --- a/LibreNMS/OS/Shared/Cisco.php +++ b/LibreNMS/OS/Shared/Cisco.php @@ -31,22 +31,27 @@ use App\Facades\LibrenmsConfig; use App\Facades\PortCache; +use App\Models\BgpPeer; +use App\Models\BgpPeerCbgp; use App\Models\Component; use App\Models\Device; use App\Models\EntPhysical; use App\Models\MacAccounting; use App\Models\Mempool; +use App\Models\PortsFdb; use App\Models\PortsNac; use App\Models\PortVlan; +use App\Models\Processor; use App\Models\Qos; use App\Models\Sla; use App\Models\Storage; use App\Models\Transceiver; use App\Models\Vlan; +use App\Models\Vrf; use Illuminate\Support\Arr; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; -use LibreNMS\Device\Processor; +use LibreNMS\Interfaces\Discovery\BgpAddressFamilyDiscovery; use LibreNMS\Interfaces\Discovery\MacAccountingDiscovery; use LibreNMS\Interfaces\Discovery\MempoolsDiscovery; use LibreNMS\Interfaces\Discovery\OSDiscovery; @@ -66,12 +71,15 @@ use LibreNMS\OS\Traits\CiscoCdpMib; use LibreNMS\OS\Traits\YamlOSDiscovery; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Util\Bgp; use LibreNMS\Util\IP; use LibreNMS\Util\Mac; +use LibreNMS\Util\Oid; use LibreNMS\Util\StringHelpers; use SnmpQuery; class Cisco extends OS implements + BgpAddressFamilyDiscovery, OSDiscovery, SlaDiscovery, StpInstanceDiscovery, @@ -184,15 +192,15 @@ public function discoverMempools() /** @var Collection $mempools */ $mempools = new Collection(); $cemp = snmpwalk_cache_multi_oid($this->getDeviceArray(), 'cempMemPoolTable', [], 'CISCO-ENHANCED-MEMPOOL-MIB'); + $entPhysicalName = SnmpQuery::cache()->walk('ENTITY-MIB::entPhysicalName')->pluck(); foreach (Arr::wrap($cemp) as $index => $entry) { if (is_numeric($entry['cempMemPoolUsed']) && $entry['cempMemPoolValid'] == 'true') { [$entPhysicalIndex] = explode('.', (string) $index); - $entPhysicalName = $this->getCacheByIndex('entPhysicalName', 'ENTITY-MIB'); $descr = ucwords((isset($entPhysicalName[$entPhysicalIndex]) ? "{$entPhysicalName[$entPhysicalIndex]} - " : '') . $entry['cempMemPoolName']); $descr = trim(str_replace(['Cisco ', 'Network Processing Engine'], '', $descr), ' -'); - $mempools->push((new Mempool([ + $mempools->push(new Mempool([ 'mempool_index' => $index, 'entPhysicalIndex' => $entPhysicalIndex, 'mempool_type' => 'cemp', @@ -204,7 +212,7 @@ public function discoverMempools() 'mempool_perc_warn' => 90, 'mempool_largestfree' => $entry['cempMemPoolHCLargestFree'] ?? $entry['cempMemPoolLargestFree'] ?? null, 'mempool_lowestfree' => $entry['cempMemPoolHCLowestFree'] ?? $entry['cempMemPoolLowestFree'] ?? null, - ]))->fillUsage($entry['cempMemPoolHCUsed'] ?? $entry['cempMemPoolUsed'], null, $entry['cempMemPoolHCFree'] ?? $entry['cempMemPoolFree'])); + ])->fillUsage($entry['cempMemPoolHCUsed'] ?? $entry['cempMemPoolUsed'], null, $entry['cempMemPoolHCFree'] ?? $entry['cempMemPoolFree'])); } } @@ -215,7 +223,7 @@ public function discoverMempools() $cmp = snmpwalk_cache_oid($this->getDeviceArray(), 'ciscoMemoryPool', [], 'CISCO-MEMORY-POOL-MIB'); foreach (Arr::wrap($cmp) as $index => $entry) { if (is_numeric($entry['ciscoMemoryPoolUsed']) && is_numeric($index)) { - $mempools->push((new Mempool([ + $mempools->push(new Mempool([ 'mempool_index' => $index, 'mempool_type' => 'cmp', 'mempool_class' => 'system', @@ -225,7 +233,7 @@ public function discoverMempools() 'mempool_free_oid' => ".1.3.6.1.4.1.9.9.48.1.1.1.6.$index", 'mempool_perc_warn' => 90, 'mempool_largestfree' => $entry['ciscoMemoryPoolLargestFree'] ?? null, - ]))->fillUsage($entry['ciscoMemoryPoolUsed'], null, $entry['ciscoMemoryPoolFree'])); + ])->fillUsage($entry['ciscoMemoryPoolUsed'], null, $entry['ciscoMemoryPoolFree'])); } } @@ -233,28 +241,26 @@ public function discoverMempools() return $mempools; } - $cpm = $this->getCacheTable('cpmCPUTotalTable', 'CISCO-PROCESS-MIB'); + $cpm = SnmpQuery::cache()->walk('CISCO-PROCESS-MIB::cpmCPUTotalTable')->table(1); - $count = 0; - foreach (Arr::wrap($cpm) as $index => $entry) { - $count++; - if (isset($entry['cpmCPUMemoryFree']) && is_numeric($entry['cpmCPUMemoryFree'])) { - $cpu = $this->getCacheByIndex('entPhysicalName', 'ENTITY-MIB')[$entry['cpmCPUTotalPhysicalIndex'] ?? 'none'] ?? "Processor $index"; + foreach ($cpm as $index => $entry) { + if (isset($entry['CISCO-PROCESS-MIB::cpmCPUMemoryFree']) && is_numeric($entry['CISCO-PROCESS-MIB::cpmCPUMemoryFree'])) { + $cpu = $entPhysicalName[$entry['CISCO-PROCESS-MIB::cpmCPUTotalPhysicalIndex'] ?? 'none'] ?? "Processor $index"; - $mempools->push((new Mempool([ + $mempools->push(new Mempool([ 'mempool_index' => $index, 'mempool_type' => 'cpm', 'mempool_class' => 'system', 'mempool_precision' => 1024, 'mempool_descr' => "$cpu Memory", - 'mempool_used_oid' => empty($entry['cpmCPUMemoryHCUsed']) ? ".1.3.6.1.4.1.9.9.109.1.1.1.1.12.$index" : ".1.3.6.1.4.1.9.9.109.1.1.1.1.17.$index", - 'mempool_free_oid' => empty($entry['cpmCPUMemoryHCFree']) ? ".1.3.6.1.4.1.9.9.109.1.1.1.1.13.$index" : ".1.3.6.1.4.1.9.9.109.1.1.1.1.19.$index", + 'mempool_used_oid' => empty($entry['CISCO-PROCESS-MIB::cpmCPUMemoryHCUsed']) ? ".1.3.6.1.4.1.9.9.109.1.1.1.1.12.$index" : ".1.3.6.1.4.1.9.9.109.1.1.1.1.17.$index", + 'mempool_free_oid' => empty($entry['CISCO-PROCESS-MIB::cpmCPUMemoryHCFree']) ? ".1.3.6.1.4.1.9.9.109.1.1.1.1.13.$index" : ".1.3.6.1.4.1.9.9.109.1.1.1.1.19.$index", 'mempool_perc_warn' => 90, - 'mempool_lowestfree' => $entry['cpmCPUMemoryHCLowest'] ?? $entry['cpmCPUMemoryLowest'] ?? null, - ]))->fillUsage( - empty($entry['cpmCPUMemoryHCUsed']) ? $entry['cpmCPUMemoryUsed'] : $entry['cpmCPUMemoryHCUsed'], + 'mempool_lowestfree' => $entry['CISCO-PROCESS-MIB::cpmCPUMemoryHCLowest'] ?? $entry['CISCO-PROCESS-MIB::cpmCPUMemoryLowest'] ?? null, + ])->fillUsage( + empty($entry['CISCO-PROCESS-MIB::cpmCPUMemoryHCUsed']) ? $entry['CISCO-PROCESS-MIB::cpmCPUMemoryUsed'] : $entry['CISCO-PROCESS-MIB::cpmCPUMemoryHCUsed'], null, - empty($entry['cpmCPUMemoryHCFree']) ? $entry['cpmCPUMemoryFree'] : $entry['cpmCPUMemoryHCFree'] + empty($entry['CISCO-PROCESS-MIB::cpmCPUMemoryHCFree']) ? $entry['CISCO-PROCESS-MIB::cpmCPUMemoryFree'] : $entry['CISCO-PROCESS-MIB::cpmCPUMemoryHCFree'] )); } } @@ -323,105 +329,109 @@ public function discoverEntityPhysical(): Collection /** * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered + * Returns a Collection of Processor models that have been discovered * - * @return array Processors + * @return Collection */ - public function discoverProcessors() + public function discoverProcessors(): Collection { - $processors_data = $this->getCacheTable('cpmCPUTotalTable', 'CISCO-PROCESS-MIB'); - $processors_data = snmpwalk_group($this->getDeviceArray(), 'cpmCoreTable', 'CISCO-PROCESS-MIB', 1, $processors_data); + $processors = $this->discoverYamlProcessors(); + if ($processors->isNotEmpty()) { + return $processors; + } + + $processors_data = SnmpQuery::cache()->walk('CISCO-PROCESS-MIB::cpmCPUTotalTable')->table(1); + $processors_data = SnmpQuery::walk('CISCO-PROCESS-MIB::cpmCoreTable')->table(1, $processors_data); $processors = []; foreach ($processors_data as $index => $entry) { - if (is_numeric($entry['cpmCPUTotal5minRev'])) { + $descr = null; + + if (is_numeric($entry['CISCO-PROCESS-MIB::cpmCPUTotal5minRev'] ?? null)) { $usage_oid = '.1.3.6.1.4.1.9.9.109.1.1.1.1.8.' . $index; - $usage = $entry['cpmCPUTotal5minRev']; - } elseif (is_numeric($entry['cpmCPUTotal5min'])) { + $usage = $entry['CISCO-PROCESS-MIB::cpmCPUTotal5minRev']; + } elseif (is_numeric($entry['CISCO-PROCESS-MIB::cpmCPUTotal5min'] ?? null)) { $usage_oid = '.1.3.6.1.4.1.9.9.109.1.1.1.1.5.' . $index; - $usage = $entry['cpmCPUTotal5min']; + $usage = $entry['CISCO-PROCESS-MIB::cpmCPUTotal5min']; } else { continue; // skip bad data } - if (isset($entry['cpmCPUTotalPhysicalIndex'])) { - $descr = $this->getCacheByIndex('entPhysicalName', 'ENTITY-MIB')[$entry['cpmCPUTotalPhysicalIndex']] ?? null; + if (isset($entry['CISCO-PROCESS-MIB::cpmCPUTotalPhysicalIndex'])) { + $descr = SnmpQuery::cache()->walk('ENTITY-MIB::entPhysicalName')->pluck()[$entry['CISCO-PROCESS-MIB::cpmCPUTotalPhysicalIndex']] ?? null; } if (empty($descr)) { $descr = "Processor $index"; } - if (isset($entry['cpmCore5min']) && is_array($entry['cpmCore5min'])) { + if (isset($entry['CISCO-PROCESS-MIB::cpmCore5min']) && is_array($entry['CISCO-PROCESS-MIB::cpmCore5min'])) { // This CPU has data per individual core - foreach ($entry['cpmCore5min'] as $core_index => $core_usage) { - $processors[] = Processor::discover( - 'cpm', - $this->getDeviceId(), - ".1.3.6.1.4.1.9.9.109.1.1.2.1.5.$index.$core_index", - "$index.$core_index", - "$descr: Core $core_index", - 1, - $core_usage, - null, - $entry['cpmCPUTotalPhysicalIndex'] - ); + foreach ($entry['CISCO-PROCESS-MIB::cpmCore5min'] as $core_index => $core_usage) { + $processors[] = new Processor([ + 'processor_type' => 'cpm', + 'processor_oid' => ".1.3.6.1.4.1.9.9.109.1.1.2.1.5.$index.$core_index", + 'processor_index' => "$index.$core_index", + 'processor_descr' => "$descr: Core $core_index", + 'processor_precision' => 1, + 'hrDeviceIndex' => null, + 'processor_perc_warn' => null, + 'processor_usage' => $core_usage, + ]); } } else { - $processors[] = Processor::discover( - 'cpm', - $this->getDeviceId(), - $usage_oid, - $index, - $descr, - 1, - $usage, - null, - $entry['cpmCPUTotalPhysicalIndex'] - ); + $processors[] = new Processor([ + 'processor_type' => 'cpm', + 'processor_oid' => $usage_oid, + 'processor_index' => $index, + 'processor_descr' => $descr, + 'processor_precision' => 1, + 'hrDeviceIndex' => null, + 'processor_perc_warn' => null, + 'processor_usage' => $usage, + ]); } } if (empty($processors)) { - // fallback to old pre-12.0 OID - $processors[] = Processor::discover( - 'ios', - $this->getDeviceId(), - '.1.3.6.1.4.1.9.2.1.58.0', // OLD-CISCO-CPU-MIB::avgBusy5 - 0 - ); + // fallback for pre-12.0 IOS and PIX without CISCO-PROCESS-MIB + $processors[] = new Processor([ + 'processor_type' => 'ios', + 'processor_oid' => '.1.3.6.1.4.1.9.2.1.58.0', // OLD-CISCO-CPU-MIB::avgBusy5 + 'processor_index' => 0, + 'processor_descr' => 'Processor', + 'processor_precision' => 1, + 'processor_usage' => SnmpQuery::numeric()->get('.1.3.6.1.4.1.9.2.1.58.0')->value(), + ]); } // QFP processors (Forwarding Processors) - $qfp_data = snmpwalk_group($this->getDeviceArray(), 'ceqfpUtilProcessingLoad', 'CISCO-ENTITY-QFP-MIB'); - - foreach ($qfp_data as $entQfpPhysicalIndex => $entry) { - /* - * .2 OID suffix is for 1 min SMA ('oneMinute') - * .3 OID suffix is for 5 min SMA ('fiveMinute') - * Could be dynamically changed to appropriate value if config had pol interval value - */ - $qfp_usage_oid = '.1.3.6.1.4.1.9.9.715.1.1.6.1.14.' . $entQfpPhysicalIndex . '.3'; - $qfp_usage = $entry['fiveMinute'] ?? null; - - if ($entQfpPhysicalIndex) { - $qfp_descr = $this->getCacheByIndex('entPhysicalName', 'ENTITY-MIB')[$entQfpPhysicalIndex]; + /* + * .2 OID suffix is for 1 min SMA ('oneMinute') + * .3 OID suffix is for 5 min SMA ('fiveMinute') + * Could be dynamically changed to appropriate value if config had pol interval value + */ + $qfp_data = SnmpQuery::numeric()->walk('CISCO-ENTITY-QFP-MIB::ceqfpUtilProcessingLoad')->values(); + + foreach ($qfp_data as $qfp_usage_oid => $qfp_usage) { + if (! str_ends_with($qfp_usage_oid, '.3') || ! is_numeric($qfp_usage)) { + continue; } - $processors[] = Processor::discover( - 'qfp', - $this->getDeviceId(), - $qfp_usage_oid, - $entQfpPhysicalIndex . '.3', - $qfp_descr ?? "QFP $entQfpPhysicalIndex", - 1, - $qfp_usage, - null, - $entQfpPhysicalIndex - ); + $entQfpPhysicalIndex = explode('.', substr($qfp_usage_oid, strlen('.1.3.6.1.4.1.9.9.715.1.1.6.1.14.')))[0]; + $qfp_descr = SnmpQuery::cache()->walk('ENTITY-MIB::entPhysicalName')->pluck()[$entQfpPhysicalIndex] ?? null; + + $processors[] = new Processor([ + 'processor_type' => 'qfp', + 'processor_oid' => $qfp_usage_oid, + 'processor_index' => $entQfpPhysicalIndex . '.3', + 'processor_descr' => $qfp_descr ?? "QFP $entQfpPhysicalIndex", + 'processor_precision' => 1, + 'processor_usage' => $qfp_usage, + ]); } - return $processors; + return collect($processors); } public function discoverSlas(): Collection @@ -504,14 +514,14 @@ public function discoverStorage(): Collection } $descr .= ':'; - return (new Storage([ + return new Storage([ 'type' => 'cisco-flash', 'storage_descr' => $descr, 'storage_index' => $index, 'storage_type' => 'FlashMemory', 'storage_free_oid' => $free_oid, 'storage_units' => 1, - ]))->fillUsage(total: $size, free: $free); + ])->fillUsage(total: $size, free: $free); }); } @@ -1013,6 +1023,39 @@ public function discoverVlans(): Collection ->filter(); // Remove null values from ignored VLANs } + /** + * Cisco devices report a separate BRIDGE-MIB per VLAN, each in its own SNMP context. + */ + public function discoverFdbTable(): Collection + { + $fdb = []; + $ignore_vlans = (array) LibrenmsConfig::getOsSetting($this->getName(), 'ignore_vlans'); + + foreach (SnmpQuery::walk('CISCO-VTP-MIB::vtpVlanState')->table(2) as $vtpVlans) { + foreach ($vtpVlans as $vlan => $data) { + // only operational VLANs, 1002-1005 are reserved for fddi and token ring + if (($data['CISCO-VTP-MIB::vtpVlanState'] ?? null) != 1 || ($vlan >= 1002 && $vlan <= 1005) || in_array($vlan, $ignore_vlans)) { + continue; + } + + $ifIndexes = $this->bridgePortIfIndexes((string) $vlan); + + foreach ($this->dot1dTpFdbPorts((string) $vlan) as $mac => $bridgePort) { + $port_id = PortCache::getIdFromIfIndex($ifIndexes[$bridgePort] ?? null, $this->getDeviceId()); + if ($port_id) { + $fdb[] = new PortsFdb([ + 'port_id' => $port_id, + 'mac_address' => Mac::parse((string) $mac)->hex(), + 'vlan' => $vlan, + ]); + } + } + } + } + + return empty($fdb) ? parent::discoverFdbTable() : new Collection($fdb); + } + public function discoverVlanPorts(Collection $vlans): Collection { $ports = parent::discoverVlanPorts($vlans); // Q-BRIDGE-MIB @@ -1109,6 +1152,134 @@ public function discoverVlanPorts(Collection $vlans): Collection return $ports; } + /** + * Routers without MPLS only report VRFs in CISCO-VRF-MIB. + * CISCO-CONTEXT-MAPPING-MIB maps SNMP contexts to VRFs. + */ + public function discoverVrfs(): Collection + { + $vrfs = parent::discoverVrfs(); + + if ($vrfs->isEmpty()) { + $vrfs = SnmpQuery::cache()->hideMib()->walk('CISCO-VRF-MIB::cvVrfName')->throwIfConnectionError()->mapTable(fn ($data, $cvVrfIndex) => new Vrf([ + 'vrf_oid' => (string) $cvVrfIndex, + 'vrf_name' => $data['cvVrfName'] ?? '', + 'mplsVpnVrfDescription' => '', + ]))->filter(fn (Vrf $vrf) => $vrf->vrf_name !== '' && ! str_contains($vrf->vrf_name, 'Platform_iVRF'))->values(); + } + + return $this->addVrfContexts($vrfs); + } + + /** + * C8xx routers report VRFs in MPLS-VPN-MIB, but their interfaces only in CISCO-VRF-MIB + */ + public function discoverVrfPorts(Collection $vrfs): Collection + { + $ports = parent::discoverVrfPorts($vrfs); + if ($ports->isNotEmpty() || $vrfs->isEmpty()) { + return $ports; + } + + $vrfOids = $vrfs->pluck('vrf_oid', 'vrf_name'); + $names = SnmpQuery::cache()->hideMib()->walk('CISCO-VRF-MIB::cvVrfName')->throwIfConnectionError()->pluck('cvVrfName'); + $members = []; + foreach (SnmpQuery::hideMib()->walk('CISCO-VRF-MIB::cvVrfInterfaceType')->throwIfConnectionError()->table(2) as $cvVrfIndex => $interfaces) { + foreach (array_keys($interfaces) as $ifIndex) { + $members[$ifIndex] = $vrfOids->get($names[$cvVrfIndex] ?? '', ''); + } + } + + return $this->vrfMemberPorts($members, $vrfs); + } + + /** + * @param Collection $vrfs + * @return Collection + */ + protected function addVrfContexts(Collection $vrfs): Collection + { + $mapping = SnmpQuery::hideMib()->numericIndex()->walk('CISCO-CONTEXT-MAPPING-MIB::cContextMappingVrfName')->throwIfConnectionError()->pluck('cContextMappingVrfName'); + + foreach ($mapping as $index => $vrfName) { + $vrfName = trim((string) $vrfName); + if ($vrfName === '' || Vrf::isDefaultName($vrfName)) { + continue; // bridge domain contexts, the default VRF is walked without a context + } + + $vrf = $vrfs->firstWhere('vrf_name', $vrfName) + ?? $vrfs->first(fn (Vrf $vrf) => strcasecmp((string) $vrf->vrf_name, $vrfName) == 0); + + if ($vrf === null) { + $vrf = new Vrf(['vrf_oid' => $vrfName, 'vrf_name' => $vrfName, 'mplsVpnVrfDescription' => '']); + $vrfs->push($vrf); + } + + $vrf->context_name ??= Oid::stringFromOid((string) $index); + } + + return $vrfs; + } + + /** + * CISCO-BGP4-MIB is read in each VRF context, BGP4-MIB when it has no sessions + * + * @return Collection + */ + public function discoverBgpPeers(): Collection + { + $peers = new Collection; + + foreach ($this->getDevice()->getVrfContexts() as $context) { + $vrfId = $this->getDevice()->vrfIdForContext($context); + $found = collect($this->walkBgpTable($context, 'CISCO-BGP4-MIB', [ + 'bgpPeerRemoteAs' => 'cbgpPeer2RemoteAs', + 'bgpPeerState' => 'cbgpPeer2State', + 'bgpPeerAdminStatus' => 'cbgpPeer2AdminStatus', + 'bgpLocalAddr' => 'cbgpPeer2LocalAddr', + 'bgpPeerLastError' => 'cbgpPeer2LastError', + 'bgpPeerLastErrorText' => 'cbgpPeer2LastErrorTxt', + 'bgpPeerFsmEstablishedTime' => 'cbgpPeer2FsmEstablishedTime', + 'bgpPeerInUpdateElapsedTime' => 'cbgpPeer2InUpdateElapsedTime', + 'bgpPeerInUpdates' => 'cbgpPeer2InUpdates', + 'bgpPeerOutUpdates' => 'cbgpPeer2OutUpdates', + 'bgpPeerInTotalMessages' => 'cbgpPeer2InTotalMessages', + 'bgpPeerOutTotalMessages' => 'cbgpPeer2OutTotalMessages', + ]))->map(function (array $row, int|string $index) use ($context, $vrfId): ?BgpPeer { + $parts = explode('.', (string) $index); + $address = Bgp::shiftInetAddress($parts, 0, $zone); + + return $this->makeBgpPeer($address, $zone, $context, $vrfId, $row); + })->filter(); + + $peers = $peers->merge($found->isNotEmpty() ? $found : $this->discoverBgp4MibPeers($context)); + } + + return $peers->values(); + } + + public function discoverBgpLocalAs(): ?int + { + return $this->bgpLocalAsFallback(parent::discoverBgpLocalAs(), 'CISCO-BGP4-MIB::cbgpPeer2LocalAs'); + } + + /** + * The cbgpPeer2 table includes IPv6 sessions, the older cbgpPeer table is read when it has no address families + * + * @return Collection + */ + public function discoverBgpAddressFamilies(Collection $peers): Collection + { + $families = new Collection; + + foreach ($peers->pluck('context_name')->unique() as $context) { + $found = $this->discoverCiscoBgpAddressFamilies($context, 'cbgpPeer2', true); + $families = $families->merge($found->isNotEmpty() ? $found : $this->discoverCiscoBgpAddressFamilies($context, 'cbgpPeer', false)); + } + + return $families->values(); + } + /** * @inheritDoc */ @@ -1184,4 +1355,44 @@ public function pollMacAccounting(Collection $macs): Collection return $macs; } + + /** + * Withdrawn prefixes are counted in the advertised total, they are subtracted from it + * + * @param bool $typedAddress indexed by InetAddressType and InetAddress, otherwise by IpAddress + * @return Collection + */ + private function discoverCiscoBgpAddressFamilies(string $context, string $table, bool $typedAddress): Collection + { + $rows = $this->walkBgpTable($context, 'CISCO-BGP4-MIB', [ + 'AcceptedPrefixes' => "{$table}AcceptedPrefixes", + 'DeniedPrefixes' => "{$table}DeniedPrefixes", + 'PrefixAdminLimit' => "{$table}PrefixAdminLimit", + 'PrefixThreshold' => "{$table}PrefixThreshold", + 'PrefixClearThreshold' => "{$table}PrefixClearThreshold", + 'AdvertisedPrefixes' => "{$table}AdvertisedPrefixes", + 'SuppressedPrefixes' => "{$table}SuppressedPrefixes", + 'WithdrawnPrefixes' => "{$table}WithdrawnPrefixes", + ]); + + $families = new Collection; + foreach ($rows as $index => $counters) { + $parts = explode('.', (string) $index); + $zone = null; + $address = $typedAddress ? Bgp::shiftInetAddress($parts, 2, $zone) : Bgp::shiftIp($parts, 2); + $family = count($parts) == 2 ? $this->makeBgpAddressFamily($address, $zone, $context, $parts[0], $parts[1], $counters) : null; + if ($family === null) { + continue; + } + + if (isset($family->WithdrawnPrefixes)) { + $family->AdvertisedPrefixes = max(0, (int) $family->AdvertisedPrefixes - $family->WithdrawnPrefixes); + $family->WithdrawnPrefixes = 0; + } + + $families->push($family); + } + + return $families; + } } diff --git a/LibreNMS/OS/Shared/Foundry.php b/LibreNMS/OS/Shared/Foundry.php index 72ab4acab6b..9b70af82498 100644 --- a/LibreNMS/OS/Shared/Foundry.php +++ b/LibreNMS/OS/Shared/Foundry.php @@ -26,21 +26,23 @@ namespace LibreNMS\OS\Shared; -use LibreNMS\Device\Processor; +use App\Models\Processor; +use Illuminate\Support\Collection; use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; use LibreNMS\OS; +use SnmpQuery; class Foundry extends OS implements ProcessorDiscovery { /** * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered + * Returns a Collection of Processor models that have been discovered * - * @return array Processors + * @return Collection */ - public function discoverProcessors() + public function discoverProcessors(): Collection { - $module_descriptions = $this->getCacheByIndex('snAgentConfigModuleDescription', 'FOUNDRY-SN-AGENT-MIB'); + $module_descriptions = SnmpQuery::walk('FOUNDRY-SN-AGENT-MIB::snAgentConfigModuleDescription')->pluck(); return \SnmpQuery::walk('FOUNDRY-SN-AGENT-MIB::snAgentCpuUtilTable')->mapTable(function ($entry, $slot, $cpu, $interval) use ($module_descriptions) { // only discover 5min @@ -55,29 +57,31 @@ public function discoverProcessors() $index = "$slot.$cpu.$interval"; if (is_numeric($entry['FOUNDRY-SN-AGENT-MIB::snAgentCpuUtil100thPercent'])) { - return Processor::discover( - $this->getName(), - $this->getDeviceId(), - '.1.3.6.1.4.1.1991.1.1.2.11.1.1.6.' . $index, - $index, - $descr, - 100, - $entry['FOUNDRY-SN-AGENT-MIB::snAgentCpuUtil100thPercent'] / 100 - ); + return new Processor([ + 'processor_type' => $this->getName(), + 'processor_oid' => '.1.3.6.1.4.1.1991.1.1.2.11.1.1.6.' . $index, + 'processor_index' => $index, + 'processor_descr' => $descr, + 'processor_precision' => 100, + 'hrDeviceIndex' => null, + 'processor_perc_warn' => null, + 'processor_usage' => $entry['FOUNDRY-SN-AGENT-MIB::snAgentCpuUtil100thPercent'], + ]); } elseif (is_numeric($entry['FOUNDRY-SN-AGENT-MIB::snAgentCpuUtilPercent'])) { - return Processor::discover( - $this->getName(), - $this->getDeviceId(), - '.1.3.6.1.4.1.1991.1.1.2.11.1.1.4.' . $index, - $index, - $descr, - 1, - $entry['FOUNDRY-SN-AGENT-MIB::snAgentCpuUtilPercent'] - ); + return new Processor([ + 'processor_type' => $this->getName(), + 'processor_oid' => '.1.3.6.1.4.1.1991.1.1.2.11.1.1.4.' . $index, + 'processor_index' => $index, + 'processor_descr' => $descr, + 'processor_precision' => 1, + 'hrDeviceIndex' => null, + 'processor_perc_warn' => null, + 'processor_usage' => $entry['FOUNDRY-SN-AGENT-MIB::snAgentCpuUtilPercent'], + ]); } } return null; - })->filter()->values()->all(); + })->filter()->values(); } } diff --git a/LibreNMS/OS/Smartax.php b/LibreNMS/OS/Smartax.php deleted file mode 100644 index 97ce6013c47..00000000000 --- a/LibreNMS/OS/Smartax.php +++ /dev/null @@ -1,71 +0,0 @@ -. - * - * @link https://www.librenms.org - * - * @copyright 2018 TheGreatDoc - * @author TheGreatDoc - */ - -namespace LibreNMS\OS; - -use LibreNMS\Device\Processor; -use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; -use LibreNMS\OS; - -class Smartax extends OS implements ProcessorDiscovery -{ - /** - * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered - * - * @return array Processors - */ - public function discoverProcessors() - { - $proc_oid = '1.3.6.1.4.1.2011.2.6.7.1.1.2.1.5.0'; - $descr_oid = '1.3.6.1.4.1.2011.2.6.7.1.1.2.1.7.0'; - - $data = snmpwalk_array_num($this->getDeviceArray(), $proc_oid); - $descr_data = snmpwalk_array_num($this->getDeviceArray(), $descr_oid); - - // remove first array - $data = reset($data); - $descr_data = reset($descr_data); - - $processors = []; - foreach ($data as $index => $value) { - if ($value != -1) { - $proc_desc = $descr_data[$index]; - $processors[] = Processor::discover( - 'smartax', - $this->getDeviceId(), - "$proc_oid.$index", - $index, - "$proc_desc processor", - 1, - $value - ); - } - } - - return $processors; - } -} diff --git a/LibreNMS/OS/Sonicwall.php b/LibreNMS/OS/Sonicwall.php index 912c830e8ff..dbc3d19f0e7 100644 --- a/LibreNMS/OS/Sonicwall.php +++ b/LibreNMS/OS/Sonicwall.php @@ -18,43 +18,56 @@ namespace LibreNMS\OS; +use App\Models\Processor; +use Illuminate\Support\Collection; use Illuminate\Support\Str; -use LibreNMS\Device\Processor; use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; use LibreNMS\OS; +use SnmpQuery; class Sonicwall extends OS implements ProcessorDiscovery { /** * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered + * Returns a Collection of Processor models that have been discovered * - * @return array Processors + * @return Collection */ - public function discoverProcessors() + public function discoverProcessors(): Collection { - if (Str::startsWith($this->getDeviceArray()['sysObjectID'], '.1.3.6.1.4.1.8741.1')) { - return [ - Processor::discover( - 'sonicwall', - $this->getDeviceId(), - '.1.3.6.1.4.1.8741.1.3.1.3.0', // SONICWALL-FIREWALL-IP-STATISTICS-MIB::sonicCurrentCPUUtil.0 - 0, - 'CPU', - 1 - ), - ]; + $processors = new Collection; + + if (Str::startsWith($this->getDevice()->sysObjectID, '.1.3.6.1.4.1.8741.1')) { + $usage = SnmpQuery::get('.1.3.6.1.4.1.8741.1.3.1.3.0')->value(); + if (is_numeric($usage)) { + $processors->push(new Processor([ + 'processor_type' => 'sonicwall', + 'processor_oid' => '.1.3.6.1.4.1.8741.1.3.1.3.0', + 'processor_index' => 0, + 'processor_descr' => 'CPU', + 'processor_precision' => 1, + 'hrDeviceIndex' => null, + 'processor_perc_warn' => null, + 'processor_usage' => $usage, + ])); + } } else { - return [ - Processor::discover( - 'sonicwall', - $this->getDeviceId(), - $this->getDeviceArray()['sysObjectID'] . '.2.1.3.0', // different OID for each model - 0, - 'CPU', - 1 - ), - ]; + $oid = $this->getDevice()->sysObjectID . '.2.1.3.0'; + $usage = SnmpQuery::get($oid)->value(); + if (is_numeric($usage)) { + $processors->push(new Processor([ + 'processor_type' => 'sonicwall', + 'processor_oid' => $oid, + 'processor_index' => 0, + 'processor_descr' => 'CPU', + 'processor_precision' => 1, + 'hrDeviceIndex' => null, + 'processor_perc_warn' => null, + 'processor_usage' => $usage, + ])); + } } + + return $processors; } } diff --git a/LibreNMS/OS/Tachyon.php b/LibreNMS/OS/Tachyon.php index 4c5a2840db5..98cceecdc85 100644 --- a/LibreNMS/OS/Tachyon.php +++ b/LibreNMS/OS/Tachyon.php @@ -32,6 +32,7 @@ use LibreNMS\Interfaces\Discovery\Sensors\WirelessRssiDiscovery; use LibreNMS\Interfaces\Discovery\Sensors\WirelessSnrDiscovery; use LibreNMS\OS; +use SnmpQuery; class Tachyon extends OS implements WirelessClientsDiscovery, @@ -71,10 +72,10 @@ public function discoverWirelessClients() public function discoverWirelessFrequency() { $sensors = []; - $data = $this->getCacheTable('TACHYON-MIB::wirelessRadioTable'); + $data = SnmpQuery::cache()->numericIndex()->walk('TACHYON-MIB::wirelessRadioTable')->valuesByIndex(); foreach ($data as $index => $entry) { - if (! empty($entry['wirelessRadioFrequency'])) { + if (! empty($entry['TACHYON-MIB::wirelessRadioFrequency'])) { $sensors[] = new WirelessSensor( WirelessSensorType::Frequency, $this->getDeviceId(), @@ -101,10 +102,10 @@ public function discoverWirelessFrequency() public function discoverWirelessPower() { $sensors = []; - $data = $this->getCacheTable('TACHYON-MIB::wirelessRadioTable'); + $data = SnmpQuery::cache()->numericIndex()->walk('TACHYON-MIB::wirelessRadioTable')->valuesByIndex(); foreach ($data as $index => $entry) { - if (! empty($entry['wirelessRadioTxPower'])) { + if (! empty($entry['TACHYON-MIB::wirelessRadioTxPower'])) { $sensors[] = new WirelessSensor( WirelessSensorType::Power, $this->getDeviceId(), @@ -131,11 +132,11 @@ public function discoverWirelessPower() public function discoverWirelessRssi() { $sensors = []; - $data = $this->getCacheTable('TACHYON-MIB::wirelessPeersTable'); + $data = SnmpQuery::cache()->numericIndex()->walk('TACHYON-MIB::wirelessPeersTable')->valuesByIndex(); foreach ($data as $index => $entry) { - if (! empty($entry['wirelessPeerRxPower'])) { - $mac = $entry['wirelessPeerMac']; + if (! empty($entry['TACHYON-MIB::wirelessPeerRxPower'])) { + $mac = $entry['TACHYON-MIB::wirelessPeerMac']; $sensors[] = new WirelessSensor( WirelessSensorType::Rssi, $this->getDeviceId(), @@ -162,11 +163,11 @@ public function discoverWirelessRssi() public function discoverWirelessRate() { $sensors = []; - $data = $this->getCacheTable('TACHYON-MIB::wirelessPeersTable'); + $data = SnmpQuery::cache()->numericIndex()->walk('TACHYON-MIB::wirelessPeersTable')->valuesByIndex(); foreach ($data as $index => $entry) { - if (! empty($entry['wirelessPeerTxRate'])) { - $mac = $entry['wirelessPeerMac']; + if (! empty($entry['TACHYON-MIB::wirelessPeerTxRate'])) { + $mac = $entry['TACHYON-MIB::wirelessPeerMac']; $sensors[] = new WirelessSensor( WirelessSensorType::Rate, $this->getDeviceId(), @@ -179,8 +180,8 @@ public function discoverWirelessRate() 1 ); } - if (! empty($entry['wirelessPeerRxRate'])) { - $mac = $entry['wirelessPeerMac']; + if (! empty($entry['TACHYON-MIB::wirelessPeerRxRate'])) { + $mac = $entry['TACHYON-MIB::wirelessPeerMac']; $sensors[] = new WirelessSensor( WirelessSensorType::Rate, $this->getDeviceId(), @@ -207,11 +208,11 @@ public function discoverWirelessRate() public function discoverWirelessDistance() { $sensors = []; - $data = $this->getCacheTable('TACHYON-MIB::wirelessPeersTable'); + $data = SnmpQuery::cache()->numericIndex()->walk('TACHYON-MIB::wirelessPeersTable')->valuesByIndex(); foreach ($data as $index => $entry) { - if (! empty($entry['wirelessPeerLinkDistance'])) { - $mac = $entry['wirelessPeerMac']; + if (! empty($entry['TACHYON-MIB::wirelessPeerLinkDistance'])) { + $mac = $entry['TACHYON-MIB::wirelessPeerMac']; $sensors[] = new WirelessSensor( WirelessSensorType::Distance, $this->getDeviceId(), @@ -238,11 +239,11 @@ public function discoverWirelessDistance() public function discoverWirelessSnr() { $sensors = []; - $data = $this->getCacheTable('TACHYON-MIB::wirelessPeersTable'); + $data = SnmpQuery::cache()->numericIndex()->walk('TACHYON-MIB::wirelessPeersTable')->valuesByIndex(); foreach ($data as $index => $entry) { - if (! empty($entry['wirelessPeerSnr'])) { - $mac = $entry['wirelessPeerMac']; + if (! empty($entry['TACHYON-MIB::wirelessPeerSnr'])) { + $mac = $entry['TACHYON-MIB::wirelessPeerMac']; $sensors[] = new WirelessSensor( WirelessSensorType::Snr, $this->getDeviceId(), diff --git a/LibreNMS/OS/Teldat.php b/LibreNMS/OS/Teldat.php index dac999a28bb..b9621204d56 100644 --- a/LibreNMS/OS/Teldat.php +++ b/LibreNMS/OS/Teldat.php @@ -36,6 +36,7 @@ use LibreNMS\Interfaces\Discovery\Sensors\WirelessRssiDiscovery; use LibreNMS\Interfaces\Discovery\Sensors\WirelessSinrDiscovery; use LibreNMS\OS; +use SnmpQuery; class Teldat extends OS implements WirelessCellDiscovery, @@ -70,11 +71,11 @@ public function discoverWirelessClients() $data = snmpwalk_cache_oid($this->getDeviceArray(), 'telProdNpMonInterfWlanBSSCurrent', [], 'TELDAT-MON-INTERF-WLAN-MIB'); if (! empty($data)) { - $ifNames = $this->getCacheByIndex('ifName', 'IF-MIB'); - $ifOperStatuses = $this->getCacheByIndex('ifOperStatus', 'IF-MIB'); + $ifNames = SnmpQuery::cache()->walk('IF-MIB::ifName')->pluck(); + $ifOperStatuses = SnmpQuery::cache()->enumStrings()->walk('IF-MIB::ifOperStatus')->pluck(); foreach ($data as $index => $entry) { - if (Str::startsWith($ifNames[$index], 'wlan') && $ifOperStatuses[$index] == 'up') { + if (Str::startsWith($ifNames[$index] ?? '', 'wlan') && ($ifOperStatuses[$index] ?? null) == 'up') { $sensors[] = new WirelessSensor( WirelessSensorType::Clients, $this->getDeviceId(), @@ -116,11 +117,11 @@ public function discoverWirelessRssi() $data = snmpwalk_cache_oid($this->getDeviceArray(), 'teldatCellularStateMobileSignalQuality', [], 'TELDAT-MON-INTERF-CELLULAR-MIB'); if (! empty($data)) { - $ifNames = $this->getCacheByIndex('ifName', 'IF-MIB'); - $ifOperStatuses = $this->getCacheByIndex('ifOperStatus', 'IF-MIB'); + $ifNames = SnmpQuery::cache()->walk('IF-MIB::ifName')->pluck(); + $ifOperStatuses = SnmpQuery::cache()->enumStrings()->walk('IF-MIB::ifOperStatus')->pluck(); foreach ($data as $index => $entry) { - if (Str::startsWith($ifNames[$index], 'cellular') && $ifOperStatuses[$index] == 'up') { + if (Str::startsWith($ifNames[$index] ?? '', 'cellular') && ($ifOperStatuses[$index] ?? null) == 'up') { $sensors[] = new WirelessSensor( WirelessSensorType::Rssi, $this->getDeviceId(), @@ -152,11 +153,11 @@ public function discoverWirelessSinr() $data = snmpwalk_cache_oid($this->getDeviceArray(), 'teldatCellularStateMobileRxSINR', [], 'TELDAT-MON-INTERF-CELLULAR-MIB'); if (! empty($data)) { - $ifNames = $this->getCacheByIndex('ifName', 'IF-MIB'); - $ifOperStatuses = $this->getCacheByIndex('ifOperStatus', 'IF-MIB'); + $ifNames = SnmpQuery::cache()->walk('IF-MIB::ifName')->pluck(); + $ifOperStatuses = SnmpQuery::cache()->enumStrings()->walk('IF-MIB::ifOperStatus')->pluck(); foreach ($data as $index => $entry) { - if (Str::startsWith($ifNames[$index], 'cellular') && $ifOperStatuses[$index] == 'up') { + if (Str::startsWith($ifNames[$index] ?? '', 'cellular') && ($ifOperStatuses[$index] ?? null) == 'up') { $sensors[] = new WirelessSensor( WirelessSensorType::Sinr, $this->getDeviceId(), @@ -188,11 +189,11 @@ public function discoverWirelessRsrq() $data = snmpwalk_cache_oid($this->getDeviceArray(), 'teldatCellularStateMobileRxRSRQ', [], 'TELDAT-MON-INTERF-CELLULAR-MIB'); if (! empty($data)) { - $ifNames = $this->getCacheByIndex('ifName', 'IF-MIB'); - $ifOperStatuses = $this->getCacheByIndex('ifOperStatus', 'IF-MIB'); + $ifNames = SnmpQuery::cache()->walk('IF-MIB::ifName')->pluck(); + $ifOperStatuses = SnmpQuery::cache()->enumStrings()->walk('IF-MIB::ifOperStatus')->pluck(); foreach ($data as $index => $entry) { - if (Str::startsWith($ifNames[$index], 'cellular') && $ifOperStatuses[$index] == 'up') { + if (Str::startsWith($ifNames[$index] ?? '', 'cellular') && ($ifOperStatuses[$index] ?? null) == 'up') { $sensors[] = new WirelessSensor( WirelessSensorType::Rsrq, $this->getDeviceId(), @@ -224,11 +225,11 @@ public function discoverWirelessRsrp() $data = snmpwalk_cache_oid($this->getDeviceArray(), 'teldatCellularStateMobileRxRSRP', [], 'TELDAT-MON-INTERF-CELLULAR-MIB'); if (! empty($data)) { - $ifNames = $this->getCacheByIndex('ifName', 'IF-MIB'); - $ifOperStatuses = $this->getCacheByIndex('ifOperStatus', 'IF-MIB'); + $ifNames = SnmpQuery::cache()->walk('IF-MIB::ifName')->pluck(); + $ifOperStatuses = SnmpQuery::cache()->enumStrings()->walk('IF-MIB::ifOperStatus')->pluck(); foreach ($data as $index => $entry) { - if (Str::startsWith($ifNames[$index], 'cellular') && $ifOperStatuses[$index] == 'up') { + if (Str::startsWith($ifNames[$index] ?? '', 'cellular') && ($ifOperStatuses[$index] ?? null) == 'up') { $sensors[] = new WirelessSensor( WirelessSensorType::Rsrp, $this->getDeviceId(), @@ -263,11 +264,11 @@ public function discoverWirelessCell() $data = snmpwalk_cache_oid($this->getDeviceArray(), 'teldatCellularStateMobileCellId', [], 'TELDAT-MON-INTERF-CELLULAR-MIB'); if (! empty($data)) { - $ifNames = $this->getCacheByIndex('ifName', 'IF-MIB'); - $ifOperStatuses = $this->getCacheByIndex('ifOperStatus', 'IF-MIB'); + $ifNames = SnmpQuery::cache()->walk('IF-MIB::ifName')->pluck(); + $ifOperStatuses = SnmpQuery::cache()->enumStrings()->walk('IF-MIB::ifOperStatus')->pluck(); foreach ($data as $index => $entry) { - if (Str::startsWith($ifNames[$index], 'cellular') && $ifOperStatuses[$index] == 'up') { + if (Str::startsWith($ifNames[$index] ?? '', 'cellular') && ($ifOperStatuses[$index] ?? null) == 'up') { $sensors[] = new WirelessSensor( WirelessSensorType::Cell, $this->getDeviceId(), @@ -285,14 +286,14 @@ public function discoverWirelessCell() if (! empty($data)) { if (empty($ifNames)) { - $ifNames = $this->getCacheByIndex('ifName', 'IF-MIB'); + $ifNames = SnmpQuery::cache()->walk('IF-MIB::ifName')->pluck(); } if (empty($ifOperStatuses)) { - $ifOperStatuses = $this->getCacheByIndex('ifOperStatus', 'IF-MIB'); + $ifOperStatuses = SnmpQuery::cache()->enumStrings()->walk('IF-MIB::ifOperStatus')->pluck(); } foreach ($data as $index => $entry) { - if (Str::startsWith($ifNames[$index], 'cellular') && $ifOperStatuses[$index] == 'up') { + if (Str::startsWith($ifNames[$index] ?? '', 'cellular') && ($ifOperStatuses[$index] ?? null) == 'up') { $sensors[] = new WirelessSensor( WirelessSensorType::Cell, $this->getDeviceId(), diff --git a/LibreNMS/OS/Timos.php b/LibreNMS/OS/Timos.php index 79496d6696f..f0cbb54f9a3 100644 --- a/LibreNMS/OS/Timos.php +++ b/LibreNMS/OS/Timos.php @@ -29,6 +29,8 @@ namespace LibreNMS\OS; use App\Facades\PortCache; +use App\Models\BgpPeer; +use App\Models\BgpPeerCbgp; use App\Models\Device; use App\Models\EntPhysical; use App\Models\MplsLsp; @@ -39,15 +41,19 @@ use App\Models\MplsService; use App\Models\MplsTunnelArHop; use App\Models\MplsTunnelCHop; +use App\Models\PortsFdb; use App\Models\PortVlan; use App\Models\Transceiver; use App\Models\Vlan; +use App\Models\Vrf; use Illuminate\Support\Collection; +use Illuminate\Support\Facades\Log; use LibreNMS\Device\WirelessSensor; use LibreNMS\Discovery\Neighbors\Neighbor; use LibreNMS\Discovery\Neighbors\NeighborParser; use LibreNMS\Enum\WirelessSensorType; use LibreNMS\Exceptions\InvalidIpException; +use LibreNMS\Interfaces\Discovery\BgpAddressFamilyDiscovery; use LibreNMS\Interfaces\Discovery\MplsDiscovery; use LibreNMS\Interfaces\Discovery\Sensors\WirelessChannelDiscovery; use LibreNMS\Interfaces\Discovery\Sensors\WirelessPowerDiscovery; @@ -60,10 +66,13 @@ use LibreNMS\Interfaces\Polling\MplsPolling; use LibreNMS\OS; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Util\Bgp; use LibreNMS\Util\IP; +use LibreNMS\Util\Mac; +use LibreNMS\Util\RouteDistinguisher; use SnmpQuery; -class Timos extends OS implements MplsDiscovery, MplsPolling, TransceiverDiscovery, VlanDiscovery, WirelessPowerDiscovery, WirelessSnrDiscovery, WirelessRsrqDiscovery, WirelessRssiDiscovery, WirelessRsrpDiscovery, WirelessChannelDiscovery +class Timos extends OS implements BgpAddressFamilyDiscovery, MplsDiscovery, MplsPolling, TransceiverDiscovery, VlanDiscovery, WirelessPowerDiscovery, WirelessSnrDiscovery, WirelessRsrqDiscovery, WirelessRssiDiscovery, WirelessRsrpDiscovery, WirelessChannelDiscovery { public function discoverOS(Device $device): void { @@ -1247,4 +1256,153 @@ protected function discoverLldpNeighbors(): Collection return NeighborParser::fromLldpRemEntry($lldpEntry, PortCache::getIdFromIfIndex($ifIndex, $this->getDeviceId())); })->filter()->values(); } + + /** + * Virtual routers (Base, VPRN and IES services) are indexed by vRtrID + */ + public function discoverVrfs(): Collection + { + return SnmpQuery::hideMib()->walk([ + 'TIMETRA-VRTR-MIB::vRtrName', + 'TIMETRA-VRTR-MIB::vRtrDescription', + 'TIMETRA-VRTR-MIB::vRtrAS4Byte', + 'TIMETRA-VRTR-MIB::vRtrRouteDistinguisher', + ])->throwIfConnectionError()->mapTable(fn ($data, $vRtrID) => new Vrf([ + 'vrf_oid' => (string) $vRtrID, + 'vrf_name' => $data['vRtrName'] ?? '', + 'bgpLocalAs' => ($data['vRtrAS4Byte'] ?? 0) ?: null, + 'mplsVpnVrfRouteDistinguisher' => RouteDistinguisher::parse($data['vRtrRouteDistinguisher'] ?? null), + 'mplsVpnVrfDescription' => $data['vRtrDescription'] ?? '', + ]))->filter(fn (Vrf $vrf) => $vrf->vrf_name !== '')->values(); + } + + /** + * vRtrIfIndex is only unique within a virtual router and IF-MIB only contains + * the Base router (vRtrID 1) interfaces, so other virtual routers can't be mapped to ports + */ + public function discoverVrfPorts(Collection $vrfs): Collection + { + $interfaces = SnmpQuery::hideMib()->walk('TIMETRA-VRTR-MIB::vRtrIfName.1')->throwIfConnectionError()->table(2); + $members = array_fill_keys(array_keys($interfaces[1] ?? []), 1); + + return $this->vrfMemberPorts($members, $vrfs); + } + + /** + * Sessions of every virtual router are listed in the default context, indexed by vRtrID + * + * @return Collection + */ + public function discoverBgpPeers(): Collection + { + $peers = collect($this->walkBgpTable('', 'TIMETRA-BGP-MIB', [ + 'bgpPeerRemoteAs' => 'tBgpPeerNgPeerAS4Byte', + 'bgpPeerState' => 'tBgpPeerNgConnState', + 'bgpPeerAdminStatus' => 'tBgpPeerNgShutdown', + 'bgpLocalAddr' => 'tBgpPeerNgLocalAddress', + 'bgpPeerDescr' => 'tBgpPeerNgDescription', + 'bgpPeerLastError' => 'tBgpPeerNgOperLastError', + 'bgpPeerFsmEstablishedTime' => 'tBgpPeerFsmEstablishedTime', + 'bgpPeerInUpdates' => 'tBgpPeerNgOperInUpdates', + 'bgpPeerOutUpdates' => 'tBgpPeerNgOperOutUpdates', + 'bgpPeerInTotalMessages' => 'tBgpPeerNgOperInTotalMessages', + 'bgpPeerOutTotalMessages' => 'tBgpPeerNgOperOutTotalMessages', + ]))->map(function (array $row, int|string $index): ?BgpPeer { + $parts = explode('.', (string) $index); + $vrfId = $this->bgpVrfId(array_shift($parts)); + if (isset($row['bgpPeerAdminStatus'])) { + $row['bgpPeerAdminStatus'] = in_array($row['bgpPeerAdminStatus'], ['1', 'true']) ? 'stop' : 'start'; + } + + return $this->makeBgpPeer(Bgp::shiftInetAddress($parts), null, '', $vrfId, $row); + })->filter()->values(); + + return $peers->isNotEmpty() ? $peers : $this->discoverBgp4MibPeers(''); + } + + public function discoverBgpLocalAs(): ?int + { + return $this->bgpLocalAsFallback(parent::discoverBgpLocalAs(), 'TIMETRA-BGP-MIB::tBgpPeerNgLocalAS4Byte'); + } + + /** + * Unicast prefix counts of IPv4 and IPv6 sessions are separate columns of the session table + * + * @return Collection + */ + public function discoverBgpAddressFamilies(Collection $peers): Collection + { + $families = new Collection; + + foreach (['ipv4' => '', 'ipv6' => 'V6'] as $afi => $column) { + $rows = $this->walkBgpTable('', 'TIMETRA-BGP-MIB', [ + 'AcceptedPrefixes' => "tBgpPeerNgOper{$column}ReceivedPrefixes", + 'AdvertisedPrefixes' => "tBgpPeerNgOper{$column}SentPrefixes", + ]); + + foreach ($rows as $index => $counters) { + $parts = explode('.', (string) $index); + array_shift($parts); // vRtrID + $address = Bgp::shiftInetAddress($parts); + if ($address?->getFamily() == $afi) { + $families->push($this->makeBgpAddressFamily($address, null, '', $afi, 'unicast', $counters)); + } + } + } + + return $families->filter()->values(); + } + + /** + * TIMETRA-SERV-MIB::tlsFdbInfoTable is indexed by svcId and tlsFdbMacAddr. + * Only entries where tlsFdbLocale is sap(1) are used, as these are the local learned MACs. + * Other locales: sdp(2), cpm(3), endpoint(4), vxlan(5), evpnMpls(6), blackhole(7) + * + * tlsFdbPortId is a TmnxPortID, which equals ifIndex for physical ports. + * tlsFdbEncapValue is a TmnxEncapVal, see decodeEncapValue(). + * Nokia SAP identifier format: ServiceID:PortId:EncapValue (e.g., 100:1/1/1:500) + */ + public function discoverFdbTable(): Collection + { + // Walk only the required FDB columns for best performance + // Testing showed: 5 columns = 388s, 3 columns = 144s, full table entry = 10+ min + // The selective approach is fastest because tlsFdbInfoEntry has 25+ columns we don't need + $fdb = SnmpQuery::walk([ + 'TIMETRA-SERV-MIB::tlsFdbLocale', + 'TIMETRA-SERV-MIB::tlsFdbPortId', + 'TIMETRA-SERV-MIB::tlsFdbEncapValue', + ])->mapTable(function ($data, $svcId, $mac) { + if (($data['TIMETRA-SERV-MIB::tlsFdbLocale'] ?? null) != 1) { + return null; + } + + $tmnxPortId = $data['TIMETRA-SERV-MIB::tlsFdbPortId'] ?? 0; + $port_id = PortCache::getIdFromIfIndex($tmnxPortId, $this->getDeviceId()); + if (! $port_id) { + Log::debug("Could not find port for TmnxPortID $tmnxPortId (MAC: $mac, service: $svcId)"); + + return null; + } + + $encapValue = $data['TIMETRA-SERV-MIB::tlsFdbEncapValue'] ?? 0; + $vlan = self::decodeEncapValue($encapValue)['outer']; // Use outer VLAN for FDB lookup + + // Skip if no valid VLAN (null encap or wildcard) + if ($vlan == 0 || $vlan == 4095) { + Log::debug("Skipping MAC $mac - no valid VLAN (encap: $encapValue, decoded: $vlan)"); + + return null; + } + + Log::debug("SAP $svcId:$tmnxPortId:" . self::formatEncapValue($encapValue) . " mac $mac vlan $vlan port $port_id"); + + return new PortsFdb([ + 'port_id' => $port_id, + 'mac_address' => Mac::parse($mac)->hex(), + 'vlan' => $vlan, + ]); + })->filter(); + + return $fdb->isNotEmpty() ? $fdb : parent::discoverFdbTable(); + } } diff --git a/LibreNMS/OS/Traits/AlcatelMacAddressMib.php b/LibreNMS/OS/Traits/AlcatelMacAddressMib.php new file mode 100644 index 00000000000..d364fd7c7ec --- /dev/null +++ b/LibreNMS/OS/Traits/AlcatelMacAddressMib.php @@ -0,0 +1,96 @@ +. + * + * @link https://www.librenms.org + * + * @copyright LibreNMS contributors + * @author Tony Murray + * @author JoseUPV + * @author Paul Iercosan + */ + +namespace LibreNMS\OS\Traits; + +use App\Facades\PortCache; +use App\Models\PortsFdb; +use Illuminate\Support\Collection; +use Illuminate\Support\Facades\Log; +use LibreNMS\Util\Mac; +use SnmpQuery; + +trait AlcatelMacAddressMib +{ + /** @var array|null */ + private ?array $alcatelLagPorts = null; + + /** + * slMacAddressDisposition is indexed by ifIndex, VLAN number and MAC address. + * This object only exists in the aos6 copy of the MIB and aos7 falls back to it. + * + * @return Collection + */ + private function alcatelDispositionFdb(): Collection + { + return SnmpQuery::mibDir('nokia/aos6')->walk('ALCATEL-IND1-MAC-ADDRESS-MIB::slMacAddressDisposition') + ->mapTable(fn ($data, $ifIndex, $vlan, $mac) => $this->alcatelFdbEntry($vlan, $mac, (int) $ifIndex)) + ->filter(); + } + + /** + * @param array $bridgePorts ifIndex keyed by bridge port, when $port is a bridge port. + * These overlap with ifIndexes (slot 9 port 1 is bridge port 1025) + */ + private function alcatelFdbEntry(int|string $vlan, string $mac, int $port, array $bridgePorts = []): ?PortsFdb + { + // Map physical LAG members using data discovered by the ports-stack module. + // Only rows whose parent is a LAG interface are used, other stacked interfaces are not remapped. + $this->alcatelLagPorts ??= $this->getDevice()->portsStack() + ->join('ports', 'ports.port_id', '=', 'ports_stack.low_port_id') + ->where('ports.ifType', 'ieee8023adLag') + ->where('ifStackStatus', 'active') + ->where('high_ifIndex', '>', 0) + ->where('low_ifIndex', '>', 0) + ->pluck('low_ifIndex', 'high_ifIndex') + ->all(); + + $ifIndex = (int) ($bridgePorts[$port] ?? 0); + $port_id = $ifIndex ? PortCache::getIdFromIfIndex($this->alcatelLagPorts[$ifIndex] ?? $ifIndex, $this->getDeviceId()) : null; + + // AOS may report an ifIndex directly instead of a bridge port. + // Aggregate bridge ports start at 4098 and map to 40000001, etc. + $port_id ??= PortCache::getIdFromIfIndex(match (true) { + $port >= 40000000 => $port, + $port >= 4098 && $port < 5000 => 40000000 + ($port - 4097), + default => $this->alcatelLagPorts[$port] ?? $port, + }, $this->getDeviceId()); + + if (! $port_id) { + Log::debug("No port mapping for port $port"); + + return null; + } + + return new PortsFdb([ + 'port_id' => $port_id, + 'mac_address' => Mac::parse($mac)->hex(), + 'vlan' => (int) $vlan ?: null, + ]); + } +} diff --git a/LibreNMS/OS/Traits/Bgp4Mib.php b/LibreNMS/OS/Traits/Bgp4Mib.php new file mode 100644 index 00000000000..75d2f091ae4 --- /dev/null +++ b/LibreNMS/OS/Traits/Bgp4Mib.php @@ -0,0 +1,262 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace LibreNMS\OS\Traits; + +use App\Facades\PortCache; +use App\Models\BgpPeer; +use App\Models\BgpPeerCbgp; +use Illuminate\Support\Collection; +use LibreNMS\Util\Bgp; +use LibreNMS\Util\IP; +use SnmpQuery; + +trait Bgp4Mib +{ + /** BgpPeer column to BGP4-MIB column */ + private const BGP4_MIB_COLUMNS = [ + 'bgpPeerRemoteAs' => 'bgpPeerRemoteAs', + 'bgpPeerState' => 'bgpPeerState', + 'bgpPeerAdminStatus' => 'bgpPeerAdminStatus', + 'bgpLocalAddr' => 'bgpPeerLocalAddr', + 'bgpPeerLastError' => 'bgpPeerLastError', + 'bgpPeerInUpdates' => 'bgpPeerInUpdates', + 'bgpPeerOutUpdates' => 'bgpPeerOutUpdates', + 'bgpPeerInTotalMessages' => 'bgpPeerInTotalMessages', + 'bgpPeerOutTotalMessages' => 'bgpPeerOutTotalMessages', + 'bgpPeerFsmEstablishedTime' => 'bgpPeerFsmEstablishedTime', + 'bgpPeerInUpdateElapsedTime' => 'bgpPeerInUpdateElapsedTime', + ]; + + /** BgpPeer columns that hold integers */ + private const BGP_INTEGER_COLUMNS = ['bgpPeerRemoteAs', 'bgpPeerLastErrorCode', 'bgpPeerLastErrorSubCode', 'bgpPeerFsmEstablishedTime', 'bgpPeerInUpdateElapsedTime']; + + /** BgpPeer columns that hold 32 bit counters */ + private const BGP_COUNTER_COLUMNS = ['bgpPeerInUpdates', 'bgpPeerOutUpdates', 'bgpPeerInTotalMessages', 'bgpPeerOutTotalMessages']; + + /** + * BGP4-MIB has no VRF index, so it is read in each VRF context + * + * @return Collection + */ + public function discoverBgpPeers(): Collection + { + return collect($this->getDevice()->getVrfContexts())->flatMap(fn (string $context) => $this->discoverBgp4MibPeers($context))->values(); + } + + /** + * BGP4-MIB only holds a 2-byte AS, OS implementations may read their own tables when it is AS_TRANS + */ + public function discoverBgpLocalAs(): ?int + { + return Bgp::localAs([SnmpQuery::get('BGP4-MIB::bgpLocalAs.0')->value()]); + } + + /** + * @return Collection + */ + protected function discoverBgp4MibPeers(string $context): Collection + { + $vrfId = $this->getDevice()->vrfIdForContext($context); + + return collect($this->walkBgpTable($context, 'BGP4-MIB', self::BGP4_MIB_COLUMNS))->map(function (array $columns, int|string $index) use ($context, $vrfId): ?BgpPeer { + $parts = explode('.', (string) $index); + + return $this->makeBgpPeer($this->bgp4MibPeerAddress($parts), null, $context, $vrfId, $columns); + })->filter()->values(); + } + + /** + * The peer address of a bgpPeerTable index + * + * @param string[] $parts + */ + protected function bgp4MibPeerAddress(array $parts): ?IP + { + return Bgp::shiftIp($parts); + } + + /** + * The first usable AS of a vendor table, when the local AS is not known or AS_TRANS + */ + protected function bgpLocalAsFallback(?int $localAs, string $oid): ?int + { + if ($localAs !== null && $localAs != Bgp::AS_TRANS) { + return $localAs; + } + + return Bgp::localAs([...array_values(SnmpQuery::walk($oid)->values()), $localAs]); + } + + /** + * Walk the columns of a table, rows are keyed by numeric index and hold the values by model column. + * The first column is walked alone, so devices without the table only cost a single walk. + * + * @param array $columns model column to table column + * @return array> + */ + protected function walkBgpTable(string $context, string $mib, array $columns): array + { + $oids = array_map(fn (string $column) => "$mib::$column", array_values(array_unique($columns))); + $first = SnmpQuery::context($context)->hideMib()->enumStrings()->numericIndex()->walk(array_shift($oids))->throwIfConnectionError(); + if (! $first->isValid()) { + return []; + } + + $values = $first->valuesByIndex(); + if (! empty($oids)) { + SnmpQuery::context($context)->hideMib()->enumStrings()->numericIndex()->walk($oids)->valuesByIndex($values); + } + + $rows = []; + foreach ($values as $index => $row) { + foreach ($columns as $modelColumn => $column) { + if (isset($row[$column]) && $row[$column] !== '') { + $rows[$index][$modelColumn] = $row[$column]; + } + } + } + + return $rows; + } + + /** + * Build a session from snmp values. Sessions are identified by address, or by interface when + * the address is only unique on its link or the session is unnumbered. + * Null when the session has no remote AS, or no usable address or interface. + * + * @param int|string|null $iface ifIndex or ifName + * @param array $columns snmp values by BgpPeer column, bgpPeerLastError is split into code and subcode + */ + protected function makeBgpPeer(?IP $address, int|string|null $iface, string $context, ?int $vrfId, array $columns): ?BgpPeer + { + $iface = $iface == '0' ? null : $iface; // 0 is never a valid ifIndex + $identifier = $this->bgpPeerIdentifier($address, $iface); + if ($identifier === null) { + return null; + } + + if (isset($columns['bgpPeerLastError'])) { + $columns += Bgp::lastError($columns['bgpPeerLastError']); + } + unset($columns['bgpPeerLastError']); + + foreach ($columns as $column => $value) { + $columns[$column] = match (true) { + $column == 'bgpPeerState' => Bgp::state($value), + $column == 'bgpLocalAddr' => IP::fromHexString($value, true)?->uncompressed(), + in_array($column, self::BGP_INTEGER_COLUMNS) => Bgp::integer($value), + in_array($column, self::BGP_COUNTER_COLUMNS) => Bgp::counter($value), + default => $value, + }; + } + + $peer = new BgpPeer(array_filter($columns, fn ($value) => $value !== null)); + if ($peer->bgpPeerRemoteAs === null) { + return null; + } + + $peer->bgpPeerIdentifier = $identifier; + $peer->bgpPeerRemoteAddr = $address?->uncompressed() ?? ''; + $peer->context_name = $context; + $peer->vrf_id = $vrfId; + $peer->bgpPeerIface = $this->bgpPeerIfIndex($iface, $peer); + + return $peer; + } + + /** + * @param int|string|null $iface ifIndex or ifName + * @param array $counters snmp values by BgpPeerCbgp column + */ + protected function makeBgpAddressFamily(?IP $address, int|string|null $iface, string $context, int|string $afi, int|string $safi, array $counters): ?BgpPeerCbgp + { + $identifier = $this->bgpPeerIdentifier($address, $iface == '0' ? null : $iface); + if ($identifier === null) { + return null; + } + + $family = new BgpPeerCbgp(array_filter(array_map(Bgp::counter(...), $counters), fn ($value) => $value !== null)); + $family->bgpPeerIdentifier = $identifier; + $family->context_name = $context; + $family->afi = Bgp::afi($afi); + $family->safi = Bgp::safi($safi); + + return $family; + } + + /** + * The VRF of tables that report every VRF from the default context + */ + protected function bgpVrfId(int|string|null $vrfOid = null, ?string $vrfName = null): ?int + { + if ($vrfName !== null) { + return $this->getDevice()->vrfs->firstWhere('vrf_name', $vrfName)?->vrf_id; + } + + return $vrfOid === null ? null : $this->getDevice()->vrfs->firstWhere('vrf_oid', (string) $vrfOid)?->vrf_id; + } + + /** + * @param int|string|null $iface ifIndex or ifName + */ + private function bgpPeerIdentifier(?IP $address, int|string|null $iface): ?string + { + if ($iface !== null && ($address === null || $address->isLinkLocal())) { + return is_numeric($iface) ? PortCache::getNameFromIfIndex((int) $iface, $this->getDevice()) ?? (string) $iface : (string) $iface; + } + + $identifier = $address?->compressed(); + + return in_array($identifier, [null, '0.0.0.0', '::']) ? null : $identifier; + } + + /** + * Tables may report the interface as ifIndex or ifName, otherwise find it by the session's local address + * + * @param int|string|null $iface ifIndex or ifName + */ + private function bgpPeerIfIndex(int|string|null $iface, BgpPeer $peer): ?int + { + if (is_numeric($iface)) { + return (int) $iface; + } + + $ifIndex = $iface ? PortCache::getByIfName($iface, $this->getDevice())?->ifIndex : null; + if ($ifIndex !== null) { + return $ifIndex; + } + + $ip = IP::parse((string) $peer->bgpLocalAddr, true); + if ($ip === null || in_array($ip->compressed(), ['0.0.0.0', '::'])) { + return null; + } + + $portId = PortCache::getIdFromIp($ip, $peer->context_name, $this->getDevice()); + + return $portId ? PortCache::get($portId)?->ifIndex : null; + } +} diff --git a/LibreNMS/OS/Traits/Bgp4V2Mib.php b/LibreNMS/OS/Traits/Bgp4V2Mib.php new file mode 100644 index 00000000000..5dbda15fe40 --- /dev/null +++ b/LibreNMS/OS/Traits/Bgp4V2Mib.php @@ -0,0 +1,116 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace LibreNMS\OS\Traits; + +use App\Models\BgpPeer; +use App\Models\BgpPeerCbgp; +use Illuminate\Support\Collection; +use LibreNMS\Util\Bgp; + +trait Bgp4V2Mib +{ + /** + * Sessions are indexed by instance and remote address. Some vendors use the VRF as instance, + * otherwise the table is read in each VRF context. BGP4-MIB is read when the table has no sessions. + * + * @param string $prefix table name prefix, for example aristaBgp4V2 + * @param bool $instanceIsVrf the instance is the vrf_oid of the VRF + * @param bool $counters the MIB has the message counters + * @return Collection + */ + protected function discoverBgp4V2Peers(string $mib, string $prefix, bool $instanceIsVrf = false, bool $counters = true): Collection + { + $columns = [ + 'bgpPeerRemoteAs' => "{$prefix}PeerRemoteAs", + 'bgpPeerState' => "{$prefix}PeerState", + 'bgpPeerAdminStatus' => "{$prefix}PeerAdminStatus", + 'bgpLocalAddr' => "{$prefix}PeerLocalAddr", + 'bgpPeerDescr' => "{$prefix}PeerDescription", + 'bgpPeerLastErrorCode' => "{$prefix}PeerLastErrorCodeReceived", + 'bgpPeerLastErrorSubCode' => "{$prefix}PeerLastErrorSubCodeReceived", + 'bgpPeerLastErrorText' => "{$prefix}PeerLastErrorReceivedText", + 'bgpPeerFsmEstablishedTime' => "{$prefix}PeerFsmEstablishedTime", + 'bgpPeerInUpdateElapsedTime' => "{$prefix}PeerInUpdatesElapsedTime", + ]; + + if ($counters) { + $columns += [ + 'bgpPeerInUpdates' => "{$prefix}PeerInUpdates", + 'bgpPeerOutUpdates' => "{$prefix}PeerOutUpdates", + 'bgpPeerInTotalMessages' => "{$prefix}PeerInTotalMessages", + 'bgpPeerOutTotalMessages' => "{$prefix}PeerOutTotalMessages", + ]; + } + + $peers = new Collection; + foreach ($instanceIsVrf ? [''] : $this->getDevice()->getVrfContexts() as $context) { + $contextVrfId = $this->getDevice()->vrfIdForContext($context); + + $found = collect($this->walkBgpTable($context, $mib, $columns))->map(function (array $row, int|string $index) use ($context, $contextVrfId, $instanceIsVrf): ?BgpPeer { + $parts = explode('.', (string) $index); + $instance = array_shift($parts); + $address = Bgp::shiftInetAddress($parts, 0, $zone); + + return $this->makeBgpPeer($address, $zone, $context, $instanceIsVrf ? $this->bgpVrfId($instance) : $contextVrfId, $row); + })->filter(); + + $peers = $peers->merge($found->isNotEmpty() ? $found : $this->discoverBgp4MibPeers($context)); + } + + return $peers->values(); + } + + /** + * Prefix counts are indexed by instance, remote address, afi and safi + * + * @param Collection $peers + * @param string $prefix table name prefix, for example aristaBgp4V2 + * @return Collection + */ + protected function discoverBgp4V2AddressFamilies(Collection $peers, string $mib, string $prefix): Collection + { + $families = []; + + foreach ($peers->pluck('context_name')->unique() as $context) { + $rows = $this->walkBgpTable($context, $mib, [ + 'AcceptedPrefixes' => "{$prefix}PrefixInPrefixesAccepted", + 'AdvertisedPrefixes' => "{$prefix}PrefixOutPrefixes", + ]); + + foreach ($rows as $index => $counters) { + $parts = explode('.', (string) $index); + array_shift($parts); // instance + $address = Bgp::shiftInetAddress($parts, 2, $zone); + if (count($parts) == 2) { + $families[] = $this->makeBgpAddressFamily($address, $zone, $context, $parts[0], $parts[1], $counters); + } + } + } + + return new Collection($families)->filter()->values(); + } +} diff --git a/LibreNMS/OS/Traits/BridgeMib.php b/LibreNMS/OS/Traits/BridgeMib.php index 771bd760810..03c33e4db51 100644 --- a/LibreNMS/OS/Traits/BridgeMib.php +++ b/LibreNMS/OS/Traits/BridgeMib.php @@ -27,16 +27,19 @@ namespace LibreNMS\OS\Traits; use App\Facades\PortCache; +use App\Models\PortsFdb; use App\Models\PortStp; use App\Models\Stp; use Illuminate\Support\Collection; +use Illuminate\Support\Facades\Log; use LibreNMS\Util\Mac; use LibreNMS\Util\StringHelpers; use SnmpQuery; trait BridgeMib { - private ?array $ifIndexToBridgePort = null; + /** @var array> */ + private array $ifIndexToBridgePort = []; public function discoverStpInstances(?string $vlan = null): Collection { @@ -97,7 +100,7 @@ public function discoverStpInstances(?string $vlan = null): Collection 'bridgeForwardDelay' => ($stp['BRIDGE-MIB::dot1dStpBridgeForwardDelay.0'] ?? 0) * $timeFactor, ]); - return (new Collection())->push($instance); + return new Collection()->push($instance); } public function discoverStpPorts(Collection $stpInstances): Collection @@ -108,7 +111,7 @@ public function discoverStpPorts(Collection $stpInstances): Collection $vlanContext = $instance->vlan == 1 ? '' : (string) $instance->vlan; // prep base port to port_id map for this specific VLAN context - $baseIfIndex = SnmpQuery::context($vlanContext, 'vlan-')->cache()->walk('BRIDGE-MIB::dot1dBasePortIfIndex')->pluck(); + $baseIfIndex = $this->bridgePortIfIndexes($vlanContext); $basePortIdMap = array_map(fn ($ifIndex) => PortCache::getIdFromIfIndex($ifIndex, $this->getDevice()), $baseIfIndex); $vlan_ports = SnmpQuery::context($vlanContext, 'vlan-') @@ -217,6 +220,108 @@ private function designatedPort(string $dp): int return (int) hexdec($dp); } + /** + * @return Collection + */ + public function discoverFdbTable(): Collection + { + $fdb = new Collection; + + foreach ($this->fdbBridgePorts() as $vlan => $macs) { + foreach ($macs as $mac => $bridgePort) { + if (! $bridgePort) { + Log::debug("No port known for $mac"); + continue; + } + + $port_id = $this->fdbPortId($bridgePort, $vlan); + if ($port_id === null) { + Log::debug("No port found for $mac on bridge port $bridgePort"); + continue; + } + + $fdb->push(new PortsFdb([ + 'port_id' => $port_id, + 'mac_address' => Mac::parse((string) $mac)->hex(), + 'vlan' => (int) $vlan ?: null, + ])); + } + } + + return $fdb; + } + + /** + * The FDB as bridge port keyed by VLAN number and MAC address. + * The internal grouping key is 0 when the VLAN is unknown or not reported. + * Discovery converts this to null when constructing the FDB entry. + * + * @return array> + */ + protected function fdbBridgePorts(): array + { + return $this->dot1qTpFdbPorts() ?: [0 => $this->dot1dTpFdbPorts()]; + } + + /** + * Resolve a bridge port from the FDB to a port_id. + * Return 0 to keep an entry with an unknown port, return null to skip it. + */ + protected function fdbPortId(int|string $bridgePort, int|string $vlan): ?int + { + return PortCache::getIdFromIfIndex($this->bridgePortIfIndexes()[$bridgePort] ?? null, $this->getDeviceId()) + ?? PortCache::getIdFromIfIndex($bridgePort, $this->getDeviceId()) // if vendor messed up, assume base port = ifIndex + ?? 0; + } + + /** + * dot1dTpFdbPort: bridge port keyed by MAC address. + * Some agents (fortiswitch, netonix) index the table by row number instead, so the MAC has to be read from dot1dTpFdbAddress. + * + * @return array + */ + protected function dot1dTpFdbPorts(string $vlanContext = ''): array + { + $table = SnmpQuery::context($vlanContext, 'vlan-')->walk('BRIDGE-MIB::dot1dTpFdbPort')->table(); + $ports = $table['BRIDGE-MIB::dot1dTpFdbPort'] ?? []; + + if (str_contains((string) array_key_first($ports), ':')) { + return $this->fixFdbMacIndexes($ports); + } + + $byMac = []; + foreach (SnmpQuery::context($vlanContext, 'vlan-')->walk('BRIDGE-MIB::dot1dTpFdbAddress')->pluck() as $row => $mac) { + $byMac[$mac] = $ports[$row] ?? 0; + } + + return $byMac; + } + + /** + * Some SNMP agents (arubaos-cx, comtrol) prepend a length byte to MacAddress indexes, encoding 7 bytes instead of 6. + * With -OX the last octet spills out of the bracket into a nested array level: + * dot1dTpFdbPort[6:0:a:f7:ec:d1].97 = 10 + * → key '6:0:a:f7:ec:d1', value ['.97' => '10'] + * Strip the length prefix, append the spilled octet (decimal → hex). + * + * @param array $ports + * @return array + */ + protected function fixFdbMacIndexes(array $ports): array + { + foreach ($ports as $mac => $port) { + if (is_array($port)) { + unset($ports[$mac]); + $octets = array_slice(explode(':', (string) $mac), 1); + foreach ($port as $spilled_octet => $spilled_port) { + $ports[implode(':', [...$octets, dechex((int) ltrim((string) $spilled_octet, '.'))])] = $spilled_port; + } + } + } + + return $ports; + } + public function bridgePortFromIfIndex(int|string|null $ifIndex): int { if (! $ifIndex) { @@ -238,10 +343,11 @@ public function ifIndexFromBridgePort(int|string|null $bridgePort): int /** * dot1dBasePortIfIndex: ifIndex keyed by bridge port * + * @param string $vlan Read from the SNMP context of this VLAN, for devices with a separate bridge per VLAN * @return array */ - protected function bridgePortIfIndexes(): array + protected function bridgePortIfIndexes(string $vlan = ''): array { - return $this->ifIndexToBridgePort ??= SnmpQuery::walk('BRIDGE-MIB::dot1dBasePortIfIndex')->pluck(); + return $this->ifIndexToBridgePort[$vlan] ??= SnmpQuery::context($vlan, 'vlan-')->cache()->walk('BRIDGE-MIB::dot1dBasePortIfIndex')->pluck(); } } diff --git a/LibreNMS/OS/Traits/FrogfootResources.php b/LibreNMS/OS/Traits/FrogfootResources.php index d996dc1c858..4b2563c2830 100644 --- a/LibreNMS/OS/Traits/FrogfootResources.php +++ b/LibreNMS/OS/Traits/FrogfootResources.php @@ -26,25 +26,33 @@ namespace LibreNMS\OS\Traits; -use LibreNMS\Device\Processor; +use App\Models\Processor; +use Illuminate\Support\Collection; trait FrogfootResources { /** * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered + * Returns a Collection of Processor models that have been discovered * - * @return array Processors + * @return Collection */ - public function discoverProcessors() + public function discoverProcessors(): Collection { - return [ - Processor::discover( - $this->getName(), - $this->getDeviceId(), - '1.3.6.1.4.1.10002.1.1.1.4.2.1.3.2', - 0 - ), - ]; + $oid = '1.3.6.1.4.1.10002.1.1.1.4.2.1.3.2'; + $value = \SnmpQuery::get($oid)->value(); + + if (! is_numeric($value)) { + return new Collection; + } + + return collect([ + new Processor([ + 'processor_type' => $this->getName(), + 'processor_oid' => $oid, + 'processor_index' => 0, + 'processor_usage' => $value, + ]), + ]); } } diff --git a/LibreNMS/OS/Traits/HostResources.php b/LibreNMS/OS/Traits/HostResources.php index cee4a6dbac1..23c476c7d32 100644 --- a/LibreNMS/OS/Traits/HostResources.php +++ b/LibreNMS/OS/Traits/HostResources.php @@ -27,14 +27,13 @@ namespace LibreNMS\OS\Traits; use App\Models\Mempool; +use App\Models\Processor; use App\Models\Storage; -use Exception; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; -use LibreNMS\Device\Processor; +use LibreNMS\Exceptions\UncorrectableNegativeException; use LibreNMS\Util\Number; -use Rrd; use SnmpQuery; trait HostResources @@ -96,41 +95,28 @@ trait HostResources /** * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered + * Returns a Collection of Processor models that have been discovered * - * @return array Processors + * @return Collection */ - public function discoverProcessors() + public function discoverProcessors(): Collection { Log::info('Host Resources: '); - $processors = []; - try { - $hrProcessorLoad = $this->getCacheByIndex('hrProcessorLoad', 'HOST-RESOURCES-MIB'); - - if (empty($hrProcessorLoad)) { - // no hr data, return - return []; + return SnmpQuery::abortOnFailure()->walk([ + 'HOST-RESOURCES-MIB::hrProcessorLoad', + 'HOST-RESOURCES-MIB::hrDeviceDescr', + ])->mapTable(function ($data, $hrDeviceIndex) { + if (! isset($data['HOST-RESOURCES-MIB::hrProcessorLoad']) || ! is_numeric($data['HOST-RESOURCES-MIB::hrProcessorLoad'])) { + return null; } - $hrDeviceDescr = $this->getCacheByIndex('hrDeviceDescr', 'HOST-RESOURCES-MIB'); - } catch (Exception) { - return []; - } - - foreach ($hrProcessorLoad as $index => $usage) { - $usage_oid = '.1.3.6.1.2.1.25.3.3.1.2.' . $index; - $descr = $hrDeviceDescr[$index] ?? null; - - if (! is_numeric($usage)) { - continue; - } - - $device = $this->getDeviceArray(); - if ($device['os'] == 'arista-eos' && $index == '1') { - continue; + // FIXME ? use skip_values + if ($this->getName() == 'arista-eos' && $hrDeviceIndex == '1') { + return null; } + $descr = $data['HOST-RESOURCES-MIB::hrDeviceDescr'] ?? null; if (empty($descr) || $descr == 'Unknown Processor Type' // Windows: Unknown Processor Type || $descr == 'An electronic chip that makes the computer work.' @@ -138,40 +124,20 @@ public function discoverProcessors() $descr = 'Processor'; } else { // Make the description a bit shorter - $remove_strings = [ - 'GenuineIntel: ', - 'AuthenticAMD: ', - 'CPU ', - '(TM)', - '(R)', - ]; - $descr = str_replace($remove_strings, '', $descr); + $descr = str_replace(['GenuineIntel: ', 'AuthenticAMD: ', 'CPU ', '(TM)', '(R)'], '', $descr); $descr = str_replace(' ', ' ', $descr); } - $old_name = ['hrProcessor', $index]; - $new_name = ['processor', 'hr', $index]; - Rrd::renameFile($this->getDevice(), $old_name, $new_name); - - $processor = Processor::discover( - 'hr', - $this->getDeviceId(), - $usage_oid, - $index, - $descr, - 1, - $usage, - null, - null, - $index - ); - - if ($processor->isValid()) { - $processors[] = $processor; - } - } - - return $processors; + return new Processor([ + 'hrDeviceIndex' => $hrDeviceIndex, + 'processor_oid' => '.1.3.6.1.2.1.25.3.3.1.2.' . $hrDeviceIndex, + 'processor_index' => $hrDeviceIndex, + 'processor_type' => 'hr', + 'processor_precision' => 1, + 'processor_usage' => $data['HOST-RESOURCES-MIB::hrProcessorLoad'], + 'processor_descr' => $descr, + ]); + })->filter(); } public function discoverMempools(): Collection @@ -199,7 +165,7 @@ public function discoverMempools(): Collection } } - return (new Mempool([ + return new Mempool([ 'mempool_index' => $index, 'mempool_type' => 'hrstorage', 'mempool_precision' => $storage['hrStorageAllocationUnits'], @@ -207,7 +173,7 @@ public function discoverMempools(): Collection 'mempool_perc_warn' => $this->memoryDescrWarn[$storage['hrStorageDescr']] ?? 90, 'mempool_used_oid' => ".1.3.6.1.2.1.25.2.3.1.6.$index", 'mempool_total_oid' => null, - ]))->setClass(null, $storage['hrStorageType'] == 'hrStorageVirtualMemory' ? 'virtual' : 'system') + ])->setClass(null, $storage['hrStorageType'] == 'hrStorageVirtualMemory' ? 'virtual' : 'system') ->fillUsage($storage['hrStorageUsed'] ?? null, $total); }); } @@ -221,7 +187,24 @@ public function discoverStorage(): Collection return new Collection; } - return collect($hr_storage)->filter(function ($storage, $index) { + return collect($hr_storage)->map(function ($storage, $index) { + // correct signed Integer32 wrap (e.g. Windows volumes > 2^31 allocation units) before validating + // -1 is commonly used as "unknown", leave it negative so the entry is skipped + if (isset($storage['hrStorageSize']) && is_numeric($storage['hrStorageSize']) && $storage['hrStorageSize'] < -1) { + $storage['hrStorageSize'] = Number::correctIntegerOverflow($storage['hrStorageSize']); + } + + if (isset($storage['hrStorageUsed'], $storage['hrStorageSize']) && is_numeric($storage['hrStorageUsed']) + && $storage['hrStorageUsed'] < -1 && $storage['hrStorageSize'] > 0) { + try { + $storage['hrStorageUsed'] = Number::correctIntegerOverflow($storage['hrStorageUsed'], (int) $storage['hrStorageSize']); + } catch (UncorrectableNegativeException) { + Log::debug("Host Resources: could not correct negative hrStorageUsed for storage ($index), larger than hrStorageSize"); + } + } + + return $storage; + })->filter(function ($storage, $index) { if (empty($storage['hrStorageType'])) { Log::debug("Host Resources: skipped storage ($index) due to missing hrStorageType"); @@ -241,16 +224,16 @@ public function discoverStorage(): Collection } return ! in_array($storage['hrStorageType'], $this->storageIgnoreTypes); - })->map(fn ($storage) => (new Storage([ + })->map(fn ($storage) => new Storage([ 'type' => 'hrstorage', 'storage_index' => $storage['hrStorageIndex'], 'storage_type' => $storage['hrStorageType'], 'storage_descr' => $storage['hrStorageDescr'], 'storage_used_oid' => '.1.3.6.1.2.1.25.2.3.1.6.' . $storage['hrStorageIndex'], 'storage_units' => $storage['hrStorageAllocationUnits'], - ]))->fillUsage( - Number::correctIntegerOverflow($storage['hrStorageUsed'] ?? null), - Number::correctIntegerOverflow($storage['hrStorageSize'] ?? null), + ])->fillUsage( + $storage['hrStorageUsed'] ?? null, + $storage['hrStorageSize'] ?? null, )); } diff --git a/LibreNMS/OS/Traits/MefUniEvcMib.php b/LibreNMS/OS/Traits/MefUniEvcMib.php new file mode 100644 index 00000000000..62d64938f52 --- /dev/null +++ b/LibreNMS/OS/Traits/MefUniEvcMib.php @@ -0,0 +1,101 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace LibreNMS\OS\Traits; + +use App\Models\MefInfo; +use Illuminate\Support\Collection; +use Illuminate\Support\Facades\Log; +use SnmpQuery; + +trait MefUniEvcMib +{ + public function discoverMef(): ?Collection + { + $evcs = $this->walkMefEvcs(); + + if ($evcs === null) { + return null; + } + + return collect($evcs)->map(fn (array $entry, int $mefID) => $this->fillMefInfo(new MefInfo(['mefID' => $mefID]), $entry))->values(); + } + + public function pollMef(Collection $mefs): Collection + { + $evcs = $this->walkMefEvcs(); + + if ($evcs === null) { + return $mefs; + } + + foreach ($mefs as $mef) { + if (! isset($evcs[$mef->mefID])) { + Log::debug("MEF link {$mef->mefIdent} ({$mef->mefID}) no longer reported, skipping"); + + continue; + } + + $this->fillMefInfo($mef, $evcs[$mef->mefID]); + } + + return $mefs; + } + + /** + * @return array>|null + */ + private function walkMefEvcs(): ?array + { + $response = SnmpQuery::mibs(['MEF-UNI-EVC-MIB'])->cache()->enumStrings()->abortOnFailure()->walk([ + 'MEF-UNI-EVC-MIB::mefServiceEvcCfgServiceType', + 'MEF-UNI-EVC-MIB::mefServiceEvcCfgIdentifier', + 'MEF-UNI-EVC-MIB::mefServiceEvcCfgMtuSize', + 'MEF-UNI-EVC-MIB::mefServiceEvcCfgAdminState', + 'MEF-UNI-EVC-MIB::mefServiceEvcCfgRowStatus', + ]); + + if ($response->getExitCode() !== 0 || ! $response->isValid()) { + return null; + } + + return $response->valuesByIndex(); + } + + /** + * @param array $entry + */ + private function fillMefInfo(MefInfo $mef, array $entry): MefInfo + { + return $mef->fill([ + 'mefType' => $entry['MEF-UNI-EVC-MIB::mefServiceEvcCfgServiceType'], + 'mefIdent' => $entry['MEF-UNI-EVC-MIB::mefServiceEvcCfgIdentifier'], + 'mefMTU' => (int) $entry['MEF-UNI-EVC-MIB::mefServiceEvcCfgMtuSize'], + 'mefAdmState' => $entry['MEF-UNI-EVC-MIB::mefServiceEvcCfgAdminState'], + 'mefRowState' => $entry['MEF-UNI-EVC-MIB::mefServiceEvcCfgRowStatus'], + ]); + } +} diff --git a/LibreNMS/OS/Traits/MplsVpnMib.php b/LibreNMS/OS/Traits/MplsVpnMib.php new file mode 100644 index 00000000000..b6d535b5a0e --- /dev/null +++ b/LibreNMS/OS/Traits/MplsVpnMib.php @@ -0,0 +1,128 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace LibreNMS\OS\Traits; + +use App\Facades\PortCache; +use App\Models\Port; +use App\Models\Vrf; +use Illuminate\Support\Collection; +use Illuminate\Support\Facades\Log; +use Illuminate\Support\Str; +use LibreNMS\Util\Oid; +use LibreNMS\Util\RouteDistinguisher; +use SnmpQuery; + +trait MplsVpnMib +{ + /** + * Both MIBs index VRFs by their length prefixed name, which is used as vrf_oid + * + * @return Collection + */ + public function discoverVrfs(): Collection + { + $vrfs = $this->discoverMplsVpnVrfs('MPLS-L3VPN-STD-MIB::mplsL3VpnVrfRD', 'MPLS-L3VPN-STD-MIB::mplsL3VpnVrfDescription'); + + // devices implement an earlier MPLS-VPN-MIB draft than the MIB file, without mplsVpnVrfVpnId, + // so the route distinguisher and description columns are named one off + return $vrfs->isNotEmpty() ? $vrfs : $this->discoverMplsVpnVrfs('MPLS-VPN-MIB::mplsVpnVrfDescription', 'MPLS-VPN-MIB::mplsVpnVrfVpnId'); + } + + /** + * @param Collection $vrfs + * @return Collection + */ + public function discoverVrfPorts(Collection $vrfs): Collection + { + if ($vrfs->isEmpty()) { + return new Collection; + } + + foreach (['MPLS-L3VPN-STD-MIB::mplsL3VpnIfVpnClassification', 'MPLS-VPN-MIB::mplsVpnIfLabelEdgeType'] as $oid) { + $members = []; + foreach (array_keys(SnmpQuery::hideMib()->numericIndex()->walk($oid)->throwIfConnectionError()->pluck(Str::after($oid, '::'))) as $index) { + $parts = explode('.', (string) $index); + $ifIndex = (int) array_pop($parts); + $members[$ifIndex] = implode('.', $parts); // VRF name index, ifIndex + } + + if (! empty($members)) { + return $this->vrfMemberPorts($members, $vrfs); + } + } + + return new Collection; + } + + /** + * Set ifVrf of the member ports + * + * @param array $members ifIndex to vrf_oid + * @param Collection $vrfs + * @return Collection + */ + protected function vrfMemberPorts(array $members, Collection $vrfs): Collection + { + $vrfIds = $vrfs->pluck('vrf_id', 'vrf_oid'); + $ports = new Collection; + + foreach ($members as $ifIndex => $vrfOid) { + $port = PortCache::getByIfIndex($ifIndex, $this->getDeviceId()); + $vrfId = $vrfIds->get((string) $vrfOid); + + if ($port === null || $vrfId === null) { + Log::debug("Skipping interface $ifIndex of VRF $vrfOid, interface or VRF not found"); + continue; + } + + $port->ifVrf = $vrfId; + $ports->push($port); + } + + return $ports; + } + + /** + * @return Collection + */ + private function discoverMplsVpnVrfs(string $rdOid, string $descriptionOid): Collection + { + $rds = SnmpQuery::hideMib()->numericIndex()->walk($rdOid)->throwIfConnectionError(); + if (! $rds->isValid()) { + return new Collection; + } + + $descriptions = SnmpQuery::hideMib()->numericIndex()->walk($descriptionOid)->pluck(Str::after($descriptionOid, '::')); + + return collect($rds->pluck(Str::after($rdOid, '::')))->map(fn ($rd, $index) => new Vrf([ + 'vrf_oid' => (string) $index, + 'vrf_name' => Oid::stringFromOid((string) $index), + 'mplsVpnVrfRouteDistinguisher' => RouteDistinguisher::parse($rd), + 'mplsVpnVrfDescription' => trim((string) ($descriptions[$index] ?? '')), + ]))->values(); + } +} diff --git a/LibreNMS/OS/Traits/QBridgeMib.php b/LibreNMS/OS/Traits/QBridgeMib.php index 71c7f634861..8055a97719a 100644 --- a/LibreNMS/OS/Traits/QBridgeMib.php +++ b/LibreNMS/OS/Traits/QBridgeMib.php @@ -37,6 +37,40 @@ trait QBridgeMib { + /** + * dot1qTpFdbPort: bridge port keyed by VLAN number and MAC address + * + * @return array> + */ + protected function dot1qTpFdbPorts(): array + { + $table = SnmpQuery::walk('Q-BRIDGE-MIB::dot1qTpFdbPort')->table(1); + if (empty($table)) { + return []; + } + + // The table is indexed by dot1qVlanFdbId, which is indexed by dot1qVlanTimeMark (ignored) and VLAN number + $fdbIdToVlan = []; + foreach (SnmpQuery::walk('Q-BRIDGE-MIB::dot1qVlanFdbId')->table(2) as $timeMark) { + foreach ((array) $timeMark as $vlan => $data) { + // Skip if $data is not an array (can happen with malformed SNMP responses) + if (is_array($data) && isset($data['Q-BRIDGE-MIB::dot1qVlanFdbId'])) { + $fdbId = $data['Q-BRIDGE-MIB::dot1qVlanFdbId']; + $fdbIdToVlan[$fdbId] = isset($fdbIdToVlan[$fdbId]) && $fdbIdToVlan[$fdbId] !== $vlan ? 0 : $vlan; + } + } + } + + $ports = []; + foreach ($table as $fdbId => $data) { + // if undefined, assume the index is the VLAN number + $vlan = $fdbIdToVlan[$fdbId] ?? $fdbId; + $ports[$vlan] = array_replace($ports[$vlan] ?? [], $this->fixFdbMacIndexes($data['Q-BRIDGE-MIB::dot1qTpFdbPort'] ?? [])); + } + + return $ports; + } + private function discoverIetfQBridgeMibVlans(): Collection { return SnmpQuery::walk('Q-BRIDGE-MIB::dot1qVlanStaticName') diff --git a/LibreNMS/OS/Traits/UcdResources.php b/LibreNMS/OS/Traits/UcdResources.php index ffbc9479c2d..915a49307af 100644 --- a/LibreNMS/OS/Traits/UcdResources.php +++ b/LibreNMS/OS/Traits/UcdResources.php @@ -27,34 +27,41 @@ namespace LibreNMS\OS\Traits; use App\Models\Mempool; +use App\Models\Processor; use App\Models\Storage; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; -use LibreNMS\Device\Processor; use LibreNMS\Util\Number; +use SnmpQuery; trait UcdResources { /** * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered + * Returns a Collection of Processor models that have been discovered * - * @return array Processors + * @return Collection */ - public function discoverProcessors() + public function discoverProcessors(): Collection { Log::info('UCD Resources: '); - return [ - Processor::discover( - 'ucd-old', - $this->getDeviceId(), - '.1.3.6.1.4.1.2021.11.11.0', - 0, - 'CPU', - -1 - ), - ]; + $value = SnmpQuery::get('.1.3.6.1.4.1.2021.11.11.0')->value(); + + if (! is_numeric($value)) { + return new Collection; + } + + return collect([ + new Processor([ + 'processor_type' => 'ucd-old', + 'processor_oid' => '.1.3.6.1.4.1.2021.11.11.0', + 'processor_index' => 0, + 'processor_descr' => 'CPU', + 'processor_precision' => -1, + 'processor_usage' => $value, + ]), + ]); } public function discoverMempools() @@ -71,58 +78,58 @@ public function discoverMempools() ], '-OQUs', 'UCD-SNMP-MIB'); if ($this->oidValid($data, 'memTotalReal') && $this->oidValid($data, 'memAvailReal')) { - $mempools->push((new Mempool([ + $mempools->push(new Mempool([ 'mempool_index' => 1, 'mempool_type' => 'ucd', 'mempool_class' => 'system', 'mempool_precision' => 1024, 'mempool_descr' => 'Physical memory', 'mempool_free_oid' => '.1.3.6.1.4.1.2021.4.6.0', - ]))->fillUsage(null, $data[0]['memTotalReal'] ?? null, $data[0]['memAvailReal'])); + ])->fillUsage(null, $data[0]['memTotalReal'] ?? null, $data[0]['memAvailReal'])); } if ($this->oidValid($data, 'memTotalSwap') && $this->oidValid($data, 'memAvailSwap')) { - $mempools->push((new Mempool([ + $mempools->push(new Mempool([ 'mempool_index' => 2, 'mempool_type' => 'ucd', 'mempool_class' => 'swap', 'mempool_precision' => 1024, 'mempool_descr' => 'Swap space', 'mempool_free_oid' => '.1.3.6.1.4.1.2021.4.4.0', - ]))->fillUsage(null, $data[0]['memTotalSwap'], $data[0]['memAvailSwap'])); + ])->fillUsage(null, $data[0]['memTotalSwap'], $data[0]['memAvailSwap'])); } if ($this->oidValid($data, 'memBuffer')) { - $mempools->push((new Mempool([ + $mempools->push(new Mempool([ 'mempool_index' => 3, 'mempool_type' => 'ucd', 'mempool_class' => 'buffers', 'mempool_precision' => 1024, 'mempool_descr' => 'Memory buffers', 'mempool_used_oid' => '.1.3.6.1.4.1.2021.4.14.0', - ]))->fillUsage($data[0]['memBuffer'], $data[0]['memTotalReal'])); + ])->fillUsage($data[0]['memBuffer'], $data[0]['memTotalReal'])); } if ($this->oidValid($data, 'memCached')) { - $mempools->push((new Mempool([ + $mempools->push(new Mempool([ 'mempool_index' => 4, 'mempool_type' => 'ucd', 'mempool_class' => 'cached', 'mempool_precision' => 1024, 'mempool_descr' => 'Cached memory', 'mempool_used_oid' => '.1.3.6.1.4.1.2021.4.15.0', - ]))->fillUsage($data[0]['memCached'], $data[0]['memTotalReal'])); + ])->fillUsage($data[0]['memCached'], $data[0]['memTotalReal'])); } if ($this->oidValid($data, 'memSysAvail')) { - $mempools->push((new Mempool([ + $mempools->push(new Mempool([ 'mempool_index' => 5, 'mempool_type' => 'ucd', 'mempool_class' => 'available', 'mempool_precision' => 1024, 'mempool_descr' => 'Available memory', 'mempool_free_oid' => '.1.3.6.1.4.1.2021.4.27.0', - ]))->fillUsage(null, $data[0]['memTotalReal'], $data[0]['memSysAvail'])); + ])->fillUsage(null, $data[0]['memTotalReal'], $data[0]['memSysAvail'])); } return $mempools; diff --git a/LibreNMS/OS/Traits/VminfoVmware.php b/LibreNMS/OS/Traits/VminfoVmware.php index 25c7e8be19b..3c3a20195ef 100644 --- a/LibreNMS/OS/Traits/VminfoVmware.php +++ b/LibreNMS/OS/Traits/VminfoVmware.php @@ -53,7 +53,7 @@ public function discoverVmInfo(): Collection return $vm_info->mapTable(function ($data, $vmwVmVMID) { $data['vm_type'] = 'vmware'; $data['vmwVmVMID'] = $vmwVmVMID; - $data['vmwVmState'] = PowerState::STATES[$data['vmwVmState']] ?? PowerState::UNKNOWN; + $data['vmwVmState'] = PowerState::parse($data['vmwVmState']); /* * If VMware Tools is not running then don't overwrite the GuestOS with the error diff --git a/LibreNMS/OS/Traits/VxworksProcessorUsage.php b/LibreNMS/OS/Traits/VxworksProcessorUsage.php index 3809dc89220..9463e551691 100644 --- a/LibreNMS/OS/Traits/VxworksProcessorUsage.php +++ b/LibreNMS/OS/Traits/VxworksProcessorUsage.php @@ -27,70 +27,63 @@ namespace LibreNMS\OS\Traits; -use LibreNMS\Device\Processor; +use App\Models\Processor; +use Illuminate\Support\Collection; +use SnmpQuery; trait VxworksProcessorUsage { /** * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered + * Returns a Collection of Processor models that have been discovered * - * @param string $oid Custom OID to fetch from - * @return array Processors + * @return Collection */ - public function discoverProcessors($oid = '.1.3.6.1.4.1.4413.1.1.1.1.4.9.0') + public function discoverProcessors($oid = '.1.3.6.1.4.1.4413.1.1.1.1.4.9.0'): Collection { - $usage = snmp_get($this->getDeviceArray(), $oid, '-Ovq'); + $usage = SnmpQuery::get($oid)->value(); if ($usage) { - $usage = $this->parseCpuUsage($usage); + $usage = $this->parseCpuUsageString($usage); if (is_numeric($usage)) { - return [ - Processor::discover( - $this->getName(), - $this->getDeviceId(), - $oid, - 0, - 'Processor', - 1, - $usage - ), - ]; + return collect([ + new Processor([ + 'processor_type' => $this->getName(), + 'processor_oid' => $oid, + 'processor_index' => 0, + 'processor_usage' => $usage, + ]), + ]); } } - return []; + return new Collection; } /** * Poll processor data. This can be implemented if custom polling is needed. * - * @param array $processors Array of processor entries from the database that need to be polled - * @return array of polled data + * @param Collection $processors Array of processor entries from the database that need to be polled + * @return Collection of polled data */ - public function pollProcessors(array $processors) + public function pollProcessors(Collection $processors): Collection { - $data = []; - foreach ($processors as $processor) { - $data[$processor['processor_id']] = $this->parseCpuUsage( - snmp_get($this->getDeviceArray(), $processor['processor_oid']) + $processor->processor_usage = $this->parseCpuUsageString( + SnmpQuery::get($processor->processor_oid)->value() ); } - return $data; + return $processors; } /** * Parse the silly cpu usage string * " 5 Secs ( 96.4918%) 60 Secs ( 54.2271%) 300 Secs ( 38.2591%)" - * - * @param string $data - * @return mixed */ - private function parseCpuUsage($data) + protected function parseCpuUsageString(string $data): ?string { - preg_match('/([0-9]+.[0-9]+)%/', $data, $matches); + preg_match('/(\d+\.\d+)%/', $data, $matches); - return $matches[1]; + return $matches[1] ?? null; } } diff --git a/LibreNMS/OS/Traits/YamlProcessorDiscovery.php b/LibreNMS/OS/Traits/YamlProcessorDiscovery.php new file mode 100644 index 00000000000..1d479ce47e8 --- /dev/null +++ b/LibreNMS/OS/Traits/YamlProcessorDiscovery.php @@ -0,0 +1,39 @@ + + */ + public function discoverYamlProcessors(): Collection + { + if (! $this->hasYamlDiscovery('processors')) { + return new Collection; + } + + $discovery = YamlDiscoveryDefinition::make(Processor::class) + ->addField(new YamlDiscoveryField('precision', 'processor_precision', 1)) + ->addField(new OidField('value', 'processor_usage')) + ->addField(new YamlDiscoveryField('descr', 'processor_descr', 'Processor')) + ->addField(new YamlDiscoveryField('type', 'processor_type', $this->getName())) + ->addField(new YamlDiscoveryField('warn_percent', 'processor_perc_warn', callback: fn ($value) => is_numeric($value) ? $value : null)) + ->addField(new IndexField('index', 'processor_index')); + + return $discovery->discover($this->getDiscovery('processors'), [ + 'hrDeviceIndex' => 0, + 'processor_descr' => 'Processor', + 'processor_precision' => 1, + ]); + } +} diff --git a/LibreNMS/OS/Unifi.php b/LibreNMS/OS/Unifi.php index 9d0fc73fb10..05446156ac9 100644 --- a/LibreNMS/OS/Unifi.php +++ b/LibreNMS/OS/Unifi.php @@ -27,6 +27,8 @@ namespace LibreNMS\OS; use App\Models\Device; +use App\Models\Processor; +use Illuminate\Support\Collection; use LibreNMS\Device\WirelessSensor; use LibreNMS\Enum\WirelessSensorType; use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; @@ -76,13 +78,15 @@ public function discoverOS(Device $device): void /** * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered + * Returns a Collection of Processor models that have been discovered * - * @return array Processors + * @return Collection */ - public function discoverProcessors() + public function discoverProcessors(): Collection { - return $this->discoverHrProcessors() ?: $this->discoverFrogfootProcessors(); + $processors = $this->discoverHrProcessors(); + + return $processors->isNotEmpty() ? $processors : $this->discoverFrogfootProcessors(); } /** @@ -96,8 +100,8 @@ public function discoverWirelessClients() if (empty($client_oids)) { return []; } - $vap_radios = $this->getCacheByIndex('unifiVapRadio', 'UBNT-UniFi-MIB'); - $ssid_ids = $this->getCacheByIndex('unifiVapEssId', 'UBNT-UniFi-MIB'); + $vap_radios = SnmpQuery::cache()->walk('UBNT-UniFi-MIB::unifiVapRadio')->pluck(); + $ssid_ids = SnmpQuery::cache()->walk('UBNT-UniFi-MIB::unifiVapEssId')->pluck(); $radios = []; foreach ($client_oids as $index => $entry) { @@ -175,19 +179,19 @@ public function discoverWirelessCcq() if (empty($ccq_oids)) { return []; } - $vap_radios = $this->getCacheByIndex('unifiVapRadio', 'UBNT-UniFi-MIB'); - $ssids = $this->getCacheByIndex('unifiVapEssId', 'UBNT-UniFi-MIB'); + $vap_radios = SnmpQuery::cache()->walk('UBNT-UniFi-MIB::unifiVapRadio')->pluck(); + $ssids = SnmpQuery::cache()->walk('UBNT-UniFi-MIB::unifiVapEssId')->pluck(); $sensors = []; foreach ($ccq_oids as $index => $entry) { - if ($ssids[$index]) { // don't discover ssids with empty names + if ($ssids[$index] ?? null) { // don't discover ssids with empty names $sensors[] = new WirelessSensor( WirelessSensorType::Ccq, $this->getDeviceId(), '.1.3.6.1.4.1.41112.1.6.1.2.1.3.' . $index, 'unifi', $index, - "SSID: {$ssids[$index]} ({$vap_radios[$index]})", + "SSID: {$ssids[$index]} (" . ($vap_radios[$index] ?? '') . ')', min($entry['unifiVapCcq'] / $this->ccqDivisor, 100), 1, $this->ccqDivisor @@ -231,11 +235,11 @@ public function pollWirelessCcq(array $sensors) public function discoverWirelessFrequency() { $data = snmpwalk_cache_oid($this->getDeviceArray(), 'unifiVapChannel', [], 'UBNT-UniFi-MIB'); - $vap_radios = $this->getCacheByIndex('unifiVapRadio', 'UBNT-UniFi-MIB'); + $vap_radios = SnmpQuery::cache()->walk('UBNT-UniFi-MIB::unifiVapRadio')->pluck(); $sensors = []; foreach ($data as $index => $entry) { - $radio = $vap_radios[$index]; + $radio = $vap_radios[$index] ?? ''; if (isset($sensors[$radio])) { continue; } @@ -277,12 +281,12 @@ public function discoverWirelessPower() if (empty($power_oids)) { return []; } - $vap_radios = $this->getCacheByIndex('unifiVapRadio', 'UBNT-UniFi-MIB'); + $vap_radios = SnmpQuery::cache()->walk('UBNT-UniFi-MIB::unifiVapRadio')->pluck(); // pick one oid for each radio, hopefully ssids don't change... not sure why this is supplied by vap $sensors = []; foreach ($power_oids as $index => $entry) { - $radio_name = $vap_radios[$index]; + $radio_name = $vap_radios[$index] ?? ''; $sensors[$radio_name] ??= new WirelessSensor( WirelessSensorType::Power, $this->getDeviceId(), @@ -312,7 +316,7 @@ public function discoverWirelessUtilization() $util_oids = snmpwalk_cache_oid($this->getDeviceArray(), 'unifiRadioCuSelfRx', $util_oids, 'UBNT-UniFi-MIB'); $util_oids = snmpwalk_cache_oid($this->getDeviceArray(), 'unifiRadioCuSelfTx', $util_oids, 'UBNT-UniFi-MIB'); $util_oids = snmpwalk_cache_oid($this->getDeviceArray(), 'unifiRadioOtherBss', $util_oids, 'UBNT-UniFi-MIB'); - $radio_names = $this->getCacheByIndex('unifiRadioRadio', 'UBNT-UniFi-MIB'); + $radio_names = SnmpQuery::walk('UBNT-UniFi-MIB::unifiRadioRadio')->pluck(); $sensors = []; foreach ($radio_names as $index => $name) { diff --git a/LibreNMS/OS/Viptela.php b/LibreNMS/OS/Viptela.php index 3fd277d7036..fde92f14687 100644 --- a/LibreNMS/OS/Viptela.php +++ b/LibreNMS/OS/Viptela.php @@ -26,60 +26,10 @@ namespace LibreNMS\OS; -use App\Models\Device; -use LibreNMS\Device\Processor; -use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; -use LibreNMS\Interfaces\Polling\ProcessorPolling; use LibreNMS\OS; use LibreNMS\OS\Traits\CiscoCdpMib; -class Viptela extends OS implements ProcessorDiscovery, ProcessorPolling +class Viptela extends OS { use CiscoCdpMib; - - private string $procOid = '.1.3.6.1.4.1.41916.11.1.16.0'; - - public function discoverOS(Device $device): void - { - parent::discoverOS($device); // yaml - } - - /** - * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered - * - * @return array Processor - */ - public function discoverProcessors() - { - $idle_cpu = 100 - (int) \SnmpQuery::get([$this->procOid])->value(); - $processors[] = Processor::discover( - 'viptela', - $this->getDeviceId(), - $this->procOid, - 0, - 'Processor', - 1, - $idle_cpu, - ); - - return $processors; - } - - /** - * Poll processor data. This can be implemented if custom polling is needed. - * - * @param array $processors Array of processor entries from the database that need to be polled - * @return array of polled data - */ - public function pollProcessors(array $processors) - { - $data = []; - - foreach ($processors as $processor) { - $data[$processor['processor_id']] = 100 - (int) \SnmpQuery::get([$this->procOid])->value(); - } - - return $data; - } } diff --git a/LibreNMS/OS/VmwareEsxi.php b/LibreNMS/OS/VmwareEsxi.php index 819e75f27b4..887c2d41cde 100644 --- a/LibreNMS/OS/VmwareEsxi.php +++ b/LibreNMS/OS/VmwareEsxi.php @@ -26,6 +26,7 @@ namespace LibreNMS\OS; +use App\Data\TimeSeries\MetricCollector; use Illuminate\Support\Collection; use LibreNMS\Interfaces\Discovery\VminfoDiscovery; use LibreNMS\Interfaces\Polling\VminfoPolling; @@ -35,13 +36,24 @@ class VmwareEsxi extends \LibreNMS\OS implements VminfoDiscovery, VminfoPolling { use VminfoVmware; - public function pollVminfo(Collection $vms): Collection + /** + * @return string[] + */ + public static function vmTypes(): array + { + return ['vmware']; + } + + public function pollVminfo(Collection $vms, MetricCollector $metrics): Collection { // no VMs, assume there aren't any if ($vms->isEmpty()) { return $vms; } - return $this->discoverVmInfo(); // just do the same thing as discovery. + // just do the same thing as discovery, but a failed walk must not remove the VMs + $polled = $this->discoverVmInfo(); + + return $polled->isEmpty() ? $vms : $polled; } } diff --git a/LibreNMS/OS/Vos.php b/LibreNMS/OS/Vos.php new file mode 100644 index 00000000000..aae956b45d0 --- /dev/null +++ b/LibreNMS/OS/Vos.php @@ -0,0 +1,60 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace LibreNMS\OS; + +use App\Models\Vrf; +use Illuminate\Support\Collection; +use LibreNMS\OS; +use SnmpQuery; + +class Vos extends OS +{ + /** + * Routing instances are only listed by the interfaces in them, so they are identified by name + */ + public function discoverVrfs(): Collection + { + return collect($this->vrfNamesByIfIndex())->unique()->map(fn (string $name) => new Vrf([ + 'vrf_oid' => $name, + 'vrf_name' => $name, + 'mplsVpnVrfDescription' => '', + ]))->values(); + } + + public function discoverVrfPorts(Collection $vrfs): Collection + { + return $this->vrfMemberPorts($this->vrfNamesByIfIndex(), $vrfs); + } + + /** + * @return array + */ + private function vrfNamesByIfIndex(): array + { + return array_filter(SnmpQuery::cache()->hideMib()->walk('VERSA-IF-MIB::versaIfVIfVrfName')->throwIfConnectionError()->pluck('versaIfVIfVrfName'), fn ($name) => $name !== ''); + } +} diff --git a/LibreNMS/OS/Vrp.php b/LibreNMS/OS/Vrp.php index 67c9e8a1869..b24127098cd 100644 --- a/LibreNMS/OS/Vrp.php +++ b/LibreNMS/OS/Vrp.php @@ -30,9 +30,12 @@ use App\Facades\PortCache; use App\Models\AccessPoint; +use App\Models\BgpPeer; +use App\Models\BgpPeerCbgp; use App\Models\Device; use App\Models\EntPhysical; use App\Models\Mempool; +use App\Models\PortsFdb; use App\Models\PortsNac; use App\Models\PortVlan; use App\Models\Sla; @@ -45,13 +48,12 @@ use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; use LibreNMS\DB\SyncsModels; -use LibreNMS\Device\Processor; use LibreNMS\Device\WirelessSensor; use LibreNMS\Enum\WirelessSensorType; use LibreNMS\Interfaces\Data\DataStorageInterface; +use LibreNMS\Interfaces\Discovery\BgpAddressFamilyDiscovery; use LibreNMS\Interfaces\Discovery\MempoolsDiscovery; use LibreNMS\Interfaces\Discovery\OSDiscovery; -use LibreNMS\Interfaces\Discovery\ProcessorDiscovery; use LibreNMS\Interfaces\Discovery\Sensors\WirelessApCountDiscovery; use LibreNMS\Interfaces\Discovery\Sensors\WirelessClientsDiscovery; use LibreNMS\Interfaces\Discovery\SlaDiscovery; @@ -64,15 +66,17 @@ use LibreNMS\OS; use LibreNMS\OS\Traits\EntityMib; use LibreNMS\RRD\RrdDefinition; +use LibreNMS\Util\Bgp; +use LibreNMS\Util\IP; use LibreNMS\Util\Mac; use LibreNMS\Util\Oid; use LibreNMS\Util\StringHelpers; use SnmpQuery; class Vrp extends OS implements + BgpAddressFamilyDiscovery, MempoolsDiscovery, OSPolling, - ProcessorDiscovery, NacPolling, WirelessApCountDiscovery, WirelessClientsDiscovery, @@ -226,7 +230,7 @@ public function discoverMempools() $descr = empty($entry['entPhysicalName']) ? ($entry['hwEntityBomEnDesc'] ?? null) : $entry['entPhysicalName']; if ($size != 0 && $descr && ! Str::contains($descr, 'No') && ! Str::contains($entry['hwEntityMemUsage'], 'No')) { - $mempools->push((new Mempool([ + $mempools->push(new Mempool([ 'mempool_index' => $index, 'mempool_type' => 'vrp', 'mempool_class' => 'system', @@ -234,7 +238,7 @@ public function discoverMempools() 'mempool_descr' => substr("$descr Memory", 0, 64), 'mempool_perc_oid' => ".1.3.6.1.4.1.2011.5.25.31.1.1.1.1.7.$index", 'mempool_perc_warn' => 90, - ]))->fillUsage(null, $size, null, $entry['hwEntityMemUsage'])); + ])->fillUsage(null, $size, null, $entry['hwEntityMemUsage'])); } } @@ -424,53 +428,6 @@ public function pollOS(DataStorageInterface $datastore): void } } - /** - * Discover processors. - * Returns an array of LibreNMS\Device\Processor objects that have been discovered - * - * @return array Processors - */ - public function discoverProcessors() - { - $device = $this->getDeviceArray(); - - $processors_data = snmpwalk_cache_multi_oid($device, 'hwEntityCpuUsage', [], 'HUAWEI-ENTITY-EXTENT-MIB', 'huawei'); - - if (! empty($processors_data)) { - $processors_data = snmpwalk_cache_multi_oid($device, 'hwEntityMemSize', $processors_data, 'HUAWEI-ENTITY-EXTENT-MIB', 'huawei'); - $processors_data = snmpwalk_cache_multi_oid($device, 'hwEntityBomEnDesc', $processors_data, 'HUAWEI-ENTITY-EXTENT-MIB', 'huawei'); - } - - d_echo($processors_data); - - $processors = []; - foreach ($processors_data as $index => $entry) { - if ($entry['hwEntityMemSize'] != 0) { - d_echo($index . ' ' . $entry['hwEntityBomEnDesc'] . ' -> ' . $entry['hwEntityCpuUsage'] . ' -> ' . $entry['hwEntityMemSize'] . "\n"); - - $usage_oid = '.1.3.6.1.4.1.2011.5.25.31.1.1.1.1.5.' . $index; - $descr = $entry['hwEntityBomEnDesc']; - $usage = $entry['hwEntityCpuUsage']; - - if (empty($descr) || Str::contains($descr, 'No') || Str::contains($usage, 'No')) { - continue; - } - - $processors[] = Processor::discover( - $this->getName(), - $this->getDeviceId(), - $usage_oid, - $index, - $descr, - 1, - $usage - ); - } - } - - return $processors; - } - /** * Discover the Network Access Control informations (dot1X etc etc) */ @@ -788,4 +745,136 @@ public function discoverVlanPorts(Collection $vlans): Collection return $ports; } + + /** + * Sessions of every VRF are listed in the default context. The session, statistics and + * description tables are indexed differently, they are merged by VRF index and address. + * + * @return Collection + */ + public function discoverBgpPeers(): Collection + { + $sessions = []; + + // instance, afi, safi, address + foreach ($this->walkBgpTable('', 'HUAWEI-BGP-VPN-MIB', [ + 'bgpPeerRemoteAs' => 'hwBgpPeerRemoteAs', + 'vrf_name' => 'hwBgpPeerVrfName', + 'bgpPeerState' => 'hwBgpPeerState', + 'bgpPeerAdminStatus' => 'hwBgpPeerAdminStatus', + 'bgpPeerLastError' => 'hwBgpPeerLastError', + 'bgpPeerFsmEstablishedTime' => 'hwBgpPeerFsmEstablishedTime', + ]) as $index => $row) { + $parts = explode('.', (string) $index); + $instance = array_shift($parts); + array_splice($parts, 0, 2); // afi, safi + $this->mergeVrpBgpSession($sessions, $instance, Bgp::shiftInetAddress($parts), $row); + } + + // ip version, instance, address + foreach ($this->walkBgpTable('', 'HUAWEI-BGP-VPN-MIB', [ + 'bgpPeerInUpdates' => 'hwBgpPeerInUpdateMsgs', + 'bgpPeerOutUpdates' => 'hwBgpPeerOutUpdateMsgs', + 'bgpPeerInTotalMessages' => 'hwBgpPeerInTotalMsgs', + 'bgpPeerOutTotalMessages' => 'hwBgpPeerOutTotalMsgs', + ]) as $index => $row) { + $parts = array_slice(explode('.', (string) $index), 1); + $instance = array_shift($parts); + $this->mergeVrpBgpSession($sessions, $instance, Bgp::shiftIp($parts), $row); + } + + // instance, address + foreach ($this->walkBgpTable('', 'HUAWEI-BGP-VPN-MIB', [ + 'bgpPeerDescr' => 'hwBgpPeerSessionExtDescription', + 'bgpLocalAddr' => 'hwBgpPeerSessionExtLocalAddr', + ]) as $index => $row) { + $parts = explode('.', (string) $index); + $instance = array_shift($parts); + $this->mergeVrpBgpSession($sessions, $instance, Bgp::shiftInetAddress($parts), $row); + } + + $peers = collect($sessions)->map(function (array $session): ?BgpPeer { + $vrfId = $this->bgpVrfId($session['instance'], $session['row']['vrf_name'] ?? null); + + return $this->makeBgpPeer($session['address'], null, '', $vrfId, Arr::except($session['row'], ['vrf_name'])); + })->filter()->values(); + + return $peers->isNotEmpty() ? $peers : $this->discoverBgp4MibPeers(''); + } + + /** + * @return Collection + */ + public function discoverBgpAddressFamilies(Collection $peers): Collection + { + $rows = $this->walkBgpTable('', 'HUAWEI-BGP-VPN-MIB', [ + 'AcceptedPrefixes' => 'hwBgpPeerPrefixRcvCounter', + 'AdvertisedPrefixes' => 'hwBgpPeerPrefixAdvCounter', + ]); + + $families = new Collection; + foreach ($rows as $index => $counters) { + // instance, afi, safi, address + $parts = explode('.', (string) $index); + array_shift($parts); + [$afi, $safi] = array_splice($parts, 0, 2) + [null, null]; + if ($afi !== null && $safi !== null) { + $families->push($this->makeBgpAddressFamily(Bgp::shiftInetAddress($parts), null, '', $afi, $safi, $counters)); + } + } + + return $families->filter()->values(); + } + + /** + * The first table to report a column wins + * + * @param array}> $sessions + * @param array $row + */ + private function mergeVrpBgpSession(array &$sessions, ?string $instance, ?IP $address, array $row): void + { + if ($instance === null || $address === null) { + return; + } + + $key = "$instance|$address"; + $sessions[$key] ??= ['instance' => $instance, 'address' => $address, 'row' => []]; + $sessions[$key]['row'] += $row; + } + + public function discoverFdbTable(): Collection + { + $ifIndexes = []; + + // indexed by MAC address, VLAN number and VSI name (may be empty) + foreach (SnmpQuery::walk('HUAWEI-L2MAM-MIB::hwDynFdbPort')->table(1) as $mac => $data) { + foreach ($data['HUAWEI-L2MAM-MIB::hwDynFdbPort'] ?? [] as $vlan => $ports) { + $ifIndexes[$vlan][$mac] = Arr::first((array) $ports); + } + } + + // Static (sticky) mac addresses are not stored in the same table. + foreach (SnmpQuery::walk('HUAWEI-L2MAM-MIB::hwCfgMacAddrQueryIfIndex')->table(10) as $vlan => $data) { + foreach ($data[0][0][0] ?? [] as $mac => $query) { + $ifIndex = Arr::first((array) ($query['showall'][0][0][0][0]['HUAWEI-L2MAM-MIB::hwCfgMacAddrQueryIfIndex'] ?? null)); + if ($ifIndex) { + $ifIndexes[$vlan][$mac] = $ifIndex; + } + } + } + + $fdb = []; + foreach ($ifIndexes as $vlan => $macs) { + foreach (array_filter($macs) as $mac => $ifIndex) { + $fdb[] = new PortsFdb([ + 'port_id' => PortCache::getIdFromIfIndex($ifIndex, $this->getDeviceId()) ?? 0, + 'mac_address' => Mac::parse((string) $mac)->hex(), + 'vlan' => (int) $vlan ?: null, + ]); + } + } + + return empty($fdb) ? parent::discoverFdbTable() : new Collection($fdb); + } } diff --git a/includes/discovery/fdb-table/edgeswitch.inc.php b/LibreNMS/OS/Vyos.php similarity index 55% rename from includes/discovery/fdb-table/edgeswitch.inc.php rename to LibreNMS/OS/Vyos.php index 6c1fb8e14e4..5ea10e1bce9 100644 --- a/includes/discovery/fdb-table/edgeswitch.inc.php +++ b/LibreNMS/OS/Vyos.php @@ -1,9 +1,9 @@ */ -use Illuminate\Support\Facades\Log; -use LibreNMS\Util\Mac; +namespace LibreNMS\OS; -$binding = snmpwalk_group($device, 'agentDynamicDsBindingTable', 'EdgeSwitch-SWITCHING-MIB', 1); +use Illuminate\Support\Collection; +use LibreNMS\OS\Shared\Unix; +use LibreNMS\OS\Traits\Bgp4V2Mib; -foreach ($binding as $mac => $data) { - $port_id = PortCache::getIdFromIfIndex($data['agentDynamicDsBindingIfIndex'], $device['device_id']); - $mac_address = Mac::parse($mac)->hex(); - $vlan_id = $data['agentDynamicDsBindingVlanId'] ?: 0; - $insert[$vlan_id][$mac_address]['port_id'] = $port_id; - Log::debug("vlan $vlan_id mac $mac_address port $port_id\n"); +class Vyos extends Unix +{ + use Bgp4V2Mib; + + /** + * The FRR BGP4V2-MIB has no message counters + */ + public function discoverBgpPeers(): Collection + { + return $this->discoverBgp4V2Peers('BGP4V2-MIB', 'bgp4V2', counters: false); + } + + public function discoverBgpLocalAs(): ?int + { + return $this->bgpLocalAsFallback(parent::discoverBgpLocalAs(), 'BGP4V2-MIB::bgp4V2PeerLocalAs'); + } } diff --git a/LibreNMS/OS/XirrusAos.php b/LibreNMS/OS/XirrusAos.php index 8625fe5428d..13b75920b49 100644 --- a/LibreNMS/OS/XirrusAos.php +++ b/LibreNMS/OS/XirrusAos.php @@ -40,6 +40,7 @@ use LibreNMS\Interfaces\Polling\Sensors\WirelessFrequencyPolling; use LibreNMS\OS; use LibreNMS\RRD\RrdDefinition; +use SnmpQuery; class XirrusAos extends OS implements OSPolling, @@ -178,7 +179,7 @@ public function discoverWirelessUtilization() private function discoverSensor(WirelessSensorType $type, $oid, $oid_num_prefix) { - $names = $this->getCacheByIndex('realtimeMonitorIfaceName', 'XIRRUS-MIB'); + $names = SnmpQuery::walk('XIRRUS-MIB::realtimeMonitorIfaceName')->pluck(); $nf = snmpwalk_cache_oid($this->getDeviceArray(), $oid, [], 'XIRRUS-MIB'); $sensors = []; @@ -189,7 +190,7 @@ private function discoverSensor(WirelessSensorType $type, $oid, $oid_num_prefix) $oid_num_prefix . $index, 'xirrus', $index, - $names[$index], + ($names[$index] ?? ''), $type === WirelessSensorType::Frequency ? WirelessSensor::channelToFrequency($entry[$oid]) : $entry[$oid] ); } diff --git a/LibreNMS/Polling/ConnectivityHelper.php b/LibreNMS/Polling/ConnectivityHelper.php deleted file mode 100644 index 2ea23855b25..00000000000 --- a/LibreNMS/Polling/ConnectivityHelper.php +++ /dev/null @@ -1,95 +0,0 @@ -. - * - * @package LibreNMS - * @link http://librenms.org - * @copyright 2021 Tony Murray - * @author Tony Murray - */ - -namespace LibreNMS\Polling; - -use App\Models\Device; -use LibreNMS\Enum\PollingMethodType; - -/** - * Temporary compatibility shim for legacy code. Delegates to Device::polling() and PerDeviceMethodResults. - */ -readonly class ConnectivityHelper -{ - private PerDeviceMethodResults $methodResults; - - public function __construct( - private Device $device, - ?PerDeviceMethodResults $methodResults = null, - ) { - $this->methodResults = $methodResults ?? new PerDeviceMethodResults($device); - } - - public function isAvailable(): bool - { - return $this->device->polling()->failedAvailabilityChecks()->isEmpty(); - } - - public function hasAvailability(): bool - { - return $this->device->polling()->hasAvailabilityCheck(); - } - - public function snmpIsEnabled(): bool - { - return $this->device->polling()->isEnabled(PollingMethodType::Snmp); - } - - public function snmpIsAvailable(): bool - { - return $this->methodResults->isAvailable(PollingMethodType::Snmp); - } - - public function ipmiIsEnabled(): bool - { - return $this->device->polling()->isEnabled(PollingMethodType::Ipmi); - } - - public function ipmiIsAvailable(): bool - { - return $this->methodResults->isAvailable(PollingMethodType::Ipmi); - } - - public function icmpIsEnabled(): bool - { - return $this->device->polling()->isEnabled(PollingMethodType::Icmp); - } - - public function icmpIsAvailable(): bool - { - return $this->methodResults->isAvailable(PollingMethodType::Icmp); - } - - public function unixAgentIsEnabled(): bool - { - return $this->device->polling()->isEnabled(PollingMethodType::UnixAgent); - } - - public function unixAgentIsAvailable(): bool - { - return $this->methodResults->isAvailable(PollingMethodType::UnixAgent); - } -} diff --git a/LibreNMS/Polling/Method/Config/ProxmoxApiConfig.php b/LibreNMS/Polling/Method/Config/ProxmoxApiConfig.php new file mode 100644 index 00000000000..cf390d51845 --- /dev/null +++ b/LibreNMS/Polling/Method/Config/ProxmoxApiConfig.php @@ -0,0 +1,16 @@ + $settings all settings, cast */ - public static function make(array $settings, SnmpSecretData $secret): self + public static function make(array $settings, SnmpCommunitySecretData|SnmpV3SecretData|null $secret): self { + $community = $secret instanceof SnmpCommunitySecretData ? $secret : null; + $v3 = $secret instanceof SnmpV3SecretData ? $secret : null; + $version = self::version($v3 ? SecretType::SnmpV3 : SecretType::SnmpCommunity, $settings['version'] ?? null); + return new self( - version: $secret->version, - community: $secret->community, - authname: $secret->authname, - authpass: $secret->authpass, - authlevel: $secret->authlevel, - authalgo: $secret->authalgo, - cryptopass: $secret->cryptopass, - cryptoalgo: $secret->cryptoalgo, + version: $version, + community: $community?->community, + authname: $v3?->authname, + authpass: $v3?->authpass, + authlevel: $v3?->authlevel, + authalgo: $v3?->authalgo, + cryptopass: $v3?->cryptopass, + cryptoalgo: $v3?->cryptoalgo, transport: $settings['transport'], port: $settings['port'], context: $settings['context'], @@ -75,8 +81,20 @@ public static function make(array $settings, SnmpSecretData $secret): self retries: $settings['retries'], maxRepeaters: $settings['max_repeaters'], maxOid: $settings['max_oid'], - bulk: $settings['bulk'], + bulk: $version !== 'v1' && $settings['bulk'], // v1 has no GETBULK portAssociationMode: $settings['port_association_mode'], ); } + + /** + * The SNMP version: a v3 secret is v3, a community is v2c unless the version setting is v1. + */ + public static function version(?SecretType $secretType, ?string $version): string + { + if ($secretType === SecretType::SnmpV3) { + return 'v3'; + } + + return $version === 'v1' ? 'v1' : 'v2c'; + } } diff --git a/LibreNMS/Polling/Method/Config/UnknownConfig.php b/LibreNMS/Polling/Method/Config/UnknownConfig.php new file mode 100644 index 00000000000..f86c04120ac --- /dev/null +++ b/LibreNMS/Polling/Method/Config/UnknownConfig.php @@ -0,0 +1,7 @@ +. - * - * @package LibreNMS - * @link http://librenms.org - * @copyright 2023 Tony Murray - * @author Tony Murray - */ - -namespace LibreNMS\OS\Traits; +namespace LibreNMS\Polling\Method\DataSources; use App\Facades\LibrenmsConfig; +use App\Models\Device; +use App\Models\Vminfo; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; use LibreNMS\Enum\PowerState; +use LibreNMS\Interfaces\Discovery\VminfoDiscovery; use LibreNMS\Util\Binaries; -trait VminfoLibvirt +/** + * VMs of a libvirt host, read with virsh over the libvirt_protocols. Enabled by config, it is not a polling method yet. + */ +class LibvirtDataSource implements VminfoDiscovery { + public function __construct( + private readonly Device $device, + ) { + } + + /** + * @return string[] + */ + public static function vmTypes(): array + { + return ['libvirt']; + } + + /** + * @return Collection + */ public function discoverVminfo(): Collection { Log::info('LibVirt VM: '); @@ -45,13 +43,13 @@ public function discoverVminfo(): Collection return new Collection; } - /** @var Collection<\App\Models\Vminfo> $vms */ + /** @var Collection $vms */ $vms = new Collection; $ssh_ok = 0; $virsh = escapeshellarg(resolve(Binaries::class)->path('virsh')); - $userHostname = $this->getDevice()->hostname; + $userHostname = $this->device->hostname; if (LibrenmsConfig::has('libvirt_username')) { $userHostname = LibrenmsConfig::get('libvirt_username') . '@' . $userHostname; } @@ -109,7 +107,7 @@ public function discoverVminfo(): Collection // libvirt does not supply this exec($virsh . ' -rc ' . escapeshellarg($uri) . ' domstate ' . escapeshellarg($dom_id), $vm_state); - $vmwVmState = PowerState::STATES[strtolower($vm_state[0])] ?? PowerState::UNKNOWN; + $vmwVmState = PowerState::parse($vm_state[0] ?? ''); $vmwVmMemSize = $xml->memory; // Convert memory size to MiB @@ -148,7 +146,7 @@ public function discoverVminfo(): Collection } // Save the discovered Virtual Machine. - $vms->push(new \App\Models\Vminfo([ + $vms->push(new Vminfo([ 'vm_type' => 'libvirt', 'vmwVmVMID' => $dom_id, 'vmwVmState' => $vmwVmState, diff --git a/LibreNMS/Polling/Method/DataSources/ProxmoxApiDataSource.php b/LibreNMS/Polling/Method/DataSources/ProxmoxApiDataSource.php new file mode 100644 index 00000000000..31545e9fde6 --- /dev/null +++ b/LibreNMS/Polling/Method/DataSources/ProxmoxApiDataSource.php @@ -0,0 +1,274 @@ +, proxmox-lxc: array}|null */ + private ?array $localGuests = null; + + public function __construct( + ProxmoxApiConfig $config, + private readonly string $clusterId, + ) { + $this->api = new ProxmoxApi($config); + } + + public function clusterId(): string + { + return $this->clusterId; + } + + /** + * @return Collection + */ + public function clusterVms(): Collection + { + $guests = $this->api->listClusterGuests(); + + return $this->identities(self::TYPE_VM, $guests['qemu'])->concat($this->identities(self::TYPE_CONTAINER, $guests['lxc'])); + } + + /** + * @return Collection + */ + public function localVms(): Collection + { + $guests = $this->localGuests(); + + return $this->identities(self::TYPE_VM, $guests[self::TYPE_VM])->concat($this->identities(self::TYPE_CONTAINER, $guests[self::TYPE_CONTAINER])); + } + + /** + * @return string[] + */ + public static function vmTypes(): array + { + return [self::TYPE_VM, self::TYPE_CONTAINER]; + } + + /** + * The guests of this node. + * + * @return Collection + */ + public function discoverVminfo(): Collection + { + $guests = $this->localGuests(); + $vms = array_filter($guests[self::TYPE_VM], fn (ProxmoxGuest $vm): bool => ! $vm->template); + $running = array_filter($vms, fn (ProxmoxGuest $vm): bool => $vm->isRunning()); + $guestOs = $this->api->getVmsGuestOs(array_column($running, 'id')); + + $containers = array_filter($guests[self::TYPE_CONTAINER], fn (ProxmoxGuest $container): bool => ! $container->template); + $containerOs = $this->api->getContainersOsType(array_column($containers, 'id')); + + return new Collection($vms) + ->map(fn (ProxmoxGuest $vm): Vminfo => $this->makeVminfo(self::TYPE_VM, $vm, $guestOs[$vm->id] ?? '')) + ->concat(array_map(fn (ProxmoxGuest $container): Vminfo => $this->makeVminfo(self::TYPE_CONTAINER, $container, $containerOs[$container->id] ?? ''), $containers)) + ->values(); + } + + /** + * @param Collection $vms + * @param MetricCollector $metrics + * @return Collection + */ + public function pollVminfo(Collection $vms, MetricCollector $metrics): Collection + { + $guests = $this->localGuests(); + + $polledVms = $vms->where('vm_type', self::TYPE_VM); + $polledGuests = array_intersect_key($guests[self::TYPE_VM], $polledVms->keyBy('vmwVmVMID')->all()); + $running = array_filter($polledGuests, fn (ProxmoxGuest $guest): bool => $guest->isRunning()); + $filesystems = $this->api->getVmsFsInfo(array_keys($running)); + + foreach ($vms as $vm) { + $guest = $guests[$vm->vm_type][$vm->vmwVmVMID] ?? null; + + // no longer on this node, the next discovery knows if it was removed + if ($guest === null) { + continue; + } + + $vm->vmwVmState = $guest->powerState(); + + if (! $guest->isRunning()) { + continue; + } + + // CPU + $metrics->record($vm, 'vm.cpu', [ + 'usage' => $guest->cpu * 100, + ]); + + // Memory + $metrics->record($vm, 'vm.memory', [ + 'used' => $guest->memory, + 'total' => $guest->maxMemory, + ]); + + if ($vm->vm_type === self::TYPE_CONTAINER) { + $metrics->record($vm, 'vm.diskio', [ + 'read_bytes' => $guest->diskRead, + 'write_bytes' => $guest->diskWrite, + ]); + // the host sees the filesystems of a container + $this->recordHostDiskUsage($vm, $guest, $metrics); + } else { + $this->recordVmDisks($vm, $guest, $filesystems[$guest->id] ?? [], $metrics); + } + + // Network counters (cumulative since boot) + $metrics->record($vm, 'vm.net', [ + 'in' => $guest->netIn, + 'out' => $guest->netOut, + ]); + } + + return $vms; + } + + /** + * The lists have all data of the guests, this node is asked once per poll or discovery. + * + * @return array{proxmox: array, proxmox-lxc: array} + */ + private function localGuests(): array + { + return $this->localGuests ??= [ + self::TYPE_VM => array_column($this->api->listVms(), null, 'id'), + self::TYPE_CONTAINER => array_column($this->api->listContainers(), null, 'id'), + ]; + } + + /** + * Templates are not VMs. The guests on an offline node are not known to be templates, so they stay. + * + * @param array $guests + * @return Collection + */ + private function identities(string $type, array $guests): Collection + { + return new Collection($guests) + ->reject(fn (ProxmoxGuest $guest): bool => $guest->template) + ->map(fn (ProxmoxGuest $guest): Vminfo => new Vminfo(['cluster_id' => $this->clusterId, 'vm_type' => $type, 'vmwVmVMID' => $guest->id])) + ->values(); + } + + /** + * An unknown OS is left out, so it does not replace the OS found while the guest was running. + */ + private function makeVminfo(string $type, ProxmoxGuest $guest, string $os): Vminfo + { + $vminfo = new Vminfo([ + 'cluster_id' => $this->clusterId, + 'vm_type' => $type, + 'vmwVmVMID' => $guest->id, + 'vmwVmDisplayName' => $guest->name, + 'vmwVmMemSize' => $guest->maxMemory / 1048576, + 'vmwVmCpus' => $guest->cpus, + 'vmwVmState' => $guest->powerState(), + ]); + + if ($os !== '') { + $vminfo->vmwVmGuestOS = $os; + } + + return $vminfo; + } + + /** + * @param list $filesystems + * @param MetricCollector $metrics + */ + private function recordVmDisks(Vminfo $vm, ProxmoxGuest $guest, array $filesystems, MetricCollector $metrics): void + { + // Disk Activity + $stats = $this->aggregateDiskStats($guest); + $metrics->record($vm, 'vm.diskio', Arr::only($stats, ['read_bytes', 'write_bytes'])); + $metrics->record($vm, 'vm.diskops', Arr::except($stats, ['read_bytes', 'write_bytes'])); + + // Disk usage + // prefer guest agent (accurate per-filesystem data), skipping pseudo-mounts and repeated mounts of a device + $real = new Collection($filesystems) + ->reject(fn (ProxmoxFilesystem $filesystem): bool => in_array($filesystem->type, self::SKIPPED_FILESYSTEMS, true)) + ->unique('device'); + $diskTotal = $real->sum('totalBytes'); + + if ($diskTotal > 0) { + $metrics->record($vm, 'vm.disk', [ + 'used' => $real->sum('usedBytes'), + 'total' => $diskTotal, + ]); + + return; + } + + // fall back to hypervisor-level values if agent is absent/unavailable or reported no sizes. + $this->recordHostDiskUsage($vm, $guest, $metrics); + } + + /** + * @param MetricCollector $metrics + */ + private function recordHostDiskUsage(Vminfo $vm, ProxmoxGuest $guest, MetricCollector $metrics): void + { + $metrics->record($vm, 'vm.disk', [ + 'used' => $guest->disk, + 'total' => $guest->maxDisk, + ]); + } + + /** + * @return array + */ + private function aggregateDiskStats(ProxmoxGuest $guest): array + { + $data = [ + 'read_bytes' => 0, + 'write_bytes' => 0, + 'read_ops' => 0, + 'write_ops' => 0, + 'read_time_ns' => 0, + 'write_time_ns' => 0, + 'failed_reads' => 0, + 'failed_writes' => 0, + ]; + + foreach ($guest->blockStats as $stat) { + $data['read_bytes'] += ($stat['rd_bytes'] ?? 0); + $data['write_bytes'] += ($stat['wr_bytes'] ?? 0); + $data['read_ops'] += ($stat['rd_operations'] ?? 0); + $data['write_ops'] += ($stat['wr_operations'] ?? 0); + $data['read_time_ns'] += ($stat['rd_total_time_ns'] ?? 0); + $data['write_time_ns'] += ($stat['wr_total_time_ns'] ?? 0); + $data['failed_reads'] += ($stat['failed_rd_operations'] ?? 0); + $data['failed_writes'] += ($stat['failed_wr_operations'] ?? 0); + } + + return $data; + } +} diff --git a/LibreNMS/Polling/Method/DataSources/UnixAgentDataSource.php b/LibreNMS/Polling/Method/DataSources/UnixAgentDataSource.php new file mode 100644 index 00000000000..e0d54d5981a --- /dev/null +++ b/LibreNMS/Polling/Method/DataSources/UnixAgentDataSource.php @@ -0,0 +1,99 @@ + ['class' => 'system', 'descr' => 'Physical memory', 'total' => 'MemTotal', 'free' => 'MemFree'], + 2 => ['class' => 'swap', 'descr' => 'Swap space', 'total' => 'SwapTotal', 'free' => 'SwapFree'], + 3 => ['class' => 'buffers', 'descr' => 'Memory buffers', 'total' => 'MemTotal', 'used' => 'Buffers'], + 4 => ['class' => 'cached', 'descr' => 'Cached memory', 'total' => 'MemTotal', 'used' => 'Cached'], + 5 => ['class' => 'available', 'descr' => 'Available memory', 'total' => 'MemTotal', 'free' => 'MemAvailable'], + ]; + + /** + * Values of the <<>> section in kB, keyed by field. Empty when the agent did not send it. + * + * @var array + */ + private array $meminfo; + + public function __construct(ProbeResult $result) + { + $section = UnixAgent::parse((string) $result->stat('output'))['mem'] ?? null; + + $meminfo = []; + foreach (is_string($section) ? explode("\n", $section) : [] as $line) { + if (preg_match('/^(\w+):\s+(\d+)/', $line, $matches)) { + $meminfo[$matches[1]] = (int) $matches[2]; + } + } + + $this->meminfo = $meminfo; + } + + /** + * @return Collection + */ + public function discoverMempools(): Collection + { + $mempools = new Collection; + + foreach (self::MEMPOOLS as $index => $fields) { + if (! isset($this->meminfo[$fields['used'] ?? $fields['free']])) { + continue; + } + + $mempools->push($this->fill(new Mempool([ + 'mempool_index' => $index, + 'mempool_type' => 'unix-agent', + 'mempool_class' => $fields['class'], + 'mempool_precision' => 1024, + 'mempool_descr' => $fields['descr'], + ]))); + } + + return $mempools; + } + + /** + * None are polled when the agent did not send the section. + * + * @param EloquentCollection $mempools + * @return EloquentCollection + */ + public function pollMempools(EloquentCollection $mempools): EloquentCollection + { + return empty($this->meminfo) ? new EloquentCollection : $mempools->each($this->fill(...)); + } + + private function fill(Mempool $mempool): Mempool + { + $fields = self::MEMPOOLS[(int) $mempool->mempool_index] ?? null; + + if ($fields === null) { + return $mempool; + } + + return $mempool->fillUsage( + isset($fields['used']) ? ($this->meminfo[$fields['used']] ?? null) : null, + $this->meminfo[$fields['total']] ?? null, + isset($fields['free']) ? ($this->meminfo[$fields['free']] ?? null) : null, + ); + } +} diff --git a/LibreNMS/Polling/Method/Definitions/PollingMethodDefinition.php b/LibreNMS/Polling/Method/Definitions/PollingMethodDefinition.php index 73315d20395..20b9d5f6593 100644 --- a/LibreNMS/Polling/Method/Definitions/PollingMethodDefinition.php +++ b/LibreNMS/Polling/Method/Definitions/PollingMethodDefinition.php @@ -20,15 +20,32 @@ abstract public function icon(): string; * Form fields that show the given defaults for fields left empty. * * @param array $defaults the polling method's default settings + * @param string|null $secretTypeVar JS expression for the type of the method's secret, null if unknown. Fields for other types are hidden * @return array> */ - public function settingsFields(array $defaults, string $dataVar = 'settingsData'): array + public function settingsFields(array $defaults, string $dataVar = 'settingsData', ?string $secretTypeVar = null): array { - return collect($this->fields())->map(function (FieldDefinition $field, string $key) use ($defaults, $dataVar): array { + $fields = $this->fields(); + + return collect($fields)->map(function (FieldDefinition $field, string $key) use ($fields, $defaults, $dataVar, $secretTypeVar): array { $schemaField = $field->toSchemaField($dataVar); unset($schemaField['default']); // empty means default, never preselect it $default = $defaults[$key] ?? null; + if ($secretTypeVar !== null && $field->secretTypes !== null) { + $forType = $this->forSecretTypesExpression($field, $secretTypeVar); + $schemaField['visible_if_expression'] = $schemaField['visible_if_expression'] ? "{$schemaField['visible_if_expression']} && $forType" : $forType; + } + + // a condition on a field that is not used with the secret type does not match + if ($secretTypeVar !== null && $schemaField['fixed_if_expression'] !== null) { + foreach (array_keys($field->fixedIf ?? []) as $conditionKey) { + if (isset($fields[$conditionKey]) && $fields[$conditionKey]->secretTypes !== null) { + $schemaField['fixed_if_expression'] .= ' && ' . $this->forSecretTypesExpression($fields[$conditionKey], $secretTypeVar); + } + } + } + if ($field->type === 'select') { if ($field->placeholder !== null) { $schemaField['default_option'] = __($field->placeholder); @@ -45,6 +62,29 @@ public function settingsFields(array $defaults, string $dataVar = 'settingsData' })->values()->all(); } + /** + * JS expression that is true when the secret type is unknown or one the field is used with. + */ + private function forSecretTypesExpression(FieldDefinition $field, string $secretTypeVar): string + { + return '(!' . $secretTypeVar . ' || ' . json_encode(array_column($field->secretTypes ?? [], 'value')) . '.includes(' . $secretTypeVar . '))'; + } + + /** + * The values of the form fields for stored settings, empty for those not set. + * Select options are strings, so a stored bool has to become its option to be selected. + * + * @param array $settings + * @return array + */ + public function formValues(array $settings): array + { + return array_map( + fn (mixed $value): mixed => is_bool($value) ? ($value ? '1' : '0') : $value, + [...array_fill_keys(array_keys($this->fields()), ''), ...$settings], + ); + } + /** * The settings that are set, cast to their type. Empty, out of range and unknown option values are left to the defaults. * diff --git a/LibreNMS/Polling/Method/Definitions/ProxmoxApiDefinition.php b/LibreNMS/Polling/Method/Definitions/ProxmoxApiDefinition.php new file mode 100644 index 00000000000..59d7db015fc --- /dev/null +++ b/LibreNMS/Polling/Method/Definitions/ProxmoxApiDefinition.php @@ -0,0 +1,36 @@ + FieldDefinition::make('hostname', 'text') + ->placeholder('Default: device\'s hostname'), + + 'port' => FieldDefinition::make('port', 'number') + ->min(1) + ->max(65535), + + 'timeout' => FieldDefinition::make('timeout', 'number') + ->min(1) + ->max(300), + + 'verify_ssl' => FieldDefinition::make('verify_ssl', 'select') + ->options([ + 1 => 'Yes', + 0 => 'No', + ]) + ->cast('bool'), + ]; + } +} diff --git a/LibreNMS/Polling/Method/Definitions/SnmpDefinition.php b/LibreNMS/Polling/Method/Definitions/SnmpDefinition.php index 7b8ca03f314..0310fa8ab19 100644 --- a/LibreNMS/Polling/Method/Definitions/SnmpDefinition.php +++ b/LibreNMS/Polling/Method/Definitions/SnmpDefinition.php @@ -4,6 +4,7 @@ use App\View\FieldSchema\FieldDefinition; use LibreNMS\Enum\PortAssociationMode; +use LibreNMS\Enum\SecretType; final class SnmpDefinition extends PollingMethodDefinition { @@ -15,6 +16,14 @@ public function icon(): string public function fields(): array { return [ + // a v3 secret is always v3, so the version is only chosen for a community + 'version' => FieldDefinition::make('version', 'select') + ->options([ + 'v2c' => 'v2c', + 'v1' => 'v1', + ]) + ->forSecretTypes(SecretType::SnmpCommunity), + 'transport' => FieldDefinition::make('transport', 'select') ->options([ 'udp' => 'UDP', @@ -49,7 +58,8 @@ public function fields(): array 1 => 'Yes', 0 => 'No', ]) - ->cast('bool'), + ->cast('bool') + ->fixedIf(['version' => 'v1'], 0), // v1 has no GETBULK 'context' => FieldDefinition::make('context', 'text') ->rules(['nullable', 'string', 'max:255']), diff --git a/LibreNMS/Polling/Method/Definitions/UnknownDefinition.php b/LibreNMS/Polling/Method/Definitions/UnknownDefinition.php new file mode 100644 index 00000000000..0b974e738a1 --- /dev/null +++ b/LibreNMS/Polling/Method/Definitions/UnknownDefinition.php @@ -0,0 +1,16 @@ +settings ?? []) + $this->defaults($device); - $secret = IpmiSecretData::fromArray($deviceMethod->secret->data ?? []); + $secret = $this->secretData($deviceMethod?->secret) ?? new IpmiSecretData; + assert($secret instanceof IpmiSecretData); return new IpmiConfig( hostname: $settings['hostname'], @@ -81,8 +82,8 @@ public function probe(Device $device, PollingMethodConfig $config): ProbeResult } } - public function secretType(): SecretType + public function secretTypes(): array { - return SecretType::Ipmi; + return [SecretType::Ipmi]; } } diff --git a/LibreNMS/Polling/Method/Methods/PollingMethod.php b/LibreNMS/Polling/Method/Methods/PollingMethod.php index d01dc143274..a46ff06e678 100644 --- a/LibreNMS/Polling/Method/Methods/PollingMethod.php +++ b/LibreNMS/Polling/Method/Methods/PollingMethod.php @@ -4,20 +4,87 @@ use App\Models\Device; use App\Models\DevicePollingMethod; +use App\Models\Secret; +use Illuminate\Validation\ValidationException; use LibreNMS\Enum\SecretType; -use LibreNMS\Exceptions\MissingSecretException; +use LibreNMS\Exceptions\UnknownSecretTypeException; use LibreNMS\Polling\Method\Config\PollingMethodConfig; use LibreNMS\Polling\Method\Definitions\PollingMethodDefinition; use LibreNMS\Polling\Method\ProbeResult; +use LibreNMS\Polling\Secrets\Data\SecretData; +use UnexpectedValueException; /** * @template-covariant TConfig of PollingMethodConfig */ abstract class PollingMethod { - public function secretType(): ?SecretType + /** + * The types of secret this method can use, empty when it uses no secret. A method uses one secret at a time. + * + * @return list + */ + public function secretTypes(): array { - return null; + return []; + } + + public function usesSecretType(SecretType $secretType): bool + { + return in_array($secretType, $this->secretTypes(), true); + } + + /** + * The secret type chosen by input, or the only type this method uses when none was chosen. + * Null when the type is not one this method uses, or none was chosen from several. + */ + public function secretTypeFrom(mixed $input): ?SecretType + { + $secretTypes = $this->secretTypes(); + $type = $input instanceof SecretType ? $input : SecretType::tryFrom((string) $input); + + if ($type === null) { + return count($secretTypes) === 1 ? $secretTypes[0] : null; + } + + return $this->usesSecretType($type) ? $type : null; + } + + /** + * Check a method is consistent before it is saved, however it was built. + * + * @throws ValidationException + */ + public function validate(DevicePollingMethod $deviceMethod): void + { + $secretType = $deviceMethod->secret?->secret_type; + + if ($secretType !== null && ! $this->usesSecretType($secretType)) { + throw ValidationException::withMessages(['secret_id' => __('poller.credential_type_mismatch')]); + } + } + + /** + * The typed data of a secret for this method, null without a secret. + * + * @throws UnknownSecretTypeException when the secret is of a type this version does not know + * @throws UnexpectedValueException when this method does not use the type of the secret, validate() prevents saving one + */ + protected function secretData(?Secret $secret): ?SecretData + { + if ($secret === null) { + return null; + } + + if ($secret->secret_type === SecretType::Unknown) { + throw UnknownSecretTypeException::forSecret($secret); + } + + if (! $this->usesSecretType($secret->secret_type)) { + throw new UnexpectedValueException("Secret $secret->id is a {$secret->secret_type->value} secret, " . static::class . ' does not use it'); + } + + return $secret->secret_type->data($secret->data ?? []); } /** @@ -30,7 +97,8 @@ public function secretType(): ?SecretType abstract public function probe(Device $device, PollingMethodConfig $config): ProbeResult; /** - * Discover or validate a candidate polling method for a device. + * Check a candidate polling method for a device, with the secret and settings it has. + * Which candidates are tried is up to the caller, see BuildPollingMethodCandidates. */ public function discover(Device $device, DevicePollingMethod $deviceMethod): ProbeResult { @@ -46,12 +114,36 @@ public function enrichDeviceMetadata(Device $device): void } /** - * Attach a secret to a method that has none and will be saved without a check. + * The class of the module data this method provides, it implements module interfaces such as VminfoDiscovery. + * Modules get it through OS::dataSources() when the method is enabled and its check succeeds. + * It is known without checking the method, see dataSource(). + * + * @return class-string|null + */ + public function dataSourceClass(): ?string + { + return null; + } + + /** + * The method's data source implements the module interface. * - * @throws MissingSecretException + * @param class-string $interface */ - public function assignDefaultSecret(DevicePollingMethod $deviceMethod): void + public function providesData(string $interface): bool { + $class = $this->dataSourceClass(); + + return $class !== null && is_a($class, $interface, true); + } + + /** + * The data source of this method for a device, see dataSourceClass(). + * Made after a successful check, so it can read what the check fetched. + */ + public function dataSource(PollingMethodConfig $config, ProbeResult $result): ?object + { + return null; } /** diff --git a/LibreNMS/Polling/Method/Methods/ProxmoxApiPollingMethod.php b/LibreNMS/Polling/Method/Methods/ProxmoxApiPollingMethod.php new file mode 100644 index 00000000000..04e3a51714d --- /dev/null +++ b/LibreNMS/Polling/Method/Methods/ProxmoxApiPollingMethod.php @@ -0,0 +1,104 @@ + + */ +final class ProxmoxApiPollingMethod extends PollingMethod +{ + public function definition(): ProxmoxApiDefinition + { + return new ProxmoxApiDefinition; + } + + public function defaultAffectsAvailability(): bool + { + return false; + } + + /** + * @return array{hostname: string, port: int, timeout: int, verify_ssl: bool} + */ + public function defaults(?Device $device = null): array + { + return [ + 'hostname' => $device->hostname ?? '', + 'port' => 8006, + 'timeout' => 10, + 'verify_ssl' => true, + ]; + } + + public function config(Device $device, ?DevicePollingMethod $deviceMethod = null): ProxmoxApiConfig + { + $settings = ($deviceMethod->settings ?? []) + $this->defaults($device); + $secret = $this->secretData($deviceMethod?->secret) ?? new ProxmoxApiSecretData; + assert($secret instanceof ProxmoxApiSecretData); + + return new ProxmoxApiConfig( + hostname: $settings['hostname'], + port: $settings['port'], + tokenId: $secret->tokenId, + tokenSecret: $secret->tokenSecret, + timeout: $settings['timeout'], + verifySsl: $settings['verify_ssl'], + ); + } + + /** + * Reads the API version and the cluster, it checks the connection and the token. + */ + public function probe(Device $device, PollingMethodConfig $config): ProbeResult + { + assert($config instanceof ProxmoxApiConfig); + + if ($config->tokenId === '' || $config->tokenSecret === '') { + return ProbeResult::failure(errorMessage: 'Proxmox API token is not set'); + } + + try { + $api = new ProxmoxApi($config); + $version = $api->version(); + $clusterId = $api->clusterId(); + } catch (ConnectionException|RequestException $e) { + return ProbeResult::failure(errorMessage: $e->getMessage()); + } + + if ($clusterId === null) { + return ProbeResult::failure(errorMessage: 'Proxmox API did not list the root CA that identifies the cluster'); + } + + return ProbeResult::success(['version' => $version['version'] ?? null, 'cluster_id' => $clusterId]); + } + + public function dataSourceClass(): string + { + return ProxmoxApiDataSource::class; + } + + public function dataSource(PollingMethodConfig $config, ProbeResult $result): ProxmoxApiDataSource + { + assert($config instanceof ProxmoxApiConfig); + + return new ProxmoxApiDataSource($config, (string) $result->stat('cluster_id')); + } + + public function secretTypes(): array + { + return [SecretType::ProxmoxApi]; + } +} diff --git a/LibreNMS/Polling/Method/Methods/SnmpPollingMethod.php b/LibreNMS/Polling/Method/Methods/SnmpPollingMethod.php index b9358a820ba..f606403c5a5 100644 --- a/LibreNMS/Polling/Method/Methods/SnmpPollingMethod.php +++ b/LibreNMS/Polling/Method/Methods/SnmpPollingMethod.php @@ -6,18 +6,17 @@ use App\Models\Device; use App\Models\DevicePollingMethod; use App\Models\Secret; -use Illuminate\Support\Collection; use LibreNMS\Data\Source\Snmp\SnmpBackendInterface; use LibreNMS\Data\Source\Snmp\SnmpQueryOptions; use LibreNMS\Enum\PollingMethodType; use LibreNMS\Enum\SecretType; -use LibreNMS\Exceptions\MissingSecretException; use LibreNMS\Modules\Core; use LibreNMS\Polling\Method\Config\PollingMethodConfig; use LibreNMS\Polling\Method\Config\SnmpConfig; use LibreNMS\Polling\Method\Definitions\SnmpDefinition; use LibreNMS\Polling\Method\ProbeResult; -use LibreNMS\Polling\Secrets\Data\SnmpSecretData; +use LibreNMS\Polling\Secrets\Data\SnmpCommunitySecretData; +use LibreNMS\Polling\Secrets\Data\SnmpV3SecretData; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; use SnmpQuery; @@ -43,13 +42,14 @@ public function defaultAffectsAvailability(): bool } /** - * @return array{transport: string, port: int, timeout: int|float, retries: int, max_repeaters: int, max_oid: int, bulk: bool, context: ?string, port_association_mode: string} + * @return array{version: string, transport: string, port: int, timeout: int|float, retries: int, max_repeaters: int, max_oid: int, bulk: bool, context: ?string, port_association_mode: string} */ public function defaults(?Device $device = null): array { $os = $device?->os ?: 'generic'; return [ + 'version' => 'v2c', 'transport' => LibrenmsConfig::get('snmp.transports.0', 'udp'), 'port' => (int) LibrenmsConfig::get('snmp.port', 161), 'timeout' => (float) LibrenmsConfig::get('snmp.timeout', 1), @@ -64,10 +64,18 @@ public function defaults(?Device $device = null): array public function config(Device $device, ?DevicePollingMethod $deviceMethod = null): SnmpConfig { - return SnmpConfig::make( - ($deviceMethod->settings ?? []) + $this->defaults($device), - SnmpSecretData::fromArray($deviceMethod->secret->data ?? []), - ); + $secret = $this->secretData($deviceMethod?->secret); + assert($secret === null || $secret instanceof SnmpCommunitySecretData || $secret instanceof SnmpV3SecretData); + + return SnmpConfig::make(($deviceMethod->settings ?? []) + $this->defaults($device), $secret); + } + + /** + * The SNMP version of the method, without decrypting the secret. + */ + public function version(?DevicePollingMethod $deviceMethod): string + { + return SnmpConfig::version($deviceMethod?->secret?->secret_type, $deviceMethod?->settings['version'] ?? null); } /** @@ -104,99 +112,32 @@ public function probe(Device $device, PollingMethodConfig $config): ProbeResult return new ProbeResult($success, ['response' => $response], $error); } - public function secretType(): SecretType - { - return SecretType::Snmp; - } - /** - * @inheritDoc + * A community for v1 and v2c, or a v3 secret. */ - public function discover(Device $device, DevicePollingMethod $deviceMethod): ProbeResult + public function secretTypes(): array { - // If specific credentials were supplied on the method, test them directly - if ($this->hasCredentials($deviceMethod)) { - $result = $this->probe($device, $this->config($device, $deviceMethod)); - if ($result->isSuccess()) { - return $result; - } - - return ProbeResult::failure($result->stats(), $result->errorMessage(), [$this->noReplyReason($deviceMethod->secret)]); - } - - // Otherwise, attempt the default credentials in order - $reasons = []; - $lastResult = null; - foreach ($this->defaultSecretsFor($deviceMethod) as $secret) { - $deviceMethod->setRelation('secret', $secret); - $deviceMethod->secret_id = $secret->id; - - $result = $this->probe($device, $this->config($device, $deviceMethod)); - if ($result->isSuccess()) { - return $result; - } - - $lastResult = $result; - $reasons[] = $this->noReplyReason($secret); - } - - return ProbeResult::failure($lastResult?->stats() ?? [], $lastResult?->errorMessage(), $reasons); + return [SecretType::SnmpCommunity, SecretType::SnmpV3]; } /** - * Without credentials, use the first default credential. + * A failure names the SNMP version and the credential that did not reply. */ - public function assignDefaultSecret(DevicePollingMethod $deviceMethod): void - { - if ($this->hasCredentials($deviceMethod)) { - return; - } - - $secret = $this->defaultSecretsFor($deviceMethod)->first() ?? throw new MissingSecretException(PollingMethodType::Snmp); - $deviceMethod->secret()->associate($secret); - } - - private function hasCredentials(DevicePollingMethod $deviceMethod): bool - { - return $deviceMethod->secret !== null && SnmpSecretData::fromArray($deviceMethod->secret->data ?? [])->hasCredentials(); - } - - /** - * All default credentials, or only those for the version when the secret has just a version. - * - * @return Collection - */ - private function defaultSecretsFor(DevicePollingMethod $deviceMethod): Collection + public function discover(Device $device, DevicePollingMethod $deviceMethod): ProbeResult { - $version = $deviceMethod->secret ? SnmpSecretData::fromArray($deviceMethod->secret->data ?? [])->version : null; + $result = $this->probe($device, $this->config($device, $deviceMethod)); - return $this->defaultSecrets($version); - } + if ($result->isSuccess() || $deviceMethod->secret === null) { + return $result; + } - /** - * The default credentials in the order they should be tried, optionally only those for one SNMP version. - * - * @return Collection - */ - public function defaultSecrets(?string $version = null): Collection - { - /** @var array $defaultSecretIds */ - $defaultSecretIds = (array) LibrenmsConfig::get('snmp.default_credentials', []); - - return Secret::where('secret_type', SecretType::Snmp) - ->whereIn('id', $defaultSecretIds) - ->get() - ->sortBy(fn (Secret $secret) => array_search($secret->id, $defaultSecretIds)) - ->when($version !== null, fn (Collection $secrets) => $secrets->filter( - fn (Secret $secret): bool => SnmpSecretData::fromArray($secret->data ?? [])->version === $version - )) - ->values(); + return ProbeResult::failure($result->stats(), $result->errorMessage(), [$this->noReplyReason($deviceMethod, $deviceMethod->secret)]); } - private function noReplyReason(Secret $secret): string + private function noReplyReason(DevicePollingMethod $deviceMethod, Secret $secret): string { return trans('exceptions.host_unreachable.no_reply_secret', [ - 'version' => SnmpSecretData::fromArray($secret->data ?? [])->version, + 'version' => $this->version($deviceMethod), 'secret' => $secret->description, ]); } diff --git a/LibreNMS/Polling/Method/Methods/UnixAgentPollingMethod.php b/LibreNMS/Polling/Method/Methods/UnixAgentPollingMethod.php index 1b7055f12b2..b1571d897cd 100644 --- a/LibreNMS/Polling/Method/Methods/UnixAgentPollingMethod.php +++ b/LibreNMS/Polling/Method/Methods/UnixAgentPollingMethod.php @@ -8,6 +8,7 @@ use Illuminate\Support\Facades\Log; use LibreNMS\Polling\Method\Config\PollingMethodConfig; use LibreNMS\Polling\Method\Config\UnixAgentConfig; +use LibreNMS\Polling\Method\DataSources\UnixAgentDataSource; use LibreNMS\Polling\Method\Definitions\UnixAgentDefinition; use LibreNMS\Polling\Method\ProbeResult; use LibreNMS\Util\Rewrite; @@ -17,6 +18,22 @@ */ final class UnixAgentPollingMethod extends PollingMethod { + /** + * @param string|null $recordedOutput agent output to use instead of connecting, for test fixtures (tests/unix-agent) + */ + public function __construct( + private readonly ?string $recordedOutput = null, + ) { + } + + /** + * Use an agent output recorded from a device, like `nc 6556 > tests/unix-agent/_.txt`. + */ + public static function recorded(string $file): self + { + return new self((string) file_get_contents($file)); + } + public function definition(): UnixAgentDefinition { return new UnixAgentDefinition; @@ -48,6 +65,16 @@ public function config(Device $device, ?DevicePollingMethod $deviceMethod = null ); } + public function dataSourceClass(): string + { + return UnixAgentDataSource::class; + } + + public function dataSource(PollingMethodConfig $config, ProbeResult $result): UnixAgentDataSource + { + return new UnixAgentDataSource($result); + } + /** * Connecting runs the whole agent, so the check fetches its output for the unix-agent module (output and time stats). */ @@ -56,6 +83,11 @@ public function probe(Device $device, PollingMethodConfig $config): ProbeResult assert($config instanceof UnixAgentConfig); $stats = ['port' => $config->port, 'timeout' => $config->timeout]; + + if ($this->recordedOutput !== null) { + return ProbeResult::success($stats + ['output' => $this->recordedOutput, 'time' => 0]); + } + $start = microtime(true); try { diff --git a/LibreNMS/Polling/Method/Methods/UnknownPollingMethod.php b/LibreNMS/Polling/Method/Methods/UnknownPollingMethod.php new file mode 100644 index 00000000000..fb4737b1dea --- /dev/null +++ b/LibreNMS/Polling/Method/Methods/UnknownPollingMethod.php @@ -0,0 +1,46 @@ + + */ +final class UnknownPollingMethod extends PollingMethod +{ + public function definition(): UnknownDefinition + { + return new UnknownDefinition; + } + + public function defaultAffectsAvailability(): bool + { + return false; + } + + /** + * @return array{} + */ + public function defaults(?Device $device = null): array + { + return []; + } + + public function config(Device $device, ?DevicePollingMethod $deviceMethod = null): UnknownConfig + { + return new UnknownConfig; + } + + public function probe(Device $device, PollingMethodConfig $config): ProbeResult + { + return ProbeResult::failure(errorMessage: 'Unknown polling method type, it can not be checked'); + } +} diff --git a/LibreNMS/Polling/Method/PollingMethodAccessor.php b/LibreNMS/Polling/Method/PollingMethodAccessor.php index fdcc3c12bfa..d1947f38f48 100644 --- a/LibreNMS/Polling/Method/PollingMethodAccessor.php +++ b/LibreNMS/Polling/Method/PollingMethodAccessor.php @@ -7,10 +7,8 @@ use Illuminate\Support\Collection; use LibreNMS\Enum\PollingMethodType; use LibreNMS\Polling\Method\Config\IcmpConfig; -use LibreNMS\Polling\Method\Config\IpmiConfig; use LibreNMS\Polling\Method\Config\PollingMethodConfig; use LibreNMS\Polling\Method\Config\SnmpConfig; -use LibreNMS\Polling\Method\Config\UnixAgentConfig; readonly class PollingMethodAccessor { @@ -37,18 +35,6 @@ public function icmp(): IcmpConfig return $this->get(PollingMethodType::Icmp); } - public function ipmi(): IpmiConfig - { - /** @var IpmiConfig */ - return $this->get(PollingMethodType::Ipmi); - } - - public function unixAgent(): UnixAgentConfig - { - /** @var UnixAgentConfig */ - return $this->get(PollingMethodType::UnixAgent); - } - /** * The method is configured and enabled for this device. */ @@ -57,6 +43,16 @@ public function isEnabled(PollingMethodType $type): bool return (bool) $this->device->pollingMethod($type)?->enabled; } + /** + * At least one of the methods is configured and enabled for this device. + * + * @param PollingMethodType[] $types + */ + public function anyEnabled(array $types): bool + { + return array_any($types, fn ($type) => $this->isEnabled($type)); + } + /** * Enabled methods that affect availability and failed their last check. * @@ -64,7 +60,7 @@ public function isEnabled(PollingMethodType $type): bool */ public function failedAvailabilityChecks(): Collection { - return $this->deviceMethods()->filter( + return $this->methods()->filter( fn (DevicePollingMethod $deviceMethod): bool => $deviceMethod->enabled && $deviceMethod->affects_availability && $deviceMethod->last_check_successful === false @@ -76,20 +72,24 @@ public function failedAvailabilityChecks(): Collection */ public function hasAvailabilityCheck(): bool { - return $this->deviceMethods()->contains( + return $this->methods()->contains( fn (DevicePollingMethod $deviceMethod): bool => $deviceMethod->enabled && $deviceMethod->affects_availability ); } /** + * The device's methods, without unknown types, which are never used. + * * @return Collection */ - private function deviceMethods(): Collection + public function methods(): Collection { if (! $this->device->exists && ! $this->device->relationLoaded('pollingMethods')) { return new Collection; } - return $this->device->pollingMethods->toBase(); + return $this->device->pollingMethods->toBase() + ->reject(fn (DevicePollingMethod $deviceMethod): bool => $deviceMethod->method_type === PollingMethodType::Unknown) + ->values(); } } diff --git a/LibreNMS/Polling/Method/PollingMethodRegistry.php b/LibreNMS/Polling/Method/PollingMethodRegistry.php index 98dc3ded0c6..9c34e780b86 100644 --- a/LibreNMS/Polling/Method/PollingMethodRegistry.php +++ b/LibreNMS/Polling/Method/PollingMethodRegistry.php @@ -7,8 +7,10 @@ use LibreNMS\Polling\Method\Methods\IcmpPollingMethod; use LibreNMS\Polling\Method\Methods\IpmiPollingMethod; use LibreNMS\Polling\Method\Methods\PollingMethod; +use LibreNMS\Polling\Method\Methods\ProxmoxApiPollingMethod; use LibreNMS\Polling\Method\Methods\SnmpPollingMethod; use LibreNMS\Polling\Method\Methods\UnixAgentPollingMethod; +use LibreNMS\Polling\Method\Methods\UnknownPollingMethod; /** * The polling method implementation for each type. @@ -23,8 +25,24 @@ public function get(PollingMethodType $type): PollingMethod return resolve(match ($type) { PollingMethodType::Icmp => IcmpPollingMethod::class, PollingMethodType::Ipmi => IpmiPollingMethod::class, + PollingMethodType::ProxmoxApi => ProxmoxApiPollingMethod::class, PollingMethodType::Snmp => SnmpPollingMethod::class, PollingMethodType::UnixAgent => UnixAgentPollingMethod::class, + PollingMethodType::Unknown => UnknownPollingMethod::class, }); } + + /** + * The methods with a data source that implements the module interface. + * + * @param class-string $interface + * @return list + */ + public function providing(string $interface): array + { + return array_values(array_filter( + PollingMethodType::cases(), + fn (PollingMethodType $type): bool => $this->get($type)->providesData($interface), + )); + } } diff --git a/LibreNMS/Polling/ModuleStatus.php b/LibreNMS/Polling/ModuleStatus.php index 00103791e26..66f27a0e11e 100644 --- a/LibreNMS/Polling/ModuleStatus.php +++ b/LibreNMS/Polling/ModuleStatus.php @@ -34,6 +34,7 @@ public function __construct( public ?bool $device = null, public ?bool $manual = null, public ?array $submodules = null, + public ?bool $method = null, // set by the device's polling methods ) { } @@ -51,6 +52,10 @@ public function isEnabled(): bool return $this->device; } + if ($this->method !== null) { + return $this->method; + } + if ($this->os !== null) { return $this->os; } @@ -68,6 +73,10 @@ public function reason(): string return 'by device'; } + if ($this->method !== null) { + return 'by polling method'; + } + if ($this->os !== null) { return 'by OS'; } @@ -82,10 +91,11 @@ public function hasSubModules(): bool public function __toString(): string { - return sprintf('Module %s: Global %s | OS %s | Device %s | Manual %s', + return sprintf('Module %s: Global %s | OS %s | Method %s | Device %s | Manual %s', $this->isEnabled() ? 'enabled' : 'disabled', $this->global ? '+' : '-', $this->os === null ? ' ' : ($this->os ? '+' : '-'), + $this->method === null ? ' ' : ($this->method ? '+' : '-'), $this->device === null ? ' ' : ($this->device ? '+' : '-'), $this->manual === null ? ' ' : ($this->manual ? '+' : '-'), ); diff --git a/LibreNMS/Polling/PerDeviceMethodResults.php b/LibreNMS/Polling/PerDeviceMethodResults.php index fe388c91ccd..f9f5d33d05f 100644 --- a/LibreNMS/Polling/PerDeviceMethodResults.php +++ b/LibreNMS/Polling/PerDeviceMethodResults.php @@ -33,6 +33,7 @@ use LibreNMS\Enum\PollingMethodType; use LibreNMS\Enum\Severity; use LibreNMS\Exceptions\SecretDecryptionException; +use LibreNMS\Exceptions\UnknownSecretTypeException; use LibreNMS\Polling\Method\PollingMethodRegistry; use LibreNMS\Polling\Method\ProbeResult; use Throwable; @@ -46,6 +47,9 @@ final class PerDeviceMethodResults /** @var array keyed by method type */ private array $results = []; + /** @var array keyed by method type */ + private array $dataSources = []; + public function __construct( public readonly Device $device, ) { @@ -73,6 +77,64 @@ public function result(PollingMethodType $type): ?ProbeResult return $this->results[$type->value] ??= $this->check($deviceMethod); } + /** + * Whether one of the methods is available, checking them in order until one is. + * + * @param PollingMethodType[] $types + */ + public function anyAvailable(array $types): bool + { + return array_any($types, fn ($type) => $this->isAvailable($type)); + } + + /** + * The data sources of the enabled methods that implement the interface and pass their check. + * Only methods with such a source are checked. + * + * @template T of object + * + * @param class-string $interface + * @return list + */ + public function dataSources(string $interface): array + { + $sources = []; + + foreach ($this->device->polling()->methods() as $deviceMethod) { + $source = $this->dataSource($deviceMethod->method_type, $interface); + + if ($source !== null) { + $sources[] = $source; + } + } + + return $sources; + } + + /** + * The data source of the method when it implements the interface, and the method is enabled and passes its check. + * The method is only checked when it has such a source. + * + * @template T of object + * + * @param class-string $interface + * @return T|null + */ + public function dataSource(PollingMethodType $type, string $interface): ?object + { + $deviceMethod = $this->device->pollingMethod($type); + if ($deviceMethod === null || ! $deviceMethod->enabled || ! app(PollingMethodRegistry::class)->get($type)->providesData($interface)) { + return null; + } + + if (! array_key_exists($type->value, $this->dataSources)) { + $this->dataSources[$type->value] = $this->createDataSource($deviceMethod); + } + $source = $this->dataSources[$type->value]; + + return $source instanceof $interface ? $source : null; + } + /** * Store the last check of each method checked so far. */ @@ -87,6 +149,23 @@ public function saveCheckedMethods(): void } } + private function createDataSource(DevicePollingMethod $deviceMethod): ?object + { + $type = $deviceMethod->method_type; + $result = $this->result($type); + + if (! $result?->isSuccess()) { + $reasons = implode(', ', $result?->reasons() ?? []); + Log::info("Polling method {$type->value} failed its check, modules using its data will not use it: $reasons"); + + return null; + } + + $method = app(PollingMethodRegistry::class)->get($type); + + return $method->dataSource($method->config($this->device, $deviceMethod), $result); + } + private function check(DevicePollingMethod $deviceMethod): ProbeResult { $method = app(PollingMethodRegistry::class)->get($deviceMethod->method_type); @@ -113,6 +192,10 @@ private function checkError(string $type, Throwable $e): string Log::error("Failed to decrypt credentials for $type polling on {$this->device->hostname}: {$e->getMessage()}"); $message = "Failed to decrypt credentials for $type polling. Verify that APP_KEY matches the primary installation."; $logType = 'auth'; + } elseif ($e instanceof UnknownSecretTypeException) { + Log::error("Can't check $type polling on {$this->device->hostname}: {$e->getMessage()}"); + $message = "Unknown secret type for $type polling, select another secret."; + $logType = 'auth'; } else { report($e); $message = "Error checking $type availability: " . class_basename($e) . '. Check log file for more details.'; diff --git a/LibreNMS/Polling/Secrets/Data/ProxmoxApiSecretData.php b/LibreNMS/Polling/Secrets/Data/ProxmoxApiSecretData.php new file mode 100644 index 00000000000..eb74bf9ff14 --- /dev/null +++ b/LibreNMS/Polling/Secrets/Data/ProxmoxApiSecretData.php @@ -0,0 +1,34 @@ + $data + */ + public static function fromArray(array $data): self + { + return new self( + tokenId: (string) ($data['token_id'] ?? ''), + tokenSecret: (string) ($data['token_secret'] ?? ''), + ); + } + + /** + * @return array + */ + public function toArray(): array + { + return [ + 'token_id' => $this->tokenId, + 'token_secret' => $this->tokenSecret, + ]; + } +} diff --git a/LibreNMS/Polling/Secrets/Data/SnmpCommunitySecretData.php b/LibreNMS/Polling/Secrets/Data/SnmpCommunitySecretData.php new file mode 100644 index 00000000000..da2014084c8 --- /dev/null +++ b/LibreNMS/Polling/Secrets/Data/SnmpCommunitySecretData.php @@ -0,0 +1,31 @@ + $data + */ + public static function fromArray(array $data): self + { + return new self( + community: (string) ($data['community'] ?? ''), + ); + } + + /** + * @return array + */ + public function toArray(): array + { + return [ + 'community' => $this->community, + ]; + } +} diff --git a/LibreNMS/Polling/Secrets/Data/SnmpSecretData.php b/LibreNMS/Polling/Secrets/Data/SnmpSecretData.php deleted file mode 100644 index cb8bfe6109f..00000000000 --- a/LibreNMS/Polling/Secrets/Data/SnmpSecretData.php +++ /dev/null @@ -1,53 +0,0 @@ - $data - */ - public static function fromArray(array $data): self - { - return new self( - version: (string) ($data['version'] ?? SnmpSecretDefinition::DEFAULT_VERSION), - community: isset($data['community']) ? (string) $data['community'] : null, - authlevel: isset($data['authlevel']) ? (string) $data['authlevel'] : SnmpSecretDefinition::DEFAULT_AUTHLEVEL, - authname: isset($data['authname']) ? (string) $data['authname'] : null, - authpass: isset($data['authpass']) ? (string) $data['authpass'] : null, - authalgo: isset($data['authalgo']) ? (string) $data['authalgo'] : SnmpSecretDefinition::DEFAULT_AUTHALGO, - cryptoalgo: isset($data['cryptoalgo']) ? (string) $data['cryptoalgo'] : SnmpSecretDefinition::DEFAULT_CRYPTOALGO, - cryptopass: isset($data['cryptopass']) ? (string) $data['cryptopass'] : null, - ); - } - - /** - * A secret with only a version has no credentials, the default credentials for that version are tried instead. - */ - public function hasCredentials(): bool - { - return $this->version === 'v3' ? ! empty($this->authname) : ! empty($this->community); - } - - /** - * @return array - */ - public function toArray(): array - { - return array_filter(get_object_vars($this), fn ($v) => $v !== null); - } -} diff --git a/LibreNMS/Polling/Secrets/Data/SnmpV3SecretData.php b/LibreNMS/Polling/Secrets/Data/SnmpV3SecretData.php new file mode 100644 index 00000000000..0dd0dd712da --- /dev/null +++ b/LibreNMS/Polling/Secrets/Data/SnmpV3SecretData.php @@ -0,0 +1,41 @@ + $data + */ + public static function fromArray(array $data): self + { + return new self( + authname: isset($data['authname']) ? (string) $data['authname'] : null, + authlevel: (string) ($data['authlevel'] ?? SnmpV3SecretDefinition::DEFAULT_AUTHLEVEL), + authpass: isset($data['authpass']) ? (string) $data['authpass'] : null, + authalgo: (string) ($data['authalgo'] ?? SnmpV3SecretDefinition::DEFAULT_AUTHALGO), + cryptoalgo: (string) ($data['cryptoalgo'] ?? SnmpV3SecretDefinition::DEFAULT_CRYPTOALGO), + cryptopass: isset($data['cryptopass']) ? (string) $data['cryptopass'] : null, + ); + } + + /** + * @return array + */ + public function toArray(): array + { + return array_filter(get_object_vars($this), fn ($v) => $v !== null); + } +} diff --git a/LibreNMS/Polling/Secrets/Data/UnknownSecretData.php b/LibreNMS/Polling/Secrets/Data/UnknownSecretData.php new file mode 100644 index 00000000000..d215d4eef3c --- /dev/null +++ b/LibreNMS/Polling/Secrets/Data/UnknownSecretData.php @@ -0,0 +1,22 @@ + $data + */ + public function __construct( + public array $data = [], + ) { + } + + /** + * @return array + */ + public function toArray(): array + { + return $this->data; + } +} diff --git a/LibreNMS/Polling/Secrets/Definitions/ProxmoxApiSecretDefinition.php b/LibreNMS/Polling/Secrets/Definitions/ProxmoxApiSecretDefinition.php new file mode 100644 index 00000000000..cfcec8c57ea --- /dev/null +++ b/LibreNMS/Polling/Secrets/Definitions/ProxmoxApiSecretDefinition.php @@ -0,0 +1,49 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace LibreNMS\Polling\Secrets\Definitions; + +use App\View\FieldSchema\FieldDefinition; + +class ProxmoxApiSecretDefinition extends SecretDefinition +{ + /** + * @inheritDoc + */ + public function fields(): array + { + return [ + 'token_id' => FieldDefinition::make('token_id', 'text') + ->label('API Token ID') + ->placeholder('user@realm!tokenname') + ->rules(['required', 'string', 'regex:/^[^@\s]+@[^!\s]+![^\s=]+$/']), + + 'token_secret' => FieldDefinition::make('token_secret', 'password') + ->label('API Token Secret') + ->rules(['required', 'uuid']), + ]; + } +} diff --git a/includes/discovery/sensors/charge/netagent2.inc.php b/LibreNMS/Polling/Secrets/Definitions/SnmpCommunitySecretDefinition.php similarity index 55% rename from includes/discovery/sensors/charge/netagent2.inc.php rename to LibreNMS/Polling/Secrets/Definitions/SnmpCommunitySecretDefinition.php index c29cab4f98e..72d77a0cd6a 100644 --- a/includes/discovery/sensors/charge/netagent2.inc.php +++ b/LibreNMS/Polling/Secrets/Definitions/SnmpCommunitySecretDefinition.php @@ -1,7 +1,7 @@ */ -use LibreNMS\Enum\SensorType; +namespace LibreNMS\Polling\Secrets\Definitions; -$charge_oid = '.1.3.6.1.4.1.935.1.1.1.2.2.1.0'; -$charge = SnmpQuery::get($charge_oid)->value(); +use App\View\FieldSchema\FieldDefinition; -if (! empty($charge)) { - $type = 'netagent2'; - $index = 0; - $limit = null; - $lowlimit = 0; - $lowwarnlimit = 10; - $divisor = 1; - $descr = 'Battery Charge'; - - discover_sensor( - null, - SensorType::Charge, - $device, - $charge_oid, - $index, - $type, - $descr, - $divisor, - 1, - $lowlimit, - $lowwarnlimit, - null, - $limit, - $charge - ); +/** + * A community for SNMP v1 and v2c, the version is a setting of the polling method. + */ +class SnmpCommunitySecretDefinition extends SecretDefinition +{ + /** + * @inheritDoc + */ + public function fields(): array + { + return [ + 'community' => FieldDefinition::make('community', 'password') + ->label('Community') + ->rules(['required', 'string']), + ]; + } } diff --git a/LibreNMS/Polling/Secrets/Definitions/SnmpSecretDefinition.php b/LibreNMS/Polling/Secrets/Definitions/SnmpV3SecretDefinition.php similarity index 72% rename from LibreNMS/Polling/Secrets/Definitions/SnmpSecretDefinition.php rename to LibreNMS/Polling/Secrets/Definitions/SnmpV3SecretDefinition.php index 10d80663b4d..49b69b9e242 100644 --- a/LibreNMS/Polling/Secrets/Definitions/SnmpSecretDefinition.php +++ b/LibreNMS/Polling/Secrets/Definitions/SnmpV3SecretDefinition.php @@ -1,7 +1,7 @@ FieldDefinition::make('version', 'select') - ->label('SNMP Version') - ->options([ - 'v1' => 'v1', - 'v2c' => 'v2c', - 'v3' => 'v3', - ]) - ->default(self::DEFAULT_VERSION) - ->rules(['required', 'in:v1,v2c,v3']), - - 'community' => FieldDefinition::make('community', 'password') - ->label('Community') - ->visibleIf([ - 'version' => ['$in' => ['v1', 'v2c']], - ]) - ->rules(['required_if:version,v1,v2c', 'string', 'nullable']), - 'authlevel' => FieldDefinition::make('authlevel', 'select') ->label('Auth Level') ->options([ @@ -69,22 +51,15 @@ public function fields(): array 'authPriv' => 'Authentication, Privacy', ]) ->default(self::DEFAULT_AUTHLEVEL) - ->visibleIf([ - 'version' => 'v3', - ]) - ->rules(['required_if:version,v3', 'in:noAuthNoPriv,authNoPriv,authPriv']), + ->rules(['required', 'in:noAuthNoPriv,authNoPriv,authPriv']), 'authname' => FieldDefinition::make('authname', 'text') ->label('Auth Name') - ->visibleIf([ - 'version' => 'v3', - ]) - ->rules(['required_if:version,v3', 'string', 'nullable']), + ->rules(['required', 'string']), 'authpass' => FieldDefinition::make('authpass', 'password') ->label('Auth Password') ->visibleIf([ - 'version' => 'v3', 'authlevel' => ['$in' => ['authNoPriv', 'authPriv']], ]) ->rules(['required_if:authlevel,authNoPriv,authPriv', 'string', 'nullable']), @@ -101,7 +76,6 @@ public function fields(): array ]) ->default(self::DEFAULT_AUTHALGO) ->visibleIf([ - 'version' => 'v3', 'authlevel' => ['$in' => ['authNoPriv', 'authPriv']], ]) ->rules(['required_if:authlevel,authNoPriv,authPriv', 'in:MD5,SHA,SHA-224,SHA-256,SHA-384,SHA-512']), @@ -118,7 +92,6 @@ public function fields(): array ]) ->default(self::DEFAULT_CRYPTOALGO) ->visibleIf([ - 'version' => 'v3', 'authlevel' => 'authPriv', ]) ->rules(['required_if:authlevel,authPriv', 'in:DES,AES,AES-192,AES-256,AES-192-C,AES-256-C']), @@ -126,7 +99,6 @@ public function fields(): array 'cryptopass' => FieldDefinition::make('cryptopass', 'password') ->label('Crypto Password') ->visibleIf([ - 'version' => 'v3', 'authlevel' => 'authPriv', ]) ->rules(['required_if:authlevel,authPriv', 'string', 'nullable']), diff --git a/LibreNMS/Polling/Secrets/Definitions/UnknownSecretDefinition.php b/LibreNMS/Polling/Secrets/Definitions/UnknownSecretDefinition.php new file mode 100644 index 00000000000..29429917b66 --- /dev/null +++ b/LibreNMS/Polling/Secrets/Definitions/UnknownSecretDefinition.php @@ -0,0 +1,39 @@ + $value === null || $value === '' ? $value : self::MASK, $data); + } + + /** + * @inheritDoc + */ + public function unmask(array $data, array $original): array + { + foreach ($data as $key => $value) { + if ($value === self::MASK) { + $data[$key] = $original[$key] ?? null; + } + } + + return $data; + } +} diff --git a/LibreNMS/RRD/Backend/PhpRrd.php b/LibreNMS/RRD/Backend/PhpRrd.php new file mode 100644 index 00000000000..2f747dbe2a9 --- /dev/null +++ b/LibreNMS/RRD/Backend/PhpRrd.php @@ -0,0 +1,212 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Steven Wilton + * @author Steven Wilton + */ + +namespace LibreNMS\RRD\Backend; + +use App\Facades\LibrenmsConfig; +use LibreNMS\Exceptions\RrdException; +use LibreNMS\Exceptions\RrdGraphException; +use LibreNMS\Exceptions\RrdUnknownException; +use LibreNMS\RRD\RrdPath; +use Log; + +class PhpRrd extends Rrdtool +{ + /** + * @param string|null $rrdcached rrdcached address to send commands to + * + * @throws RrdUnknownException + */ + public function __construct(?string $rrdcached) + { + if (! extension_loaded('rrd')) { + throw new RrdUnknownException('The php-rrd extension is not loaded'); + } + + parent::__construct($rrdcached); + } + + public function __destruct() + { + // librrd keeps its rrdcached connection in global state, release it with the backend + if ($this->rrdcached) { + rrdc_disconnect(); + } + } + + /** + * @param string[] $arguments + * + * @throws RrdException + */ + protected function createFile(RrdPath $rrd, array $arguments): void + { + $arguments = [...$this->daemon(), ...$arguments, ...$this->noOverwrite($rrd)]; + Log::debug("PHPRRD[%gcreate $rrd " . implode(' ', $arguments) . '%n]', ['color' => true]); + + if (! $this->inRrdDir(fn () => rrd_create($rrd->relativePath(), $arguments))) { + throw RrdException::parse(rrd_error()); + } + } + + /** + * @param array $values + * + * @throws RrdException + */ + public function update(RrdPath $rrd, array $values, ?int $timestamp = null): void + { + $arguments = [...$this->daemon(), ($timestamp ?? 'N') . ':' . $this->formatValues($values)]; + Log::debug("PHPRRD[%gupdate $rrd " . implode(' ', $arguments) . '%n]', ['color' => true]); + + // \RRDUpdater can't be given --daemon, so use the function + if (! rrd_update($this->file($rrd), $arguments)) { + throw RrdException::parse(rrd_error()); + } + } + + /** + * @param array $limits + * + * @throws RrdException + */ + public function tune(RrdPath $rrd, array $limits): void + { + $arguments = [...$this->daemon(), ...$this->limitArguments($limits)]; + Log::debug("PHPRRD[%gtune $rrd " . implode(' ', $arguments) . '%n]', ['color' => true]); + + if (! rrd_tune($this->file($rrd), $arguments)) { + throw RrdException::parse(rrd_error()); + } + } + + /** + * @throws RrdException + */ + public function last(RrdPath $rrd): int + { + if ($this->remote()) { + return parent::last($rrd); + } + + $last = rrd_last($this->file($rrd)); + if ($last === false) { // @phpstan-ignore identical.alwaysFalse (the stubs omit false, which php-rrd returns on error) + throw RrdException::parse(rrd_error()); + } + + return $last; + } + + protected function version(): string + { + return rrd_version(); + } + + /** + * librrd only reads the timezone from the TZ environment variable, which is process wide, + * so this is not safe to use from multiple threads in the same process. + * + * @param string[] $options + */ + public function graph(array $options, ?string $timezone = null): string + { + // librrd calls tzset() during graph init, so TZ must be set in the environment + $savedTz = getenv('TZ'); + if ($timezone) { + putenv("TZ=$timezone"); + } + + $options = [...$this->daemon(), ...$options]; + Log::debug('PHPRRD[%ggraph ' . implode(' ', $options) . '%n]', ['color' => true]); + $graph = new \RRDGraph('-'); + $graph->setOptions($options); + try { + $data = $this->inRrdDir($graph->saveVerbose(...)); + } catch (\Exception $e) { + throw new RrdGraphException($e->getMessage()); + } finally { + if ($timezone) { + putenv($savedTz === false ? 'TZ' : "TZ=$savedTz"); + } + } + + return $data['image']; + } + + /** + * The file name to give librrd, a remote rrdcached resolves relative names against its base directory + */ + private function file(RrdPath $rrd): string + { + return $this->remote() ? $rrd->relativePath() : $rrd->fullPath(); + } + + /** + * librrd resolves file names from the working directory, which is process wide, so run in the + * rrd directory like the rrdtool process does for commands that may reference other files + * (create sources, graph DEFs). A remote rrdcached may have no local directory. + * + * @template T + * + * @param callable(): T $callback + * @return T + */ + private function inRrdDir(callable $callback): mixed + { + $rrdDir = (string) LibrenmsConfig::get('rrd_dir'); + $savedCwd = is_dir($rrdDir) ? getcwd() : false; + if ($savedCwd !== false) { + chdir($rrdDir); + } + + try { + return $callback(); + } finally { + if ($savedCwd !== false) { + chdir($savedCwd); + } + } + } + + /** + * @return string[] librrd arguments to send the command through rrdcached when it is set + */ + private function daemon(): array + { + return $this->rrdcached ? ['--daemon', $this->rrdcached] : []; + } +} diff --git a/LibreNMS/RRD/Backend/RrdBackendInterface.php b/LibreNMS/RRD/Backend/RrdBackendInterface.php new file mode 100644 index 00000000000..55945a3e36f --- /dev/null +++ b/LibreNMS/RRD/Backend/RrdBackendInterface.php @@ -0,0 +1,116 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Steven Wilton + * @author Steven Wilton + */ + +namespace LibreNMS\RRD\Backend; + +use LibreNMS\Exceptions\RrdException; +use LibreNMS\Exceptions\RrdGraphException; +use LibreNMS\Exceptions\RrdNotFoundException; +use LibreNMS\RRD\RrdDefinition; +use LibreNMS\RRD\RrdPath; + +/** + * Storage and graphing operations for rrd files, using local files or rrdcached when it is set. + * rrdcached may be on another host, so files are not assumed to be local when it is set. + * + * File names are relative to the rrd directory, including those in graph options, + * which matches how rrdcached resolves them against its base directory. + * + * Errors are reported with RrdException subclasses. RrdStoreException subclasses + * mean the store itself is unusable (connection, permissions), anything else is + * specific to the file or data. + * + * Behavior with rrdcached: + * - updates are queued, so data errors (such as a data source count mismatch) + * are only detected when the daemon writes the file and are not reported. + * - librrd creates the file locally if the daemon can't be reached. + * + * Backends release any process or socket they hold when they are destroyed. + */ +interface RrdBackendInterface +{ + /** + * Create the rrd file described by the definition, an existing file is left untouched. + * + * @throws RrdException + */ + public function create(RrdPath $rrd, RrdDefinition $definition): void; + + /** + * Store values. + * + * @param array $values values in data source order, non-numeric values are stored as unknown + * @param int|null $timestamp unix time of the values, defaults to now + * + * @throws RrdNotFoundException if the file does not exist + * @throws RrdException + */ + public function update(RrdPath $rrd, array $values, ?int $timestamp = null): void; + + /** + * Change the minimum and/or maximum allowed values of data sources in an existing file. + * Values outside the limits are stored as unknown. A null limit removes it. + * + * @param array $limits data source name => limits + * + * @throws RrdNotFoundException if the file does not exist + * @throws RrdException + */ + public function tune(RrdPath $rrd, array $limits): void; + + /** + * Gets the timestamp of the last update to the RRD file + * + * @throws RrdException if the store can not be checked + */ + public function last(RrdPath $rrd): int; + + /** + * List the rrd files for a host, optionally limited to file names starting with $prefix. + * + * @return RrdPath[] + * + * @throws RrdException + */ + public function list(string $hostname, string $prefix = ''): array; + + /** + * Draw a graph + * + * @param string[] $options rrdtool graph options + * @param string|null $timezone timezone to draw the graph in, defaults to the server timezone + * @return string the image + * + * @throws RrdGraphException + */ + public function graph(array $options, ?string $timezone = null): string; + + /** + * Whether rrdcached is on another host, so the files may not be local. + * librrd treats unix: and bare paths as unix sockets and resolves file names locally for them. + */ + public function remote(): bool; +} diff --git a/LibreNMS/RRD/Backend/Rrdtool.php b/LibreNMS/RRD/Backend/Rrdtool.php new file mode 100644 index 00000000000..95e0bb08a12 --- /dev/null +++ b/LibreNMS/RRD/Backend/Rrdtool.php @@ -0,0 +1,253 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Steven Wilton + * @author Steven Wilton + */ + +namespace LibreNMS\RRD\Backend; + +use LibreNMS\Exceptions\RrdException; +use LibreNMS\Exceptions\RrdFileExistsException; +use LibreNMS\Exceptions\RrdGraphException; +use LibreNMS\Exceptions\RrdNotFoundException; +use LibreNMS\Exceptions\RrdSourceException; +use LibreNMS\RRD\RrdDefinition; +use LibreNMS\RRD\RrdPath; +use LibreNMS\RRD\RrdProcess; +use LibreNMS\Util\Debug; +use Log; + +/** + * Pipes commands to an rrdtool process, rrdtool forwards them to rrdcached when it is configured. + * The process runs in the rrd directory, so file names are given relative to it. + */ +class Rrdtool implements RrdBackendInterface +{ + /** + * @param string|null $rrdcached rrdcached address the rrdtool process forwards commands to + * @param RrdProcess|null $process the rrdtool process, started on first use when not given + * @param string $version rrdtool version + */ + public function __construct( + protected readonly ?string $rrdcached, + private ?RrdProcess $process = null, + private readonly string $version = '1.7.0', + ) { + } + + /** + * Source files that can't be read are skipped. librrd checks them locally, so with a remote + * rrdcached they are only used when it shares storage with this host. + * + * @throws RrdException + */ + public function create(RrdPath $rrd, RrdDefinition $definition): void + { + try { + try { + $this->createFile($rrd, $definition->getCreateArguments()); + } catch (RrdSourceException $e) { + if (! $definition->hasSources()) { + throw $e; + } + + Log::debug("RRD[%g$rrd creating without sources: {$e->getMessage()}%n]", ['color' => true]); + $this->createFile($rrd, $definition->getCreateArguments(withSources: false)); + } + } catch (RrdFileExistsException) { + Log::debug("RRD[%g$rrd already exists%n]", ['color' => true]); + } + } + + /** + * @param string[] $arguments rrdtool create arguments + * + * @throws RrdException + */ + protected function createFile(RrdPath $rrd, array $arguments): void + { + $this->run('create', $rrd->relativePath(), [...$arguments, ...$this->noOverwrite($rrd)]); + } + + /** + * Arguments to keep an existing file, rrdtool <1.4.3 doesn't support -O so check for the file instead + * + * @return string[] + * + * @throws RrdFileExistsException + */ + protected function noOverwrite(RrdPath $rrd): array + { + if (version_compare($this->version(), '1.4.3', '>=')) { + return ['-O']; + } + + if (is_file($rrd->fullPath())) { + throw new RrdFileExistsException("$rrd already exists"); + } + + return []; + } + + protected function version(): string + { + return $this->version; + } + + /** + * @param array $values + * + * @throws RrdException + */ + public function update(RrdPath $rrd, array $values, ?int $timestamp = null): void + { + $this->run('update', $rrd->relativePath(), [($timestamp ?? 'N') . ':' . $this->formatValues($values)]); + } + + /** + * @param array $limits + * + * @throws RrdException + */ + public function tune(RrdPath $rrd, array $limits): void + { + $this->run('tune', $rrd->relativePath(), $this->limitArguments($limits)); + } + + /** + * @throws RrdException + */ + public function last(RrdPath $rrd): int + { + return (int) $this->run('last', $rrd->relativePath()); + } + + /** + * @return RrdPath[] + * + * @throws RrdException + */ + public function list(string $hostname, string $prefix = ''): array + { + try { + $output = $this->run('list', ($this->rrdcached ? '/' : '') . RrdPath::make($hostname)->relativePath()); + } catch (RrdNotFoundException) { + return []; + } + + return $this->toPaths($hostname, $prefix, explode("\n", $output)); + } + + /** + * Graphs run in their own short lived rrdtool process so they can use the viewer's timezone + * + * @param string[] $options + */ + public function graph(array $options, ?string $timezone = null): string + { + try { + $process = app(RrdProcess::class, ['timeout' => 300, 'timezone' => $timezone]); + + return $process->run('"' . implode('" "', ['graph', '-', ...$options]) . '"'); + } catch (RrdException $e) { + throw new RrdGraphException($e->getMessage(), 'Error'); + } + } + + /** + * Pipe a command to rrdtool + * + * @param string[] $arguments + * + * @throws RrdException + */ + private function run(string $command, string $filename, array $arguments = []): string + { + $this->process ??= app(RrdProcess::class, ['timeout' => 1200]); + $output = $this->process->run(implode(' ', [$command, $filename, ...$arguments])); + + if (Debug::isVerbose() && $output) { + Log::debug('RRDtool Output: ' . $output); + } + + return $output; + } + + /** + * Whether rrdcached is on another host, so the files may not be local. + * librrd treats unix: and bare paths as unix sockets and resolves file names locally for them. + */ + public function remote(): bool + { + return $this->rrdcached !== null + && $this->rrdcached !== '' + && ! str_starts_with($this->rrdcached, 'unix:') + && ! str_starts_with($this->rrdcached, '/'); + } + + /** + * @param array $values + */ + protected function formatValues(array $values): string + { + return implode(':', array_map(fn ($v) => is_numeric($v) ? $v : 'U', $values)); + } + + /** + * @param array $limits + * @return string[] rrdtool tune arguments + */ + protected function limitArguments(array $limits): array + { + $arguments = []; + foreach ($limits as $ds => $limit) { + if (array_key_exists('min', $limit)) { + array_push($arguments, '--minimum', $ds . ':' . ($limit['min'] ?? 'U')); + } + if (array_key_exists('max', $limit)) { + array_push($arguments, '--maximum', $ds . ':' . ($limit['max'] ?? 'U')); + } + } + + return $arguments; + } + + /** + * Filter file names by prefix and turn them into paths for the host + * + * @param string[] $files + * @return RrdPath[] + */ + protected function toPaths(string $hostname, string $prefix, array $files): array + { + $paths = []; + foreach ($files as $file) { + $file = basename(trim($file)); + if ($file !== '' && str_starts_with($file, $prefix) && str_ends_with($file, '.rrd')) { + $paths[] = RrdPath::make($hostname, $file); + } + } + + return $paths; + } +} diff --git a/LibreNMS/RRD/PortRrd.php b/LibreNMS/RRD/PortRrd.php new file mode 100644 index 00000000000..d6d116701c6 --- /dev/null +++ b/LibreNMS/RRD/PortRrd.php @@ -0,0 +1,43 @@ + + */ + public static function tuneLimits(int $ifSpeed): array + { + if ($ifSpeed < 10000000) { + return []; + } + + return array_fill_keys(self::COUNTERS, ['max' => $ifSpeed / 8]); + } +} diff --git a/LibreNMS/RRD/RrdDefinition.php b/LibreNMS/RRD/RrdDefinition.php index 0d8104e1f53..b70822c0a05 100644 --- a/LibreNMS/RRD/RrdDefinition.php +++ b/LibreNMS/RRD/RrdDefinition.php @@ -33,9 +33,10 @@ class RrdDefinition implements \Stringable { private static $types = ['GAUGE', 'DERIVE', 'COUNTER', 'ABSOLUTE', 'DCOUNTER', 'DDERIVE']; private $dataSets = []; - private $sources = []; - private $invalid_source = []; private $skipNameCheck = false; + private ?int $step = null; + /** @var string[]|null */ + private ?array $rras = null; /** * Make a new empty RrdDefinition @@ -45,6 +46,41 @@ public static function make() return new self(); } + /** + * Set the step (seconds between updates), defaults to the rrd.step setting + */ + public function setStep(int $step): static + { + $this->step = $step; + + return $this; + } + + public function getStep(): int + { + return $this->step ?? (int) LibrenmsConfig::get('rrd.step', 300); + } + + /** + * Set the round robin archives, defaults to the rrd_rra setting + * + * @param string[] $rras RRA:CF:xff:steps:rows + */ + public function setRras(array $rras): static + { + $this->rras = $rras; + + return $this; + } + + /** + * @return string[] + */ + public function getRras(): array + { + return $this->rras ?? preg_split('/\s+/', trim((string) LibrenmsConfig::get('rrd_rra')), -1, PREG_SPLIT_NO_EMPTY); + } + /** * Add a dataset to this definition. * See https://oss.oetiker.ch/rrdtool/doc/rrdcreate.en.html for more information. @@ -55,7 +91,7 @@ public static function make() * @param int $max Maximum allowed value. null means undefined. * @param int $heartbeat Heartbeat for this dataset. Uses the global setting if null. * @param string $source_ds Dataset to copy data from an existing rrd file - * @param string $source_file File to copy data from (may be ommitted copy from the current file) + * @param RrdPath|null $source_file File to copy data from (may be ommitted copy from the current file) * @return RrdDefinition */ public function addDataset($name, $type, $min = null, $max = null, $heartbeat = null, $source_ds = null, $source_file = null) @@ -88,20 +124,74 @@ public function __toString(): string return implode(' ', $this->getArguments()); } - public function getArguments(): array + /** + * Get the sources and data sources as they would be passed to rrdtool create + * + * @param bool $withSources copy data from source files, data sources are left empty without them + * @return string[] + */ + public function getArguments(bool $withSources = true): array { - $def = []; + // sources are referenced from data sources by 1 based index + $sources = []; + $dataSources = []; + foreach ($this->dataSets as $ds) { + $name = $ds['name'] . ($withSources ? $this->createSource($ds['source_ds'], $ds['source_file'], $sources) : ''); + $dataSources[] = "DS:$name:{$ds['type']}:{$ds['hb']}:{$ds['min']}:{$ds['max']}"; + } + + $arguments = []; + foreach (array_keys($sources) as $source) { + array_push($arguments, '--source', $source); + } + + return [...$arguments, ...$dataSources]; + } + /** + * Check if any data is copied from source files + */ + public function hasSources(): bool + { foreach ($this->dataSets as $ds) { - $name = $ds['name'] . $this->createSource($ds['source_ds'], $ds['source_file']); - $def[] = "DS:$name:{$ds['type']}:{$ds['hb']}:{$ds['min']}:{$ds['max']}"; + if ($ds['source_ds'] && $ds['source_file']) { + return true; + } } - foreach ($this->sources as $source) { - array_unshift($def, '--source', $source); + return false; + } + + /** + * Everything rrdtool create needs after the file name: step, sources, data sources and archives + * + * @param bool $withSources copy data from source files, data sources are left empty without them + * @return string[] + */ + public function getCreateArguments(bool $withSources = true): array + { + return ['--step', (string) $this->getStep(), ...$this->getArguments($withSources), ...$this->getRras()]; + } + + /** + * Order values to match the data sources, values for unknown data sources are dropped + * and missing values are unknown. With name checking disabled, values are kept in the given order. + * + * @param array $fields data source name => value + * @return array + */ + public function orderValues(array $fields): array + { + if ($this->skipNameCheck) { + return array_values($fields); } - return $def; + $values = []; + foreach ($fields as $name => $value) { + $values[$this->escapeName($name)] = $value; + } + + return array_map(fn ($ds) => $values[$ds] ?? null, array_keys($this->dataSets)); } /** @@ -128,35 +218,22 @@ public function disableNameChecking() return $this; } - private function createSource(?string $ds, ?string $file): string + /** + * @param array $sources relative path => 1 based index + */ + private function createSource(?string $ds, ?RrdPath $file, array &$sources): string { if (empty($ds)) { return ''; } - $output = '=' . $ds; - - // if is file given, find or add it to the sources list - if ($file) { - $index = array_search($file, $this->sources); - if ($index === false) { - // check if source rrd exists and cache failures - // using file_exists because source does not seem to support rrdcached - // so this will only work if we have file access to the old rrd file - if (isset($this->invalid_source[$file]) || ! file_exists($file)) { - $this->invalid_source[$file] = true; - - return ''; // skip source if file does not exist - } - - $this->sources[] = $file; - $index = array_key_last($this->sources); - } - - $output .= '[' . ($index + 1) . ']'; // rrdcreate sources are 1 based + if ($file === null) { + return '=' . $ds; } - return $output; + $index = $sources[$file->relativePath()] ??= count($sources) + 1; + + return "=$ds" . "[$index]"; // rrdcreate sources are 1 based } /** diff --git a/LibreNMS/RRD/RrdPath.php b/LibreNMS/RRD/RrdPath.php index 8915f83b5c1..0fbbb0a1517 100644 --- a/LibreNMS/RRD/RrdPath.php +++ b/LibreNMS/RRD/RrdPath.php @@ -43,16 +43,6 @@ public static function make(string $hostname, string $filename = ''): RrdPath return self::fromParts(trim($hostname, '[]'), $filename); } - /** - * Legacy proxmox layout: proxmox// - * - * @deprecated remove when proxmox is rewritten - */ - public static function proxmox(string $cluster, string $filename = ''): RrdPath - { - return self::fromParts('proxmox', $cluster, $filename); - } - /** * Sanitize each path component and join them, skipping empty components */ @@ -73,13 +63,11 @@ public function fullPath(): string return LibrenmsConfig::get('rrd_dir') . DIRECTORY_SEPARATOR . $this->relativePath; } - public function defaultPath(): string - { - return LibrenmsConfig::get('rrdcached') ? $this->relativePath() : $this->fullPath(); - } - + /** + * The path relative to the rrd directory, backends resolve it from there + */ public function __toString(): string { - return $this->defaultPath(); + return $this->relativePath; } } diff --git a/LibreNMS/RRD/RrdProcess.php b/LibreNMS/RRD/RrdProcess.php index a1a448f0d2d..ea81249c842 100644 --- a/LibreNMS/RRD/RrdProcess.php +++ b/LibreNMS/RRD/RrdProcess.php @@ -17,16 +17,15 @@ class RrdProcess const COMMAND_COMPLETE = 'OK u:'; private readonly string $rrd_dir; - private readonly InputStream $input; + private InputStream $input; private ?Process $process = null; private Closure $processFactory; + private float $lastUsed = 0; - public function __construct(private readonly LoggerInterface $logger, Binaries $binaries, private readonly int $timeout = 300, ?Closure $processFactory = null) + public function __construct(private readonly LoggerInterface $logger, Binaries $binaries, private readonly int $timeout = 300, ?Closure $processFactory = null, ?string $timezone = null) { $this->rrd_dir = Str::finish(LibrenmsConfig::get('rrd_dir', LibrenmsConfig::get('install_dir') . '/rrd'), '/'); - $this->input = new InputStream(); - // set up process factory if ($processFactory === null) { $command = [$binaries->path('rrdtool'), '-']; @@ -34,8 +33,8 @@ public function __construct(private readonly LoggerInterface $logger, Binaries $ if (LibrenmsConfig::get('rrdcached', '')) { $env['RRDCACHED_ADDRESS'] = LibrenmsConfig::get('rrdcached', ''); } - if (session('preferences.timezone')) { - $env['TZ'] = session('preferences.timezone'); + if ($timezone) { + $env['TZ'] = $timezone; } $this->processFactory = fn () => new Process( command: $command, @@ -49,12 +48,21 @@ public function __construct(private readonly LoggerInterface $logger, Binaries $ public function start(): void { + // the idle timeout counts time between commands, so replace a process that sat idle + // for half of it to leave the next command enough time before it is killed + if ($this->process?->isRunning() && microtime(true) - $this->lastUsed > $this->timeout / 2) { + $this->stop(); + } + if ($this->process === null || ! $this->process->isRunning()) { + // fresh input so nothing left unread by a stopped process (like quit) reaches the new one + $this->input = new InputStream(); $this->process = ($this->processFactory)(); $this->process->setInput($this->input); $this->process->setTimeout($this->timeout); $this->process->setIdleTimeout($this->timeout); $this->process->start(); + $this->lastUsed = microtime(true); } } @@ -114,6 +122,7 @@ private function runAsync(string $command): void $this->logger->debug("RRD[%g$command%n]", ['color' => true]); $this->process->clearOutput(); $this->input->write("$command\n"); + $this->lastUsed = microtime(true); } public function __destruct() diff --git a/LibreNMS/Scan/HostProbe.php b/LibreNMS/Scan/HostProbe.php index abfdad7636d..6e5587e4d40 100644 --- a/LibreNMS/Scan/HostProbe.php +++ b/LibreNMS/Scan/HostProbe.php @@ -69,6 +69,7 @@ public function result(): AddScannedHost|DeviceAddOutcome|null return new AddScannedHost( ip: $this->ip, snmpSecretId: $snmpSecretId, + snmpVersion: $this->snmp?->version(), pingable: $pingable === true, pollerGroup: $this->options->pollerGroup, dnsOnly: $this->options->dnsOnly, diff --git a/LibreNMS/Scan/LocalNetworks.php b/LibreNMS/Scan/LocalNetworks.php new file mode 100644 index 00000000000..c9928376bbf --- /dev/null +++ b/LibreNMS/Scan/LocalNetworks.php @@ -0,0 +1,105 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace LibreNMS\Scan; + +use LibreNMS\Util\IPv4; + +class LocalNetworks +{ + /** interfaces of containers, VMs and VPNs, their networks are not where the devices are */ + private const string VIRTUAL_INTERFACES = '/^(lo|docker|br-|veth|virbr|vnet|cni|flannel|cali|vxlan|podman|lxc|tailscale|zt|wg)/'; + /** a larger network is narrowed to the /24 of the server, a large scan is slow */ + private const int MIN_PREFIX = 22; + /** the address family of IPv4, AF_INET needs the sockets extension */ + private const int AF_INET = 2; + + /** + * @param string[] $containerMarkers files that exist inside a container (Docker, Podman) + */ + public function __construct( + private readonly array $containerMarkers = ['/.dockerenv', '/run/.containerenv'], + ) { + } + + /** + * The IPv4 networks of the interfaces that are up, without duplicates. + * None inside a container, its interfaces are on the container network, not the LAN. + * + * @param array, up?: bool}>|null $interfaces as net_get_interfaces() returns, null to read them + * @return string[] in CIDR notation + */ + public function find(?array $interfaces = null): array + { + if ($this->inContainer()) { + return []; + } + + $interfaces ??= net_get_interfaces() ?: []; + + $networks = []; + foreach ($interfaces as $name => $interface) { + if (empty($interface['up']) || preg_match(self::VIRTUAL_INTERFACES, (string) $name)) { + continue; + } + + foreach ($interface['unicast'] ?? [] as $address) { + if (($address['family'] ?? null) !== self::AF_INET || ! isset($address['address'], $address['netmask'])) { + continue; + } + + $network = $this->network($address['address'], $address['netmask']); + if ($network !== null) { + $networks[$network] = $network; + } + } + } + + return array_values($networks); + } + + private function inContainer(): bool + { + return array_any($this->containerMarkers, fn ($marker) => file_exists($marker)); + } + + private function network(string $address, string $netmask): ?string + { + if (! IPv4::isValid($address)) { + return null; + } + + $cidr = IPv4::netmask2cidr($netmask); + $ip = new IPv4($address); + + // a host or point-to-point address has no other devices, loopback and link-local are not reachable + if ($cidr >= 31 || $ip->inNetwork('127.0.0.0/8') || $ip->inNetwork('169.254.0.0/16')) { + return null; + } + + return $ip->getNetwork($cidr < self::MIN_PREFIX ? 24 : $cidr); + } +} diff --git a/LibreNMS/Scan/NetworkScanner.php b/LibreNMS/Scan/NetworkScanner.php index d9c83846c0d..16be89aff87 100644 --- a/LibreNMS/Scan/NetworkScanner.php +++ b/LibreNMS/Scan/NetworkScanner.php @@ -38,7 +38,7 @@ class NetworkScanner { /** the addresses that are checked for known devices and pinged together */ - private const BATCH_SIZE = 256; + private const int BATCH_SIZE = 256; public function __construct( private readonly KnownAddresses $knownAddresses, diff --git a/LibreNMS/Scan/ScanOptions.php b/LibreNMS/Scan/ScanOptions.php index afa733d3f17..1feffb5f1bf 100644 --- a/LibreNMS/Scan/ScanOptions.php +++ b/LibreNMS/Scan/ScanOptions.php @@ -26,11 +26,13 @@ namespace LibreNMS\Scan; +use App\Actions\Device\BuildPollingMethodCandidates; use App\Facades\LibrenmsConfig; -use App\Models\Secret; +use App\Models\Device; +use App\Models\DevicePollingMethod; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Polling\Method\Config\SnmpConfig; use LibreNMS\Polling\Method\Methods\SnmpPollingMethod; -use LibreNMS\Polling\Secrets\Data\SnmpSecretData; final readonly class ScanOptions { @@ -42,7 +44,7 @@ * @param bool $pingFallback add hosts that only reply to ping as ping only * @param bool $pingOnly add every host that replies to ping as ping only, SNMP is not probed * @param bool $icmpEnabled ping the addresses - * @param array $snmpConfigs the credentials to probe with by secret id, most preferred first + * @param list $snmpConfigs the credentials to probe with as [secret id, config], most preferred first */ public function __construct( public int $concurrency = 32, @@ -82,17 +84,19 @@ public static function fromConfig( } /** - * The default SNMP credentials, the ones a new device is added with, with a short timeout and no retries. + * The default SNMP credentials, tried like they are for a new device, with a short timeout and no retries. * - * @return array by secret id, most preferred first + * @return list [secret id, config], most preferred first */ public static function defaultSnmpConfigs(): array { $method = new SnmpPollingMethod; - $settings = ['timeout' => 1, 'retries' => 0] + $method->defaults(); + $device = new Device; + $deviceMethod = new DevicePollingMethod(['method_type' => PollingMethodType::Snmp, 'settings' => ['timeout' => 1, 'retries' => 0]]); - return $method->defaultSecrets() - ->mapWithKeys(fn (Secret $secret) => [$secret->id => SnmpConfig::make($settings, SnmpSecretData::fromArray($secret->data ?? []))]) - ->all(); + return array_map( + fn (DevicePollingMethod $candidate): array => [(int) $candidate->secret_id, $method->config($device, $candidate)], + app(BuildPollingMethodCandidates::class)->execute($device, $deviceMethod), + ); } } diff --git a/LibreNMS/Scan/SnmpProbe.php b/LibreNMS/Scan/SnmpProbe.php index 91339821ce6..e5e6f250a8b 100644 --- a/LibreNMS/Scan/SnmpProbe.php +++ b/LibreNMS/Scan/SnmpProbe.php @@ -33,22 +33,23 @@ final class SnmpProbe { - /** @var array by secret id, most preferred first */ + /** @var list [secret id, config, process], most preferred first */ private array $processes = []; private ?int $secretId = null; + private ?string $version = null; private bool $settled = false; /** - * @param array $configs by secret id, most preferred first + * @param list $configs [secret id, config], a secret may be tried with several versions, most preferred first */ public function __construct(string $ip, array $configs) { $netSnmp = new NetSnmpOptions; - foreach ($configs as $secretId => $config) { + foreach ($configs as [$secretId, $config]) { $process = new Process($netSnmp->buildCli('snmpget', $ip, ['SNMPv2-MIB::sysObjectID.0'], $config, SnmpQueryOptions::quickPrint())); $process->start(); - $this->processes[$secretId] = $process; + $this->processes[] = [$secretId, $config, $process]; } } @@ -62,7 +63,7 @@ public function settled(): bool return true; } - foreach ($this->processes as $secretId => $process) { + foreach ($this->processes as [$secretId, $config, $process]) { if ($process->isRunning()) { return false; // a more preferred credential may still reply } @@ -70,6 +71,7 @@ public function settled(): bool // same as SnmpPollingMethod::probe(), exit code 2 is an error response, the host replied if (in_array($process->getExitCode(), [0, 2], true)) { $this->secretId = $secretId; + $this->version = $config->version; break; } } @@ -87,4 +89,12 @@ public function secretId(): ?int { return $this->secretId; } + + /** + * The SNMP version the host replied to, null if it did not reply or the probe has not settled. + */ + public function version(): ?string + { + return $this->version; + } } diff --git a/LibreNMS/Services.php b/LibreNMS/Services.php index 3f0004cc615..43aaccef2ec 100644 --- a/LibreNMS/Services.php +++ b/LibreNMS/Services.php @@ -57,8 +57,6 @@ public static function list(): array /** * Create a service entry for a device. * - * Mirrors the legacy global add_service() helper. - * * @param array|int|\App\Models\Device $device */ public static function addService($device, string $type, string $desc, string $ip = '', string $param = '', int $ignore = 0, int $disabled = 0, $template_id = '', string $name = '') diff --git a/LibreNMS/Snmptrap/Handlers/Aos7stpNewRoot.php b/LibreNMS/Snmptrap/Handlers/Aos7stpNewRoot.php index e7054142045..cd3742d9567 100644 --- a/LibreNMS/Snmptrap/Handlers/Aos7stpNewRoot.php +++ b/LibreNMS/Snmptrap/Handlers/Aos7stpNewRoot.php @@ -43,6 +43,6 @@ class Aos7stpNewRoot implements SnmptrapHandler */ public function handle(Device $device, Trap $trap) { - $trap->log('SNMP Trap: Device ' . $device->displayName() . ' was elected as new root on one of its Spanning Tree Instances', Severity::Notice, 'stp'); + $trap->log('SNMP Trap: Device ' . $device->hostname . ' was elected as new root on one of its Spanning Tree Instances', Severity::Notice, 'stp'); } } diff --git a/LibreNMS/Snmptrap/Handlers/AuthenticationFailure.php b/LibreNMS/Snmptrap/Handlers/AuthenticationFailure.php index d717323707a..8cc9696064a 100644 --- a/LibreNMS/Snmptrap/Handlers/AuthenticationFailure.php +++ b/LibreNMS/Snmptrap/Handlers/AuthenticationFailure.php @@ -43,6 +43,6 @@ class AuthenticationFailure implements SnmptrapHandler */ public function handle(Device $device, Trap $trap) { - $trap->log('SNMP Trap: Authentication Failure: ' . $device->displayName(), Severity::Notice, 'auth'); + $trap->log('SNMP Trap: Authentication Failure: ' . $device->hostname, Severity::Notice, 'auth'); } } diff --git a/LibreNMS/Snmptrap/Handlers/BridgeNewRoot.php b/LibreNMS/Snmptrap/Handlers/BridgeNewRoot.php index 96d5c4f190f..c28e4357c46 100644 --- a/LibreNMS/Snmptrap/Handlers/BridgeNewRoot.php +++ b/LibreNMS/Snmptrap/Handlers/BridgeNewRoot.php @@ -40,6 +40,6 @@ class BridgeNewRoot implements SnmptrapHandler */ public function handle(Device $device, Trap $trap) { - $trap->log('SNMP Trap: Device ' . $device->displayName() . ' was elected as new root on one of its Spanning Tree Instances', Severity::Notice, 'stp'); + $trap->log('SNMP Trap: Device ' . $device->hostname . ' was elected as new root on one of its Spanning Tree Instances', Severity::Notice, 'stp'); } } diff --git a/LibreNMS/Snmptrap/Handlers/BridgeTopologyChanged.php b/LibreNMS/Snmptrap/Handlers/BridgeTopologyChanged.php index 3dbf3444de2..781cd7ffd88 100644 --- a/LibreNMS/Snmptrap/Handlers/BridgeTopologyChanged.php +++ b/LibreNMS/Snmptrap/Handlers/BridgeTopologyChanged.php @@ -40,6 +40,6 @@ class BridgeTopologyChanged implements SnmptrapHandler */ public function handle(Device $device, Trap $trap) { - $trap->log('SNMP Trap: Topology of Spanning Tree Instance on device ' . $device->displayName() . ' was changed', Severity::Notice, 'stp'); + $trap->log('SNMP Trap: Topology of Spanning Tree Instance on device ' . $device->hostname . ' was changed', Severity::Notice, 'stp'); } } diff --git a/LibreNMS/Snmptrap/Handlers/ColdBoot.php b/LibreNMS/Snmptrap/Handlers/ColdBoot.php index 8f81c1594f6..4d31088ab37 100644 --- a/LibreNMS/Snmptrap/Handlers/ColdBoot.php +++ b/LibreNMS/Snmptrap/Handlers/ColdBoot.php @@ -40,6 +40,6 @@ class ColdBoot implements SnmptrapHandler */ public function handle(Device $device, Trap $trap) { - $trap->log('SNMP Trap: Device ' . $device->displayName() . ' cold booted', Severity::Warning, 'reboot'); + $trap->log('SNMP Trap: Device ' . $device->hostname . ' cold booted', Severity::Warning, 'reboot'); } } diff --git a/LibreNMS/Snmptrap/Handlers/CppmServiceRestartNotification.php b/LibreNMS/Snmptrap/Handlers/CppmServiceRestartNotification.php index 1d59a5d40ca..9c3a453753b 100644 --- a/LibreNMS/Snmptrap/Handlers/CppmServiceRestartNotification.php +++ b/LibreNMS/Snmptrap/Handlers/CppmServiceRestartNotification.php @@ -51,6 +51,6 @@ public function handle(Device $device, Trap $trap) { $cppmServiceName = $trap->getOidData($trap->findOid('CPPM-MIB::cppmServiceName.0')); $cppmTrapMessage = $trap->getOidData($trap->findOid('CPPM-MIB::cppmTrapMessage.0')); - $trap->log('Clearpass Service Trap - Host:' . $device->displayName() . ' Service:' . $cppmServiceName . ' Message:' . $cppmTrapMessage, Severity::Warning); + $trap->log('Clearpass Service Trap - Host:' . $device->hostname . ' Service:' . $cppmServiceName . ' Message:' . $cppmTrapMessage, Severity::Warning); } } diff --git a/LibreNMS/Snmptrap/Handlers/CppmServiceStartNotification.php b/LibreNMS/Snmptrap/Handlers/CppmServiceStartNotification.php index 5fcec9ec024..f1edd3c77e7 100644 --- a/LibreNMS/Snmptrap/Handlers/CppmServiceStartNotification.php +++ b/LibreNMS/Snmptrap/Handlers/CppmServiceStartNotification.php @@ -51,6 +51,6 @@ public function handle(Device $device, Trap $trap) { $cppmServiceName = $trap->getOidData($trap->findOid('CPPM-MIB::cppmServiceName.0')); $cppmTrapMessage = $trap->getOidData($trap->findOid('CPPM-MIB::cppmTrapMessage.0')); - $trap->log('Clearpass Service Trap - Host:' . $device->displayName() . ' Service:' . $cppmServiceName . ' Message:' . $cppmTrapMessage, Severity::Warning); + $trap->log('Clearpass Service Trap - Host:' . $device->hostname . ' Service:' . $cppmServiceName . ' Message:' . $cppmTrapMessage, Severity::Warning); } } diff --git a/LibreNMS/Snmptrap/Handlers/CppmServiceStopNotification.php b/LibreNMS/Snmptrap/Handlers/CppmServiceStopNotification.php index 43ffbe069b8..e0e68cc2d63 100644 --- a/LibreNMS/Snmptrap/Handlers/CppmServiceStopNotification.php +++ b/LibreNMS/Snmptrap/Handlers/CppmServiceStopNotification.php @@ -51,6 +51,6 @@ public function handle(Device $device, Trap $trap) { $cppmServiceName = $trap->getOidData($trap->findOid('CPPM-MIB::cppmServiceName.0')); $cppmTrapMessage = $trap->getOidData($trap->findOid('CPPM-MIB::cppmTrapMessage.0')); - $trap->log('Clearpass Service Trap - Host:' . $device->displayName() . ' Service:' . $cppmServiceName . ' Message:' . $cppmTrapMessage, Severity::Warning); + $trap->log('Clearpass Service Trap - Host:' . $device->hostname . ' Service:' . $cppmServiceName . ' Message:' . $cppmTrapMessage, Severity::Warning); } } diff --git a/LibreNMS/Snmptrap/Handlers/EntityDatabaseConfigChanged.php b/LibreNMS/Snmptrap/Handlers/EntityDatabaseConfigChanged.php index b5847bb7d8c..f646718a327 100644 --- a/LibreNMS/Snmptrap/Handlers/EntityDatabaseConfigChanged.php +++ b/LibreNMS/Snmptrap/Handlers/EntityDatabaseConfigChanged.php @@ -40,6 +40,6 @@ class EntityDatabaseConfigChanged implements SnmptrapHandler */ public function handle(Device $device, Trap $trap) { - $trap->log('SNMP Trap: Configuration of Entity Database on device ' . $device->displayName() . ' was changed', Severity::Notice, 'system'); + $trap->log('SNMP Trap: Configuration of Entity Database on device ' . $device->hostname . ' was changed', Severity::Notice, 'system'); } } diff --git a/LibreNMS/Snmptrap/Handlers/FailedUserLogin.php b/LibreNMS/Snmptrap/Handlers/FailedUserLogin.php index 6c003e45646..f0ba74de039 100644 --- a/LibreNMS/Snmptrap/Handlers/FailedUserLogin.php +++ b/LibreNMS/Snmptrap/Handlers/FailedUserLogin.php @@ -40,6 +40,6 @@ class FailedUserLogin implements SnmptrapHandler */ public function handle(Device $device, Trap $trap) { - $trap->log('SNMP Trap: Failed User Login: ' . $device->displayName(), Severity::Warning, 'auth'); + $trap->log('SNMP Trap: Failed User Login: ' . $device->hostname, Severity::Warning, 'auth'); } } diff --git a/LibreNMS/Snmptrap/Handlers/FgTrapDhcp.php b/LibreNMS/Snmptrap/Handlers/FgTrapDhcp.php new file mode 100644 index 00000000000..037cd176ea2 --- /dev/null +++ b/LibreNMS/Snmptrap/Handlers/FgTrapDhcp.php @@ -0,0 +1,59 @@ +. + * + * Fortigate DHCP server event: pool exhausted, IP conflict, or NAK received. + * + * @link https://www.librenms.org + */ + +namespace LibreNMS\Snmptrap\Handlers; + +use App\Models\Device; +use LibreNMS\Enum\Severity; +use LibreNMS\Interfaces\SnmptrapHandler; +use LibreNMS\Snmptrap\Trap; + +class FgTrapDhcp implements SnmptrapHandler +{ + /** + * Handle snmptrap. + * Data is pre-parsed and delivered as a Trap. + * + * @param Device $device + * @param Trap $trap + * @return void + */ + public function handle(Device $device, Trap $trap) + { + $type = $trap->getOidData($trap->findOid('FORTINET-FORTIGATE-MIB::fgDhcpTrapType')); + $message = $trap->getOidData($trap->findOid('FORTINET-FORTIGATE-MIB::fgDhcpTrapMessage')); + $ifName = $trap->getOidData($trap->findOid('IF-MIB::ifName')) ?: 'unknown interface'; + + // snmptrapd may render the enum as "conflictIP", "conflictIP(2)" or "2" + [$event, $severity] = match (preg_replace('/\D/', '', $type) ?: $type) { + '1', 'runOutOfIPPool' => ['DHCP pool exhausted', Severity::Error], + '2', 'conflictIP' => ['DHCP IP conflict', Severity::Warning], + '3', 'receivedNAK' => ['DHCP NAK received', Severity::Notice], + default => ['DHCP event', Severity::Warning], + }; + + $trap->log("$event on $ifName: $message", $severity); + } +} diff --git a/LibreNMS/Snmptrap/Handlers/OspfTxRetransmit.php b/LibreNMS/Snmptrap/Handlers/OspfTxRetransmit.php index c0c89230c59..c82b8c449f5 100755 --- a/LibreNMS/Snmptrap/Handlers/OspfTxRetransmit.php +++ b/LibreNMS/Snmptrap/Handlers/OspfTxRetransmit.php @@ -50,11 +50,11 @@ public function handle(Device $device, Trap $trap) $ospfLsdbLsid = $trap->getOidData($trap->findOid('OSPF-MIB::ospfLsdbLsid')); if ($ospfPacketType != 'lsUpdate') { - $trap->log('SNMP TRAP: ' . $device->displayName() . "(Router ID: $ospfRouterId) sent a $ospfPacketType packet to $ospfNbrRtrId."); + $trap->log('SNMP TRAP: ' . $device->hostname . "(Router ID: $ospfRouterId) sent a $ospfPacketType packet to $ospfNbrRtrId."); return; } - $trap->log('SNMP Trap: OSPFTxRetransmit trap received from ' . $device->displayName() . "(Router ID: $ospfRouterId). A $ospfPacketType packet was sent to $ospfNbrRtrId. LSType: $ospfLsdbType, route ID: $ospfLsdbLsid, originating from $ospfLsdbRouterId."); + $trap->log('SNMP Trap: OSPFTxRetransmit trap received from ' . $device->hostname . "(Router ID: $ospfRouterId). A $ospfPacketType packet was sent to $ospfNbrRtrId. LSType: $ospfLsdbType, route ID: $ospfLsdbLsid, originating from $ospfLsdbRouterId."); } } diff --git a/LibreNMS/Snmptrap/Handlers/UpsAlarm.php b/LibreNMS/Snmptrap/Handlers/UpsAlarm.php index 307abcb02f1..649477284f7 100644 --- a/LibreNMS/Snmptrap/Handlers/UpsAlarm.php +++ b/LibreNMS/Snmptrap/Handlers/UpsAlarm.php @@ -32,7 +32,7 @@ class UpsAlarm /** * UPS-MIB upsWellKnownAlarms (RFC 1628), keyed by their OBJECT-IDENTITY index. */ - private const ALARMS = [ + private const array ALARMS = [ 1 => ['upsAlarmBatteryBad', 'One or more batteries have been determined to require replacement.', Severity::Error], 2 => ['upsAlarmOnBattery', 'The UPS is drawing power from the batteries.', Severity::Warning], 3 => ['upsAlarmLowBattery', 'The remaining battery run-time is less than or equal to the configured low battery time.', Severity::Error], diff --git a/LibreNMS/Snmptrap/Handlers/WarmBoot.php b/LibreNMS/Snmptrap/Handlers/WarmBoot.php index 34da4755396..7b4ef467bf8 100644 --- a/LibreNMS/Snmptrap/Handlers/WarmBoot.php +++ b/LibreNMS/Snmptrap/Handlers/WarmBoot.php @@ -40,6 +40,6 @@ class WarmBoot implements SnmptrapHandler */ public function handle(Device $device, Trap $trap) { - $trap->log('SNMP Trap: Device ' . $device->displayName() . ' warm booted', Severity::Warning, 'reboot'); + $trap->log('SNMP Trap: Device ' . $device->hostname . ' warm booted', Severity::Warning, 'reboot'); } } diff --git a/LibreNMS/Snmptrap/Trap.php b/LibreNMS/Snmptrap/Trap.php index d4d91e7d70f..bc4e51d1f46 100644 --- a/LibreNMS/Snmptrap/Trap.php +++ b/LibreNMS/Snmptrap/Trap.php @@ -56,7 +56,7 @@ public function __construct(public readonly string $raw) $this->ip = $matches[1] ?? ''; // parse the oid data - $this->oid_data = (new Collection($lines))->mapWithKeys(function ($line) { + $this->oid_data = new Collection($lines)->mapWithKeys(function ($line) { [$oid, $data] = explode(' ', $line, 2); return [$oid => trim($data, '"')]; diff --git a/LibreNMS/Syslog/Processor.php b/LibreNMS/Syslog/Processor.php index ff7c2d259ea..85e9fc92d87 100644 --- a/LibreNMS/Syslog/Processor.php +++ b/LibreNMS/Syslog/Processor.php @@ -41,7 +41,7 @@ class Processor { /** How long a sender that resolves to nothing is remembered, in seconds. 0 looks it up every message. */ - private const MISS_TTL = 60; + private const int MISS_TTL = 60; /** @var array minimal device info cache */ private array $deviceInfo = []; diff --git a/LibreNMS/Traits/HasUnknownCase.php b/LibreNMS/Traits/HasUnknownCase.php new file mode 100644 index 00000000000..d30f4fcbd9a --- /dev/null +++ b/LibreNMS/Traits/HasUnknownCase.php @@ -0,0 +1,34 @@ + + */ + public static function known(): array + { + return array_values(array_filter(self::cases(), fn (self $type): bool => $type !== self::Unknown)); + } + + public function isUnknown(): bool + { + return $this === self::Unknown; + } +} diff --git a/LibreNMS/Traits/RequiresPollingMethod.php b/LibreNMS/Traits/RequiresPollingMethod.php new file mode 100644 index 00000000000..27846980ec8 --- /dev/null +++ b/LibreNMS/Traits/RequiresPollingMethod.php @@ -0,0 +1,37 @@ + + */ + abstract public function pollingMethods(Device $device): array; + + public function shouldDiscover(OS $os): bool + { + return $this->hasAvailableMethod($os); + } + + public function shouldPoll(OS $os): bool + { + return $this->hasAvailableMethod($os); + } + + /** + * One of the polling methods this module can get data from is available, checked in order of preference. + */ + protected function hasAvailableMethod(OS $os): bool + { + return $os->getMethodResults()->anyAvailable($this->pollingMethods($os->getDevice())); + } +} diff --git a/LibreNMS/Util/Bgp.php b/LibreNMS/Util/Bgp.php new file mode 100644 index 00000000000..8bdf71144f4 --- /dev/null +++ b/LibreNMS/Util/Bgp.php @@ -0,0 +1,194 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace LibreNMS\Util; + +class Bgp +{ + /** AS_TRANS, reported in place of a 4-byte AS by 2-byte only objects */ + public const AS_TRANS = 23456; + + /** InetAddressType to [index length, address length], the z types carry a 4 octet zone */ + private const array ADDRESS_LENGTHS = [1 => [4, 4], 2 => [16, 16], 3 => [8, 4], 4 => [20, 16]]; + + private const array AFI = [1 => 'ipv4', 2 => 'ipv6', 25 => 'l2vpn']; + + private const array SAFI = [ + 1 => 'unicast', + 2 => 'multicast', + 3 => 'unicastAndMulticast', + 4 => 'labeledUnicast', + 5 => 'mvpn', + 65 => 'vpls', + 70 => 'evpn', + 128 => 'vpn', + 129 => 'vpnMulticast', + 132 => 'rtfilter', + 133 => 'flow', + ]; + + private const array STATES = ['idle', 'connect', 'active', 'opensent', 'openconfirm', 'established']; + + public static function state(?string $state): string + { + $state = strtolower((string) $state); + + return in_array($state, self::STATES) ? $state : 'idle'; + } + + public static function afi(int|string $afi): string + { + return self::AFI[$afi] ?? (string) $afi; + } + + public static function safi(int|string $safi): string + { + return self::SAFI[$safi] ?? (string) $safi; + } + + public static function integer(int|string|null $value): ?int + { + return is_numeric($value) ? Number::correctIntegerOverflow((int) $value) : null; + } + + /** + * The database and rrd expect 32 bit counters. 64 bit counters may not fit in an int, + * so take the remainder digit by digit. + */ + public static function counter(int|string|null $value): ?int + { + if (! is_numeric($value)) { + return null; + } + + $value = (string) $value; + if (! ctype_digit($value)) { + return (Number::correctIntegerOverflow((int) $value) ?? 0) % 2 ** 32; + } + + $low = 0; + foreach (str_split($value) as $digit) { + $low = ($low * 10 + (int) $digit) % 2 ** 32; + } + + return $low; + } + + /** + * Split a two octet last error into its code and subcode, displayed as hex or as raw octets + * + * @return array{bgpPeerLastErrorCode?: int, bgpPeerLastErrorSubCode?: int} + */ + public static function lastError(?string $value): array + { + $value = trim((string) $value, " \"\0"); + + if (preg_match('/^([0-9a-f]{1,2})[ :]?([0-9a-f]{2})$/i', $value, $matches)) { + return ['bgpPeerLastErrorCode' => (int) hexdec($matches[1]), 'bgpPeerLastErrorSubCode' => (int) hexdec($matches[2])]; + } + + if (strlen($value) == 2) { + return ['bgpPeerLastErrorCode' => ord($value[0]), 'bgpPeerLastErrorSubCode' => ord($value[1])]; + } + + return []; + } + + /** + * The first usable AS, AS_TRANS only if nothing else is known + * + * @param iterable $values + */ + public static function localAs(iterable $values): ?int + { + $trans = null; + + foreach ($values as $value) { + $as = self::integer($value); + if ($as == self::AS_TRANS) { + $trans = $as; + } elseif ($as > 0) { + return $as; + } + } + + return $trans; + } + + /** + * Take an InetAddressType and InetAddress off the front of an index. + * Vendors disagree on whether the address is prefixed with its length, so both are accepted. + * + * @param string[] $parts index parts, the address is removed + * @param int $trailing index parts after the address + * @param int|null $zone set to the zone (interface index) of scoped addresses + */ + public static function shiftInetAddress(array &$parts, int $trailing = 0, ?int &$zone = null): ?IP + { + [$length, $addressLength] = self::ADDRESS_LENGTHS[(int) array_shift($parts)] ?? [null, null]; + $octets = $length === null ? null : self::shiftOctets($parts, $trailing, [$length]); + if ($octets === null) { + return null; + } + + $zone = array_reduce(array_slice($octets, $addressLength), fn (int $zone, string $octet) => $zone * 256 + (int) $octet, 0) ?: null; + + return IP::fromSnmpString(implode('.', array_slice($octets, 0, $addressLength)), true); + } + + /** + * Take an address without a type off the front of an index, with or without a length + * + * @param string[] $parts index parts, the address is removed + * @param int $trailing index parts after the address + */ + public static function shiftIp(array &$parts, int $trailing = 0): ?IP + { + $octets = self::shiftOctets($parts, $trailing, [4, 16]); + + return $octets === null ? null : IP::fromSnmpString(implode('.', $octets), true); + } + + /** + * @param string[] $parts + * @param int[] $lengths valid index lengths + * @return string[]|null + */ + private static function shiftOctets(array &$parts, int $trailing, array $lengths): ?array + { + $available = count($parts) - $trailing; + if (in_array($available - 1, $lengths) && $parts[0] == $available - 1) { + array_shift($parts); + $available--; + } elseif (! in_array($available, $lengths)) { + return null; + } + + return array_splice($parts, 0, $available); + } +} diff --git a/LibreNMS/Util/Binaries.php b/LibreNMS/Util/Binaries.php index e572983f382..32d428a9004 100644 --- a/LibreNMS/Util/Binaries.php +++ b/LibreNMS/Util/Binaries.php @@ -35,7 +35,7 @@ class Binaries { /** searched after PATH, which may be empty when running from cron or systemd */ - private const SEARCH_DIRS = ['/usr/local/sbin', '/usr/local/bin', '/usr/sbin', '/usr/bin', '/sbin', '/bin']; + private const array SEARCH_DIRS = ['/usr/local/sbin', '/usr/local/bin', '/usr/sbin', '/usr/bin', '/sbin', '/bin']; /** binaries that could be set in the LibreNMS config and their setting, support for these settings will be removed */ public const LEGACY_SETTINGS = [ 'fping' => 'fping', diff --git a/LibreNMS/Util/CiHelper.php b/LibreNMS/Util/CiHelper.php index eda413dd468..ae7df2bfd72 100644 --- a/LibreNMS/Util/CiHelper.php +++ b/LibreNMS/Util/CiHelper.php @@ -457,7 +457,7 @@ public function detectChangedFiles(): void $this->flags['full'] = empty($changed_files); // don't disable full if already set $files = $changed_files ? explode(' ', $changed_files) : []; - $this->changed = (new FileCategorizer($files))->categorize(); + $this->changed = new FileCategorizer($files)->categorize(); $this->parseChangedFiles(); } diff --git a/LibreNMS/Util/Dns.php b/LibreNMS/Util/Dns.php index e07a39d4701..fce80534420 100644 --- a/LibreNMS/Util/Dns.php +++ b/LibreNMS/Util/Dns.php @@ -100,9 +100,9 @@ public function resolveHostname(string $ip): ?string return null; } - $hostname = @gethostbyaddr($ip); - if (! $hostname || @inet_pton($hostname) !== false) { - return null; // no reverse name, gethostbyaddr returns the IP + $hostname = $this->reverseHostname($ip); + if ($hostname === null) { + return null; } $family = strlen($packed) === 16 ? AddressFamily::IPv6 : AddressFamily::IPv4; @@ -115,6 +115,20 @@ public function resolveHostname(string $ip): ?string return null; } + /** + * The reverse name, even when it does not resolve back to the address. + */ + public function reverseHostname(string $ip): ?string + { + if (! IP::isValid($ip)) { + return null; + } + + $hostname = @gethostbyaddr($ip); + + return $hostname && ! IP::isValid($hostname) ? rtrim($hostname, '.') : null; + } + /** * @param string $domain Domain which has to be parsed * @param string $record DNS Record which should be searched @@ -135,7 +149,7 @@ public function getRecord(string $domain, string $record = 'A'): array /** * @param string $hostname - * @return array + * @return array{}|array{lat: float|null, lng: float|null} */ public function getCoordinates($hostname): array { diff --git a/LibreNMS/Util/FileCategorizer.php b/LibreNMS/Util/FileCategorizer.php index 8b7839e97fc..c9fa7ac8f22 100644 --- a/LibreNMS/Util/FileCategorizer.php +++ b/LibreNMS/Util/FileCategorizer.php @@ -31,7 +31,7 @@ class FileCategorizer extends Categorizer { - private const TESTS_REGEX = '#^tests/(snmpsim|data)/(([0-9a-z\-]+)(_[0-9a-z\-]+)?)(_[0-9a-z\-]+)?\.(json|snmprec)$#'; + private const string TESTS_REGEX = '#^tests/(snmpsim|data)/(([0-9a-z\-]+)(_[0-9a-z\-]+)?)(_[0-9a-z\-]+)?\.(json|snmprec)$#'; public function __construct($items = []) { diff --git a/LibreNMS/Util/Graph.php b/LibreNMS/Util/Graph.php index 774b850fe62..7aac22f301f 100644 --- a/LibreNMS/Util/Graph.php +++ b/LibreNMS/Util/Graph.php @@ -1,60 +1,37 @@ . - * - * @link https://www.librenms.org - * - * @copyright 2018 Tony Murray - * @author Tony Murray - */ - namespace LibreNMS\Util; -use App\Facades\DeviceCache; +use App\Data\Graphing\GraphImage; +use App\Data\Graphing\GraphParameters; use App\Facades\LibrenmsConfig; +use App\Graphs\GraphAccess; +use App\Graphs\GraphFactory; use App\Models\Device; use Illuminate\Support\Arr; -use Illuminate\Support\Facades\Auth; -use LibreNMS\Data\Graphing\GraphImage; -use LibreNMS\Data\Graphing\GraphParameters; use LibreNMS\Enum\ImageFormat; use LibreNMS\Enum\PollingMethodType; -use LibreNMS\Exceptions\RrdGraphException; -use LibreNMS\RRD\RrdPath; -use Rrd; +use LibreNMS\Exceptions\GraphException; +use LibreNMS\Exceptions\NoGraphData; class Graph { - const BASE64_OUTPUT = 1; // BASE64 encoded image data - const INLINE_BASE64 = 2; // img src inline base64 image - const IMAGE_PNG = 4; // img src inline base64 image - const IMAGE_SVG = 8; // img src inline base64 image + // output flags for getImageData(), used by the @graphImage directive in alert templates + const BASE64_OUTPUT = 1; // base64 encoded image data + const INLINE_BASE64 = 2; // inline base64 data uri for img src + const IMAGE_PNG = 4; + const IMAGE_SVG = 8; /** - * Convenience helper to specify desired image output + * Image data in the format selected by the output flags * - * @param array|string $vars - * @param int $flags - * @return string + * @param array|string $vars graph vars or a graph url + * @param int $flags bitmask of the output flag constants */ - public static function getImageData($vars, int $flags = 0): string + public static function getImageData(array|string $vars, int $flags = 0): string { + $vars = is_string($vars) ? Url::parseLegacyPathVars($vars) : $vars; + if ($flags & self::IMAGE_PNG) { $vars['graph_type'] = 'png'; } @@ -63,157 +40,53 @@ public static function getImageData($vars, int $flags = 0): string $vars['graph_type'] = 'svg'; } + $image = self::getImage($vars); + if ($flags & self::INLINE_BASE64) { - return self::getImage($vars)->inline(); + return $image->inline(); } if ($flags & self::BASE64_OUTPUT) { - return self::getImage($vars)->base64(); + return $image->base64(); } - return self::getImage($vars)->data; + return $image->data; } /** - * Fetch a GraphImage based on the given $vars + * Fetch a GraphImage based on the given $vars, for server side rendering of alerts: + * the graphs in alert templates and transports are chosen by whoever configured the alert, + * so a guest (the alert runner) is trusted, a logged-in user still needs permission. * Catches errors generated and always returns GraphImage * - * @param array|string $vars - * @return GraphImage - */ - public static function getImage($vars): GraphImage - { - try { - return self::get($vars); - } catch (RrdGraphException $e) { - if (Debug::isEnabled()) { - throw $e; - } - - return new GraphImage(ImageFormat::forGraph($vars['graph_type'] ?? null), 'Error', $e->generateErrorImage()); - } - } - - /** - * Fetch a GraphImage based on the given $vars - * - * @param array|string $vars - * @return GraphImage - * - * @throws RrdGraphException + * @param array|string $vars graph vars or a graph url */ - public static function get($vars): GraphImage + public static function getImage(array|string $vars): GraphImage { - $graph_params = new GraphParameters(is_string($vars) ? Url::parseLegacyPathVars($vars) : $vars); - $rrd_options = self::getRrdOptions($vars, $rrd_filename); + $params = new GraphParameters(is_string($vars) ? Url::parseLegacyPathVars($vars) : $vars); - // Generating the graph! try { - $image_data = Rrd::graph($rrd_options); - - return new GraphImage($graph_params->imageFormat, $graph_params->getTitle(), $image_data); - } catch (RrdGraphException $e) { - // preserve original error if debug is enabled, otherwise make it a little more user friendly + return app(GraphAccess::class)->trusted(fn () => app(GraphFactory::class)->graphFor($params)->render()); + } catch (GraphException $e) { if (Debug::isEnabled()) { throw $e; } - if (isset($rrd_filename) && ! Rrd::checkRrdExists($rrd_filename)) { - throw new RrdGraphException('No Data file' . basename($rrd_filename), 'No Data', $graph_params->width, $graph_params->height, $e->getCode(), $e->getImage()); - } - - throw new RrdGraphException('Error: ' . $e->getMessage(), 'Draw Error', $graph_params->width, $graph_params->height, $e->getCode(), $e->getImage()); + return self::errorImage($params, $e); } } /** - * Build RRD options for the given $vars - * - * @param array|string $vars - * @param RrdPath|null &$rrd_filename output parameter for the resolved rrd filename - * @return array - * - * @throws RrdGraphException + * An image with the error text, sized and formatted as the requested graph */ - public static function getRrdOptions($vars, ?RrdPath &$rrd_filename = null): array + public static function errorImage(GraphParameters $params, GraphException $e): GraphImage { - if (! defined('IGNORE_ERRORS')) { - define('IGNORE_ERRORS', true); - } + $style = $params->style ?: session('applied_site_style'); + $foreground = $style === 'dark' ? [255, 255, 255] : [0, 0, 0]; + $color = $e instanceof NoGraphData ? $foreground : [128, 0, 0]; + $title = $params->visible('title') ? ($params->user_title ?? $e->graphTitle) : null; - $previousCwd = getcwd(); - chdir(base_path()); - - try { - include_once base_path('includes/dbFacile.php'); - include_once base_path('includes/common.php'); - include_once base_path('includes/html/functions.inc.php'); - include_once base_path('includes/rewrites.php'); - - // handle possible graph url input - if (is_string($vars)) { - $vars = Url::parseLegacyPathVars($vars); - } - - // variables for included graphs - $graph_params = new GraphParameters($vars); - $type = $graph_params->type; - $subtype = $graph_params->subtype; - - $deviceId = $vars['device'] ?? ($type === 'device' ? ($vars['id'] ?? null) : null); - if ($deviceId) { - $device = DeviceCache::get($deviceId); - if ($device->exists) { - DeviceCache::setPrimary($device->device_id); - } - } - - $height = $graph_params->height; - $width = $graph_params->width; - $from = $graph_params->from; - $to = $graph_params->to; - $period = $graph_params->period; - $prev_from = $graph_params->prev_from; - $inverse = $graph_params->inverse; - $in = $graph_params->in; - $out = $graph_params->out; - $float_precision = $graph_params->float_precision; - $title = $graph_params->visible('title'); - $nototal = ! $graph_params->visible('total'); - $nodetails = ! $graph_params->visible('details'); - $noagg = ! $graph_params->visible('aggregate'); - - /** @var \Amenadiel\JpGraph\Graph\Graph|null $graph */ - $graph = null; - /** @var array $rrd_options */ - $rrd_options = []; - $rrd_filename = null; - - $auth = Auth::guest(); // if user not logged in, assume we authenticated via signed url, allow_unauth_graphs or allow_unauth_graphs_cidr - require base_path("/includes/html/graphs/$type/auth.inc.php"); - if (! $auth) { - // We are unauthenticated :( - throw new RrdGraphException('No Authorization', 'No Auth', $width, $height); - } - - if (is_file(base_path("/includes/html/graphs/$type/$subtype.inc.php"))) { - require base_path("/includes/html/graphs/$type/$subtype.inc.php"); - } elseif (is_file(base_path("/includes/html/graphs/$type/generic.inc.php"))) { - require base_path("/includes/html/graphs/$type/generic.inc.php"); - } else { - throw new RrdGraphException("{$type}_$subtype template missing", "{$type}_$subtype missing", $width, $height); - } - - if (empty($rrd_options) && ! $graph instanceof \Amenadiel\JpGraph\Graph\Graph) { - throw new RrdGraphException('Graph Definition Error', 'Def Error', $width, $height); - } - - return [...$graph_params->toRrdOptions(), ...$rrd_options]; - } finally { - if ($previousCwd !== false) { - chdir($previousCwd); - } - } + return new GraphImage($params->imageFormat, $title ?? 'Error', self::error($e->getMessage(), $e->shortText, $params->width, $params->height, $color, $params->imageFormat, $title, $foreground)); } public static function getTypes(): array @@ -230,28 +103,14 @@ public static function getTypes(): array */ public static function getSubtypes(string $type, ?Device $device = null): array { - $dir = base_path('includes/html/graphs/' . basename($type)); - $types = []; - - if (is_dir($dir)) { - foreach (new \DirectoryIterator($dir) as $file) { - if ($file->isFile() && str_ends_with($file->getFilename(), '.inc.php')) { - $name = $file->getBasename('.inc.php'); - if ($name !== 'auth') { - $types[] = $name; - } - } - } - } + $types = app(GraphFactory::class)->subtypes($type); if ($device?->graphs) { $graphs = $device->graphs->pluck('graph'); - foreach (LibrenmsConfig::get('graph_types') as $gType => $type_data) { - foreach (array_keys($type_data) as $subtype) { - if ($graphs->contains($subtype) && self::isMibGraph($gType, $subtype)) { - $types[] = $subtype; - } + foreach (array_keys(LibrenmsConfig::get("graph_types.$type", [])) as $subtype) { + if ($graphs->contains($subtype)) { + $types[] = $subtype; } } } @@ -262,18 +121,6 @@ public static function getSubtypes(string $type, ?Device $device = null): array return $types; } - /** - * Check if the given graph is a mib graph - * - * @param string $type - * @param string $subtype - * @return bool - */ - public static function isMibGraph($type, $subtype): bool - { - return LibrenmsConfig::get("graph_types.$type.$subtype.section") == 'mib'; - } - public static function getOverviewGraphsForDevice(Device $device): array { if (! $device->polling()->isEnabled(PollingMethodType::Snmp)) { @@ -297,19 +144,25 @@ public static function getOverviewGraphsForDevice(Device $device): array * @param int $width Width of graph image (defaults to 300) * @param int|null $height Height of graph image (defaults to width / 3) * @param int[] $color Color of text, defaults to dark red + * @param ImageFormat|null $format defaults to the configured graph type + * @param string|null $title Original graph title, when enabled + * @param int[] $titleColor Color of the graph title * @return string the generated image */ - public static function error(string $text, ?string $short_text, int $width = 300, ?int $height = null, array $color = [128, 0, 0]): string + public static function error(string $text, ?string $short_text, int $width = 300, ?int $height = null, array $color = [128, 0, 0], ?ImageFormat $format = null, ?string $title = null, array $titleColor = [0, 0, 0]): string { - $type = LibrenmsConfig::get('webui.graph_type'); + $format ??= ImageFormat::forGraph(); $height ??= $width / 3; if ($short_text !== null && $width < 200) { $text = $short_text; } - if ($type === 'svg') { + if ($format === ImageFormat::Svg) { $rgb = implode(', ', $color); + $titleRgb = implode(', ', $titleColor); + $text = htmlspecialchars($text, ENT_QUOTES | ENT_XML1, 'UTF-8'); + $titleHtml = $title === null ? '' : '' . htmlspecialchars($title, ENT_QUOTES | ENT_XML1, 'UTF-8') . ''; return << - + + $titleHtml $text @@ -330,6 +184,11 @@ public static function error(string $text, ?string $short_text, int $width = 300 $img = imagecreate($width, $height); imagecolorallocatealpha($img, 255, 255, 255, 127); // transparent background + if ($title !== null) { + $titleX = max(0, (int) (($width - imagefontwidth(3) * strlen($title)) / 2)); + imagestring($img, 3, $titleX, 5, $title, imagecolorallocate($img, ...$titleColor)); + } + $px = (int) ((imagesx($img) - 7.5 * strlen($text)) / 2); $font = $width < 200 ? 3 : 5; imagestring($img, $font, $px, $height / 2 - 8, $text, imagecolorallocate($img, ...$color)); @@ -337,8 +196,7 @@ public static function error(string $text, ?string $short_text, int $width = 300 // Output the image ob_start(); imagepng($img); - $output = ob_get_clean(); - ob_end_clean(); + $output = (string) ob_get_clean(); imagedestroy($img); return $output; diff --git a/LibreNMS/Util/Html.php b/LibreNMS/Util/Html.php index f9241382b3f..a4b97dd59fb 100644 --- a/LibreNMS/Util/Html.php +++ b/LibreNMS/Util/Html.php @@ -169,13 +169,8 @@ public static function percentageBar($width, $height, $percent, $left_text = '', return implode('', $output); } - /** - * @param int|string $state - */ - public static function powerStateLabel($state): array + public static function powerStateLabel(int $state): array { - $state = is_string($state) ? PowerState::STATES[$state] : $state; - return match ($state) { PowerState::OFF => ['OFF', 'label-default'], PowerState::ON => ['ON', 'label-success'], @@ -184,9 +179,12 @@ public static function powerStateLabel($state): array }; } - public static function severityToLabel(Severity $severity, string $text = '', string $title = '', string $class = 'label'): string + /** + * Return the bootstrap label class for this severity. + */ + public static function severityClass(Severity $severity): string { - $state_label = match ($severity) { + return match ($severity) { Severity::Ok => 'label-success', Severity::Info => 'label-info', Severity::Notice => 'label-primary', @@ -194,11 +192,14 @@ public static function severityToLabel(Severity $severity, string $text = '', st Severity::Error => 'label-danger', default => 'label-default', }; + } + public static function severityToLabel(Severity $severity, string $text = '', string $title = '', string $class = 'label'): string + { if ($title) { $title = " title=\"$title\""; } - return "$text"; + return "$text"; } } diff --git a/LibreNMS/Util/IP.php b/LibreNMS/Util/IP.php index 582e0dd3461..7126643dc27 100644 --- a/LibreNMS/Util/IP.php +++ b/LibreNMS/Util/IP.php @@ -246,13 +246,7 @@ protected function range(): array */ public function inNetworks($networks) { - foreach ((array) $networks as $network) { - if ($this->inNetwork($network)) { - return true; - } - } - - return false; + return array_any((array) $networks, fn ($network) => $this->inNetwork($network)); } /** diff --git a/LibreNMS/Util/Mail.php b/LibreNMS/Util/Mail.php index 6144871eb8e..3e3d0d76b08 100644 --- a/LibreNMS/Util/Mail.php +++ b/LibreNMS/Util/Mail.php @@ -27,7 +27,7 @@ namespace LibreNMS\Util; use App\Facades\LibrenmsConfig; -use LibreNMS\Exceptions\RrdGraphException; +use LibreNMS\Exceptions\GraphException; use PHPMailer\PHPMailer\PHPMailer; use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Exception\ExceptionInterface as MimeException; @@ -164,7 +164,7 @@ private static function embedGraphs(PHPMailer $mail, bool $html = false): void $cid, $fileName . '.' . $image->fileExtension(), PHPMailer::ENCODING_BASE64, - $image->format->contentType() + $image->format->mediaType() ); // update image tag to link to attached image, or just the image name @@ -173,7 +173,7 @@ private static function embedGraphs(PHPMailer $mail, bool $html = false): void } else { $body = str_replace($tag, "[$fileName]", $body); } - } catch (RrdGraphException|\PHPMailer\PHPMailer\Exception $e) { + } catch (GraphException|\PHPMailer\PHPMailer\Exception $e) { report($e); } } diff --git a/LibreNMS/Util/Module.php b/LibreNMS/Util/Module.php index c2db208eee1..3518cf9ac41 100644 --- a/LibreNMS/Util/Module.php +++ b/LibreNMS/Util/Module.php @@ -76,7 +76,7 @@ public static function savePerformance(string $module, ProcessType $type, float return; // do not record for now as there is currently no rrd during discovery } - app('Datastore')->put(DeviceCache::getPrimary()->toArray(), 'poller-perf', [ + app('Datastore')->put(DeviceCache::getPrimary(), 'poller-perf', [ 'module' => $module, 'rrd_def' => RrdDefinition::make()->addDataset('poller', 'GAUGE', 0), 'rrd_name' => ['poller-perf', $module], diff --git a/LibreNMS/Util/ModuleList.php b/LibreNMS/Util/ModuleList.php index 73b659e9687..3e17d83a58b 100644 --- a/LibreNMS/Util/ModuleList.php +++ b/LibreNMS/Util/ModuleList.php @@ -29,6 +29,7 @@ use App\Facades\LibrenmsConfig; use App\Models\Device; use Illuminate\Support\Facades\Log; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Enum\ProcessType; use LibreNMS\Polling\ModuleStatus; @@ -109,7 +110,7 @@ public function modulesWithStatus(ProcessType $type, Device $device): array return ['core' => new ModuleStatus(true)] + $module_status; } - private function moduleStatus(ProcessType $type, string $module_name, Device $device): ModuleStatus + public function moduleStatus(ProcessType $type, string $module_name, Device $device): ModuleStatus { $override = $this->overrides[$module_name] ?? null; @@ -120,6 +121,7 @@ private function moduleStatus(ProcessType $type, string $module_name, Device $de $device->getAttrib("discover_$module_name"), $override == null ? null : true, is_array($override) ? $override : null, + $this->methodSetting($module_name, $device), ), ProcessType::Poller => new ModuleStatus( LibrenmsConfig::get("poller_modules.$module_name"), @@ -127,7 +129,21 @@ private function moduleStatus(ProcessType $type, string $module_name, Device $de $device->getAttrib("poll_$module_name"), $override == null ? null : true, is_array($override) ? $override : null, + $this->methodSetting($module_name, $device), ), }; } + + /** + * True when one of the module's non-SNMP methods is enabled, otherwise null. + */ + public function methodSetting(string $module_name, Device $device): ?bool + { + $methods = array_filter( + Module::fromName($module_name)->pollingMethods($device), + fn (PollingMethodType $method): bool => $method !== PollingMethodType::Snmp, + ); + + return $device->polling()->anyEnabled($methods) ?: null; + } } diff --git a/LibreNMS/Util/ModuleTestHelper.php b/LibreNMS/Util/ModuleTestHelper.php index c25a469d4b6..c20bd36595b 100644 --- a/LibreNMS/Util/ModuleTestHelper.php +++ b/LibreNMS/Util/ModuleTestHelper.php @@ -45,11 +45,8 @@ class ModuleTestHelper { private bool $quiet = false; - private readonly string $variant; private readonly string $snmprec_file; private readonly string $json_file; - private readonly string $snmprec_dir; - private readonly string $json_dir; private readonly string $file_name; private array $discovery_module_output = []; private array $poller_module_output = []; @@ -69,18 +66,10 @@ class ModuleTestHelper */ public function __construct(private readonly ModuleList $modules, string $os, string $variant = '') { - $this->variant = strtolower($variant); - // preset the file names - if ($variant) { - $variant = '_' . $this->variant; - } - $install_dir = LibrenmsConfig::get('install_dir'); - $this->file_name = $os . $variant; - $this->snmprec_dir = "$install_dir/tests/snmpsim/"; - $this->snmprec_file = $this->snmprec_dir . $this->file_name . '.snmprec'; - $this->json_dir = "$install_dir/tests/data/"; - $this->json_file = $this->json_dir . $this->file_name . '.json'; + $this->file_name = self::fixtureName($os, $variant); + $this->snmprec_file = self::snmprecFilepath($this->file_name); + $this->json_file = base_path("tests/data/$this->file_name.json"); // never store time series data LibrenmsConfig::set('rrd.enable', false); @@ -92,6 +81,20 @@ public function __construct(private readonly ModuleList $modules, string $os, st LibrenmsConfig::set('kafka.enable', false); } + /** + * The fixture base name: for the base fixture, _ for a variant + */ + public static function fixtureName(string $os, string $variant = ''): string + { + return $variant === '' ? $os : $os . '_' . strtolower($variant); + } + + public static function snmprecFilepath(string $fixture): string + { + // same directory Snmpsim serves + return base_path("tests/snmpsim/$fixture.snmprec"); + } + public function setQuiet(bool $quiet = true): void { $this->quiet = $quiet; @@ -273,7 +276,7 @@ public function name(): string ]); $method = new DevicePollingMethod([ 'method_type' => PollingMethodType::Snmp, - 'settings' => ['transport' => 'udp', 'port' => $snmpSimPort], + 'settings' => ['transport' => 'udp', 'port' => $snmpSimPort, 'max_repeaters' => 25], 'affects_availability' => true, 'last_check_successful' => true, ]); @@ -308,7 +311,7 @@ public function name(): string ob_start(); Log::setDefaultDriver('stdout'); - (new DiscoverDevice($device_id, $this->modules))->handle(); + new DiscoverDevice($device_id, $this->modules)->handle(); $this->discovery_output = ob_get_contents(); if ($this->quiet) { @@ -340,7 +343,7 @@ public function name(): string ob_start(); Log::setDefaultDriver('stdout'); - (new PollDevice($device_id, $this->modules))->handle(); + new PollDevice($device_id, $this->modules)->handle(); $this->poller_output = ob_get_contents(); if ($this->quiet) { @@ -364,7 +367,7 @@ public function name(): string if (! getenv('CI') && $device['hostname'] == $snmpSimIp) { // we don't need the debug from this Debug::set(false); - delete_device($device_id); + $device->delete(); } return $data; @@ -378,9 +381,9 @@ private function snmpSecret(): Secret { return Secret::updateOrCreate([ 'description' => 'LibreNMS Test Secret', - 'secret_type' => SecretType::Snmp, + 'secret_type' => SecretType::SnmpCommunity, ], [ - 'data' => ['version' => 'v2c', 'community' => $this->file_name], + 'data' => ['community' => $this->file_name], ]); } @@ -496,7 +499,7 @@ public function getTestData(): array public function getJsonFilepath(bool $short = false): string { if ($short) { - return ltrim(str_replace(LibrenmsConfig::get('install_dir'), '', $this->json_file), '/'); + return ltrim(str_replace(base_path(), '', $this->json_file), '/'); } return $this->json_file; diff --git a/LibreNMS/Util/ObjectCache.php b/LibreNMS/Util/ObjectCache.php index be9bef62826..4bfee163f00 100644 --- a/LibreNMS/Util/ObjectCache.php +++ b/LibreNMS/Util/ObjectCache.php @@ -74,8 +74,8 @@ public static function routing() return [ 'vrf' => Vrf::hasAccess($user)->count(), 'mpls' => Mpls::hasAccess($user)->count(), - 'ospf' => OspfInstance::hasAccess($user)->count(), - 'ospfv3' => Ospfv3Instance::hasAccess($user)->count(), + 'ospf' => OspfInstance::hasAccess($user)->where('ospfAdminStat', 'enabled')->count(), + 'ospfv3' => Ospfv3Instance::hasAccess($user)->where('ospfv3AdminStatus', 'enabled')->count(), 'isis' => IsisAdjacency::hasAccess($user)->count(), 'cisco-otv' => Component::hasAccess($user)->where('type', 'Cisco-OTV')->count(), 'bgp' => BgpPeer::hasAccess($user)->count(), diff --git a/LibreNMS/Util/Oid.php b/LibreNMS/Util/Oid.php index 8efcd8bd901..29836d9ffe0 100644 --- a/LibreNMS/Util/Oid.php +++ b/LibreNMS/Util/Oid.php @@ -94,13 +94,7 @@ public function isValid(string $oid): bool public static function hasNumeric(array $oids): bool { - foreach ($oids as $oid) { - if (self::of($oid)->isNumeric()) { - return true; - } - } - - return false; + return array_any($oids, fn ($oid) => self::of($oid)->isNumeric()); } /** diff --git a/LibreNMS/Util/RouteDistinguisher.php b/LibreNMS/Util/RouteDistinguisher.php new file mode 100644 index 00000000000..24a9cc1b90b --- /dev/null +++ b/LibreNMS/Util/RouteDistinguisher.php @@ -0,0 +1,76 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace LibreNMS\Util; + +class RouteDistinguisher +{ + /** + * Devices report route distinguishers as text, as text with a trailing null, + * or as the 8 octet RFC 4364 value. Returns null when it is not set. + */ + public static function parse(?string $value): ?string + { + $value = trim((string) $value, ' "'); + $octets = preg_match('/^[0-9a-f]{2}( [0-9a-f]{2})+$/i', $value) ? (string) hex2bin(str_replace(' ', '', $value)) : $value; + + $text = trim($octets, " \0"); + if ($text !== '' && ctype_print($text)) { + return str_contains($text, ':') ? $text : null; // some devices report INVALID or similar + } + + return strlen($octets) == 8 ? self::fromOctets($octets) : null; + } + + /** + * A 2 octet type, then administrator and assigned number subfields (RFC 4364 4.2) + */ + private static function fromOctets(string $octets): ?string + { + if (trim($octets, "\0") === '') { + return null; + } + + $type = unpack('n', substr($octets, 0, 2))[1]; + $value = substr($octets, 2); + + if ($type == 0) { + $parts = unpack('nadmin/Nnumber', $value); + + return "{$parts['admin']}:{$parts['number']}"; + } + + if ($type == 1) { + return inet_ntop(substr($value, 0, 4)) . ':' . unpack('n', substr($value, 4))[1]; + } + + if ($type == 2) { + $parts = unpack('Nadmin/nnumber', $value); + + return "{$parts['admin']}:{$parts['number']}"; + } + + return null; + } +} diff --git a/LibreNMS/Util/SearchTerm.php b/LibreNMS/Util/SearchTerm.php new file mode 100644 index 00000000000..eca2cbd81de --- /dev/null +++ b/LibreNMS/Util/SearchTerm.php @@ -0,0 +1,258 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace LibreNMS\Util; + +use Illuminate\Support\Facades\DB; + +class SearchTerm +{ + public const MAX_TERMS = 50; + + /** @var array{short: list, long: list}|null */ + private ?array $vendorOuis = null; + + /** + * @param string $value the trimmed search string + * @param IP|null $ip a complete address, or network when $isNetwork + * @param bool $isNetwork a prefix length was given (10.0.0.0/8) + * @param string|null $ipv4Fragment partial IPv4 address (10.1.) + * @param string|null $ipv6Fragment partial IPv6 address (2001:db8:) + * @param string|null $macHex lowercase hex digits of a full or partial MAC + */ + public function __construct( + public readonly string $value, + public readonly ?IP $ip = null, + public readonly bool $isNetwork = false, + public readonly ?string $ipv4Fragment = null, + public readonly ?string $ipv6Fragment = null, + public readonly ?string $macHex = null, + ) { + } + + /** + * Several addresses or hostnames pasted at once become separate terms, + * anything else is a single term so text with spaces still works + * + * @return list empty when nothing was searched for + */ + public static function parseMany(string $search): array + { + $tokens = preg_split('/[\s,;]+/', $search, -1, PREG_SPLIT_NO_EMPTY) ?: []; + $terms = array_values(array_filter(array_map(self::parse(...), $tokens), fn (self $term) => $term->value !== '')); + + if (count($terms) > 1 && array_all($terms, fn (self $term) => $term->ip !== null || $term->isFullMac() || $term->isHostname())) { + return $terms; + } + + $term = self::parse($search); + + return $term->value === '' ? [] : [$term]; + } + + /** + * Remove what comes along when copying an address from logs, configs or tickets: + * quotes, brackets, field names (ip=, mac:) and trailing punctuation + */ + public static function clean(string $search): string + { + $value = trim($search, " \t\n\r\0\x0B\"'`(){}<>,;"); + $value = (string) preg_replace('/^(ip|ipv4|ipv6|addr|address|mac|hwaddr|ether|lladdr|host|hostname)\s*[=:]\s*/i', '', $value); + $value = (string) preg_replace('/^\[([0-9a-f:.]+)](:\d+)?$/i', '$1', $value); // [2001:db8::1]:443 + + $value = trim($value, " \t\"'`[]"); + + return (string) preg_replace('/^(\d{1,3}(?:\.\d{1,3}){3}):\d+$/', '$1', $value); // 10.0.0.1:443 + } + + public static function parse(string $search): self + { + $value = self::clean($search); + $isNetwork = str_contains($value, '/'); + $ip = IP::parse($value, true); + $hex = strtolower((string) preg_replace('/^0x|[:\-. ]/i', '', $value)); + // Mac::parse() accepts single digit groups without separators, so 74:29:72 would be a full MAC + $mac = Mac::parse($value); + $isFullMac = $mac->isValid() && (strlen($hex) == 12 || count(preg_split('/[:\-.]/', $value)) == 6); + + $ipv4Fragment = null; + $ipv6Fragment = null; + if ($ip === null) { + if (preg_match('/^(?=.*\.)\.?\d{1,3}(\.\d{0,3}){0,3}$/', $value)) { + $ipv4Fragment = $value; + } elseif (! $isFullMac && preg_match('/^[0-9a-f:]+$/i', $value) && str_contains($value, ':')) { + $ipv6Fragment = strtolower($value); + } + } + + // short hex strings are usually words, only treat them as MAC when they have separators or 6+ digits + $macHex = null; + if ($isFullMac) { + $macHex = $mac->hex(); + } elseif ($ip === null && $ipv4Fragment === null && ctype_xdigit($hex) + && (strlen($hex) >= 6 || preg_match('/[:\-.]/', $value))) { + $macHex = substr($hex, 0, 12); + } + + return new self($value, $ip, $isNetwork && $ip !== null, $ipv4Fragment, $ipv6Fragment, $macHex); + } + + public function like(): string + { + return '%' . addcslashes($this->value, '\\%_') . '%'; + } + + public function isIpv4(): bool + { + return $this->ipv4Fragment !== null || $this->ip instanceof IPv4; + } + + public function isIpv6(): bool + { + return $this->ipv6Fragment !== null || $this->ip instanceof IPv6; + } + + public function isIp(): bool + { + return $this->isIpv4() || $this->isIpv6(); + } + + public function isExactIp(): bool + { + return $this->ip !== null && ! $this->isNetwork; + } + + /** + * fe80::1:2 is a valid address, but often typed as the beginning of a longer one + */ + public function mayBePartialIpv6(): bool + { + return $this->ip instanceof IPv6 && str_contains($this->value, '::'); + } + + public function isMac(): bool + { + return $this->macHex !== null; + } + + public function isFullMac(): bool + { + return $this->macHex !== null && strlen($this->macHex) == 12; + } + + /** + * Text that is not an address, could be a hostname or vendor + */ + public function isText(): bool + { + return ! $this->isIp() && ! $this->isMac() && preg_match('/[a-z]/i', $this->value) === 1; + } + + /** + * Only hex digits: a MAC with no separators, or a serial number or word that happens to look like one + */ + public function isBareHex(): bool + { + return ctype_xdigit($this->value); + } + + /** + * Could be found in free text like a serial number or location + */ + public function mayBeText(): bool + { + return ! $this->isIp() && (! $this->isMac() || $this->isBareHex()); + } + + /** + * Looks like a DNS name that could be resolved (contains a dot and a letter, no spaces) + */ + public function isHostname(): bool + { + return $this->isText() && str_contains($this->value, '.') + && preg_match('/^[a-z0-9]([a-z0-9\-_.]*[a-z0-9])?\.?$/i', $this->value) === 1; + } + + /** + * Upper case hex of the first and last address in the network, to compare with HEX(INET6_ATON(column)) + * + * @return array{string, string}|null + */ + public function networkRange(): ?array + { + if ($this->ip === null || ! $this->isNetwork) { + return null; + } + + $start = ''; + $end = ''; + foreach (str_split($this->ip->packed()) as $index => $byte) { + $bits = max(0, min(8, $this->ip->cidr - $index * 8)); + $mask = (0xFF << (8 - $bits)) & 0xFF; + $start .= chr(ord($byte) & $mask); + $end .= chr(ord($byte) | (~$mask & 0xFF)); + } + + return [strtoupper(bin2hex($start)), strtoupper(bin2hex($end))]; + } + + /** + * OUI prefixes of vendors matching this text. + * 6 digit OUIs are separate so they can be matched on their first 6 digits with IN (...) + * + * @return array{short: list, long: list} + */ + public function vendorOuis(): array + { + if ($this->vendorOuis === null) { + $ouis = strlen($this->value) >= 3 && $this->isText() && ! $this->isHostname() + ? DB::table('vendor_ouis')->whereLike('vendor', $this->like())->limit(5000)->pluck('oui') + : collect(); + + [$short, $long] = $ouis->map(fn ($oui) => strtolower((string) $oui)) + ->partition(fn ($oui) => strlen($oui) == 6); + + $this->vendorOuis = ['short' => $short->values()->all(), 'long' => $long->take(200)->values()->all()]; + } + + return $this->vendorOuis; + } + + /** + * Could match a MAC address column + */ + public function isAddressLike(): bool + { + return $this->isMac() || $this->isVendor(); + } + + public function isVendor(): bool + { + $ouis = $this->vendorOuis(); + + return ! empty($ouis['short']) || ! empty($ouis['long']); + } +} diff --git a/LibreNMS/Util/Snmpsim.php b/LibreNMS/Util/Snmpsim.php index 12f1fe9779b..144ecca52dc 100644 --- a/LibreNMS/Util/Snmpsim.php +++ b/LibreNMS/Util/Snmpsim.php @@ -96,7 +96,7 @@ public function setupVenv($print_output = false): void Log::error($setupProcess->getErrorOutput()); } - $installProcess = new Process([$snmpsim_venv_path . '/bin/pip', 'install', 'https://github.com/librenms/snmpsim/releases/download/v2.0.1/snmpsim-2.0.1-py3-none-any.whl']); + $installProcess = new Process([$snmpsim_venv_path . '/bin/pip', 'install', 'https://github.com/librenms/snmpsim/releases/download/v2.0.3/snmpsim-2.0.3-py3-none-any.whl']); $installProcess->setTty($print_output); $installProcess->run(); diff --git a/LibreNMS/Util/Stats.php b/LibreNMS/Util/Stats.php index d0187267e4c..1d4e33f6080 100644 --- a/LibreNMS/Util/Stats.php +++ b/LibreNMS/Util/Stats.php @@ -28,14 +28,13 @@ use App\Facades\LibrenmsConfig; use App\Models\Callback; -use App\Models\Secret; use Illuminate\Database\Query\Builder; use Illuminate\Support\Collection; use Illuminate\Support\Facades\DB; use Illuminate\Support\Str; use LibreNMS\Enum\PortAssociationMode; -use LibreNMS\Exceptions\SecretDecryptionException; -use LibreNMS\Polling\Secrets\Data\SnmpSecretData; +use LibreNMS\Enum\SecretType; +use LibreNMS\Polling\Method\Config\SnmpConfig; class Stats { @@ -59,15 +58,7 @@ public function dump(): array public function isEnabled(): bool { - $enabled = Callback::get('enabled'); - - if ($enabled == 2) { - $this->clearStats(); - - return false; - } - - return $enabled == 1; + return LibrenmsConfig::get('reporting.usage', false); } public function clearStats(): void @@ -190,29 +181,19 @@ private function collectDeviceInfo(): Collection } /** - * The SNMP version is stored in the encrypted secret, so it can't be grouped in SQL. + * The SNMP version follows from the secret type and the version setting, counted for each pair, then the few pairs are combined. */ private function selectSnmpVersions(): Collection { - $methodsPerSecret = DB::table('device_polling_methods') + return DB::table('device_polling_methods') + ->leftJoin('secrets', 'secrets.id', '=', 'device_polling_methods.secret_id') ->where('method_type', 'snmp') - ->whereNotNull('secret_id') - ->groupBy('secret_id') - ->selectRaw('secret_id, COUNT(*) AS total') - ->pluck('total', 'secret_id'); - - $totals = []; - foreach (Secret::whereIn('id', $methodsPerSecret->keys())->get() as $secret) { - try { - $version = SnmpSecretData::fromArray($secret->data)->version; - } catch (SecretDecryptionException) { - $version = 'unknown'; - } - $totals[$version] = ($totals[$version] ?? 0) + $methodsPerSecret[$secret->id]; - } - - return collect($totals) - ->map(fn (int $total, string $version) => (object) ['total' => $total, 'snmpver' => $version]) + ->groupBy('secrets.secret_type', 'device_polling_methods.settings->version') + ->select(['secrets.secret_type', 'device_polling_methods.settings->version as version']) + ->selectRaw('COUNT(*) AS total') + ->get() + ->groupBy(fn ($row) => SnmpConfig::version(SecretType::tryFrom((string) $row->secret_type), $row->version)) + ->map(fn (Collection $rows, string $version) => (object) ['total' => (int) $rows->sum('total'), 'snmpver' => $version]) ->values(); } diff --git a/LibreNMS/Util/StringHelpers.php b/LibreNMS/Util/StringHelpers.php index 70a3eeead45..7dcac53589c 100644 --- a/LibreNMS/Util/StringHelpers.php +++ b/LibreNMS/Util/StringHelpers.php @@ -240,7 +240,7 @@ public static function trimHexGarbage(string $string): string */ public static function hasNumber(string $string): bool { - return (bool) preg_match('/^\s*-?\d+(\.\d+)?/', $string); + return (bool) preg_match('/^\s*-?(\d+(\.\d*)?|\.\d+)/', $string); } public static function isHex(string $string, string $delimiter = ''): bool diff --git a/LibreNMS/Util/UserFuncHelper.php b/LibreNMS/Util/UserFuncHelper.php index b2799b70126..0880f783020 100644 --- a/LibreNMS/Util/UserFuncHelper.php +++ b/LibreNMS/Util/UserFuncHelper.php @@ -58,4 +58,14 @@ public function hhmmssToMinutes(): int return (int) ((int) $h * 60 + (int) $m + (int) $s / 60); } + + /** + * Reduce a bitmap to its highest set bit, e.g. 24 (16 + 8) becomes 16 + */ + public function highestBit(): int + { + $value = (int) $this->value; + + return $value > 0 ? 1 << (strlen(decbin($value)) - 1) : 0; + } } diff --git a/LibreNMS/Validations/Php.php b/LibreNMS/Validations/Php.php index 5e5488c2450..f7ccec7274c 100644 --- a/LibreNMS/Validations/Php.php +++ b/LibreNMS/Validations/Php.php @@ -67,7 +67,7 @@ private function checkVersion(Validator $validator) private function checkExtensions(Validator $validator) { - $required_modules = ['mysqlnd', 'mbstring', 'pcre', 'curl', 'xml', 'gd', 'sockets', 'dom']; + $required_modules = ['mysqlnd', 'mbstring', 'pcre', 'curl', 'xml', 'gd', 'sockets', 'dom', 'posix']; if (LibrenmsConfig::get('distributed_poller') && Config::get('cache.default') == 'memcached') { $required_modules[] = 'memcached'; @@ -81,10 +81,11 @@ private function checkExtensions(Validator $validator) } } - $suggested_extensions = ['posix' => 'php-process']; - foreach ($suggested_extensions as $extension => $packages) { - if (! extension_loaded($extension)) { - $validator->warn("Missing optional PHP extension: $extension", "It is suggested you install $packages or the one that matches your php version"); + // only available on the cli + $required_cli_modules = ['pcntl']; + foreach ($required_cli_modules as $extension) { + if (shell_exec($this->php() . " -r \"var_export(extension_loaded('$extension'));\"") == 'false') { + $validator->fail("Missing CLI PHP extension: $extension", "Please install $extension"); } } } diff --git a/LibreNMS/Validations/Poller/CheckDispatcherService.php b/LibreNMS/Validations/Poller/CheckDispatcherService.php index 97319011815..6d3e6d04d86 100644 --- a/LibreNMS/Validations/Poller/CheckDispatcherService.php +++ b/LibreNMS/Validations/Poller/CheckDispatcherService.php @@ -40,7 +40,7 @@ class CheckDispatcherService implements \LibreNMS\Interfaces\Validation */ public function validate(): ValidationResult { - if (PollerCluster::exists()) { + if (PollerCluster::isQueueWorker(false)->exists()) { return $this->checkDispatchService(); } elseif (LibrenmsConfig::get('schedule_type.poller') == 'dispatcher') { // We have explicity set the scheduler to be the dispatcher, but no nodes have registered @@ -60,10 +60,10 @@ public function enabled(): bool private function checkDispatchService(): ValidationResult { - if (PollerCluster::isActive()->exists()) { + if (PollerCluster::isQueueWorker(false)->isActive()->exists()) { // check for inactive nodes $this_node_id = config('librenms.node_id'); - $inactive = PollerCluster::isInactive()->get() + $inactive = PollerCluster::isQueueWorker(false)->isInactive()->get() ->map(function (PollerCluster $node) use ($this_node_id) { $name = $node->poller_name ?: $node->node_id; diff --git a/LibreNMS/Validations/Poller/CheckQueuePolling.php b/LibreNMS/Validations/Poller/CheckQueuePolling.php new file mode 100644 index 00000000000..81dcb5e78d9 --- /dev/null +++ b/LibreNMS/Validations/Poller/CheckQueuePolling.php @@ -0,0 +1,76 @@ +checkDispatcher(app(QueueStatus::class), app(FailedJobs::class)); + } catch (Exception $e) { + return ValidationResult::fail(trans('validation.validations.poller.CheckQueueWorkers.unavailable', ['message' => $e->getMessage()])); + } + + if ($result !== null) { + return $result; + } + + if (WorkerNode::inUse('poller')) { + $overdue = app(QueueStatus::class)->overdueDevices()->pluck('hostname'); + + if ($overdue->isNotEmpty()) { + return ValidationResult::warn(trans('validation.validations.poller.CheckQueuePolling.overdue'), trans('validation.validations.poller.CheckQueuePolling.overdue_fix')) + ->setList('Devices', $overdue->all()); + } + } + + return ValidationResult::ok(trans('validation.validations.poller.CheckQueuePolling.ok')); + } + + /** + * @inheritDoc + */ + public function enabled(): bool + { + return Eloquent::isConnected() && WorkerNode::inUse() && Device::exists(); + } + + private function checkDispatcher(QueueStatus $status, FailedJobs $failedJobs): ?ValidationResult + { + $last = $status->lastDispatched(); + if ($last !== null && $last->diffInSeconds(now()) <= self::DISPATCH_LATE) { + return null; + } + + $result = $last === null + ? ValidationResult::fail(trans('validation.validations.poller.CheckQueuePolling.not_dispatched')) + : ValidationResult::fail(trans('validation.validations.poller.CheckQueuePolling.dispatch_stopped', ['time' => $last->diffForHumans()])); + + $failed = $failedJobs->list(job: DispatchPollingWork::class, limit: 1)->first(); + if ($failed !== null) { + $result->setList('Last failure', [$failed['finished']?->diffForHumans() . ': ' . $failed['error']]); + } + + return $result; + } +} diff --git a/LibreNMS/Validations/Poller/CheckQueueWorkers.php b/LibreNMS/Validations/Poller/CheckQueueWorkers.php new file mode 100644 index 00000000000..6a951916a86 --- /dev/null +++ b/LibreNMS/Validations/Poller/CheckQueueWorkers.php @@ -0,0 +1,93 @@ + config('queue.default')]), 'Set QUEUE_CONNECTION=redis in .env'); + } + + try { + $status = app(QueueStatus::class); + $intervals = $status->pollingQueues(); + $worked = app(WorkedQueues::class)->worked(array_keys($intervals)); + + if (empty($worked)) { + return ValidationResult::fail(trans('validation.validations.poller.CheckQueueWorkers.not_running')) + ->setFix($this->serviceCommands()); + } + + $inactive = PollerCluster::isQueueWorker()->isInactive()->get() + ->map(fn (PollerCluster $node) => $node->poller_name ?: $node->node_id); + if ($inactive->isNotEmpty()) { + return ValidationResult::fail(trans('validation.validations.poller.CheckQueueWorkers.nodes_down')) + ->setList('Inactive Nodes', $inactive->all()); + } + + $unworked = array_diff(array_keys($intervals), $worked); + if (! empty($unworked)) { + return ValidationResult::fail(trans('validation.validations.poller.CheckQueueWorkers.unworked')) + ->setList('Queues', array_values($unworked)); + } + + // jobs are queued when due, one waiting longer than the interval is not run before the next is due + $behind = collect($status->ages(array_keys($intervals))) + ->filter(fn (int $age, string $name): bool => $age > $intervals[$name]) + ->map(fn (int $age, string $name): string => "$name ({$age}s)"); + if ($behind->isNotEmpty()) { + return ValidationResult::warn(trans('validation.validations.poller.CheckQueueWorkers.behind')) + ->setList('Queues', $behind->values()->all()); + } + } catch (Exception $e) { + return ValidationResult::fail(trans('validation.validations.poller.CheckQueueWorkers.unavailable', ['message' => $e->getMessage()])); + } + + return ValidationResult::ok(trans('validation.validations.poller.CheckQueueWorkers.ok')); + } + + /** + * @inheritDoc + */ + public function enabled(): bool + { + return Eloquent::isConnected() && WorkerNode::inUse(); + } + + /** + * @return string[] + */ + private function serviceCommands(): array + { + $base_dir = rtrim(base_path(), '/'); + + if (resolve(Binaries::class)->find('systemctl') === null) { + return ["Run '$base_dir/lnms worker' with a process supervisor that starts it again when it exits"]; + } + + return [ + $base_dir === '/opt/librenms' + ? 'sudo cp /opt/librenms/dist/librenms-worker.service /etc/systemd/system/' + : "sudo sh -c 'sed \"s#/opt/librenms#$base_dir#\" $base_dir/dist/librenms-worker.service > /etc/systemd/system/librenms-worker.service'", + 'sudo systemctl enable --now librenms-worker.service', + ]; + } +} diff --git a/LibreNMS/Validations/Programs.php b/LibreNMS/Validations/Programs.php index d4b2d79c6c9..bf8a471286e 100644 --- a/LibreNMS/Validations/Programs.php +++ b/LibreNMS/Validations/Programs.php @@ -38,7 +38,7 @@ class Programs extends BaseValidation /** older versions have no -4/-6 options, IPv6 needs the separate fping6 binary */ public const FPING_MIN_VERSION = '4.0'; /** binaries needed to poll devices */ - private const REQUIRED_BINARIES = ['fping', 'rrdtool', 'snmpwalk', 'snmpget', 'snmpgetnext', 'snmpbulkwalk']; + private const array REQUIRED_BINARIES = ['fping', 'rrdtool', 'snmpwalk', 'snmpget', 'snmpgetnext', 'snmpbulkwalk']; /** * Validate this module. diff --git a/LibreNMS/Validations/Python.php b/LibreNMS/Validations/Python.php index 85d19675b45..aff1a01e841 100644 --- a/LibreNMS/Validations/Python.php +++ b/LibreNMS/Validations/Python.php @@ -52,8 +52,14 @@ public function validate(Validator $validator): void } $this->checkVersion($validator, $version); - $this->checkPipVersion($validator, $version); - $this->checkExtensions($validator); + + $pip_output = (string) `pip3 --version 2>/dev/null`; + if (empty($pip_output)) { + $validator->warn('pip3 is not available'); + } else { + $this->checkPipVersion($validator, $pip_output, $version); + $this->checkExtensions($validator); + } } private function checkVersion(Validator $validator, $version) @@ -63,10 +69,10 @@ private function checkVersion(Validator $validator, $version) } } - private function checkPipVersion(Validator $validator, $version) + private function checkPipVersion(Validator $validator, string $pip_output, string $version) { - preg_match('/\(python ([0-9.]+)\)/', (string) `pip3 --version 2>/dev/null`, $matches); - $pip = $matches[1]; + preg_match('/\(python ([0-9.]+)\)/', $pip_output, $matches); + $pip = $matches[1] ?? ''; $python = implode('.', array_slice(explode('.', (string) $version), 0, 2)); if ($pip && version_compare($python, $pip, '!=')) { $validator->fail("python3 ($python) and pip3 ($pip) versions do not match. This likely will cause dependencies to be installed for the wrong python version."); diff --git a/LibreNMS/Validations/Rrd/CheckRrdBackend.php b/LibreNMS/Validations/Rrd/CheckRrdBackend.php new file mode 100644 index 00000000000..e48f611e223 --- /dev/null +++ b/LibreNMS/Validations/Rrd/CheckRrdBackend.php @@ -0,0 +1,33 @@ + $port])); - } - } else { - $connection = @fsockopen($host, (int) $port); - if (is_resource($connection)) { - fclose($connection); - } else { - return ValidationResult::fail(trans('validation.validations.rrd.CheckRrdcachedConnectivity.fail_port', ['server' => $host, 'port' => $port])); + // librrd treats unix: and bare paths as unix sockets + if (str_starts_with($rrdcached, 'unix:') || str_starts_with($rrdcached, '/')) { + $socket = preg_replace('/^unix:/', '', $rrdcached); + if (! file_exists($socket)) { + return ValidationResult::fail(trans('validation.validations.rrd.CheckRrdcachedConnectivity.fail_socket', ['socket' => $socket])); } + + return ValidationResult::ok(trans('validation.validations.rrd.CheckRrdcachedConnectivity.ok')); + } + + [$host, $port] = self::hostAndPort($rrdcached); + $connection = @stream_socket_client('tcp://' . (str_contains($host, ':') ? "[$host]" : $host) . ":$port", $errno, $errstr, 5); + if (! is_resource($connection)) { + return ValidationResult::fail(trans('validation.validations.rrd.CheckRrdcachedConnectivity.fail_port', ['server' => $host, 'port' => $port])); } + fclose($connection); + return ValidationResult::ok(trans('validation.validations.rrd.CheckRrdcachedConnectivity.ok')); } + /** + * Split host, host:port, [ipv6], [ipv6]:port or a bare ipv6 address like librrd, defaulting to port 42217 + * + * @return array{string, int} + */ + private static function hostAndPort(string $address): array + { + if (preg_match('/^\[(.+)](?::(\d+))?$/', $address, $matches)) { + return [$matches[1], (int) ($matches[2] ?? 0) ?: 42217]; + } + + // more than one colon is a bare ipv6 address without a port + if (substr_count($address, ':') === 1) { + [$host, $port] = explode(':', $address); + + return [$host, (int) $port ?: 42217]; + } + + return [$address, 42217]; + } + /** * @inheritDoc */ diff --git a/LibreNMS/service.py b/LibreNMS/service.py index c24567cc380..b77ecf1816b 100644 --- a/LibreNMS/service.py +++ b/LibreNMS/service.py @@ -459,7 +459,16 @@ def reap_psutil(self): A process from a previous invocation is trying to report its status """ # Speed things up by only looking at direct zombie children - for p in psutil.Process().children(recursive=False): + try: + children = psutil.Process().children(recursive=False) + except (OSError, psutil.AccessDenied): + # psutil may raise AccessDenied during /proc scans on hosts with PID churn. + # Catch it to keep the dispatcher alive and re-arm reaping, since no + # further SIGCHLD may arrive to retry pending children. + self.reap_flag = True + logger.debug("Could not enumerate child processes", exc_info=True) + return + for p in children: try: status = p.status() @@ -472,8 +481,13 @@ def reap_psutil(self): r[0], r[1], ) - except (OSError, psutil.NoSuchProcess): - # process was already reaped + except psutil.NoSuchProcess: + # process was already reaped, nothing to retry + continue + except (OSError, psutil.AccessDenied): + # child was unreadable mid-reap, re-arm so a possible zombie + # gets another chance on the next loop iteration + self.reap_flag = True continue def start(self): @@ -673,23 +687,8 @@ def fetch_immediate_device_list(self): def run_maintenance(self): """ - Runs update and cleanup tasks by calling daily.sh. Reloads the python script after the update. - Sets a schema-update lock so no distributed pollers will update until the schema has been updated. + Run update and cleanup tasks by calling daily.sh, then reload on success. """ - attempt = 0 - wait = 5 - max_runtime = 86100 - max_tries = int(max_runtime / wait) - logger.info("Waiting for schema lock") - while not self._lm.lock("schema-update", self.config.unique_name, max_runtime): - attempt += 1 - if attempt >= max_tries: # don't get stuck indefinitely - logger.warning( - "Reached max wait for other pollers to update, updating now" - ) - break - sleep(wait) - logger.info("Running maintenance tasks") exit_code, output = LibreNMS.call_script("daily.sh") if exit_code == 0: @@ -697,8 +696,6 @@ def run_maintenance(self): else: logger.error("Error {} in daily.sh:\n{}".format(exit_code, output)) - self._lm.unlock("schema-update", self.config.unique_name) - self.reload_flag = True def create_lock_manager(self): diff --git a/app/Actions/Device/AddFoundDevice.php b/app/Actions/Device/AddFoundDevice.php index b74af023b90..fe26324e85c 100644 --- a/app/Actions/Device/AddFoundDevice.php +++ b/app/Actions/Device/AddFoundDevice.php @@ -39,7 +39,7 @@ readonly class AddFoundDevice { - private const LOCK_SECONDS = 300; // longer than adding a device takes + private const int LOCK_SECONDS = 300; // longer than adding a device takes public function __construct( private ValidateDeviceAndCreate $create, @@ -74,7 +74,7 @@ private function create(Device $device, ?Collection $pollingMethods, array $unch { try { if ($this->create->execute($device, $pollingMethods, uncheckedMethods: $uncheckedMethods)) { - return new AddFoundDeviceResult(DeviceAddOutcome::Added, trans('commands.device:add.messages.added', ['hostname' => $device->hostname, 'device_id' => $device->device_id])); + return new AddFoundDeviceResult(DeviceAddOutcome::Added, trans('commands.device:add.messages.added', ['hostname' => $device->hostname, 'device_id' => $device->device_id]), $device); } return new AddFoundDeviceResult(DeviceAddOutcome::Error, trans('commands.device:add.messages.save_failed', ['hostname' => $device->hostname])); diff --git a/app/Actions/Device/AddFoundDeviceResult.php b/app/Actions/Device/AddFoundDeviceResult.php index 8a57bfe9fc1..5ea9c054ec7 100644 --- a/app/Actions/Device/AddFoundDeviceResult.php +++ b/app/Actions/Device/AddFoundDeviceResult.php @@ -2,6 +2,7 @@ namespace App\Actions\Device; +use App\Models\Device; use LibreNMS\Enum\DeviceAddOutcome; readonly class AddFoundDeviceResult @@ -9,6 +10,7 @@ public function __construct( public DeviceAddOutcome $outcome, public string $message = '', + public ?Device $device = null, // the added device ) { } diff --git a/app/Actions/Device/BuildDefaultPollingMethods.php b/app/Actions/Device/BuildDefaultPollingMethods.php index 4c4a67de901..967c96b7fec 100644 --- a/app/Actions/Device/BuildDefaultPollingMethods.php +++ b/app/Actions/Device/BuildDefaultPollingMethods.php @@ -21,8 +21,9 @@ public function __construct( * Build a single candidate or transient polling method with its secret relation. * * @param array $data + * @param string $errorKeyPrefix prefix for the validation error keys, where the data is nested in the request */ - public function buildMethod(Device $device, PollingMethodType $type, array $data = []): DevicePollingMethod + public function buildMethod(Device $device, PollingMethodType $type, array $data = [], string $errorKeyPrefix = ''): DevicePollingMethod { $method = $this->pollingMethods->get($type); $pollingMethod = new DevicePollingMethod([ @@ -33,12 +34,15 @@ public function buildMethod(Device $device, PollingMethodType $type, array $data ]); $pollingMethod->setRelation('device', $device); - $secret = $this->resolveSecret->execute($device, $type, $data); + $secret = $this->resolveSecret->execute($device, $type, $data, $errorKeyPrefix); if ($secret !== null) { $pollingMethod->setRelation('secret', $secret); if ($secret->exists) { $pollingMethod->secret_id = $secret->id; } + } elseif (isset($data['secret_type'])) { + // without a secret, a type limits the default credentials that are tried, like only v3 credentials + $pollingMethod->defaultSecretType = $method->secretTypeFrom($data['secret_type']); } return $pollingMethod; @@ -48,9 +52,10 @@ public function buildMethod(Device $device, PollingMethodType $type, array $data * Build default polling methods collection for a new device. * * @param array $input + * @param string $errorKeyPrefix prefix for the validation error keys of the methods, where they are nested in the request * @return Collection */ - public function execute(Device $device, array $input = []): Collection + public function execute(Device $device, array $input = [], string $errorKeyPrefix = ''): Collection { $pollingMethods = collect(); @@ -64,9 +69,9 @@ public function execute(Device $device, array $input = []): Collection continue; } - $type = PollingMethodType::tryFrom($methodName); + $type = PollingMethodType::tryFromKnown($methodName); if ($type !== null) { - $pollingMethods->push($this->buildMethod($device, $type, $data)); + $pollingMethods->push($this->buildMethod($device, $type, $data, $errorKeyPrefix === '' ? '' : "$errorKeyPrefix$methodName.")); } } diff --git a/app/Actions/Device/BuildPollingMethodCandidates.php b/app/Actions/Device/BuildPollingMethodCandidates.php new file mode 100644 index 00000000000..ab4ab88075e --- /dev/null +++ b/app/Actions/Device/BuildPollingMethodCandidates.php @@ -0,0 +1,121 @@ + 'snmp.default_credentials', + ]; + + public function __construct( + private PollingMethodRegistry $pollingMethods, + ) { + } + + /** + * The ways to try a polling method, most preferred first. Copies, the method is not changed, see apply(). + * A method tries its secret, or without one its default credentials. A method without default credentials is tried as it is. + * For a new device, each secret is then tried again with the retry settings of its type (a community as v1), + * unless the method sets them. Retries come after every other candidate, like the legacy default SNMP versions v2c, v3, v1. + * Empty when a method has no secret and none of its default credentials exist. + * + * @return list + */ + public function execute(Device $device, DevicePollingMethod $deviceMethod): array + { + $secrets = $deviceMethod->secret !== null ? [$deviceMethod->secret] : $this->defaultSecrets($deviceMethod); + if ($secrets === null) { + return [$deviceMethod->replicate()]; + } + + $settings = $deviceMethod->settings ?? []; + $givenSettings = array_filter($settings); + $candidates = []; + $retries = []; + foreach ($secrets as $secret) { + $candidates[] = $this->withSecret($deviceMethod, $secret); + + foreach ($device->exists ? [] : $this->retrySettings($secret->secret_type) as $retry) { + // a setting the method sets is not retried with another value + if (array_intersect_key($givenSettings, $retry) === []) { + $retries[] = $this->withSecret($deviceMethod, $secret, [...$settings, ...$retry]); + } + } + } + + return [...$candidates, ...$retries]; + } + + /** + * Give the method the secret and settings of the candidate that worked, or that is used without a check. + */ + public function apply(DevicePollingMethod $candidate, DevicePollingMethod $deviceMethod): void + { + // the candidate is a copy without the key and timestamps, the method keeps those + $deviceMethod->setRawAttributes([...$deviceMethod->getAttributes(), ...$candidate->getAttributes()]); + $deviceMethod->setRelations([...$deviceMethod->getRelations(), ...$candidate->getRelations()]); + } + + /** + * Settings to try a new device's secret of this type with again, when the other candidates did not work. + * + * @return list> + */ + private function retrySettings(SecretType $secretType): array + { + return match ($secretType) { + SecretType::SnmpCommunity => [['version' => 'v1']], // a community is tried as v2c, some devices only speak v1 + default => [], + }; + } + + /** + * The default credentials in the order they are tried, null when the method has none. + * + * @return Collection|null + */ + private function defaultSecrets(DevicePollingMethod $deviceMethod): ?Collection + { + $config = self::DEFAULT_CREDENTIALS[$deviceMethod->method_type->value] ?? null; + if ($config === null) { + return null; + } + + /** @var array $defaultSecretIds */ + $defaultSecretIds = (array) LibrenmsConfig::get($config, []); + $secretTypes = $deviceMethod->defaultSecretType ? [$deviceMethod->defaultSecretType] : $this->pollingMethods->get($deviceMethod->method_type)->secretTypes(); + + return Secret::whereIn('secret_type', $secretTypes) + ->whereIn('id', $defaultSecretIds) + ->get() + ->sortBy(fn (Secret $secret) => array_search($secret->id, $defaultSecretIds)) + ->values(); + } + + /** + * @param array|null $settings null keeps the settings of the method + */ + private function withSecret(DevicePollingMethod $deviceMethod, Secret $secret, ?array $settings = null): DevicePollingMethod + { + $candidate = $deviceMethod->replicate(); + if ($settings !== null) { + $candidate->settings = $settings; + } + $candidate->secret_id = $secret->id; + $candidate->setRelation('secret', $secret); + + return $candidate; + } +} diff --git a/app/Actions/Device/CheckDeviceAvailability.php b/app/Actions/Device/CheckDeviceAvailability.php index 1c07db4b0a1..01947433034 100644 --- a/app/Actions/Device/CheckDeviceAvailability.php +++ b/app/Actions/Device/CheckDeviceAvailability.php @@ -21,13 +21,15 @@ public function execute(PerDeviceMethodResults $methodResults, bool $commit = fa { $device = $methodResults->device; - if ($device->pollingMethods->isEmpty()) { + $deviceMethods = $device->polling()->methods(); + + if ($deviceMethods->isEmpty()) { Log::debug("No polling methods for $device->hostname, availability is not checked"); return $device->status; } - $availabilityMethods = $device->pollingMethods + $availabilityMethods = $deviceMethods ->filter(fn (DevicePollingMethod $deviceMethod): bool => $deviceMethod->enabled && $deviceMethod->affects_availability); foreach ($availabilityMethods as $deviceMethod) { diff --git a/app/Actions/Device/DiscoverDevicePollingMethods.php b/app/Actions/Device/DiscoverDevicePollingMethods.php index cec873103f0..df13e7c45ff 100644 --- a/app/Actions/Device/DiscoverDevicePollingMethods.php +++ b/app/Actions/Device/DiscoverDevicePollingMethods.php @@ -7,12 +7,11 @@ use Illuminate\Support\Collection; use LibreNMS\Enum\PollingMethodType; use LibreNMS\Exceptions\HostUnreachableException; -use LibreNMS\Polling\Method\PollingMethodRegistry; readonly class DiscoverDevicePollingMethods { public function __construct( - private PollingMethodRegistry $pollingMethods, + private DiscoverPollingMethod $discoverMethod, ) { } @@ -29,8 +28,7 @@ public function execute(Device $device, Collection $candidateMethods, bool $ping $enabledMethods = $candidateMethods->filter(fn (DevicePollingMethod $m) => $m->enabled); foreach ($enabledMethods as $deviceMethod) { - $method = $this->pollingMethods->get($deviceMethod->method_type); - $result = $method->discover($device, $deviceMethod); + $result = $this->discoverMethod->execute($device, $deviceMethod); $deviceMethod->last_check_successful = $result->isSuccess(); diff --git a/app/Actions/Device/DiscoverPollingMethod.php b/app/Actions/Device/DiscoverPollingMethod.php new file mode 100644 index 00000000000..ed35f72f049 --- /dev/null +++ b/app/Actions/Device/DiscoverPollingMethod.php @@ -0,0 +1,43 @@ +pollingMethods->get($deviceMethod->method_type); + + $reasons = []; + $lastResult = null; + foreach ($this->candidates->execute($device, $deviceMethod) as $candidate) { + $result = $method->discover($device, $candidate); + + if ($result->isSuccess()) { + $this->candidates->apply($candidate, $deviceMethod); + + return $result; + } + + $lastResult = $result; + array_push($reasons, ...$result->reasons()); + } + + return ProbeResult::failure($lastResult?->stats() ?? [], $lastResult?->errorMessage(), $reasons); + } +} diff --git a/app/Actions/Device/LegacyDeviceCreator.php b/app/Actions/Device/LegacyDeviceCreator.php index 4676a1492bd..0e4f9bbef29 100644 --- a/app/Actions/Device/LegacyDeviceCreator.php +++ b/app/Actions/Device/LegacyDeviceCreator.php @@ -8,8 +8,10 @@ use Illuminate\Support\Collection; use LibreNMS\Enum\PollingMethodType; use LibreNMS\Enum\SecretMode; -use LibreNMS\Polling\Secrets\Data\SnmpSecretData; -use LibreNMS\Polling\Secrets\Definitions\SnmpSecretDefinition; +use LibreNMS\Enum\SecretType; +use LibreNMS\Polling\Secrets\Data\SnmpCommunitySecretData; +use LibreNMS\Polling\Secrets\Data\SnmpV3SecretData; +use LibreNMS\Polling\Secrets\Definitions\SnmpV3SecretDefinition; class LegacyDeviceCreator { @@ -74,7 +76,8 @@ public function getPollingMethods(Device $device): Collection */ public function pollingMethodsInput(): array { - $secretData = $this->snmpSecretData(); + $secretType = $this->snmpSecretType(); + $secretData = $this->snmpSecretData($secretType); return [ // a ping only device is always pinged @@ -82,43 +85,68 @@ public function pollingMethodsInput(): array PollingMethodType::Snmp->value => [ 'active' => ! $this->ping_only, 'settings' => array_filter([ + // a given community version is only tried with that version, without one v2c then v1 are tried + 'version' => in_array($this->snmpver, ['v1', 'v2c'], true) ? $this->snmpver : null, 'port' => $this->port, 'transport' => $this->transport, 'port_association_mode' => $this->port_association_mode, ], fn ($v) => $v !== null), 'secret_mode' => $secretData ? SecretMode::New->value : SecretMode::Default->value, + 'secret_type' => $secretType?->value, 'secret_data' => $secretData?->toArray(), ], ]; } /** - * Explicit SNMP credentials, only a version to try the default credentials for that version, or null to try all default credentials. + * The type of the new secret, or of the default credentials to try without one. Null when nothing says which. + */ + private function snmpSecretType(): ?SecretType + { + if ($this->snmpver === 'v3') { + return SecretType::SnmpV3; + } + + if ($this->snmpver || filled($this->community)) { + return SecretType::SnmpCommunity; + } + + return $this->hasV3Credentials() ? SecretType::SnmpV3 : null; + } + + /** + * Explicit SNMP credentials of the type, or null to try the default credentials. * Any given value is explicit, even one that matches a default. + * v3 values without a community are not credentials for v1 or v2c. */ - private function snmpSecretData(): ?SnmpSecretData + private function snmpSecretData(?SecretType $secretType): SnmpCommunitySecretData|SnmpV3SecretData|null + { + if ($secretType === SecretType::SnmpCommunity && filled($this->community)) { + return new SnmpCommunitySecretData((string) $this->community); + } + + if ($secretType === SecretType::SnmpV3 && ($this->hasV3Credentials() || filled($this->community))) { + return new SnmpV3SecretData( + authname: $this->authname ?: 'root', + authlevel: $this->authlevel ?: (($this->authpass ? 'auth' : 'noAuth') . (($this->cryptopass && $this->authpass) ? 'Priv' : 'NoPriv')), + authpass: $this->authpass, + authalgo: $this->authalgo ?: SnmpV3SecretDefinition::DEFAULT_AUTHALGO, + cryptoalgo: $this->cryptoalgo ?: SnmpV3SecretDefinition::DEFAULT_CRYPTOALGO, + cryptopass: $this->cryptopass, + ); + } + + return null; + } + + private function hasV3Credentials(): bool { - $hasV3Credentials = filled($this->authname) + return filled($this->authname) || filled($this->authlevel) || filled($this->authpass) || filled($this->authalgo) || filled($this->cryptopass) || filled($this->cryptoalgo); - - if (blank($this->community) && ! $hasV3Credentials) { - return $this->snmpver ? new SnmpSecretData(version: $this->snmpver) : null; - } - - return new SnmpSecretData( - version: $this->snmpver ?: (blank($this->community) ? 'v3' : SnmpSecretDefinition::DEFAULT_VERSION), - community: $this->community, - authlevel: $this->authlevel ?: (($this->authpass ? 'auth' : 'noAuth') . (($this->cryptopass && $this->authpass) ? 'Priv' : 'NoPriv')), - authname: $this->authname ?: 'root', - authpass: $this->authpass, - authalgo: $this->authalgo ?: SnmpSecretDefinition::DEFAULT_AUTHALGO, - cryptoalgo: $this->cryptoalgo ?: SnmpSecretDefinition::DEFAULT_CRYPTOALGO, - cryptopass: $this->cryptopass, - ); } /** diff --git a/app/Actions/Device/PersistDeviceWithPollingMethods.php b/app/Actions/Device/PersistDeviceWithPollingMethods.php index b8f07530fa8..0d8ab936a1d 100644 --- a/app/Actions/Device/PersistDeviceWithPollingMethods.php +++ b/app/Actions/Device/PersistDeviceWithPollingMethods.php @@ -6,14 +6,27 @@ use App\Models\DevicePollingMethod; use Illuminate\Support\Collection; use Illuminate\Support\Facades\DB; +use Illuminate\Validation\ValidationException; +use LibreNMS\Polling\Method\PollingMethodRegistry; class PersistDeviceWithPollingMethods { + public function __construct( + private readonly PollingMethodRegistry $registry, + ) { + } + /** * @param Collection|null $pollingMethods + * + * @throws ValidationException */ public function execute(Device $device, ?Collection $pollingMethods = null): bool { + foreach ($pollingMethods ?? [] as $deviceMethod) { + $this->registry->get($deviceMethod->method_type)->validate($deviceMethod); + } + return DB::transaction(function () use ($device, $pollingMethods): bool { $saved = $device->save(); diff --git a/app/Actions/Device/ResolvePollingMethodSecret.php b/app/Actions/Device/ResolvePollingMethodSecret.php index 09a63ec8445..4def6b6ca0f 100644 --- a/app/Actions/Device/ResolvePollingMethodSecret.php +++ b/app/Actions/Device/ResolvePollingMethodSecret.php @@ -20,14 +20,16 @@ public function __construct( * The secret selected by polling method form input. New and edited secrets are not saved. * Returns null when no secret was selected. * - * @param array $input secret_mode, secret_id, description and secret_data + * @param array $input secret_mode, secret_id, secret_type, description and secret_data + * @param string $errorKeyPrefix prefix for the validation error keys, where the input is nested in the request * * @throws ValidationException */ - public function execute(Device $device, PollingMethodType $type, array $input): ?Secret + public function execute(Device $device, PollingMethodType $type, array $input, string $errorKeyPrefix = ''): ?Secret { - $secretType = $this->pollingMethods->get($type)->secretType(); - if ($secretType === null) { + $method = $this->pollingMethods->get($type); + $secretTypes = $method->secretTypes(); + if (empty($secretTypes)) { return null; } @@ -36,7 +38,7 @@ public function execute(Device $device, PollingMethodType $type, array $input): $data = $input['secret_data'] ?? []; if ($mode === SecretMode::Existing || $mode === SecretMode::Edit) { - $secret = Secret::resolveForType((int) ($input['secret_id'] ?? 0), $secretType); + $secret = Secret::resolveForTypes((int) ($input['secret_id'] ?? 0), $secretTypes, errorKey: $errorKeyPrefix . 'secret_id'); if ($mode === SecretMode::Edit) { $secret->data = $data; @@ -47,6 +49,11 @@ public function execute(Device $device, PollingMethodType $type, array $input): } if ($mode === SecretMode::New) { + $secretType = $method->secretTypeFrom($input['secret_type'] ?? null); + if ($secretType === null) { + throw ValidationException::withMessages([$errorKeyPrefix . 'secret_type' => __('poller.credential_type_mismatch')]); + } + return new Secret([ 'secret_type' => $secretType, 'description' => $description ?: Secret::defaultDescription($type, $device->hostname), diff --git a/app/Actions/Device/ValidateDeviceAndCreate.php b/app/Actions/Device/ValidateDeviceAndCreate.php index a1409af16ec..26789498ceb 100644 --- a/app/Actions/Device/ValidateDeviceAndCreate.php +++ b/app/Actions/Device/ValidateDeviceAndCreate.php @@ -31,6 +31,7 @@ use App\Models\DevicePollingMethod; use Illuminate\Support\Collection; use LibreNMS\Enum\PollingMethodType; +use LibreNMS\Exceptions\MissingSecretException; use LibreNMS\Polling\Method\PollingMethodRegistry; readonly class ValidateDeviceAndCreate @@ -42,6 +43,7 @@ public function __construct( private DiscoverDeviceMetadata $discoverMetadata, private PersistDeviceWithPollingMethods $persister, private PollingMethodRegistry $registry, + private BuildPollingMethodCandidates $candidates, ) { } @@ -53,7 +55,7 @@ public function __construct( * @throws \LibreNMS\Exceptions\HostExistsException * @throws \LibreNMS\Exceptions\HostUnreachableException * @throws \LibreNMS\Exceptions\SnmpVersionUnsupportedException - * @throws \LibreNMS\Exceptions\MissingSecretException + * @throws MissingSecretException */ public function execute( Device $device, @@ -89,9 +91,12 @@ public function execute( // after the sysName check, only a sysName that was given or read from the device is checked $device->sysName = $device->sysName ?: $device->hostname; - // methods that were not checked have not found credentials + // methods that were not checked have not found credentials, they get the first ones that would be tried foreach ($pollingMethods as $deviceMethod) { - $this->registry->get($deviceMethod->method_type)->assignDefaultSecret($deviceMethod); + if ($deviceMethod->secret === null && $this->registry->get($deviceMethod->method_type)->secretTypes() !== []) { + $candidate = $this->candidates->execute($device, $deviceMethod)[0] ?? throw new MissingSecretException($deviceMethod->method_type); + $this->candidates->apply($candidate, $deviceMethod); + } } // The OS is detected via SNMP, without it the device is ping only diff --git a/app/ApiClients/Data/ProxmoxFilesystem.php b/app/ApiClients/Data/ProxmoxFilesystem.php new file mode 100644 index 00000000000..9c95404b7c8 --- /dev/null +++ b/app/ApiClients/Data/ProxmoxFilesystem.php @@ -0,0 +1,33 @@ + $data + */ + public static function fromArray(array $data): self + { + return new self( + device: (string) ($data['name'] ?? $data['mountpoint'] ?? ''), + type: (string) ($data['type'] ?? ''), + usedBytes: (int) ($data['used-bytes'] ?? 0), + totalBytes: (int) ($data['total-bytes'] ?? 0), + ); + } +} diff --git a/app/ApiClients/Data/ProxmoxGuest.php b/app/ApiClients/Data/ProxmoxGuest.php new file mode 100644 index 00000000000..bef12392b61 --- /dev/null +++ b/app/ApiClients/Data/ProxmoxGuest.php @@ -0,0 +1,73 @@ +> $blockStats disk activity per disk, only the VM list of a node has it + */ + public function __construct( + public int $id, + public string $name, + public string $status, + public ?string $qmpStatus, + public int $cpus, + public float $cpu, + public int $memory, + public int $maxMemory, + public int $disk, + public int $maxDisk, + public int $netIn, + public int $netOut, + public int $diskRead, + public int $diskWrite, + public bool $template, + public array $blockStats, + ) { + } + + /** + * @param array $data + */ + public static function fromArray(array $data): self + { + return new self( + id: (int) $data['vmid'], + name: (string) ($data['name'] ?? ''), + status: (string) ($data['status'] ?? 'stopped'), + qmpStatus: $data['qmpstatus'] ?? null, + cpus: (int) ($data['cpus'] ?? 0), + cpu: (float) ($data['cpu'] ?? 0), + memory: (int) ($data['mem'] ?? 0), + maxMemory: (int) ($data['maxmem'] ?? 0), + disk: (int) ($data['disk'] ?? 0), + maxDisk: (int) ($data['maxdisk'] ?? 0), + netIn: (int) ($data['netin'] ?? 0), + netOut: (int) ($data['netout'] ?? 0), + diskRead: (int) ($data['diskread'] ?? 0), + diskWrite: (int) ($data['diskwrite'] ?? 0), + template: ! empty($data['template']), + blockStats: $data['blockstat'] ?? [], + ); + } + + public function powerState(): int + { + return PowerState::parse($this->qmpStatus ?? $this->status); + } + + /** + * Only a running guest has metrics or a guest agent that can answer. + */ + public function isRunning(): bool + { + return $this->powerState() === PowerState::ON; + } +} diff --git a/app/ApiClients/GraylogApi.php b/app/ApiClients/GraylogApi.php index ce6f539aa66..fef1ca4a30e 100644 --- a/app/ApiClients/GraylogApi.php +++ b/app/ApiClients/GraylogApi.php @@ -123,7 +123,7 @@ public function getAddresses(Device $device): \Illuminate\Support\Collection $addresses = collect([ gethostbyname($device->hostname), $device->hostname, - $device->displayName(), + $device->display, $device->ip, $device->sysName, ]); diff --git a/app/ApiClients/ProxmoxApi.php b/app/ApiClients/ProxmoxApi.php new file mode 100644 index 00000000000..292dc5414ae --- /dev/null +++ b/app/ApiClients/ProxmoxApi.php @@ -0,0 +1,202 @@ +baseUri = 'https://' . Rewrite::addIpv6Brackets($this->config->hostname) . ':' . $this->config->port . '/api2/json'; + } + + /** + * @return array + * + * @throws ConnectionException + * @throws RequestException + */ + public function version(): array + { + return $this->callApi('version')->throw()->json('data') ?? []; + } + + /** + * Identifies the cluster of this node, also when it is renamed or another cluster has the same name. + * The root CA is created with the cluster and shared by its nodes, a standalone host has its own. + * + * @return string|null null when the API does not list the root CA + * + * @throws ConnectionException + * @throws RequestException + */ + public function clusterId(): ?string + { + $certificates = $this->callApi('nodes/localhost/certificates/info')->throw()->json('data') ?? []; + + foreach ($certificates as $certificate) { + if (($certificate['filename'] ?? '') === 'pve-root-ca.pem' && ! empty($certificate['fingerprint'])) { + return 'proxmox-' . substr(strtolower(str_replace(':', '', (string) $certificate['fingerprint'])), 0, 32); + } + } + + return null; + } + + /** + * Every guest of the cluster, also those on offline nodes. Of those only the id is known, not that they are templates. + * + * @return array{qemu: list, lxc: list} + * + * @throws ConnectionException + * @throws RequestException + */ + public function listClusterGuests(): array + { + $guests = $this->callApi('cluster/resources', ['type' => 'vm'])->throw()->json('data') ?? []; + + $ofType = fn (string $type): array => array_map( + ProxmoxGuest::fromArray(...), + array_values(array_filter($guests, fn (array $guest): bool => ($guest['type'] ?? '') === $type)), + ); + + return ['qemu' => $ofType('qemu'), 'lxc' => $ofType('lxc')]; + } + + /** + * With the full status of running VMs, such as disk activity and whether they are paused. + * + * @return list + * + * @throws ConnectionException + * @throws RequestException + */ + public function listVms(): array + { + return $this->guests($this->callApi('nodes/localhost/qemu', ['full' => 1])); + } + + /** + * The list does not take the full option, it always has the status of the containers. + * + * @return list + * + * @throws ConnectionException + * @throws RequestException + */ + public function listContainers(): array + { + return $this->guests($this->callApi('nodes/localhost/lxc')); + } + + /** + * Filesystems reported by the guest agents, empty for VMs whose agent is not running or not responding. + * + * @param list $vmIds + * @return array> keyed by VM id + */ + public function getVmsFsInfo(array $vmIds): array + { + return array_map( + fn (?Response $response): array => array_map(ProxmoxFilesystem::fromArray(...), $response?->json('data.result') ?? []), + $this->callGuests($vmIds, fn (int $vmId): string => "nodes/localhost/qemu/$vmId/agent/get-fsinfo"), + ); + } + + /** + * The OS names reported by the guest agents, empty for VMs whose agent is not running or not responding. + * + * @param list $vmIds + * @return array keyed by VM id + */ + public function getVmsGuestOs(array $vmIds): array + { + return array_map( + fn (?Response $response): string => $response?->json('data.result.pretty-name') ?? '', + $this->callGuests($vmIds, fn (int $vmId): string => "nodes/localhost/qemu/$vmId/agent/get-osinfo"), + ); + } + + /** + * The OS types set in the container configs, empty for containers whose config could not be read. + * + * @param list $containerIds + * @return array keyed by container id + */ + public function getContainersOsType(array $containerIds): array + { + return array_map( + fn (?Response $response): string => $response?->json('data.ostype') ?? '', + $this->callGuests($containerIds, fn (int $containerId): string => "nodes/localhost/lxc/$containerId/config"), + ); + } + + /** + * Per guest data is optional, a failed call must not fail the other guests. + * + * @param list $guestIds + * @param callable(int): string $uri + * @return array keyed by guest id + */ + private function callGuests(array $guestIds, callable $uri): array + { + $client = $this->client(); + $options = $client->getOptions(); // pooled requests do not inherit the options of the client + + $responses = $client->pool(function (Pool $pool) use ($guestIds, $uri, $options): void { + foreach ($guestIds as $guestId) { + $pool->as((string) $guestId)->withOptions($options)->get("$this->baseUri/{$uri($guestId)}"); + } + }, self::GUEST_CONCURRENCY); + + return array_map(fn (mixed $response): ?Response => $response instanceof Response ? $response : null, $responses); + } + + /** + * @return list + * + * @throws RequestException + */ + private function guests(Response $response): array + { + return array_map(ProxmoxGuest::fromArray(...), $response->throw()->json('data') ?? []); + } + + /** + * @param array $query + * + * @throws ConnectionException + */ + private function callApi(string $uri, array $query = []): Response + { + return $this->client()->baseUrl($this->baseUri)->get($uri, $query); + } + + private function client(): PendingRequest + { + return Http::client() + ->timeout($this->config->timeout) + ->withOptions(['verify' => $this->config->verifySsl]) + ->withHeader('Authorization', "PVEAPIToken={$this->config->tokenId}={$this->config->tokenSecret}") + ->acceptJson(); + } +} diff --git a/app/ApiClients/Unimus.php b/app/ApiClients/Unimus.php index d815d990499..0ae6a41b3d9 100644 --- a/app/ApiClients/Unimus.php +++ b/app/ApiClients/Unimus.php @@ -34,9 +34,9 @@ class Unimus extends BaseApi { - private const DEVICE_ID_CACHE_TTL = 3600; - private const DEVICE_ID_MISS_TTL = 300; - private const NOT_FOUND_SENTINEL = -1; + private const int DEVICE_ID_CACHE_TTL = 3600; + private const int DEVICE_ID_MISS_TTL = 300; + private const int NOT_FOUND_SENTINEL = -1; private readonly bool $enabled; private readonly string $token; diff --git a/app/Casts/PollingMethodTypeCast.php b/app/Casts/PollingMethodTypeCast.php new file mode 100644 index 00000000000..8d3656e1ce4 --- /dev/null +++ b/app/Casts/PollingMethodTypeCast.php @@ -0,0 +1,25 @@ + + */ +class PollingMethodTypeCast extends StoredTypeEnum +{ + protected function enumClass(): string + { + return PollingMethodType::class; + } + + /** + * @param array $attributes + */ + public function get(Model $model, string $key, mixed $value, array $attributes): ?PollingMethodType + { + return $value === null ? null : PollingMethodType::fromStored((string) $value); + } +} diff --git a/app/Casts/SecretTypeCast.php b/app/Casts/SecretTypeCast.php new file mode 100644 index 00000000000..3a6c59adb1a --- /dev/null +++ b/app/Casts/SecretTypeCast.php @@ -0,0 +1,25 @@ + + */ +class SecretTypeCast extends StoredTypeEnum +{ + protected function enumClass(): string + { + return SecretType::class; + } + + /** + * @param array $attributes + */ + public function get(Model $model, string $key, mixed $value, array $attributes): ?SecretType + { + return $value === null ? null : SecretType::fromStored((string) $value); + } +} diff --git a/app/Casts/StoredTypeEnum.php b/app/Casts/StoredTypeEnum.php new file mode 100644 index 00000000000..35054970112 --- /dev/null +++ b/app/Casts/StoredTypeEnum.php @@ -0,0 +1,56 @@ + + */ +abstract class StoredTypeEnum implements CastsAttributes, SerializesCastableAttributes +{ + /** Unknown can't tell different stored values apart */ + public bool $withoutObjectCaching = true; + + /** + * @return class-string + */ + abstract protected function enumClass(): string; + + /** + * @param array $attributes + */ + public function set(Model $model, string $key, mixed $value, array $attributes): ?string + { + if ($value instanceof \BackedEnum) { + if (! $value instanceof ($this->enumClass())) { + throw new InvalidArgumentException("$key must be a {$this->enumClass()}, got " . $value::class); + } + + if ($value->isUnknown()) { + return isset($attributes[$key]) ? (string) $attributes[$key] : $value->value; // keep the stored type + } + + return $value->value; + } + + return $value === null ? null : (string) $value; + } + + /** + * @param array $attributes + */ + public function serialize(Model $model, string $key, mixed $value, array $attributes): ?string + { + return isset($attributes[$key]) ? (string) $attributes[$key] : null; + } +} diff --git a/app/ConfigBackup/Providers/OxidizedProvider.php b/app/ConfigBackup/Providers/OxidizedProvider.php index 2662d781a5c..b3587418771 100644 --- a/app/ConfigBackup/Providers/OxidizedProvider.php +++ b/app/ConfigBackup/Providers/OxidizedProvider.php @@ -34,9 +34,9 @@ class OxidizedProvider implements ConfigBackupProvider, RefreshableConfigBackupProvider { /** Backup id used for the single current config when versioning is disabled. */ - private const CONFIG_ID = 'current'; + private const string CONFIG_ID = 'current'; - private const PER_PAGE = 100; + private const int PER_PAGE = 100; private ?string $lastError = null; @@ -242,7 +242,7 @@ private function versions(Device $device, array $node): ?array /** * @param list> $versions - * @return list + * @return list */ private function mapVersions(array $versions): array { @@ -253,18 +253,32 @@ private function mapVersions(array $versions): array 'until' => null, 'type' => 'TEXT', 'content' => null, + 'author' => null, ]]; } return array_map(fn ($version) => [ 'id' => (string) ($version['oid'] ?? ''), - 'date' => isset($version['date']) ? (strtotime((string) $version['date']) ?: null) : null, + 'date' => strtotime((string) ($version['date'] ?? '')) ?: strtotime((string) ($version['time'] ?? '')) ?: null, 'until' => null, 'type' => 'TEXT', 'content' => null, + 'author' => $this->versionAuthor($version), ], $versions); } + /** + * Oxidized commits as "Oxidized" by default (git.name), which carries no useful information. + * + * @param array $version + */ + private function versionAuthor(array $version): ?string + { + $name = $version['author']['name'] ?? null; + + return $name && $name !== 'Oxidized' ? $name : null; + } + /** * @param array $node */ diff --git a/app/ConfigBackup/Providers/RancidProvider.php b/app/ConfigBackup/Providers/RancidProvider.php index 76c885b909f..f804ea9a86e 100644 --- a/app/ConfigBackup/Providers/RancidProvider.php +++ b/app/ConfigBackup/Providers/RancidProvider.php @@ -38,16 +38,16 @@ class RancidProvider implements ConfigBackupProvider { /** Revisions listed per page (matches OxidizedProvider). */ - private const PER_PAGE = 100; + private const int PER_PAGE = 100; /** Backup id for the on-disk file when there is no VCS history. */ - private const CURRENT = 'current'; + private const string CURRENT = 'current'; /** Unchanged lines kept around each change when diffs are rebuilt without comments. */ - private const DIFF_CONTEXT = 3; + private const int DIFF_CONTEXT = 3; /** Seconds between repeated eventlog entries for the same unreadable repo. */ - private const FAILURE_LOG_INTERVAL = 3600; + private const int FAILURE_LOG_INTERVAL = 3600; private ?string $lastError = null; @@ -475,7 +475,10 @@ private function nameCandidates(Device $device): array $candidates[] = $device->hostname . '.' . $domain; } - return array_values(array_unique(array_filter($candidates))); + // a config file name never spans directories + $candidates = array_filter($candidates, fn ($name) => $name && ! preg_match('#[/\\\\]|\.\.#', $name)); + + return array_values(array_unique($candidates)); } /** diff --git a/app/ConfigRepository.php b/app/ConfigRepository.php index af458b749be..c71420dabca 100644 --- a/app/ConfigRepository.php +++ b/app/ConfigRepository.php @@ -27,7 +27,6 @@ namespace App; use App\Events\SettingChanged; -use App\Models\Callback; use App\Models\GraphType; use Exception; use Illuminate\Database\QueryException; @@ -65,7 +64,7 @@ public function __construct(private readonly bool $loadUserConfiguration = true) // load config settings that can be cached $cache_ttl = config('librenms.config_cache_ttl'); - $this->config = Cache::driver($cache_ttl == 0 ? 'null' : 'file')->remember('librenms-config', $cache_ttl, function () { + $this->config = Cache::driver($cache_ttl == 0 ? 'null' : 'file')->remember($this->cacheKey(), $cache_ttl, function () { $this->config = []; // merge all config sources together config_definitions.json & os defs > db config > config.php $this->loadPreUserConfigDefaults(); @@ -333,7 +332,15 @@ public function getAll(): array */ public function invalidateCache(): void { - Cache::driver('file')->forget('librenms-config'); + Cache::driver('file')->forget($this->cacheKey()); + } + + /** + * The config includes database settings, keep each database's apart (the test suite shares the file cache) + */ + private function cacheKey(): string + { + return 'librenms-config-' . config('database.default'); } /** @@ -465,10 +472,6 @@ private function loadPostUserConfigDefaults(): void $this->persistDefault('device_display_default', $display_value); } - if (! $this->has('reporting.usage')) { - $this->persistDefault('reporting.usage', (bool) Callback::get('enabled')); - } - // populate legacy DB credentials, just in case something external uses them. Maybe remove this later $this->populateLegacyDbCredentials(); } diff --git a/app/Console/Commands/AddUserCommand.php b/app/Console/Commands/AddUserCommand.php index d7c21732e04..bf3fa273830 100644 --- a/app/Console/Commands/AddUserCommand.php +++ b/app/Console/Commands/AddUserCommand.php @@ -59,7 +59,7 @@ public function __construct() public function handle(): int { - if (LibrenmsConfig::get('auth_mechanism') !== 'mysql') { + if (LibrenmsConfig::get('auth_mechanism') !== 'mysql' && ! LibrenmsConfig::get('auth_fallback_local')) { $this->warn(__('commands.user:add.wrong-auth')); } diff --git a/app/Console/Commands/DevCollectSnmprec.php b/app/Console/Commands/DevCollectSnmprec.php index 902e7086032..acbd9f11944 100644 --- a/app/Console/Commands/DevCollectSnmprec.php +++ b/app/Console/Commands/DevCollectSnmprec.php @@ -12,9 +12,10 @@ use App\Models\Device; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Event; +use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\Log; +use Illuminate\Support\Str; use LibreNMS\Data\Source\Snmp\SnmpResponse; -use LibreNMS\Exceptions\InvalidModuleException; use LibreNMS\Util\Debug; use LibreNMS\Util\Mac; use LibreNMS\Util\Module; @@ -27,6 +28,7 @@ use Symfony\Component\Console\Output\OutputInterface; use function Laravel\Prompts\spin; +use function Laravel\Prompts\suggest; class DevCollectSnmprec extends LnmsCommand { @@ -38,11 +40,9 @@ public function __construct() { parent::__construct(); - $this->addArgument('device', mode: InputArgument::REQUIRED); - $this->addOption('variant', 'r', InputOption::VALUE_REQUIRED); + $this->addArgument('device', mode: InputArgument::OPTIONAL); + $this->addOption('model', 'M', InputOption::VALUE_REQUIRED); $this->addOption('modules', 'm', InputOption::VALUE_REQUIRED); - $this->addOption('prefer-collected', null, InputOption::VALUE_NONE); - $this->addOption('os', 'o', InputOption::VALUE_REQUIRED); $this->addOption('output', null, InputOption::VALUE_REQUIRED); $this->addOption('full', null, InputOption::VALUE_NONE); $this->setHelp(__('commands.dev:collect-snmprec.help')); @@ -50,29 +50,39 @@ public function __construct() public function handle(): int { - $variant = $this->option('variant'); - if ($variant === null) { - $this->error(__('commands.dev:collect-snmprec.variant_required')); + $output = $this->option('output') ?: null; - return 1; + if ($this->option('full')) { + return $this->handleFullWalk($output); } - $variant = trim($variant); - if (str_contains($variant, '_')) { - $this->error(__('commands.dev:collect-snmprec.variant_underscore')); + // --output picks the file, so no model is used + $model = $output === null ? $this->option('model') : null; + if ($output === null && $model === null && ! $this->input->isInteractive()) { + $this->error(__('commands.dev:collect-snmprec.model_required')); return 1; } - if (str_contains($variant, ',')) { - $this->error(__('commands.dev:collect-snmprec.variant_single')); - return 1; + if ($model !== null) { + $model = strtolower(trim($model)); + if ($error = $this->validateModel($model)) { + $this->error($error); + + return 1; + } } - if ($this->option('full') && $this->option('modules') !== null) { - $this->error('--full and --modules cannot be used together because a full walk does not run modules.'); + $modules = $this->commaSeparatedOption('modules'); - return 1; + // before any prompts + foreach ($modules as $module) { + $moduleName = explode('/', $module, 2)[0]; + if (! Module::exists($moduleName)) { + $this->error(__('commands.dev:collect-snmprec.invalid_module', ['module' => $moduleName])); + + return 1; + } } $device = $this->resolveDevice(); @@ -82,97 +92,141 @@ public function handle(): int DeviceCache::setPrimary($device->device_id); - if ($device->os !== 'generic' && $this->option('os') !== null) { - $this->error("--os cannot be used because the device is already detected as '{$device->os}'."); + // modules collect only what the OS asks for, so a generic device would leave data out + if ($device->os === 'generic') { + $this->error(__('commands.dev:collect-snmprec.generic_device')); return 1; } - $targetOs = $device->os !== 'generic' ? $device->os : $this->option('os'); - if (! $targetOs) { - $this->error(__('commands.dev:collect-snmprec.os_required')); + $fixture = $output === null ? ModuleTestHelper::fixtureName($device->os, $model ?? $this->askModel($device->os)) : null; + $snmprecFile = $output ?? ModuleTestHelper::snmprecFilepath($fixture); + + $this->line(__('commands.dev:collect-snmprec.modules', [ + 'modules' => $modules === [] ? __('commands.dev:collect-snmprec.default_modules') : implode(',', $modules), + ])); + $this->printSavingAs($snmprecFile); + $this->newLine(); + if (! $this->captureData($device, ModuleList::fromUserOverrides($modules), $snmprecFile)) { return 1; } - if ($this->option('full')) { - $data = $this->runWithProgress( - fn () => SnmpQuery::options(['-OUneb', '-Ih'])->walk('.'), - __('commands.dev:collect-snmprec.capturing_data') - ); - if ($data->getExitCode() === 0) { - $this->saveSnmprec($this->getSnmprecFilePath($targetOs, $variant), [$this->convertSnmpToSnmprec($data)], '', (bool) $this->option('prefer-collected')); - } + $this->newLine(); + $this->info(__('commands.dev:collect-snmprec.verify_private_data')); + if ($fixture !== null) { + $this->info(__('commands.dev:collect-snmprec.next_step', ['fixture' => $fixture])); + } + + return 0; + } + + /** + * Walk the whole device into --output. No modules run, so the OS and model are not used. + */ + private function handleFullWalk(?string $snmprecFile): int + { + if ($this->option('modules') !== null) { + $this->error('--full and --modules cannot be used together because a full walk does not run modules.'); return 1; } - $modules = $this->commaSeparatedOption('modules'); + if ($snmprecFile === null) { + $this->error(__('commands.dev:collect-snmprec.full_requires_output')); - foreach ($modules as $module) { - $moduleName = explode('/', $module, 2)[0]; - if (! Module::exists($moduleName)) { - $this->error("Invalid module name: $moduleName"); + return 1; + } - return 1; - } + $device = $this->resolveDevice(); + if (! $device) { + return 1; } - $this->line("OS: $targetOs"); - $this->line('Variant: ' . ($variant === '' ? '(base; explicitly selected)' : $variant)); - $this->line('Modules: ' . ($this->option('modules') ?: 'configured defaults')); - $this->newLine(); + $this->printSavingAs($snmprecFile); - try { - $this->captureData( - $device, - ModuleList::fromUserOverrides($modules), - $this->getSnmprecFilePath($targetOs, $variant), - (bool) $this->option('prefer-collected'), - ); + $data = $this->runWithProgress( + fn () => SnmpQuery::device($device)->options(['-OUneb', '-Ih'])->walk('.'), + __('commands.dev:collect-snmprec.capturing_data') + ); + if ($data->getExitCode() !== 0) { + $this->error(__('commands.dev:collect-snmprec.walk_failed', ['error' => $data->getErrorMessage()])); - $this->newLine(); - $this->info(__('commands.dev:collect-snmprec.verify_private_data')); - } catch (InvalidModuleException $e) { - $this->error($e->getMessage()); + return 1; + } + if (! $this->saveSnmprec($snmprecFile, ['' => [$this->convertSnmpToSnmprec($data)]])) { return 1; } + $this->newLine(); + $this->info(__('commands.dev:collect-snmprec.verify_private_data')); + return 0; } + /** + * The device from the argument, or asked for when it is omitted + */ private function resolveDevice(): ?Device { $deviceSpec = $this->argument('device'); - try { - $device = DeviceCache::get($deviceSpec); - } catch (\Exception) { - $device = null; + if ($deviceSpec === null) { + if (! $this->input->isInteractive()) { + $this->error(__('commands.dev:collect-snmprec.device_required')); + + return null; + } + + if (! Device::query()->exists()) { + $this->error(__('commands.dev:collect-snmprec.no_devices')); + + return null; + } + + $deviceSpec = suggest( + label: __('commands.dev:collect-snmprec.ask_device'), + options: fn (string $value) => $this->completeArgument('device', $value), + required: true, + validate: fn (string $value) => $this->findDevice($value) === null + ? __('commands.dev:collect-snmprec.device_not_found', ['device' => $value]) + : null, + ); } - if (! $device?->exists) { - $this->error(__('commands.dev:collect-snmprec.device_not_found', ['device' => $deviceSpec])); + $device = $this->findDevice($deviceSpec); - return null; + if ($device === null) { + $this->error(__('commands.dev:collect-snmprec.device_not_found', ['device' => $deviceSpec])); } return $device; } - private function getSnmprecFilePath(string $os, string $variant): string + private function findDevice(string $deviceSpec): ?Device { - if ($customFile = $this->option('output')) { - return (string) $customFile; + try { + $device = DeviceCache::get(trim($deviceSpec)); + } catch (\Exception) { + return null; } - $variantSuffix = $variant !== '' ? '_' . strtolower($variant) : ''; + return $device->exists ? $device : null; + } - return base_path("tests/snmpsim/$os$variantSuffix.snmprec"); + private function printSavingAs(string $file): void + { + $this->line(__('commands.dev:collect-snmprec.saving_as', ['file' => $this->displayPath($file)]) . ' ' + . __(is_file($file) ? 'commands.dev:collect-snmprec.file_replaced' : 'commands.dev:collect-snmprec.file_new')); } - private function captureData(Device $device, ModuleList $moduleList, string $snmprecFile, bool $preferCollected): void + private function displayPath(string $file): string + { + return Str::replaceStart(base_path() . '/', '', $file); + } + + private function captureData(Device $device, ModuleList $moduleList, string $snmprecFile): bool { $snmprecDataByContext = []; @@ -210,17 +264,15 @@ private function captureData(Device $device, ModuleList $moduleList, string $snm try { $this->runWithProgress(function () use ($device, $moduleList): void { - (new DiscoverDevice($device->device_id, $moduleList))->handle(); - (new PollDevice($device->device_id, $moduleList))->handle(); + new DiscoverDevice($device->device_id, $moduleList)->handle(); + new PollDevice($device->device_id, $moduleList)->handle(); }, __('commands.dev:collect-snmprec.capturing_data')); } finally { config(['logging.channels.stdout.level' => $previous_level]); Event::forget(SnmpQueryExecuted::class); } - foreach ($snmprecDataByContext as $context => $snmprecData) { - $this->saveSnmprec($snmprecFile, $snmprecData, $context, $preferCollected); - } + return $this->saveSnmprec($snmprecFile, $snmprecDataByContext); } private function runWithProgress(\Closure $callback, string $message): mixed @@ -372,41 +424,55 @@ private function getSnmprecType(string $text): ?string } /** - * @param array> $data + * Write the snmprec file and its @context files. They are rewritten, never merged with data from earlier runs. + * + * @param array>> $dataByContext + * @return bool false when nothing was saved */ - private function saveSnmprec(string $baseFile, array $data, ?string $context, bool $preferCollected): void + private function saveSnmprec(string $baseFile, array $dataByContext): bool { - $filename = $context - ? str_replace('.snmprec', '', $baseFile) . "@$context.snmprec" - : $baseFile; + $stem = str_replace('.snmprec', '', $baseFile); + $results = []; + foreach ($dataByContext as $context => $data) { + $filename = $context === '' ? $baseFile : "$stem@$context.snmprec"; + + // keyed by OID, the last value wins + $newData = []; + foreach (array_merge(...$data) as $line) { + $newData[explode('|', $line, 2)[0]] = $line; + } - $existingData = is_file($filename) ? $this->indexSnmprec(explode(PHP_EOL, file_get_contents($filename))) : []; + $this->cleanSnmprecData($newData); + uksort($newData, fn ($a, $b) => $this->compareOids((string) $a, (string) $b)); - $newData = []; - foreach ($data as $part) { - $newData = array_merge($newData, $this->indexSnmprec($part)); + if ($newData !== []) { + $results[$filename] = $newData; + } } - $this->cleanSnmprecData($newData); + // keep the existing files when nothing was collected + if ($results === []) { + $this->error(__('commands.dev:collect-snmprec.no_data')); - $results = $preferCollected ? array_merge($existingData, $newData) : array_merge($newData, $existingData); + return false; + } - uksort($results, fn ($a, $b) => $this->compareOids((string) $a, (string) $b)); + File::delete([$baseFile, ...(glob("$stem@*.snmprec") ?: [])]); - if (empty($results)) { - $this->info(__('commands.dev:collect-snmprec.no_data', ['file' => $filename])); + foreach ($results as $filename => $lines) { + if (file_put_contents($filename, implode(PHP_EOL, $lines) . PHP_EOL) === false) { + $this->error(__('commands.dev:collect-snmprec.save_failed', ['file' => $this->displayPath($filename)])); - return; + return false; + } + + $this->newLine(); + $this->info(__('commands.dev:collect-snmprec.saved_snmprec', ['file' => $this->displayPath($filename)])); } - $this->newLine(); - $this->info(__('commands.dev:collect-snmprec.saved_snmprec', ['file' => $filename])); - file_put_contents($filename, implode(PHP_EOL, $results) . PHP_EOL); + return true; } - /** - * Compare two dotted-decimal OIDs numerically, segment by segment. - */ private function compareOids(string $a, string $b): int { $aParts = explode('.', $a); @@ -426,24 +492,6 @@ private function compareOids(string $a, string $b): int return count($aParts) <=> count($bParts); } - /** - * @param array $snmprecData - * @return array - */ - private function indexSnmprec(array $snmprecData): array - { - $result = []; - - foreach ($snmprecData as $line) { - if ($line !== '') { - [$oid] = explode('|', $line, 2); - $result[$oid] = $line; - } - } - - return $result; - } - /** * @param array $data */ @@ -501,19 +549,7 @@ public function completeArgument($name, $value): array|false public function completeOptionValue(DynamicInputOption $option, string $current, ?InputInterface $input = null): ?Collection { return match ($option->getName()) { - 'os' => $this->filterCompletions( - collect(glob(resource_path('definitions/os_detection/*.yaml')))->map(fn ($file) => basename($file, '.yaml'))->all(), - $current - ), - 'variant' => $this->filterCompletions( - collect(glob(base_path('tests/snmpsim/*.snmprec'))) - ->map(fn ($file) => ModuleTestHelper::extractVariant(basename($file, '.snmprec'))[1]) - ->filter(fn ($variant) => $variant !== '') - ->unique() - ->values() - ->all(), - $current - ), + 'model' => $this->filterCompletions($this->fixtureModels(), $current), 'modules' => $this->filterCompletions( array_values(array_unique(array_merge( array_keys(LibrenmsConfig::get('discovery_modules', [])), @@ -526,6 +562,88 @@ public function completeOptionValue(DynamicInputOption $option, string $current, }; } + private function validateModel(string $model): ?string + { + return preg_match('/^[a-z0-9.+-]*$/', $model) ? null : __('commands.dev:collect-snmprec.model_invalid'); + } + + /** + * Ask for the model, suggesting the existing fixtures of the OS. + * Input may be a full fixture name (linksys_wrt54g), the bare OS for the base fixture (linksys), + * or just a model (wrt54g). + */ + private function askModel(string $os): string + { + $fixtures = $this->fixtureNames() + ->filter(fn ($name) => ModuleTestHelper::extractVariant($name)[0] === $os) + ->values() + ->all(); + + if ($fixtures) { + $this->line(__('commands.dev:collect-snmprec.existing_fixtures', ['os' => $os])); + foreach ($fixtures as $fixture) { + $this->line("- $fixture.snmprec"); + } + $this->newLine(); + } + + $toModel = function (string $value) use ($os): string { + // accept file names as listed (linksys_wrt54g.snmprec) + $value = preg_replace('/\.snmprec$/i', '', trim($value)); + [$valueOs, $model] = ModuleTestHelper::extractVariant($value); + + return strtolower(strcasecmp($valueOs, $os) === 0 ? $model : $value); + }; + + // suggest bare models, with the OS name standing in for the base fixture + $suggestions = array_map(function ($fixture) use ($os) { + $model = ModuleTestHelper::extractVariant($fixture)[1]; + + return $model === '' ? $os : $model; + }, $fixtures); + + return $toModel(suggest( + label: __('commands.dev:collect-snmprec.ask_model'), + options: fn (string $value) => $this->filterCompletions($suggestions, $value)->all(), + required: true, + validate: fn (string $value) => $this->validateModel($toModel($value)), + hint: __('commands.dev:collect-snmprec.ask_model_hint', ['os' => $os]), + )); + } + + /** + * Fixture names in tests/snmpsim without extension or @context + * + * @return Collection + */ + private function fixtureNames(): Collection + { + return collect(glob(base_path('tests/snmpsim/*.snmprec'))) + ->map(fn ($file) => explode('@', basename($file, '.snmprec'), 2)[0]) + ->unique() + ->sort() + ->values(); + } + + /** + * Models of the existing fixtures + * + * @return array + */ + private function fixtureModels(): array + { + return $this->fixtureNames() + ->map(fn ($name) => ModuleTestHelper::extractVariant($name)[1]) + ->filter(fn ($model) => $model !== '') + ->unique() + ->values() + ->all(); + } + + /** + * @param array $values + * @return Collection + */ private function filterCompletions(array $values, string $current, bool $commaDelimited = false): Collection { $prefix = ''; @@ -537,7 +655,7 @@ private function filterCompletions(array $values, string $current, bool $commaDe } return collect($values) - ->filter(fn ($value) => str_starts_with((string) $value, $partial)) + ->filter(fn ($value) => stripos((string) $value, $partial) === 0) ->map(fn ($value) => $prefix . $value) ->sort() ->values(); diff --git a/app/Console/Commands/DevGenerateTestData.php b/app/Console/Commands/DevGenerateTestData.php index 8e32017c83d..23682a96853 100644 --- a/app/Console/Commands/DevGenerateTestData.php +++ b/app/Console/Commands/DevGenerateTestData.php @@ -37,8 +37,7 @@ public function __construct() { parent::__construct(); - $this->addArgument('os', InputArgument::OPTIONAL); - $this->addOption('variant', 'r', InputOption::VALUE_REQUIRED); + $this->addArgument('prefix', InputArgument::OPTIONAL); $this->addOption('modules', 'm', InputOption::VALUE_REQUIRED); $this->addOption('output', null, InputOption::VALUE_REQUIRED); $this->setHelp(__('commands.dev:generate-test-data.help')); @@ -46,36 +45,17 @@ public function __construct() public function handle(): int { - $os = $this->argument('os'); - $all = $os === 'all'; + $prefix = $this->argument('prefix'); + $all = $prefix === 'all'; if ($all) { - $os = null; + $prefix = null; } - if (! $all && $os === null) { + if (! $all && ($prefix === null || $prefix === '')) { $this->error(__('commands.dev:generate-test-data.scope_required')); return 1; } - $variants = $this->commaSeparatedOption('variant', filterEmpty: false); - - if (! $all && $os === null) { - $this->error(__('commands.dev:generate-test-data.scope_required')); - - return 1; - } - - if ($all && $os !== null) { - $this->error(__('commands.dev:generate-test-data.scope_conflict')); - - return 1; - } - - if ($variants !== [] && $os === null) { - $this->error(__('commands.dev:generate-test-data.variant_requires_os')); - - return 1; - } $modules = $this->commaSeparatedOption('modules'); @@ -89,7 +69,7 @@ public function handle(): int } try { - $osList = $this->findOsWithData($os, $variants, $modules); + $osList = $this->findOsWithData($prefix, $modules); } catch (InvalidModuleException $e) { $this->error($e->getMessage()); @@ -97,13 +77,10 @@ public function handle(): int } if (empty($osList)) { - $this->error($os === null + $this->error($prefix === null ? __('commands.dev:generate-test-data.no_fixtures') - : __('commands.dev:generate-test-data.no_fixtures_for_os', ['os' => $os])); + : __('commands.dev:generate-test-data.no_fixtures_for_prefix', ['prefix' => $prefix])); $this->line(__('commands.dev:generate-test-data.fixture_selection_note')); - if ($os !== null && $variants === []) { - $this->line(__('commands.dev:generate-test-data.recreate_hint')); - } return 1; } @@ -227,23 +204,25 @@ private function startSnmpsim(Snmpsim $snmpsim, bool $quiet = false): void } /** - * @param array $variants * @param array $modules * @return array>}> * * @throws InvalidModuleException */ - private function findOsWithData(?string $os, array $variants, array $modules): array + private function findOsWithData(?string $prefix, array $modules): array { - if ($os !== null && $variants !== []) { - $moduleOverrides = ModuleList::fromUserOverrides($modules)->overrides; + $osList = ModuleTestHelper::findOsWithData($modules); - return collect($variants) - ->mapWithKeys(fn ($variant) => [$variant === '' ? $os : "{$os}_$variant" => [$os, $variant, $moduleOverrides]]) - ->all(); + if ($prefix !== null) { + $osList = array_filter($osList, fn ($name) => str_starts_with($name, $prefix), ARRAY_FILTER_USE_KEY); + } + + if ($osList === [] && $prefix !== null && is_file(base_path("tests/snmpsim/$prefix.snmprec"))) { + [$os, $variant] = ModuleTestHelper::extractVariant("$prefix.json"); + + return [$prefix => [$os, $variant, ModuleList::fromUserOverrides($modules)->overrides]]; } - $osList = ModuleTestHelper::findOsWithData($modules, $os); ksort($osList); return $osList; @@ -254,14 +233,14 @@ private function findOsWithData(?string $os, array $variants, array $modules): a */ public function completeArgument(string $name, string $value, mixed $previous = null): array|false { - if ($name === 'os') { - $osList = collect(glob(base_path('tests/data/*.json'))) - ->map(fn ($f) => ModuleTestHelper::extractVariant($f)[0]) - ->unique() - ->values(); + if ($name === 'prefix') { + $names = collect(glob(base_path('tests/data/*.json'))) + ->merge(glob(base_path('tests/snmpsim/*.snmprec'))) + ->map(fn ($f) => pathinfo($f, PATHINFO_FILENAME)); + $osList = $names->map(fn ($n) => ModuleTestHelper::extractVariant($n)[0]); return $this->filterCompletions( - $osList->prepend('all')->all(), + $names->merge($osList)->unique()->prepend('all')->all(), $value )->all(); } @@ -274,23 +253,7 @@ public function completeArgument(string $name, string $value, mixed $previous = */ public function completeOptionValue(DynamicInputOption $option, string $current, ?InputInterface $input = null): ?Collection { - $os = $input?->getArgument('os'); - if ($os === 'all') { - $os = null; - } - return match ($option->getName()) { - 'variant' => $this->filterCompletions( - collect(glob(base_path('tests/data/*.json'))) - ->map(fn ($f) => ModuleTestHelper::extractVariant($f)) - ->filter(fn ($v) => (! $os || $v[0] === $os) && $v[1] !== '') - ->pluck(1) - ->unique() - ->values() - ->all(), - $current, - commaDelimited: true - ), 'modules' => $this->filterCompletions($this->moduleNames(), $current, commaDelimited: true), default => null, }; diff --git a/app/Console/Commands/DevSimulate.php b/app/Console/Commands/DevSimulate.php index 257d5e0d180..2e38066ff18 100644 --- a/app/Console/Commands/DevSimulate.php +++ b/app/Console/Commands/DevSimulate.php @@ -155,9 +155,9 @@ private function addDevice(string $community): string $secret = Secret::updateOrCreate([ 'description' => "snmpsim secret ($device->hostname)", - 'secret_type' => SecretType::Snmp, + 'secret_type' => SecretType::SnmpCommunity, ], [ - 'data' => ['version' => 'v2c', 'community' => $community], + 'data' => ['community' => $community], ]); $method->secret()->associate($secret)->save(); diff --git a/app/Console/Commands/DeviceAdd.php b/app/Console/Commands/DeviceAdd.php index df65e8fc38a..58a85b7a709 100644 --- a/app/Console/Commands/DeviceAdd.php +++ b/app/Console/Commands/DeviceAdd.php @@ -13,7 +13,7 @@ use LibreNMS\Exceptions\HostnameExistsException; use LibreNMS\Exceptions\HostUnreachableException; use LibreNMS\Exceptions\MissingSecretException; -use LibreNMS\Polling\Secrets\Definitions\SnmpSecretDefinition; +use LibreNMS\Polling\Secrets\Definitions\SnmpV3SecretDefinition; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputOption; @@ -57,9 +57,9 @@ public function __construct() $this->addOption('display-name', 'd', InputOption::VALUE_REQUIRED); $this->addOption('security-name', 'u', InputOption::VALUE_REQUIRED); $this->addOption('auth-password', 'A', InputOption::VALUE_REQUIRED); - $this->addOption('auth-protocol', 'a', InputOption::VALUE_REQUIRED, __('commands.device:add.options.auth-protocol', ['default' => SnmpSecretDefinition::DEFAULT_AUTHALGO])); + $this->addOption('auth-protocol', 'a', InputOption::VALUE_REQUIRED, __('commands.device:add.options.auth-protocol', ['default' => SnmpV3SecretDefinition::DEFAULT_AUTHALGO])); $this->addOption('privacy-password', 'X', InputOption::VALUE_REQUIRED); - $this->addOption('privacy-protocol', 'x', InputOption::VALUE_REQUIRED, __('commands.device:add.options.privacy-protocol', ['default' => SnmpSecretDefinition::DEFAULT_CRYPTOALGO])); + $this->addOption('privacy-protocol', 'x', InputOption::VALUE_REQUIRED, __('commands.device:add.options.privacy-protocol', ['default' => SnmpV3SecretDefinition::DEFAULT_CRYPTOALGO])); $this->addOption('force', 'f', InputOption::VALUE_NONE); $this->addOption('ping-fallback', 'b', InputOption::VALUE_NONE); $this->addOption('poller-group', 'g', InputOption::VALUE_REQUIRED); diff --git a/app/Console/Commands/DevicePing.php b/app/Console/Commands/DevicePing.php index 60d0b1a8235..81bbafbaf7b 100644 --- a/app/Console/Commands/DevicePing.php +++ b/app/Console/Commands/DevicePing.php @@ -71,7 +71,7 @@ public function handle(IcmpPollingMethod $icmpMethod): int /** @var FpingResponse $response */ $response = $result->stat('fping_status'); - $this->line($device->displayName() . ' : ' . ($response->wasSkipped() ? 'skipped' : $response)); + $this->line($device->display . ' : ' . ($response->wasSkipped() ? 'skipped' : $response)); } return 0; diff --git a/app/Console/Commands/MaintenanceCachePeeringdb.php b/app/Console/Commands/MaintenanceCachePeeringdb.php index 0ef0b72d221..9abb0c7ec95 100644 --- a/app/Console/Commands/MaintenanceCachePeeringdb.php +++ b/app/Console/Commands/MaintenanceCachePeeringdb.php @@ -16,13 +16,13 @@ class MaintenanceCachePeeringdb extends LnmsCommand { protected $name = 'maintenance:cache-peeringdb'; - private const API_URL = 'https://peeringdb.com/api'; + private const string API_URL = 'https://peeringdb.com/api'; /** Collected data is kept for 71 hours */ - private const CACHE_SECONDS = 255600; + private const int CACHE_SECONDS = 255600; /** ASNs PeeringDB holds no data for are skipped for a week */ - private const NO_DATA_SECONDS = 604800; + private const int NO_DATA_SECONDS = 604800; private ?string $apiKey = null; diff --git a/app/Console/Commands/MaintenanceDiscoverSslCertificates.php b/app/Console/Commands/MaintenanceDiscoverSslCertificates.php index 1881452b0ce..db333b576b5 100644 --- a/app/Console/Commands/MaintenanceDiscoverSslCertificates.php +++ b/app/Console/Commands/MaintenanceDiscoverSslCertificates.php @@ -74,18 +74,20 @@ public function handle(): int continue; } + $severity = $cert->isWithinWarningWindow() ? Severity::Warning : Severity::Info; + if ($cert->exists) { $changes = $cert->getTrackedChanges(); $cert->save(); if ($changes !== '') { $updated++; - Eventlog::log("SSL certificate updated: {$host}:{$port} – {$changes}", $device->device_id, 'ssl-certificate', Severity::Info, $cert->id); + Eventlog::log("SSL certificate updated: {$host}:{$port} – {$changes}", $device->device_id, 'ssl-certificate', $severity, $cert->id); } } else { $cert->save(); $created++; $msg = "SSL certificate discovered: {$host}:{$port} – Subject: {$cert->subject}, Issuer: {$cert->issuer}, Valid until: " . ($cert->valid_to?->format('Y-m-d H:i:s') ?? 'N/A') . ', Days until expiry: ' . ($cert->days_until_expiry ?? 'N/A'); - Eventlog::log($msg, $device->device_id, 'ssl-certificate', Severity::Info, $cert->id); + Eventlog::log($msg, $device->device_id, 'ssl-certificate', $severity, $cert->id); } } diff --git a/app/Console/Commands/MaintenanceFetchOuis.php b/app/Console/Commands/MaintenanceFetchOuis.php index fc984708a35..44c18d6c463 100644 --- a/app/Console/Commands/MaintenanceFetchOuis.php +++ b/app/Console/Commands/MaintenanceFetchOuis.php @@ -94,7 +94,7 @@ private function buildOuiList(string $csv_data): array continue; } - [$oui, , $vendor] = str_getcsv($csv_line, "\t"); // index 1 = short vendor + [$oui, , $vendor] = str_getcsv($csv_line, "\t", escape: '\\'); // index 1 = short vendor $oui = strtolower(str_replace(':', '', $oui)); // normalize oui $prefix_index = strpos($oui, '/'); diff --git a/app/Console/Commands/MaintenanceRefreshSslCertificates.php b/app/Console/Commands/MaintenanceRefreshSslCertificates.php index c4e02a7d5ca..5389cac90f3 100644 --- a/app/Console/Commands/MaintenanceRefreshSslCertificates.php +++ b/app/Console/Commands/MaintenanceRefreshSslCertificates.php @@ -58,11 +58,12 @@ public function handle(): int continue; } + $severity = $cert->isWithinWarningWindow() ? Severity::Warning : Severity::Info; $changes = $cert->getTrackedChanges(); $cert->save(); if ($changes !== '') { $refreshed++; - Eventlog::log("SSL certificate refreshed: {$cert->host}:{$cert->port} – {$changes}", $cert->device_id, 'ssl-certificate', Severity::Info, $cert->id); + Eventlog::log("SSL certificate refreshed: {$cert->host}:{$cert->port} – {$changes}", $cert->device_id, 'ssl-certificate', $severity, $cert->id); } } diff --git a/app/Console/Commands/PluginEnable.php b/app/Console/Commands/PluginEnable.php index aed64762a7e..71d449dc3d7 100644 --- a/app/Console/Commands/PluginEnable.php +++ b/app/Console/Commands/PluginEnable.php @@ -29,7 +29,7 @@ public function handle(): int if ($plugin !== 'all') { $query->where('plugin_name', 'like', $plugin) ->limit(1) - ->orderBy('version', 'DESC'); + ->orderBy('version', 'desc'); } $updated = $query->update(['plugin_active' => 1]); diff --git a/app/Console/Commands/PluginSyncCommand.php b/app/Console/Commands/PluginSyncCommand.php new file mode 100644 index 00000000000..a1d979c61e9 --- /dev/null +++ b/app/Console/Commands/PluginSyncCommand.php @@ -0,0 +1,33 @@ +argument('device spec'))->get(); foreach ($devices as $device) { - $display_name = $device->displayName(); + $display_name = $device->display; if ($display_name != $device->hostname) { $display_name .= "($device->hostname)"; } @@ -46,12 +47,10 @@ public function handle(): int foreach ($ports as $port) { $this->line(' ' . __('commands.port:tune.port', ['port' => $port->ifName])); $rrdfile = Rrd::name($device->hostname, Rrd::portName($port->port_id)); - Rrd::tune('port', $rrdfile, $port->ifSpeed); + Rrd::tune($rrdfile, PortRrd::tuneLimits((int) $port->ifSpeed)); } } - Rrd::terminate(); - return 0; } diff --git a/app/Console/Commands/ReleaseTag.php b/app/Console/Commands/ReleaseTag.php index 9ee48300887..df7d7a4ebdb 100644 --- a/app/Console/Commands/ReleaseTag.php +++ b/app/Console/Commands/ReleaseTag.php @@ -84,7 +84,7 @@ public function handle(Binaries $binaries): int } // remove changelog modifications - (new Process([$binaries->path('git'), 'checkout', base_path($file)]))->run(); + new Process([$binaries->path('git'), 'checkout', base_path($file)])->run(); return 0; } diff --git a/app/Console/Commands/ReportDevices.php b/app/Console/Commands/ReportDevices.php index 171dc98c6ba..6f70e24bc00 100644 --- a/app/Console/Commands/ReportDevices.php +++ b/app/Console/Commands/ReportDevices.php @@ -143,7 +143,7 @@ protected function getRelationships(): array protected function getSyntheticFields(): array { return [ - 'displayName' => new SyntheticDeviceField('displayName', ['hostname', 'sysName', 'ip', 'display'], fn (Device $device) => $device->displayName(), headerName: 'display name'), + 'displayName' => new SyntheticDeviceField('displayName', ['display'], fn (Device $device) => $device->display, headerName: 'display name'), // legacy alias 'location' => new SyntheticDeviceField('location', ['location_id'], fn (Device $device) => $device->location->location, fn (Builder $q) => $q->with('location')), 'os_text' => new SyntheticDeviceField('os_text', ['os'], fn (Device $device) => LibrenmsConfig::getOsSetting($device->os, 'text'), headerName: 'os text'), ]; @@ -200,10 +200,10 @@ protected function printReport(array $headers, array|Collection $rows): void if ($output == 'csv') { $out = fopen('php://output', 'w'); if (! $this->option('no-header')) { - fputcsv($out, $headers); + fputcsv($out, $headers, escape: '\\'); } foreach ($rows as $row) { - fputcsv($out, $row); + fputcsv($out, $row, escape: '\\'); } fclose($out); diff --git a/app/Console/Commands/SetConfigCommand.php b/app/Console/Commands/SetConfigCommand.php index c6d0d451faa..8887ed1401b 100644 --- a/app/Console/Commands/SetConfigCommand.php +++ b/app/Console/Commands/SetConfigCommand.php @@ -42,7 +42,7 @@ public function handle(DynamicConfig $definition): int $force = $this->option('ignore-checks'); $parent = null; - if (preg_match('/^os\.(?[a-z_\-]+)\.(?.*)$/', $setting, $matches)) { + if (preg_match('/^os\.(?[a-z0-9_\-]+)\.(?.*)$/', $setting, $matches)) { $os = $matches['os']; try { if (! $force) { diff --git a/app/Console/Commands/SmokepingGenerateCommand.php b/app/Console/Commands/SmokepingGenerateCommand.php index 58951bb272c..540eeee1851 100644 --- a/app/Console/Commands/SmokepingGenerateCommand.php +++ b/app/Console/Commands/SmokepingGenerateCommand.php @@ -30,6 +30,8 @@ use App\Facades\LibrenmsConfig; use App\Models\Device; use Illuminate\Support\Collection; +use LibreNMS\Enum\AddressFamily; +use LibreNMS\Polling\Method\Methods\IcmpPollingMethod; use LibreNMS\Polling\Method\Methods\SnmpPollingMethod; use LibreNMS\Util\Binaries; use Symfony\Component\Console\Input\InputOption; @@ -131,10 +133,11 @@ public function buildTargetsConfiguration(Collection $devices): int { // Take the devices array and build it into a hierarchical list $smokelist = []; + $icmp = new IcmpPollingMethod; $snmp = new SnmpPollingMethod; foreach ($devices as $device) { $smokelist[$device->type][$device->hostname] = [ - 'transport' => $snmp->transport($device), + 'transport' => $this->deviceTransport($device, $icmp, $snmp), 'displayname' => $device->display, ]; } @@ -145,6 +148,15 @@ public function buildTargetsConfiguration(Collection $devices): int return $this->render($header, $targets); } + private function deviceTransport(Device $device, IcmpPollingMethod $icmp, SnmpPollingMethod $snmp): string + { + return match ($icmp->resolveAddressFamily($device)) { + AddressFamily::IPv4 => 'udp', + AddressFamily::IPv6 => 'udp6', + default => $snmp->transport($device), + }; + } + /** * Set a warning to be emitted * diff --git a/app/Console/Commands/SnmpFetch.php b/app/Console/Commands/SnmpFetch.php index 8cf15ba46dc..890d636a6df 100644 --- a/app/Console/Commands/SnmpFetch.php +++ b/app/Console/Commands/SnmpFetch.php @@ -70,7 +70,7 @@ public function handle(): int $return = 0; foreach ($devices as $device) { - $device_name = $device->displayName(); + $device_name = $device->display; if ($device_name) { $this->info($device_name . ':'); } @@ -78,6 +78,10 @@ public function handle(): int $res = $this->fetchData($device); if (! $res->isValid()) { + if ($this->output->isVeryVerbose()) { + $this->line($res->raw()); + } + $this->warn(trans('commands.snmp:fetch.failed')); $this->line($res->getErrorMessage()); $res->isValid(); diff --git a/app/Console/Commands/Traits/CompletesConfigArgument.php b/app/Console/Commands/Traits/CompletesConfigArgument.php index 32671d034ef..9d01ce85fcf 100644 --- a/app/Console/Commands/Traits/CompletesConfigArgument.php +++ b/app/Console/Commands/Traits/CompletesConfigArgument.php @@ -37,9 +37,9 @@ trait CompletesConfigArgument public function completeArgument($name, $value, $previous) { if ($name == 'setting') { - return (new DynamicConfig())->all()->keys()->filter(fn ($setting) => Str::startsWith($setting, $value))->all(); + return new DynamicConfig()->all()->keys()->filter(fn ($setting) => Str::startsWith($setting, $value))->all(); } elseif ($name == 'value') { - $config = (new DynamicConfig())->get($previous); + $config = new DynamicConfig()->get($previous); switch ($config->getType()) { case 'select-dynamic': @@ -78,7 +78,7 @@ protected function suggestionsForSelectDynamic(DynamicConfigItem $config, ?strin } // make "http" request - $results = (new InternalHttpRequest()) + $results = new InternalHttpRequest() ->actingAs($admin) ->json('GET', route("ajax.select.$target"), $data)->json('results'); diff --git a/app/Data/Graphing/DataSeries.php b/app/Data/Graphing/DataSeries.php new file mode 100644 index 00000000000..1b46f66e43d --- /dev/null +++ b/app/Data/Graphing/DataSeries.php @@ -0,0 +1,23 @@ + */ -namespace LibreNMS\Data\Graphing; +namespace App\Data\Graphing; use LibreNMS\Enum\ImageFormat; @@ -41,7 +41,7 @@ public function base64(): string public function inline(): string { - return 'data:' . $this->contentType() . ';base64,' . $this->base64(); + return 'data:' . $this->mediaType() . ';base64,' . $this->base64(); } public function fileExtension(): string @@ -49,9 +49,9 @@ public function fileExtension(): string return $this->format->name; } - public function contentType(): string + public function mediaType(): string { - return $this->format->contentType(); + return $this->format->mediaType(); } public function __toString(): string diff --git a/app/Data/Graphing/GraphInput.php b/app/Data/Graphing/GraphInput.php new file mode 100644 index 00000000000..489f6a7dbc9 --- /dev/null +++ b/app/Data/Graphing/GraphInput.php @@ -0,0 +1,57 @@ + $vars + */ + public function __construct(private array $vars) + { + } + + /** + * @return array + */ + public function all(): array + { + return $this->vars; + } + + public function int(string $key): ?int + { + return $this->filter($key, FILTER_VALIDATE_INT); + } + + public function float(string $key): ?float + { + return $this->filter($key, FILTER_VALIDATE_FLOAT); + } + + /** + * Accepts true/false, 1/0, yes/no and on/off + */ + public function bool(string $key): ?bool + { + return $this->filter($key, FILTER_VALIDATE_BOOL); + } + + public function string(string $key): ?string + { + $value = $this->vars[$key] ?? null; + + return is_scalar($value) ? (string) $value : null; + } + + private function filter(string $key, int $filter): mixed + { + $value = $this->vars[$key] ?? null; + + return is_scalar($value) ? filter_var($value, $filter, FILTER_NULL_ON_FAILURE) : null; + } +} diff --git a/app/Data/Graphing/GraphOptions.php b/app/Data/Graphing/GraphOptions.php new file mode 100644 index 00000000000..2e9e4d1892f --- /dev/null +++ b/app/Data/Graphing/GraphOptions.php @@ -0,0 +1,32 @@ + */ + private array $visibleElements; + + /** Input graphs read their own options from, such as bill_hist_id */ + public GraphInput $input; + + public string $type; + public string $subtype; + public ?int $id; + public ?int $deviceId; + public ?int $portId; + + public ?string $user_title; + public ImageFormat $imageFormat; + + public string $style; + public string $font_color; + public string $background; + public string $canvas; + + public int $width; + public int $height; + public bool $full_size; + public bool $is_small; + + public int $from; + public int $to; + /** No end time was requested, so the graph ends at the current time */ + public bool $ends_now; + public int $period; + public int $prev_from; + + public bool $inverse; + public string $in; + public string $out; + + // user requested scale, graph options take precedence + public ?float $scale_min; + public ?float $scale_max; + public ?bool $scale_rigid; + + /** + * @param array $input + */ + public function __construct(array $input) + { + $this->input = $input = new GraphInput($input); + + $this->imageFormat = ImageFormat::forGraph($input->string('graph_type')); + [$this->type, $this->subtype] = $this->extractType($input->string('type') ?? ''); + + $this->id = $input->int('id'); + $this->deviceId = $input->int('device') ?? ($this->type === 'device' ? $this->id : null); + $this->portId = $input->int('port') ?? ($this->type === 'port' ? $this->id : null); + + $this->width = $this->size($input->int('width') ?? 400); + $this->height = $this->size($input->int('height') ?? intdiv($this->width, 3)); + $this->full_size = $input->bool('absolute') ?? false; + $this->is_small = $this->width < self::SMALL; + + $this->style = $input->string('style') ?? ''; + $this->font_color = Clean::alphaDash($input->string('font') ?? ''); + + $this->canvas = Clean::alphaDash($input->string('bg') ?? ''); + $this->background = Clean::alphaDash($input->string('bbg') ?? ''); + + $this->user_title = $input->string('graph_title'); // if the user sets a title, show it + $title = $input->string('title'); + $this->visibleElements = [ + 'title' => $this->user_title !== null || ($title !== null && $title !== 'no'), + 'legend' => $input->string('legend') !== 'no', + 'total' => ! ($input->bool('nototal') ?? $this->is_small), + 'details' => ! ($input->bool('nodetails') ?? $this->is_small), + 'aggregate' => ! ($input->bool('noagg') ?? false), + 'previous' => $input->string('previous') === 'yes', + ]; + + $this->from = Time::parseAt($input->string('from') ?: '-1d') ?: Time::parseAt('-1d'); + $to = Time::parseAt($input->string('to') ?: 0); + $this->ends_now = $to === 0; + $this->to = $to ?: time(); + $this->period = $this->to - $this->from; + $this->prev_from = $this->from - $this->period; + $this->scale_min = $input->float('scale_min'); + $this->scale_max = $input->float('scale_max'); + $this->scale_rigid = $input->bool('scale_rigid'); + + $this->inverse = $input->bool('inverse') ?? false; + $this->in = $this->inverse ? 'out' : 'in'; + $this->out = $this->inverse ? 'in' : 'out'; + } + + public function visible(string $element): bool + { + return $this->visibleElements[$element] ?? true; + } + + private function size(int $pixels): int + { + return max(1, min(self::MAX_SIZE, $pixels)); + } + + /** + * @return array{string, string} type and subtype + */ + private function extractType(string $type): array + { + return preg_match(self::TYPE_PATTERN, $type, $matches) ? [$matches[1], $matches[2]] : ['', '']; + } +} diff --git a/app/Data/Graphing/Legacy/LegacyAuthResult.php b/app/Data/Graphing/Legacy/LegacyAuthResult.php new file mode 100644 index 00000000000..33bd3aa7ad2 --- /dev/null +++ b/app/Data/Graphing/Legacy/LegacyAuthResult.php @@ -0,0 +1,22 @@ + $scope local variables set by the auth file, shared with the graph file + */ + public function __construct( + public bool $authorized, + public GraphPageContext $pageContext, + public array $scope, + ) { + } +} diff --git a/app/Data/Graphing/Legacy/LegacyGraphParameters.php b/app/Data/Graphing/Legacy/LegacyGraphParameters.php new file mode 100644 index 00000000000..0b73ac60e54 --- /dev/null +++ b/app/Data/Graphing/Legacy/LegacyGraphParameters.php @@ -0,0 +1,54 @@ +params->visible($element); + } + + public function toOptions(): GraphOptions + { + return new GraphOptions( + scaleMin: $this->scale_min, + scaleMax: $this->scale_max, + scaleRigid: $this->scale_rigid, + base: $this->base, + unitsExponent: $this->units_exponent, + logarithmic: $this->logarithmic, + altYGrid: $this->alt_y_grid, + verticalLabel: $this->vertical_label, + leftAxisFormat: $this->left_axis_format, + rightAxis: $this->right_axis, + rightAxisLabel: $this->right_axis_label, + unitsLength: $this->units_length, + ); + } +} diff --git a/app/Data/Graphing/Legacy/LegacyGraphResult.php b/app/Data/Graphing/Legacy/LegacyGraphResult.php new file mode 100644 index 00000000000..f7b7e57ff43 --- /dev/null +++ b/app/Data/Graphing/Legacy/LegacyGraphResult.php @@ -0,0 +1,24 @@ + $rrdOptions the graph elements: DEF, CDEF, LINE, AREA, GPRINT, etc. + * @param array $rrdFiles the rrd files the graph reads + */ + public function __construct( + public array $rrdOptions, + public GraphOptions $options, + public string $title, + public array $rrdFiles, + ) { + } +} diff --git a/app/Data/Graphing/SeriesStyle.php b/app/Data/Graphing/SeriesStyle.php new file mode 100644 index 00000000000..22daf5a0ae4 --- /dev/null +++ b/app/Data/Graphing/SeriesStyle.php @@ -0,0 +1,31 @@ + $tags the name of each tag that was stored, by its name in the identity. The hostname was added by the datastores. + * @param list|null $rrdName the parts of the rrd file name, {tag} is the value of a tag of the identity. Null when the file was named after the measurement. + */ + public function __construct( + public string $measurement, + public array $tags = [], + public ?array $rrdName = null, + ) { + } + + /** + * @return array + */ + public function tagsOf(MetricIdentity $metric): array + { + $tags = []; + foreach ($this->tags as $name => $legacyName) { + if (isset($metric->tags[$name])) { + $tags[$legacyName] = $metric->tags[$name]; + } + } + + return $tags; + } + + /** + * @return list|null null when the file was named after the measurement + */ + public function rrdNameOf(MetricIdentity $metric): ?array + { + if ($this->rrdName === null) { + return null; + } + + $values = []; + foreach ($metric->tags as $name => $value) { + $values['{' . $name . '}'] = (string) $value; + } + + return array_map(fn (string $part): string => strtr($part, $values), $this->rrdName); + } +} diff --git a/app/Data/TimeSeries/MetricCollector.php b/app/Data/TimeSeries/MetricCollector.php new file mode 100644 index 00000000000..f0affab13ca --- /dev/null +++ b/app/Data/TimeSeries/MetricCollector.php @@ -0,0 +1,44 @@ + + */ + private array $entries = []; + + /** + * @param string[] $allowed measurements that may be recorded, empty allows all + */ + public function __construct(public readonly array $allowed = []) + { + } + + /** + * @param TModel $model + * @param array $fields + */ + public function record(HasMetrics $model, string $measurement, array $fields): void + { + if ($this->allowed && ! in_array($measurement, $this->allowed, true)) { + throw new \RuntimeException('Invalid metric: ' . $measurement); + } + + $this->entries[] = new MetricEntry($model->metricIdentity($measurement), $fields); + } + + /** + * @return list + */ + public function entries(): array + { + return $this->entries; + } +} diff --git a/app/Data/TimeSeries/MetricEntry.php b/app/Data/TimeSeries/MetricEntry.php new file mode 100644 index 00000000000..ea0bde3255a --- /dev/null +++ b/app/Data/TimeSeries/MetricEntry.php @@ -0,0 +1,15 @@ + $fields + */ + public function __construct( + public MetricIdentity $identity, + public array $fields, + ) { + } +} diff --git a/app/Data/TimeSeries/MetricIdentity.php b/app/Data/TimeSeries/MetricIdentity.php new file mode 100644 index 00000000000..c584a0bfe05 --- /dev/null +++ b/app/Data/TimeSeries/MetricIdentity.php @@ -0,0 +1,50 @@ + $tags in a fixed order, datastores may name a series after the values + */ + public function __construct( + public string $measurement, + public array $tags = [], + ) { + } + + /** + * What datastores that keep series in a hierarchy (rrd, graphite) group this series under: + * the hostname, or the first tag of a metric that does not belong to one device. + */ + public function group(): string + { + $tag = $this->groupTag(); + + return $tag === null ? '' : (string) $this->tags[$tag]; + } + + /** + * The tags that tell the series apart inside its group + * + * @return array + */ + public function tagsInGroup(): array + { + return array_diff_key($this->tags, [(string) $this->groupTag() => null]); + } + + private function groupTag(): ?string + { + $first = array_key_first($this->tags); + + assert($first === 'hostname' || ! array_key_exists('hostname', $this->tags), 'hostname tag should be first!'); + + return $first; + } +} diff --git a/app/Events/NetworkAddressScanned.php b/app/Events/NetworkAddressScanned.php new file mode 100644 index 00000000000..3eb3a13d2ac --- /dev/null +++ b/app/Events/NetworkAddressScanned.php @@ -0,0 +1,24 @@ +adjustErrorHandlingForAppEnv(app()->environment()); $exceptions->dontReportDuplicates(); - $exceptions->throttle(fn (Throwable $e) => Limit::perMinute(LibrenmsConfig::get('reporting.throttle', 30))); + $exceptions->throttle(function (Throwable $e): Limit { + $limit = (int) LibrenmsConfig::get('reporting.throttle', 30); + + return $limit > 0 ? Limit::perMinute($limit) : Limit::none(); + }); $exceptions->reportable($this->reportable(...)); - $exceptions->report($this->report(...)); $exceptions->render($this->render(...)); - - Flare::determineVersionUsing(fn () => \LibreNMS\Util\Version::VERSION); } public function reportable(Throwable $e): bool @@ -71,15 +69,6 @@ public function reportable(Throwable $e): bool return false; // false = block default log message } - public function report(Throwable $e): bool - { - if ($this->isReportingEnabled()) { - Flare::report($e); - } - - return true; - } - public function render(Throwable $exception, Request $request): Response|JsonResponse|null { // try to upgrade generic exceptions to more specific ones @@ -98,64 +87,6 @@ public function render(Throwable $exception, Request $request): Response|JsonRes return null; // use default rendering } - /** - * Checks the state of the config and current install to determine if reporting should be enabled - * The primary factor is the setting reporting.error - */ - public function isReportingEnabled(): bool - { - if ($this->reportingEnabled !== null) { - return $this->reportingEnabled; - } - - // safety check so we don't leak early reports (but reporting should not be loaded before the config is) - if (! app()->bound('librenms-config')) { - return false; - } - - $this->reportingEnabled = false; // don't cache before config is loaded - - // check the user setting - if (LibrenmsConfig::get('reporting.error') !== true) { - \Log::debug('Reporting disabled by user setting'); - - return false; - } - - // Only run in production - if (! app()->isProduction()) { - \Log::debug('Reporting disabled because app is not in production mode'); - - return false; - } - - // Check git - $git = Git::make(180); - if ($git->isAvailable()) { - if (! Str::contains($git->remoteUrl(), ['git@github.com:librenms/librenms.git', 'https://github.com/librenms/librenms.git'])) { - \Log::debug('Reporting disabled because LibreNMS is not from the official repository'); - - return false; - } - - if ($git->hasChanges()) { - \Log::debug('Reporting disabled because LibreNMS is not from the official repository'); - - return false; - } - - if (! $git->isOfficialCommits()) { - \Log::debug('Reporting disabled due to local modifications'); - - return false; - } - } - - $this->reportingEnabled = true; - - return true; - } - private function adjustErrorHandlingForAppEnv(string $environment): void { // throw exceptions and deprecations in testing and non-prod when APP_DEBUG is set. diff --git a/app/Graphs/AbstractGraph.php b/app/Graphs/AbstractGraph.php new file mode 100644 index 00000000000..c8f587f0179 --- /dev/null +++ b/app/Graphs/AbstractGraph.php @@ -0,0 +1,155 @@ +requestedPort(); + + return new GraphPageContext($this->requestedDevice() ?? $port?->device, $port); + } + + /** + * The device requested by the device or id (of device graphs) input, null if it does not exist + */ + protected function requestedDevice(): ?Device + { + if ($this->params->deviceId === null) { + return null; + } + + $device = DeviceCache::get($this->params->deviceId); + + return $device->exists ? $device : null; + } + + /** + * The port requested by the port or id (of port graphs) input + */ + protected function requestedPort(): ?Port + { + return $this->params->portId === null ? null : PortCache::get($this->params->portId); + } + + public function getTitle(): string + { + return ($this->getPageContext()->device->display ?? ucfirst($this->params->type)) + . '::' . Str::title(str_replace('_', ' ', $this->params->subtype)); + } + + public function getDebugCommand(): ?string + { + return null; + } + + final public function authorize(): bool + { + return $this->authorized ??= $this->isAuthorized(); + } + + public function render(): GraphImage + { + $title = null; + + try { + $this->checkRenderable(); + $title = $this->params->visible('title') ? ($this->params->user_title ?? $this->getTitle()) : null; + $image = $this->draw(); + } catch (GraphException $e) { + $e->graphTitle ??= $title; + + throw $e; + } catch (Throwable $e) { + // drawing libraries and queries fail with their own exceptions, keep the details out of the image + report($e); + + $error = new GraphException('Graph Error', 'Error', $e); + $error->graphTitle = $title; + + throw $error; + } + + // the image is named after the title the user set + return $this->params->user_title === null + ? $image + : new GraphImage($image->format, $this->params->user_title, $image->data); + } + + /** + * Graph specific validation rules for the graph input. + * Common graph request input is validated by GraphRequest. + * + * @return array + */ + protected function validation(): array + { + return []; + } + + /** + * @throws GraphException + */ + protected function checkRenderable(): void + { + if ($rules = $this->validation()) { + $validator = Validator::make($this->params->input->all(), $rules); + + if ($validator->fails()) { + throw new InvalidGraphInput($validator->errors()->first()); + } + } + + if (! $this->authorize()) { + throw new UnauthorizedGraph; + } + } + + /** + * Can the current user view the model, guests only when anonymous graphs are allowed + */ + protected function canView(Model $model): bool + { + return app(GraphAccess::class)->canView($model); + } +} diff --git a/app/Graphs/AbstractSeriesGraph.php b/app/Graphs/AbstractSeriesGraph.php new file mode 100644 index 00000000000..9e0cb4ac2f9 --- /dev/null +++ b/app/Graphs/AbstractSeriesGraph.php @@ -0,0 +1,58 @@ + + */ + abstract public function getSeries(): array; + + /** + * Draws the series from the datastore, override to draw them with another backend + */ + protected function renderer(): RrdGraphRenderer + { + return app(RrdGraphRenderer::class, ['params' => $this->params]); + } + + public function getDebugCommand(): ?string + { + $this->checkRenderable(); + + return $this->renderer()->seriesDebugCommand($this->getTitle(), $this->series(), $this->options()); + } + + protected function draw(): GraphImage + { + return $this->renderer()->render($this->getTitle(), $this->series(), $this->options()); + } + + /** + * @return array + * + * @throws GraphException + */ + private function series(): array + { + return $this->getSeries() ?: throw new NoGraphData; + } +} diff --git a/app/Graphs/Bill/BillGraph.php b/app/Graphs/Bill/BillGraph.php new file mode 100644 index 00000000000..b653da1d553 --- /dev/null +++ b/app/Graphs/Bill/BillGraph.php @@ -0,0 +1,158 @@ +bill(); + + return $bill !== null && $this->canView($bill); + } + + public function getTitle(): string + { + return $this->bill()->bill_name ?? 'Bill'; + } + + protected function validation(): array + { + return [ + 'id' => 'required|integer', + 'bill_hist_id' => 'nullable|integer', + ]; + } + + protected function draw(): GraphImage + { + $image = $this->graph()->Stroke(_IMG_HANDLER); + + ob_start(); + imagepng($image); + + return new GraphImage(ImageFormat::Png, $this->getTitle(), (string) ob_get_clean()); + } + + protected function bill(): ?Bill + { + return $this->params->id === null ? null : ($this->bill ??= Bill::find($this->params->id)); + } + + protected function histId(): ?int + { + return $this->params->input->int('bill_hist_id'); + } + + /** + * Graph with the styling shared by all bill graphs + * + * @param array $limits scale limits passed to Graph::SetScale() + */ + protected function newGraph(string $name, string $yTitle, string $scale = 'textlin', array $limits = []): Graph + { + $graph = new Graph($this->params->width, $this->params->height, $name); + $graph->img->SetImgFormat('png'); + $graph->SetScale($scale, ...$limits); // creates the axes + + // work around bug in jpgraph error handling + $graph->title->Set(' '); + $graph->subtitle->Set(' '); + $graph->subsubtitle->Set(' '); + $graph->footer->left->Set(' '); + $graph->footer->center->Set(' '); + $graph->footer->right->Set(' '); + + $graph->SetMarginColor('white'); + $graph->SetFrame(false); + $graph->SetMargin('75', '30', '30', '65'); + + $graph->legend->SetFont(FF_FONT1, FS_NORMAL); + $graph->legend->SetLayout(LEGEND_HOR); + $graph->legend->Pos('0.52', '0.91', 'center'); + + $graph->xaxis->SetFont(FF_FONT1, FS_BOLD); + $graph->xaxis->SetPos('min'); + $graph->xaxis->SetTitleMargin(30); + $graph->xaxis->title->Set(' '); + + $graph->xgrid->Show(true, true); + $graph->xgrid->SetColor('#e0e0e0', '#efefef'); + + $graph->yaxis->SetFont(FF_FONT1); + $graph->yaxis->SetTitleMargin(50); + $graph->yaxis->title->SetFont(FF_FONT1, FS_NORMAL, 10); + $graph->yaxis->title->Set($yTitle); + + $graph->ygrid->SetFill(true, '#EFEFEF@0.5', '#FFFFFF@0.5'); + + return $graph; + } + + /** + * Graph for bytes transferred per tick + * + * @param array $graph_data + */ + protected function transferGraph(array $graph_data): Graph + { + $graph = $this->newGraph($graph_data['graph_name'], 'Bytes Transferred'); + $graph->title->SetFont(FF_FONT2, FS_BOLD, 10); + $graph->xaxis->SetTickLabels($graph_data['ticklabels']); + $graph->yaxis->SetLabelFormatCallback(fn ($value) => Number::formatBase($value, LibrenmsConfig::get('billing.base'), 1, 0)); + + return $graph; + } + + /** + * The in, total and out bars of a transfer graph + * + * @param array $graph_data + * @return array + */ + protected function trafficBars(array $graph_data): array + { + $total = new BarPlot($graph_data['tot_data']); + $total->SetLegend('Traffic total'); + $total->SetColor('darkgray'); + $total->SetFillColor('lightgray@0.4'); + $total->value->Show(); + $total->value->SetFormatCallback('\LibreNMS\Billing::formatBytesShort'); + + $in = new BarPlot($graph_data['in_data']); + $in->SetLegend('Traffic In'); + $in->SetColor('darkgreen'); + $in->SetFillColor('lightgreen@0.4'); + $in->SetWeight(1); + + $out = new BarPlot($graph_data['out_data']); + $out->SetLegend('Traffic Out'); + $out->SetColor('darkblue'); + $out->SetFillColor('lightblue@0.4'); + $out->SetWeight(1); + + return [$in, $total, $out]; + } +} diff --git a/app/Graphs/Bill/HistoricbitsGraph.php b/app/Graphs/Bill/HistoricbitsGraph.php new file mode 100644 index 00000000000..dc4b3f95460 --- /dev/null +++ b/app/Graphs/Bill/HistoricbitsGraph.php @@ -0,0 +1,112 @@ + 'nullable|integer', + ]; + } + + protected function graph(): Graph + { + $bill_id = $this->bill()->bill_id; + $hist_id = $this->histId(); + + if ($hist_id !== null) { + $history = BillHistory::where('bill_id', $bill_id)->find($hist_id); + if ($history === null) { + throw new NoGraphData; + } + + $dur = Carbon::parse($history->bill_dateto)->timestamp - Carbon::parse($history->bill_datefrom)->timestamp; + $graph_data = Billing::getHistoryBitsGraphData($bill_id, $hist_id, $this->reduceFactor($dur)); + } else { + $dur = $this->params->period; + $graph_data = Billing::getBitsGraphData($bill_id, $this->params->from, $this->params->to, $this->reduceFactor($dur)); + } + + if (empty($graph_data['ticks'])) { + throw new NoGraphData; + } + + $ticks = $graph_data['ticks']; + $xmin = $ticks[0]; + $xmax = $ticks[count($ticks) - 1]; + + $graph = $this->newGraph($graph_data['graph_name'] ?? 'Bill Graph', 'Bits per second', 'datlin', [0, 0, $graph_data['from'], $graph_data['to']]); + $graph->legend->Pos(0.52, 0.90, 'center'); + $graph->xaxis->SetTextLabelInterval(2); + $graph->xaxis->SetLabelFormatCallback(function ($aVal) use ($dur) { + if ($dur < 172800) { + return date('H:i', $aVal); + } elseif ($dur < 604800) { + return date('D', $aVal); + } + + return date('j M', $aVal); + }); + $graph->yaxis->SetLabelFormatCallback(fn ($y) => Number::formatSi($y, 0, 0, '')); + $graph->yaxis->HideZeroLabel(1); + + $lineplot = new LinePlot($graph_data['tot_data'], $ticks); + $lineplot->SetLegend('Traffic total'); + $lineplot->SetColor('#d5d5d5'); + $lineplot->SetFillColor('#d5d5d5@0.5'); + + $lineplot_in = new LinePlot($graph_data['in_data'], $ticks); + $lineplot_in->SetLegend('Traffic In'); + $lineplot_in->SetColor('darkgreen'); + $lineplot_in->SetFillColor('lightgreen@0.4'); + $lineplot_in->SetWeight(1); + + $lineplot_out = new LinePlot(array_map(fn ($x) => $x * -1, $graph_data['out_data']), $ticks); + $lineplot_out->SetLegend('Traffic Out'); + $lineplot_out->SetColor('darkblue'); + $lineplot_out->SetFillColor('lightblue@0.4'); + $lineplot_out->SetWeight(1); + + $graph->Add($lineplot); + $graph->Add($lineplot_in); + $graph->Add($lineplot_out); + + $bill_type = strtolower((string) $graph_data['bill_type']); + if ($bill_type == 'cdr') { + $lineplot_95th = new LinePlot([$graph_data['rate_95th'], $graph_data['rate_95th']], [$xmin, $xmax]); + $lineplot_95th->SetColor('red'); + $graph->Add($lineplot_95th); + } elseif ($bill_type == 'quota') { + $lineplot_ave = new LinePlot([$graph_data['rate_average'], $graph_data['rate_average']], [$xmin, $xmax]); + $lineplot_ave->SetColor('red'); + $graph->Add($lineplot_ave); + } + + return $graph; + } + + /** + * Combine data points so there are about three per pixel + */ + private function reduceFactor(int $duration): int + { + $reducefactor = $this->params->input->int('reducefactor') ?? 0; + + if ($reducefactor >= 2) { + return $reducefactor; + } + + return max(2, (int) round($duration / 300 / (max(1, $this->params->height - 100) * 3))); + } +} diff --git a/app/Graphs/Bill/HistoricmonthlyGraph.php b/app/Graphs/Bill/HistoricmonthlyGraph.php new file mode 100644 index 00000000000..8d72affb401 --- /dev/null +++ b/app/Graphs/Bill/HistoricmonthlyGraph.php @@ -0,0 +1,60 @@ +bill()->bill_id); + + if (empty($graph_data['ticklabels'])) { + throw new NoGraphData; + } + + $graph_data['ticklabels'] = array_map(function ($label) { + if (! $label) { + return $label; + } + + $parts = explode(' - ', (string) $label); + $start = strtotime($parts[0]); + $end = strtotime($parts[1]); + + if (date('m', $start) == date('m', $end) && date('d', $start) == 1) { + // Calendar months, omit the date and the end! + return date('M Y', $start); + } + + return date('j M Y', $start) . "\n" . date('j M Y', $end); + }, $graph_data['ticklabels']); + + $graph = $this->transferGraph($graph_data); + + $barplot_over = new BarPlot($graph_data['overuse_data']); + $barplot_over->SetLegend('Traffic Overusage'); + $barplot_over->SetColor('darkred'); + $barplot_over->SetFillColor('lightred@0.4'); + $barplot_over->SetWeight(1); + + $lineplot_allow = new LinePlot($graph_data['allow_data']); + $lineplot_allow->SetLegend('Traffic Allowed'); + $lineplot_allow->SetColor('black'); + $lineplot_allow->SetWeight(1); + + $graph->Add(new GroupBarPlot([...$this->trafficBars($graph_data), $barplot_over])); + $graph->Add($lineplot_allow); + + return $graph; + } +} diff --git a/app/Graphs/Bill/HistorictransferGraph.php b/app/Graphs/Bill/HistorictransferGraph.php new file mode 100644 index 00000000000..179c2995a76 --- /dev/null +++ b/app/Graphs/Bill/HistorictransferGraph.php @@ -0,0 +1,53 @@ + 'nullable|in:day,hour', + ]; + } + + protected function graph(): Graph + { + $bill_id = $this->bill()->bill_id; + $imgtype = $this->params->input->string('imgtype'); + + $graph_data = $imgtype === null + ? Billing::getHistoricTransferGraphData($bill_id) + : Billing::getBandwidthGraphData($bill_id, $this->histId(), $this->params->from, $this->params->to, $imgtype); + + if (empty($graph_data['ticklabels'])) { + throw new NoGraphData; + } + + if ($imgtype === 'day') { + $graph_data['ticklabels'] = array_map(fn ($label) => $label ? date("j\nM", strtotime((string) $label)) : $label, $graph_data['ticklabels']); + } + + $graph = $this->transferGraph($graph_data); + + $lineplot_allow = new LinePlot($graph_data['ave_data']); + $lineplot_allow->SetLegend('Average'); + $lineplot_allow->SetColor('black'); + $lineplot_allow->SetWeight(1); + + $graph->Add(new GroupBarPlot($this->trafficBars($graph_data))); + $graph->Add($lineplot_allow); + + return $graph; + } +} diff --git a/app/Graphs/Device/DeviceGraph.php b/app/Graphs/Device/DeviceGraph.php new file mode 100644 index 00000000000..1850ea0a14d --- /dev/null +++ b/app/Graphs/Device/DeviceGraph.php @@ -0,0 +1,41 @@ +getPageContext()->device; + + return $device !== null && $this->canView($device); + } + + /** + * @throws NoGraphData + */ + protected function device(): Device + { + return $this->getPageContext()->device ?? throw new NoGraphData; + } + + /** + * A metric stored for the device + * + * @param array $tags + * + * @throws NoGraphData + */ + protected function metric(string $measurement, array $tags = []): MetricIdentity + { + return new MetricIdentity($measurement, ['hostname' => $this->device()->hostname, ...$tags]); + } +} diff --git a/app/Graphs/Device/NetstatIpGraph.php b/app/Graphs/Device/NetstatIpGraph.php new file mode 100644 index 00000000000..92fde6d9a2b --- /dev/null +++ b/app/Graphs/Device/NetstatIpGraph.php @@ -0,0 +1,36 @@ +device()->display . ' :: IP NetStats'; + } + + public function getSeries(): array + { + $metric = $this->metric('netstats-ip'); + $outbound = new SeriesStyle(invert: true); + + return [ + 'ipForwDatagrams' => new DataSeries($metric, 'ipForwDatagrams', 'Fwd Datagrams'), + 'ipInDelivers' => new DataSeries($metric, 'ipInDelivers', 'In Delivers'), + 'ipInReceives' => new DataSeries($metric, 'ipInReceives', 'In Receives'), + 'ipOutRequests' => new DataSeries($metric, 'ipOutRequests', 'Out Requests', style: $outbound), + 'ipInDiscards' => new DataSeries($metric, 'ipInDiscards', 'In Discards'), + 'ipOutDiscards' => new DataSeries($metric, 'ipOutDiscards', 'Out Discards', style: $outbound), + 'ipOutNoRoutes' => new DataSeries($metric, 'ipOutNoRoutes', 'Out No Routes', style: $outbound), + ]; + } + + protected function options(): GraphOptions + { + return new GraphOptions(scaleMin: 0); + } +} diff --git a/app/Graphs/Device/ProcessorGraph.php b/app/Graphs/Device/ProcessorGraph.php new file mode 100644 index 00000000000..e2697301392 --- /dev/null +++ b/app/Graphs/Device/ProcessorGraph.php @@ -0,0 +1,49 @@ +device()->display; + } + + public function getSeries(): array + { + $device = $this->device(); + $processors = $device->processors; + + // stacked processors are drawn as their share of the device total + $style = $this->isStacked() + ? new SeriesStyle(stacked: true, stackAverage: true) + : new SeriesStyle(fill: true); + + $series = []; + foreach ($processors as $processor) { + $processor->setRelation('device', $device); + $metric = $processor->metricIdentity('processor'); + $series["proc_$processor->processor_id"] = new DataSeries($metric, 'usage', $processor->getFormattedDescription(), style: $style); + } + + return $series; + } + + protected function options(): GraphOptions + { + return new GraphOptions(scaleMin: 0, scaleMax: 100, legendTitle: 'Load %', palette: $this->isStacked() ? 'oranges' : 'mixed'); + } + + private function isStacked(): bool + { + return (bool) LibrenmsConfig::getOsSetting($this->device()->os, 'processor_stacked'); + } +} diff --git a/app/Graphs/GraphAccess.php b/app/Graphs/GraphAccess.php new file mode 100644 index 00000000000..10a60658d06 --- /dev/null +++ b/app/Graphs/GraphAccess.php @@ -0,0 +1,102 @@ +trusted; + $this->trusted = true; + + try { + return $callback(); + } finally { + $this->trusted = $previous; + } + } + + /** + * Can the current user view graphs of the model. + * Guests may when anonymous graphs are allowed, users need permission to view the model. + */ + public function canView(Model $model): bool + { + if (Auth::guest()) { + return $this->allowsGuests(); + } + + return Gate::allows('view', $model); + } + + /** + * There is no user and anonymous graphs are allowed. + * The starting authorization of legacy graph auth files, which check permissions when it is false. + */ + public function guestAllowed(): bool + { + return Auth::guest() && $this->allowsGuests(); + } + + /** + * Guests may view graphs: trusted by the caller, allow_unauth_graphs, or the client ip is in allow_unauth_graphs_cidr + */ + public function allowsGuests(?Request $request = null): bool + { + if ($this->trusted) { + return true; + } + + if (LibrenmsConfig::get('allow_unauth_graphs', false)) { + d_echo("Unauthorized graphs allowed\n"); + + return true; + } + + $ip = ($request ?? request())->getClientIp(); + if ($ip === null) { + return false; + } + + try { + $client_ip = IP::parse($ip); + foreach (LibrenmsConfig::get('allow_unauth_graphs_cidr', []) as $range) { + if ($client_ip->inNetwork($range)) { + d_echo("Unauthorized graphs allowed from $range\n"); + + return true; + } + } + } catch (InvalidIpException) { + d_echo("Client IP ($ip) is invalid.\n"); + } + + return false; + } +} diff --git a/app/Graphs/GraphFactory.php b/app/Graphs/GraphFactory.php new file mode 100644 index 00000000000..56ba886ad68 --- /dev/null +++ b/app/Graphs/GraphFactory.php @@ -0,0 +1,79 @@ +type) || empty($params->subtype)) { + throw new InvalidGraph; + } + + $className = $this->graphClass($params->type, $params->subtype); + if ($className !== null) { + return app($className, ['params' => $params]); + } + + return new LegacyGraph($params); + } + + /** + * All subtypes of the given graph type + * + * @return string[] + */ + public function subtypes(string $type): array + { + $type = basename($type); + $subtypes = LegacyGraphScript::subtypes($type); + + foreach (glob(app_path('Graphs/' . ucfirst($type) . '/*Graph.php')) ?: [] as $file) { + $subtype = Str::snake(basename($file, 'Graph.php')); + if ($this->graphClass($type, $subtype) !== null) { + $subtypes[] = $subtype; + } + } + + return $subtypes; + } + + /** + * Graph classes are named App\Graphs\{Type}\{Subtype}Graph, for example App\Graphs\Device\ProcessorGraph + * + * @return class-string|null + */ + private function graphClass(string $type, string $subtype): ?string + { + // only plain names map to classes, so other spellings of a subtype do not resolve to the same class + if (! preg_match('/^[a-zA-Z0-9]+$/', $type) || ! preg_match('/^[a-z0-9_]+$/', $subtype) + || in_array(strtolower($type), self::FRAMEWORK_DIRECTORIES, true)) { + return null; + } + + $className = 'App\\Graphs\\' . ucfirst($type) . '\\' . Str::studly($subtype) . 'Graph'; + + if (is_subclass_of($className, GraphInterface::class) && new ReflectionClass($className)->isInstantiable()) { + return $className; + } + + return null; + } +} diff --git a/app/Graphs/Legacy/LegacyGraph.php b/app/Graphs/Legacy/LegacyGraph.php new file mode 100644 index 00000000000..8d2e841cb90 --- /dev/null +++ b/app/Graphs/Legacy/LegacyGraph.php @@ -0,0 +1,132 @@ +script = LegacyGraphScript::find($params->type, $params->subtype) ?? throw new InvalidGraph; + } + + protected function isAuthorized(): bool + { + return $this->authResult()->authorized; + } + + public function getPageContext(): GraphPageContext + { + return $this->authResult()->pageContext; + } + + /** + * Graph files may set the title, unauthorized users do not get to run them + */ + public function getTitle(): string + { + $title = $this->authorize() ? $this->graphResult()->title : ''; + + return $title ?: parent::getTitle(); + } + + protected function options(): GraphOptions + { + return $this->graphResult()->options; + } + + /** + * The full rrdtool graph argument list + * + * @return array + * + * @throws GraphException + */ + public function getRrdCommandOptions(): array + { + $this->checkRenderable(); + + return $this->buildRrdOptions(); + } + + public function getDebugCommand(): ?string + { + return $this->renderer()->debugCommand($this->getRrdCommandOptions()); + } + + protected function draw(): GraphImage + { + return $this->renderer()->draw($this->getTitle(), $this->buildRrdOptions(), $this->dataFilesMissing(...)); + } + + private function renderer(): RrdGraphRenderer + { + return app(RrdGraphRenderer::class, ['params' => $this->params]); + } + + /** + * @return array + * + * @throws GraphException + */ + private function buildRrdOptions(): array + { + return $this->renderer()->commandOptions($this->getTitle(), $this->options(), $this->graphResult()->rrdOptions); + } + + /** + * Whether a failed draw is because of missing data files. + * Only checked after a failed draw, each check may be a request to rrdcached + */ + private function dataFilesMissing(): bool + { + $files = $this->graphResult()->rrdFiles; + + foreach ($files as $file) { + if (Rrd::checkRrdExists($file)) { + return false; + } + } + + return $files !== []; + } + + /** + * @throws GraphException + */ + private function authResult(): LegacyAuthResult + { + return $this->authResult ??= $this->script->runAuth($this->requestedDevice(), $this->requestedPort(), $this->params->input->all()); + } + + /** + * @throws GraphException + */ + private function graphResult(): LegacyGraphResult + { + return $this->graphResult ??= $this->script->runGraph($this->authResult(), $this->params); + } +} diff --git a/app/Graphs/Legacy/LegacyGraphScript.php b/app/Graphs/Legacy/LegacyGraphScript.php new file mode 100644 index 00000000000..310c3a34998 --- /dev/null +++ b/app/Graphs/Legacy/LegacyGraphScript.php @@ -0,0 +1,227 @@ + + */ + public static function subtypes(string $type): array + { + $files = glob(base_path("includes/html/graphs/$type/*.inc.php")) ?: []; + + return array_values(array_diff(array_map(fn (string $file) => basename($file, '.inc.php'), $files), ['auth'])); + } + + /** + * Auth files may resolve the device and port when they were not requested directly. + * They start authorized only when a guest may view graphs, otherwise they check the permissions of the user. + * + * @param array $vars + * + * @throws GraphException + */ + public function runAuth(?Device $device, ?Port $port, array $vars): LegacyAuthResult + { + if ($device) { + DeviceCache::setPrimary($device->device_id); + } + + $scope = $this->include($this->authFile, [ + 'device' => $device ?? new Device, + 'port' => $port, + 'vars' => $vars, + 'auth' => app(GraphAccess::class)->guestAllowed(), + ]); + + if ($device === null) { + $device = $this->deviceFromScope($scope); + + if ($device) { + DeviceCache::setPrimary($device->device_id); + } + } + + if ($port === null && ($scope['port'] ?? null) instanceof Port) { + $port = $scope['port']; + } + + $title = $scope['title'] ?? null; + + return new LegacyAuthResult( + authorized: (bool) ($scope['auth'] ?? false), + pageContext: new GraphPageContext($device, $port, is_string($title) && $title !== '' ? $title : null), + scope: $scope, + ); + } + + /** + * @throws GraphException + */ + public function runGraph(LegacyAuthResult $auth, GraphParameters $params): LegacyGraphResult + { + $legacyParams = new LegacyGraphParameters($params); + + try { + $scope = $this->include($this->graphFile, [ + ...$auth->scope, + 'graph_params' => $legacyParams, + 'type' => $params->type, + 'subtype' => $params->subtype, + 'height' => $params->height, + 'width' => $params->width, + 'from' => $params->from, + 'to' => $params->to, + 'period' => $params->period, + 'prev_from' => $params->prev_from, + 'inverse' => $params->inverse, + 'in' => $params->in, + 'out' => $params->out, + 'float_precision' => 2, + 'title' => $params->visible('title'), + 'nototal' => ! $params->visible('total'), + 'nodetails' => ! $params->visible('details'), + 'noagg' => ! $params->visible('aggregate'), + 'rrd_options' => [], + ]); + } catch (GraphException $e) { + $e->graphTitle ??= $legacyParams->title ?: null; + + throw $e; + } + + return new LegacyGraphResult( + rrdOptions: $scope['rrd_options'] ?? [], + options: $legacyParams->toOptions(), + title: $legacyParams->title, + rrdFiles: $this->rrdFilesFromScope($scope), + ); + } + + /** + * @param array $scope + */ + private function deviceFromScope(array $scope): ?Device + { + $device = $scope['device'] ?? null; + + if (is_array($device) && isset($device['device_id'])) { + $device = DeviceCache::get($device['device_id']); + } + + return $device instanceof Device && $device->exists ? $device : null; + } + + /** + * @param array $scope + * @return array + */ + private function rrdFilesFromScope(array $scope): array + { + if (isset($scope['rrd_list']) && is_array($scope['rrd_list'])) { + $files = array_column($scope['rrd_list'], 'filename'); + } elseif (isset($scope['rrd_filenames']) && is_array($scope['rrd_filenames'])) { + $files = $scope['rrd_filenames']; + } else { + $files = [$scope['rrd_filename'] ?? $scope['filename'] ?? null]; + } + + return array_values(array_filter($files, fn ($file) => $file instanceof RrdPath)); + } + + /** + * Include a legacy file with the given local variables + * + * @param array $scope + * @return array the local variables after the include + * + * @throws GraphException + */ + private function include(string $file, array $scope): array + { + $previousCwd = getcwd(); + chdir(base_path()); + + try { + include_once base_path('includes/common.php'); + include_once base_path('includes/html/functions.inc.php'); + include_once base_path('includes/dbFacile.php'); + include_once base_path('includes/rewrites.php'); + + return (static function (string $__file, array $__scope): array { + extract($__scope, EXTR_SKIP); + unset($__scope); + + include $__file; + unset($__file); + + return get_defined_vars(); + })($file, $scope); + } catch (GraphException $e) { + throw $e; + } catch (RrdNotFoundException $e) { + throw new NoGraphData('No Data file', $e); + } catch (Throwable $e) { + // legacy scripts fail with warnings and errors on unexpected input, keep the details out of the image + report($e); + + throw new GraphException('Graph Error', 'Error', $e); + } finally { + if ($previousCwd !== false) { + chdir($previousCwd); + } + } + } +} diff --git a/app/Graphs/Rrd/RrdFileResolver.php b/app/Graphs/Rrd/RrdFileResolver.php new file mode 100644 index 00000000000..9f798ab04d4 --- /dev/null +++ b/app/Graphs/Rrd/RrdFileResolver.php @@ -0,0 +1,33 @@ + relative path to whether the file exists */ + private array $exists = []; + + /** + * Prefers the file the poller writes to, a metric stored under its other name is still found + * + * @return string|null The path to the RRD file, relative to the rrd directory, if it exists, null otherwise. + */ + public function pathFor(MetricIdentity $metric): ?string + { + foreach (Rrd::metricNames($metric) as $path) { + $file = $path->relativePath(); + + if ($this->exists[$file] ??= Rrd::checkRrdExists($path)) { + return $file; + } + } + + return null; + } +} diff --git a/app/Graphs/Rrd/RrdGraphRenderer.php b/app/Graphs/Rrd/RrdGraphRenderer.php new file mode 100644 index 00000000000..b30b8db97fa --- /dev/null +++ b/app/Graphs/Rrd/RrdGraphRenderer.php @@ -0,0 +1,117 @@ + $series + * + * @throws GraphException + */ + public function render(string $title, array $series, GraphOptions $options): GraphImage + { + return $this->draw($title, $this->seriesCommandOptions($title, $series, $options)); + } + + /** + * @param array $series + * + * @throws GraphException + */ + public function seriesDebugCommand(string $title, array $series, GraphOptions $options): string + { + return $this->debugCommand($this->seriesCommandOptions($title, $series, $options)); + } + + /** + * @param array $series + * @return array + * + * @throws GraphException + */ + private function seriesCommandOptions(string $title, array $series, GraphOptions $options): array + { + $definition = new RrdSeriesDefinition($series, $options, $this->rrdFiles)->build($this->params); + + return $this->commandOptions($title, $options, $definition); + } + + /** + * The full rrdtool graph argument list + * + * @param array $definition the graph elements: DEF, CDEF, LINE, AREA, GPRINT, etc. + * @return array + * + * @throws GraphException + */ + public function commandOptions(string $title, GraphOptions $options, array $definition): array + { + if (empty($definition)) { + throw new GraphException('Graph Definition Error', 'Def Error'); + } + + return [ + ...new RrdOptionsBuilder($this->params)->build($title, $options), + ...$definition, + ]; + } + + /** + * A shell command that draws the graph, rrd file names are relative to the rrd directory + * + * @param array $commandOptions + */ + public function debugCommand(array $commandOptions): string + { + return 'cd ' . escapeshellarg((string) LibrenmsConfig::get('rrd_dir')) . ' && ' . implode(' ', array_map(escapeshellarg(...), [ + 'rrdtool', + 'graph', + '-', + ...$commandOptions, + ])); + } + + /** + * Draw the graph in the timezone of the session + * + * @param array $commandOptions + * @param (Closure(): bool)|null $dataFilesMissing whether a failed draw is because of missing data files + * + * @throws GraphException + */ + public function draw(string $title, array $commandOptions, ?Closure $dataFilesMissing = null): GraphImage + { + try { + $image = app(RrdBackendInterface::class)->graph($commandOptions, session('preferences.timezone')); + + return new GraphImage($this->params->imageFormat, $title, $image); + } catch (RrdGraphException $e) { + if ($dataFilesMissing !== null && $dataFilesMissing()) { + throw new NoGraphData('No Data files', $e); + } + + throw new RrdGraphException('Error: ' . $e->getMessage(), 'Draw Error', $e); + } + } +} diff --git a/app/Graphs/Rrd/RrdOptionsBuilder.php b/app/Graphs/Rrd/RrdOptionsBuilder.php new file mode 100644 index 00000000000..a57a791a795 --- /dev/null +++ b/app/Graphs/Rrd/RrdOptionsBuilder.php @@ -0,0 +1,211 @@ +fontSize = $params->width <= self::MEDIUM_SMALL ? 7 : 8; + } + + /** + * @param string $title the graph title, replaced by the user title if set + * @return array + */ + public function build(string $title, GraphOptions $options): array + { + return array_map(strval(...), [ + ...$this->imageOptions($title), + ...$this->scaleOptions($options), + ...$this->axisOptions($options), + ]); + } + + /** + * @return array + */ + private function imageOptions(string $title): array + { + $params = $this->params; + $options = ['--start', $params->from, '--end', $params->to, '--width', $params->width, '--height', $params->height]; + + // image must fit final dimensions + if ($params->full_size) { + $options[] = '--full-size-mode'; + } + + if ($params->imageFormat === ImageFormat::Svg) { + $options[] = '--imgformat=SVG'; + if ($params->width < self::MEDIUM) { + array_push($options, '-m', 0.75, '-R', 'light'); + } + } + + // set up fonts + $font = LibrenmsConfig::get('mono_font'); + array_push($options, '--font', 'TITLE:' . $this->fontSize . ':' . $font); + array_push($options, '--font', 'LEGEND:' . $this->fontSize . ':' . $font); + array_push($options, '--font', 'AXIS:' . ($this->fontSize - 1) . ':' . $font); + array_push($options, '--font-render-mode', 'normal'); + + // set up colors + foreach ($this->colors() as $name => $color) { + array_push($options, '-c', $name . '#' . $color); + } + + // remove all text, height is too small + if ($params->height < self::TINY) { + $options[] = '--only-graph'; + } + + if (! $params->visible('legend')) { + $options[] = '-g'; + } + + if ($params->visible('title')) { + $options[] = '--title=' . $this->escape($this->fitTitle($params->user_title ?? $title)); + } + + return $options; + } + + /** + * The requested scale is used when the graph does not set one + * + * @return array + */ + private function scaleOptions(GraphOptions $graph): array + { + $options = []; + $min = $graph->scaleMin ?? $this->params->scale_min; + $max = $graph->scaleMax ?? $this->params->scale_max; + $rigid = $graph->scaleRigid ?? $this->params->scale_rigid; + + if ($min === null && $max === null) { + $options[] = '--alt-autoscale-max'; + $rigid ??= true; + } + if ($min !== null) { + array_push($options, '-l', $min); + } + if ($max !== null) { + array_push($options, '-u', $max); + } + if ($rigid) { + $options[] = '--rigid'; + } + + return $options; + } + + /** + * @return array + */ + private function axisOptions(GraphOptions $graph): array + { + $options = ['--slope-mode']; + + if ($graph->altYGrid) { + $options[] = '--alt-y-grid'; + } + if ($graph->base !== null) { + array_push($options, '--base', $graph->base); + } + if ($graph->unitsExponent !== null) { + array_push($options, '--units-exponent', $graph->unitsExponent); + } + if ($graph->logarithmic) { + $options[] = '--logarithmic'; + } + + if ($graph->rightAxis !== null) { + array_push($options, '--right-axis', $this->escape($graph->rightAxis)); + } + if ($graph->rightAxisLabel !== null) { + array_push($options, '--right-axis-label', $this->escape($graph->rightAxisLabel)); + } + if ($graph->leftAxisFormat !== null) { + array_push($options, '--left-axis-format', $this->escape($graph->leftAxisFormat)); + } + if ($graph->unitsLength !== null) { + array_push($options, '--units-length', $graph->unitsLength); + } + if ($graph->verticalLabel !== null) { + array_push($options, '--vertical-label', $this->escape($graph->verticalLabel)); + } + + return $options; + } + + /** + * @return array rrdtool color names to hex colors + */ + private function colors(): array + { + $style = $this->params->style ?: session('applied_site_style'); + $defaults = LibrenmsConfig::get($style == 'dark' ? 'rrdgraph_def_text_dark' : 'rrdgraph_def_text'); + $font = ltrim(LibrenmsConfig::get($style == 'dark' ? 'rrdgraph_def_text_color_dark' : 'rrdgraph_def_text_color'), '#'); + + preg_match_all('/-c ([A-Z]+)#([0-9A-Fa-f]{6,8})/', $defaults, $matches); + $colors = ['FONT' => $font]; + foreach ($matches[1] as $index => $key) { + $colors[$key] = $matches[2][$index]; + } + + // user overrides + if ($this->params->font_color) { + $colors['FONT'] = $this->params->font_color; + } + + if ($this->params->canvas) { + $colors['CANVAS'] = $this->params->canvas; + } + + if ($this->params->background) { + $colors['BACK'] = $this->params->background; + } + + return $colors; + } + + private function fitTitle(string $title): string + { + // linear approximation + $slope = 0.1332; + $intercept = 15.55; + $sizeAdjustment = 8 / $this->fontSize; // Adjust the slope if the font size deviates from 8 + $adjustedSlope = $slope * $sizeAdjustment; + + $maxChars = (int) floor($this->params->width * $adjustedSlope + $intercept); + + if ($maxChars <= 0) { + return ''; + } + + if (strlen($title) <= $maxChars) { + return $title; + } + + return substr($title, 0, max(0, $maxChars - 3)) . '...'; + } + + private function escape(string $input): string + { + return str_replace(["'", '"', "\n", "\r"], '', $input); + } +} diff --git a/app/Graphs/Rrd/RrdSeriesDefinition.php b/app/Graphs/Rrd/RrdSeriesDefinition.php new file mode 100644 index 00000000000..058b38afed2 --- /dev/null +++ b/app/Graphs/Rrd/RrdSeriesDefinition.php @@ -0,0 +1,223 @@ + legend columns and the value each one shows */ + private const array LEGEND_COLUMNS = [ + 'Now' => ['suffix' => '', 'cf' => 'LAST'], + 'Min' => ['suffix' => 'min', 'cf' => 'MIN'], + 'Max' => ['suffix' => 'max', 'cf' => 'MAX'], + 'Avg' => ['suffix' => '', 'cf' => 'AVERAGE'], + ]; + // a value is 5 digits and an SI prefix + private const int LEGEND_VALUE_WIDTH = 6; + // rrdtool separates legend items with 2 spaces + private const int LEGEND_COLUMN_GAP = 2; + // series labels start further right than the heading because of the color box + private const int LEGEND_COLOR_BOX_WIDTH = 2; + + private int $colorIndex = 0; + + /** + * @param array $series + */ + public function __construct( + private readonly array $series, + private readonly GraphOptions $options, + private readonly RrdFileResolver $rrdFiles, + ) { + } + + /** + * Series without an rrd file are left out + * + * @return array + * + * @throws NoGraphData when none of the rrd files exist + */ + public function build(GraphParameters $params): array + { + $defs = []; + $maxFills = []; + $fills = []; + $drawing = []; + $previousValues = []; + $stacking = false; + $inverted = false; + + $files = []; + foreach ($this->series as $key => $series) { + $filename = $this->rrdFiles->pathFor($series->metric); + + if ($filename !== null) { + $files[$key] = $filename; + } + } + + if ($files === []) { + throw new NoGraphData('No Data files'); + } + + $averaged = count(array_filter(array_keys($files), fn ($key) => $this->series[$key]->style->stackAverage)); + + $i = 0; + foreach ($files as $key => $filename) { + $series = $this->series[$key]; + $id = 'ds' . $i++; + $style = $series->style; + $drawScale = $style->stackAverage ? $style->drawScale / $averaged : $style->drawScale; + $color = $style->color ?? $this->nextColor(); + $label = Rrd::fixedSafeDescr($series->description, self::LABEL_WIDTH); + $inverted = $inverted || $style->invert; + + array_push($defs, ...$this->valueDefs($id, $filename, $series)); + $drawnId = $this->drawnValue($id, $drawScale, $style->invert, $defs); + + if ($style->stacked) { + $drawing[] = "AREA:$drawnId#$color:$label" . ($stacking ? ':STACK' : ''); + $stacking = true; + + if ($params->visible('previous')) { + array_push($defs, "DEF:{$id}prev=$filename:$series->field:AVERAGE:start=$params->prev_from:end=$params->from", "SHIFT:{$id}prev:$params->period"); + $previousValues[] = "{$id}prev,UN,0,{$id}prev,IF" . $this->scaleRpn($series->scale * $drawScale); + } + } else { + $drawing[] = "LINE1.25:$drawnId#$color:$label"; + if ($style->fill) { + $fills[] = "AREA:$drawnId#" . ($style->fillColor ?? $color . '20'); + } + if ($style->maxFillColor !== null) { + $maxFills[] = 'AREA:' . $this->drawnValue("{$id}max", $drawScale, $style->invert, $defs) . "#$style->maxFillColor"; + } + } + + array_push($drawing, ...$this->legendValues($id, $series->unit)); + } + + if ($previousValues) { + $defs[] = 'CDEF:previous=' . implode(',', $previousValues) . str_repeat(',+', count($previousValues) - 1); + array_push($drawing, 'AREA:previous#99999999:', 'LINE1.25:previous#666666:'); + } + + if ($inverted) { + $drawing[] = 'HRULE:0#555555'; + } + + // fills go below all lines, so they do not hide lines of other series + return [$this->legendHeader(), ...$defs, ...$maxFills, ...$fills, ...$drawing]; + } + + /** + * Define the average, min and max of a series as $id, {$id}min and {$id}max + * + * @return array + */ + private function valueDefs(string $id, string $filename, DataSeries $series): array + { + $defs = []; + $scale = $this->scaleRpn($series->scale); + + foreach (['' => 'AVERAGE', 'min' => 'MIN', 'max' => 'MAX'] as $suffix => $cf) { + if ($scale === '') { + $defs[] = "DEF:$id$suffix=$filename:$series->field:$cf"; + } else { + $defs[] = "DEF:{$id}raw$suffix=$filename:$series->field:$cf"; + $defs[] = "CDEF:$id$suffix={$id}raw$suffix$scale"; + } + } + + return $defs; + } + + /** + * Apply the draw only transformations of the style + * + * @param string $id the value to draw, such as ds0 or ds0max + * @param array $defs receives the definition, if one is needed + * @return string the id to draw + */ + private function drawnValue(string $id, float $drawScale, bool $invert, array &$defs): string + { + $scale = $this->scaleRpn($drawScale * ($invert && ! LibrenmsConfig::get('webui.graph_stacked') ? -1 : 1)); + + if ($scale === '') { + return $id; + } + + $defs[] = "CDEF:{$id}drawn=$id$scale"; + + return $id . 'drawn'; + } + + /** + * RPN suffix multiplying by the scale, empty when there is nothing to do + */ + private function scaleRpn(float $scale): string + { + return $scale == 1 ? '' : ",$scale,*"; + } + + private function nextColor(): string + { + $palette = $this->options->palette; + + if (! LibrenmsConfig::has("graph_colours.$palette.$this->colorIndex")) { + $this->colorIndex = 0; + } + + return LibrenmsConfig::get("graph_colours.$palette." . $this->colorIndex++); + } + + /** + * The legend title and a label above each column of values, aligned with the values + */ + private function legendHeader(): string + { + $unitWidth = max([0, ...array_map(fn (DataSeries $series) => strlen($series->unit), $this->series)]); + $columnWidth = self::LEGEND_VALUE_WIDTH + $unitWidth + self::LEGEND_COLUMN_GAP; + + $header = Rrd::fixedSafeDescr($this->options->legendTitle, self::LABEL_WIDTH); + $width = $columnWidth + self::LEGEND_COLOR_BOX_WIDTH; + + foreach (array_keys(self::LEGEND_COLUMNS) as $label) { + $header .= str_pad($label, $width, ' ', STR_PAD_LEFT); + $width = $columnWidth; + } + + return "COMMENT:$header\\l"; + } + + /** + * The legend values of a series, ending the legend line + * + * @return array + */ + private function legendValues(string $id, string $unit): array + { + $unit = str_replace(['%', ':'], ['%%', '\\:'], $unit); + $values = []; + + foreach (self::LEGEND_COLUMNS as $column) { + $values[] = "GPRINT:$id{$column['suffix']}:{$column['cf']}:%5." . self::PRECISION . "lf%s$unit"; + } + + $values[array_key_last($values)] .= '\\n'; + + return $values; + } +} diff --git a/app/Graphs/Vminfo/CpuGraph.php b/app/Graphs/Vminfo/CpuGraph.php new file mode 100644 index 00000000000..b6376ac0f2e --- /dev/null +++ b/app/Graphs/Vminfo/CpuGraph.php @@ -0,0 +1,22 @@ + new DataSeries($this->metric('vm.cpu'), 'usage', 'CPU Usage', '%', style: new SeriesStyle(fill: true)), + ]; + } + + protected function options(): GraphOptions + { + return new GraphOptions(scaleMin: 0, scaleMax: 100, legendTitle: 'CPU Usage %', palette: 'oranges'); + } +} diff --git a/app/Graphs/Vminfo/DiskGraph.php b/app/Graphs/Vminfo/DiskGraph.php new file mode 100644 index 00000000000..a39db591d83 --- /dev/null +++ b/app/Graphs/Vminfo/DiskGraph.php @@ -0,0 +1,25 @@ +metric('vm.disk'); + + return [ + 'used' => new DataSeries($metric, 'used', 'Used Disk', 'B', style: new SeriesStyle(color: 'CC0000', fill: true)), + 'total' => new DataSeries($metric, 'total', 'Total Disk', 'B', style: new SeriesStyle(color: '708090')), + ]; + } + + protected function options(): GraphOptions + { + return new GraphOptions(scaleMin: 0, base: 1024, legendTitle: 'Disk'); + } +} diff --git a/app/Graphs/Vminfo/DiskioBitsGraph.php b/app/Graphs/Vminfo/DiskioBitsGraph.php new file mode 100644 index 00000000000..ba4d8ce68a0 --- /dev/null +++ b/app/Graphs/Vminfo/DiskioBitsGraph.php @@ -0,0 +1,19 @@ +metric('vm.diskio'); + + return [ + 'read' => new DataSeries($metric, 'read_bytes', 'Read', 'bps', 8, new SeriesStyle(color: '75BA30', fill: true, fillColor: 'CAE853')), + 'write' => new DataSeries($metric, 'write_bytes', 'Write', 'bps', 8, new SeriesStyle(color: '6A6AB7', fill: true, fillColor: 'A9A9F2', invert: true)), + ]; + } +} diff --git a/app/Graphs/Vminfo/DiskioOpsGraph.php b/app/Graphs/Vminfo/DiskioOpsGraph.php new file mode 100644 index 00000000000..3276f431ea5 --- /dev/null +++ b/app/Graphs/Vminfo/DiskioOpsGraph.php @@ -0,0 +1,25 @@ +metric('vm.diskops'); + + return [ + 'read' => new DataSeries($metric, 'read_ops', 'Read', style: new SeriesStyle(color: '75BA30', fill: true, fillColor: 'CAE853')), + 'write' => new DataSeries($metric, 'write_ops', 'Write', style: new SeriesStyle(color: '6A6AB7', fill: true, fillColor: 'A9A9F2', invert: true)), + ]; + } + + protected function options(): GraphOptions + { + return new GraphOptions(legendTitle: 'Ops/sec'); + } +} diff --git a/app/Graphs/Vminfo/MemGraph.php b/app/Graphs/Vminfo/MemGraph.php new file mode 100644 index 00000000000..0cbc7dd61d4 --- /dev/null +++ b/app/Graphs/Vminfo/MemGraph.php @@ -0,0 +1,25 @@ +metric('vm.memory'); + + return [ + 'used' => new DataSeries($metric, 'used', 'Used Memory', 'B', style: new SeriesStyle(color: 'CC0000', fill: true)), + 'total' => new DataSeries($metric, 'total', 'Total Memory', 'B', style: new SeriesStyle(color: '708090')), + ]; + } + + protected function options(): GraphOptions + { + return new GraphOptions(scaleMin: 0, base: 1024, legendTitle: 'Memory'); + } +} diff --git a/app/Graphs/Vminfo/NetGraph.php b/app/Graphs/Vminfo/NetGraph.php new file mode 100644 index 00000000000..89961a84f4b --- /dev/null +++ b/app/Graphs/Vminfo/NetGraph.php @@ -0,0 +1,19 @@ +metric('vm.net'); + + return [ + 'in' => new DataSeries($metric, 'in', 'In', 'bps', 8, new SeriesStyle(color: '608720', fill: true, fillColor: '90B040', maxFillColor: 'D7FFC7')), + 'out' => new DataSeries($metric, 'out', 'Out', 'bps', 8, new SeriesStyle(color: '606090', fill: true, fillColor: '8080C0', maxFillColor: 'E0E0FF', invert: true)), + ]; + } +} diff --git a/app/Graphs/Vminfo/VminfoGraph.php b/app/Graphs/Vminfo/VminfoGraph.php new file mode 100644 index 00000000000..fb8229f3bfe --- /dev/null +++ b/app/Graphs/Vminfo/VminfoGraph.php @@ -0,0 +1,64 @@ +findVminfo(); + + return $vminfo !== null && $this->canView($vminfo); + } + + protected function validation(): array + { + return ['id' => 'required|integer']; + } + + public function getPageContext(): GraphPageContext + { + $vminfo = $this->findVminfo(); + + return new GraphPageContext($vminfo?->device, subtitle: $vminfo ? " :: VM :: $vminfo->vmwVmDisplayName" : null); + } + + public function getTitle(): string + { + $vminfo = $this->vminfo(); + + return $vminfo->device?->shortDisplayName() . '::' . $vminfo->vmwVmDisplayName; + } + + /** + * @throws NoGraphData + */ + protected function vminfo(): Vminfo + { + return $this->findVminfo() ?? throw new NoGraphData; + } + + /** + * @throws NoGraphData + */ + protected function metric(string $measurement): MetricIdentity + { + return $this->vminfo()->metricIdentity($measurement); + } + + private function findVminfo(): ?Vminfo + { + return $this->params->id === null ? null : ($this->vminfo ??= Vminfo::with('device')->find($this->params->id)); + } +} diff --git a/app/Horizon/JobMonitor.php b/app/Horizon/JobMonitor.php new file mode 100644 index 00000000000..8ec2c8a1b5f --- /dev/null +++ b/app/Horizon/JobMonitor.php @@ -0,0 +1,97 @@ +masters->names()); + } + + public static function deviceTag(int $device_id): string + { + return "device:$device_id"; + } + + public function isMonitoring(string $tag): bool + { + return in_array($tag, $this->tags->monitoring()); + } + + public function monitor(string $tag): void + { + $this->tags->monitor($tag); + } + + /** + * Stop monitoring and delete the recorded jobs + */ + public function stopMonitoring(string $tag): void + { + Bus::dispatchSync(new StopMonitoringTag($tag)); + } + + /** + * Jobs recorded for a monitored tag + * + * @return Collection> + */ + public function monitoredJobs(string $tag, int $limit = 50): Collection + { + return $this->jobs->getJobs($this->tags->paginate($tag, 0, $limit)) + ->map($this->present(...)) + ->values(); + } + + /** + * @return array + */ + private function present(object $job): array + { + $payload = json_decode((string) $job->payload, true) ?: []; + $started = $job->reserved_at ? Carbon::createFromTimestamp((float) $job->reserved_at) : null; + $finished = $job->failed_at ?: $job->completed_at; + $finished = $finished ? Carbon::createFromTimestamp((float) $finished) : null; + $exception = mb_convert_encoding((string) $job->exception, 'UTF-8'); + + return [ + 'id' => $job->id, + 'name' => class_basename((string) $job->name), + 'queue' => $job->queue, + // released jobs go back to pending, a pending job that already ran is a down device being retried + 'status' => $job->status == 'pending' && ($payload['attempts'] ?? 0) > 0 ? 'retrying' : $job->status, + 'device_id' => JobPayload::deviceId($payload), + 'attempts' => $payload['attempts'] ?? null, + 'started' => $started, + 'finished' => $finished, + 'runtime' => $started && $finished ? $started->diffInSeconds($finished) : null, + 'error' => FailedJobs::exceptionSummary($exception), + 'exception' => $exception, + 'retried' => ! empty($job->retried_by), + ]; + } +} diff --git a/app/Horizon/Supervisors.php b/app/Horizon/Supervisors.php new file mode 100644 index 00000000000..475d7561308 --- /dev/null +++ b/app/Horizon/Supervisors.php @@ -0,0 +1,140 @@ + WorkerNode::queues() type */ + private const array TYPES = ['supervisor-poll' => 'poller', 'supervisor-discovery' => 'discovery']; + /** seconds between checkins and checks for changed settings */ + private const int HEARTBEAT = 60; + + /** @var NodeSupervisors|null supervisor options used when horizon started */ + private ?array $started = null; + private int $nextCheck = 0; + private bool $reportedDetails = false; + + /** + * Horizon only works with the redis queue driver + */ + public static function supported(): bool + { + return config('queue.default') == 'redis'; + } + + /** + * Horizon master names start with this, it matches the node's settings on the pollers page + */ + public static function masterBasename(?string $node_id = null): string + { + return Str::slug($node_id ?? config('librenms.node_id') ?: gethostname()); + } + + /** + * Supervisors for the poll and discovery queues of the node's poller groups, null if disabled + * + * @return NodeSupervisors + */ + public static function forNode(PollerCluster $node): array + { + $queues = WorkerNode::queues($node); + + return array_map(fn (string $type): ?array => $queues[$type] === null ? null : [ + 'queue' => $queues[$type]['queues'], + 'maxProcesses' => $queues[$type]['workers'], + ], self::TYPES); + } + + /** + * Configure this node's supervisors, before the horizon command reads its config + */ + public function start(?PollerCluster $node = null): void + { + if (! config('librenms.node_id')) { + Log::warning('NODE_ID is not set in .env, this node will not show on the pollers page'); + } + + $this->started = self::forNode($node ?? WorkerNode::settings()); + + foreach ($this->started as $name => $options) { + if ($options === null) { + // every environment starts all supervisors in the defaults + config([ + 'horizon.defaults' => Arr::except(config('horizon.defaults'), $name), + 'horizon.environments' => array_map(fn (array $supervisors): array => Arr::except($supervisors, $name), config('horizon.environments')), + ]); + + continue; + } + + foreach ($options as $option => $value) { + config(["horizon.defaults.$name.$option" => $value]); + } + } + } + + /** + * Runs on every loop of the master supervisor (about every second) + */ + public function looped(MasterSupervisor $master): void + { + $now = time(); + if ($this->started === null || $now < $this->nextCheck) { + return; + } + $this->nextCheck = $now + self::HEARTBEAT; // set first, a failure is not retried every loop + $node = WorkerNode::settings(); + + // supervisors are only configured at start, the service starts Horizon again with the new settings + if (self::forNode($node) !== $this->started) { + Log::info('Poller settings for this node changed, stopping Horizon to apply them'); + $master->terminate(); + + return; + } + + $this->checkin($node); + } + + private function checkin(PollerCluster $node): void + { + if (! config('librenms.node_id')) { + return; // warned at start + } + + if (! $node->exists) { + $node->node_id = config('librenms.node_id'); + $node->poller_groups = (string) $node->getSettingValue('poller_groups'); + } + $node->poller_name = LibrenmsConfig::get('distributed_poller_name'); + $node->last_report = now(); + $node->master = false; // DispatchPollingWork runs on any one node, there is no master + // on the first checkin, Horizon starts again after an update + if (! $this->reportedDetails) { + $this->reportedDetails = true; + $node->poller_details = [ + 'librenms_version' => Version::get()->name(), + 'php_version' => PHP_VERSION, + 'os_version' => Version::get()->os(), + ]; + } + $node->save(); + } +} diff --git a/app/Http/Controllers/AboutController.php b/app/Http/Controllers/AboutController.php index 0b97a2c87e8..22ab1e3f1cf 100644 --- a/app/Http/Controllers/AboutController.php +++ b/app/Http/Controllers/AboutController.php @@ -66,8 +66,7 @@ public function index(Request $request) return view('about.index', [ 'usage_reporting_status' => LibrenmsConfig::get('reporting.usage'), - 'error_reporting_status' => LibrenmsConfig::get('reporting.error'), - 'reporting_clearable' => Callback::whereIn('name', ['uuid', 'error_reporting_uuid'])->exists(), + 'reporting_clearable' => Callback::where('name', 'uuid')->exists(), 'db_schema' => $version->database(), 'git_log' => $version->git->log(), diff --git a/app/Http/Controllers/Ajax/AlertDetailsController.php b/app/Http/Controllers/Ajax/AlertDetailsController.php index 88413f6c7c7..06db777ff2f 100644 --- a/app/Http/Controllers/Ajax/AlertDetailsController.php +++ b/app/Http/Controllers/Ajax/AlertDetailsController.php @@ -36,7 +36,7 @@ class AlertDetailsController use AuthorizesRequests; /** Max entity rows returned for the on-demand detail view to bound memory. */ - private const DETAIL_ROW_LIMIT = 1000; + private const int DETAIL_ROW_LIMIT = 1000; public function __invoke(AlertLog $alertLog): JsonResponse { diff --git a/app/Http/Controllers/Ajax/Search/ArpSearchController.php b/app/Http/Controllers/Ajax/Search/ArpSearchController.php index a35e3a54969..7770fb63ffb 100644 --- a/app/Http/Controllers/Ajax/Search/ArpSearchController.php +++ b/app/Http/Controllers/Ajax/Search/ArpSearchController.php @@ -71,7 +71,12 @@ protected function groups(string $search, string $like, int $limit, ?User $user) $results = $groups->map(fn ($g) => $this->formatResult($g, $devices->get($g->sample_device_id), $ports->get($g->sample_port_id))); - return [['type' => 'arp_tables', 'label' => __('search.arp_tables'), 'results' => $results]]; + return [[ + 'type' => 'arp_tables', + 'label' => __('search.arp_tables'), + 'url' => $this->addressSearchUrl($search, 'neighbor'), + 'results' => $results, + ]]; } /** @@ -95,7 +100,7 @@ private function formatResult(object $g, ?Device $device, ?Port $port): array $ip = IP::parse($g->address, true)?->compressed(); $url = $g->kind === 'arp' - ? Url::generate(['page' => 'search', 'search' => 'arp', 'searchPhrase' => $g->address]) + ? route('search', ['q' => $ip]) : Url::deviceUrl($device, ['tab' => 'ports', 'view' => 'nd']); return [ diff --git a/app/Http/Controllers/Ajax/Search/DevicesSearchController.php b/app/Http/Controllers/Ajax/Search/DevicesSearchController.php index 405f5b72fa2..44cc4c952de 100644 --- a/app/Http/Controllers/Ajax/Search/DevicesSearchController.php +++ b/app/Http/Controllers/Ajax/Search/DevicesSearchController.php @@ -70,6 +70,11 @@ protected function groups(string $search, string $like, int $limit, ?User $user) return [null]; } - return [['type' => 'devices', 'label' => __('search.devices'), 'results' => $results]]; + return [[ + 'type' => 'devices', + 'label' => __('search.devices'), + 'url' => route('devices', ['filter' => ['search' => ['contains' => $search]]]), + 'results' => $results, + ]]; } } diff --git a/app/Http/Controllers/Ajax/Search/FdbSearchController.php b/app/Http/Controllers/Ajax/Search/FdbSearchController.php index ad16457b01e..7f94f219335 100644 --- a/app/Http/Controllers/Ajax/Search/FdbSearchController.php +++ b/app/Http/Controllers/Ajax/Search/FdbSearchController.php @@ -9,7 +9,6 @@ use Illuminate\Support\Facades\DB; use LibreNMS\Util\IP; use LibreNMS\Util\Mac; -use LibreNMS\Util\Url; class FdbSearchController extends GroupedSearchController { @@ -29,7 +28,7 @@ protected function groups(string $search, string $like, int $limit, ?User $user) ->groupBy('port_id'); $fdb = PortsFdb::hasAccess($user) - ->select(['ports_fdb.ports_fdb_id', 'ports_fdb.mac_address', 'ports_fdb.port_id', 'ports_fdb.device_id', 'ports_fdb.vlan_id', 'mac_counts.mac_count']) + ->select(['ports_fdb.ports_fdb_id', 'ports_fdb.mac_address', 'ports_fdb.port_id', 'ports_fdb.device_id', 'ports_fdb.vlan', 'mac_counts.mac_count']) ->joinSub($macCountSubquery, 'mac_counts', function ($join): void { $join->on('ports_fdb.port_id', '=', 'mac_counts.port_id'); }) @@ -73,7 +72,7 @@ protected function groups(string $search, string $like, int $limit, ?User $user) ])), 'icon' => 'fa fa-plug', 'status' => $isConnected ? 'tw:border-l-green-600!' : null, - 'url' => Url::generate(['page' => 'search', 'search' => 'fdb', 'searchPhrase' => $portsFdb->mac_address]), + 'url' => route('search', ['q' => Mac::parse($portsFdb->mac_address)->readable()]), ]; }); @@ -81,6 +80,11 @@ protected function groups(string $search, string $like, int $limit, ?User $user) return [null]; } - return [['type' => 'fdb_tables', 'label' => __('search.fdb_tables'), 'results' => $fdb]]; + return [[ + 'type' => 'fdb_tables', + 'label' => __('search.fdb_tables'), + 'url' => $this->addressSearchUrl($search, 'fdb'), + 'results' => $fdb, + ]]; } } diff --git a/app/Http/Controllers/Ajax/Search/GroupedSearchController.php b/app/Http/Controllers/Ajax/Search/GroupedSearchController.php index 58c4617ffcf..74207523a76 100644 --- a/app/Http/Controllers/Ajax/Search/GroupedSearchController.php +++ b/app/Http/Controllers/Ajax/Search/GroupedSearchController.php @@ -7,6 +7,7 @@ use App\Models\User; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; +use LibreNMS\Util\SearchTerm; abstract class GroupedSearchController extends Controller { @@ -28,9 +29,19 @@ public function __invoke(Request $request): JsonResponse } /** - * Return a list of groups, each ['type' => ..., 'label' => ..., 'results' => Collection], or null for empty groups. + * Return a list of groups, each ['type' => ..., 'label' => ..., 'url' => optional page with all results, 'results' => Collection], or null for empty groups. * * @return list */ abstract protected function groups(string $search, string $like, int $limit, ?User $user): array; + + /** + * The search page with all results of this source, it needs a longer MAC fragment than the global search does + */ + protected function addressSearchUrl(string $search, string $source): ?string + { + $term = SearchTerm::parse($search); + + return $term->isMac() || $term->isIp() ? route('search', ['q' => $search, 'filter' => ['source' => ['eq' => $source]]]) : null; + } } diff --git a/app/Http/Controllers/Ajax/Search/PortsSearchController.php b/app/Http/Controllers/Ajax/Search/PortsSearchController.php index fb74b442c65..f94f273f5c3 100644 --- a/app/Http/Controllers/Ajax/Search/PortsSearchController.php +++ b/app/Http/Controllers/Ajax/Search/PortsSearchController.php @@ -49,6 +49,11 @@ protected function groups(string $search, string $like, int $limit, ?User $user) 'url' => Url::portUrl($port), ]); - return [$ports->isEmpty() ? null : ['type' => 'ports', 'label' => __('search.ports'), 'results' => $ports]]; + return [$ports->isEmpty() ? null : [ + 'type' => 'ports', + 'label' => __('search.ports'), + 'url' => route('ports', ['filter' => ['search' => ['contains' => $search]]]), + 'results' => $ports, + ]]; } } diff --git a/app/Http/Controllers/AlertController.php b/app/Http/Controllers/AlertController.php index bbdb1ba336b..a11f4476256 100644 --- a/app/Http/Controllers/AlertController.php +++ b/app/Http/Controllers/AlertController.php @@ -74,7 +74,7 @@ public function ack(Request $request, AlertFault $fault): \Illuminate\Http\JsonR if ($saved) { $fault->loadMissing('rule'); if ($fault->rule) { - (new AlertRules($fault->device_id))->syncAlertState($fault->rule); + new AlertRules($fault->device_id)->syncAlertState($fault->rule); } $rule_name = $fault->rule?->name; diff --git a/app/Http/Controllers/AlertRuleController.php b/app/Http/Controllers/AlertRuleController.php index 7ea9c1efe95..94d0b46de69 100644 --- a/app/Http/Controllers/AlertRuleController.php +++ b/app/Http/Controllers/AlertRuleController.php @@ -151,7 +151,7 @@ private function formatDeviceMaps(AlertRule $alertRule): array foreach ($alertRule->devices as $device) { $maps[] = [ 'id' => $device->device_id, - 'text' => $device->displayName(), + 'text' => $device->display, ]; } diff --git a/app/Http/Controllers/AuthLogController.php b/app/Http/Controllers/AuthLogController.php index 306f6ede6d5..987eecc9f7e 100644 --- a/app/Http/Controllers/AuthLogController.php +++ b/app/Http/Controllers/AuthLogController.php @@ -15,7 +15,7 @@ public function index(): View $this->authorize('auth-log.view'); return view('user.authlog', [ - 'authlog' => AuthLog::orderBy('datetime', 'DESC')->get(), + 'authlog' => AuthLog::orderBy('datetime', 'desc')->get(), ]); } } diff --git a/app/Http/Controllers/Device/AddDeviceController.php b/app/Http/Controllers/Device/AddDeviceController.php index 6b7c788ab27..ba35b1e411e 100644 --- a/app/Http/Controllers/Device/AddDeviceController.php +++ b/app/Http/Controllers/Device/AddDeviceController.php @@ -11,10 +11,12 @@ use App\Models\DevicePollingMethod; use App\Models\PollerGroup; use App\Models\Secret; +use App\View\PollingMethodSecretForm; use Illuminate\Contracts\View\View; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; +use Illuminate\Validation\ValidationException; use LibreNMS\Enum\PollingMethodType; use LibreNMS\Exceptions\HostExistsException; use LibreNMS\Exceptions\HostIpExistsException; @@ -66,18 +68,21 @@ public function index(Request $request): View { $this->authorize('create', Device::class); - $availableMethods = collect(PollingMethodType::cases())->map(function (PollingMethodType $type): array { + $secrets = Secret::query() + ->hasAccess($request->user()) + ->orderBy('description') + ->get(['id', 'description', 'secret_type']); + + $availableMethods = collect(PollingMethodType::known())->map(function (PollingMethodType $type) use ($secrets): array { $method = $this->pollingMethods->get($type); $definition = $method->definition(); - $secretDefinition = $method->secretType()?->definition(); return [ 'type' => $type->value, 'label' => $type->label(), 'icon' => $definition->icon(), - 'schema_fields' => $secretDefinition?->buildSchemaFields(dataVar: "methods['" . $type->value . "'].formData") ?? [], - 'schema_defaults' => $secretDefinition?->schemaDefaults() ?? [], - 'settings_fields' => $definition->settingsFields($method->defaults(), "methods['" . $type->value . "'].settingsData"), + ...PollingMethodSecretForm::make($method, $secrets, "methods['" . $type->value . "'].formData"), + 'settings_fields' => $definition->settingsFields($method->defaults(), "methods['" . $type->value . "'].settingsData", "secretTypes['" . $type->value . "']"), 'settings_keys' => array_keys($definition->fields()), 'default_affects_availability' => $method->defaultAffectsAvailability(), ]; @@ -93,7 +98,7 @@ public function index(Request $request): View $defaultDisplayTemplate = LibrenmsConfig::get('device_display_default', '{{ $hostname }}'); $addDeviceConfig = [ - 'hostname' => old('hostname', ''), + 'hostname' => old('hostname', is_string($request->query('hostname')) ? $request->query('hostname') : ''), 'display_template' => old('display_template', ''), 'default_display_template' => $defaultDisplayTemplate, 'display_variables' => $this->displayVariables(), @@ -111,11 +116,13 @@ public function index(Request $request): View 'affects_availability' => old("polling_methods.{$type}.affects_availability") !== null ? (bool) old("polling_methods.{$type}.affects_availability") : $method['default_affects_availability'], 'secret_mode' => old("polling_methods.{$type}.secret_mode", 'default'), 'secret_id' => old("polling_methods.{$type}.secret_id", ''), + 'secret_type' => old("polling_methods.{$type}.secret_type", $method['secret_types'][0]['type'] ?? ''), 'description' => old("polling_methods.{$type}.description", ''), - 'formData' => old("polling_methods.{$type}.secret_data", $method['schema_defaults'] ?? []), + 'formData' => old("polling_methods.{$type}.secret_data") ?: $method['schema_defaults'], 'settingsData' => old("polling_methods.{$type}.settings", array_fill_keys($method['settings_keys'], '')), ]]; })->all(), + 'secret_type_by_id' => collect($availableMethods)->mapWithKeys(fn (array $m) => [$m['type'] => (object) $m['secret_type_by_id']])->all(), 'all_types' => collect($availableMethods)->map(fn ($m) => ['type' => $m['type'], 'label' => $m['label']])->values()->all(), 'store_url' => route('device.add.store'), ]; @@ -127,11 +134,6 @@ public function index(Request $request): View 'oldActiveMethods' => $oldActiveMethods, 'default_display_template' => $defaultDisplayTemplate, 'add_device_config' => $addDeviceConfig, - 'availableSecrets' => Secret::query() - ->hasAccess($request->user()) - ->orderBy('description') - ->get(['id', 'description', 'secret_type']) - ->groupBy(fn (Secret $s): string => $s->secret_type->value), ]); } @@ -159,7 +161,7 @@ public function store(StoreDeviceRequest $request, ToastInterface $toast, BuildD /** @var array> $rawMethods */ $rawMethods = $validated['polling_methods'] ?? []; - $pollingMethods = $buildMethods->execute($device, ['methods' => $rawMethods]); + $pollingMethods = $buildMethods->execute($device, ['methods' => $rawMethods], 'polling_methods.'); if ($pollingMethods->isEmpty()) { return response()->json([ @@ -209,6 +211,8 @@ public function store(StoreDeviceRequest $request, ToastInterface $toast, BuildD 'message' => $e->getMessage(), 'errors' => ['hostname' => [$e->getMessage()]], ], 422); + } catch (ValidationException $e) { + throw $e; } catch (\Throwable $e) { report($e); diff --git a/app/Http/Controllers/Device/EditDeviceController.php b/app/Http/Controllers/Device/EditDeviceController.php index fbeaf397995..94d6d4f2050 100644 --- a/app/Http/Controllers/Device/EditDeviceController.php +++ b/app/Http/Controllers/Device/EditDeviceController.php @@ -35,6 +35,7 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Http\RedirectResponse; use Illuminate\Support\Facades\DB; +use LibreNMS\Enum\DeviceType; use LibreNMS\Enum\MaintenanceBehavior; use LibreNMS\Enum\PollingMethodType; use LibreNMS\Exceptions\HostRenameException; @@ -47,14 +48,8 @@ public function index(Device $device): View { $this->authorize('update', $device); - $types = collect(LibrenmsConfig::get('device_types'))->keyBy('type'); - if (! $types->has($device->type)) { - $types->put($device->type, [ - 'icon' => null, - 'text' => ucfirst($device->type), - 'type' => $device->type, - ]); - } + $types = DeviceType::icons(); + $types[$device->type] ??= null; $alertSchedules = $device->alertSchedules()->isActive()->get(); $isUnderMaintenance = $alertSchedules->isNotEmpty(); @@ -77,7 +72,7 @@ public function index(Device $device): View 'static_groups' => $static_groups, 'types' => $types, 'default_type' => LibrenmsConfig::getOsSetting($device->os, 'type'), - 'parents' => $device->parents()->select(['devices.device_id', 'hostname', 'sysName', 'ip', 'overwrite_ip', 'display'])->get()->mapWithKeys(fn ($parent) => [$parent->device_id => $parent->displayName()]), + 'parents' => $device->parents()->select(['devices.device_id', 'hostname', 'sysName', 'ip', 'overwrite_ip', 'display'])->get()->mapWithKeys(fn ($parent) => [$parent->device_id => $parent->display]), 'poller_groups' => PollerGroup::orderBy('group_name')->pluck('group_name', 'id'), 'default_poller_group' => LibrenmsConfig::get('distributed_poller_group'), 'override_sysContact_bool' => $device->getAttrib('override_sysContact_bool'), diff --git a/app/Http/Controllers/Device/EditModulesController.php b/app/Http/Controllers/Device/EditModulesController.php index 8570169c50e..d374a6c5634 100644 --- a/app/Http/Controllers/Device/EditModulesController.php +++ b/app/Http/Controllers/Device/EditModulesController.php @@ -33,7 +33,9 @@ use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Lang; +use LibreNMS\Enum\ProcessType; use LibreNMS\Util\Module; +use LibreNMS\Util\ModuleList; class EditModulesController { @@ -42,7 +44,7 @@ class EditModulesController /** * @var array */ - private const TYPES = [ + private const array TYPES = [ 'polling' => ['config' => 'poller_modules', 'attrib' => 'poll_'], 'discovery' => ['config' => 'discovery_modules', 'attrib' => 'discover_'], ]; @@ -52,10 +54,12 @@ public function index(Device $device): View $this->authorize('update', $device); $attribs = $device->getAttribs(); + $toggleable = $this->toggleable($device); + $moduleList = new ModuleList; $modules = []; foreach (self::TYPES as $type => ['config' => $configKey, 'attrib' => $attribPrefix]) { - foreach ($this->modules($configKey) as $module => $globalEnabled) { + foreach (array_intersect_key($this->modules($configKey), $toggleable) as $module => $globalEnabled) { $osEnabled = LibrenmsConfig::has("os.$device->os.$configKey.$module") ? (bool) LibrenmsConfig::get("os.$device->os.$configKey.$module") : null; @@ -64,6 +68,7 @@ public function index(Device $device): View $modules[$module][$type] = [ 'global' => (bool) $globalEnabled, 'os' => $osEnabled, + 'method' => $moduleList->methodSetting($module, $device), 'device' => $deviceEnabled, ]; } @@ -75,7 +80,7 @@ public function index(Device $device): View $modules[$module] = [ 'module' => $module, 'name' => $this->moduleName($module), - 'has_data' => Module::fromName($module)->dataExists($device), + 'has_data' => $toggleable[$module], 'discovery' => $settings['discovery'] ?? null, 'polling' => $settings['polling'] ?? null, ]; @@ -111,9 +116,11 @@ public function update(Request $request, Device $device, string $module): JsonRe } // return the effective module status + $moduleList = new ModuleList; + return response()->json([ - 'discovery' => (bool) $device->getAttrib('discover_' . $module, LibrenmsConfig::getCombined($device->os, 'discovery_modules')[$module] ?? false), - 'polling' => (bool) $device->getAttrib('poll_' . $module, LibrenmsConfig::getCombined($device->os, 'poller_modules')[$module] ?? false), + 'discovery' => $moduleList->moduleStatus(ProcessType::Discovery, $module, $device)->isEnabled(), + 'polling' => $moduleList->moduleStatus(ProcessType::Poller, $module, $device)->isEnabled(), ]); } @@ -128,6 +135,28 @@ public function delete(Device $device, string $module): JsonResponse ]); } + /** + * Modules that can be enabled or disabled for the device, with whether each has data for the device. + * Those that can use a polling method enabled on the device, or still have data to delete. + * + * @return array + */ + private function toggleable(Device $device): array + { + $toggleable = []; + + foreach (array_keys($this->modules('poller_modules') + $this->modules('discovery_modules')) as $module) { + $instance = Module::fromName($module); + $hasData = $instance->dataExists($device); + + if ($hasData || $device->polling()->anyEnabled($instance->pollingMethods($device))) { + $toggleable[$module] = $hasData; + } + } + + return $toggleable; + } + private function moduleName(string $module): string { foreach (self::TYPES as ['config' => $configKey]) { diff --git a/app/Http/Controllers/Device/EditPollingController.php b/app/Http/Controllers/Device/EditPollingController.php index 2a426acc33a..289d3275f25 100644 --- a/app/Http/Controllers/Device/EditPollingController.php +++ b/app/Http/Controllers/Device/EditPollingController.php @@ -2,13 +2,16 @@ namespace App\Http\Controllers\Device; +use App\Actions\Device\DiscoverPollingMethod; use App\Actions\Device\ResolvePollingMethodSecret; use App\Actions\Device\SetDeviceAvailability; +use App\Facades\LibrenmsConfig; use App\Http\Interfaces\ToastInterface; use App\Http\Requests\SavePollingMethodRequest; use App\Models\Device; use App\Models\DevicePollingMethod; use App\Models\Secret; +use App\View\PollingMethodSecretForm; use Illuminate\Auth\Access\AuthorizationException; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Http\JsonResponse; @@ -18,8 +21,10 @@ use Illuminate\Support\Facades\DB; use Illuminate\View\View; use LibreNMS\Enum\PollingMethodType; +use LibreNMS\Interfaces\RemovesMethodData; use LibreNMS\Polling\Method\PollingMethodRegistry; use LibreNMS\Polling\Method\ProbeResult; +use LibreNMS\Util\Module; class EditPollingController { @@ -28,6 +33,7 @@ class EditPollingController public function __construct( private readonly PollingMethodRegistry $pollingMethods, private readonly ResolvePollingMethodSecret $resolveSecret, + private readonly DiscoverPollingMethod $discoverMethod, ) { } @@ -40,19 +46,20 @@ public function index(Device $device): View $device->load('pollingMethods.secret'); - $allMethods = collect(PollingMethodType::cases())->map( - fn (PollingMethodType $type): array => $this->buildMethodData($device, $type) + $secrets = Secret::query() + ->when(auth()->user(), fn ($q, $user) => $q->hasAccess($user)) + ->orderBy('description') + ->get(['id', 'description', 'secret_type']); + + $allMethods = collect(PollingMethodType::known())->map( + fn (PollingMethodType $type): array => $this->buildMethodData($device, $type, $secrets) ); return view('device.edit.polling', [ 'device' => $device, 'allMethods' => $allMethods, + 'unknownMethods' => $device->pollingMethods->where('method_type', PollingMethodType::Unknown)->values(), 'tabsConfig' => $this->buildTabsConfig($allMethods), - 'availableSecrets' => Secret::query() - ->when(auth()->user(), fn ($q, $user) => $q->hasAccess($user)) - ->orderBy('description') - ->get(['id', 'description', 'secret_type']) - ->groupBy(fn (Secret $s): string => $s->secret_type->value), ]); } @@ -67,7 +74,7 @@ private function buildTabsConfig(Collection $allMethods): array $configuredMethods = $allMethods->filter(fn (array $m): bool => $m['configured'])->values(); $snmpConfigured = $configuredMethods->firstWhere('type', PollingMethodType::Snmp->value); $defaultTab = ($snmpConfigured && ! empty($snmpConfigured['enabled'])) ? PollingMethodType::Snmp->value : $configuredMethods->first()['type'] ?? ''; - $initialTab = PollingMethodType::tryFrom((string) request('tab'))->value ?? $defaultTab; + $initialTab = PollingMethodType::tryFromKnown((string) request('tab'))->value ?? $defaultTab; $activeMethods = $configuredMethods->pluck('type'); if ($initialTab !== '' && ! $activeMethods->contains($initialTab)) { @@ -92,28 +99,26 @@ private function buildTabsConfig(Collection $allMethods): array /** * Form data for a method. Secret values are not included, the form loads them when needed. * + * @param Collection|null $secrets the secrets to pick from, the ones this method can use are included * @return array */ - private function buildMethodData(Device $device, PollingMethodType $type): array + private function buildMethodData(Device $device, PollingMethodType $type, ?Collection $secrets = null): array { $method = $this->pollingMethods->get($type); $definition = $method->definition(); /** @var DevicePollingMethod|null $row */ $row = $device->pollingMethods->firstWhere('method_type', $type); - $secretType = $method->secretType(); - $secretDefinition = $secretType?->definition(); return [ 'type' => $type->value, 'label' => $type->label(), 'icon' => $definition->icon(), - 'schema_fields' => $secretDefinition?->buildSchemaFields() ?? [], - 'schema_defaults' => $secretDefinition?->schemaDefaults() ?? [], - 'settings_fields' => $definition->settingsFields($method->defaults($device)), - 'settings' => [...array_fill_keys(array_keys($definition->fields()), ''), ...$row->settings ?? []], + ...PollingMethodSecretForm::make($method, $secrets), + 'settings_fields' => $definition->settingsFields($method->defaults($device), secretTypeVar: 'currentSecretType'), + 'settings' => $definition->formValues($row->settings ?? []), 'affects_availability' => $row ? $row->affects_availability : $method->defaultAffectsAvailability(), - 'secret' => $row?->secret ? ['id' => $row->secret->id, 'description' => $row->secret->description] : null, - 'default_secret_description' => $secretType ? Secret::defaultDescription($type, $device->hostname) : null, + 'secret' => $row?->secret ? ['id' => $row->secret->id, 'description' => $row->secret->description, 'secret_type' => $row->secret->typeName()] : null, + 'default_secret_description' => $method->secretTypes() ? Secret::defaultDescription($type, $device->hostname) : null, 'configured' => $row !== null, 'enabled' => $row ? $row->enabled : true, 'last_check_successful' => $row?->last_check_successful, @@ -158,11 +163,13 @@ public function destroy(Device $device, string $methodType, ToastInterface $toas { $this->authorize('update', $device); - $type = PollingMethodType::tryFrom($methodType) ?? abort(404); - $pollingMethod = $device->pollingMethod($type) ?? abort(404); + // by stored type, so unknown methods can be removed too + $pollingMethod = $device->pollingMethods->first(fn (DevicePollingMethod $m): bool => $m->typeName() === $methodType) ?? abort(404); + $type = $pollingMethod->method_type; $pollingMethod->delete(); $device->unsetRelation('pollingMethods'); + $this->removeMethodData($device, $type); $setDeviceAvailability->execute($device); @@ -170,13 +177,13 @@ public function destroy(Device $device, string $methodType, ToastInterface $toas return response()->json([ 'status' => 'ok', 'message' => __('poller.method_removed'), - 'default_secret_description' => $this->pollingMethods->get($type)->secretType() ? Secret::defaultDescription($type, $device->hostname) : null, + 'default_secret_description' => $this->pollingMethods->get($type)->secretTypes() ? Secret::defaultDescription($type, $device->hostname) : null, ]); } $toast->success(__('poller.method_removed')); - return redirect()->route('device.edit.polling', ['device' => $device, 'tab' => $type->value]); + return redirect()->route('device.edit.polling', ['device' => $device, 'tab' => $type === PollingMethodType::Unknown ? null : $type->value]); } /** @@ -216,8 +223,10 @@ private function save( } $deviceMethod->setRelation('device', $device); + $method->validate($deviceMethod); + if ($deviceMethod->enabled) { - $probeResult = $request->boolean('force_save') ? null : $method->discover($device, $deviceMethod); + $probeResult = $request->boolean('force_save') ? null : $this->discoverMethod->execute($device, $deviceMethod); if ($probeResult && ! $probeResult->isSuccess()) { return $this->reachabilityFailedResponse($request, $device, $type, $probeResult, $toast); } @@ -253,6 +262,20 @@ private function save( return redirect()->route('device.edit.polling', ['device' => $device, 'tab' => $type->value]); } + /** + * Modules delete the data of a removed method, nothing else would: without the method they may not run again. + */ + private function removeMethodData(Device $device, PollingMethodType $type): void + { + foreach (array_keys(LibrenmsConfig::get('poller_modules', []) + LibrenmsConfig::get('discovery_modules', [])) as $name) { + $module = Module::fromName($name); + + if ($module instanceof RemovesMethodData) { + $module->removeMethodData($device, $type); + } + } + } + private function reachabilityFailedResponse( Request $request, Device $device, diff --git a/app/Http/Controllers/Device/EditPortsController.php b/app/Http/Controllers/Device/EditPortsController.php index 96d42f6745b..6d9ccd0c8f9 100644 --- a/app/Http/Controllers/Device/EditPortsController.php +++ b/app/Http/Controllers/Device/EditPortsController.php @@ -42,6 +42,7 @@ use LibreNMS\Enum\IfOperStatus; use LibreNMS\Enum\Severity; use LibreNMS\Polling\ModuleStatus; +use LibreNMS\RRD\PortRrd; use LibreNMS\Util\Url; class EditPortsController @@ -53,7 +54,7 @@ class EditPortsController * * @var array */ - private const SORT_FIELDS = [ + private const array SORT_FIELDS = [ 'ifIndex' => 'ifIndex', 'ifName' => 'ifName', 'ifOperStatus' => 'ifOperStatus', @@ -66,21 +67,21 @@ class EditPortsController * * @var array */ - private const BULK_UPDATES = [ + private const array BULK_UPDATES = [ 'disable' => ['disabled', 1], 'enable' => ['disabled', 0], 'ignore' => ['ignore', 1], 'unignore' => ['ignore', 0], ]; - private const POLLING_STATES = ['polled', 'not_polled', 'skipped']; + private const array POLLING_STATES = ['polled', 'not_polled', 'skipped']; /** * Device settings on this page, request key => device attrib * * @var array */ - private const SETTINGS = [ + private const array SETTINGS = [ 'selected_ports' => 'selected_ports', 'rrd_tune' => 'override_rrdtool_tune', ]; @@ -504,7 +505,7 @@ private function updateSpeed(Device $device, Port $port, ?int $speed): void $portTune = $device->getAttrib('ifName_tune:' . $port->ifName); if ($portTune === null ? $this->rrdTuneStatus($device)->isEnabled() : $portTune === 'true') { - Rrd::tune('port', Rrd::name($device->hostname, Rrd::portName($port->port_id)), $speed); + Rrd::tune(Rrd::name($device->hostname, Rrd::portName($port->port_id)), PortRrd::tuneLimits($speed)); } } diff --git a/app/Http/Controllers/Device/EditProcessorsController.php b/app/Http/Controllers/Device/EditProcessorsController.php index 771fab38829..4c87830a8b9 100644 --- a/app/Http/Controllers/Device/EditProcessorsController.php +++ b/app/Http/Controllers/Device/EditProcessorsController.php @@ -59,11 +59,15 @@ public function update(Request $request, Device $device, Processor $processor): } $validated = $request->validate([ - 'processor_perc_warn' => 'nullable|numeric|between:0,100', + 'processor_perc_warn_custom' => 'nullable|numeric|between:0,100', ]); - $warnPercent = $validated['processor_perc_warn'] ?? null; - $processor->processor_perc_warn = $warnPercent === null ? null : (int) round((float) $warnPercent); + // empty clears the user threshold, the default threshold is used until discovery sets the discovered one + $custom = $validated['processor_perc_warn_custom'] ?? null; + $processor->processor_perc_warn_custom = $custom === null ? null : (int) round((float) $custom); + if ($custom === null) { + $processor->processor_perc_warn = null; + } if ($processor->save()) { return response()->json([ diff --git a/app/Http/Controllers/Device/EditRoutingController.php b/app/Http/Controllers/Device/EditRoutingController.php index 32cc747d67b..eb4a2e224b4 100644 --- a/app/Http/Controllers/Device/EditRoutingController.php +++ b/app/Http/Controllers/Device/EditRoutingController.php @@ -28,12 +28,14 @@ use App\Models\BgpPeer; use App\Models\Device; +use App\Models\Vrf as VrfModel; +use Closure; use Illuminate\Contracts\View\View; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Http\JsonResponse; -use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Gate; +use Illuminate\Validation\ValidationException; class EditRoutingController { @@ -43,11 +45,9 @@ public function index(Device $device): View { $this->authorize('update', $device); - $snmpContexts = json_decode((string) $device->getAttrib('routing_snmp_contexts', '[]'), true); - return view('device.edit.routing', [ 'device' => $device, - 'snmp_contexts' => is_array($snmpContexts) ? $snmpContexts : [], + 'vrfs' => $this->vrfs($device), 'peers' => $device->bgppeers() ->orderBy('bgpPeerRemoteAs') ->orderBy('bgpPeerIdentifier') @@ -56,34 +56,140 @@ public function index(Device $device): View ]); } - public function updateContexts(Request $request, Device $device): RedirectResponse + /** + * Add a VRF the device does not list through its SNMP context + */ + public function storeVrf(Request $request, Device $device): JsonResponse { $this->authorize('update', $device); $validated = $request->validate([ - 'snmp_contexts' => 'nullable|array', - 'snmp_contexts.*' => 'nullable|string|max:255', + 'context' => ['bail', 'required', 'string', 'max:128', $this->unusedContext($device), function (string $attribute, string $value, Closure $fail) use ($device): void { + if (VrfModel::isDefaultName($value)) { + $fail(__('The default VRF is polled without a context.')); + + return; + } + + $vrf = $device->vrfs->first(fn (VrfModel $vrf) => strcasecmp((string) $vrf->vrf_name, $value) == 0); + if ($vrf !== null) { + $fail(__('VRF :vrf exists, set its context in the table.', ['vrf' => $vrf->vrf_name])); + } + }], ]); - /** @var array $submittedContexts */ - $submittedContexts = $validated['snmp_contexts'] ?? []; + $vrf = $device->vrfs()->create([ + 'vrf_oid' => VrfModel::contextOnlyOid($validated['context']), + 'vrf_name' => $validated['context'], + 'context_name' => $validated['context'], + 'context_manual' => true, + 'vrf_manual' => true, + 'mplsVpnVrfDescription' => '', + ]); - $snmpContexts = collect($submittedContexts) - ->map(fn (?string $context) => trim((string) $context)) - ->filter() - ->unique() - ->values() - ->all(); + return response()->json([ + 'message' => __('VRF :vrf added', ['vrf' => $vrf->vrf_name]), + 'vrfs' => $this->vrfs($device), + ]); + } - if ($snmpContexts !== []) { - $device->setAttrib('routing_snmp_contexts', json_encode($snmpContexts)); - } else { - $device->forgetAttrib('routing_snmp_contexts'); + public function updateVrf(Request $request, Device $device, VrfModel $vrf): JsonResponse + { + $this->authorize('update', $device); + + $validated = $request->validate([ + 'context_enabled' => 'sometimes|boolean', + 'context_name' => ['sometimes', 'nullable', 'string', 'max:128', $this->unusedContext($device, $vrf)], + ]); + + if (array_key_exists('context_name', $validated)) { + if (! $this->contextEditable($vrf)) { + throw ValidationException::withMessages(['context_name' => __('The context of VRF :vrf cannot be changed.', ['vrf' => $vrf->vrf_name])]); + } + + if ($validated['context_name'] !== $vrf->context_name) { + // the next discovery checks the context before it is walked + $vrf->fill(['context_name' => $validated['context_name'], 'context_manual' => $validated['context_name'] !== null, 'context_verified' => false, 'context_failures' => 0]); + } + } + + if (array_key_exists('context_enabled', $validated)) { + $vrf->context_enabled = (bool) $validated['context_enabled']; } - toast()->success(__('SNMP contexts updated')); + $vrf->save(); + + return response()->json($this->vrfData($device, $vrf)); + } + + /** + * Remove a VRF only known through its SNMP context + */ + public function destroyVrf(Device $device, VrfModel $vrf): JsonResponse + { + $this->authorize('update', $device); + abort_unless($vrf->vrf_manual, 422, __('VRF :vrf is listed by the device.', ['vrf' => $vrf->vrf_name])); + + $vrf->delete(); - return response()->redirectToRoute('device.edit.routing', ['device' => $device->device_id]); + return response()->json([ + 'vrfs' => $this->vrfs($device), + ]); + } + + /** + * A context exposes a single VRF. SNMP contexts are case-sensitive. + */ + private function unusedContext(Device $device, ?VrfModel $except = null): Closure + { + return function (string $attribute, mixed $value, Closure $fail) use ($device, $except): void { + $vrf = $device->vrfs->first(fn (VrfModel $vrf) => $vrf->context_name === $value && $vrf->vrf_id !== $except?->vrf_id); + if ($vrf !== null) { + $fail(__('Context :context is used by VRF :vrf.', ['context' => $value, 'vrf' => $vrf->vrf_name])); + } + }; + } + + /** + * Users set the context of VRFs the device lists without a context. + * Contexts the device maps and the context of VRFs only known through it are fixed. + */ + private function contextEditable(VrfModel $vrf): bool + { + return ! $vrf->isDefault() && ! $vrf->vrf_manual && ($vrf->context_name === null || $vrf->context_manual); + } + + /** + * @return array> + */ + private function vrfs(Device $device): array + { + return $device->vrfs()->orderBy('vrf_name')->get()->map(fn (VrfModel $vrf) => $this->vrfData($device, $vrf))->all(); + } + + /** + * @return array{name: string|null, rd: string|null, context: string|null, context_only: bool, device_context: bool, enabled: bool, editable: bool, status: string, update_url: string, destroy_url: string} + */ + private function vrfData(Device $device, VrfModel $vrf): array + { + return [ + 'name' => $vrf->vrf_name, + 'rd' => $vrf->mplsVpnVrfRouteDistinguisher, + 'context' => $vrf->context_name, + 'context_only' => $vrf->vrf_manual, + 'device_context' => $vrf->context_name !== null && ! $vrf->context_manual, + 'enabled' => $vrf->context_enabled, + 'editable' => $this->contextEditable($vrf), + 'status' => match (true) { + $vrf->context_name === null => 'none', + ! $vrf->context_enabled => 'disabled', + $vrf->context_verified => 'answering', + $vrf->context_failures == 0 => 'waiting', + default => 'failing', + }, + 'update_url' => route('device.edit.routing.vrf.update', [$device, $vrf]), + 'destroy_url' => route('device.edit.routing.vrf.destroy', [$device, $vrf]), + ]; } public function updatePeer(Request $request, Device $device, BgpPeer $bgpPeer): JsonResponse diff --git a/app/Http/Controllers/Device/EditWirelessSensorsController.php b/app/Http/Controllers/Device/EditWirelessSensorsController.php index 3df553fde4a..046376de02c 100644 --- a/app/Http/Controllers/Device/EditWirelessSensorsController.php +++ b/app/Http/Controllers/Device/EditWirelessSensorsController.php @@ -43,7 +43,7 @@ class EditWirelessSensorsController * * @var array */ - private const CLEARED_LIMITS = [ + private const array CLEARED_LIMITS = [ 'sensor_limit' => null, 'sensor_limit_warn' => null, 'sensor_limit_low_warn' => null, diff --git a/app/Http/Controllers/Device/JobMonitorController.php b/app/Http/Controllers/Device/JobMonitorController.php new file mode 100644 index 00000000000..3b99919e3ad --- /dev/null +++ b/app/Http/Controllers/Device/JobMonitorController.php @@ -0,0 +1,37 @@ +authorize('worker.update'); + $this->authorize('view', $device); + abort_unless(QueueStatus::showPages() && $monitor->horizonRunning(), 404); + + $monitor->monitor(JobMonitor::deviceTag($device->device_id)); + + return redirect()->route('device', ['device' => $device->device_id, 'tab' => 'capture', 'section' => 'jobs']); + } + + public function destroy(Device $device, JobMonitor $monitor): RedirectResponse + { + $this->authorize('worker.update'); + $this->authorize('view', $device); + abort_unless(QueueStatus::showPages() && $monitor->horizonRunning(), 404); + + $monitor->stopMonitoring(JobMonitor::deviceTag($device->device_id)); + + return redirect()->route('device', ['device' => $device->device_id, 'tab' => 'capture', 'section' => 'jobs']); + } +} diff --git a/app/Http/Controllers/Device/Tabs/CaptureController.php b/app/Http/Controllers/Device/Tabs/CaptureController.php index 2b7461f4b7e..fa3b301ffe9 100644 --- a/app/Http/Controllers/Device/Tabs/CaptureController.php +++ b/app/Http/Controllers/Device/Tabs/CaptureController.php @@ -26,11 +26,18 @@ namespace App\Http\Controllers\Device\Tabs; +use App\Horizon\JobMonitor; use App\Models\Device; +use App\Queue\FailedJobs; +use App\Queue\QueueStatus; use Illuminate\Http\Request; +use Illuminate\Support\Collection; use Illuminate\Support\Facades\Gate; use LibreNMS\Interfaces\UI\DeviceTab; +/** + * @phpstan-import-type FailedJobRow from FailedJobs + */ class CaptureController implements DeviceTab { public function visible(Device $device): bool @@ -57,7 +64,15 @@ public function data(Device $device, Request $request): array { Gate::authorize('device.debug'); + $jobs = $this->jobs($device); + $section = $request->query('section', 'discovery'); + if (! in_array($section, ['discovery', 'poller', 'snmp', 'alerts'], true) && ! ($section === 'jobs' && $jobs)) { + $section = 'discovery'; + } + return [ + 'section' => $section, + 'jobs' => $jobs, 'tabs' => [ 'discovery' => [ 'name' => __('Discovery'), @@ -78,4 +93,29 @@ public function data(Device $device, Request $request): array ], ]; } + + /** + * Queue jobs for the device, null when queue workers are not in use. + * Every job is only recorded when Horizon runs the workers. + * + * @return array{monitor: bool, monitoring: bool, jobs: Collection>, failed: Collection}|null + */ + private function jobs(Device $device): ?array + { + if (! QueueStatus::showPages() || Gate::denies('worker.view')) { + return null; + } + + $monitor = app(JobMonitor::class); + $available = rescue(fn () => $monitor->horizonRunning(), false); + $tag = JobMonitor::deviceTag($device->device_id); + $monitoring = $available && rescue(fn () => $monitor->isMonitoring($tag), false); + + return [ + 'monitor' => $available, + 'monitoring' => $monitoring, + 'jobs' => $monitoring ? rescue(fn () => $monitor->monitoredJobs($tag), collect()) : collect(), + 'failed' => app(FailedJobs::class)->list(device_id: $device->device_id), + ]; + } } diff --git a/app/Http/Controllers/Device/Tabs/EventlogController.php b/app/Http/Controllers/Device/Tabs/EventlogController.php index bf7ed252285..c9cce921d12 100644 --- a/app/Http/Controllers/Device/Tabs/EventlogController.php +++ b/app/Http/Controllers/Device/Tabs/EventlogController.php @@ -41,12 +41,19 @@ public function __invoke(Device $device, Request $request): View $request->validate([ 'eventtype' => 'nullable|string', + 'port' => 'nullable|int', ]); + $eventtype = $request->string('eventtype')->value(); + $port_id = $request->integer('port') ?: null; + return view('device.tabs.logs.eventlog', [ 'device' => $device, 'filter_device' => false, - 'eventtype' => $request->input('eventtype', ''), + 'eventtype' => $eventtype, + 'port_id' => $port_id, + 'port' => $port_id ? $device->ports()->find($port_id) : null, + 'clear_port_url' => route('device.eventlog', array_filter(['device' => $device->device_id, 'eventtype' => $eventtype])), ]); } } diff --git a/app/Http/Controllers/Device/Tabs/OverviewController.php b/app/Http/Controllers/Device/Tabs/OverviewController.php index e49c94e2c58..96b4f8e0009 100644 --- a/app/Http/Controllers/Device/Tabs/OverviewController.php +++ b/app/Http/Controllers/Device/Tabs/OverviewController.php @@ -183,12 +183,13 @@ private function sensorPanels(Device $device): Collection // a panel with a single sensor class links to that class on the health tab, like the class panels $classes = $sensors->pluck('sensor_class')->unique(); $healthVars = $classes->count() === 1 ? ['vars' => 'metric=' . $classes->first()] : []; + $groups = $this->groupSensors($device, $sensors); return [ - 'title' => $category->label(), + 'title' => $category->label($groups->count()), 'icon' => 'fa fa-' . $category->icon(), 'href' => route('device', ['device' => $device->device_id, 'tab' => 'health'] + $healthVars), - 'groups' => $this->groupSensors($device, $sensors), + 'groups' => $groups, ]; }); diff --git a/app/Http/Controllers/Device/Tabs/PackagesController.php b/app/Http/Controllers/Device/Tabs/PackagesController.php index 43d04b269ab..2e705d63ead 100644 --- a/app/Http/Controllers/Device/Tabs/PackagesController.php +++ b/app/Http/Controllers/Device/Tabs/PackagesController.php @@ -26,7 +26,10 @@ namespace App\Http\Controllers\Device\Tabs; +use App\Http\Controllers\PackagesController as AllPackagesController; use App\Models\Device; +use App\Models\Package; +use App\Models\User; use Illuminate\Http\Request; use LibreNMS\Interfaces\UI\DeviceTab; @@ -54,8 +57,13 @@ public function name(): string public function data(Device $device, Request $request): array { + /** @var User $user */ + $user = $request->user(); + return [ - 'packages' => $device->packages()->orderBy('name')->get(), + 'packages' => AllPackagesController::filteredQuery($request, $device->device_id)->orderBy('name')->orderBy('version')->orderBy('build')->get(), + 'filter' => $request->array('filter'), + 'filterFields' => Package::filterFieldDefinitions($user, $device->device_id), ]; } } diff --git a/app/Http/Controllers/Device/Tabs/PortsController.php b/app/Http/Controllers/Device/Tabs/PortsController.php index 274c5149594..55bcea66efb 100644 --- a/app/Http/Controllers/Device/Tabs/PortsController.php +++ b/app/Http/Controllers/Device/Tabs/PortsController.php @@ -29,6 +29,7 @@ use App\Facades\LibrenmsConfig; use App\Http\Controllers\PortSecurityController; use App\Models\Device; +use App\Models\Eventlog; use App\Models\Link; use App\Models\Port; use App\Models\PortSecurity; @@ -137,7 +138,7 @@ private function portData(Device $device, Request $request): array /** @var Collection|LengthAwarePaginator $ports */ $ports = $this->getFilteredPortsQuery($device, $relationships, $request) - ->paginate(fn ($total) => $this->settings['perPage'] == 'all' ? $total : (int) $this->settings['perPage']) // @phpstan-ignore-line missing closure type + ->paginate(fn ($total) => $this->settings['perPage'] == 'all' ? $total : (int) $this->settings['perPage']) ->appends('perPage', $this->settings['perPage']); $data = [ @@ -148,6 +149,7 @@ private function portData(Device $device, Request $request): array 'upkts' => [['type' => 'port_upkts', 'title' => trans('Packets (Unicast)'), 'vars' => [['from' => '-1d'], ['from' => '-7d'], ['from' => '-30d'], ['from' => '-1y']]]], 'errors' => [['type' => 'port_errors', 'title' => trans('Errors'), 'vars' => [['from' => '-1d'], ['from' => '-7d'], ['from' => '-30d'], ['from' => '-1y']]]], ], + 'ports_with_events' => $this->portsWithEvents($device->device_id, $ports->pluck('port_id')), ]; if ($this->detail) { @@ -160,6 +162,22 @@ private function portData(Device $device, Request $request): array return $data; } + /** + * The ids of the given ports that have interface eventlog entries. + * + * @param iterable $port_ids + * @return Collection + */ + public function portsWithEvents(int $device_id, iterable $port_ids): Collection + { + return Eventlog::query() + ->where('device_id', $device_id) + ->where('type', 'interface') + ->whereIn('reference', $port_ids) + ->distinct() + ->pluck('reference'); + } + public function findPortNeighbors(Port $port): array { // only do for detail diff --git a/app/Http/Controllers/Device/Tabs/ProcessesController.php b/app/Http/Controllers/Device/Tabs/ProcessesController.php index efe7b184afb..41dc6b379c7 100644 --- a/app/Http/Controllers/Device/Tabs/ProcessesController.php +++ b/app/Http/Controllers/Device/Tabs/ProcessesController.php @@ -33,7 +33,7 @@ class ProcessesController implements DeviceTab { - private const COLUMNS = [ + private const array COLUMNS = [ 'pid' => ['label' => 'PID'], 'vsz' => ['label' => 'VSZ', 'title' => 'Virtual Memory'], 'rss' => ['label' => 'RSS', 'title' => 'Resident Memory'], diff --git a/app/Http/Controllers/Device/Tabs/VmInfoController.php b/app/Http/Controllers/Device/Tabs/VmInfoController.php index 38e51e313d0..02dabe17621 100644 --- a/app/Http/Controllers/Device/Tabs/VmInfoController.php +++ b/app/Http/Controllers/Device/Tabs/VmInfoController.php @@ -26,10 +26,13 @@ namespace App\Http\Controllers\Device\Tabs; +use App\Facades\Rrd; use App\Models\Device; use App\Models\Vminfo; +use App\View\Components\VminfoGraphs; use Illuminate\Http\Request; use Illuminate\Support\Facades\Gate; +use Illuminate\View\View; use LibreNMS\Interfaces\UI\DeviceTab; class VmInfoController implements DeviceTab @@ -54,14 +57,47 @@ public function name(): string return __('Virtual Machines'); } + /** + * @return array + */ public function data(Device $device, Request $request): array { - $request->validate(Vminfo::filterValidationRules()); + // the device page only authorizes the device + Gate::authorize('viewAny', Vminfo::class); + + $request->validate([ + ...Vminfo::filterValidationRules(), + ...VminfoGraphs::validationRules(), + ]); + + $graph = $request->input('graph'); return [ 'filterFields' => collect(Vminfo::filterFieldDefinitions()) ->filter(fn ($field) => $field['key'] !== 'device_id')->values()->all(), 'filter' => $request->array('filter'), + 'graph' => $graph, + 'nav' => VminfoGraphs::nav($request->query(), fn (array $query): string => route('device', ['device' => $device->device_id, 'tab' => 'vm', ...$query])), + 'vms' => $graph ? $device->vminfo() + ->chaperone() + ->recordsMetrics(VminfoGraphs::types()[$graph]['metric']) + ->applyFilters($request->array('filter')) + ->orderBy('vmwVmDisplayName') + ->paginate($request->integer('per_page', VminfoGraphs::PER_PAGE_OPTIONS[0])) + ->withQueryString() : null, ]; } + + public function show(Device $device, Vminfo $vminfo): View + { + abort_unless($vminfo->device()->is($device), 404); + Gate::authorize('view', $vminfo); + + return view('device.tabs.vm.show', [ + 'device' => $device, + 'vm' => $vminfo, + // not every source records metrics + 'graphs' => array_values(array_filter(VminfoGraphs::types(), fn (array $graph): bool => Rrd::checkRrdExists(Rrd::metricName($vminfo->metricIdentity($graph['metric']))))), + ]); + } } diff --git a/app/Http/Controllers/DeviceDependencyController.php b/app/Http/Controllers/DeviceDependencyController.php index fb786a4ef29..7f95c82d179 100644 --- a/app/Http/Controllers/DeviceDependencyController.php +++ b/app/Http/Controllers/DeviceDependencyController.php @@ -76,7 +76,11 @@ public function destroy(Request $request): JsonResponse ->orWhereHas('parents', fn (Builder $query) => $query->whereIntegerInRaw('device_relationships.parent_device_id', $validated['parent_ids'])) ->get()); - DB::table('device_relationships')->whereIntegerInRaw('parent_device_id', $validated['parent_ids'])->delete(); + // detach with ids so DeviceRelationshipObserver updates the dependency depths + DB::transaction(function () use ($validated): void { + Device::whereIntegerInRaw('device_id', $validated['parent_ids'])->get() + ->each(fn (Device $parent) => $parent->children()->detach($parent->children()->allRelatedIds())); + }); return response()->json([ 'message' => __('Device dependencies have been removed'), diff --git a/app/Http/Controllers/DeviceGroupController.php b/app/Http/Controllers/DeviceGroupController.php index 2e497f5e4bb..f3f179e7d70 100644 --- a/app/Http/Controllers/DeviceGroupController.php +++ b/app/Http/Controllers/DeviceGroupController.php @@ -8,6 +8,7 @@ use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Validation\Rule; +use Illuminate\Validation\ValidationException; use LibreNMS\Alerting\QueryBuilderFilter; class DeviceGroupController extends Controller @@ -58,13 +59,14 @@ public function store(Request $request, ToastInterface $toast) 'devices.*' => 'integer', 'rules' => 'json|required_if:type,dynamic', ]); + $devices = $request->type == 'static' ? $this->staticMembers($request) : []; $deviceGroup = new DeviceGroup($request->only(['name', 'desc', 'type'])); $deviceGroup->rules = json_decode($request->rules); $deviceGroup->save(); if ($request->type == 'static') { - $deviceGroup->devices()->sync($request->devices); + $deviceGroup->devices()->sync($devices); } $toast->success(__('Device Group :name created', ['name' => htmlentities((string) $deviceGroup->name)])); @@ -125,13 +127,14 @@ public function update(Request $request, DeviceGroup $deviceGroup, ToastInterfac 'devices.*' => 'integer', 'rules' => 'json|required_if:type,dynamic', ]); + $devices = $request->type == 'static' ? $this->staticMembers($request, $deviceGroup) : []; $deviceGroup->fill($request->only(['name', 'desc', 'type'])); $devices_updated = false; if ($deviceGroup->type == 'static') { - // sync device_ids from input - $updated = $deviceGroup->devices()->sync($request->input('devices', [])); + // sync device_ids from input (plus existing members the user cannot see) + $updated = $deviceGroup->devices()->sync($devices); // check for attached/detached/updated $devices_updated = array_sum(array_map(count(...), $updated)) > 0; } else { @@ -162,18 +165,49 @@ public function update(Request $request, DeviceGroup $deviceGroup, ToastInterfac /** * Schedule all devices in the group for rediscovery. */ - public function rediscover(DeviceGroup $deviceGroup): JsonResponse + public function rediscover(Request $request, DeviceGroup $deviceGroup): JsonResponse { - $this->authorize('device.update'); + $this->authorize('view', $deviceGroup); + $this->authorize('update', Device::class); + + // all or nothing: every member device must be accessible to the user + $members = $deviceGroup->devices()->pluck('devices.device_id'); + $accessible = Device::hasAccess($request->user())->whereIntegerInRaw('device_id', $members)->count(); + abort_if($accessible !== $members->count(), 403); - Device::whereIntegerInRaw('device_id', $deviceGroup->devices()->pluck('devices.device_id')) - ->update(['last_discovered' => null]); + Device::whereIntegerInRaw('device_id', $members)->update(['last_discovered' => null]); return response()->json([ 'message' => __('Devices of group :name will be rediscovered', ['name' => htmlentities($deviceGroup->name)]), ]); } + /** + * Resolve the device ids to sync to a static group from the request. + * Users may only add devices they can access. Existing members the user + * cannot access are always kept, they can neither be added nor removed. + * + * @return int[] + * + * @throws ValidationException when a device that is not accessible would be added + */ + private function staticMembers(Request $request, ?DeviceGroup $deviceGroup = null): array + { + $requested = $request->collect('devices')->map(fn ($id): int => (int) $id)->unique(); + $current = $deviceGroup?->devices()->pluck('devices.device_id') ?? collect(); + + $accessible = Device::hasAccess($request->user()) + ->whereIntegerInRaw('device_id', $requested->merge($current)) + ->pluck('device_id'); + $hidden = $current->diff($accessible); + + if ($requested->diff($accessible)->diff($hidden)->isNotEmpty()) { + throw ValidationException::withMessages(['devices' => __('validation.exists', ['attribute' => 'devices'])]); + } + + return $requested->merge($hidden)->unique()->values()->all(); + } + /** * Remove the specified resource from storage. */ diff --git a/app/Http/Controllers/FirstRunController.php b/app/Http/Controllers/FirstRunController.php new file mode 100644 index 00000000000..cb98d6a58bd --- /dev/null +++ b/app/Http/Controllers/FirstRunController.php @@ -0,0 +1,419 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace App\Http\Controllers; + +use App\Actions\Device\AddFoundDeviceResult; +use App\Events\NetworkAddressScanned; +use App\Facades\LibrenmsConfig; +use App\Jobs\ScanNetworks; +use App\Models\Device; +use App\Models\Secret; +use App\Models\User; +use App\View\FieldSchema\FieldDefinition; +use Illuminate\Contracts\View\View; +use Illuminate\Http\JsonResponse; +use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Bus; +use Illuminate\Support\Facades\Event; +use Illuminate\Support\Facades\Gate; +use Illuminate\Support\Facades\Log; +use Illuminate\Support\Facades\Validator; +use Illuminate\Support\Str; +use Illuminate\Validation\ValidationException; +use LibreNMS\Enum\DeviceAddOutcome; +use LibreNMS\Enum\SecretType; +use LibreNMS\Polling\Secrets\Definitions\SecretDefinition; +use LibreNMS\Polling\Secrets\Definitions\SnmpV3SecretDefinition; +use LibreNMS\Scan\LocalNetworks; +use LibreNMS\Scan\NetworkScanner; +use LibreNMS\Scan\ScanOptions; +use LibreNMS\Util\Binaries; +use LibreNMS\Util\IP; +use LibreNMS\Util\Url; +use Symfony\Component\HttpFoundation\StreamedResponse; +use Throwable; + +class FirstRunController extends Controller +{ + /** a larger scan takes too long to watch, lnms scan:network can scan it */ + public const MAX_ADDRESSES = 4096; + + /** + * Send a user that can set up LibreNMS to the first run page until it is finished or there are devices. + */ + public static function shouldShow(User $user): bool + { + return ! LibrenmsConfig::get('first_run_complete') + && self::canSetup($user) + && ! Device::query()->exists(); + } + + public function index(Request $request, LocalNetworks $localNetworks): View + { + $this->authorizeSetup(); + + $v3Definition = SecretType::SnmpV3->definition(); + $levels = $v3Definition->fields()['authlevel']->options ?? []; + + $nets = (array) LibrenmsConfig::get('nets', []); + $suggested = $nets === [] ? $localNetworks->find() : []; + + return view('first-run.index', [ + 'config' => [ + 'credentials' => $this->credentialList($request->user()), + 'v3_defaults' => $v3Definition->schemaDefaults(), + 'v3_levels' => $levels, + 'networks' => $nets ?: $suggested, + 'networks_suggested' => $suggested !== [], + 'max_addresses' => self::MAX_ADDRESSES, + 'urls' => [ + 'credentials' => route('first-run.credentials'), + 'networks' => route('first-run.networks'), + 'scan' => route('first-run.scan'), + ], + ], + 'v3Schema' => $v3Definition->schema(), + ]); + } + + /** + * Save the communities and SNMPv3 credentials as the default SNMP credentials, in the order given. + * Credentials that were removed are no longer defaults, the secrets are kept. + */ + public function credentials(Request $request): JsonResponse + { + $this->authorizeSetup(); + + $request->validate([ + 'credentials' => ['required', 'array', 'max:30'], + 'credentials.*' => ['array'], + 'credentials.*.id' => ['nullable', 'integer'], + 'credentials.*.type' => ['required_without:credentials.*.id', 'in:community,v3'], + 'credentials.*.community' => ['required_if:credentials.*.type,community', 'string', 'max:255'], + ], [ + 'credentials.required' => __('first_run.credentials.required'), + ]); + // the fields of new SNMPv3 credentials are validated below, validated() would drop them + /** @var array> $credentials */ + $credentials = array_values((array) $request->input('credentials')); + + // check every credential before any is saved + $checked = []; + foreach ($credentials as $index => $credential) { + if (isset($credential['id'])) { + $checked[] = Secret::resolveForTypes((int) $credential['id'], [SecretType::SnmpCommunity, SecretType::SnmpV3], $request->user(), "credentials.$index"); + } elseif ($credential['type'] === 'community') { + $checked[] = trim((string) $credential['community']); + } else { + $checked[] = $this->validateV3($credential, "credentials.$index"); + } + } + + $ids = []; + foreach ($checked as $credential) { + if ($credential instanceof Secret) { + $ids[] = $credential->id; + } elseif (is_string($credential)) { + $ids[] = $this->communitySecretId($credential, $request->user()); + } else { + $ids[] = $this->v3SecretId($credential); + } + } + + LibrenmsConfig::persist('snmp.default_credentials', array_values(array_unique($ids))); + + return response()->json([ + 'message' => __('first_run.credentials.saved'), + 'credentials' => $this->credentialList($request->user()), + ]); + } + + /** + * Save the networks to scan to the nets setting. + */ + public function networks(Request $request, NetworkScanner $scanner): JsonResponse + { + $this->authorizeSetup(); + + $validated = $request->validate([ + 'networks' => ['required', 'array', 'min:1', 'max:32'], + 'networks.*' => ['required', 'string', 'distinct', function (string $attribute, mixed $value, \Closure $fail): void { + if (IP::parse((string) $value, true) === null || ! str_contains((string) $value, '/')) { + $fail(__('first_run.networks.invalid', ['network' => $value])); + } + }], + ]); + + $this->checkScanSize($scanner, $validated['networks']); + + LibrenmsConfig::persist('nets', array_values($validated['networks'])); + + return response()->json(['message' => __('first_run.networks.saved')]); + } + + /** + * Scan the networks of the nets setting, each result is streamed as a line of JSON as the scan goes. + */ + public function scan(Request $request, NetworkScanner $scanner, Binaries $binaries): StreamedResponse + { + $this->authorizeSetup(); + $request->validate(['ping_fallback' => ['boolean']]); + + $nets = (array) LibrenmsConfig::get('nets', []); + if ($nets === []) { + throw ValidationException::withMessages(['networks' => __('first_run.networks.required')]); + } + $total = $this->checkScanSize($scanner, $nets); + + $options = ScanOptions::fromConfig(pingFallback: $request->boolean('ping_fallback')); + $missing = array_keys(array_filter([ + 'fping' => $options->icmpEnabled, + 'snmpget' => $options->snmpConfigs !== [], + ], fn (bool $required, string $binary) => $required && $binaries->find($binary) === null, ARRAY_FILTER_USE_BOTH)); + if ($missing !== []) { + throw ValidationException::withMessages(['networks' => __('first_run.scan.missing_binary', ['binary' => implode(', ', $missing)])]); + } + + $job = new ScanNetworks( + scanId: (string) Str::uuid(), + pollerGroup: (int) LibrenmsConfig::get('default_poller_group', 0), + pingFallback: $request->boolean('ping_fallback'), + ); + + $icmp = $options->icmpEnabled; + + return new StreamedResponse(function () use ($job, $total, $icmp): void { + set_time_limit(0); + while (ob_get_level() > 0) { + ob_end_flush(); + } + + $start = microtime(true); + // with ping, a host that is not added replied to ping but not SNMP + $this->send(['type' => 'start', 'total' => $total, 'icmp' => $icmp]); + + // the scan id is new, so no other scan is reported here + Event::listen(function (NetworkAddressScanned $event) use ($job): void { + if ($event->scanId === $job->scanId) { + $this->send($this->resultLine($event->ip, $event->result)); + } + }); + + try { + // runs in this process until there are workers, then the page will read the results the job stored + Bus::dispatchSync($job); + $this->send(['type' => 'done', 'seconds' => round(microtime(true) - $start, 1)]); + } catch (Throwable $e) { + Log::error('First run scan failed: ' . $e->getMessage(), ['exception' => $e]); + $this->send(['type' => 'error', 'message' => $e->getMessage()]); + } + }, 200, [ + 'Content-Type' => 'application/x-ndjson', + 'Cache-Control' => 'no-cache', + 'X-Accel-Buffering' => 'no', + ]); + } + + /** + * The default SNMP credentials in the order they are tried, the SNMPv3 passwords are not sent. + * Like the secrets pages, a community is only shown to a user that can unmask secrets, the others see its description. + * + * @return list + */ + private function credentialList(User $user): array + { + $ids = $this->defaultCredentialIds(); + $unmask = Gate::forUser($user)->allows('unmask', Secret::class); + + return Secret::hasAccess($user)->whereIn('id', $ids)->whereIn('secret_type', [SecretType::SnmpCommunity, SecretType::SnmpV3])->get() + ->sortBy(fn (Secret $secret) => array_search($secret->id, $ids)) + ->map(fn (Secret $secret) => $secret->secret_type === SecretType::SnmpCommunity ? [ + 'id' => $secret->id, + 'type' => 'community', + 'community' => $unmask ? (string) ($secret->data['community'] ?? '') : SecretDefinition::MASK, + 'label' => $unmask ? (string) ($secret->data['community'] ?? '') : $secret->description, + ] : [ + 'id' => $secret->id, + 'type' => 'v3', + 'authname' => (string) ($secret->data['authname'] ?? ''), + 'authlevel' => (string) ($secret->data['authlevel'] ?? SnmpV3SecretDefinition::DEFAULT_AUTHLEVEL), + 'authalgo' => $secret->data['authalgo'] ?? null, + 'cryptoalgo' => $secret->data['cryptoalgo'] ?? null, + ])->values()->all(); + } + + /** + * @param string[] $networks + * @return int|float the number of addresses to scan + * + * @throws ValidationException when there are too many to watch + */ + private function checkScanSize(NetworkScanner $scanner, array $networks): int|float + { + $parsed = $scanner->withoutOverlaps(array_filter(array_map(fn (string $network) => IP::parse($network, true), $networks))); + $total = array_sum(array_map(fn (IP $network): int|float => $network->addressCount(), $parsed)); + + if ($total > self::MAX_ADDRESSES) { + throw ValidationException::withMessages(['networks' => __('first_run.networks.too_large', [ + 'count' => number_format($total), + 'max' => number_format(self::MAX_ADDRESSES), + ])]); + } + + return $total; + } + + /** + * Do not show the first run page again. + */ + public function finish(Request $request): RedirectResponse + { + $this->authorizeSetup(); + + LibrenmsConfig::persist('first_run_complete', true); + + return $request->input('to') === 'devices' ? redirect()->route('devices') : redirect()->route('home'); + } + + /** + * Saving the credentials creates secrets, without that permission a user would be stuck on the first step. + */ + private static function canSetup(User $user): bool + { + return $user->can('settings.update') && $user->can('create', Device::class) && $user->can('create', Secret::class); + } + + private function authorizeSetup(): void + { + $this->authorize('settings.update'); + $this->authorize('create', Device::class); + $this->authorize('create', Secret::class); + } + + /** + * @return array + */ + private function resultLine(string $ip, AddFoundDeviceResult $result): array + { + $line = ['type' => 'result', 'ip' => $ip, 'outcome' => $result->outcome->name]; + + // the probe got a reply but adding failed (the reverse DNS name did not reach the host, or a second check failed), + // the page would count it as replying to ping but not SNMP, so it is reported as an error with the reasons + if ($result->outcome === DeviceAddOutcome::Unreachable && $result->message !== '') { + $line['outcome'] = DeviceAddOutcome::Error->name; + $line['message'] = implode(' ', array_filter(array_map(trim(...), explode(PHP_EOL, $result->message)))); + } elseif (in_array($result->outcome, [DeviceAddOutcome::Added, DeviceAddOutcome::Known, DeviceAddOutcome::Error], true)) { + // only the hosts that were found are listed, the others are counted + $line['message'] = strtok($result->message, PHP_EOL) ?: $result->outcome->description(); + } + + $device = $result->device; + if ($device !== null) { + $line['device'] = [ + 'name' => $device->display, + 'sysName' => $device->sysName, + 'os' => LibrenmsConfig::getOsSetting($device->os, 'text', $device->os), + 'hardware' => $device->hardware, + 'logo' => $device->logo(), + 'url' => Url::deviceUrl($device), + ]; + } + + return $line; + } + + /** + * @param array $line + */ + private function send(array $line): void + { + echo json_encode($line, JSON_UNESCAPED_SLASHES | JSON_INVALID_UTF8_SUBSTITUTE) . "\n"; + flush(); + } + + /** + * @return int[] + */ + private function defaultCredentialIds(): array + { + return array_map(intval(...), (array) LibrenmsConfig::get('snmp.default_credentials', [])); + } + + /** + * The secret of the community, an existing one is reused. + */ + private function communitySecretId(string $community, User $user): int + { + $existing = Secret::hasAccess($user)->where('secret_type', SecretType::SnmpCommunity)->get() + ->first(fn (Secret $secret) => ($secret->data['community'] ?? null) === $community); + + return $existing->id ?? Secret::create([ + 'description' => Secret::uniqueDescription(__('first_run.credentials.community_description')), + 'secret_type' => SecretType::SnmpCommunity, + 'data' => ['community' => $community], + ])->id; + } + + /** + * @param array $data + * @param string $errorKey the prefix of the validation error keys + * @return array + */ + private function validateV3(array $data, string $errorKey): array + { + $definition = SecretType::SnmpV3->definition(); + $labels = collect($definition->fields())->map(fn (FieldDefinition $field) => $field->label ?? $field->key)->all(); + $rules = $definition->rules(); + // net-snmp refuses shorter passphrases + $rules['authpass'] = [...(array) $rules['authpass'], 'min:8']; + $rules['cryptopass'] = [...(array) $rules['cryptopass'], 'min:8']; + + $validator = Validator::make($data, $rules, attributes: $labels); + if ($validator->fails()) { + throw ValidationException::withMessages(collect($validator->errors()->messages())->mapWithKeys(fn ($messages, $field) => ["$errorKey.$field" => $messages])->all()); + } + + return $validator->validated(); + } + + /** + * @param array $data + */ + private function v3SecretId(array $data): int + { + return Secret::create([ + 'description' => Secret::uniqueDescription(__('first_run.credentials.v3_description', ['name' => $data['authname']])), + 'secret_type' => SecretType::SnmpV3, + 'data' => array_merge([ + 'authlevel' => SnmpV3SecretDefinition::DEFAULT_AUTHLEVEL, + 'authalgo' => SnmpV3SecretDefinition::DEFAULT_AUTHALGO, + 'cryptoalgo' => SnmpV3SecretDefinition::DEFAULT_CRYPTOALGO, + ], array_filter($data, fn ($value) => $value !== null && $value !== '')), + ])->id; + } +} diff --git a/app/Http/Controllers/GraphController.php b/app/Http/Controllers/GraphController.php index 9d120e979e8..97521d10a83 100644 --- a/app/Http/Controllers/GraphController.php +++ b/app/Http/Controllers/GraphController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; +use App\Http\Requests\GraphImageRequest; use Illuminate\Http\Request; use Illuminate\Http\Response; -use LibreNMS\Enum\ImageFormat; -use LibreNMS\Exceptions\RrdGraphException; +use LibreNMS\Exceptions\GraphException; use LibreNMS\Util\Debug; use LibreNMS\Util\Graph; use LibreNMS\Util\Url; @@ -13,39 +13,35 @@ class GraphController extends Controller { /** - * @throws RrdGraphException + * @throws GraphException */ - public function __invoke(Request $request, string $path = ''): Response + public function __invoke(Request $request): Response { - $vars = Url::parseLegacyPathVars(); - if ($request->user() !== null) { - // only allow debug for logged in users - Debug::set(! empty($vars['debug'])); + // only allow debug for logged in users, set before the graph request authorizes and validates so those show debug output too + Debug::set(! empty(Url::parseLegacyPathVars()['debug'])); } - try { - $graph = Graph::get($vars); + $graphRequest = app(GraphImageRequest::class); + try { + $image = $graphRequest->graph()->render(); + $status = 200; + } catch (GraphException $e) { if (Debug::isEnabled()) { - return response('graph'); + throw $e; } - $headers = [ - 'Content-type' => $graph->contentType(), - ]; + $image = Graph::errorImage($graphRequest->graphParams(), $e); + $status = $e->httpStatus(); + } - if ($request->input('output') == 'base64') { - return response($graph->base64(), 200, $headers); - } + if (Debug::isEnabled()) { + return response('graph'); + } - return response($graph->data, 200, $headers); - } catch (RrdGraphException $e) { - if (Debug::isEnabled()) { - throw $e; - } + $data = $graphRequest->input('output') == 'base64' ? $image->base64() : $image->data; - return response($e->generateErrorImage(), 500, ['Content-type' => ImageFormat::forGraph($vars['graph_type'] ?? null)->contentType()]); - } + return response($data, $status, ['Content-type' => $image->mediaType()]); } } diff --git a/app/Http/Controllers/GraphsPageController.php b/app/Http/Controllers/GraphsPageController.php index 5115adfd5f2..6c9d60811f3 100644 --- a/app/Http/Controllers/GraphsPageController.php +++ b/app/Http/Controllers/GraphsPageController.php @@ -2,9 +2,10 @@ namespace App\Http\Controllers; +use App\Data\Graphing\GraphParameters; use App\Facades\LibrenmsConfig; -use App\Facades\Rrd; -use App\Http\Requests\GraphsPageRequest; +use App\Graphs\GraphFactory; +use App\Http\Requests\GraphRequest; use App\Models\Device; use App\Models\Port; use Illuminate\Contracts\View\View; @@ -15,15 +16,19 @@ class GraphsPageController extends Controller { - public function __invoke(GraphsPageRequest $request): View + public function __invoke(GraphRequest $request): View { - $fullType = "{$request->type}_$request->subtype"; + $params = $request->graphParams(); + $context = $request->graph()->getPageContext(); + $device = $context->device; + $port = $context->port; + $fullType = "{$params->type}_$params->subtype"; $showCommand = $request->input('showcommand') === 'yes'; $isDynamicGraph = LibrenmsConfig::get('webui.dynamic_graphs', false) === true; $this->handleWidescreenPreference($request); - $subtitle = $this->buildSubtitle($request->type, $request->subtype, $request); + $subtitle = $this->buildSubtitle($params->type, $params->subtype, $context->subtitle); [$subtypeOptions, $subtypeSelected] = $this->subtypeNavigationOptions($request); @@ -33,13 +38,13 @@ public function __invoke(GraphsPageRequest $request): View $mainGraphVars = $request->toVars(['height' => $height, 'width' => $width]); return view('graphs.show', [ - 'device' => $request->device, - 'port' => $request->port, + 'device' => $device, + 'port' => $port, 'subtitle' => $subtitle, - 'pageTitle' => $this->entityTitle($request->device, $request->port) . $subtitle, + 'pageTitle' => $this->entityTitle($device, $port) . $subtitle, 'subtypeOptions' => $subtypeOptions, 'subtypeSelected' => $subtypeSelected, - 'periodThumbs' => $this->periodThumbnails($request, $request->from, $request->to, $thumbWidth), + 'periodThumbs' => $this->periodThumbnails($request, $thumbWidth), 'toggles' => $this->controlToggles($request, $fullType, $showCommand), 'trendHint' => $fullType === 'port_bits' || str_contains($fullType, 'sensor_'), 'graphFrom' => $request->input('from') ?? '-1d', @@ -58,7 +63,7 @@ public function __invoke(GraphsPageRequest $request): View /** * Store widescreen display toggle state in session. */ - private function handleWidescreenPreference(GraphsPageRequest $request): void + private function handleWidescreenPreference(GraphRequest $request): void { if ($request->has('widescreen')) { $request->input('widescreen') === 'yes' @@ -72,9 +77,10 @@ private function handleWidescreenPreference(GraphsPageRequest $request): void * * @return array{0: array, 1: ?string} */ - private function subtypeNavigationOptions(GraphsPageRequest $request): array + private function subtypeNavigationOptions(GraphRequest $request): array { - $graphSubtypes = in_array($request->type, ['sensor', 'wireless'], true) ? [] : Graph::getSubtypes($request->type, $request->device); + $type = $request->graphParams()->type; + $graphSubtypes = in_array($type, ['sensor', 'wireless'], true) ? [] : Graph::getSubtypes($type, $request->graph()->getPageContext()->device); if (count($graphSubtypes) <= 1) { return [[], null]; @@ -82,10 +88,10 @@ private function subtypeNavigationOptions(GraphsPageRequest $request): array return [ array_map(fn ($availType) => [ - 'value' => $this->graphUrl($request, ['type' => "{$request->type}_{$availType}"]), + 'value' => $this->graphUrl($request, ['type' => "{$type}_{$availType}"]), 'text' => StringHelpers::niceCase($availType), ], $graphSubtypes), - $this->graphUrl($request, ['type' => "{$request->type}_{$request->subtype}"]), + $this->graphUrl($request, ['type' => "{$type}_{$request->graphParams()->subtype}"]), ]; } @@ -94,10 +100,11 @@ private function subtypeNavigationOptions(GraphsPageRequest $request): array * * @return array> */ - private function periodThumbnails(GraphsPageRequest $request, int $from, int $to, int $thumbWidth): array + private function periodThumbnails(GraphRequest $request, int $thumbWidth): array { $now = (int) LibrenmsConfig::get('time.now'); - $currentDuration = ($to ?: $now) - $from; + $params = $request->graphParams(); + $currentDuration = $now - $params->from; $periodThumbs = []; foreach (LibrenmsConfig::get('graphs.row.normal') as $period => $text) { @@ -105,7 +112,7 @@ private function periodThumbnails(GraphsPageRequest $request, int $from, int $to $periodDuration = $now - $periodFrom; $periodThumbs[] = [ 'text' => __("settings.settings.graphs.row.normal.options.$period"), - 'active' => ! $to && $periodDuration > 0 && abs($currentDuration - $periodDuration) <= 0.05 * $periodDuration, + 'active' => $params->ends_now && $periodDuration > 0 && abs($currentDuration - $periodDuration) <= 0.05 * $periodDuration, 'link' => $this->graphUrl($request, ['from' => Time::toRelativeOffset($periodDuration), 'to' => null]), 'vars' => $request->toVars([ 'height' => '90', @@ -125,7 +132,7 @@ private function periodThumbnails(GraphsPageRequest $request, int $from, int $to * * @return array */ - private function controlToggles(GraphsPageRequest $request, string $fullType, bool $showCommand): array + private function controlToggles(GraphRequest $request, string $fullType, bool $showCommand): array { $toggles = [ $request->input('legend') === 'no' @@ -171,10 +178,10 @@ private function dynamicGraphSrcTemplate(array $mainGraphVars): string /** * Build the plain-text subtitle (" :: ...") describing the graph subtype. */ - private function buildSubtitle(string $type, string $subtype, GraphsPageRequest $request): string + private function buildSubtitle(string $type, string $subtype, ?string $graphSubtitle): string { - if ($request->subtitle) { - return $request->subtitle; + if ($graphSubtitle) { + return $graphSubtitle; } if (LibrenmsConfig::has("graph_types.$type.$subtype.descr")) { @@ -203,7 +210,7 @@ private function entityTitle(?Device $device, ?Port $port): string * * @return array{width: int, height: int, thumbWidth: int} */ - private function graphDimensions(GraphsPageRequest $request): array + private function graphDimensions(GraphRequest $request): array { if ($request->session()->get('widescreen')) { $width = 1700; @@ -238,12 +245,7 @@ private function graphDimensions(GraphsPageRequest $request): array private function renderRrdCommand(array $graphVars): ?string { try { - $rrd_options = Graph::getRrdOptions($graphVars); - - return implode(' ', array_map(escapeshellarg(...), [ - 'rrdtool', - ...Rrd::buildCommand('graph', '-', $rrd_options), - ])); + return app(GraphFactory::class)->graphFor(new GraphParameters($graphVars))->getDebugCommand(); } catch (\Throwable $e) { Log::error('RRDTool Command Error: ' . $e->getMessage(), ['exception' => $e]); @@ -256,7 +258,7 @@ private function renderRrdCommand(array $graphVars): ?string * * @param array $changes */ - private function graphUrl(GraphsPageRequest $request, array $changes = []): string + private function graphUrl(GraphRequest $request, array $changes = []): string { $params = array_merge( $request->except(['page', 'username', 'password', 'width', 'height']), diff --git a/app/Http/Controllers/Install/ChecksController.php b/app/Http/Controllers/Install/ChecksController.php index a9d73a2f838..227495c4679 100644 --- a/app/Http/Controllers/Install/ChecksController.php +++ b/app/Http/Controllers/Install/ChecksController.php @@ -81,13 +81,7 @@ public function complete(): bool return true; } - foreach ($this->versionResults() as $result) { - if (! $result['ok']) { - return false; - } - } - - return true; + return array_all($this->versionResults(), fn ($result) => $result['ok']); } public function enabled(): bool diff --git a/app/Http/Controllers/Install/DatabaseController.php b/app/Http/Controllers/Install/DatabaseController.php index e6e7ba83bd1..0299323d300 100644 --- a/app/Http/Controllers/Install/DatabaseController.php +++ b/app/Http/Controllers/Install/DatabaseController.php @@ -78,7 +78,7 @@ public function test(Request $request) // validate Database $validator = new Validator(); - (new Database())->validateSystem($validator); + new Database()->validateSystem($validator); $results = $validator->getResults('database'); foreach ($results as $result) { diff --git a/app/Http/Controllers/Install/FinalizeController.php b/app/Http/Controllers/Install/FinalizeController.php index f43a83df84b..232cee2e97d 100644 --- a/app/Http/Controllers/Install/FinalizeController.php +++ b/app/Http/Controllers/Install/FinalizeController.php @@ -65,7 +65,6 @@ public function saveConfig(Request $request): \Illuminate\Http\JsonResponse $this->saveSetting('update_channel', $request->input('update_channel', 'master')); $this->saveSetting('site_style', $request->input('site_style')); - $this->saveSetting('reporting.error', $request->has('error_reporting')); $this->saveSetting('reporting.usage', $request->has('usage_reporting')); $env = ''; diff --git a/app/Http/Controllers/InventoryController.php b/app/Http/Controllers/InventoryController.php index 10889fe66cc..065193a47bd 100644 --- a/app/Http/Controllers/InventoryController.php +++ b/app/Http/Controllers/InventoryController.php @@ -27,7 +27,7 @@ public function __invoke(Request $request): View $model_filter = ['field' => 'model']; $device_selected = ''; if ($device) { - $device_selected = ['id' => $device->device_id, 'text' => $device->displayName()]; + $device_selected = ['id' => $device->device_id, 'text' => $device->display]; $model_filter['device_id'] = $device->device_id; } diff --git a/app/Http/Controllers/Maps/CustomMapDataController.php b/app/Http/Controllers/Maps/CustomMapDataController.php index 9b2cdf0cce5..0fa48eeb78d 100644 --- a/app/Http/Controllers/Maps/CustomMapDataController.php +++ b/app/Http/Controllers/Maps/CustomMapDataController.php @@ -76,7 +76,8 @@ public function get(Request $request, CustomMap $map): JsonResponse ]; if ($edge->port) { $edges[$edgeid]['device_id'] = $edge->port->device_id; - $edges[$edgeid]['port_name'] = $edge->port->device->displayName() . ' - ' . $edge->port->getLabel(); + $device = $edge->port->device; + $edges[$edgeid]['port_name'] = $device->display . ' - ' . $edge->port->getLabel(); // Get speed to and from if ($edge->reverse) { diff --git a/app/Http/Controllers/Maps/MapDataController.php b/app/Http/Controllers/Maps/MapDataController.php index 71a2b788a3c..1ef18cded62 100644 --- a/app/Http/Controllers/Maps/MapDataController.php +++ b/app/Http/Controllers/Maps/MapDataController.php @@ -39,6 +39,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Log; +use LibreNMS\Enum\DeviceType; use LibreNMS\Enum\IfOperStatus; class MapDataController extends Controller @@ -487,12 +488,12 @@ public function getDevices(Request $request): JsonResponse $updowntime = ''; } - $deviceTypes = collect(LibrenmsConfig::get('device_types', []))->pluck('icon', 'type'); + $deviceTypes = DeviceType::icons(); $device_list[$device->device_id] = [ 'id' => $device->device_id, 'icon' => $device->icon, - 'typeIcon' => $deviceTypes->get($device->type, 'server'), + 'typeIcon' => $deviceTypes[$device->type] ?? 'server', 'icontitle' => $device->icon ? str_replace(['.svg', '.png'], '', basename((string) $device->icon)) : $device->os, 'sname' => $device->shortDisplayName(), 'status' => $device->status, diff --git a/app/Http/Controllers/OutagesController.php b/app/Http/Controllers/OutagesController.php index f58cfbfd907..eb34f5bd90f 100644 --- a/app/Http/Controllers/OutagesController.php +++ b/app/Http/Controllers/OutagesController.php @@ -28,7 +28,7 @@ public function index(Request $request): View $device = Device::hasAccess($request->user())->find((int) $request->input('device')); if ($device) { - $selected_device = ['id' => $device->device_id, 'text' => $device->displayName()]; + $selected_device = ['id' => $device->device_id, 'text' => $device->display]; } } diff --git a/app/Http/Controllers/OverviewController.php b/app/Http/Controllers/OverviewController.php index 870fed9fa11..421cfc699a3 100644 --- a/app/Http/Controllers/OverviewController.php +++ b/app/Http/Controllers/OverviewController.php @@ -15,12 +15,16 @@ class OverviewController extends Controller { /** * @param Request $request - * @return \Illuminate\Contracts\View\View + * @return \Illuminate\Contracts\View\View|\Illuminate\Http\RedirectResponse */ public function index(Request $request) { $this->authorize('viewAny', Dashboard::class); + if (FirstRunController::shouldShow($request->user())) { + return redirect()->route('first-run'); + } + $view = LibrenmsConfig::get('front_page'); if (view()->exists("overview.custom.$view")) { @@ -30,7 +34,7 @@ public function index(Request $request) } // default to dashboard - return (new DashboardController())->index($request); + return new DashboardController()->index($request); } /** diff --git a/app/Http/Controllers/PackagesController.php b/app/Http/Controllers/PackagesController.php new file mode 100644 index 00000000000..ed241c1348b --- /dev/null +++ b/app/Http/Controllers/PackagesController.php @@ -0,0 +1,98 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace App\Http\Controllers; + +use App\Models\Package; +use App\Models\User; +use Illuminate\Database\Eloquent\Builder; +use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; +use Illuminate\Support\Collection; +use Illuminate\View\View; +use LibreNMS\Util\Url; + +class PackagesController extends Controller +{ + public function index(Request $request): View + { + /** @var User $user */ + $user = $request->user(); + $query = self::filteredQuery($request); + + $names = (clone $query)->select('name')->groupBy('name')->orderBy('name')->paginate(50)->withQueryString(); + + $packages = (clone $query)->with('device') + ->whereIn('name', $names->pluck('name')) + ->orderBy('name')->orderBy('version')->orderBy('build') + ->get() + ->groupBy('name') + ->map(fn (Collection $rows) => [ + 'arch' => $rows->pluck('arch')->filter()->unique()->sort()->values(), + 'managers' => $rows->pluck('manager')->filter()->unique()->values(), + 'device_count' => $rows->pluck('device_id')->unique()->count(), + 'versions' => $rows->groupBy(fn (Package $package) => $package->displayVersion()) + ->map(fn (Collection $versionRows) => $versionRows->pluck('device')->filter()->unique('device_id')->sortBy('display')->values()), + ]); + + return view('packages.index', [ + 'names' => $names, + 'packages' => $packages, + 'filter' => $request->array('filter'), + 'filterFields' => Package::filterFieldDefinitions($user), + ]); + } + + /** + * @return Builder + */ + public static function filteredQuery(Request $request, ?int $deviceId = null): Builder + { + $request->validate(Package::filterValidationRules()); + + /** @var User $user */ + $user = $request->user(); + $filter = $request->array('filter'); + + if ($deviceId) { + unset($filter['device_id']); // a device page only ever shows that device + } + + return Package::hasAccess($user) + ->when($deviceId, fn (Builder $q) => $q->where('packages.device_id', $deviceId)) + ->when($filter, fn (Builder $q, array $filters) => $q->applyFilters($filters)); + } + + /** + * Translate the old packages/name=foo pages + */ + public function legacy(): RedirectResponse + { + $name = Url::parseOptions('name'); + + return redirect()->to($name ? Package::urlForName($name) : route('packages.index')); + } +} diff --git a/app/Http/Controllers/PortGroupPortsController.php b/app/Http/Controllers/PortGroupPortsController.php index ca1ededdd8d..29acaf293fb 100644 --- a/app/Http/Controllers/PortGroupPortsController.php +++ b/app/Http/Controllers/PortGroupPortsController.php @@ -18,7 +18,7 @@ class PortGroupPortsController extends Controller * * @var array */ - private const SORT_FIELDS = [ + private const array SORT_FIELDS = [ 'device' => 'device', 'ifName' => 'ifName', 'ifOperStatus' => 'ifOperStatus', @@ -26,7 +26,7 @@ class PortGroupPortsController extends Controller 'ifAlias' => 'ifAlias', ]; - private const MEMBERSHIP = ['members', 'available', 'all']; + private const array MEMBERSHIP = ['members', 'available', 'all']; public function index(Request $request, PortGroup $portGroup): View { diff --git a/app/Http/Controllers/PortTypeController.php b/app/Http/Controllers/PortTypeController.php index a67b0053b12..478b89412d9 100644 --- a/app/Http/Controllers/PortTypeController.php +++ b/app/Http/Controllers/PortTypeController.php @@ -37,7 +37,7 @@ class PortTypeController extends Controller /** * Port types whose matching descriptions can be extended with a _descr config setting. */ - private const CONFIGURABLE_TYPES = ['core', 'customers', 'peering', 'transit']; + private const array CONFIGURABLE_TYPES = ['core', 'customers', 'peering', 'transit']; public function graph(Request $request, string $types): View { diff --git a/app/Http/Controllers/QueueController.php b/app/Http/Controllers/QueueController.php new file mode 100644 index 00000000000..1b0ff01609e --- /dev/null +++ b/app/Http/Controllers/QueueController.php @@ -0,0 +1,72 @@ +authorize('worker.view'); + abort_unless(QueueStatus::showPages(), 404); + + $retrying = $retries->retrying(); + $overdue = $status->overdueDevices(50); + + return view('poller.queues', [ + 'current_tab' => 'queues', + 'queues' => $status->queues($retrying), + 'retrying' => $retrying, + 'workers' => $status->workers(), + 'overdue' => $overdue->map(fn (Device $device): array => ['device' => $device, 'locked' => $locks->held($device)]), + 'lock_minutes' => intdiv(new PollDevice(0, ModuleList::fromUserOverrides([]))->uniqueFor(), 60), + 'failed' => $failed->list(), + 'failed_count' => $failed->count(), + ]); + } + + public function retry(FailedJobs $failed, string $id): RedirectResponse + { + $this->authorize('worker.update'); + abort_unless(QueueStatus::showPages(), 404); + + $failed->retry($id); + + toast()->success(__('Job queued for retry')); + + return back(); + } + + public function releaseLock(DeviceLocks $locks, Device $device): RedirectResponse + { + $this->authorize('worker.update'); + abort_unless(QueueStatus::showPages(), 404); + + $locks->release($device); + + toast()->success(__('The device will be queued on the next dispatch')); + + return back(); + } + + public function forget(FailedJobs $failed, string $id): RedirectResponse + { + $this->authorize('worker.update'); + abort_unless(QueueStatus::showPages(), 404); + + $failed->forget($id); + + toast()->success(__('Failed job deleted')); + + return back(); + } +} diff --git a/app/Http/Controllers/RealtimeGraphController.php b/app/Http/Controllers/RealtimeGraphController.php index ebeb76af510..7887c9ced2b 100644 --- a/app/Http/Controllers/RealtimeGraphController.php +++ b/app/Http/Controllers/RealtimeGraphController.php @@ -8,7 +8,7 @@ class RealtimeGraphController extends Controller { - private const DEFAULT_INTERVAL = 1.0; + private const float DEFAULT_INTERVAL = 1.0; public function __invoke(Request $request, Port $port): Response { @@ -35,7 +35,7 @@ public function __invoke(Request $request, Port $port): Response 'graphDuration' => $interval * $nbPlot, 'fetchLink' => route('realtime.data', ['port' => $port->port_id]), 'graphTitle' => $title, - 'deviceName' => $port->device->displayName(), + 'deviceName' => $port->device->display, 'errorText' => "Cannot get data about interface $port->ifIndex", ]) ->header('Content-Type', 'image/svg+xml; charset=UTF-8'); diff --git a/app/Http/Controllers/Routing/Ospfv3Controller.php b/app/Http/Controllers/Routing/Ospfv3Controller.php index 42252754a6b..c9d8f1214a3 100644 --- a/app/Http/Controllers/Routing/Ospfv3Controller.php +++ b/app/Http/Controllers/Routing/Ospfv3Controller.php @@ -34,6 +34,7 @@ class Ospfv3Controller extends Controller public function __invoke(Request $request): View { $instances = Ospfv3Instance::hasAccess($request->user()) + ->where('ospfv3AdminStatus', 'enabled') ->with('device') ->withCount([ 'areas', diff --git a/app/Http/Controllers/Search/Data/Gateway.php b/app/Http/Controllers/Search/Data/Gateway.php new file mode 100644 index 00000000000..a77d6d7858f --- /dev/null +++ b/app/Http/Controllers/Search/Data/Gateway.php @@ -0,0 +1,44 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace App\Http\Controllers\Search\Data; + +use App\Models\Port; +use LibreNMS\Util\IP; + +class Gateway +{ + /** + * @param Port|null $port the interface with this IP, when it is monitored + * @param int $devices how many devices have a default route through it, 0 for a router found on the subnet + */ + public function __construct( + public readonly IP $ip, + public readonly ?Port $port, + public readonly int $devices, + ) { + } +} diff --git a/app/Logging/Reporting/Middleware/AddGitInformation.php b/app/Http/Controllers/Search/Data/HostKey.php similarity index 54% rename from app/Logging/Reporting/Middleware/AddGitInformation.php rename to app/Http/Controllers/Search/Data/HostKey.php index 26b8c7615c2..c0cf6f31d47 100644 --- a/app/Logging/Reporting/Middleware/AddGitInformation.php +++ b/app/Http/Controllers/Search/Data/HostKey.php @@ -1,9 +1,9 @@ */ -namespace App\Logging\Reporting\Middleware; +namespace App\Http\Controllers\Search\Data; -use LibreNMS\Util\Git; -use Spatie\FlareClient\Report; +use LibreNMS\Util\IP; -class AddGitInformation implements \Spatie\FlareClient\FlareMiddleware\FlareMiddleware +class HostKey { /** - * @return mixed + * @param list $ips + * @param list $macs + * @param string|null $hostname the name that resolved to the IPs */ - public function handle(Report $report, \Closure $next) - { - $git = Git::make(180); - - $report->group('git', [ - 'hash' => $git->commitHash(), - 'message' => $git->message(), - 'tag' => $git->shortTag(), - 'remote' => $git->remoteUrl(), - ]); + public function __construct( + public readonly array $ips = [], + public readonly array $macs = [], + public readonly ?string $hostname = null, + ) { + } - return $next($report); + /** + * @return list + */ + public function compressedIps(): array + { + return array_map(fn (IP $ip): string => $ip->compressed(), $this->ips); } } diff --git a/app/Http/Controllers/Search/Data/HostLocation.php b/app/Http/Controllers/Search/Data/HostLocation.php new file mode 100644 index 00000000000..c327bce9e35 --- /dev/null +++ b/app/Http/Controllers/Search/Data/HostLocation.php @@ -0,0 +1,88 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace App\Http\Controllers\Search\Data; + +use App\Models\Port; +use App\Models\PortsFdb; +use Carbon\Carbon; + +class HostLocation +{ + public function __construct( + public readonly string $mac, + public readonly int $portId, + public readonly ?Port $port, + public readonly ?int $vlan, + public readonly int $macCount, + public readonly ?Carbon $updatedAt, + ) { + } + + /** + * @param PortsFdb $entry selected with its mac_count and the port's links_count + */ + public static function fromFdb(PortsFdb $entry): self + { + return new self($entry->mac_address, (int) $entry->port_id, $entry->port, $entry->vlan === null ? null : (int) $entry->vlan, (int) $entry->mac_count, $entry->updated_at); + } + + public function isUplink(): bool + { + return $this->port?->links_count > 0; + } + + /** + * Ports that can't be called the host's port: links to other network devices and aggregates. + * An aggregate may be a bonded server, but most carry traffic for a whole switch. + */ + public function isTrunk(): bool + { + return $this->isUplink() || $this->port?->ifType === 'ieee8023adLag'; + } + + public function state(): LocationState + { + return match (true) { + $this->isTrunk() => LocationState::Trunk, + $this->macCount === 1 => LocationState::Direct, + default => LocationState::Shared, + }; + } + + public function portDescription(): ?string + { + return self::describePort($this->port); + } + + /** + * The port's description, when it says more than its name + */ + public static function describePort(?Port $port): ?string + { + return $port && $port->getDescription() != $port->getLabel() ? $port->getDescription() : null; + } +} diff --git a/app/Models/VrfLite.php b/app/Http/Controllers/Search/Data/HostMac.php similarity index 64% rename from app/Models/VrfLite.php rename to app/Http/Controllers/Search/Data/HostMac.php index 03e4f5a3bb7..9f2fffe3be3 100644 --- a/app/Models/VrfLite.php +++ b/app/Http/Controllers/Search/Data/HostMac.php @@ -1,9 +1,9 @@ */ -namespace App\Models; +namespace App\Http\Controllers\Search\Data; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use Carbon\Carbon; -class VrfLite extends DeviceRelatedModel +class HostMac { - use HasFactory; - protected $table = 'vrf_lite_cisco'; - protected $primaryKey = 'vrf_lite_cisco_id'; - public $timestamps = false; + /** + * @param bool $stale seen long before the host's newest MAC + */ + public function __construct( + public readonly string $hex, + public readonly ?Carbon $seen, + public readonly bool $stale, + ) { + } } diff --git a/app/Http/Controllers/Search/Data/HostRecord.php b/app/Http/Controllers/Search/Data/HostRecord.php new file mode 100644 index 00000000000..2cf31c1276a --- /dev/null +++ b/app/Http/Controllers/Search/Data/HostRecord.php @@ -0,0 +1,200 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace App\Http\Controllers\Search\Data; + +use App\Models\Device; +use App\Models\Port; +use LibreNMS\Util\IP; +use LibreNMS\Util\Mac; + +class HostRecord +{ + /** + * @param list $ips + * @param list $macs + * @param list $locations closest port first + * @param list $entries ARP and ND + * @param bool $severalMacs devices report different MACs for an address in the same context, a device only keeps the latest so this can't tell if they are in use at the same time + */ + public function __construct( + public readonly array $ips, + public readonly array $macs, + public readonly array $locations, + public readonly array $entries, + public readonly ?Port $interface, + public readonly ?Device $device, + public readonly bool $severalMacs, + ) { + } + + public function isNotSeen(): bool + { + return $this->entries === [] && $this->locations === [] && $this->interface === null && $this->device === null; + } + + /** + * The first IP, or the first MAC when no IP is known + */ + public function title(): string + { + return ($this->ips[0] ?? null)?->compressed() ?? Mac::parse(($this->macs[0] ?? null)?->hex)->readable(); + } + + public function isMonitored(): bool + { + return $this->interface !== null || $this->device !== null; + } + + public function interfaceDescription(): ?string + { + return HostLocation::describePort($this->interface); + } + + /** + * The closest port, stale MACs don't count + */ + public function bestLocation(?string $mac = null): ?HostLocation + { + foreach ($this->locations as $location) { + if ($mac === null ? ! $this->isStale($location->mac) : $location->mac === $mac) { + return $location; + } + } + + return null; + } + + public function locationState(): LocationState + { + return $this->bestLocation()?->state() ?? LocationState::Unknown; + } + + /** + * What the list and export show: one row for each MAC when devices report several for an address + * + * @return non-empty-list + */ + public function rows(): array + { + if ($this->severalMacs) { + return array_map(fn (HostMac $mac): HostRow => new HostRow($mac, $this->bestLocation($mac->hex), $mac->seen, $mac->stale), $this->macs) ?: [new HostRow(null, null, null, false)]; + } + + $seen = array_filter(array_column($this->macs, 'seen')); + + return [new HostRow($this->macs[0] ?? null, $this->bestLocation(), $seen ? max($seen) : null, false)]; + } + + /** + * Current forwarding entries, closest first, one for each port with its VLAN if it has one + * + * @return list + */ + public function currentLocations(): array + { + $byPort = []; + foreach ($this->locations as $location) { + if ($this->isStale($location->mac)) { + continue; + } + if (! isset($byPort[$location->portId]) || ($byPort[$location->portId]->vlan === null && $location->vlan !== null)) { + $byPort[$location->portId] = $location; + } + } + + return array_values($byPort); + } + + /** + * Forwarding entries on ports other than the best one + * + * @return list + */ + public function otherLocations(): array + { + $best = $this->bestLocation(); + + return array_values(array_filter($this->currentLocations(), fn (HostLocation $location) => $location->portId !== $best?->portId)); + } + + /** + * With no clear port every place it was seen is listed as an equal + */ + public function hasNoClearPort(): bool + { + return $this->locationState() === LocationState::Trunk && ! $this->severalMacs && ! $this->interface; + } + + /** + * Forwarding entries to list apart from where the host is + * + * @return list + */ + public function alsoLearnedOn(): array + { + return $this->interface ? $this->currentLocations() : $this->otherLocations(); + } + + public function showsAlsoLearned(): bool + { + return $this->alsoLearnedOn() !== [] && ! $this->severalMacs && ! $this->hasNoClearPort(); + } + + /** + * ARP and ND entries for each interface, the first interface first + * + * @return list> + */ + public function neighborInterfaces(): array + { + $byPort = []; + foreach ($this->entries as $entry) { + $byPort[$entry->port->port_id ?? 0][$entry->key()] = $entry; + } + + return array_map(array_values(...), array_values($byPort)); + } + + /** + * The interface that knows a host when nothing says where it is: not monitored and not in a forwarding table + */ + public function viaPort(): ?Port + { + return $this->isMonitored() ? null : ($this->entries[0]->port ?? null); + } + + public function isStale(string $mac): bool + { + foreach ($this->macs as $entry) { + if ($entry->hex === $mac) { + return $entry->stale; + } + } + + return false; + } +} diff --git a/includes/polling/sensors/temperature/aos-emu2.inc.php b/app/Http/Controllers/Search/Data/HostRow.php similarity index 58% rename from includes/polling/sensors/temperature/aos-emu2.inc.php rename to app/Http/Controllers/Search/Data/HostRow.php index b1500a356fe..bc08b6482aa 100644 --- a/includes/polling/sensors/temperature/aos-emu2.inc.php +++ b/app/Http/Controllers/Search/Data/HostRow.php @@ -1,9 +1,9 @@ + * @copyright 2026 Tony Murray + * @author Tony Murray */ -$scale = SnmpQuery::cache()->enumStrings()->get('PowerNet-MIB::emsStatusSysTempUnits.0')->value(); -$sensor_value = fahrenheit_to_celsius($sensor_value, $scale); +namespace App\Http\Controllers\Search\Data; + +use Carbon\Carbon; + +class HostRow +{ + public function __construct( + public readonly ?HostMac $mac, + public readonly ?HostLocation $location, + public readonly ?Carbon $seen, + public readonly bool $stale, + ) { + } +} diff --git a/app/Http/Controllers/Search/Data/HostSubnet.php b/app/Http/Controllers/Search/Data/HostSubnet.php new file mode 100644 index 00000000000..62d9ce95aeb --- /dev/null +++ b/app/Http/Controllers/Search/Data/HostSubnet.php @@ -0,0 +1,63 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace App\Http\Controllers\Search\Data; + +use Illuminate\Support\Collection; + +class HostSubnet +{ + /** + * @param Collection $gateways + * @param Collection $peers interfaces on the subnet, without the gateways + * @param string|null $network the host's network in cidr format + */ + public function __construct( + public readonly Collection $gateways, + public readonly Collection $peers, + public readonly ?string $network, + ) { + } + + public function count(): int + { + return $this->gateways->count() + $this->peers->count(); + } + + /** + * How many of those past the first $limit are interfaces on the network, the rest can't be listed by searching it + */ + public function hiddenOnNetwork(int $limit): int + { + if ($this->network === null) { + return 0; + } + + return $this->gateways->concat($this->peers)->skip($limit) + ->filter(fn (Gateway|SubnetAddress $item): bool => $item->port !== null && $item->ip->inNetwork($this->network)) + ->count(); + } +} diff --git a/app/Http/Controllers/Search/Data/LocationState.php b/app/Http/Controllers/Search/Data/LocationState.php new file mode 100644 index 00000000000..acea1259906 --- /dev/null +++ b/app/Http/Controllers/Search/Data/LocationState.php @@ -0,0 +1,51 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace App\Http\Controllers\Search\Data; + +enum LocationState +{ + /** the only MAC on the port */ + case Direct; + /** one of several MACs on the port */ + case Shared; + /** no port stands out: links to other network devices and aggregates */ + case Trunk; + /** not in a forwarding table */ + case Unknown; + + /** + * The colour of its labels and status bars + */ + public function labelClass(): string + { + return match ($this) { + self::Direct => 'label-success', + self::Shared => 'label-default', + self::Trunk, self::Unknown => 'label-warning', + }; + } +} diff --git a/app/Http/Controllers/Search/Data/NeighborEntry.php b/app/Http/Controllers/Search/Data/NeighborEntry.php new file mode 100644 index 00000000000..bcf09f2108f --- /dev/null +++ b/app/Http/Controllers/Search/Data/NeighborEntry.php @@ -0,0 +1,53 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace App\Http\Controllers\Search\Data; + +use App\Models\Port; +use LibreNMS\Util\IP; + +class NeighborEntry +{ + /** + * @param string $source ARP or ND + */ + public function __construct( + public readonly string $source, + public readonly IP $ip, + public readonly string $mac, + public readonly ?Port $port, + public readonly string $context, + ) { + } + + /** + * The same fact can come from several queries or contexts + */ + public function key(): string + { + return implode('|', [$this->source, $this->ip->compressed(), $this->mac, $this->port?->port_id]); + } +} diff --git a/app/Http/Controllers/Search/Data/SubnetAddress.php b/app/Http/Controllers/Search/Data/SubnetAddress.php new file mode 100644 index 00000000000..db1fb65410e --- /dev/null +++ b/app/Http/Controllers/Search/Data/SubnetAddress.php @@ -0,0 +1,72 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace App\Http\Controllers\Search\Data; + +use App\Models\Ipv4Address; +use App\Models\Ipv6Address; +use App\Models\Port; +use LibreNMS\Util\IP; + +class SubnetAddress +{ + public function __construct( + public readonly IP $ip, + public readonly int $prefixLength, + public readonly int $portId, + public readonly ?Port $port, + ) { + } + + public static function from(Ipv4Address|Ipv6Address $address): ?self + { + $isIpv4 = $address instanceof Ipv4Address; + $ip = IP::parse($isIpv4 ? $address->ipv4_address : $address->ipv6_address, true); + + return $ip === null ? null : new self($ip, (int) ($isIpv4 ? $address->ipv4_prefixlen : $address->ipv6_prefixlen), (int) $address->port_id, $address->port); + } + + /** + * The address with its prefix length + */ + public function cidr(): string + { + return $this->ip->compressed() . '/' . $this->prefixLength; + } + + /** + * The network this address is in, in cidr format + */ + public function network(): string + { + return $this->ip->getNetwork($this->prefixLength); + } + + public function isOnNetworkDevice(): bool + { + return in_array($this->port?->device?->type, ['network', 'firewall']); + } +} diff --git a/app/Http/Controllers/Search/HostExportController.php b/app/Http/Controllers/Search/HostExportController.php new file mode 100644 index 00000000000..95beba07185 --- /dev/null +++ b/app/Http/Controllers/Search/HostExportController.php @@ -0,0 +1,136 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace App\Http\Controllers\Search; + +use App\Facades\LibrenmsConfig; +use App\Http\Controllers\Controller; +use App\Http\Controllers\Search\Data\HostKey; +use App\Http\Controllers\Search\Data\HostRecord; +use App\Http\Controllers\Search\Data\HostRow; +use App\Http\Requests\HostSearchRequest; +use App\Models\Port; +use App\Models\UserPref; +use Illuminate\Support\Enumerable; +use LibreNMS\Util\IP; +use LibreNMS\Util\Mac; +use Symfony\Component\HttpFoundation\StreamedResponse; + +class HostExportController extends Controller +{ + private const int CHUNK_SIZE = 500; + + public function __invoke(HostSearchRequest $request): StreamedResponse + { + $this->authorize('viewAny', Port::class); + + $validated = $request->validated(); + $user = $request->user(); + + $query = $request->listQuery(); + $rows = $query->build($request->sort(), $request->direction()); + $lookup = new HostLookup($user); + $macFormat = (string) (UserPref::getPref($user, 'network_search_mac_format') ?? 'colon'); + + return response()->streamDownload(function () use ($rows, $query, $lookup, $macFormat, $validated): void { + $output = fopen('php://output', 'w'); + fprintf($output, chr(0xEF) . chr(0xBB) . chr(0xBF)); + fputcsv($output, $this->headers(), ',', '"', '\\'); + + $write = function (Enumerable $page) use ($output, $query, $lookup, $macFormat): void { + $hosts = $lookup->find($page->map(fn (object $row): HostKey => $query->hostKey((array) $row))->values()->all()); + foreach ($hosts as $host) { + foreach ($this->rows($host, $macFormat) as $row) { + fputcsv($output, array_map($this->neutralizeFormula(...), $row), ',', '"', '\\'); + } + } + }; + + if (($validated['export'] ?? 'all') === 'page') { + $write($rows->forPage((int) ($validated['page'] ?? 1), (int) ($validated['perPage'] ?? 25))->get()); + } else { + $rows->cursor()->chunk(self::CHUNK_SIZE)->each($write); + } + + fclose($output); + }, 'network-search-' . date('Y-m-d-His') . '.csv', ['Content-Type' => 'text/csv; charset=UTF-8']); + } + + /** + * @return list + */ + private function headers(): array + { + return array_map(fn (string $key): string => __("search.export.$key"), [ + 'ip', 'mac', 'vendor', 'interface', 'switch', 'port', 'port_description', 'vlan', 'macs_on_port', 'seen_via', 'last_seen', + ]); + } + + /** + * @return list> + */ + private function rows(HostRecord $host, string $macFormat): array + { + $ips = implode(' ', array_map(fn (IP $ip): string => $ip->compressed(), $host->ips)); + + return array_map(fn (HostRow $row): array => [ + $ips, + $row->mac ? $this->formatMac($row->mac->hex, $macFormat) : '', + $row->mac && LibrenmsConfig::get('mac_oui.enabled') ? Mac::parse($row->mac->hex)->vendor() : '', + $this->portText($host->interface) ?: $host->device?->display, + $row->location?->port?->device?->display, + $row->location?->port?->getLabel(), + $row->location?->portDescription(), + $row->location?->vlan, + $row->location?->macCount, + $row->location ? '' : $this->portText($host->viaPort()), + $row->seen?->toDateTimeString(), + ], $host->rows()); + } + + /** + * Port descriptions and device names come from the devices, a spreadsheet would run one that looks like a formula + */ + private function neutralizeFormula(mixed $value): mixed + { + return is_string($value) && preg_match('/^[=+\-@\t\r]/', $value) ? "'" . $value : $value; + } + + private function portText(?Port $port): string + { + return $port ? trim($port->device?->display . ' ' . $port->getLabel()) : ''; + } + + private function formatMac(string $hex, string $format): string + { + return match ($format) { + 'dash' => implode('-', str_split($hex, 2)), + 'dot' => implode('.', str_split($hex, 4)), + 'bare' => $hex, + default => implode(':', str_split($hex, 2)), + }; + } +} diff --git a/app/Http/Controllers/Search/HostListQuery.php b/app/Http/Controllers/Search/HostListQuery.php new file mode 100644 index 00000000000..0d6259f6dfd --- /dev/null +++ b/app/Http/Controllers/Search/HostListQuery.php @@ -0,0 +1,564 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace App\Http\Controllers\Search; + +use App\Http\Controllers\Search\Data\HostKey; +use App\Models\Device; +use App\Models\Ipv4Address; +use App\Models\Ipv4Mac; +use App\Models\Ipv6Address; +use App\Models\Ipv6Nd; +use App\Models\Port; +use App\Models\PortsFdb; +use App\Models\User; +use Illuminate\Contracts\Database\Query\Builder as AnyBuilder; +use Illuminate\Contracts\Database\Query\Expression; +use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Query\Builder as QueryBuilder; +use Illuminate\Support\Facades\DB; +use LibreNMS\Util\IP; +use LibreNMS\Util\IPv6; +use LibreNMS\Util\SearchTerm; + +class HostListQuery +{ + public const SOURCES = ['neighbor', 'fdb', 'interface', 'device']; + + /** Ignored everywhere: incomplete ARP and ND entries, and broadcast */ + public const JUNK_MACS = ['', '000000000000', 'ffffffffffff']; + + private const array PORT_FILTERS = ['device_id', 'device.groups.id', 'port_id', 'ifAlias', 'ifType']; + + /** + * @param list $terms empty lists every host + * @param array> $filters + */ + public function __construct(private readonly array $terms, private readonly array $filters, private readonly User $user) + { + } + + /** + * One row per IP, or per MAC when no IP is known for it. A search for MACs has one row per MAC instead, + * a single MAC can have hundreds of addresses. + * + * @param string $sort ip, mac, seen or input: the order the terms were given in + */ + public function build(string $sort = 'ip', string $direction = 'asc'): QueryBuilder + { + $direction = $direction == 'desc' ? 'desc' : 'asc'; + // ends in what makes a row unique, pages and export chunks are separate queries that must agree on the order + $byIp = "MIN(ip) IS NULL, LENGTH(INET6_ATON(MIN(ip))) $direction, INET6_ATON(MIN(ip)) $direction, {$this->groupKey()}"; + + $query = $this->rows(); + + return match ($sort) { + 'mac' => $query->orderByRaw("MIN(mac) IS NULL, MIN(mac) $direction, $byIp"), + 'seen' => $query->leftJoinSub($this->lastSeen(), 'seen', 'seen.mac_address', '=', 'hosts.mac') + ->orderByRaw("MAX(seen.seen) IS NULL, MAX(seen.seen) $direction, $byIp"), + 'input' => $this->orderAsGiven($query)->orderByRaw($byIp), + default => $query->orderByRaw($byIp), + }; + } + + public function defaultSort(): string + { + return count($this->terms) > 1 ? 'input' : 'ip'; + } + + /** + * What a row of the built query names for HostLookup: its IP, or its MAC when no IP is known or the rows are grouped by MAC + * + * @param array $row + */ + public function hostKey(array $row): HostKey + { + $mac = is_string($row['mac'] ?? null) ? $row['mac'] : null; + $ip = is_string($row['ip'] ?? null) ? IP::parse($row['ip'], true) : null; + + return $ip !== null && ($mac === null || ! $this->groupsByMac()) + ? new HostKey(ips: [$ip]) + : new HostKey(macs: $mac !== null ? [$mac] : []); + } + + public function groupsByMac(): bool + { + return $this->terms !== [] && array_all($this->terms, fn (SearchTerm $term): bool => $term->isAddressLike()); + } + + /** + * How many of the addresses in a pasted list nothing knows about + * + * @param int $total how many rows the built query has + */ + public function notSeenCount(int $total): int + { + if ($this->notFoundRows() === []) { + return 0; + } + + return $total - $this->rows(withNotFound: false)->getCountForPagination(); + } + + private function rows(bool $withNotFound = true): QueryBuilder + { + return DB::query()->fromSub($this->union($withNotFound), 'hosts') + ->selectRaw('MIN(ip) as ip, MIN(mac) as mac') + ->groupByRaw($this->groupKey()); + } + + /** + * What makes a row unique + */ + private function groupKey(): string + { + return $this->groupsByMac() ? 'COALESCE(mac, ip)' : 'COALESCE(ip, mac)'; + } + + private function union(bool $withNotFound = true): QueryBuilder + { + $branches = []; + foreach (self::SOURCES as $source) { + if ($this->isSourceSelected($source)) { + array_push($branches, ...$this->branches($source)); + } + } + if ($withNotFound) { + array_push($branches, ...$this->notFoundRows()); + } + + $union = array_shift($branches) ?? DB::query()->selectRaw('NULL as ip, NULL as mac')->whereRaw('1 = 0'); + foreach ($branches as $branch) { + $union->union($branch); + } + + return $union; + } + + /** + * @return list + */ + private function branches(string $source): array + { + return array_values(array_filter(match ($source) { + 'neighbor' => [ + $this->neighborTable(Ipv4Mac::hasAccess($this->user), 'ipv4_mac', 'ipv4_address', fn (SearchTerm $term) => $term->isIpv4()), + $this->neighborTable(Ipv6Nd::hasAccess($this->user), 'ipv6_nd', 'ipv6_address', fn (SearchTerm $term) => $term->isIpv6()), + ], + 'fdb' => [$this->fdb()], + 'interface' => [ + $this->interfaceIps(Ipv4Address::hasAccess($this->user), 'ipv4_addresses', 'ipv4_address', fn (SearchTerm $term) => $term->isIpv4()), + $this->interfaceIps(Ipv6Address::hasAccess($this->user), 'ipv6_addresses', 'ipv6_address', fn (SearchTerm $term) => $term->isIpv6(), 'ipv6_addresses.ipv6_compressed'), + $this->interfaceMacs(), + ], + 'device' => [$this->devices()], + default => [], + })); + } + + /** + * When each MAC was last seen, ARP entries have no time + */ + private function lastSeen(): QueryBuilder + { + $seen = DB::table('ports_fdb')->select('mac_address', 'updated_at') + ->unionAll(DB::table('ipv6_nd')->select('mac_address', 'updated_at')); + + return DB::query()->fromSub($seen, 'entries')->selectRaw('mac_address, MAX(updated_at) as seen')->groupBy('mac_address'); + } + + /** + * Terms that don't name one address go last + */ + private function orderAsGiven(QueryBuilder $query): QueryBuilder + { + $given = []; + foreach ($this->terms as $term) { + $given[] = $term->macHex ?? (string) $term->ip?->compressed(); + } + if ($given === []) { + return $query; + } + + $place = fn (string $column): string => "CASE $column " . implode(' ', array_map(fn (int $index): string => 'WHEN ? THEN ' . ($index + 1), array_keys($given))) . ' END'; + + return $query->orderByRaw("COALESCE({$place('MIN(ip)')}, {$place('MIN(mac)')}, " . (count($given) + 1) . ')', [...$given, ...$given]); + } + + /** + * An ARP or ND table, $isSameFamily says if a term's IP could be in it + * + * @param Builder $query + * @param \Closure(SearchTerm): bool $isSameFamily + */ + private function neighborTable(Builder $query, string $table, string $ipColumn, \Closure $isSameFamily): ?QueryBuilder + { + $terms = $this->termsWhere(fn (SearchTerm $term) => $isSameFamily($term) || $term->isAddressLike()); + if ($this->cannotMatch($terms)) { + return null; + } + + $query->whereNotIn("$table.mac_address", self::JUNK_MACS); + $this->matchAny($query, $terms, function (Builder $q, SearchTerm $term) use ($table, $isSameFamily): void { + if ($isSameFamily($term)) { + $this->whereNeighborIp($q, $term); + } + $this->orWhereMac($q, "$table.mac_address", $term); + }); + + return $this->scopeToVlan($this->scopeNeighborsToPorts($query, $table), $table) + ->toBase()->select(DB::raw("INET6_NTOA(INET6_ATON($table.$ipColumn)) as ip"), "$table.mac_address as mac"); + } + + /** + * With the neighbor tables searched, only the MACs they didn't resolve to an IP: the rest are listed by their IP. + * On its own this also finds an IP, through the MAC the neighbor tables know for it. + */ + private function fdb(): ?QueryBuilder + { + $withNeighbors = $this->isSourceSelected('neighbor'); + $terms = $this->termsWhere(fn (SearchTerm $term) => $term->isAddressLike() || (! $withNeighbors && $term->isIp())); + if ($this->cannotMatch($terms)) { + return null; + } + + $query = PortsFdb::hasAccess($this->user)->whereNotIn('ports_fdb.mac_address', self::JUNK_MACS); + $this->matchAny($query, $terms, function (Builder $q, SearchTerm $term): void { + $this->orWhereMac($q, 'ports_fdb.mac_address', $term); + if ($term->isIp()) { + $neighbors = $term->isIpv6() ? Ipv6Nd::hasAccess($this->user)->select('ipv6_nd.mac_address') : Ipv4Mac::hasAccess($this->user)->select('ipv4_mac.mac_address'); + $q->orWhereIn('ports_fdb.mac_address', $this->whereNeighborIp($neighbors, $term)); + } + }); + if ($withNeighbors) { + $this->exceptMacsWithIp($query, 'ports_fdb.mac_address'); + } + + return $this->scopeToVlan($this->scopeToPorts($query, 'ports_fdb'), 'ports_fdb') + ->toBase()->select(DB::raw('NULL as ip'), 'ports_fdb.mac_address as mac'); + } + + /** + * @param Builder $query + * @param \Closure(SearchTerm): bool $applies + */ + private function interfaceIps(Builder $query, string $table, string $column, \Closure $applies, ?string $alternateColumn = null): ?QueryBuilder + { + $terms = $this->termsWhere($applies); + if ($this->cannotMatch($terms) || $this->hasFilter('vlan')) { + return null; + } + + $this->matchAny($query, $terms, fn (Builder $q, SearchTerm $term) => $this->whereIp($q, "$table.$column", $term, $alternateColumn)); + + $query->join('ports', 'ports.port_id', '=', "$table.port_id"); + + return $this->scopeToPorts($query, $table) + ->toBase()->select(DB::raw("INET6_NTOA(INET6_ATON($table.$column)) as ip"), 'ports.ifPhysAddress as mac'); + } + + /** + * MACs of interfaces without an address, ports sharing a MAC collapse into one row + */ + private function interfaceMacs(): ?QueryBuilder + { + $terms = $this->termsWhere(fn (SearchTerm $term) => $term->isAddressLike()); + if ($this->cannotMatch($terms) || $this->hasFilter('vlan')) { + return null; + } + + $query = Port::hasAccess($this->user)->isNotDeleted()->whereNotNull('ports.ifPhysAddress')->where('ports.ifPhysAddress', '!=', ''); + $this->matchAny($query, $terms, fn (Builder $q, SearchTerm $term) => $this->whereMac($q, 'ports.ifPhysAddress', $term)); + if ($this->isSourceSelected('neighbor')) { + $this->exceptMacsWithIp($query, 'ports.ifPhysAddress'); + } + $query->whereNotIn('ports.ifPhysAddress', self::JUNK_MACS); + $query->whereNotIn('ports.ifPhysAddress', fn ($sub) => $sub->from('ports as with_ip')->select('with_ip.ifPhysAddress') + ->whereNotNull('with_ip.ifPhysAddress') + ->where(fn ($has) => $has->whereIn('with_ip.port_id', fn ($v4) => $v4->from('ipv4_addresses')->select('port_id')) + ->orWhereIn('with_ip.port_id', fn ($v6) => $v6->from('ipv6_addresses')->select('port_id')))); + + return $this->scopeToPorts($query, 'ports')->toBase()->select(DB::raw('NULL as ip'), 'ports.ifPhysAddress as mac'); + } + + private function devices(): ?QueryBuilder + { + if ($this->filteredPorts() !== null || $this->hasFilter('vlan')) { + return null; + } + + $query = Device::hasAccess($this->user)->whereNotNull('devices.ip') + ->leftJoin('locations', 'devices.location_id', '=', 'locations.id'); + + $this->matchAny($query, $this->terms, function (Builder $q, SearchTerm $term): void { + $like = $term->like(); + $q->whereLike('devices.hostname', $like) + ->orWhereLike('devices.sysName', $like) + ->orWhereLike('devices.display', $like); + + if ($term->mayBeText()) { + $q->orWhereLike('devices.hardware', $like) + ->orWhereLike('devices.serial', $like) + ->orWhereLike('devices.purpose', $like) + ->orWhereLike('devices.notes', $like) + ->orWhereLike('locations.location', $like); + } + + if ($range = $term->networkRange()) { + // the column holds both families, and hex strings of different lengths can sort into each other's range + $q->orWhereRaw('LENGTH(devices.ip) = ? AND HEX(devices.ip) BETWEEN ? AND ?', [strlen($range[0]) / 2, ...$range]); + } elseif ($term->isExactIp()) { + $q->orWhere('devices.ip', $term->ip?->packed()); + } + }); + + return $query->toBase()->selectRaw('INET6_NTOA(devices.ip) as ip, NULL as mac'); + } + + /** + * Pasted addresses that nothing matched still get a row, so the list shows they were not seen + * + * @return list + */ + private function notFoundRows(): array + { + if (count($this->terms) < 2 || $this->filters !== []) { + return []; + } + + // a MAC the neighbor tables know is already listed by its IP + $macs = array_values(array_filter(array_map(fn (SearchTerm $term) => $term->isFullMac() ? $term->macHex : null, $this->terms))); + $withIp = Ipv4Mac::hasAccess($this->user)->whereIn('ipv4_mac.mac_address', $macs)->pluck('mac_address') + ->merge(Ipv6Nd::hasAccess($this->user)->whereIn('ipv6_nd.mac_address', $macs)->pluck('mac_address')); + + $rows = []; + foreach ($this->terms as $term) { + if ($term->isExactIp()) { + $rows[] = DB::query()->selectRaw('? as ip, NULL as mac', [$term->ip?->compressed()]); + } elseif ($term->isFullMac() && ! $withIp->contains($term->macHex)) { + $rows[] = DB::query()->selectRaw('NULL as ip, ? as mac', [$term->macHex]); + } + } + + return $rows; + } + + /** + * @param \Closure(SearchTerm): bool $applies + * @return list + */ + private function termsWhere(\Closure $applies): array + { + return array_values(array_filter($this->terms, $applies)); + } + + /** + * This search has terms, but none of them could be found in a source + * + * @param list $applicableTerms + */ + private function cannotMatch(array $applicableTerms): bool + { + return $this->terms !== [] && $applicableTerms === []; + } + + /** + * Without terms this matches everything + * + * @param Builder $query + * @param list $terms + * @param \Closure(Builder, SearchTerm): mixed $match + */ + private function matchAny(Builder $query, array $terms, \Closure $match): void + { + if ($terms === []) { + return; + } + + $query->where(function (Builder $any) use ($terms, $match): void { + foreach ($terms as $term) { + $any->orWhere(fn (Builder $q) => $match($q, $term)); + } + }); + } + + /** + * Match the IP column of the neighbor table for this term's address family + * + * @template TQuery of AnyBuilder + * + * @param TQuery $query + * @return TQuery + */ + private function whereNeighborIp(AnyBuilder $query, SearchTerm $term): AnyBuilder + { + return $term->isIpv6() + ? $this->whereIp($query, 'ipv6_nd.ipv6_address', $term, DB::raw('INET6_NTOA(INET6_ATON(ipv6_nd.ipv6_address))')) + : $this->whereIp($query, 'ipv4_mac.ipv4_address', $term); + } + + /** + * Match an IP address column: exact address, network or partial address. + * Address columns store IPv4 compressed and IPv6 uncompressed. + * + * @template TQuery of AnyBuilder + * + * @param TQuery $query + * @param string|Expression|null $alternateColumn the same address compressed, to find partial IPv6 addresses + * @return TQuery + */ + private function whereIp(AnyBuilder $query, string $column, SearchTerm $term, string|Expression|null $alternateColumn = null): AnyBuilder + { + if ($range = $term->networkRange()) { + return $query->whereRaw("HEX(INET6_ATON($column)) BETWEEN ? AND ?", $range); + } + + if ($term->isExactIp()) { + $exact = $term->ip instanceof IPv6 ? $term->ip->uncompressed() : $term->ip?->compressed(); + if ($alternateColumn && $term->mayBePartialIpv6()) { + return $query->where(fn (AnyBuilder $q) => $q->where($column, $exact)->orWhereLike($alternateColumn, $term->ip?->compressed() . '%')); + } + + return $query->where($column, $exact); + } + + return $query->where(fn (AnyBuilder $q) => $q->whereLike($column, $term->like()) + ->when($alternateColumn, fn (AnyBuilder $q) => $q->orWhereLike($alternateColumn, $term->like()))); + } + + /** + * @param Builder $query + */ + private function orWhereMac(Builder $query, string $column, SearchTerm $term): void + { + if ($term->isAddressLike()) { + $query->orWhere(fn (Builder $mac) => $this->whereMac($mac, $column, $term)); + } + } + + /** + * Match a MAC address column (12 lowercase hex digits): partial MAC or vendor + * + * @template TQuery of AnyBuilder + * + * @param TQuery $query + * @return TQuery + */ + private function whereMac(AnyBuilder $query, string $column, SearchTerm $term): AnyBuilder + { + if ($term->isMac()) { + return $term->isFullMac() ? $query->where($column, $term->macHex) : $query->whereLike($column, "%$term->macHex%"); + } + + $ouis = $term->vendorOuis(); + + return $query->where(function (AnyBuilder $q) use ($column, $ouis): void { + $q->whereIn(DB::raw('SUBSTR(' . DB::getQueryGrammar()->wrap($column) . ', 1, 6)'), $ouis['short']); + foreach ($ouis['long'] as $oui) { + $q->orWhereLike($column, "$oui%"); + } + }); + } + + /** + * @param Builder $query + */ + private function exceptMacsWithIp(Builder $query, string $column): void + { + $query->whereNotIn($column, Ipv4Mac::hasAccess($this->user)->select('ipv4_mac.mac_address')) + ->whereNotIn($column, Ipv6Nd::hasAccess($this->user)->select('ipv6_nd.mac_address')); + } + + /** + * The ports the filters ask for, null when they don't narrow the ports + * + * @return Builder|null + */ + private function filteredPorts(): ?Builder + { + $portFilters = array_intersect_key($this->filters, array_flip(self::PORT_FILTERS)); + + return $portFilters ? Port::query()->applyFilters($portFilters)->select('ports.port_id') : null; + } + + /** + * @param Builder $query + * @return Builder + */ + private function scopeToPorts(Builder $query, string $table): Builder + { + $ports = $this->filteredPorts(); + + return $ports ? $query->whereIn("$table.port_id", $ports) : $query; + } + + /** + * A router learns the IP but the switch port is in the forwarding table, either one can be what is asked for + * + * @param Builder $query + * @return Builder + */ + private function scopeNeighborsToPorts(Builder $query, string $table): Builder + { + $ports = $this->filteredPorts(); + + return $ports ? $query->where(fn (Builder $q) => $q->whereIn("$table.port_id", $ports) + ->orWhereIn("$table.mac_address", PortsFdb::hasAccess($this->user)->whereIn('ports_fdb.port_id', $ports)->select('ports_fdb.mac_address'))) : $query; + } + + /** + * @param Builder $query + * @return Builder + */ + private function scopeToVlan(Builder $query, string $table): Builder + { + return $this->hasFilter('vlan') ? $query->whereIn("$table.mac_address", $this->macsInVlan()) : $query; + } + + private function hasFilter(string $key): bool + { + return isset($this->filters[$key]); + } + + private function macsInVlan(): QueryBuilder + { + return PortsFdb::hasAccess($this->user)->applyFilters(['vlan' => $this->filters['vlan']])->select('ports_fdb.mac_address')->toBase(); + } + + private function isSourceSelected(string $source): bool + { + $filter = $this->filters['source'] ?? []; + foreach ($filter as $op => $value) { + $values = is_array($value) ? $value : explode(',', (string) $value); + $listed = in_array($source, $values); + if ((in_array($op, ['eq', 'in']) && ! $listed) || (in_array($op, ['neq', 'not_in']) && $listed)) { + return false; + } + } + + return true; + } +} diff --git a/app/Http/Controllers/Search/HostLookup.php b/app/Http/Controllers/Search/HostLookup.php new file mode 100644 index 00000000000..b759c9454dc --- /dev/null +++ b/app/Http/Controllers/Search/HostLookup.php @@ -0,0 +1,221 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace App\Http\Controllers\Search; + +use App\Http\Controllers\Search\Data\HostKey; +use App\Http\Controllers\Search\Data\HostLocation; +use App\Http\Controllers\Search\Data\HostMac; +use App\Http\Controllers\Search\Data\HostRecord; +use App\Http\Controllers\Search\Data\NeighborEntry; +use App\Models\Device; +use App\Models\Ipv4Mac; +use App\Models\Ipv6Nd; +use App\Models\Port; +use App\Models\PortsFdb; +use App\Models\User; +use Carbon\Carbon; +use Illuminate\Database\Eloquent\Builder; +use Illuminate\Support\Collection; +use Illuminate\Support\Facades\DB; +use LibreNMS\Util\IP; +use LibreNMS\Util\IPv4; +use LibreNMS\Util\IPv6; + +class HostLookup +{ + /** Entries further apart than this are old data */ + private const int STALE_AFTER_SECONDS = 86400; + + /** Keeps a MAC with a huge number of addresses in check, scaled so hosts in a batch don't take each other's share */ + private const int MAX_ENTRIES_PER_HOST = 2000; + + public function __construct(private readonly User $user) + { + } + + /** + * @param list $hosts + * @param bool $follow also find the other addresses of the MACs found, a slower lookup for a single host + * @return list + */ + public function find(array $hosts, bool $follow = false): array + { + $allIps = collect($hosts)->flatMap(fn (HostKey $host): array => $host->ips)->values(); + $allMacs = collect($hosts)->flatMap(fn (HostKey $host): array => $host->macs)->values(); + + $limit = self::MAX_ENTRIES_PER_HOST * count($hosts); + $entries = $this->entries($allIps, $allMacs, $limit); + if ($follow) { + // added to what was found, a MAC with more addresses than the limit can't push out the IP asked for + $entries = $entries->concat($this->entries(collect(), $allMacs->merge($entries->pluck('mac'))->unique()->values(), $limit)) + ->unique(fn (NeighborEntry $entry): string => $entry->key()) + ->values(); + } + + $interfaces = new SubnetLookup($this->user)->portsWithIps($allIps); + $devices = Device::hasAccess($this->user)->whereIn('ip', $allIps->map(fn (IP $ip) => $ip->packed()))->get() + ->keyBy(fn (Device $device) => (string) IP::parse((string) $device->ip, true)?->compressed()); + + $macs = $allMacs->merge($entries->pluck('mac')) + ->merge($interfaces->map(fn (Port $port) => (string) $port->getRawOriginal('ifPhysAddress'))->values()) + ->unique()->diff(HostListQuery::JUNK_MACS)->values(); + $locations = $this->fdbLocations($macs)->groupBy('mac'); + $owners = Port::hasAccess($this->user)->isNotDeleted()->with('device')->whereIn('ifPhysAddress', $macs)->get() + ->groupBy(fn (Port $port): string => (string) $port->getRawOriginal('ifPhysAddress')); + $neighborSeen = Ipv6Nd::hasAccess($this->user)->whereIn('mac_address', $macs)->selectRaw('mac_address, MAX(updated_at) as seen')->groupBy('mac_address')->toBase()->pluck('seen', 'mac_address'); + + return array_map(function (HostKey $host) use ($entries, $interfaces, $devices, $locations, $owners, $neighborSeen, $follow): HostRecord { + $wanted = $host->compressedIps(); + $isWanted = fn (NeighborEntry $entry): bool => in_array($entry->ip->compressed(), $wanted); + $matched = $entries->filter(fn (NeighborEntry $entry): bool => $isWanted($entry) || in_array($entry->mac, $host->macs)); + + // the other addresses of a MAC tell us about this host, unless it's unclear which MAC is the host + $matchedMacs = $matched->pluck('mac')->unique(); + if ($follow && $matchedMacs->count() == 1) { + $matched = $entries->filter(fn (NeighborEntry $entry): bool => $isWanted($entry) || $matchedMacs->contains($entry->mac)); + } + + $interface = collect($wanted)->map(fn (string $ip) => $interfaces->get($ip))->filter()->first(); + $device = collect($wanted)->map(fn (string $ip) => $devices->get($ip))->filter()->first(); + + $hexes = collect($host->macs)->merge($matched->pluck('mac')) + ->when($interface, fn (Collection $list) => $list->push((string) $interface->getRawOriginal('ifPhysAddress'))) + ->filter()->unique()->values(); + + if (! $interface && $hexes->count() == 1) { + $interface = $owners->get($hexes->first())?->first(); + } + + return new HostRecord( + ips: collect($host->ips)->merge($matched->pluck('ip'))->unique(fn (IP $ip) => $ip->compressed())->values()->all(), + macs: $this->describeMacs($hexes, $locations, $neighborSeen), + locations: $hexes->flatMap(fn (string $mac) => $locations->get($mac, []))->sort($this->closestPortFirst(...))->values()->all(), + entries: $matched->values()->all(), + interface: $interface, + device: $device ?? $interface?->device, + severalMacs: $this->hasSeveralMacs($matched), + ); + }, $hosts); + } + + /** + * @param Collection $ips + * @param Collection $macs + * @return Collection + */ + private function entries(Collection $ips, Collection $macs, int $limit): Collection + { + $ipv4 = $ips->whereInstanceOf(IPv4::class)->map(fn (IP $ip) => $ip->compressed())->values(); + $ipv6 = $ips->whereInstanceOf(IPv6::class)->map(fn (IP $ip) => $ip->uncompressed())->values(); + + $arp = Ipv4Mac::hasAccess($this->user)->with('port.device') + ->whereNotIn('mac_address', HostListQuery::JUNK_MACS) + ->where(fn (Builder $q) => $q->whereIn('ipv4_address', $ipv4)->orWhereIn('mac_address', $macs)) + ->limit($limit)->get() + ->map(fn (Ipv4Mac $entry): ?NeighborEntry => $this->neighborEntry('ARP', $entry->ipv4_address, $entry)); + + $nd = Ipv6Nd::hasAccess($this->user)->with('port.device') + ->whereNotIn('mac_address', HostListQuery::JUNK_MACS) + ->where(fn (Builder $q) => $q->whereIn('ipv6_address', $ipv6)->orWhereIn('mac_address', $macs)) + ->limit($limit)->get() + ->map(fn (Ipv6Nd $entry): ?NeighborEntry => $this->neighborEntry('ND', $entry->ipv6_address, $entry)); + + return $arp->toBase()->concat($nd)->filter()->values(); + } + + private function neighborEntry(string $source, string $address, Ipv4Mac|Ipv6Nd $entry): ?NeighborEntry + { + $ip = IP::parse($address, true); + + return $ip === null ? null : new NeighborEntry($source, $ip, $entry->mac_address, $entry->port, (string) $entry->context_name); + } + + /** + * Forwarding table entries for these MAC addresses + * + * @param Collection $macs + * @return Collection + */ + private function fdbLocations(Collection $macs): Collection + { + $macCounts = DB::table('ports_fdb') + ->select('port_id', DB::raw('COUNT(DISTINCT mac_address) as mac_count')) + ->whereIn('port_id', DB::table('ports_fdb')->select('port_id')->whereIn('mac_address', $macs)) + ->groupBy('port_id'); + + return PortsFdb::hasAccess($this->user) + ->select(['ports_fdb.*', 'mac_counts.mac_count']) + ->joinSub($macCounts, 'mac_counts', 'ports_fdb.port_id', '=', 'mac_counts.port_id') + ->with(['port' => fn ($q) => $q->with('device')->withCount('links')]) + ->whereIn('ports_fdb.mac_address', $macs) + ->get() + ->toBase() + ->map(HostLocation::fromFdb(...)); + } + + /** + * Links to other network devices and aggregates go last, + * after that the port with the fewest learned MACs is closest to the host + */ + private function closestPortFirst(HostLocation $a, HostLocation $b): int + { + return [$a->isTrunk(), $a->macCount, $b->updatedAt] + <=> [$b->isTrunk(), $b->macCount, $a->updatedAt]; + } + + /** + * @param Collection $hexes + * @param Collection> $locations + * @param Collection $neighborSeen + * @return list + */ + private function describeMacs(Collection $hexes, Collection $locations, Collection $neighborSeen): array + { + $seen = $hexes->mapWithKeys(fn (string $mac): array => [$mac => collect($locations->get($mac, []))->pluck('updatedAt') + ->push($neighborSeen->get($mac) ? Carbon::parse($neighborSeen->get($mac)) : null) + ->filter()->max()]); + + // only compare what has a timestamp, ARP entries don't have one + $newest = $seen->filter()->max(); + + return $hexes->map(fn (string $mac): HostMac => new HostMac( + $mac, + $seen->get($mac), + $seen->get($mac) !== null && $seen->get($mac)->diffInSeconds($newest, true) > self::STALE_AFTER_SECONDS, + ))->values()->all(); + } + + /** + * @param Collection $entries + */ + private function hasSeveralMacs(Collection $entries): bool + { + return $entries->reject(fn (NeighborEntry $entry): bool => $entry->ip->isLinkLocal()) + ->groupBy(fn (NeighborEntry $entry): string => $entry->ip->compressed() . '|' . $entry->context) + ->contains(fn (Collection $same): bool => $same->pluck('mac')->unique()->count() > 1); + } +} diff --git a/app/Http/Controllers/Search/HostNameController.php b/app/Http/Controllers/Search/HostNameController.php new file mode 100644 index 00000000000..2ae75a005a4 --- /dev/null +++ b/app/Http/Controllers/Search/HostNameController.php @@ -0,0 +1,60 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace App\Http\Controllers\Search; + +use App\Http\Controllers\Controller; +use App\Models\Port; +use Illuminate\Http\JsonResponse; +use Illuminate\Http\Request; +use LibreNMS\Util\Dns; + +class HostNameController extends Controller +{ + /** + * The signed URL holds the addresses a search showed this user, so it can't be used to look up others + */ + public function __invoke(Request $request, Dns $dns): JsonResponse + { + $this->authorize('viewAny', Port::class); + + /** @var array{ips: list} $validated */ + $validated = $request->validate([ + 'ips' => 'required|array|max:3', + 'ips.*' => 'ip', + ]); + + foreach ($validated['ips'] as $ip) { + if ($name = $dns->reverseHostname($ip)) { + $matches = array_any($dns->getAddresses($name), fn (string $address): bool => @inet_pton($address) === inet_pton($ip)); + + return response()->json(['name' => $name, 'ip' => $ip, 'forward_match' => $matches]); + } + } + + return response()->json(['name' => null, 'ip' => null, 'forward_match' => null]); + } +} diff --git a/app/Http/Controllers/Search/HostResultsController.php b/app/Http/Controllers/Search/HostResultsController.php new file mode 100644 index 00000000000..0585c56fdb6 --- /dev/null +++ b/app/Http/Controllers/Search/HostResultsController.php @@ -0,0 +1,245 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace App\Http\Controllers\Search; + +use App\Facades\LibrenmsConfig; +use App\Http\Controllers\Controller; +use App\Http\Controllers\Search\Data\HostKey; +use App\Http\Controllers\Search\Data\HostRecord; +use App\Http\Controllers\Search\Data\HostSubnet; +use App\Http\Requests\HostSearchRequest; +use App\Models\Device; +use App\Models\Port; +use Illuminate\Http\JsonResponse; +use Illuminate\Support\Facades\URL; +use LibreNMS\Util\Dns; +use LibreNMS\Util\IP; +use LibreNMS\Util\IPv4; +use LibreNMS\Util\Mac; +use LibreNMS\Util\SearchTerm; + +class HostResultsController extends Controller +{ + /** + * Loopback and link local addresses are in use on many hosts, so they don't identify this one + */ + private const array LOCAL_NETWORKS = ['127.0.0.0/8', '169.254.0.0/16', '::1/128', 'fe80::/10']; + + public function __invoke(HostSearchRequest $request, Dns $dns): JsonResponse + { + $this->authorize('viewAny', Port::class); + + $terms = $request->terms(); + + // filters narrow a list, opening a host from that list asks for it directly + if (count($terms) == 1 && ($request->filters() === [] || $request->validated('view') !== null)) { + $response = $this->hostResponse($request, $terms[0], $dns); + if ($response !== null) { + return $response; + } + } + + return $this->listResponse($request); + } + + /** + * The summary of the host a term names, null when the term should be listed instead + */ + private function hostResponse(HostSearchRequest $request, SearchTerm $term, Dns $dns): ?JsonResponse + { + $target = $this->hostTarget($term, $dns); + if ($target === null) { + return null; + } + + $host = new HostLookup($request->user())->find([$target], follow: true)[0]; + + $searchedIp = $term->isExactIp() ? $term->ip : null; + $subnet = new SubnetLookup($request->user())->find($host, $searchedIp); + + if ($host->isNotSeen()) { + // not a host, but it may be the start of an IPv6 address, or the name or serial number of a device + $mayBeListed = $term->mayBePartialIpv6() + || (($target->hostname !== null || $term->isBareHex()) && $request->listQuery()->build()->exists()); + + return $mayBeListed ? null : $this->notFoundResponse($request, $term, $subnet, $target->hostname ? $host->ips : []); + } + + $device = $this->titleDevice($host); + $viewUrl = fn (string $view): string => route('search', ['q' => $request->searchText(), 'view' => $view]); + + $html = $request->validated('view') === 'locations' && $host->currentLocations() !== [] + ? view('search.locations', ['host' => $host, 'summaryUrl' => $viewUrl('host')]) + : view('search.host', ['host' => $host, 'titleDevice' => $device, 'subnet' => $subnet, 'locationsUrl' => $viewUrl('locations')]); + + return response()->json([ + 'mode' => 'host', + 'heading' => view('search.partials.heading', [ + 'host' => $host, + 'name' => $target->hostname, + 'device' => $device, + 'nameUrl' => $this->nameUrl($host, $searchedIp), + ])->render(), + 'html' => $html->render(), + ]); + } + + /** + * The device this host is, unless all it was found by is an address many devices have + */ + private function titleDevice(HostRecord $host): ?Device + { + if ($host->ips !== [] && array_all($host->ips, fn (IP $ip): bool => $ip->inNetworks(self::LOCAL_NETWORKS))) { + return null; + } + + $device = $host->interface->device ?? $host->device; + + return $device?->display ? $device : null; + } + + /** + * Where the page asks for the reverse DNS name after showing the host, the lookup can be slow + */ + private function nameUrl(HostRecord $host, ?IP $searchedIp = null): ?string + { + $ips = collect($searchedIp === null ? $host->ips : [$searchedIp]) + ->reject(fn (IP $ip): bool => $ip->inNetworks(self::LOCAL_NETWORKS)) + ->take(3) + ->map(fn (IP $ip): string => $ip->compressed()) + ->values() + ->all(); + + return $ips ? URL::signedRoute('search.name', ['ips' => $ips]) : null; + } + + /** + * The host a search names: an IP, a MAC, or the IPs of a hostname + */ + private function hostTarget(SearchTerm $term, Dns $dns): ?HostKey + { + if ($term->isExactIp()) { + return new HostKey(ips: [$term->ip]); + } + + if ($term->isFullMac()) { + return new HostKey(macs: [$term->macHex]); + } + + if ($term->isHostname()) { + $hostname = rtrim($term->value, '.'); + $ips = []; + foreach ($dns->getAddresses($hostname) as $address) { + if ($ip = IP::parse($address, true)) { + $ips[$ip->compressed()] = $ip; + } + } + + return $ips ? new HostKey(ips: array_values($ips), hostname: $hostname) : null; + } + + return null; + } + + private function listResponse(HostSearchRequest $request): JsonResponse + { + $query = $request->listQuery(); + $sort = $request->sort(); + $direction = $request->direction(); + $results = $query->build($sort, $direction) + ->paginate((int) ($request->validated('per_page') ?? 25)) + ->withPath(route('search')) + ->appends($request->except('page')); + + if ($results->total() == 0) { + return $this->notFoundResponse($request, $request->terms()[0] ?? null); + } + + $keys = []; + foreach ($results->items() as $row) { + $keys[] = $query->hostKey((array) $row); + } + + return response()->json([ + 'mode' => 'list', + 'total' => $results->total(), + 'sort' => $sort, + 'dir' => $direction, + 'summary' => $this->summary($request, $query, $results->total()), + 'html' => view('search.list', [ + 'hosts' => new HostLookup($request->user())->find($keys), + 'results' => $results, + 'sort' => $sort, + 'direction' => $direction, + ])->render(), + ]); + } + + private function summary(HostSearchRequest $request, HostListQuery $query, int $total): string + { + $terms = $request->terms(); + $network = count($terms) == 1 && $request->filters() === [] && $terms[0]->isNetwork ? $terms[0]->ip : null; + if ($network instanceof IPv4) { + $parts = [__('search.list.network_seen', ['count' => $total, 'size' => number_format($network->addressCount())])]; + } else { + $parts = [$query->groupsByMac() ? trans_choice('search.macs_count', $total) : trans_choice('search.list.hosts', $total)]; + } + + if (count($terms) > 1 && ($notSeen = $query->notSeenCount($total)) > 0) { + $parts[] = __('search.list.not_seen', ['count' => $notSeen]); + } + if ($request->termCount() > SearchTerm::MAX_TERMS) { + $parts[] = __('search.list.terms_ignored', ['count' => SearchTerm::MAX_TERMS, 'total' => $request->termCount()]); + } + + return implode(' · ', $parts); + } + + /** + * Nothing matched: say what was searched and offer the searches most likely to help + * + * @param list $resolved what a searched hostname resolved to + */ + private function notFoundResponse(HostSearchRequest $request, ?SearchTerm $term, ?HostSubnet $subnet = null, array $resolved = []): JsonResponse + { + $mac = $term?->isFullMac() ? Mac::parse((string) $term->macHex) : null; + + return response()->json([ + 'mode' => 'not_found', + 'total' => 0, + 'html' => view('search.not-found', [ + 'query' => $request->searchText(), + 'resolved' => $resolved, + 'hasFilters' => $request->filters() !== [], + 'subnet' => $subnet, + 'network' => $term?->ip !== null ? $subnet?->network : null, + 'ouiPrefix' => $mac ? implode(':', array_slice($mac->array(), 0, 3)) : null, + 'vendor' => $mac && LibrenmsConfig::get('mac_oui.enabled') ? $mac->vendor() : null, + ])->render(), + ]); + } +} diff --git a/app/Http/Controllers/Search/SubnetLookup.php b/app/Http/Controllers/Search/SubnetLookup.php new file mode 100644 index 00000000000..9a94963e05b --- /dev/null +++ b/app/Http/Controllers/Search/SubnetLookup.php @@ -0,0 +1,333 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace App\Http\Controllers\Search; + +use App\Http\Controllers\Search\Data\Gateway; +use App\Http\Controllers\Search\Data\HostRecord; +use App\Http\Controllers\Search\Data\HostSubnet; +use App\Http\Controllers\Search\Data\NeighborEntry; +use App\Http\Controllers\Search\Data\SubnetAddress; +use App\Models\Ipv4Address; +use App\Models\Ipv6Address; +use App\Models\Port; +use App\Models\Route; +use App\Models\User; +use Illuminate\Database\Eloquent\Builder; +use Illuminate\Support\Collection; +use LibreNMS\Util\IP; +use LibreNMS\Util\IPv4; +use LibreNMS\Util\IPv6; + +class SubnetLookup +{ + public function __construct(private readonly User $user) + { + } + + public function find(HostRecord $host, ?IP $searchedIp = null): HostSubnet + { + $hostIps = collect($searchedIp === null ? $host->ips : [$searchedIp]); + $ips = $hostIps + ->reject(fn (IP $ip): bool => $ip->isLinkLocal()) // every interface has a link local subnet + ->take(3) + ->values(); + $containing = $ips->mapWithKeys(fn (IP $ip): array => [$ip->compressed() => $this->subnetsContaining($ip)]); + + $sameSubnet = $this->sameSubnet($host, $ips, $containing); + // any device on the subnet can tell, not just those that have seen this host + $shared = $containing->flatMap(fn (array $addresses): array => $addresses)->concat($this->addressesWithIps($hostIps))->values(); + $gateways = $this->gateways($host, $shared); + + // the gateways are listed on their own, don't repeat them with the rest of the subnet + $hops = $gateways->map(fn (Gateway $gateway): string => $gateway->ip->compressed()); + + return new HostSubnet( + $gateways, + $sameSubnet->reject(fn (SubnetAddress $address): bool => $hops->contains($address->ip->compressed()))->values(), + $sameSubnet->first()?->network(), + ); + } + + /** + * The interface addresses configured with these IPs + * + * @param Collection $ips + * @return Collection + */ + public function addressesWithIps(Collection $ips): Collection + { + $ipv4 = Ipv4Address::hasAccess($this->user)->with('port.device') + ->whereIn('ipv4_address', $ips->whereInstanceOf(IPv4::class)->map(fn (IP $ip): string => $ip->compressed())->values())->get(); + $ipv6 = Ipv6Address::hasAccess($this->user)->with('port.device') + ->whereIn('ipv6_address', $ips->whereInstanceOf(IPv6::class)->map(fn (IP $ip): string => $ip->uncompressed())->values())->get(); + + return $ipv4->toBase()->concat($ipv6)->map(SubnetAddress::from(...))->filter()->values(); + } + + /** + * Ports configured with these IPs, keyed by compressed IP + * + * @param Collection $ips + * @return Collection + */ + public function portsWithIps(Collection $ips): Collection + { + $ports = new Collection; + foreach ($this->addressesWithIps($ips) as $address) { + if ($address->port) { + $ports->put($address->ip->compressed(), $address->port); + } + } + + return $ports; + } + + /** + * Interfaces on the host's subnet: each interface that has the IP in its ARP or ND table, or when + * none does, those in the most specific subnet containing it. Any host on the subnet can show up here, + * so this can't tell which is the gateway. Network devices are listed first as they are the most likely. + * + * @param Collection $ips + * @param Collection> $containing subnetsContaining() of each IP + * @return Collection + */ + private function sameSubnet(HostRecord $host, Collection $ips, Collection $containing): Collection + { + return $ips + ->flatMap(function (IP $ip) use ($host, $containing): array { + $portIds = collect($host->entries) + ->filter(fn (NeighborEntry $entry): bool => $entry->ip->compressed() === $ip->compressed()) + ->map(fn (NeighborEntry $entry): ?int => $entry->port?->port_id) + ->filter()->unique()->values()->all(); + + return $this->closestAddressOnPorts($ip, $portIds) ?: $containing->get($ip->compressed(), []); + }) + ->unique(fn (SubnetAddress $address): string => $address->portId . '|' . $address->ip->compressed()) + ->sortBy(fn (SubnetAddress $address): int => $address->isOnNetworkDevice() ? 0 : 1) + ->values(); + } + + /** + * The host's gateways: where it and devices on its subnet send their default route. A default route may leave + * through another of the device's interfaces, so only next hops on the subnet shared with the host count. + * When no device says, the routers on the subnet are the gateways. + * + * @param Collection $shared + * @return Collection + */ + private function gateways(HostRecord $host, Collection $shared): Collection + { + $hostIps = collect($host->ips)->map(fn (IP $ip): string => $ip->compressed()); + $hostDeviceId = $host->device?->device_id; + + $routes = Route::hasAccess($this->user) + ->whereIntegerInRaw('device_id', array_filter([...$this->deviceIds($shared), $hostDeviceId])) + ->whereIn('inetCidrRouteDest', ['0.0.0.0', '::', '0000:0000:0000:0000:0000:0000:0000:0000']) + ->where('inetCidrRoutePfxLen', 0) + ->get(); + + $nextHops = []; + foreach ($routes as $route) { + $hop = IP::parse((string) $route->inetCidrRouteNextHop, true); + if ($hop === null || $hostIps->contains($hop->compressed())) { + continue; + } + if ($shared->contains(fn (SubnetAddress $address): bool => ($address->port?->device_id == $route->device_id || $route->device_id == $hostDeviceId) && $this->isNextHopOn($hop, $route, $address))) { + $nextHops[$hop->compressed()]['ip'] = $hop; + $nextHops[$hop->compressed()]['devices'][$route->device_id] = true; + } + } + + if ($nextHops === []) { + return $this->routersOn($shared) + ->reject(fn (SubnetAddress $address): bool => $hostIps->contains($address->ip->compressed())) + ->map(fn (SubnetAddress $address): Gateway => new Gateway($address->ip, $address->port, 0)) + ->values(); + } + + // a link local address is reused on many links, it can't identify the interface + $interfaces = $this->portsWithIps(collect($nextHops)->pluck('ip')->reject(fn (IP $hop): bool => $hop->isLinkLocal())->values()); + + return collect($nextHops) + ->map(fn (array $nextHop, string $hop): Gateway => new Gateway($nextHop['ip'], $interfaces->get($hop), count($nextHop['devices']))) + ->sortByDesc('devices') + ->values(); + } + + /** + * Addresses of network devices with the subnet directly connected and routes through other networks. + * Any host has a connected route for its subnet, so that alone doesn't make it a router. + * + * @param Collection $addresses + * @return Collection + */ + private function routersOn(Collection $addresses): Collection + { + $candidates = $addresses->filter(fn (SubnetAddress $address): bool => $address->isOnNetworkDevice()); + + $connected = Route::hasAccess($this->user) + ->whereIntegerInRaw('device_id', $this->deviceIds($candidates)) + ->whereIn('inetCidrRoutePfxLen', $candidates->pluck('prefixLength')->unique()->values()) + ->select(['device_id', 'inetCidrRouteDest', 'inetCidrRoutePfxLen', 'inetCidrRouteNextHop']) + ->get()->groupBy('device_id'); + $connectedRouters = $candidates->filter(fn (SubnetAddress $address): bool => collect($connected->get($address->port?->device_id, [])) + ->contains(fn (Route $route): bool => $this->isConnectedRoute($route, $address))); + + // devices may have many routes, but few next hops + $nextHops = Route::hasAccess($this->user) + ->whereIntegerInRaw('device_id', $this->deviceIds($connectedRouters)) + ->select(['device_id', 'inetCidrRouteNextHop'])->distinct() + ->get()->groupBy('device_id'); + + return $connectedRouters->filter(fn (SubnetAddress $address): bool => collect($nextHops->get($address->port?->device_id, [])) + ->contains(function (Route $route) use ($address): bool { + $hop = IP::parse((string) $route->inetCidrRouteNextHop, true); + + return $hop !== null && ! $this->isUnspecified($hop) && ! $hop->inNetwork($address->cidr()); + }))->values(); + } + + /** + * @param Collection $addresses + * @return list + */ + private function deviceIds(Collection $addresses): array + { + return $addresses->map(fn (SubnetAddress $address): ?int => $address->port?->device_id)->filter()->unique()->values()->all(); + } + + private function isConnectedRoute(Route $route, SubnetAddress $address): bool + { + $destination = IP::parse((string) $route->inetCidrRouteDest, true); + $hop = IP::parse((string) $route->inetCidrRouteNextHop, true); + + return $destination !== null && $hop !== null + && (int) $route->inetCidrRoutePfxLen === $address->prefixLength + && $destination->compressed() === IP::parse($address->ip->getNetworkAddress($address->prefixLength))->compressed() + && ($this->isUnspecified($hop) || $hop->compressed() === $address->ip->compressed()); + } + + private function isUnspecified(IP $ip): bool + { + return in_array($ip->compressed(), ['0.0.0.0', '::'], true); + } + + private function isNextHopOn(IP $hop, Route $route, SubnetAddress $address): bool + { + if ($hop->compressed() === $address->ip->compressed()) { + return false; // the device's own address + } + + // a link local next hop has no network to check, the route's interface is the link it's on + return $hop->isLinkLocal() ? $route->port_id == $address->portId : $hop->inNetwork($address->cidr()); + } + + /** + * For each port, choose the address sharing the most leading bits among subnets containing the IP. + * An ARP or ND entry alone does not mean the interface is on the host's subnet. + * + * @param list $portIds + * @return list + */ + private function closestAddressOnPorts(IP $ip, array $portIds): array + { + if ($portIds === []) { + return []; + } + + $closest = []; + foreach ($this->addressesLike($ip)->whereIn('port_id', $portIds)->get() as $row) { + $address = SubnetAddress::from($row); + if ($address === null || $address->ip->isLinkLocal() || $address->ip->compressed() === $ip->compressed() || ! $ip->inNetwork($address->cidr())) { + continue; + } + $bits = $this->commonBits($ip, $address->ip); + if ($bits > ($closest[$address->portId]['bits'] ?? -1)) { + $closest[$address->portId] = ['bits' => $bits, 'address' => $address]; + } + } + + return array_values(array_column($closest, 'address')); + } + + /** + * The interfaces in the most specific subnet containing the IP + * + * @return list + */ + private function subnetsContaining(IP $ip): array + { + $query = $this->addressesLike($ip); + if ($ip instanceof IPv4) { + $query->whereBetween('ipv4_prefixlen', [8, 31]) + ->whereRaw('INET_ATON(ipv4_address) >> (32 - ipv4_prefixlen) = INET_ATON(?) >> (32 - ipv4_prefixlen)', [$ip->compressed()]) + ->orderByDesc('ipv4_prefixlen'); + } else { + // whole hex digits narrow it down, the exact check is below. Shorter prefixes aren't real interface subnets. + $query->whereBetween('ipv6_prefixlen', [32, 127]) + ->whereRaw('SUBSTR(HEX(INET6_ATON(ipv6_address)), 1, ipv6_prefixlen DIV 4) = SUBSTR(?, 1, ipv6_prefixlen DIV 4)', [strtoupper(bin2hex($ip->packed()))]) + ->orderByDesc('ipv6_prefixlen'); + } + + $inSubnet = $query->limit(50)->get()->toBase() + ->map(SubnetAddress::from(...)) + ->filter(fn (?SubnetAddress $address): bool => $address !== null && $address->ip->compressed() !== $ip->compressed() && $ip->inNetwork($address->cidr())) + ->values(); + + // ordered by prefix, only the most specific subnet is the host's own + $longest = $inSubnet->first()?->prefixLength; + + return $inSubnet->filter(fn (SubnetAddress $address): bool => $address->prefixLength === $longest)->values()->all(); + } + + /** + * Interface addresses of the same family as this IP + * + * @return Builder|Builder + */ + private function addressesLike(IP $ip): Builder + { + return ($ip instanceof IPv4 ? Ipv4Address::hasAccess($this->user) : Ipv6Address::hasAccess($this->user))->with('port.device'); + } + + private function commonBits(IP $first, IP $second): int + { + $a = $first->packed(); + $b = $second->packed(); + $bits = 0; + + for ($i = 0, $length = min(strlen($a), strlen($b)); $i < $length; $i++) { + $difference = ord($a[$i]) ^ ord($b[$i]); + if ($difference !== 0) { + return $bits + 8 - strlen(decbin($difference)); + } + $bits += 8; + } + + return $bits; + } +} diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php new file mode 100644 index 00000000000..d4923fb5eae --- /dev/null +++ b/app/Http/Controllers/SearchController.php @@ -0,0 +1,138 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace App\Http\Controllers; + +use App\Models\Port; +use App\Models\User; +use App\Models\UserPref; +use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; +use Illuminate\View\View; +use LibreNMS\Util\Url; + +class SearchController extends Controller +{ + /** Old search pages, new source filter value */ + private const array LEGACY_SOURCES = ['ipv4' => 'interface', 'ipv6' => 'interface', 'mac' => 'interface', 'arp' => 'neighbor', 'fdb' => 'fdb']; + + public function index(Request $request): View + { + $this->authorize('viewAny', Port::class); + + /** @var User $user */ + $user = $request->user(); + + return view('search.index', [ + 'query' => (string) $request->input('q'), + 'hasQuery' => $request->has('q'), + 'view' => $request->input('view'), + 'macFormat' => UserPref::getPref($user, 'network_search_mac_format') ?? 'colon', + 'filter' => $request->array('filter'), + 'filterFields' => $this->filterFields(), + 'resultsUrl' => route('search.results'), + ]); + } + + /** + * @return array, params?: array}> + */ + private function filterFields(): array + { + return [ + [ + 'key' => 'source', + 'label' => __('search.filter.source'), + 'type' => 'select', + 'options' => [ + 'neighbor' => __('search.source.neighbor'), + 'fdb' => __('search.source.fdb'), + 'interface' => __('search.source.interface'), + 'device' => __('search.source.device'), + ], + ], + [ + 'key' => 'device_id', + 'label' => __('search.filter.device'), + 'type' => 'select', + 'endpoint' => route('ajax.select.device'), + ], + [ + 'key' => 'device.groups.id', + 'label' => __('device.device_group'), + 'type' => 'select', + 'endpoint' => route('ajax.select.device-group'), + ], + [ + 'key' => 'port_id', + 'label' => __('search.filter.port'), + 'type' => 'select', + 'endpoint' => route('ajax.select.port'), + ], + [ + 'key' => 'ifAlias', + 'label' => __('search.filter.port_description'), + 'type' => 'text', + ], + [ + 'key' => 'vlan', + 'label' => __('search.filter.vlan'), + 'type' => 'number', + ], + [ + 'key' => 'ifType', + 'label' => __('search.filter.interface_type'), + 'type' => 'select', + 'endpoint' => route('ajax.select.port-field'), + 'params' => ['field' => 'ifType'], + ], + ]; + } + + /** + * Translate the old search/search=arp/searchPhrase=1.2.3.4 pages + */ + public function legacy(): RedirectResponse + { + $options = Url::parseOptions(); + $type = $options['search'] ?? ''; + + if ($type == 'packages') { + return redirect()->route('packages.index'); + } + + $filter = array_filter([ + 'source' => isset(self::LEGACY_SOURCES[$type]) ? ['eq' => self::LEGACY_SOURCES[$type]] : null, + 'device_id' => ! empty($options['device_id']) ? ['eq' => $options['device_id']] : null, + ]); + + // without a search phrase the old pages listed every entry + return redirect()->route('search', array_filter([ + 'q' => $options['searchPhrase'] ?? $options['address'] ?? '', + 'filter' => $filter, + ], fn ($value) => $value !== [])); + } +} diff --git a/app/Http/Controllers/SecretController.php b/app/Http/Controllers/SecretController.php index 05ea853aee1..5f7828e91ed 100644 --- a/app/Http/Controllers/SecretController.php +++ b/app/Http/Controllers/SecretController.php @@ -51,14 +51,13 @@ public function create(Request $request): View { Gate::authorize('create', Secret::class); - $type = $request->query('type', 'snmp'); - $secretType = SecretType::tryFrom($type) ?? SecretType::Snmp; + $secretType = SecretType::tryFromKnown((string) $request->query('type')) ?? SecretType::SnmpCommunity; $definition = $secretType->definition(); $schema = $definition->schema(); $data = array_merge($definition->schemaDefaults(), old()); return view('secrets.create', [ - 'types' => SecretType::cases(), + 'types' => SecretType::known(), 'currentType' => $secretType, 'schema' => $schema, 'data' => $data, @@ -74,7 +73,7 @@ public function store(Request $request, ToastInterface $toast): RedirectResponse 'secret_type' => 'required|string', ]); - $secretType = SecretType::tryFrom($validated['secret_type']); + $secretType = SecretType::tryFromKnown($validated['secret_type']); if (! $secretType) { abort(400, 'Invalid secret type.'); } @@ -103,7 +102,7 @@ public function show(Request $request, Secret $secret): JsonResponse return response()->json([ 'id' => $secret->id, 'description' => $secret->description, - 'secret_type' => $secret->secret_type->value, + 'secret_type' => $secret->typeName(), 'usage_count' => $secret->devices()->count(), 'data' => (object) $this->secretData($secret), ]); @@ -115,7 +114,9 @@ public function edit(Request $request, Secret $secret): View $this->abortUnlessAccessible($request, $secret); $definition = $secret->secret_type->definition(); - $data = array_merge($definition->schemaDefaults(), $this->secretData($secret), old()); + $data = $secret->secret_type === SecretType::Unknown + ? $this->secretData($secret) + : array_merge($definition->schemaDefaults(), $this->secretData($secret), old()); return view('secrets.edit', [ 'secret' => $secret, @@ -133,14 +134,15 @@ public function update(Request $request, Secret $secret, ToastInterface $toast): 'description' => ['required', 'string', 'max:255', Rule::unique('secrets', 'description')->ignore($secret->id)], ]); - $definition = $secret->secret_type->definition(); - $request->merge($definition->unmask($request->all(), $secret->data)); // masked means unchanged - $data = $request->validate($definition->rules()); + // only the description of an unknown type can be edited + if ($secret->secret_type !== SecretType::Unknown) { + $definition = $secret->secret_type->definition(); + $request->merge($definition->unmask($request->all(), $secret->data)); // masked means unchanged + $secret->data = $request->validate($definition->rules()); + } - $secret->update([ - 'description' => $validated['description'], - 'data' => $data, - ]); + $secret->description = $validated['description']; + $secret->save(); $toast->success(__('Secret updated')); diff --git a/app/Http/Controllers/Select/ApplicationController.php b/app/Http/Controllers/Select/ApplicationController.php index b19dbb3dd7a..0fc8964ec87 100644 --- a/app/Http/Controllers/Select/ApplicationController.php +++ b/app/Http/Controllers/Select/ApplicationController.php @@ -69,7 +69,7 @@ public function formatItem(Model $model): array { return [ 'id' => $model->app_id, - 'text' => $model->displayName() . ' - ' . $model->device->displayName(), + 'text' => $model->displayName() . ' - ' . $model->device->display, ]; } } diff --git a/app/Http/Controllers/Select/DashboardController.php b/app/Http/Controllers/Select/DashboardController.php index b90327a9298..62e588ef971 100644 --- a/app/Http/Controllers/Select/DashboardController.php +++ b/app/Http/Controllers/Select/DashboardController.php @@ -52,7 +52,7 @@ protected function baseQuery(Request $request): Builder ->leftJoin('users', 'dashboards.user_id', 'users.user_id') // left join so we can search username ->orderBy('dashboards.user_id') ->orderBy('dashboard_name') - ->select(['dashboard_id', 'username', 'dashboard_name']); + ->select(['dashboards.dashboard_id', 'users.username', 'dashboards.dashboard_name', 'dashboards.access']); } /** diff --git a/app/Http/Controllers/Select/DeviceController.php b/app/Http/Controllers/Select/DeviceController.php index 33e74f46235..d4ae81539d4 100644 --- a/app/Http/Controllers/Select/DeviceController.php +++ b/app/Http/Controllers/Select/DeviceController.php @@ -87,7 +87,7 @@ public function formatItem(Model $model): array /** @var Device $model */ return [ 'id' => $model->{$this->id}, - 'text' => $model->displayName(), + 'text' => $model->display, 'icon' => $model->icon, ]; } diff --git a/app/Http/Controllers/Select/DeviceFieldController.php b/app/Http/Controllers/Select/DeviceFieldController.php index 1f42bdeead0..4976dcae121 100644 --- a/app/Http/Controllers/Select/DeviceFieldController.php +++ b/app/Http/Controllers/Select/DeviceFieldController.php @@ -31,6 +31,7 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; use Illuminate\Http\Request; +use LibreNMS\Enum\DeviceType; /** * @extends SelectController @@ -85,7 +86,7 @@ public function formatItem(Model $model): array if ($field == 'os') { $text = LibrenmsConfig::getOsSetting($text, 'text'); } elseif ($field == 'type') { - $text = ucfirst((string) $text); + $text = DeviceType::labelFor((string) $text); } return [ diff --git a/app/Http/Controllers/Select/GraphController.php b/app/Http/Controllers/Select/GraphController.php index 74b3250d437..c4a75130029 100644 --- a/app/Http/Controllers/Select/GraphController.php +++ b/app/Http/Controllers/Select/GraphController.php @@ -110,21 +110,9 @@ public function __invoke(Request $request): JsonResponse */ private function formatGraph(string $top, string $graph): array { - $text = $graph; - if (Str::contains('_', $graph)) { - [$type, $subtype] = explode('_', (string) $graph, 2); - } else { - $type = $graph; - $subtype = ''; - } - - if (! Graph::isMibGraph($type, $subtype)) { - $text = ucwords($top . ' ' . str_replace(['_', '-'], ' ', $text)); - } - return [ 'id' => $top . '_' . $graph, - 'text' => $text, + 'text' => ucwords($top . ' ' . str_replace(['_', '-'], ' ', $graph)), ]; } diff --git a/app/Http/Controllers/Select/SecretController.php b/app/Http/Controllers/Select/SecretController.php index c728753cc80..355c177ba4d 100644 --- a/app/Http/Controllers/Select/SecretController.php +++ b/app/Http/Controllers/Select/SecretController.php @@ -21,7 +21,7 @@ protected function rules(): array { return [ 'type' => 'nullable|string', - 'secret_type' => 'nullable|string', + 'secret_type' => 'nullable|string', // comma separated for several types ]; } @@ -38,9 +38,11 @@ protected function searchFields(Request $request): array */ protected function filterFields(Request $request): array { + $byTypes = fn (Builder $query, $value) => $query->whereIn('secret_type', explode(',', (string) $value)); + return [ - 'secret_type' => 'secret_type', - 'type' => fn (Builder $query, $value) => $query->where('secret_type', $value), + 'secret_type' => $byTypes, + 'type' => $byTypes, ]; } diff --git a/app/Http/Controllers/Table/AddressSearchController.php b/app/Http/Controllers/Table/AddressSearchController.php deleted file mode 100644 index 196ae552c61..00000000000 --- a/app/Http/Controllers/Table/AddressSearchController.php +++ /dev/null @@ -1,117 +0,0 @@ -. - * - * @link https://www.librenms.org - * - * @copyright 2026 Tony Murray - * @author Tony Murray - */ - -namespace App\Http\Controllers\Table; - -use App\Models\PortRelatedModel; -use Illuminate\Contracts\Database\Query\Expression; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\Model; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\DB; -use Illuminate\Validation\Rule; -use LibreNMS\Exceptions\InvalidIpException; -use LibreNMS\Util\IP; -use LibreNMS\Util\Url; - -/** - * @template TModel of PortRelatedModel - * - * @extends TableController - */ -abstract class AddressSearchController extends TableController -{ - /** @var string|Expression (string or DB::raw) */ - protected mixed $sortField = ''; // set for sort - protected string $searchField = ''; - protected string $additionalSearchField = ''; - protected string $cidrField = ''; // set for display - - protected function sortFields(Request $request): array - { - return [ - 'hostname' => 'device_via_port_hostname', - 'interface' => 'port_ifname', - 'description' => 'port_description', - 'address' => $this->sortField, - ]; - } - - protected function rules(): array - { - return [ - 'address' => ['nullable', 'string'], - 'device_id' => ['nullable', 'integer'], - 'interface' => ['nullable', Rule::in('Vlan%', 'Loopback%')], - ]; - } - - /** - * @param PortRelatedModel $model - * @return array - * - * @throws InvalidIpException - */ - public function formatItem(Model $model): array - { - $port = $model->port; - - return [ - 'hostname' => Url::modernDeviceLink($port?->device), - 'interface' => Url::portLink($port), - 'address' => IP::parse($model->{$this->searchField}, true)->compressed() . '/' . $model->{$this->cidrField}, - 'description' => $port->getLabel() == $port->ifAlias ? '' : htmlspecialchars((string) $port->ifAlias), - ]; - } - - protected function applyBaseSearchQuery(Builder $builder, Request $request): Builder - { - return $builder - ->when($request->input('address'), function ($q, $address): void { - if (str_contains($address, '/')) { - [$address, $cidr] = explode('/', $address, 2); - } - - $q->where(fn ($q) => $q->where($this->searchField, 'LIKE', "%$address%")->when($this->additionalSearchField, fn ($q, $f) => $q->orWhere($f, 'LIKE', "%$address%"))); - - if (isset($cidr)) { - $q->where($this->cidrField, $cidr); - } - }) - ->when($request->input('device_id'), fn ($q, $id) => $q->whereHas('port', fn ($pq) => $pq->where('device_id', $id))) - ->when($request->input('interface'), fn ($q, $i) => $q->whereHas('port', fn ($pq) => $pq->where('ifDescr', 'LIKE', $i))) - ->when($request->has('sort.hostname'), fn ($q) => $q->withAggregate('deviceViaPort', 'hostname')) - ->when($request->has('sort.interface'), fn ($q) => $q->withAggregate('port', 'ifName')) - ->when($request->has('sort.description'), function ($q) use ($builder): void { - $q->select($builder->getModel()->getTable() . '.*')->selectSub(function ($sub) use ($builder): void { - $sub->selectRaw('IF(ifAlias = ifName || ifAlias = ifDescr, "", ifAlias)') - ->from('ports') - ->whereColumn('ports.port_id', $builder->qualifyColumn('port_id')) - ->limit(1); - }, 'port_description'); - }); - } -} diff --git a/app/Http/Controllers/Table/AlertLogController.php b/app/Http/Controllers/Table/AlertLogController.php index f55a63f42af..0a76b81b107 100644 --- a/app/Http/Controllers/Table/AlertLogController.php +++ b/app/Http/Controllers/Table/AlertLogController.php @@ -21,7 +21,7 @@ class AlertLogController extends TableController protected array $default_sort = ['time_logged' => 'asc']; /** Max entity rows rendered in the (collapsed) inline detail cell to bound memory. */ - private const INLINE_DETAIL_ROW_LIMIT = 100; + private const int INLINE_DETAIL_ROW_LIMIT = 100; public function __construct( private readonly AlertLogDetailParser $parser @@ -39,6 +39,7 @@ protected function rules(): array 'state' => 'integer|nullable', 'from' => 'nullable|date_or_relative', 'to' => 'nullable|date_or_relative', + 'widget_id' => 'nullable|integer|min:1', ]; } @@ -201,18 +202,30 @@ public function formatItem(Model $model): array $alert_rule .= ' ' . $entity_count . '×'; } + $incidentId = $this->incidentId($model->id); + return [ 'id' => $model->id, 'time_logged' => $model->time_logged, - 'details' => '', + 'details' => '', 'verbose_details' => "", - 'hostname' => '
' . Url::modernDeviceLink($model->device) . '
' . $fault_detail . '
', + 'hostname' => '
' . Url::modernDeviceLink($model->device) . '
' . $fault_detail . '
', 'alert_rule' => $alert_rule, 'status' => $status, 'severity' => $model->rule?->severity, ]; } + /** + * Build the incident element id, namespaced by the dashboard widget instance when present. + */ + private function incidentId(int $logId): string + { + $widgetId = request()->integer('widget_id'); + + return $widgetId > 0 ? "incident{$widgetId}-{$logId}" : "incident{$logId}"; + } + protected function getExportHeaders(): array { return [ @@ -230,12 +243,14 @@ protected function getExportHeaders(): array protected function formatExportRow($item): array { + $device = $item->device; + return [ $item->id, strtolower((string) $item->state->name), $item->time_logged->toIso8601ZuluString(), $item->device_id, - $item->device?->displayName(), + $device->display, $item->rule_id, $item->rule?->name, $item->rule?->severity, diff --git a/app/Http/Controllers/Table/AlertsController.php b/app/Http/Controllers/Table/AlertsController.php index 612a92a7295..a53c2db8f73 100644 --- a/app/Http/Controllers/Table/AlertsController.php +++ b/app/Http/Controllers/Table/AlertsController.php @@ -49,7 +49,7 @@ class AlertsController extends TableController protected array $default_sort = ['timestamp' => 'desc']; /** Maps the min_severity filter's UI values to alert_rules.severity comparisons. */ - private const SEVERITY_MAP = [ + private const array SEVERITY_MAP = [ 'ok' => 1, 'warning' => 2, 'critical' => 3, @@ -80,6 +80,7 @@ protected function rules(): array 'min_severity' => 'nullable|string', 'group' => 'nullable|integer|min:1', 'uncollapse_key_count' => 'nullable|integer', + 'widget_id' => 'nullable|integer|min:1', ]; } @@ -247,12 +248,13 @@ public function formatItem(Model $model): array } $alertLogId = AlertLog::query()->where('fault_id', $model->id)->max('id'); + $incidentId = $this->incidentId($model->id); return [ 'rule' => '' . $ruleName . '', - 'details' => '', + 'details' => '', 'verbose_details' => $this->verboseDetailsButton($alertLogId), - 'hostname' => $this->renderHostname($model), + 'hostname' => $this->renderHostname($model, $incidentId), 'location' => '' . e($location ?? 'N/A') . '', 'timestamp' => $model->timestamp ? Time::format($model->timestamp, 'compact') : 'N/A', 'severity' => $this->severityIcon($model->rule?->severity, $state), @@ -315,17 +317,27 @@ private function renderFaultDetail(AlertFault $fault): string ])->render(); } - private function renderHostname(AlertFault $fault): string + private function renderHostname(AlertFault $fault, string $incidentId): string { $faultDetail = $this->renderFaultDetail($fault); $collapseClass = $this->incidentCollapseClass($faultDetail); return '
' . Url::modernDeviceLink($fault->device) - . '
' . $faultDetail . '
' + . '
' . $faultDetail . '
' . '
'; } + /** + * Build the incident element id, namespaced by the dashboard widget instance when present. + */ + private function incidentId(int $faultId): string + { + $widgetId = request()->integer('widget_id'); + + return $widgetId > 0 ? "incident{$widgetId}-{$faultId}" : "incident{$faultId}"; + } + private function countPrintableCharacters(string $string): int { $string = trim(strip_tags($string)); diff --git a/app/Http/Controllers/Table/DeviceController.php b/app/Http/Controllers/Table/DeviceController.php index 75cbd50e1c3..6e499abefd2 100644 --- a/app/Http/Controllers/Table/DeviceController.php +++ b/app/Http/Controllers/Table/DeviceController.php @@ -104,7 +104,7 @@ protected function baseQuery(Request $request): Builder /** @var Builder $query */ $query = Device::hasAccess($request->user()) - ->with(['location', 'groups', 'attribs' => fn ($q) => $q->ofType('override_device_http_port')]) + ->with(['location', 'groups', 'attribs' => fn ($q) => $q->ofType(['override_device_http_port', 'override_device_ssh_port', 'override_device_telnet_port'])]) ->applyFilters($request->array('filter')) ->withCount(['ports', 'sensors', 'wirelessSensors']); @@ -286,14 +286,16 @@ private function getActions(Device $device): array } $row = $this->isDetailed() ? 1 : 0; + $telnet_port = $device->getAttrib('override_device_telnet_port'); $actions[$row][] = [ 'title' => 'Telnet to ' . $device->hostname, - 'href' => 'telnet://' . $device->hostname, + 'href' => 'telnet://' . $device->hostname . ($telnet_port ? ':' . $telnet_port : ''), 'icon' => 'fa-terminal', 'external' => false, ]; - $ssh_href = 'ssh://' . $device->hostname; + $ssh_port = $device->getAttrib('override_device_ssh_port'); + $ssh_href = 'ssh://' . $device->hostname . ($ssh_port ? ':' . $ssh_port : ''); if ($server = LibrenmsConfig::get('gateone.server')) { $ssh_href = LibrenmsConfig::get('gateone.use_librenms_user') ? $server . '?ssh=ssh://' . Auth::user()->username . '@' . $device->hostname . '&location=' . $device->hostname @@ -366,7 +368,7 @@ protected function formatExportRow(Model $device): array return [ 'device_id' => $device->device_id, - 'hostname' => $device->displayName(), + 'hostname' => $device->display, 'ip' => $device->ip, 'hardware' => Rewrite::ciscoHardware($device), 'os' => LibrenmsConfig::getOsSetting($device->os, 'text', $device->os), diff --git a/app/Http/Controllers/Table/DiskioController.php b/app/Http/Controllers/Table/DiskioController.php index 16deb5f3849..65bd04617ad 100644 --- a/app/Http/Controllers/Table/DiskioController.php +++ b/app/Http/Controllers/Table/DiskioController.php @@ -73,7 +73,7 @@ public function formatItem(Model $model): array { $graph_array = [ 'type' => 'diskio_bits', - 'popup_title' => htmlentities(strip_tags($model->device?->displayName() . ': ' . $model->diskio_descr)), + 'popup_title' => htmlentities(strip_tags($model->device?->display . ': ' . $model->diskio_descr)), 'id' => $model->diskio_id, 'from' => '-1d', 'height' => 20, diff --git a/app/Http/Controllers/Table/EventlogController.php b/app/Http/Controllers/Table/EventlogController.php index b38276f30a4..f4e2a39ac03 100644 --- a/app/Http/Controllers/Table/EventlogController.php +++ b/app/Http/Controllers/Table/EventlogController.php @@ -27,13 +27,14 @@ namespace App\Http\Controllers\Table; use App\Models\Eventlog; +use App\Models\Port; use App\Models\Sensor; use Carbon\Carbon; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; use Illuminate\Http\Request; use Illuminate\Support\Facades\Blade; -use LibreNMS\Enum\Severity; +use LibreNMS\Util\Html; use LibreNMS\Util\Time; use LibreNMS\Util\Url; @@ -47,6 +48,7 @@ public function rules(): array return [ 'device' => 'nullable|int', 'device_group' => 'nullable|int', + 'port' => 'nullable|int', 'eventtype' => 'nullable|string', 'age' => 'nullable|int', 'message' => 'nullable|string', @@ -58,11 +60,34 @@ public function searchFields(Request $request): array return ['message']; } + /** + * Also match interface events by the label (ifName, ifAlias, ifDescr) of their port. + */ + protected function search(?string $search, Builder $query, array $fields): Builder + { + if (! $search) { + return $query; + } + + return $query->where(fn (Builder $query) => parent::search($search, $query, $fields) + ->orWhere(fn (Builder $query) => $query + ->where('type', 'interface') + ->whereIn('reference', Port::select('port_id')->where(fn (Builder $query) => $query + ->where('ifName', 'like', "%$search%") + ->orWhere('ifAlias', 'like', "%$search%") + ->orWhere('ifDescr', 'like', "%$search%") + )) + )); + } + protected function filterFields(Request $request): array { return [ 'device_id' => 'device', 'type' => 'eventtype', + 'port' => function (Builder $query, int $port_id): void { + $query->where('type', 'interface')->where('reference', $port_id); + }, ]; } @@ -131,23 +156,7 @@ private function formatType(Eventlog $eventlog): string private function formatDatetime(Eventlog $eventlog): string { - $output = ""; - $output .= Time::format($eventlog->datetime, 'compact'); - - return $output; - } - - private function severityLabel(Severity $eventlog_severity): string - { - return match ($eventlog_severity) { - Severity::Ok => 'label-success', - Severity::Info => 'label-info', - Severity::Notice => 'label-primary', - Severity::Warning => 'label-warning', - Severity::Error => 'label-danger', - default => 'label-default', // Unknown - }; + return Html::severityToLabel($eventlog->severity, '', class: 'alert-status eventlog-status') + . Time::format($eventlog->datetime, 'compact'); } } diff --git a/app/Http/Controllers/Table/FdbTablesController.php b/app/Http/Controllers/Table/FdbTablesController.php index 0a908ac4be8..8c2c60db773 100755 --- a/app/Http/Controllers/Table/FdbTablesController.php +++ b/app/Http/Controllers/Table/FdbTablesController.php @@ -29,7 +29,6 @@ use App\Models\Ipv4Mac; use App\Models\Port; use App\Models\PortsFdb; -use App\Models\Vlan; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; use Illuminate\Http\Request; @@ -72,7 +71,7 @@ protected function baseQuery(Request $request): Builder $this->authorize('viewAny', Port::class); return PortsFdb::hasAccess($request->user()) - ->with(['device', 'port', 'vlan', 'ipv4Addresses']) + ->with(['device', 'port', 'ipv4Addresses']) ->select('ports_fdb.*'); } @@ -80,11 +79,12 @@ protected function search(?string $search, Builder $query, array $fields): Build { if ($search = trim(\Request::input('searchPhrase') ?? '')) { $mac_search = '%' . str_replace([':', ' ', '-', '.', '0x'], '', $search) . '%'; + $vlans = ctype_digit($search) ? [$search] : []; switch (\Request::input('searchby') ?? '') { case 'mac': return $query->where('ports_fdb.mac_address', 'like', $mac_search); case 'vlan': - return $query->whereIntegerInRaw('ports_fdb.vlan_id', $this->findVlans($search)); + return $query->whereIn('ports_fdb.vlan', $vlans); case 'dnsname': $search = gethostbyname($search); // no break @@ -97,10 +97,10 @@ protected function search(?string $search, Builder $query, array $fields): Build return $this->findPortsByOui($vendor_ouis, $query); default: - return $query->where(function ($query) use ($search, $mac_search): void { + return $query->where(function ($query) use ($search, $mac_search, $vlans): void { $query->where('ports_fdb.mac_address', 'like', $mac_search) ->orWhereIntegerInRaw('ports_fdb.port_id', $this->findPorts($search)) - ->orWhereIntegerInRaw('ports_fdb.vlan_id', $this->findVlans($search)) + ->orWhereIn('ports_fdb.vlan', $vlans) ->orWhereIn('ports_fdb.mac_address', $this->findMacs($search)); }); } @@ -123,8 +123,7 @@ public function sort(Request $request, Builder $query): Builder } if (isset($sort['vlan'])) { - $query->leftJoin('vlans', 'ports_fdb.vlan_id', 'vlans.vlan_id') - ->orderBy('vlan_vlan', $sort['vlan'] == 'desc' ? 'desc' : 'asc'); + $query->orderBy('ports_fdb.vlan', $sort['vlan'] == 'desc' ? 'desc' : 'asc'); } if (isset($sort['interface'])) { @@ -163,7 +162,7 @@ public function formatItem(Model $model): array 'mac_oui' => $mac->vendor(), 'ipv4_address' => $ips->implode(', '), 'interface' => '', - 'vlan' => $model->vlan ? $model->vlan->vlan_vlan : '', + 'vlan' => $model->vlan ?? '', 'description' => '', 'dnsname' => $this->resolveDns($ips), 'first_seen' => 'unknown', @@ -208,23 +207,6 @@ protected function findMacs(string $ip): Collection ->pluck('mac_address'); } - /** - * @param string $vlan - * @return Collection - */ - protected function findVlans(string $vlan): Collection - { - $port_id = \Request::input('port_id'); - $device_id = \Request::input('device_id'); - - return Vlan::where('vlan_vlan', $vlan) - ->when($device_id, fn ($query) => $query->where('device_id', $device_id)) - ->when($port_id, fn ($query) => $query->whereIn('device_id', function ($query) use ($port_id): void { - $query->select('device_id')->from('ports')->where('port_id', $port_id); - })) - ->pluck('vlan_id'); - } - /** * @param string $ifAlias * @return Collection diff --git a/app/Http/Controllers/Table/InventoryController.php b/app/Http/Controllers/Table/InventoryController.php index 865c6f53a91..8009af07a9c 100644 --- a/app/Http/Controllers/Table/InventoryController.php +++ b/app/Http/Controllers/Table/InventoryController.php @@ -124,8 +124,10 @@ protected function getExportHeaders(): array */ protected function formatExportRow(Model $entPhysical): array { + $device = $entPhysical->device; + return [ - $entPhysical->device ? $entPhysical->device->displayName() : '', + $entPhysical->device ? $device->display : '', $entPhysical->entPhysicalDescr, $entPhysical->entPhysicalName, $entPhysical->entPhysicalModelName, diff --git a/app/Http/Controllers/Table/Ipv4AddressSearchController.php b/app/Http/Controllers/Table/Ipv4AddressSearchController.php deleted file mode 100644 index f809cc9aaa2..00000000000 --- a/app/Http/Controllers/Table/Ipv4AddressSearchController.php +++ /dev/null @@ -1,59 +0,0 @@ -. - * - * @link https://www.librenms.org - * - * @copyright 2026 Tony Murray - * @author Tony Murray - */ - -namespace App\Http\Controllers\Table; - -use App\Models\Ipv4Address; -use App\Models\Port; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\DB; - -/** - * @extends AddressSearchController - */ -class Ipv4AddressSearchController extends AddressSearchController -{ - public function __construct() - { - $this->sortField = DB::raw('INET_ATON(ipv4_address)'); - $this->searchField = 'ipv4_address'; - $this->cidrField = 'ipv4_prefixlen'; - } - - /** - * @inheritDoc - */ - protected function baseQuery(Request $request): Builder|\Illuminate\Database\Query\Builder - { - $this->authorize('viewAny', Port::class); - - return $this->applyBaseSearchQuery( - Ipv4Address::query()->hasAccess($request->user())->with(['port', 'port.device']), - $request - ); - } -} diff --git a/app/Http/Controllers/Table/Ipv6AddressSearchController.php b/app/Http/Controllers/Table/Ipv6AddressSearchController.php deleted file mode 100644 index 29a976b40fd..00000000000 --- a/app/Http/Controllers/Table/Ipv6AddressSearchController.php +++ /dev/null @@ -1,60 +0,0 @@ -. - * - * @link https://www.librenms.org - * - * @copyright 2026 Tony Murray - * @author Tony Murray - */ - -namespace App\Http\Controllers\Table; - -use App\Models\Ipv6Address; -use App\Models\Port; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\DB; - -/** - * @extends AddressSearchController - */ -class Ipv6AddressSearchController extends AddressSearchController -{ - public function __construct() - { - $this->sortField = DB::raw('INET6_ATON(ipv6_address)'); - $this->searchField = 'ipv6_address'; - $this->additionalSearchField = 'ipv6_compressed'; - $this->cidrField = 'ipv6_prefixlen'; - } - - /** - * @inheritDoc - */ - protected function baseQuery(Request $request): Builder|\Illuminate\Database\Query\Builder - { - $this->authorize('viewAny', Port::class); - - return $this->applyBaseSearchQuery( - Ipv6Address::query()->hasAccess($request->user())->with(['port', 'port.device']), - $request - ); - } -} diff --git a/app/Http/Controllers/Table/MacSearchController.php b/app/Http/Controllers/Table/MacSearchController.php deleted file mode 100644 index b35646f8b96..00000000000 --- a/app/Http/Controllers/Table/MacSearchController.php +++ /dev/null @@ -1,94 +0,0 @@ -. - * - * @link https://www.librenms.org - * - * @copyright 2026 Tony Murray - * @author Tony Murray - */ - -namespace App\Http\Controllers\Table; - -use App\Models\Port; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\Model; -use Illuminate\Http\Request; -use Illuminate\Validation\Rule; -use LibreNMS\Util\Mac; -use LibreNMS\Util\Url; - -/** - * @extends TableController - */ -class MacSearchController extends TableController -{ - protected function rules(): array - { - return [ - 'address' => ['nullable', 'string'], - 'device_id' => ['nullable', 'integer'], - 'interface' => ['nullable', Rule::in('Vlan%', 'Loopback%')], - ]; - } - - protected function sortFields(Request $request): array - { - return [ - 'hostname' => 'device_hostname', - 'interface' => 'ifDescr', - 'description' => 'ifAlias', - 'address' => 'ifPhysAddress', - ]; - } - - protected function baseQuery(Request $request): Builder|\Illuminate\Database\Query\Builder - { - $this->authorize('viewAny', Port::class); - - return Port::query() - ->hasAccess($request->user()) - ->with('device') - ->when($request->input('device_id'), fn ($q, $id) => $q->where('device_id', $id)) - ->when($request->input('interface'), fn ($q, $i) => $q->where('ifDescr', 'LIKE', $i)) - ->when($request->input('address'), function ($q, $mac) { - $cleanMac = str_replace([':', ' ', '-', '.', '0x'], '', $mac); - - return $q->where('ifPhysAddress', 'LIKE', "%$cleanMac%"); - }) - ->when($request->has('sort.hostname'), fn ($q) => $q->withAggregate('device', 'hostname')); - } - - /** - * @param Port $model - * @return array - */ - public function formatItem(Model $model): array - { - $mac = Mac::parse($model->ifPhysAddress); - - return [ - 'hostname' => Url::modernDeviceLink($model->device), - 'interface' => Url::portLink($model), - 'address' => $mac->readable(), - 'description' => $model->getLabel() == $model->ifAlias ? '' : htmlspecialchars((string) $model->ifAlias), - 'mac_oui' => $mac->vendor(), - ]; - } -} diff --git a/app/Http/Controllers/Table/MempoolsController.php b/app/Http/Controllers/Table/MempoolsController.php index e2905680a25..3549fbdf77e 100644 --- a/app/Http/Controllers/Table/MempoolsController.php +++ b/app/Http/Controllers/Table/MempoolsController.php @@ -186,9 +186,11 @@ protected function formatExportRow(Model $mempool): array { $is_percent = $mempool->mempool_total == 100; + $device = $mempool->device; + return [ 'device_id' => $mempool->device_id, - 'hostname' => $mempool->device->displayName(), + 'hostname' => $device->display, 'description' => $mempool->mempool_descr, 'used' => $is_percent ? $mempool->mempool_used : Number::formatBi($mempool->mempool_used), 'free' => $is_percent ? $mempool->mempool_free : Number::formatBi($mempool->mempool_free), diff --git a/app/Http/Controllers/Table/OutagesController.php b/app/Http/Controllers/Table/OutagesController.php index 58e7316ea0a..868e96211bd 100644 --- a/app/Http/Controllers/Table/OutagesController.php +++ b/app/Http/Controllers/Table/OutagesController.php @@ -182,8 +182,10 @@ protected function getExportHeaders(): array */ protected function formatExportRow(Model $outage): array { + $device = $outage->device; + return [ - $outage->device ? $outage->device->displayName() : '', + $outage->device ? $device->display : '', Carbon::createFromTimestamp($outage->going_down)->toIso8601ZuluString(), $outage->up_again ? Carbon::createFromTimestamp($outage->up_again)->toIso8601ZuluString() : '-', $this->asDuration($outage)->format('%H:%I:%S'), diff --git a/app/Http/Controllers/Table/PortSecurityController.php b/app/Http/Controllers/Table/PortSecurityController.php index f142afa4708..31cb4d68375 100644 --- a/app/Http/Controllers/Table/PortSecurityController.php +++ b/app/Http/Controllers/Table/PortSecurityController.php @@ -123,10 +123,12 @@ protected function getExportHeaders(): array */ protected function formatExportRow(Model $item): array { + $device = $item->device; + return array_merge( request()->integer('device_id') ? [] : [ $item->device_id, - $item->device?->displayName() ?? '', + $device->display ?? '', ], [ $item->port?->getShortLabel() ?? '', diff --git a/app/Http/Controllers/Table/PortsController.php b/app/Http/Controllers/Table/PortsController.php index cc7ec075206..a800c3c426f 100644 --- a/app/Http/Controllers/Table/PortsController.php +++ b/app/Http/Controllers/Table/PortsController.php @@ -215,9 +215,11 @@ protected function formatExportRow(Model $port): array $adminStatus = $port->ifAdminStatus?->value; $speed = Number::formatSi($port->ifSpeed); + $device = $port->device; + return [ 'device_id' => $port->device_id, - 'hostname' => $port->device?->displayName(), + 'hostname' => $device->display, 'port' => $port->ifName ?: $port->ifDescr, 'ifindex' => $port->ifIndex, 'status' => $status, diff --git a/app/Http/Controllers/Table/PrinterSupplyController.php b/app/Http/Controllers/Table/PrinterSupplyController.php index 5d468417885..e86b6b74d56 100644 --- a/app/Http/Controllers/Table/PrinterSupplyController.php +++ b/app/Http/Controllers/Table/PrinterSupplyController.php @@ -69,7 +69,7 @@ public function formatItem(Model $model): array $graph_array = [ 'type' => 'toner_usage', - 'popup_title' => htmlentities(strip_tags($model->device?->displayName() . ': ' . $model->supply_descr)), + 'popup_title' => htmlentities(strip_tags($model->device?->display . ': ' . $model->supply_descr)), 'id' => $model->supply_id, 'from' => '-1d', 'height' => 20, diff --git a/app/Http/Controllers/Table/ProcessorsController.php b/app/Http/Controllers/Table/ProcessorsController.php index 5a89b55f05d..cc52fa6e98a 100644 --- a/app/Http/Controllers/Table/ProcessorsController.php +++ b/app/Http/Controllers/Table/ProcessorsController.php @@ -65,10 +65,10 @@ protected function baseQuery(Request $request): Builder */ public function formatItem(Model $model): array { - $perc = round($model->processor_usage); + $perc = (int) round($model->processor_usage ?? 0); $graph_array = [ 'type' => 'processor_usage', - 'popup_title' => htmlentities(strip_tags($model->device->displayName() . ': ' . $model->processor_descr)), + 'popup_title' => htmlentities(strip_tags($model->device->display . ': ' . $model->processor_descr)), 'id' => $model->processor_id, 'from' => '-1d', 'height' => 20, @@ -78,7 +78,9 @@ public function formatItem(Model $model): array $hostname = Blade::render('', ['device' => $model->device]); $descr = htmlspecialchars((string) $model->processor_descr); $mini_graph = Url::graphPopup($graph_array); - $bar = Html::percentageBar(400, 10, $perc, $perc . '%', (100 - $perc) . '%', $model->processor_perc_warn); + $bar = $model->processor_usage === null + ? Html::percentageBar(400, 10, 0, '?', '', $model->processor_perc_warn) + : Html::percentageBar(400, 10, $perc, $perc . '%', (100 - $perc) . '%', $model->processor_perc_warn); $usage = Url::graphPopup($graph_array, $bar); if (\Request::input('view') == 'graphs') { @@ -117,8 +119,10 @@ protected function getExportHeaders(): array */ protected function formatExportRow(Model $processor): array { + $device = $processor->device; + return [ - $processor->device ? $processor->device->displayName() : '', + $processor->device ? $device->display : '', $processor->processor_descr, $processor->processor_usage, ]; diff --git a/app/Http/Controllers/Table/SslCertificateController.php b/app/Http/Controllers/Table/SslCertificateController.php index 44acfe2b079..57bb81a5375 100644 --- a/app/Http/Controllers/Table/SslCertificateController.php +++ b/app/Http/Controllers/Table/SslCertificateController.php @@ -57,7 +57,7 @@ public function formatItem(Model $model): array $deviceLink = '' . e($sslCertificate->device->hostname) . ''; } - $validTo = $sslCertificate->valid_to !== null ? $sslCertificate->valid_to->format('Y-m-d H:i') : null; + $validTo = $sslCertificate->valid_to?->format('Y-m-d H:i'); $status = ''; if ($sslCertificate->disabled) { $status = '' . __('Disabled') . ''; diff --git a/app/Http/Controllers/Table/StoragesController.php b/app/Http/Controllers/Table/StoragesController.php index 1909a5127bd..edaa54cdc41 100644 --- a/app/Http/Controllers/Table/StoragesController.php +++ b/app/Http/Controllers/Table/StoragesController.php @@ -71,7 +71,7 @@ public function formatItem(Model $model): array $descr = htmlentities((string) $model->storage_descr); $graph_array = [ 'type' => 'storage_usage', - 'popup_title' => htmlentities(strip_tags($model->device?->displayName() . ': ' . $model->storage_descr)), + 'popup_title' => htmlentities(strip_tags($model->device?->display . ': ' . $model->storage_descr)), 'id' => $model->storage_id, 'from' => '-1d', 'height' => 20, @@ -129,8 +129,10 @@ protected function getExportHeaders(): array */ protected function formatExportRow(Model $storage): array { + $device = $storage->device; + return [ - $storage->device ? $storage->device->displayName() : '', + $storage->device ? $device->display : '', $storage->storage_descr, Number::formatBi($storage->storage_used), Number::formatBi($storage->storage_free), diff --git a/app/Http/Controllers/Table/Traits/SensorTrait.php b/app/Http/Controllers/Table/Traits/SensorTrait.php index 2f1e3ca3082..0548536840f 100644 --- a/app/Http/Controllers/Table/Traits/SensorTrait.php +++ b/app/Http/Controllers/Table/Traits/SensorTrait.php @@ -70,7 +70,7 @@ public function formatItem(Model $model): array $request = \Illuminate\Support\Facades\Request::instance(); $graph_array = [ 'type' => $model->getGraphType(), - 'popup_title' => htmlentities(strip_tags($model->device?->displayName() . ': ' . $model->sensor_descr)), + 'popup_title' => htmlentities(strip_tags($model->device?->display . ': ' . $model->sensor_descr)), 'id' => $model->sensor_id, 'from' => '-1d', 'height' => 20, @@ -129,8 +129,10 @@ protected function getExportHeaders(): array */ protected function formatExportRow(Model $sensor): array { + $device = $sensor->device; + return [ - $sensor->device ? $sensor->device->displayName() : '', + $sensor->device ? $device->display : '', $sensor->sensor_descr, $sensor->formatValue(), $sensor->formatValue('sensor_limit_low'), diff --git a/app/Http/Controllers/Table/VminfoController.php b/app/Http/Controllers/Table/VminfoController.php index 5adc2e31902..2febaaf143f 100644 --- a/app/Http/Controllers/Table/VminfoController.php +++ b/app/Http/Controllers/Table/VminfoController.php @@ -109,6 +109,7 @@ public function formatItem(Model $model): array 'hostname' => Url::modernDeviceLink($model->device), 'deviceid' => $model->device_id, 'sysname' => $model->device?->sysName, + 'graphs' => '', ]; } diff --git a/app/Http/Controllers/Traits/StreamsOutputToBrowser.php b/app/Http/Controllers/Traits/StreamsOutputToBrowser.php index c73063c9d72..25bf81b85cf 100644 --- a/app/Http/Controllers/Traits/StreamsOutputToBrowser.php +++ b/app/Http/Controllers/Traits/StreamsOutputToBrowser.php @@ -100,7 +100,7 @@ private function setupLogger(): void config(['logging.channels.stream' => [ 'driver' => 'custom', 'via' => fn (): Logger => new Logger('stream', [ - (new StreamHandler('php://output', Level::Debug))->setFormatter(new NoColorFormatter()), + new StreamHandler('php://output', Level::Debug)->setFormatter(new NoColorFormatter()), ]), 'level' => 'debug', ]]); diff --git a/app/Http/Controllers/UserPreferencesController.php b/app/Http/Controllers/UserPreferencesController.php index 50ae404fdf3..091e09b8cf0 100644 --- a/app/Http/Controllers/UserPreferencesController.php +++ b/app/Http/Controllers/UserPreferencesController.php @@ -123,6 +123,7 @@ public function store(Request $request) ], 'temp_units' => 'required|in:default,f', 'hide_dashboard_editor' => 'required|integer', + 'network_search_mac_format' => 'required|in:default,colon,dash,dot,bare', ]; $this->validate($request, [ diff --git a/app/Http/Controllers/ValidateController.php b/app/Http/Controllers/ValidateController.php index 1e342770e4a..ba98dd66ff8 100644 --- a/app/Http/Controllers/ValidateController.php +++ b/app/Http/Controllers/ValidateController.php @@ -14,7 +14,7 @@ public function index(): View { $this->authorize('settings.view'); - $validationGroups = (new Validator())->getValidationGroups(); + $validationGroups = new Validator()->getValidationGroups(); $groups = collect($validationGroups) ->map(fn (bool $enabled, string $group) => [ diff --git a/app/Http/Controllers/VminfoController.php b/app/Http/Controllers/VminfoController.php index c67a3a204bb..73cd574f1b1 100644 --- a/app/Http/Controllers/VminfoController.php +++ b/app/Http/Controllers/VminfoController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Models\Vminfo; +use App\View\Components\VminfoGraphs; use Illuminate\Http\Request; use Illuminate\View\View; @@ -12,11 +13,25 @@ public function index(Request $request): View { $this->authorize('viewAny', Vminfo::class); - $request->validate(Vminfo::filterValidationRules()); + $request->validate([ + ...Vminfo::filterValidationRules(), + ...VminfoGraphs::validationRules(), + ]); + + $graph = $request->input('graph'); return view('vminfo', [ 'filterFields' => Vminfo::filterFieldDefinitions(), 'filter' => $request->array('filter'), + 'graph' => $graph, + 'nav' => VminfoGraphs::nav($request->query(), fn (array $query): string => route('vminfo.index', $query)), + 'vms' => $graph ? Vminfo::hasAccess($request->user()) + ->recordsMetrics(VminfoGraphs::types()[$graph]['metric']) + ->applyFilters($request->array('filter')) + ->with('device') + ->orderBy('vmwVmDisplayName') + ->paginate($request->integer('per_page', VminfoGraphs::PER_PAGE_OPTIONS[0])) + ->withQueryString() : null, ]); } } diff --git a/app/Http/Controllers/Widgets/AlertMapController.php b/app/Http/Controllers/Widgets/AlertMapController.php index 1149711f032..60a26841bfe 100644 --- a/app/Http/Controllers/Widgets/AlertMapController.php +++ b/app/Http/Controllers/Widgets/AlertMapController.php @@ -150,7 +150,7 @@ private function getDeviceLabel(Device $device, string $severity, int $label_typ private function getDeviceTooltip(Device $device, array $alert_severities): string { - $tooltip = $device->displayName(); + $tooltip = $device->display; $tooltip .= sprintf( ' - %s: %d / %s: %d / %s: %d', diff --git a/app/Http/Controllers/Widgets/AvailabilityMapController.php b/app/Http/Controllers/Widgets/AvailabilityMapController.php index 406611799cc..242c673fa5b 100644 --- a/app/Http/Controllers/Widgets/AvailabilityMapController.php +++ b/app/Http/Controllers/Widgets/AvailabilityMapController.php @@ -208,7 +208,7 @@ private function getServiceLabel(Service $service): string private function getDeviceTooltip(Device $device, string $state_name): string { - $tooltip = $device->displayName(); + $tooltip = $device->display; if (! $device->status && ! $device->last_polled) { $time = __('Never polled'); @@ -225,7 +225,8 @@ private function getDeviceTooltip(Device $device, string $state_name): string private function getServiceTooltip(Service $service): string { - $tooltip = $service->device->displayName() . ' [' . $service->service_type . ']'; + $device = $service->device; + $tooltip = $device->display . ' [' . $service->service_type . ']'; $description = $service->service_name ?: $service->service_desc; if ($description) { diff --git a/app/Http/Controllers/Widgets/DeviceTypeController.php b/app/Http/Controllers/Widgets/DeviceTypeController.php index e545446f04a..f1884175bab 100644 --- a/app/Http/Controllers/Widgets/DeviceTypeController.php +++ b/app/Http/Controllers/Widgets/DeviceTypeController.php @@ -30,6 +30,7 @@ use Illuminate\Http\Request; use Illuminate\View\View; use LibreNMS\DB\Eloquent; +use LibreNMS\Enum\DeviceType; class DeviceTypeController extends WidgetController { @@ -63,17 +64,17 @@ protected function getData(Request $request): array $count = 0; $device_types = []; - foreach (\App\Facades\LibrenmsConfig::get('device_types') as $device_type) { + foreach (array_keys(DeviceType::icons()) as $device_type) { $count++; $device_types[] = [ - 'type' => $device_type['type'], - 'count' => $counts->get($device_type['type'], 0), - 'visible' => $top->has($device_type['type']) || (! $data['top_device_group_count'] || $count < $data['top_device_group_count']), + 'type' => $device_type, + 'count' => $counts->get($device_type, 0), + 'visible' => $top->has($device_type) || (! $data['top_device_group_count'] || $count < $data['top_device_group_count']), ]; } if ($data['sort_order'] == 'name') { - usort($device_types, fn ($item1, $item2) => $item1['type'] <=> $item2['type']); + usort($device_types, fn ($item1, $item2) => strcasecmp(DeviceType::labelFor($item1['type']), DeviceType::labelFor($item2['type']))); } else { usort($device_types, fn ($item1, $item2) => $item2['count'] <=> $item1['count']); } diff --git a/app/Http/Controllers/Widgets/GlobeController.php b/app/Http/Controllers/Widgets/GlobeController.php index bd67269ce1e..93b3e5f9b49 100644 --- a/app/Http/Controllers/Widgets/GlobeController.php +++ b/app/Http/Controllers/Widgets/GlobeController.php @@ -74,13 +74,13 @@ public function getView(Request $request): string|View $count = $location->devices->count(); [$devices_down, $devices_up] = $location->devices->partition(fn ($device) => $device->disabled == 0 && $device->ignore == 0 && $device->status == 0); $up = $devices_up->count(); - $down_items = $devices_down->map(fn ($device) => htmlentities((string) $device->displayName()) . ' DOWN'); + $down_items = $devices_down->map(fn ($device) => htmlentities((string) $device->display) . ' DOWN'); } elseif ($data['markers'] == 'ports') { foreach ($location->devices as $device) { [$ports_down, $ports_up] = $device->ports->partition(fn ($port) => $port->ifOperStatus != IfOperStatus::Up && $port->ifAdminStatus == IfOperStatus::Up); $count += $device->ports->count(); $up += $ports_up->count(); - $down_items = $ports_down->map(fn ($port) => htmlentities((string) $device->displayName()) . '/' . htmlentities((string) $port->getShortLabel()) . ' DOWN'); + $down_items = $ports_down->map(fn ($port) => htmlentities((string) $device->display) . '/' . htmlentities((string) $port->getShortLabel()) . ' DOWN'); } } diff --git a/app/Http/Controllers/Widgets/GraphController.php b/app/Http/Controllers/Widgets/GraphController.php index c9c24508868..01199b1fdcb 100644 --- a/app/Http/Controllers/Widgets/GraphController.php +++ b/app/Http/Controllers/Widgets/GraphController.php @@ -38,7 +38,6 @@ use Carbon\Carbon; use Illuminate\Http\Request; use Illuminate\View\View; -use LibreNMS\Util\Graph; use LibreNMS\Util\Time; class GraphController extends WidgetController @@ -77,7 +76,7 @@ public function getTitle(): string if ($type == 'device') { $device = Device::find($settings['graph_device']); - return ($device ? $device->displayName() : 'Device') . ' / ' . $settings['graph_type']; + return ($device ? $device->display : 'Device') . ' / ' . $settings['graph_type']; } elseif ($type == 'aggregate') { $aggregate_type = $this->getGraphType(false); if ($aggregate_type == 'ports') { @@ -87,11 +86,15 @@ public function getTitle(): string } } elseif ($type == 'port') { if ($port = Port::find($settings['graph_port'])) { - return $port->device->displayName() . ' / ' . $port->getShortLabel() . ' / ' . $settings['graph_type']; + $device5 = $port->device; + + return $device5->display . ' / ' . $port->getShortLabel() . ' / ' . $settings['graph_type']; } } elseif ($type == 'application') { if ($application = Application::find($settings['graph_application'])) { - return $application->device->displayName() . ' / ' . $application->app_type . ' / ' . $settings['graph_type']; + $device4 = $application->device; + + return $device4->display . ' / ' . $application->app_type . ' / ' . $settings['graph_type']; } } elseif ($type == 'bill') { if ($bill = Bill::find($settings['graph_bill'])) { @@ -99,15 +102,21 @@ public function getTitle(): string } } elseif ($type == 'munin') { if ($munin = MuninPlugin::find($settings['graph_munin'])) { - return $munin->device->displayName() . ' / ' . $munin->mplug_type . ' / ' . $settings['graph_type']; + $device3 = $munin->device; + + return $device3->display . ' / ' . $munin->mplug_type . ' / ' . $settings['graph_type']; } } elseif ($type == 'service') { if ($service = Service::find($settings['graph_service'])) { - return $service->device->displayName() . ' / ' . $service->service_type . ' (' . $service->service_desc . ')' . ' / ' . $settings['graph_type']; + $device2 = $service->device; + + return $device2->display . ' / ' . $service->service_type . ' (' . $service->service_desc . ')' . ' / ' . $settings['graph_type']; } } elseif ($type == 'customoid') { if ($customoid = Customoid::find($settings['graph_customoid'])) { - return $customoid->device?->displayName() . ' / ' . $type . ' / ' . $customoid->customoid_descr; + $device1 = $customoid->device; + + return $device1->display . ' / ' . $type . ' / ' . $customoid->customoid_descr; } } @@ -123,17 +132,15 @@ public function getSettingsView(Request $request): View { $data = $this->getSettings(true); - // format display name for selected graph type $type_parts = explode('_', (string) $data['graph_type']); $primary = array_shift($type_parts); - $secondary = implode('_', $type_parts); - $name = $primary . ' ' . (Graph::isMibGraph($primary, $secondary) ? $secondary : implode(' ', $type_parts)); + $name = $primary . ' ' . implode(' ', $type_parts); // format display for selected items if ($primary == 'device' && $data['graph_device']) { $device = Device::find($data['graph_device']); } - $data['device_text'] = isset($device) ? $device->displayName() : __('Device does not exist'); + $data['device_text'] = isset($device) ? $device->display : __('Device does not exist'); if ($primary == 'port' && $data['graph_port']) { $port = Port::find($data['graph_port']); @@ -143,7 +150,7 @@ public function getSettingsView(Request $request): View if ($primary == 'application' && $data['graph_application']) { $app = Application::find($data['graph_application']); } - $data['application_text'] = isset($app) ? $app->displayName() . ' - ' . $app->device->displayName() : __('App does not exist'); + $data['application_text'] = isset($app) ? $app->displayName() . ' - ' . $app->device->display : __('App does not exist'); if ($primary == 'bill' && $data['graph_bill']) { $bill = Bill::find($data['graph_bill']); @@ -153,17 +160,17 @@ public function getSettingsView(Request $request): View if ($primary == 'munin' && $data['graph_munin']) { $mplug = MuninPlugin::with('device')->find($data['graph_munin']); } - $data['munin_text'] = isset($mplug) ? $mplug->device->displayName() . ' - ' . $mplug->mplug_type : __('Munin plugin does not exist'); + $data['munin_text'] = isset($mplug) ? $mplug->device->display . ' - ' . $mplug->mplug_type : __('Munin plugin does not exist'); if ($primary == 'service' && $data['graph_service']) { $service = Service::with('device')->find($data['graph_service']); } - $data['service_text'] = isset($service) ? $service->device->displayName() . ' - ' . $service->service_type . ' (' . $service->service_desc . ')' : __('Service does not exist'); + $data['service_text'] = isset($service) ? $service->device->display . ' - ' . $service->service_type . ' (' . $service->service_desc . ')' : __('Service does not exist'); if ($primary == 'customoid' && $data['graph_customoid']) { $customoid = Customoid::with('device')->find($data['graph_customoid']); } - $data['customoid_text'] = isset($customoid) ? $customoid->device?->displayName() . ' - ' . $customoid->customoid_descr : __('Custom OID does not exist'); + $data['customoid_text'] = isset($customoid) ? $customoid->device->display . ' - ' . $customoid->customoid_descr : __('Custom OID does not exist'); $data['graph_ports'] = Port::whereIntegerInRaw('port_id', $data['graph_ports']) ->select('ports.device_id', 'port_id', 'ifAlias', 'ifName', 'ifDescr') @@ -230,7 +237,7 @@ public function getView(Request $request): string|View if ($aggregate_type == 'sensors') { // Multi-sensor graph - $sensor_ids = array_filter($settings['graph_sensors']); // Filter empty values + $sensor_ids = $settings['graph_sensors']; $params[] = 'id=' . implode(',', $sensor_ids); if (($settings['graph_stack'] ?? 'no') == 'yes') { $params[] = 'stack=1'; @@ -321,8 +328,8 @@ public function getSettings($settingsView = false): array $settings['graph_service'] = $this->convertLegacySettingId($settings['graph_service'], 'service_id'); $settings['graph_bill'] = $this->convertLegacySettingId($settings['graph_bill'], 'bill_id'); - $settings['graph_custom'] = (array) $settings['graph_custom']; - $settings['graph_ports'] = (array) $settings['graph_ports']; + $settings['graph_custom'] = array_filter((array) $settings['graph_custom']); + $settings['graph_ports'] = array_filter((array) $settings['graph_ports']); $settings['graph_sensors'] = array_filter((array) $settings['graph_sensors']); $this->settings = $settings; diff --git a/app/Http/Controllers/Widgets/HealthSensorsController.php b/app/Http/Controllers/Widgets/HealthSensorsController.php index 0a7ac3c1345..eab4d3ce7bd 100644 --- a/app/Http/Controllers/Widgets/HealthSensorsController.php +++ b/app/Http/Controllers/Widgets/HealthSensorsController.php @@ -37,7 +37,7 @@ class HealthSensorsController extends WidgetController { protected string $name = 'health-sensors'; - private const MAX_ENTRIES = 100; + private const int MAX_ENTRIES = 100; /** @var array */ protected $defaults = [ diff --git a/app/Http/Controllers/Widgets/ImageController.php b/app/Http/Controllers/Widgets/ImageController.php index 91637c73bff..a859953ca26 100644 --- a/app/Http/Controllers/Widgets/ImageController.php +++ b/app/Http/Controllers/Widgets/ImageController.php @@ -60,6 +60,11 @@ public function getView(Request $request): string|View $data['image_url'] .= '?' . mt_rand(); } + // only link to http(s) or relative urls, never javascript: or other schemes + if (! preg_match('#^(?:https?://|[^:]*(?:[/?\#]|$))#i', (string) $data['target_url'])) { + $data['target_url'] = null; + } + return view('widgets.generic-image', $data); } diff --git a/app/Http/Controllers/Widgets/ServerStatsController.php b/app/Http/Controllers/Widgets/ServerStatsController.php index d8830fe87a5..393366e4177 100644 --- a/app/Http/Controllers/Widgets/ServerStatsController.php +++ b/app/Http/Controllers/Widgets/ServerStatsController.php @@ -55,7 +55,7 @@ public function getTitle(): string $device = Device::hasAccess(request()->user())->find($settings['device']); if ($device) { - return $device->displayName() . ' Stats'; + return $device->display . ' Stats'; } return parent::getTitle(); diff --git a/app/Http/Controllers/Widgets/TopDevicesController.php b/app/Http/Controllers/Widgets/TopDevicesController.php index 26bcb564897..64eedf86d0a 100644 --- a/app/Http/Controllers/Widgets/TopDevicesController.php +++ b/app/Http/Controllers/Widgets/TopDevicesController.php @@ -274,7 +274,7 @@ private function getStorageData($sort) 'type' => 'storage_usage', 'legend' => 'no', ]; - $overlib_content = Url::overlibContent($graph_array, $device->displayName() . ' - ' . $storage->storage_descr); + $overlib_content = Url::overlibContent($graph_array, $device->display . ' - ' . $storage->storage_descr); $link_array = $graph_array; $link_array['page'] = 'graphs'; diff --git a/app/Http/Middleware/AuthenticateGraph.php b/app/Http/Middleware/AuthenticateGraph.php index b1496941fc3..61700852510 100644 --- a/app/Http/Middleware/AuthenticateGraph.php +++ b/app/Http/Middleware/AuthenticateGraph.php @@ -26,14 +26,12 @@ namespace App\Http\Middleware; -use App\Facades\LibrenmsConfig; +use App\Graphs\GraphAccess; use Closure; use Illuminate\Auth\AuthenticationException; use Illuminate\Auth\Middleware\Authenticate; use Illuminate\Http\Request; use Illuminate\Http\Response; -use LibreNMS\Exceptions\InvalidIpException; -use LibreNMS\Util\IP; class AuthenticateGraph { @@ -45,6 +43,10 @@ class AuthenticateGraph LoadUserPreferences::class, ]; + public function __construct(private readonly GraphAccess $access) + { + } + /** * Handle an incoming request. * @@ -61,42 +63,17 @@ public function handle(Request $request, Closure $next, $relative = null): Respo return $next($request); } - // bypass normal auth if signed + // bypass normal auth if signed, the signature vouches for the graph if ($request->hasValidSignature($relative !== 'relative')) { - return $next($request); + return $this->access->trusted(fn () => $next($request)); } // bypass normal auth if ip is allowed (or all IPs) - if ($this->isAllowed($request)) { + if ($this->access->allowsGuests($request)) { return $next($request); } // unauthenticated, force login throw new AuthenticationException('Unauthenticated.'); } - - protected function isAllowed(Request $request): bool - { - if (LibrenmsConfig::get('allow_unauth_graphs', false)) { - d_echo("Unauthorized graphs allowed\n"); - - return true; - } - - $ip = $request->getClientIp(); - try { - $client_ip = IP::parse($ip); - foreach (LibrenmsConfig::get('allow_unauth_graphs_cidr', []) as $range) { - if ($client_ip->inNetwork($range)) { - d_echo("Unauthorized graphs allowed from $range\n"); - - return true; - } - } - } catch (InvalidIpException) { - d_echo("Client IP ($ip) is invalid.\n"); - } - - return false; - } } diff --git a/app/Http/Middleware/MergeSavedFilter.php b/app/Http/Middleware/MergeSavedFilter.php index 6695da88036..d8734e60c1a 100644 --- a/app/Http/Middleware/MergeSavedFilter.php +++ b/app/Http/Middleware/MergeSavedFilter.php @@ -23,19 +23,16 @@ public function handle(Request $request, Closure $next, string $filterName, ?str return $next($request); } - $filter = $request->array('filter'); - - // Explicit clear via '?filter=' parameter - if ($request->has('filter') && empty($filter)) { - $request->merge(['filter' => []]); + // Filters in the url replace the saved filter, '?filter=' explicitly clears it + if ($request->has('filter')) { + $request->merge(['filter' => $request->array('filter')]); return $next($request); } if ($request->user() !== null) { $prefKey = 'filters.' . $filterName; - $savedFilter = UserPref::getPref($request->user(), $prefKey) ?: []; - $request->merge(['filter' => array_merge($savedFilter, $filter)]); + $request->merge(['filter' => UserPref::getPref($request->user(), $prefKey) ?: []]); } return $next($request); diff --git a/app/Http/Requests/GraphImageRequest.php b/app/Http/Requests/GraphImageRequest.php new file mode 100644 index 00000000000..c9b5ffc27f5 --- /dev/null +++ b/app/Http/Requests/GraphImageRequest.php @@ -0,0 +1,41 @@ +respondWithErrorImage(new UnauthorizedGraph); + } + + protected function failedValidation(Validator $validator): never + { + $this->respondWithErrorImage(new InvalidGraphInput($validator->errors()->first())); + } + + /** + * @throws GraphException when debugging, to show the details + */ + private function respondWithErrorImage(GraphException $e): never + { + if (Debug::isEnabled()) { + throw $e; + } + + $image = Graph::errorImage($this->graphParams(), $e); + + throw new HttpResponseException(response($image->data, $e->httpStatus(), ['Content-Type' => $image->mediaType()])); + } +} diff --git a/app/Http/Requests/GraphRequest.php b/app/Http/Requests/GraphRequest.php new file mode 100644 index 00000000000..d0729c83559 --- /dev/null +++ b/app/Http/Requests/GraphRequest.php @@ -0,0 +1,103 @@ +mergeIfMissing(Url::parseLegacyPathVars($this->path())); + } + + public function authorize(): bool + { + try { + return $this->graph()->authorize(); + } catch (GraphException) { + // unknown graphs look the same as unauthorized ones + return false; + } + } + + /** + * @return array> + */ + public function rules(): array + { + return [ + 'type' => ['required', 'string', 'regex:' . GraphParameters::TYPE_PATTERN], + 'from' => ['nullable', 'string', 'regex:/^[-a-zA-Z0-9_ :]+$/'], + 'to' => ['nullable', 'string', 'regex:/^[-a-zA-Z0-9_ :]+$/'], + 'widescreen' => ['nullable', 'string', 'in:yes,no'], + 'legend' => ['nullable', 'string', 'in:yes,no'], + 'previous' => ['nullable', 'string', 'in:yes,no'], + 'showcommand' => ['nullable', 'string', 'in:yes,no'], + 'port_speed_zoom' => ['nullable', 'in:0,1'], + 'device' => ['nullable', 'integer'], + 'id' => ['nullable', 'regex:/^\d+(,\d+)*$/'], + 'customer' => ['nullable', 'string', 'max:255'], + 'width' => ['nullable', 'integer', 'min:10', 'max:' . GraphParameters::MAX_SIZE], + 'height' => ['nullable', 'integer', 'min:10', 'max:' . GraphParameters::MAX_SIZE], + 'graph_title' => ['nullable', 'string', 'max:255'], + + // Sensor parameters + 'sensor' => ['nullable', 'integer'], + + // Generic parameters commonly used by legacy graph scripts + 'in' => ['nullable', 'string', 'max:255', 'regex:/^[a-zA-Z0-9_.-]+$/'], + 'out' => ['nullable', 'string', 'max:255', 'regex:/^[a-zA-Z0-9_.-]+$/'], + 'inverse' => ['nullable', 'string', 'in:true,false,1,0,yes,no'], + ]; + } + + /** + * Only the standard graph variables have rules, legacy graph scripts check the variables they read themselves + */ + public function withValidator(Validator $validator): void + { + $validator->after(function (Validator $validator): void { + foreach (array_keys($this->all()) as $key) { + if (! preg_match('/^[a-zA-Z0-9_.-]+$/', (string) $key)) { + $validator->errors()->add((string) $key, 'The parameter key contains invalid characters.'); + } + } + }); + } + + /** + * The request input for building graph urls, with the time range resolved + * + * @param array $overrides + * @return array + */ + public function toVars(array $overrides = []): array + { + $params = $this->graphParams(); + $vars = $params->input->all(); + $vars['from'] = $params->from; + $vars['to'] = $params->ends_now ? null : $params->to; + + return array_merge($vars, $overrides); + } + + public function graphParams(): GraphParameters + { + return $this->graphParams ??= new GraphParameters($this->except(['page', 'username', 'password'])); + } + + public function graph(): GraphInterface + { + return $this->graph ??= resolve(GraphFactory::class)->graphFor($this->graphParams()); + } +} diff --git a/app/Http/Requests/GraphsPageRequest.php b/app/Http/Requests/GraphsPageRequest.php deleted file mode 100644 index a7c8ce9d8d9..00000000000 --- a/app/Http/Requests/GraphsPageRequest.php +++ /dev/null @@ -1,188 +0,0 @@ - */ - public array $ids = []; - - public ?string $subtitle = null; - - protected function prepareForValidation(): void - { - $this->mergeIfMissing(Url::parseLegacyPathVars($this->path())); - } - - /** - * Determine if the user is authorized to make this request. - */ - public function authorize(): bool - { - $typeInput = $this->string('type', '')->toString(); - if (! preg_match('#^[a-zA-Z0-9]+_[^/?&]+$#', $typeInput)) { - return false; - } - [$this->type, $this->subtype] = explode('_', $typeInput, 2); - - $this->from = (int) (Time::parseAt($this->input('from', '')) ?: LibrenmsConfig::get('time.day')); - $this->to = Time::parseAt($this->input('to', '')); - - // Include legacy database and HTML helper functions - include_once base_path('includes/dbFacile.php'); - include_once base_path('includes/common.php'); - include_once base_path('includes/html/functions.inc.php'); - include_once base_path('includes/rewrites.php'); - - $this->ids = $this->string('id')->explode(',')->filter()->map(intval(...))->values()->all(); - - if ($deviceId = $this->input('device')) { - $this->device = DeviceCache::get($deviceId); - } elseif (count($this->ids) === 1) { - if ($this->type == 'port') { - $this->port = PortCache::get($this->getId()); - $this->device = $this->port->device; - } elseif ($this->type == 'device') { - $this->device = DeviceCache::get($this->getId()); - } - } - $auth = false; - - $authPath = base_path("includes/html/graphs/$this->type/auth.inc.php"); - if (! is_file($authPath)) { - return false; - } - - $runAuth = function (string $file, array $vars, mixed $device, mixed $port, bool &$auth): void { - require $file; - - if (is_array($device) && isset($device['device_id'])) { - $this->device ??= DeviceCache::get($device['device_id']); - } - - if ($port instanceof Port) { - $this->port ??= $port; - } - - if (isset($title) && is_string($title) && $title !== '') { - $this->subtitle = $title; - } - }; - $runAuth($authPath, $this->toVars(), $this->device, $this->port, $auth); - - return (bool) $auth; - } - - /** - * Get the validation rules that apply to the request. - * - * @return array|string> - */ - public function rules(): array - { - return [ - 'type' => ['required', 'string', 'regex:/^[a-zA-Z0-9]+_[a-zA-Z0-9_.-]+$/'], - 'from' => ['nullable', 'string', 'regex:/^[-a-zA-Z0-9_ :]+$/'], - 'to' => ['nullable', 'string', 'regex:/^[-a-zA-Z0-9_ :]+$/'], - 'widescreen' => ['nullable', 'string', 'in:yes,no'], - 'legend' => ['nullable', 'string', 'in:yes,no'], - 'previous' => ['nullable', 'string', 'in:yes,no'], - 'showcommand' => ['nullable', 'string', 'in:yes,no'], - 'port_speed_zoom' => ['nullable', 'in:0,1'], - 'device' => ['nullable', 'integer'], - 'id' => ['nullable', 'regex:/^\d+(,\d+)*$/'], - 'customer' => ['nullable', 'string', 'max:255'], - 'width' => ['nullable', 'integer', 'min:10'], - 'height' => ['nullable', 'integer', 'min:10'], - - // Sensor parameters - 'sensor' => ['nullable', 'integer'], - - // Generic parameters commonly used by legacy graph scripts - 'in' => ['nullable', 'string', 'max:255', 'regex:/^[a-zA-Z0-9_.-]+$/'], - 'out' => ['nullable', 'string', 'max:255', 'regex:/^[a-zA-Z0-9_.-]+$/'], - 'inverse' => ['nullable', 'string', 'in:true,false,1,0,yes,no'], - 'float_precision' => ['nullable', 'integer'], - 'total' => ['nullable', 'string', 'in:true,false,1,0,yes,no'], - 'details' => ['nullable', 'string', 'in:true,false,1,0,yes,no'], - 'aggregate' => ['nullable', 'string', 'in:true,false,1,0,yes,no'], - ]; - } - - /** - * Configure the validator instance. - */ - public function withValidator(Validator $validator): void - { - $validator->after(function (Validator $validator): void { - $validateItem = function (string $key, mixed $value) use ($validator, &$validateItem): void { - if (is_array($value)) { - foreach ($value as $k => $v) { - $validateItem($key, $k); - $validateItem($key, $v); - } - } elseif (is_string($value)) { - if (! preg_match('/^[-a-zA-Z0-9_.: \/+,]*$/', $value)) { - $validator->errors()->add($key, 'The parameter value contains invalid characters.'); - } - } - }; - - foreach ($this->all() as $key => $value) { - // Validate key - if (! preg_match('/^[a-zA-Z0-9_.-]+$/', $key)) { - $validator->errors()->add($key, 'The parameter key contains invalid characters.'); - } - - // customer names are free text, only used as a query binding - if ($key === 'customer') { - continue; - } - - $validateItem($key, $value); - } - }); - } - - public function getId(): int - { - if (count($this->ids) !== 1) { - throw ValidationException::withMessages(['id' => 'Invalid id input, input must be a single integer']); - } - - return $this->ids[0]; - } - - /** - * Build the legacy variables array for graph template execution. - * - * @param array $overrides - * @return array - */ - public function toVars(array $overrides = []): array - { - $vars = $this->except(['page', 'username', 'password']); - $vars['from'] = $this->from; - $vars['to'] = $this->to ?: null; - - return array_merge($vars, $overrides); - } -} diff --git a/app/Http/Requests/HostSearchRequest.php b/app/Http/Requests/HostSearchRequest.php new file mode 100644 index 00000000000..6fb62aa57dc --- /dev/null +++ b/app/Http/Requests/HostSearchRequest.php @@ -0,0 +1,93 @@ +|null */ + private ?array $allTerms = null; + + /** + * @return array + */ + public function rules(): array + { + return [ + 'q' => 'nullable|string|max:8000', // room for a pasted list of addresses + 'page' => 'nullable|integer|min:1', + 'sort' => 'nullable|in:ip,mac,seen', + 'dir' => 'nullable|in:asc,desc', + 'per_page' => 'nullable|integer|in:10,25,50,100', + 'view' => 'nullable|in:host,locations', + // the table export button's own parameters + 'export' => 'nullable|in:page,all', + 'perPage' => 'nullable|integer|in:10,25,50,100', + ...Port::filterValidationRules(), + ]; + } + + public function searchText(): string + { + return trim($this->validated('q') ?? ''); + } + + /** + * ip, mac, seen or input: the order the terms were given in + */ + public function sort(): string + { + return $this->validated('sort') ?? $this->listQuery()->defaultSort(); + } + + public function direction(): string + { + return $this->validated('dir') ?? 'asc'; + } + + /** + * The terms that get searched, empty lists every host + * + * @return list + */ + public function terms(): array + { + return array_slice($this->allTerms(), 0, SearchTerm::MAX_TERMS); + } + + /** + * How many terms were given, this may be more than get searched + */ + public function termCount(): int + { + return count($this->allTerms()); + } + + /** + * @return array> + */ + public function filters(): array + { + return array_filter($this->validated('filter') ?? []); + } + + public function listQuery(): HostListQuery + { + return new HostListQuery($this->terms(), $this->filters(), $this->user()); + } + + /** + * @return list + */ + private function allTerms(): array + { + return $this->allTerms ??= SearchTerm::parseMany($this->validated('q') ?? ''); + } +} diff --git a/app/Http/Requests/SavePollingMethodRequest.php b/app/Http/Requests/SavePollingMethodRequest.php index 628ce2e0c15..f89554388bd 100644 --- a/app/Http/Requests/SavePollingMethodRequest.php +++ b/app/Http/Requests/SavePollingMethodRequest.php @@ -9,6 +9,7 @@ use Illuminate\Validation\Validator; use LibreNMS\Enum\PollingMethodType; use LibreNMS\Enum\SecretMode; +use LibreNMS\Enum\SecretType; use LibreNMS\Polling\Method\PollingMethodRegistry; /** @@ -33,7 +34,7 @@ public function pollingType(): ?PollingMethodType { $type = $this->route('methodType') ?? $this->input('method_type'); - return is_string($type) ? PollingMethodType::tryFrom($type) : null; + return is_string($type) ? PollingMethodType::tryFromKnown($type) : null; } /** @@ -42,7 +43,7 @@ public function pollingType(): ?PollingMethodType public function rules(PollingMethodRegistry $pollingMethods): array { $rules = [ - 'method_type' => [Rule::requiredIf($this->isCreating()), Rule::enum(PollingMethodType::class)], + 'method_type' => [Rule::requiredIf($this->isCreating()), Rule::enum(PollingMethodType::class)->except([PollingMethodType::Unknown])], 'enabled' => ['boolean'], 'affects_availability' => ['boolean'], 'force_save' => ['boolean'], @@ -59,8 +60,8 @@ public function rules(PollingMethodRegistry $pollingMethods): array $rules["settings.$key"] = $rule; } - $secretDefinition = $method->secretType()?->definition(); - if ($secretDefinition === null) { + $secretTypes = $method->secretTypes(); + if (empty($secretTypes)) { return $rules; } @@ -74,7 +75,8 @@ public function rules(PollingMethodRegistry $pollingMethods): array ? ['required', 'string', 'max:255', $unique] : ['nullable', 'string', 'max:255', $unique->ignore($this->input('secret_id'))]; - foreach ($secretDefinition->rules() as $key => $rule) { + $rules['secret_type'] = [Rule::requiredIf(count($secretTypes) > 1), 'nullable', Rule::in(array_column($secretTypes, 'value'))]; + foreach ($method->secretTypeFrom($this->input('secret_type'))?->definition()->rules() ?? [] as $key => $rule) { $rules["secret_data.$key"] = $rule; } } @@ -108,13 +110,21 @@ protected function prepareForValidation(): void return; } - $secretType = $this->container->make(PollingMethodRegistry::class)->get($type)->secretType(); - if ($secretType === null) { + $secretTypes = $this->container->make(PollingMethodRegistry::class)->get($type)->secretTypes(); + if (empty($secretTypes)) { return; } - $source = Secret::resolveForType((int) $secretId, $secretType, $this->user()); + $source = Secret::resolveForTypes((int) $secretId, $secretTypes, $this->user()); - $this->merge(['secret_data' => $secretType->definition()->unmask($secretData, $source->data)]); + // an edited secret keeps its type, a new secret made from it has the same type unless another was chosen + $secretType = SecretMode::tryFrom((string) $this->input('secret_mode')) === SecretMode::Edit + ? $source->secret_type + : (SecretType::tryFromKnown((string) $this->input('secret_type')) ?? $source->secret_type); + + $this->merge([ + 'secret_type' => $secretType->value, + 'secret_data' => $source->secret_type === $secretType ? $secretType->definition()->unmask($secretData, $source->data) : $secretData, + ]); } } diff --git a/app/Http/Requests/StoreDeviceRequest.php b/app/Http/Requests/StoreDeviceRequest.php index 100af4b2638..1a1c2071774 100644 --- a/app/Http/Requests/StoreDeviceRequest.php +++ b/app/Http/Requests/StoreDeviceRequest.php @@ -37,7 +37,7 @@ public function rules(PollingMethodRegistry $pollingMethods): array // Loop over the methods provided in the request foreach ($this->input('polling_methods', []) as $method => $data) { - $type = PollingMethodType::tryFrom($method); + $type = PollingMethodType::tryFromKnown($method); if (! $type) { continue; } @@ -56,8 +56,8 @@ public function rules(PollingMethodRegistry $pollingMethods): array $rules["polling_methods.{$method}.secret_mode"] = ['nullable', Rule::enum(SecretMode::class)->only([SecretMode::Default, SecretMode::Existing, SecretMode::New])]; $pollingMethod = $pollingMethods->get($type); - $secretDefinition = $pollingMethod->secretType()?->definition(); - if ($secretDefinition !== null) { + $secretTypes = $pollingMethod->secretTypes(); + if (! empty($secretTypes)) { $rules["polling_methods.{$method}.secret_id"] = [ 'required_if:polling_methods.' . $method . '.secret_mode,existing', 'nullable', @@ -67,7 +67,8 @@ public function rules(PollingMethodRegistry $pollingMethods): array if (($data['secret_mode'] ?? null) === SecretMode::New->value) { $rules["polling_methods.{$method}.description"] = ['nullable', 'string', 'max:255', 'unique:secrets,description']; - foreach ($secretDefinition->rules() as $key => $rule) { + $rules["polling_methods.{$method}.secret_type"] = [Rule::requiredIf(count($secretTypes) > 1), 'nullable', Rule::in(array_column($secretTypes, 'value'))]; + foreach ($pollingMethod->secretTypeFrom($data['secret_type'] ?? null)?->definition()->rules() ?? [] as $key => $rule) { $rules["polling_methods.{$method}.secret_data.{$key}"] = $rule; } } diff --git a/app/Http/Requests/UpdateUserRequest.php b/app/Http/Requests/UpdateUserRequest.php index a8db882e75f..c959679ca17 100644 --- a/app/Http/Requests/UpdateUserRequest.php +++ b/app/Http/Requests/UpdateUserRequest.php @@ -37,6 +37,7 @@ public function rules(): array return [ 'realname' => 'nullable|max:64|string', 'email' => 'nullable|email|max:64', + 'phone' => 'nullable|string|max:15', 'descr' => 'nullable|max:30|string', 'new_password' => ['nullable', 'confirmed', Password::defaults()], 'new_password_confirmation' => 'nullable|same:new_password', @@ -57,6 +58,7 @@ public function rules(): array return [ 'realname' => 'nullable|max:64|string', 'email' => 'nullable|email|max:64', + 'phone' => 'nullable|string|max:15', 'descr' => 'nullable|max:30|string', 'old_password' => 'nullable|string', 'new_password' => ['nullable', 'confirmed', Password::defaults()], diff --git a/app/Http/Resources/Device.php b/app/Http/Resources/Device.php index 14fbbf1010e..e6d3fa0aa5d 100644 --- a/app/Http/Resources/Device.php +++ b/app/Http/Resources/Device.php @@ -11,7 +11,9 @@ use LibreNMS\Enum\PortAssociationMode; use LibreNMS\Exceptions\SecretDecryptionException; use LibreNMS\Polling\Method\Methods\SnmpPollingMethod; -use LibreNMS\Polling\Secrets\Data\SnmpSecretData; +use LibreNMS\Polling\Secrets\Data\SecretData; +use LibreNMS\Polling\Secrets\Data\SnmpCommunitySecretData; +use LibreNMS\Polling\Secrets\Data\SnmpV3SecretData; /** * @mixin \App\Models\Device @@ -26,10 +28,12 @@ class Device extends JsonResource public function toArray(Request $request): array { $canUnmask = (bool) $request->user()?->can('unmask', Secret::class); + $snmp = new SnmpPollingMethod; $snmpMethod = $this->pollingMethod(PollingMethodType::Snmp); - $snmpSettings = $snmpMethod ? ($snmpMethod->settings ?? []) + (new SnmpPollingMethod)->defaults($this->resource) : []; + $snmpSettings = $snmpMethod ? ($snmpMethod->settings ?? []) + $snmp->defaults($this->resource) : []; $snmpSecret = $this->snmpSecret($snmpMethod); - $snmpV3 = $snmpSecret?->version === 'v3' ? $snmpSecret : null; + $snmpCommunity = $snmpSecret instanceof SnmpCommunitySecretData ? $snmpSecret : null; + $snmpV3 = $snmpSecret instanceof SnmpV3SecretData ? $snmpSecret : null; $data = [ 'device_id' => $this->device_id, @@ -37,14 +41,14 @@ public function toArray(Request $request): array 'sysName' => $this->sysName, 'ip' => $this->ip, 'overwrite_ip' => $this->overwrite_ip, - 'community' => $canUnmask && $snmpV3 === null ? $snmpSecret?->community : null, + 'community' => $canUnmask ? $snmpCommunity?->community : null, 'authlevel' => $snmpV3?->authlevel, 'authname' => $snmpV3?->authname, 'authpass' => $canUnmask ? $snmpV3?->authpass : null, 'authalgo' => $snmpV3?->authalgo, 'cryptopass' => $canUnmask ? $snmpV3?->cryptopass : null, 'cryptoalgo' => $snmpV3?->cryptoalgo, - 'snmpver' => $snmpSecret?->version, + 'snmpver' => $snmpMethod ? $snmp->version($snmpMethod) : null, 'port' => $snmpSettings['port'] ?? null, 'transport' => $snmpSettings['transport'] ?? null, 'timeout' => $snmpSettings['timeout'] ?? null, @@ -109,14 +113,14 @@ public function toArray(Request $request): array /** * Credentials are not needed to list devices, so a secret that can't be decrypted is left out. */ - private function snmpSecret(?DevicePollingMethod $snmpMethod): ?SnmpSecretData + private function snmpSecret(?DevicePollingMethod $snmpMethod): ?SecretData { if ($snmpMethod?->secret === null) { return null; } try { - return SnmpSecretData::fromArray($snmpMethod->secret->data); + return $snmpMethod->secret->secret_type->data($snmpMethod->secret->data); } catch (SecretDecryptionException) { return null; } diff --git a/app/Http/ViewComposers/MenuComposer.php b/app/Http/ViewComposers/MenuComposer.php index 940a049f83e..51297d3a3fe 100644 --- a/app/Http/ViewComposers/MenuComposer.php +++ b/app/Http/ViewComposers/MenuComposer.php @@ -49,10 +49,10 @@ use App\Models\Vlan; use App\Models\Vminfo; use App\Models\WirelessSensor; -use Illuminate\Support\Arr; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Gate; use Illuminate\View\View; +use LibreNMS\Enum\DeviceType; use LibreNMS\Enum\WirelessSensorType; use LibreNMS\Interfaces\Plugins\Hooks\MenuEntryHook; use LibreNMS\Plugins; @@ -91,7 +91,7 @@ public function compose(View $view) $vars['device_groups'] = DeviceGroup::hasAccess($user)->orderBy('name')->get(['device_groups.id', 'name', 'desc']); $vars['package_count'] = Package::hasAccess($user)->count(); - $configDeviceTypes = Arr::keyBy(LibrenmsConfig::get('device_types'), 'type'); + $deviceTypeIcons = DeviceType::icons(); $vars['device_types'] = Device::hasAccess($user) ->select('type') ->distinct() @@ -99,7 +99,7 @@ public function compose(View $view) ->orderBy('type') ->pluck('type') ->keyBy(fn ($type) => $type) - ->map(fn ($type) => $configDeviceTypes[$type]['icon'] ?? 'angle-double-right'); + ->map(fn ($type) => $deviceTypeIcons[$type] ?? 'angle-double-right'); $vars['no_devices_added'] = ! Device::hasAccess($user)->exists(); $vars['locations'] = (LibrenmsConfig::get('show_locations') && LibrenmsConfig::get('show_locations_dropdown')) ? diff --git a/app/Jobs/AddScannedHost.php b/app/Jobs/AddScannedHost.php index f15edc2a759..556eeb386eb 100644 --- a/app/Jobs/AddScannedHost.php +++ b/app/Jobs/AddScannedHost.php @@ -48,6 +48,7 @@ class AddScannedHost implements ShouldQueue /** * @param int|null $snmpSecretId the secret the host replied to, null to add the host as ping only * @param bool $pingable the host replied to ping, it is not pinged again. With SNMP, a host that did not reply is added without ICMP + * @param string|null $snmpVersion the SNMP version the host replied to */ public function __construct( public string $ip, @@ -55,12 +56,18 @@ public function __construct( public bool $pingable, public int $pollerGroup = 0, public bool $dnsOnly = false, + public ?string $snmpVersion = null, ) { } - public function displayName(): string + /** + * Tags shown in Horizon + * + * @return string[] + */ + public function tags(): array { - return "AddScannedHost:$this->ip"; + return ['scan', "ip:$this->ip"]; } /** @@ -83,7 +90,13 @@ public function handle(Dns $dns, BuildDefaultPollingMethods $builder, AddFoundDe ? [PollingMethodType::Icmp->value => ['active' => true]] : [ PollingMethodType::Icmp->value => ['active' => $this->pingable], - PollingMethodType::Snmp->value => ['active' => true, 'secret_mode' => SecretMode::Existing->value, 'secret_id' => $this->snmpSecretId], + PollingMethodType::Snmp->value => [ + 'active' => true, + 'secret_mode' => SecretMode::Existing->value, + 'secret_id' => $this->snmpSecretId, + // only v1 is a setting, the scan found it so v2c is not tried again + 'settings' => $this->snmpVersion === 'v1' ? ['version' => 'v1'] : [], + ], ], ]); diff --git a/app/Jobs/Concerns/DeviceJob.php b/app/Jobs/Concerns/DeviceJob.php new file mode 100644 index 00000000000..5d1a63e0024 --- /dev/null +++ b/app/Jobs/Concerns/DeviceJob.php @@ -0,0 +1,75 @@ +device_id:$this->queue"; + } + + /** + * @return bool false if the device no longer exists or is not in this queue's poller group + */ + private function initDevice(): bool + { + Cache::driver('device')->flush(); + \DeviceCache::setPrimary($this->device_id); + $this->device = \DeviceCache::getPrimary(); + + if (! $this->device->exists) { + $this->device = null; + Log::info("Device $this->device_id no longer exists, skipping"); + + return false; + } + + // DispatchPollingWork queues it again for the new group, this job releases only the old group's lock + if ($this->queue !== null && $this->queue != self::queueFor($this->device->poller_group)) { + Log::info("Device $this->device_id moved to poller group {$this->device->poller_group}, skipping"); + $this->device = null; + + return false; + } + + $this->device->ip = Dns::lookupIp($this->device) ?? $this->device->ip; + + // attributes only, relations loaded onto the cached device would be serialized too + $this->deviceArray = $this->device->attributesToArray(); + if ($os_group = LibrenmsConfig::get("os.{$this->device->os}.group")) { + $this->deviceArray['os_group'] = $os_group; + } + + Log::info(sprintf(<<<'EOH' +Hostname: %s %s +ID: %s +OS: %s +IP: %s + +EOH, $this->device->hostname, $os_group ? " ($os_group)" : '', $this->device->device_id, $this->device->os, $this->device->ip)); + + return true; + } +} diff --git a/app/Jobs/DiscoverDevice.php b/app/Jobs/DiscoverDevice.php index 3df15d7b7a6..fef2517f053 100644 --- a/app/Jobs/DiscoverDevice.php +++ b/app/Jobs/DiscoverDevice.php @@ -9,6 +9,7 @@ use App\Events\ModuleDiscovered; use App\Exceptions\DiscoveryFailedException; use App\Facades\LibrenmsConfig; +use App\Jobs\Concerns\DeviceJob; use App\Models\Device; use App\Models\Eventlog; use App\Polling\Measure\Measurement; @@ -22,21 +23,19 @@ use Illuminate\Queue\Jobs\SyncJob; use Illuminate\Queue\SerializesModels; use Illuminate\Support\Facades\App; -use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Log; use LibreNMS\Enum\ProcessType; use LibreNMS\Enum\Severity; use LibreNMS\Interfaces\SupportsSubmodules; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; use LibreNMS\Polling\PerDeviceMethodResults; -use LibreNMS\Util\Dns; use LibreNMS\Util\Module; use LibreNMS\Util\ModuleList; use Throwable; class DiscoverDevice implements ShouldQueue, ShouldBeUnique { + use DeviceJob; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; private array $deviceArray; @@ -51,23 +50,39 @@ public function __construct( ) { } - public function displayName(): string + /** + * Each poller group has its own queue, worked by the nodes in that group + */ + public static function queueFor(int $poller_group): string { - return "DiscoverDevice:$this->device_id"; + return $poller_group ? "discovery-$poller_group" : 'discovery'; } - public function uniqueId(): int + public function deviceId(): int { return $this->device_id; } + /** + * Tags shown in Horizon + * + * @return string[] + */ + public function tags(): array + { + return ['discovery', "device:$this->device_id"]; + } + /** * Execute the job. */ public function handle(): void { + if (! $this->initDevice()) { + return; // deleted or moved to another poller group after it was queued + } + try { - $this->initDevice(); App::forgetInstance('sensor-discovery'); DiscoveringDevice::dispatch($this->device); $measurement = Measurement::start('discover'); @@ -78,7 +93,7 @@ public function handle(): void $measurement->end(); Log::info(sprintf("\n>>> Discovered %s (%s) in %0.3f seconds <<<", - $this->device->displayName(), + $this->device->display, $this->device->device_id, $measurement->getDuration())); @@ -99,7 +114,7 @@ public function handle(): void $this->device?->save(); // make sure device changes are saved even if discovery fails } - // retry down devices, last attempt succeeds so it stays out of failed_jobs + // retry down devices, the last attempt succeeds, a down device is not a failed job if (! $this->device->status && $this->job && ! $this->job instanceof SyncJob && $this->attempts() < $this->tries) { throw new DiscoveryFailedException($this->device); } @@ -111,27 +126,6 @@ public function backoff(): array return DispatchPollingWork::downRetryBackoff(); } - private function initDevice(): void - { - Cache::driver('device')->flush(); - \DeviceCache::setPrimary($this->device_id); - $this->device = \DeviceCache::getPrimary(); - $this->device->ip = Dns::lookupIp($this->device) ?? $this->device->ip; - - $this->deviceArray = $this->device->toArray(); - if ($os_group = LibrenmsConfig::get("os.{$this->device->os}.group")) { - $this->deviceArray['os_group'] = $os_group; - } - - Log::info(sprintf(<<<'EOH' -Hostname: %s %s -ID: %s -OS: %s -IP: %s - -EOH, $this->device->hostname, $os_group ? " ($os_group)" : '', $this->device->device_id, $this->device->os, $this->device->ip)); - } - private function discoverModules(): void { // import legacy stuff @@ -143,7 +137,6 @@ private function discoverModules(): void // update availability status $methodResults = new PerDeviceMethodResults($this->device); app(CheckDeviceAvailability::class)->execute($methodResults); - $connectivity = new ConnectivityHelper($this->device, $methodResults); $this->deviceArray['status'] = $this->device->status; $this->deviceArray['status_reason'] = $this->device->status_reason; $os = OS::make($this->deviceArray); @@ -156,7 +149,7 @@ private function discoverModules(): void try { $instance = Module::fromName($module); - $should_discover = $instance->shouldDiscover($os, $module_status, $connectivity); + $should_discover = $module_status->isEnabled() && $instance->shouldDiscover($os); if ($should_discover) { DiscoveringModule::dispatch($this->device, $module); diff --git a/app/Jobs/DispatchPollingWork.php b/app/Jobs/DispatchPollingWork.php index 86f42ea60b9..1d05b1e5b69 100644 --- a/app/Jobs/DispatchPollingWork.php +++ b/app/Jobs/DispatchPollingWork.php @@ -3,12 +3,18 @@ namespace App\Jobs; use App\Facades\LibrenmsConfig; +use App\Queue\PollingQueues; +use App\Queue\QueueStatus; +use App\Queue\WorkedQueues; +use App\Queue\WorkerNode; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Collection; +use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; use LibreNMS\Util\ModuleList; @@ -26,10 +32,9 @@ class DispatchPollingWork implements ShouldQueue, ShouldBeUniqueUntilProcessing * cannot stretch the interval past the frequency and skip a window. Start times slowly drift earlier, * which spreads the load around the window. */ - private const EARLY_START = 3; + private const int EARLY_START = 3; public int $uniqueFor = 60; // only one waiting in the queue - private string $pollingQueueConnection; private int $poll_interval; private int $discovery_interval; @@ -41,15 +46,22 @@ public function __construct( private ?bool $poll = null, private ?bool $discover = null, ) { - $this->poll ??= LibrenmsConfig::get('schedule_type.poller') == 'scheduler'; - $this->discover ??= LibrenmsConfig::get('schedule_type.discovery') == 'scheduler'; + $this->onQueue(PollingQueues::SCHEDULER); + $this->poll ??= WorkerNode::inUse('poller'); + $this->discover ??= WorkerNode::inUse('discovery'); $this->poll_interval = self::pollInterval(); - $this->discovery_interval = LibrenmsConfig::get('service_discovery_frequency', 21600) - self::EARLY_START; + $this->discovery_interval = self::discoveryInterval(); + } - $default = \config('queue.default'); - // database minimum driver, redis recommended - $this->pollingQueueConnection = $default == 'sync' ? 'database' : $default; + /** + * Tags shown in Horizon + * + * @return string[] + */ + public function tags(): array + { + return ['dispatch']; } /** @@ -82,29 +94,72 @@ public function handle(): void ->get(); $modules = ModuleList::fromUserOverrides([]); + $worked = $this->workedQueues($devices); $discovered = []; $polled = []; + $unworked = []; foreach ($devices as $device) { if ($this->discover && $device->discover) { - DiscoverDevice::dispatch($device->device_id, $modules) - ->onConnection($this->pollingQueueConnection) - ->onQueue($device->poller_group ? "discovery-$device->poller_group" : 'discovery') - ->delay($this->delay($device->discovery_wait)); - $discovered[] = $device->device_id; + $queue = DiscoverDevice::queueFor($device->poller_group); + if ($worked === null || in_array($queue, $worked)) { + DiscoverDevice::dispatch($device->device_id, $modules) + ->onQueue($queue) + ->delay($this->delay($device->discovery_wait)); + $discovered[] = $device->device_id; + } else { + $unworked[$queue][] = $device->device_id; + } } if ($this->poll && $device->poll) { - PollDevice::dispatch($device->device_id, $modules) - ->onConnection($this->pollingQueueConnection) - ->onQueue($device->poller_group ? "poll-$device->poller_group" : 'poll') - ->delay($this->delay($device->poll_wait)); - $polled[] = $device->device_id; + $queue = PollDevice::queueFor($device->poller_group); + if ($worked === null || in_array($queue, $worked)) { + PollDevice::dispatch($device->device_id, $modules) + ->onQueue($queue) + ->delay($this->delay($device->poll_wait)); + $polled[] = $device->device_id; + } else { + $unworked[$queue][] = $device->device_id; + } } } Log::debug('Due for discovery: ' . implode(',', $discovered)); Log::debug('Due for polling: ' . implode(',', $polled)); + + foreach ($unworked as $queue => $device_ids) { + // warn hourly, devices stay due and are queued as soon as a node works the queue + if (Cache::add("dispatch-unworked-queue:$queue", true, 3600)) { + Log::warning("No workers for queue $queue, not queueing devices: " . implode(',', $device_ids)); + } + } + + app(QueueStatus::class)->recordDispatched(); + } + + /** + * Queues worked by the queue workers on any node. + * A job queued for a poller group no node works would wait there, with another queued each time its unique lock expires. + * Null when unknown (no worker has recorded its queues), everything is queued. + * + * @param Collection $devices due devices + * @return string[]|null + */ + private function workedQueues(Collection $devices): ?array + { + $groups = $devices->pluck('poller_group')->map(intval(...))->all(); + $queues = [PollingQueues::SCHEDULER, ...PollingQueues::forGroups($groups, $this->poll, $this->discover)]; + + return app(WorkedQueues::class)->worked($queues) ?: null; + } + + /** + * Seconds between polls of a device, like the dispatcher service + */ + public static function pollFrequency(): int + { + return (int) LibrenmsConfig::get('service_poller_frequency', LibrenmsConfig::get('rrd.step', 300)); } /** @@ -112,7 +167,23 @@ public function handle(): void */ public static function pollInterval(): int { - return LibrenmsConfig::get('service_poller_frequency', LibrenmsConfig::get('rrd.step', 300)) - self::EARLY_START; + return self::pollFrequency() - self::EARLY_START; + } + + /** + * Seconds from the start of one discovery to the start of the next + */ + public static function discoveryInterval(): int + { + return self::discoveryFrequency() - self::EARLY_START; + } + + /** + * Seconds between discoveries of a device, like the dispatcher service + */ + public static function discoveryFrequency(): int + { + return (int) LibrenmsConfig::get('service_discovery_frequency', 21600); } /** diff --git a/app/Jobs/PollDevice.php b/app/Jobs/PollDevice.php index ee57a1b7001..4915c501593 100644 --- a/app/Jobs/PollDevice.php +++ b/app/Jobs/PollDevice.php @@ -10,6 +10,7 @@ use App\Exceptions\PollingFailedException; use App\Facades\LibrenmsConfig; use App\Facades\Rrd; +use App\Jobs\Concerns\DeviceJob; use App\Models\Device; use App\Models\Eventlog; use App\Polling\Measure\Measurement; @@ -22,28 +23,26 @@ use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\Jobs\SyncJob; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Log; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Enum\ProcessType; use LibreNMS\Enum\Severity; use LibreNMS\Interfaces\SupportsSubmodules; use LibreNMS\OS; -use LibreNMS\Polling\ConnectivityHelper; use LibreNMS\Polling\PerDeviceMethodResults; use LibreNMS\RRD\RrdDefinition; use LibreNMS\RRD\RrdPath; -use LibreNMS\Util\Dns; use LibreNMS\Util\Module; use LibreNMS\Util\ModuleList; use Throwable; class PollDevice implements ShouldQueue, ShouldBeUnique { + use DeviceJob; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; private ?Device $device = null; public int $tries = 4; // 1 + backoff() steps - public int $uniqueFor = 3600; // held across retries public int $timeout = 600; // < queue retry_after private ?array $deviceArray = null; @@ -62,24 +61,48 @@ public function __construct( ) { } - public function displayName(): string + /** + * Held while the job waits and runs (up to the timeout) and across retries (most of a poll interval). + * A lock left behind (the job was lost) holds up the device for no more than this. + */ + public function uniqueFor(): int + { + return $this->timeout + DispatchPollingWork::pollFrequency(); + } + + /** + * Each poller group has its own queue, worked by the nodes in that group + */ + public static function queueFor(int $poller_group): string { - return "PollDevice:$this->device_id"; + return $poller_group ? "poll-$poller_group" : 'poll'; } - public function uniqueId(): int + public function deviceId(): int { return $this->device_id; } + /** + * Tags shown in Horizon + * + * @return string[] + */ + public function tags(): array + { + return ['poll', "device:$this->device_id"]; + } + /** * Execute the job. */ public function handle(): void { - $this->initDevice(); + if (! $this->initDevice()) { + return; // deleted or moved to another poller group after it was queued + } + $methodResults = new PerDeviceMethodResults($this->device); - $connectivity = new ConnectivityHelper($this->device, $methodResults); $this->initRrdDirectory(); PollingDevice::dispatch($this->device); $this->os = OS::make($this->deviceArray); @@ -91,7 +114,7 @@ public function handle(): void // check and save status app(CheckDeviceAvailability::class)->execute($methodResults, true); - $this->pollModules($connectivity); + $this->pollModules(); $methodResults->saveCheckedMethods(); $measurement->end(); @@ -102,7 +125,7 @@ public function handle(): void $this->recordPerformance($measurement); } - if ($connectivity->icmpIsEnabled()) { + if ($this->device->polling()->isEnabled(PollingMethodType::Icmp)) { $this->os->enableGraph('ping_perf'); } @@ -116,8 +139,9 @@ public function handle(): void // finalize the device poll $this->device->save(); + $device = $this->device; Log::info(sprintf("\n>>> Polled %s (%s) in %0.3f seconds <<<", - $this->device->displayName(), + $device->display, $this->device->device_id, $measurement->getDuration())); @@ -135,7 +159,7 @@ public function handle(): void DevicePolled::dispatch($this->device); - // retry down devices, last attempt succeeds so it stays out of failed_jobs + // retry down devices, the last attempt succeeds, a down device is not a failed job if (! $this->device->status && $this->job && ! $this->job instanceof SyncJob && $this->attempts() < $this->tries) { throw new PollingFailedException($this->device); } @@ -147,7 +171,7 @@ public function backoff(): array return DispatchPollingWork::downRetryBackoff(); } - private function pollModules(ConnectivityHelper $connectivity): void + private function pollModules(): void { // update $device array status $this->deviceArray['status'] = $this->device->status; @@ -168,7 +192,7 @@ private function pollModules(ConnectivityHelper $connectivity): void try { $instance = Module::fromName($module); - $should_poll = $instance->shouldPoll($this->os, $module_status, $connectivity); + $should_poll = $module_status->isEnabled() && $instance->shouldPoll($this->os); if ($should_poll) { PollingModule::dispatch($this->device, $module); @@ -203,27 +227,6 @@ private function pollModules(ConnectivityHelper $connectivity): void } } - private function initDevice(): void - { - Cache::driver('device')->flush(); - \DeviceCache::setPrimary($this->device_id); - $this->device = \DeviceCache::getPrimary(); - $this->device->ip = Dns::lookupIp($this->device) ?? $this->device->ip; - - $this->deviceArray = $this->device->toArray(); - if ($os_group = LibrenmsConfig::get("os.{$this->device->os}.group")) { - $this->deviceArray['os_group'] = $os_group; - } - - Log::info(sprintf(<<<'EOH' -Hostname: %s %s -ID: %s -OS: %s -IP: %s - -EOH, $this->device->hostname, $os_group ? " ($os_group)" : '', $this->device->device_id, $this->device->os, $this->device->ip)); - } - private function initRrdDirectory(): void { if (LibrenmsConfig::get('rrd.enable', true)) { diff --git a/app/Jobs/ScanNetworks.php b/app/Jobs/ScanNetworks.php new file mode 100644 index 00000000000..9e53ea12ba5 --- /dev/null +++ b/app/Jobs/ScanNetworks.php @@ -0,0 +1,121 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2026 Tony Murray + * @author Tony Murray + */ + +namespace App\Jobs; + +use App\Actions\Device\AddFoundDeviceResult; +use App\Events\NetworkAddressScanned; +use App\Facades\LibrenmsConfig; +use Illuminate\Bus\Queueable; +use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Foundation\Bus\Dispatchable; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Support\Facades\Log; +use InvalidArgumentException; +use LibreNMS\Scan\NetworkScanner; +use LibreNMS\Scan\ScanOptions; +use LibreNMS\Util\IP; + +/** + * The result of each address is reported with the NetworkAddressScanned event. + * Only plain values are queued, the SNMP credentials are read when the scan runs so they are not stored in the queue. + */ +class ScanNetworks implements ShouldQueue +{ + use Dispatchable, InteractsWithQueue, Queueable; + + public int $tries = 1; // the hosts that were added would be found as known, don't retry + public int $timeout = 3600; // less than the queue retry_after + + /** + * @param string $scanId passed to the NetworkAddressScanned events, to tell scans apart + * @param string[]|null $networks in CIDR notation, null for the nets setting + * @param int $pollerGroup the poller group the devices are added to, the scan runs on a poller of this group + */ + public function __construct( + public string $scanId, + public ?array $networks = null, + public int $pollerGroup = 0, + public bool $pingFallback = false, + public bool $pingOnly = false, + public bool $dnsOnly = false, + public int $concurrency = 32, + ) { + // the hosts must be reachable from the poller that adds them + $this->onQueue($pollerGroup ? "discovery-$pollerGroup" : 'discovery'); + } + + public function displayName(): string + { + return "ScanNetworks:$this->scanId"; + } + + public function handle(NetworkScanner $scanner): void + { + $options = ScanOptions::fromConfig( + concurrency: $this->concurrency, + excludedNetworks: $this->excludedNetworks(), + pollerGroup: $this->pollerGroup, + dnsOnly: $this->dnsOnly, + pingFallback: $this->pingFallback, + pingOnly: $this->pingOnly, + ); + + $scanner->scan($this->parsedNetworks(), $options, function (string $ip, AddFoundDeviceResult $result): void { + NetworkAddressScanned::dispatch($this->scanId, $ip, $result); + }); + } + + /** + * @return IP[] + */ + private function parsedNetworks(): array + { + $networks = []; + foreach ($this->networks ?? (array) LibrenmsConfig::get('nets', []) as $network) { + $networks[] = IP::parse($network, true) ?? throw new InvalidArgumentException("Invalid network $network"); + } + + return $networks; + } + + /** + * @return string[] + */ + private function excludedNetworks(): array + { + $excluded = []; + foreach ((array) LibrenmsConfig::get('autodiscovery.nets-exclude', []) as $network) { + if (IP::parse($network, true) === null) { + Log::warning("Ignoring invalid network $network in autodiscovery.nets-exclude"); + } else { + $excluded[] = $network; + } + } + + return $excluded; + } +} diff --git a/app/Listeners/CommandStartingListener.php b/app/Listeners/CommandStartingListener.php index 9182c96715f..74058e078c3 100644 --- a/app/Listeners/CommandStartingListener.php +++ b/app/Listeners/CommandStartingListener.php @@ -44,6 +44,9 @@ class CommandStartingListener 'queue:listen', 'scan', // draws a live view, it shows logs with -v 'scan:network', + 'horizon', + 'horizon:supervisor', + 'horizon:work', ]; /** diff --git a/app/Logging/Reporting/Middleware/CleanContext.php b/app/Logging/Reporting/Middleware/CleanContext.php deleted file mode 100644 index 9e0b3bff5f1..00000000000 --- a/app/Logging/Reporting/Middleware/CleanContext.php +++ /dev/null @@ -1,65 +0,0 @@ -. - * - * @link https://www.librenms.org - * - * @copyright 2022 Tony Murray - * @author Tony Murray - */ - -namespace App\Logging\Reporting\Middleware; - -use Spatie\FlareClient\Report; - -class CleanContext implements \Spatie\FlareClient\FlareMiddleware\FlareMiddleware -{ - /** - * Middleware to remove sensitive data from the context. - * - * @return mixed - */ - public function handle(Report $report, \Closure $next) - { - try { - $report->setApplicationPath(''); - $context = $report->allContext(); - - if (isset($context['request']['url'])) { - $context['request']['url'] = str_replace($context['headers']['host'] ?? '', 'librenms', $context['request']['url']); - } - - if (isset($context['session']['url']['intended'])) { - $context['session']['url']['intended'] = str_replace($context['headers']['host'] ?? '', 'librenms', $context['session']['url']['intended']); - } - - if (isset($context['session']['_previous']['url'])) { - $context['session']['_previous']['url'] = str_replace($context['headers']['host'] ?? '', 'librenms', $context['session']['_previous']['url']); - } - - $context['headers']['host'] = null; - $context['headers']['referer'] = null; - - $report->userProvidedContext($context); - } catch (\Exception) { - } - - return $next($report); - } -} diff --git a/app/Logging/Reporting/Middleware/SetGroups.php b/app/Logging/Reporting/Middleware/SetGroups.php deleted file mode 100644 index 25e2163e105..00000000000 --- a/app/Logging/Reporting/Middleware/SetGroups.php +++ /dev/null @@ -1,61 +0,0 @@ -. - * - * @link https://www.librenms.org - * - * @copyright 2022 Tony Murray - * @author Tony Murray - */ - -namespace App\Logging\Reporting\Middleware; - -use LibreNMS\Util\Version; -use Spatie\FlareClient\Report; - -class SetGroups implements \Spatie\FlareClient\FlareMiddleware\FlareMiddleware -{ - /** - * Middleware to set LibreNMS and Tools grouping data - * - * @return mixed - */ - public function handle(Report $report, \Closure $next) - { - try { - $version = Version::get(); - - $report->group('LibreNMS', [ - 'Git version' => $version->name(), - 'App version' => Version::VERSION, - ]); - - $report->group('Tools', [ - 'Database' => $version->databaseServer(), - 'Net-SNMP' => $version->netSnmp(), - 'Python' => $version->python(), - 'RRDtool' => $version->rrdtool(), - - ]); - } catch (\Exception) { - } - - return $next($report); - } -} diff --git a/app/Logging/Reporting/Middleware/SetInstanceId.php b/app/Logging/Reporting/Middleware/SetInstanceId.php deleted file mode 100644 index 2eae626a59b..00000000000 --- a/app/Logging/Reporting/Middleware/SetInstanceId.php +++ /dev/null @@ -1,67 +0,0 @@ -. - * - * @link https://www.librenms.org - */ - -namespace App\Logging\Reporting\Middleware; - -use App\Models\Callback; -use Illuminate\Support\Str; -use Spatie\FlareClient\Report; - -class SetInstanceId implements \Spatie\FlareClient\FlareMiddleware\FlareMiddleware -{ - private static ?string $instanceId = null; - - /** - * Middleware to add instance ID, piggybacks on the "user id" feature. - * - * @return mixed - */ - public function handle(Report $report, \Closure $next) - { - try { - $user = $report->getGroup('user', []); - $user['id'] = self::getInstanceId(); - - $report->group('user', $user); - } catch (\Exception) { - } - - return $next($report); - } - - public static function getInstanceId(): string - { - if (is_null(self::$instanceId)) { - $uuid = Callback::get('error_reporting_uuid'); - - if (! $uuid) { - $uuid = Str::uuid(); - Callback::set('error_reporting_uuid', $uuid); - } - - self::$instanceId = $uuid; - } - - return self::$instanceId; - } -} diff --git a/app/Models/BgpPeer.php b/app/Models/BgpPeer.php index c59bdd4290a..8c43d6b324c 100644 --- a/app/Models/BgpPeer.php +++ b/app/Models/BgpPeer.php @@ -28,8 +28,10 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Factories\HasFactory; +use LibreNMS\Interfaces\Models\HasSyncProtectedAttributes; +use LibreNMS\Interfaces\Models\Keyable; -class BgpPeer extends DeviceRelatedModel +class BgpPeer extends DeviceRelatedModel implements Keyable, HasSyncProtectedAttributes { use HasFactory; @@ -42,6 +44,9 @@ class BgpPeer extends DeviceRelatedModel 'bgpPeerRemoteAs', 'bgpPeerState', 'bgpPeerAdminStatus', + 'bgpPeerLastErrorCode', + 'bgpPeerLastErrorSubCode', + 'bgpPeerLastErrorText', 'bgpLocalAddr', 'bgpPeerRemoteAddr', 'bgpPeerInUpdates', @@ -53,7 +58,38 @@ class BgpPeer extends DeviceRelatedModel 'bgpPeerDescr', 'bgpPeerIface', 'astext', + 'context_name', ]; + + /** + * Session state is updated by polling, so state changes are seen there + */ + private const array POLLED_ATTRIBUTES = [ + 'bgpPeerState', + 'bgpPeerAdminStatus', + 'bgpPeerLastErrorCode', + 'bgpPeerLastErrorSubCode', + 'bgpPeerLastErrorText', + 'bgpPeerIface', + 'bgpLocalAddr', + 'bgpPeerInUpdates', + 'bgpPeerOutUpdates', + 'bgpPeerInTotalMessages', + 'bgpPeerOutTotalMessages', + 'bgpPeerFsmEstablishedTime', + 'bgpPeerInUpdateElapsedTime', + ]; + + public function getCompositeKey(): string + { + return "$this->bgpPeerIdentifier|$this->context_name|$this->vrf_id"; + } + + public function getSyncProtectedAttributes(): array + { + return self::POLLED_ATTRIBUTES; + } + // ---- Query scopes ---- protected function scopeInAlarm(Builder $query) diff --git a/app/Models/BgpPeerCbgp.php b/app/Models/BgpPeerCbgp.php index f808ae6093b..b9c16451eca 100644 --- a/app/Models/BgpPeerCbgp.php +++ b/app/Models/BgpPeerCbgp.php @@ -2,9 +2,88 @@ namespace App\Models; -class BgpPeerCbgp extends DeviceRelatedModel +use LibreNMS\Interfaces\Models\HasSyncProtectedAttributes; +use LibreNMS\Interfaces\Models\Keyable; + +class BgpPeerCbgp extends DeviceRelatedModel implements Keyable, HasSyncProtectedAttributes { protected $table = 'bgpPeers_cbgp'; public $timestamps = false; public $incrementing = false; + protected $fillable = [ + 'bgpPeerIdentifier', + 'afi', + 'safi', + 'context_name', + 'AcceptedPrefixes', + 'DeniedPrefixes', + 'PrefixAdminLimit', + 'PrefixThreshold', + 'PrefixClearThreshold', + 'AdvertisedPrefixes', + 'SuppressedPrefixes', + 'WithdrawnPrefixes', + ]; + + /** + * Prefix counts are updated by polling, which also records the change since the last poll + */ + public const PREFIX_COUNTERS = [ + 'AcceptedPrefixes', + 'DeniedPrefixes', + 'PrefixAdminLimit', + 'PrefixThreshold', + 'PrefixClearThreshold', + 'AdvertisedPrefixes', + 'SuppressedPrefixes', + 'WithdrawnPrefixes', + ]; + + /** + * Counters that also store their previous value and the change since it + */ + public const DELTA_COUNTERS = [ + 'AcceptedPrefixes', + 'DeniedPrefixes', + 'AdvertisedPrefixes', + 'SuppressedPrefixes', + 'WithdrawnPrefixes', + ]; + + /** + * Zero for every counter column, they are all required + * + * @return array + */ + public static function emptyCounters(): array + { + $columns = self::PREFIX_COUNTERS; + foreach (self::DELTA_COUNTERS as $counter) { + array_push($columns, "{$counter}_delta", "{$counter}_prev"); + } + + return array_fill_keys($columns, 0); + } + + public function getCompositeKey(): string + { + return "$this->bgpPeerIdentifier|$this->context_name|$this->afi|$this->safi"; + } + + public function getSyncProtectedAttributes(): array + { + return array_keys(self::emptyCounters()); + } + + /** + * The table has no primary key, so updates and deletes are scoped by its unique index + */ + protected function setKeysForSaveQuery($query) + { + return $query->where('device_id', $this->getOriginal('device_id', $this->device_id)) + ->where('bgpPeerIdentifier', $this->getOriginal('bgpPeerIdentifier', $this->bgpPeerIdentifier)) + ->where('context_name', $this->getOriginal('context_name', $this->context_name)) + ->where('afi', $this->getOriginal('afi', $this->afi)) + ->where('safi', $this->getOriginal('safi', $this->safi)); + } } diff --git a/app/Models/BillData.php b/app/Models/BillData.php index 07a2f6a76d2..4910eea0804 100644 --- a/app/Models/BillData.php +++ b/app/Models/BillData.php @@ -2,6 +2,8 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Builder; + class BillData extends BillRelatedModel { protected $table = 'bill_data'; @@ -16,4 +18,23 @@ class BillData extends BillRelatedModel 'in_delta', 'out_delta', ]; + + // ---- Query scopes ---- + + /** + * Rows belonging to a billing period: after the start, up to and including the end. + */ + protected function scopeInBillingPeriod(Builder $query, string $datefrom, string $dateto): Builder + { + return $query->where('timestamp', '>', $datefrom) + ->where('timestamp', '<=', $dateto); + } + + /** + * Rows between two unix timestamps, inclusive. + */ + protected function scopeBetweenUnixTimes(Builder $query, int|string|null $from, int|string|null $to): Builder + { + return $query->whereRaw('`timestamp` >= FROM_UNIXTIME(?) AND `timestamp` <= FROM_UNIXTIME(?)', [$from, $to]); + } } diff --git a/app/Models/CefSwitching.php b/app/Models/CefSwitching.php index 9165ad8e429..2cef2164449 100644 --- a/app/Models/CefSwitching.php +++ b/app/Models/CefSwitching.php @@ -27,11 +27,19 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; +use LibreNMS\Interfaces\Models\Keyable; -class CefSwitching extends DeviceRelatedModel +class CefSwitching extends DeviceRelatedModel implements Keyable { use HasFactory; public $timestamps = false; protected $table = 'cef_switching'; protected $primaryKey = 'cef_switching_id'; + + protected $fillable = ['device_id', 'entPhysicalIndex', 'afi', 'cef_index', 'cef_path', 'drop', 'punt', 'punt2host', 'drop_prev', 'punt_prev', 'punt2host_prev', 'updated', 'updated_prev']; + + public function getCompositeKey(): string + { + return $this->device_id . '-' . (int) $this->entPhysicalIndex . '-' . $this->afi . '-' . (int) $this->cef_index; + } } diff --git a/app/Models/Dashboard.php b/app/Models/Dashboard.php index 86f2d3c47ca..b224518a6e3 100644 --- a/app/Models/Dashboard.php +++ b/app/Models/Dashboard.php @@ -17,8 +17,8 @@ class Dashboard extends Model protected function scopeHasAccess(Builder $query, User $user): Builder { - return $query->where(fn (Builder $query) => $query->where('user_id', $user->user_id) - ->orWhere('access', '>', 0)); + return $query->where(fn (Builder $query) => $query->where($query->qualifyColumn('user_id'), $user->user_id) + ->orWhere($query->qualifyColumn('access'), '>', 0)); } // ---- Define Relationships ---- diff --git a/app/Models/Device.php b/app/Models/Device.php index 1e9b82321c9..9d48a782ea9 100644 --- a/app/Models/Device.php +++ b/app/Models/Device.php @@ -8,7 +8,6 @@ use App\Observers\DeviceObserver; use App\View\SimpleTemplate; use Carbon\Carbon; -use Fico7489\Laravel\Pivot\Traits\PivotEventTrait; use Illuminate\Database\Eloquent\Attributes\ObservedBy; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Factories\HasFactory; @@ -20,6 +19,7 @@ use Illuminate\Database\Eloquent\Relations\MorphToMany; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Arr; +use Illuminate\Support\Collection; use Illuminate\Support\Str; use LibreNMS\Cache\DeviceMaintenanceCache; use LibreNMS\Enum\DeviceStatus; @@ -27,8 +27,8 @@ use LibreNMS\Enum\PollingMethodType; use LibreNMS\Exceptions\InvalidIpException; use LibreNMS\Polling\Method\PollingMethodAccessor; -use LibreNMS\Polling\ModuleStatus; use LibreNMS\Polling\Method\PollingMethodRegistry; +use LibreNMS\Polling\ModuleStatus; use LibreNMS\Util\IP; use LibreNMS\Util\Rewrite; use LibreNMS\Util\Time; @@ -44,7 +44,7 @@ #[ObservedBy([DeviceObserver::class])] class Device extends BaseModel { - use PivotEventTrait, HasFactory, Filterable; + use HasFactory, Filterable; public $timestamps = false; protected $primaryKey = 'device_id'; @@ -162,6 +162,10 @@ public static function findByIp(?string $ip): ?Device public function pollingMethod(PollingMethodType $method): ?DevicePollingMethod { + if ($method === PollingMethodType::Unknown) { + return null; // any number of unknown types, none of them is used + } + if (! $this->relationLoaded('pollingMethods')) { if (! $this->exists) { return null; @@ -173,22 +177,59 @@ public function pollingMethod(PollingMethodType $method): ?DevicePollingMethod } /** - * Get VRF contexts to poll. - * If no contexts are found, return the default context '' + * SNMP contexts to walk for per VRF data: the default context, plus the contexts of + * non-default VRFs that answered at the last discovery and were not disabled by the user. * - * @return array + * @return string[] */ public function getVrfContexts(): array { - return $this->vrfLites->isEmpty() ? [''] : $this->vrfLites->pluck('context_name')->all(); + return $this->vrfs + ->filter(fn (Vrf $vrf) => $vrf->isContextWalked()) + ->pluck('context_name') + ->prepend('') + ->unique() + ->values() + ->all(); + } + + /** + * Contexts of VRFs that are not walked right now, because they stopped answering or were disabled. + * Modules keep the rows of these contexts until the VRF or its context is removed. + * + * @return string[] + */ + public function getSkippedVrfContexts(): array + { + return $this->vrfs + ->filter(fn (Vrf $vrf) => $vrf->context_name !== null && ! $vrf->isDefault() && ! $vrf->isContextWalked()) + ->pluck('context_name') + ->diff($this->getVrfContexts()) + ->unique() + ->values() + ->all(); + } + + /** + * Find the VRF of rows walked from an SNMP context. + * Some tables store the VRF name as the context, so names are matched as well. + */ + public function vrfIdForContext(?string $context): ?int + { + if ($context === null || $context === '') { + return null; // default context + } + + return $this->vrfs->firstWhere('context_name', $context)->vrf_id + ?? $this->vrfs->firstWhere('vrf_name', $context)?->vrf_id; } /** - * @deprecated use display field directly + * @deprecated use display field directly. */ public function displayName(): string { - return $this->display ?: $this->hostname ?: ''; + return $this->display ?: ''; } /** @@ -196,7 +237,7 @@ public function displayName(): string */ public function name(): string { - $display = $this->displayName(); + $display = $this->display; if (! Str::contains($display, $this->hostname)) { return (string) $this->hostname; @@ -260,9 +301,9 @@ public function getDeviceStatus(): DeviceStatus * @param int $length length to shorten to, will not break up words so may be longer * @return string */ - public function shortDisplayName($length = 12) + public function shortDisplayName(int $length = 12): string { - $name = $this->displayName(); + $name = $this->display; // IP addresses should not be shortened if (IP::isValid($name)) { @@ -335,12 +376,13 @@ public function logo() } /** - * Update the max_depth field based on parents + * Update the max_depth field based on parents, then update children if it changed * Performs SQL query, so make sure all parents are saved first * - * @param int $exclude exclude a device_id from being considered (used for deleting) + * @param int|null $exclude exclude a device_id from being considered as parent + * @param int[] $visited device_ids already updated on this path, to stop on dependency loops */ - public function updateMaxDepth($exclude = null) + public function updateMaxDepth($exclude = null, array $visited = []): void { // optimize for memory instead of time $query = $this->parents()->getQuery(); @@ -360,7 +402,16 @@ public function updateMaxDepth($exclude = null) $this->max_depth = $parents_max_depth + 1; } + $changed = $this->isDirty('max_depth'); $this->save(); + + if ($changed) { + $visited[] = $this->device_id; + $this->children() + ->whereNotIn('devices.device_id', $visited) + ->get() + ->each(fn (Device $child) => $child->updateMaxDepth(null, $visited)); + } } /** @@ -373,7 +424,7 @@ public function validateStandalone() { if ($this->max_depth === 0 && $this->children()->count() > 0) { $this->max_depth = 1; // has children - } elseif ($this->max_depth === 1 && $this->parents()->count() === 0) { + } elseif ($this->max_depth === 1 && $this->parents()->count() === 0 && $this->children()->count() === 0) { $this->max_depth = 0; // no children or parents } @@ -633,6 +684,8 @@ public function scopeHasAccess($query, User $user) public function scopeInDeviceGroup($query, $deviceGroup) { + $deviceGroup = $deviceGroup instanceof Collection ? $deviceGroup->all() : $deviceGroup; + return $query->whereIn( $query->qualifyColumn('device_id'), function ($query) use ($deviceGroup): void { $query->select('device_id') @@ -644,6 +697,8 @@ public function scopeInDeviceGroup($query, $deviceGroup) public function scopeNotInDeviceGroup($query, $deviceGroup) { + $deviceGroup = $deviceGroup instanceof Collection ? $deviceGroup->all() : $deviceGroup; + return $query->whereNotIn( $query->qualifyColumn('device_id'), function ($query) use ($deviceGroup): void { $query->select('device_id') @@ -802,11 +857,12 @@ public function cefSwitching(): HasMany } /** - * @return BelongsToMany + * @return BelongsToMany */ public function children(): BelongsToMany { - return $this->belongsToMany(self::class, 'device_relationships', 'parent_device_id', 'child_device_id'); + return $this->belongsToMany(self::class, 'device_relationships', 'parent_device_id', 'child_device_id') + ->using(DeviceRelationship::class); } /** @@ -922,6 +978,14 @@ public function isisAdjacencies(): HasMany return $this->hasMany(IsisAdjacency::class, 'device_id', 'device_id'); } + /** + * @return HasManyThrough + */ + public function juniAtmVps(): HasManyThrough + { + return $this->hasManyThrough(JuniAtmVp::class, Port::class, 'device_id', 'port_id'); + } + /** * @return HasMany */ @@ -1085,11 +1149,12 @@ public function packages(): HasMany } /** - * @return BelongsToMany + * @return BelongsToMany */ public function parents(): BelongsToMany { - return $this->belongsToMany(self::class, 'device_relationships', 'child_device_id', 'parent_device_id'); + return $this->belongsToMany(self::class, 'device_relationships', 'child_device_id', 'parent_device_id') + ->using(DeviceRelationship::class); } /** @@ -1438,19 +1503,21 @@ public function vlans(): HasMany } /** - * @return HasMany + * @return HasMany */ - public function vrfLites(): HasMany + public function vrfs(): HasMany { - return $this->hasMany(VrfLite::class, 'device_id'); + return $this->hasMany(Vrf::class, 'device_id'); } /** - * @return HasMany + * Scoped route bindings guess the relationship of {vrf} as vrves + * + * @param string $childType */ - public function vrfs(): HasMany + protected function childRouteBindingRelationshipName($childType): string { - return $this->hasMany(Vrf::class, 'device_id'); + return $childType === 'vrf' ? 'vrfs' : parent::childRouteBindingRelationshipName($childType); } /** diff --git a/app/Models/DevicePollingMethod.php b/app/Models/DevicePollingMethod.php index c488439cc88..50304044d56 100644 --- a/app/Models/DevicePollingMethod.php +++ b/app/Models/DevicePollingMethod.php @@ -2,15 +2,19 @@ namespace App\Models; +use App\Casts\PollingMethodTypeCast; +use App\Models\Traits\HasStoredType; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\BelongsTo; -use LibreNMS\Enum\PollingMethodType; +use LibreNMS\Enum\SecretType; class DevicePollingMethod extends DeviceRelatedModel { /** @use HasFactory<\Database\Factories\DevicePollingMethodFactory> */ use HasFactory; + use HasStoredType; + protected $fillable = [ 'device_id', 'method_type', @@ -23,6 +27,11 @@ class DevicePollingMethod extends DeviceRelatedModel 'last_check_changed_at', ]; + /** + * Not saved. While a device is added without a secret: only try default credentials of this type, null for all types. + */ + public ?SecretType $defaultSecretType = null; + /** * Match the database column defaults. */ @@ -32,7 +41,7 @@ class DevicePollingMethod extends DeviceRelatedModel ]; protected $casts = [ - 'method_type' => PollingMethodType::class, + 'method_type' => PollingMethodTypeCast::class, 'enabled' => 'boolean', 'affects_availability' => 'boolean', 'settings' => 'array', @@ -50,6 +59,11 @@ protected static function booted(): void }); } + protected function storedTypeColumn(): string + { + return 'method_type'; + } + /** @return BelongsTo */ public function secret(): BelongsTo { diff --git a/app/Models/DeviceRelationship.php b/app/Models/DeviceRelationship.php new file mode 100644 index 00000000000..398383ea962 --- /dev/null +++ b/app/Models/DeviceRelationship.php @@ -0,0 +1,20 @@ + + */ + protected function casts(): array + { + return [ + 'payload' => 'array', + 'failed_at' => 'datetime', + ]; + } +} diff --git a/app/Models/JuniAtmVp.php b/app/Models/JuniAtmVp.php index d9c48b31320..7ec1670908b 100644 --- a/app/Models/JuniAtmVp.php +++ b/app/Models/JuniAtmVp.php @@ -6,4 +6,6 @@ class JuniAtmVp extends PortRelatedModel { protected $table = 'juniAtmVp'; public $timestamps = false; + + protected $fillable = ['port_id', 'vp_id', 'vp_descr', 'juniAtmVp_id']; } diff --git a/app/Models/MefInfo.php b/app/Models/MefInfo.php index 00351e859c4..6db349c7f2c 100644 --- a/app/Models/MefInfo.php +++ b/app/Models/MefInfo.php @@ -2,12 +2,32 @@ namespace App\Models; +use App\Observers\MefInfoObserver; +use Illuminate\Database\Eloquent\Attributes\ObservedBy; use Illuminate\Database\Eloquent\Factories\HasFactory; +use LibreNMS\Interfaces\Models\HasSyncProtectedAttributes; +use LibreNMS\Interfaces\Models\Keyable; -class MefInfo extends DeviceRelatedModel +#[ObservedBy([MefInfoObserver::class])] +class MefInfo extends DeviceRelatedModel implements Keyable, HasSyncProtectedAttributes { use HasFactory; protected $table = 'mefinfo'; public $timestamps = false; + + protected $fillable = ['device_id', 'mefID', 'mefType', 'mefIdent', 'mefMTU', 'mefAdmState', 'mefRowState']; + + public function getCompositeKey(): int + { + return (int) $this->mefID; + } + + /** + * @return string[] + */ + public function getSyncProtectedAttributes(): array + { + return ['mefType', 'mefIdent', 'mefMTU', 'mefAdmState', 'mefRowState']; + } } diff --git a/app/Models/Mempool.php b/app/Models/Mempool.php index 5c95d3ed5ca..ac8bb09b58b 100644 --- a/app/Models/Mempool.php +++ b/app/Models/Mempool.php @@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Exceptions\InsufficientDataException; use LibreNMS\Exceptions\UncorrectableNegativeException; use LibreNMS\Interfaces\Models\HasSyncProtectedAttributes; @@ -39,11 +40,22 @@ class Mempool extends DeviceRelatedModel implements HasSyncProtectedAttributes, 'mempool_total_oid', 'mempool_largestfree', 'mempool_lowestfree', + 'polling_method', ]; protected $attributes = [ 'mempool_precision' => 1, ]; + /** + * @return array + */ + protected function casts(): array + { + return [ + 'polling_method' => PollingMethodType::class, + ]; + } + public function isValid(): bool { return $this->mempool_total > 0 && $this->mempool_used !== null && $this->mempool_free !== null && $this->mempool_perc !== null; diff --git a/app/Models/Package.php b/app/Models/Package.php index ba5ddbf0583..c9681ed033b 100644 --- a/app/Models/Package.php +++ b/app/Models/Package.php @@ -26,14 +26,17 @@ namespace App\Models; +use App\Models\Traits\Filterable; use App\Observers\PackageObserver; use Illuminate\Database\Eloquent\Attributes\ObservedBy; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Factories\HasFactory; use LibreNMS\Interfaces\Models\Keyable; #[ObservedBy([PackageObserver::class])] class Package extends DeviceRelatedModel implements Keyable { + use Filterable; use HasFactory; public $timestamps = false; @@ -48,6 +51,120 @@ class Package extends DeviceRelatedModel implements Keyable 'size', ]; + /** @var list */ + protected array $filterable = [ + 'name', + 'version', + 'arch', + 'manager', + 'size', + 'device_id', + ]; + + /** + * @return array + */ + public static function filterFieldDefinitions(User $user, ?int $deviceId = null): array + { + $fields = [ + [ + 'key' => 'name', + 'label' => __('Package'), + 'type' => 'text', + 'search' => true, + ], + [ + 'key' => 'version', + 'label' => __('Version'), + 'type' => 'version', + ], + [ + 'key' => 'arch', + 'label' => __('Arch'), + 'type' => 'select', + 'options' => self::availableValues('arch', $user, $deviceId), + ], + [ + 'key' => 'manager', + 'label' => __('Manager'), + 'type' => 'select', + 'options' => self::availableValues('manager', $user, $deviceId), + ], + ]; + + $fields[] = $deviceId === null + ? [ + 'key' => 'device_id', + 'label' => __('Device'), + 'type' => 'select', + 'endpoint' => route('ajax.select.device'), + ] + : [ + 'key' => 'size', + 'label' => __('Size (bytes)'), + 'type' => 'number', + ]; + + return $fields; + } + + /** + * @return string[] + */ + private static function availableValues(string $column, User $user, ?int $deviceId): array + { + return self::hasAccess($user) + ->when($deviceId, fn (Builder $q) => $q->where('device_id', $deviceId)) + ->distinct()->orderBy($column)->pluck($column)->all(); + } + + /** + * Link to a single package on the packages page + */ + public static function urlForName(string $name): string + { + return route('packages.index', ['filter' => ['name' => ['eq' => $name]]]); + } + + /** + * version_compare can't run in SQL, resolve the matching versions so pagination only sees matches + * + * @param Builder $query + * @param scalar|scalar[] $value + * @param array{operator?: string, wildcard?: string, not?: bool, null?: bool, set?: bool} $config + */ + protected function filterVersion(Builder $query, mixed $value, array $config): void + { + $operator = $config['operator'] ?? null; + + if (! in_array($operator, ['>', '>=', '<', '<='], true) || ! is_scalar($value)) { + $this->applyQueryLogic($query, $this->qualifyColumn('version'), $value, $config); + + return; + } + + [$compareEpoch, $compareVersion] = $this->splitEpoch((string) $value); + + $query->whereIn($this->qualifyColumn('version'), $query->clone()->distinct()->pluck('version') + ->filter(function (string $version) use ($compareEpoch, $compareVersion, $operator) { + [$epoch, $version] = $this->splitEpoch($version); + + return $epoch === $compareEpoch + ? version_compare($version, $compareVersion, $operator) + : version_compare((string) $epoch, (string) $compareEpoch, $operator); + })); + } + + /** + * Split the epoch from a version, 1:2.3 becomes [1, '2.3'] and a missing epoch is 0 + * + * @return array{int, string} + */ + private function splitEpoch(string $version): array + { + return preg_match('/^(\d+):(.+)$/', $version, $matches) ? [(int) $matches[1], $matches[2]] : [0, $version]; + } + public function getCompositeKey(): string { return "$this->manager-$this->name-$this->arch"; @@ -55,7 +172,12 @@ public function getCompositeKey(): string public function __toString(): string { - return $this->name . ' (' . $this->arch . ') version ' . $this->version . ($this->build ? "-$this->build" : ''); + return $this->name . ' (' . $this->arch . ') version ' . $this->displayVersion(); + } + + public function displayVersion(): string + { + return $this->version . ($this->build ? "-$this->build" : ''); } public function isValid(): bool diff --git a/app/Models/PollerCluster.php b/app/Models/PollerCluster.php index 7f6ec349c83..b0ab8a0aad9 100644 --- a/app/Models/PollerCluster.php +++ b/app/Models/PollerCluster.php @@ -26,6 +26,7 @@ namespace App\Models; +use App\Queue\WorkerNode; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; @@ -72,6 +73,16 @@ protected function scopeIsActive(Builder $query): Builder return $query->where('last_report', '>=', \DB::raw("DATE_SUB(NOW(),INTERVAL COALESCE(`poller_frequency`, $default) SECOND)")); } + /** + * Queue worker nodes, otherwise dispatcher service nodes + */ + protected function scopeIsQueueWorker(Builder $query, bool $worker = true): Builder + { + return $worker + ? $query->where('poller_version', WorkerNode::VERSION) + : $query->where(fn (Builder $query) => $query->where('poller_version', '!=', WorkerNode::VERSION)->orWhereNull('poller_version')); + } + protected function scopeIsInactive(Builder $query): Builder { $default = (int) (\App\Facades\LibrenmsConfig::get('service_poller_frequency') ?? \App\Facades\LibrenmsConfig::get('rrd.step')); @@ -114,6 +125,10 @@ public function configDefinition($groups = null) $groups = PollerGroup::list(); } + if ($this->poller_version == WorkerNode::VERSION) { + return $this->workerConfigDefinition($groups); + } + $scheduleType = \App\Facades\LibrenmsConfig::get('schedule_type'); $pollerGloballyEnabled = $scheduleType['poller'] == 'legacy' ? \App\Facades\LibrenmsConfig::get('service_poller_enabled', true) : $scheduleType['poller'] == 'dispatcher'; @@ -295,6 +310,53 @@ public function configDefinition($groups = null) ]; } + /** + * Queue worker nodes only work queues, polling work is dispatched for all nodes from the global settings + * + * @param \Illuminate\Support\Collection|false $groups + * @return array> + */ + private function workerConfigDefinition($groups): array + { + $globalGroups = (string) \App\Facades\LibrenmsConfig::get('distributed_poller_group'); + + return [ + [ + 'name' => 'poller_groups', + 'default' => $globalGroups, + 'value' => $this->poller_groups === null || $this->poller_groups === '' ? $globalGroups : (string) $this->poller_groups, + 'type' => 'multiple', + 'options' => $groups, + ], + [ + 'name' => 'poller_enabled', + 'default' => true, + 'value' => (bool) ($this->poller_enabled ?? true), + 'type' => 'boolean', + ], + [ + 'name' => 'poller_workers', + 'default' => \App\Facades\LibrenmsConfig::get('service_poller_workers'), + 'value' => $this->poller_workers ?? \App\Facades\LibrenmsConfig::get('service_poller_workers'), + 'type' => 'integer', + 'units' => 'workers', + ], + [ + 'name' => 'discovery_enabled', + 'default' => true, + 'value' => (bool) ($this->discovery_enabled ?? true), + 'type' => 'boolean', + ], + [ + 'name' => 'discovery_workers', + 'default' => \App\Facades\LibrenmsConfig::get('service_discovery_workers'), + 'value' => $this->discovery_workers ?? \App\Facades\LibrenmsConfig::get('service_discovery_workers'), + 'type' => 'integer', + 'units' => 'workers', + ], + ]; + } + // ---- Relationships ---- /** * @return \Illuminate\Database\Eloquent\Relations\HasMany<\App\Models\PollerClusterStat, $this> diff --git a/app/Models/Port.php b/app/Models/Port.php index b0194203476..2eed27ed03c 100644 --- a/app/Models/Port.php +++ b/app/Models/Port.php @@ -33,6 +33,7 @@ class Port extends DeviceRelatedModel protected $guarded = []; protected array $filterable = [ 'device_id', + 'port_id', 'ifName', 'ifDescr', 'portName', diff --git a/app/Models/PortsFdb.php b/app/Models/PortsFdb.php index cb966a2d1fd..293943f0879 100644 --- a/app/Models/PortsFdb.php +++ b/app/Models/PortsFdb.php @@ -2,19 +2,35 @@ namespace App\Models; +use App\Models\Traits\Filterable; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; +use LibreNMS\Interfaces\Models\Keyable; /** * @property-read int|null $mac_count */ -class PortsFdb extends PortRelatedModel +class PortsFdb extends PortRelatedModel implements Keyable { - use HasFactory; + use HasFactory, Filterable; + + /** @var list */ + protected array $filterable = ['vlan']; protected $table = 'ports_fdb'; protected $primaryKey = 'ports_fdb_id'; public $timestamps = true; + protected $fillable = [ + 'port_id', + 'mac_address', + 'vlan', + 'device_id', + ]; + + public function getCompositeKey(): string + { + return "$this->vlan-$this->mac_address"; + } // ---- Define Relationships ---- /** @@ -25,14 +41,6 @@ public function device(): BelongsTo return $this->belongsTo(Device::class, 'device_id', 'device_id'); } - /** - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<\App\Models\Vlan, $this> - */ - public function vlan(): BelongsTo - { - return $this->belongsTo(Vlan::class, 'vlan_id', 'vlan_id'); - } - /** * @return \Illuminate\Database\Eloquent\Relations\HasMany<\App\Models\Ipv4Mac, $this> */ diff --git a/app/Models/Processor.php b/app/Models/Processor.php index 6c539cdd3f8..f498f943796 100644 --- a/app/Models/Processor.php +++ b/app/Models/Processor.php @@ -2,38 +2,135 @@ namespace App\Models; +use App\Data\TimeSeries\MetricIdentity; +use App\Observers\ProcessorObserver; +use Illuminate\Database\Eloquent\Attributes\ObservedBy; +use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Factories\HasFactory; +use LibreNMS\Interfaces\Models\HasMetrics; +use LibreNMS\Interfaces\Models\Keyable; +use LibreNMS\Util\Number; -class Processor extends DeviceRelatedModel +/** + * @property int $hrDeviceIndex + * @property string|null $processor_oid + * @property string $processor_type + * @property float|int|string|null $processor_usage + * @property string $processor_descr + * @property int|null $processor_perc_warn + * @property int|null $processor_perc_warn_custom + */ +#[ObservedBy([ProcessorObserver::class])] +class Processor extends DeviceRelatedModel implements HasMetrics, Keyable { use HasFactory; public $timestamps = false; protected $primaryKey = 'processor_id'; + protected $attributes = [ + 'hrDeviceIndex' => 0, + 'processor_descr' => 'Processor', + 'processor_precision' => 1, + ]; + protected $fillable = [ + 'hrDeviceIndex', + 'processor_oid', + 'processor_index', + 'processor_type', + 'processor_usage', + 'processor_descr', + 'processor_precision', + 'processor_perc_warn', + ]; - // ---- Helper Functions ---- + /** + * Fill processor_precision first so processor_usage is scaled correctly regardless of attribute order. + */ + public function fill(array $attributes): static + { + if (array_key_exists('processor_precision', $attributes)) { + $attributes = ['processor_precision' => $attributes['processor_precision']] + $attributes; + } + + return parent::fill($attributes); + } + + // ---- Attribute Mutators / Casting ---- + + protected function hrDeviceIndex(): Attribute + { + return Attribute::make( + set: fn ($value) => (int) $value, + ); + } + + protected function processorDescr(): Attribute + { + return Attribute::make( + set: function (?string $value) { + $descr = trim(preg_replace('/ {2,}/', ' ', (string) $value)); + + return $descr === '' ? 'Processor' : substr($descr, 0, 64); + }, + ); + } + + protected function processorOid(): Attribute + { + return Attribute::make( + set: fn (?string $value) => $value === null ? null : '.' . ltrim($value, '.'), + ); + } + + protected function processorType(): Attribute + { + return Attribute::make( + set: fn (?string $value) => substr((string) $value, 0, 16), + ); + } + + protected function processorUsage(): Attribute + { + return Attribute::make( + set: function (?string $value, array $attributes) { + // no number in the value (empty or an error string), usage is unknown + if ($value === null || ! preg_match('/\d/', $value)) { + return null; + } + + // negative precision represents free, subtract from 100 + $precision = ($attributes['processor_precision'] ?? 1) ?: 1; + $base = $precision < 0 ? 100 : 0; + $raw_usage = Number::extract($value); + + return $base + ($raw_usage / $precision); + } + ); + } /** - * Return Processor Description, formatted for display - * - * @return string + * Description with vendor noise removed, for display. */ - public function getFormattedDescription() + public function getFormattedDescription(): string { - $bad_descr = [ - 'GenuineIntel:', - 'AuthenticAMD:', - 'Intel(R)', - 'CPU', - '(R)', - '(tm)', - ]; + $descr = str_replace(['GenuineIntel:', 'AuthenticAMD:', 'Intel(R)', 'CPU', '(R)', '(tm)'], '', $this->processor_descr); - $descr = str_replace($bad_descr, '', $this->processor_descr); + return trim(preg_replace('/ {2,}/', ' ', $descr)); + } - // reduce extra spaces - $descr = str_replace(' ', ' ', $descr); + public function getCompositeKey(): string + { + return $this->processor_type . '_' . $this->processor_index; + } - return $descr; + /** + * Identity used when storing and reading a measurement of this processor + */ + public function metricIdentity(string $measurement): MetricIdentity + { + return new MetricIdentity( + $measurement, + ['hostname' => (string) $this->device?->hostname, 'type' => $this->processor_type, 'index' => $this->processor_index], + ); } } diff --git a/app/Models/Secret.php b/app/Models/Secret.php index 00be00bfb93..8d89e9cfaeb 100644 --- a/app/Models/Secret.php +++ b/app/Models/Secret.php @@ -3,6 +3,8 @@ namespace App\Models; use App\Casts\EncryptedSecret; +use App\Casts\SecretTypeCast; +use App\Models\Traits\HasStoredType; use App\Observers\SecretObserver; use Illuminate\Database\Eloquent\Attributes\ObservedBy; use Illuminate\Database\Eloquent\Builder; @@ -18,6 +20,8 @@ class Secret extends BaseModel /** @use HasFactory<\Database\Factories\SecretFactory> */ use HasFactory; + use HasStoredType; + protected $fillable = [ 'description', 'secret_type', @@ -32,16 +36,19 @@ class Secret extends BaseModel ]; public $casts = [ - 'secret_type' => SecretType::class, + 'secret_type' => SecretTypeCast::class, 'data' => EncryptedSecret::class, ]; /** - * Resolve an existing Secret by ID and verify its type matches the expected secret type. + * Resolve an existing Secret by ID and verify it is one of the expected secret types. + * + * @param SecretType[] $types + * @param string $errorKey the validation error key for a secret of another type * * @throws \Illuminate\Validation\ValidationException */ - public static function resolveForType(int $id, SecretType $type, ?User $user = null): self + public static function resolveForTypes(int $id, array $types, ?User $user = null, string $errorKey = 'secret_id'): self { $query = static::query(); $user ??= auth()->user(); @@ -51,9 +58,9 @@ public static function resolveForType(int $id, SecretType $type, ?User $user = n $secret = $query->findOrFail($id); - if ($secret->secret_type !== $type) { + if (! in_array($secret->secret_type, $types, true)) { throw \Illuminate\Validation\ValidationException::withMessages([ - 'secret_id' => __('poller.credential_type_mismatch'), + $errorKey => __('poller.credential_type_mismatch'), ]); } @@ -65,7 +72,14 @@ public static function resolveForType(int $id, SecretType $type, ?User $user = n */ public static function defaultDescription(PollingMethodType $type, string $hostname): string { - $base = strtoupper($type->value) . ' ' . $hostname; + return static::uniqueDescription(strtoupper($type->value) . ' ' . $hostname); + } + + /** + * The description, numbered when another secret has it. + */ + public static function uniqueDescription(string $base): string + { $description = $base; for ($i = 2; static::where('description', $description)->exists(); $i++) { $description = "$base ($i)"; @@ -74,6 +88,11 @@ public static function defaultDescription(PollingMethodType $type, string $hostn return $description; } + protected function storedTypeColumn(): string + { + return 'secret_type'; + } + // ---- Query Scopes ---- /** diff --git a/app/Models/Sensor.php b/app/Models/Sensor.php index bdae4f4fcbc..f4347fa2964 100644 --- a/app/Models/Sensor.php +++ b/app/Models/Sensor.php @@ -11,8 +11,8 @@ use Illuminate\Database\Eloquent\Relations\HasOneThrough; use Illuminate\Database\Eloquent\Relations\MorphMany; use LibreNMS\Enum\SensorCategory; -use LibreNMS\Enum\SensorType; use LibreNMS\Enum\SensorState; +use LibreNMS\Enum\SensorType; use LibreNMS\Interfaces\Models\HasSyncProtectedAttributes; use LibreNMS\Interfaces\Models\Keyable; use LibreNMS\Util\Number; diff --git a/app/Models/SslCertificate.php b/app/Models/SslCertificate.php index 1b704436610..f3ca525854c 100644 --- a/app/Models/SslCertificate.php +++ b/app/Models/SslCertificate.php @@ -3,6 +3,7 @@ namespace App\Models; use AcmePhp\Ssl\Exception\CertificateParsingException; +use App\Facades\LibrenmsConfig; use Carbon\Carbon; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; @@ -144,6 +145,16 @@ public function expiresWithinDays(int $days): bool return $validTo !== null && $validTo->lte(now()->addDays($days)); } + /** + * Check whether the certificate is within the configured warning expiry window. + */ + public function isWithinWarningWindow(): bool + { + $warning = (int) LibrenmsConfig::get('ssl_certificates.days_until_expiry_warning', 30); + + return $this->expiresWithinDays($warning); + } + /** * Get a formatted string of changes for tracked attributes. */ @@ -152,18 +163,34 @@ public function getTrackedChanges(): string $dirty = $this->getDirty(); $parts = []; $fields = ['subject', 'issuer', 'valid_to', 'valid_from', 'fingerprint', 'days_until_expiry']; + $warning = (int) LibrenmsConfig::get('ssl_certificates.days_until_expiry_warning', 30); + $danger = (int) LibrenmsConfig::get('ssl_certificates.days_until_expiry_danger', 0); foreach ($fields as $field) { - if (array_key_exists($field, $dirty)) { - $o = $this->getOriginal($field); - $n = $this->getAttribute($field); + if (! array_key_exists($field, $dirty)) { + continue; + } + if ($field === 'days_until_expiry') { + $days = $this->getAttribute($field); + $oldDays = $this->getOriginal($field); + if (! is_int($days) || ! is_int($oldDays)) { + continue; + } + $crossedWarning = $oldDays > $warning && $this->isWithinWarningWindow(); + $crossedDanger = $oldDays > $danger && $days <= $danger; + if (! $crossedWarning && ! $crossedDanger) { + continue; + } + } - $oStr = $o instanceof \DateTimeInterface ? $o->format('Y-m-d H:i:s') : (string) $o; - $nStr = $n instanceof \DateTimeInterface ? $n->format('Y-m-d H:i:s') : (string) $n; + $o = $this->getOriginal($field); + $n = $this->getAttribute($field); - if ($oStr !== $nStr) { - $parts[] = "{$field} ({$oStr} → {$nStr})"; - } + $oStr = $o instanceof \DateTimeInterface ? $o->format('Y-m-d H:i:s') : (string) $o; + $nStr = $n instanceof \DateTimeInterface ? $n->format('Y-m-d H:i:s') : (string) $n; + + if ($oStr !== $nStr) { + $parts[] = "{$field} ({$oStr} → {$nStr})"; } } diff --git a/app/Models/StateTranslation.php b/app/Models/StateTranslation.php index 20812a2e7f2..f2b3016e2bd 100644 --- a/app/Models/StateTranslation.php +++ b/app/Models/StateTranslation.php @@ -45,29 +45,17 @@ class StateTranslation extends Model implements Keyable public static function define(string $descr, int $value, Severity $severity): self { - $genericValue = match ($severity) { - Severity::Ok => 0, - Severity::Warning => 1, - Severity::Error => 2, - Severity::Unknown => 3, - default => throw new \Exception("Severity $severity->name is not supported for state sensors"), - }; - return new self([ 'state_descr' => $descr, 'state_value' => $value, - 'state_generic_value' => $genericValue, + 'state_generic_value' => $severity->toSensorState()->value, ]); } public function severity(): Severity { - return match ((int) $this->getAttribute('state_generic_value')) { - SensorState::Ok->value => Severity::Ok, - SensorState::Warning->value => Severity::Warning, - SensorState::Error->value => Severity::Error, - default => Severity::Unknown, - }; + return (SensorState::tryFrom((int) $this->getAttribute('state_generic_value')) ?? SensorState::Unknown) + ->toSeverity(); } /** diff --git a/app/Models/Traits/HasStoredType.php b/app/Models/Traits/HasStoredType.php new file mode 100644 index 00000000000..d16fbd390f5 --- /dev/null +++ b/app/Models/Traits/HasStoredType.php @@ -0,0 +1,27 @@ +attributes[$this->storedTypeColumn()] ?? ''); + } + + public function typeLabel(): string + { + /** @var PollingMethodType|SecretType|null $type */ + $type = $this->getAttribute($this->storedTypeColumn()); + + return $type?->isUnknown() ? __('poller.unknown_type', ['type' => $this->typeName()]) : (string) $type?->label(); + } +} diff --git a/app/Models/User.php b/app/Models/User.php index df4cc0d47c7..d70fcb87abb 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -33,12 +33,13 @@ class User extends Authenticatable use Notifiable; protected $primaryKey = 'user_id'; - protected $fillable = ['realname', 'username', 'email', 'descr', 'can_modify_passwd', 'auth_type', 'auth_id', 'enabled']; + protected $fillable = ['realname', 'username', 'email', 'phone', 'descr', 'can_modify_passwd', 'auth_type', 'auth_id', 'enabled']; protected $hidden = ['password', 'remember_token', 'pivot']; protected $attributes = [ // default values 'descr' => '', 'realname' => '', 'email' => '', + 'phone' => '', ]; protected $dispatchesEvents = [ 'created' => UserCreated::class, @@ -53,15 +54,11 @@ protected function casts(): array 'realname' => 'string', 'descr' => 'string', 'email' => 'string', + 'phone' => 'string', 'can_modify_passwd' => 'integer', ]; } - public function toFlare(): array - { - return $this->only(['auth_type', 'enabled']); - } - // ---- Helper Functions ---- /** diff --git a/app/Models/Vlan.php b/app/Models/Vlan.php index 0dffea44710..d901dbc9bca 100644 --- a/app/Models/Vlan.php +++ b/app/Models/Vlan.php @@ -2,13 +2,15 @@ namespace App\Models; +use App\Models\Traits\Filterable; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\HasMany; class Vlan extends DeviceRelatedModel { - use HasFactory; + use HasFactory, Filterable; protected $primaryKey = 'vlan_id'; + protected array $filterable = ['vlan_vlan']; public $timestamps = false; protected $fillable = [ 'device_id', diff --git a/app/Models/Vminfo.php b/app/Models/Vminfo.php index 0067da42159..a8c0eb0f6c5 100644 --- a/app/Models/Vminfo.php +++ b/app/Models/Vminfo.php @@ -2,6 +2,7 @@ namespace App\Models; +use App\Data\TimeSeries\MetricIdentity; use App\Facades\LibrenmsConfig; use App\Models\Traits\Filterable; use App\Observers\VminfoObserver; @@ -10,14 +11,18 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\HasOne; use Illuminate\Support\Str; +use LibreNMS\Enum\PollingMethodType; use LibreNMS\Enum\PowerState; +use LibreNMS\Interfaces\Models\HasMetrics; use LibreNMS\Interfaces\Models\Keyable; +use LibreNMS\Interfaces\VminfoMetricSource; +use LibreNMS\Polling\Method\PollingMethodRegistry; use LibreNMS\Util\Html; use LibreNMS\Util\Number; use LibreNMS\Util\Rewrite; #[ObservedBy([VminfoObserver::class])] -class Vminfo extends DeviceRelatedModel implements Keyable +class Vminfo extends DeviceRelatedModel implements HasMetrics, Keyable { use Filterable; use HasFactory; @@ -32,6 +37,7 @@ class Vminfo extends DeviceRelatedModel implements Keyable 'vmwVmMemSize', 'vmwVmCpus', 'vmwVmState', + 'cluster_id', ]; /** @var list */ @@ -141,6 +147,30 @@ protected function scopeGuessFromDevice(Builder $query, Device $device): Builder return $query->whereIn('vmwVmDisplayName', $where); } + /** + * VMs whose source records metrics, optionally limited to a specific metric. + * + * @param Builder $query + * @return Builder + */ + protected function scopeRecordsMetrics(Builder $query, ?string $metric = null): Builder + { + $registry = app(PollingMethodRegistry::class); + $types = collect($registry->providing(VminfoMetricSource::class)) + ->flatMap(function (PollingMethodType $type) use ($registry): array { + /** @var class-string $source */ + $source = $registry->get($type)->dataSourceClass(); + + return $source::vmTypes(); + })->unique()->values()->all(); + + if ($metric === 'vm.diskops') { + $types = array_diff($types, ['proxmox-lxc']); + } + + return $query->whereIn('vm_type', $types); + } + /** * @return \Illuminate\Database\Eloquent\Relations\HasOne<\App\Models\Device, $this> */ @@ -151,6 +181,14 @@ public function parentDevice(): HasOne public function getCompositeKey(): string { - return "$this->vm_type-$this->vmwVmVMID"; + return "$this->cluster_id-$this->vm_type-$this->vmwVmVMID"; // cluster_id null on non-proxmox + } + + public function metricIdentity(string $measurement): MetricIdentity + { + // a VM in a cluster keeps its metrics when it migrates to another device + $group = $this->cluster_id === null ? ['hostname' => (string) $this->device?->hostname] : ['cluster' => $this->cluster_id]; + + return new MetricIdentity($measurement, [...$group, 'type' => $this->vm_type, 'id' => $this->vmwVmVMID]); } } diff --git a/app/Models/Vrf.php b/app/Models/Vrf.php index f6d71c2f3a0..66b92c4b7dd 100644 --- a/app/Models/Vrf.php +++ b/app/Models/Vrf.php @@ -3,7 +3,14 @@ /** * Vrf.php * - * -Description- + * A VRF (routing instance) of a device. + * vrf_oid is the VRF index used by the vendor MIB that lists it (string indexes in their + * length prefixed OID form), or the VRF name when the device only references VRFs by name. + * context_name is the SNMP context that exposes the VRF. Routing modules only walk it when it + * answered discovery (context_verified) and the user did not disable it (context_enabled). + * context_failures counts consecutive discoveries it did not answer. + * context_manual marks contexts set by users, vrf_manual VRFs that only exist because of such a context. + * Those VRFs have no index in a MIB, their vrf_oid is the context with a prefix so it never matches one. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,9 +35,12 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\HasMany; +use LibreNMS\Interfaces\Models\HasSyncProtectedAttributes; +use LibreNMS\Interfaces\Models\Keyable; -class Vrf extends DeviceRelatedModel +class Vrf extends DeviceRelatedModel implements HasSyncProtectedAttributes, Keyable { + /** @use HasFactory<\Database\Factories\VrfFactory> */ use HasFactory; public $timestamps = false; @@ -39,8 +49,73 @@ class Vrf extends DeviceRelatedModel protected $fillable = [ 'vrf_oid', 'vrf_name', + 'context_name', + 'context_manual', + 'vrf_manual', + 'context_verified', + 'context_failures', + 'context_enabled', + 'bgpLocalAs', + 'mplsVpnVrfRouteDistinguisher', + 'mplsVpnVrfDescription', ]; + /** + * @return array + */ + protected function casts(): array + { + return [ + 'context_manual' => 'boolean', + 'vrf_manual' => 'boolean', + 'context_verified' => 'boolean', + 'context_failures' => 'integer', + 'context_enabled' => 'boolean', + ]; + } + + /** + * vrf_oid of a VRF only known through its SNMP context + */ + public static function contextOnlyOid(string $context): string + { + return 'context:' . $context; + } + + /** + * The default VRF is reached without a context, so its context is never walked + */ + public static function isDefaultName(?string $name): bool + { + return $name !== null && strcasecmp($name, 'default') == 0; + } + + public function isDefault(): bool + { + return self::isDefaultName($this->vrf_name); + } + + /** + * Walking a context is a user setting + */ + public function getSyncProtectedAttributes(): array + { + return ['context_enabled']; + } + + /** + * Contexts routing modules walk + */ + public function isContextWalked(): bool + { + return $this->context_name !== null && $this->context_verified && $this->context_enabled && ! $this->isDefault(); + } + + public function getCompositeKey(): string + { + return (string) $this->vrf_oid; + } + /** * @return \Illuminate\Database\Eloquent\Relations\HasMany<\App\Models\Port, $this> */ diff --git a/app/Observers/DeviceObserver.php b/app/Observers/DeviceObserver.php index 904f80abb26..dee47ee14f8 100644 --- a/app/Observers/DeviceObserver.php +++ b/app/Observers/DeviceObserver.php @@ -95,7 +95,8 @@ public function updating(Device $device): void throw new HostRenameException("Renaming of $old_name failed due to existing RRD folder for $new_name"); } - if (rename($old_rrd_dir, $new_rrd_dir)) { + // a device without an RRD folder (e.g. disabled, never polled) has nothing to move + if (! is_dir($old_rrd_dir) || rename($old_rrd_dir, $new_rrd_dir)) { $device->ip = null; $source = auth()->user()?->username ?: 'console'; Eventlog::log("Hostname changed -> $new_name ($source)", $device, 'system', Severity::Notice); @@ -219,7 +220,6 @@ public function deleting(Device $device): void $device->vlans()->delete(); $device->vminfo()->delete(); $device->vrfs()->delete(); - $device->vrfLites()->delete(); $device->vServers()->delete(); $device->wirelessSensors()->delete(); @@ -231,38 +231,9 @@ public function deleting(Device $device): void } }); - // handle device dependency updates - $device->children->each->updateMaxDepth($device->device_id); - } - - /** - * Handle the device "Pivot Attached" event. - * - * @param Device $device - * @param string $relationName parents or children - * @param array $pivotIds list of pivot ids - * @param array $pivotIdsAttributes additional pivot attributes - * @return void - */ - public function pivotAttached(Device $device, $relationName, $pivotIds, $pivotIdsAttributes) - { - if ($relationName == 'parents') { - // a parent attached to this device - - // update the parent's max depth incase it used to be standalone - Device::whereIntegerInRaw('device_id', $pivotIds)->get()->each->validateStandalone(); - - // make sure this device's max depth is updated - $device->updateMaxDepth(); - } elseif ($relationName == 'children') { - // a child device attached to this device - - // if this device used to be standalone, we need to udpate max depth - $device->validateStandalone(); - - // make sure the child's max depth is updated - Device::whereIntegerInRaw('device_id', $pivotIds)->get()->each->updateMaxDepth(); - } + // detach with ids so DeviceRelationshipObserver updates the remaining dependency depths + $device->children()->detach($device->children()->allRelatedIds()); + $device->parents()->detach($device->parents()->allRelatedIds()); } public static function attributeChangedMessage($attribute, $value, $previous): string diff --git a/app/Observers/DeviceRelationshipObserver.php b/app/Observers/DeviceRelationshipObserver.php new file mode 100644 index 00000000000..87ce79a6eb9 --- /dev/null +++ b/app/Observers/DeviceRelationshipObserver.php @@ -0,0 +1,33 @@ +parent_device_id)?->validateStandalone(); + + // the child is now one level below its deepest parent + Device::find($relationship->child_device_id)?->updateMaxDepth(); + } + + /** + * A parent was detached from a child, update the dependency depths + */ + public function deleted(DeviceRelationship $relationship): void + { + // the parent might be standalone now + Device::find($relationship->parent_device_id)?->validateStandalone(); + + // the child might have a shallower deepest parent or be a root now + Device::find($relationship->child_device_id)?->updateMaxDepth(); + } +} diff --git a/app/Observers/MefInfoObserver.php b/app/Observers/MefInfoObserver.php new file mode 100644 index 00000000000..e1166a2fbc4 --- /dev/null +++ b/app/Observers/MefInfoObserver.php @@ -0,0 +1,30 @@ +mefIdent . ' (' . $mef->mefID . ') Discovered', $mef->device_id, 'system', Severity::Info); + } + + /** + * Handle the MefInfo "deleted" event. + * + * @return void + */ + public function deleted(MefInfo $mef): void + { + Eventlog::log('MEF link: ' . $mef->mefIdent . ' Removed', $mef->device_id, 'system', Severity::Notice); + } +} diff --git a/app/Observers/ModuleModelObserver.php b/app/Observers/ModuleModelObserver.php index 59fb86b636b..ff4f7aedeb6 100644 --- a/app/Observers/ModuleModelObserver.php +++ b/app/Observers/ModuleModelObserver.php @@ -26,19 +26,15 @@ namespace App\Observers; use Illuminate\Database\Eloquent\Model as Eloquent; -use Illuminate\Log\Logger; use Illuminate\Support\Facades\Log; use LibreNMS\Util\Debug; use Psr\Log\LoggerInterface; class ModuleModelObserver { - private readonly LoggerInterface $logger; - public function __construct( - ?Logger $logger = null, + private readonly LoggerInterface $logger, ) { - $this->logger = $logger ?? Log::channel('stdout'); } /** @@ -56,7 +52,7 @@ public static function observe(string $model, string $name = ''): void } if (! in_array($class, $observed_models)) { - $model::observe(new static()); + $model::observe(static::class); $observed_models[] = $class; } } diff --git a/app/Observers/ProcessorObserver.php b/app/Observers/ProcessorObserver.php new file mode 100644 index 00000000000..159ea4ba57b --- /dev/null +++ b/app/Observers/ProcessorObserver.php @@ -0,0 +1,33 @@ +processor_perc_warn_custom !== null) { + $processor->processor_perc_warn = $processor->processor_perc_warn_custom; + } elseif ($processor->processor_perc_warn === null) { + $processor->processor_perc_warn = LibrenmsConfig::get('processor_perc_warn', 75); + } + } + + public function created(Processor $processor): void + { + $message = "Processor Discovered: {$processor->processor_type} {$processor->processor_index} {$processor->processor_descr}"; + Eventlog::log($message, $processor->device_id, 'processors', Severity::Notice, $processor->processor_id); + } + + public function deleted(Processor $processor): void + { + $message = "Processor Removed: {$processor->processor_type} {$processor->processor_index} {$processor->processor_descr}"; + Eventlog::log($message, $processor->device_id, 'processors', Severity::Notice, $processor->processor_id); + } +} diff --git a/app/Observers/QosObserver.php b/app/Observers/QosObserver.php index 469cd4934ed..4b163022fe2 100644 --- a/app/Observers/QosObserver.php +++ b/app/Observers/QosObserver.php @@ -56,7 +56,8 @@ private function calcPct(?int $dividend, ?int $divisor, int $precision): ?float return null; } - if (! $divisor) { + // Drops cannot exceed the total, some devices (Catalyst 3850) report no pre-policy counters + if (! $divisor || $dividend > $divisor) { return null; } diff --git a/app/Observers/TransceiverObserver.php b/app/Observers/TransceiverObserver.php index 744d599d535..15c26145bae 100644 --- a/app/Observers/TransceiverObserver.php +++ b/app/Observers/TransceiverObserver.php @@ -8,7 +8,7 @@ class TransceiverObserver { - private const IDENTITY_ATTRIBUTES = ['vendor', 'model', 'type', 'serial']; + private const array IDENTITY_ATTRIBUTES = ['vendor', 'model', 'type', 'serial']; public function created(Transceiver $transceiver): void { diff --git a/app/Observers/VminfoObserver.php b/app/Observers/VminfoObserver.php index 1a73f65ffe1..d3b48ff598f 100644 --- a/app/Observers/VminfoObserver.php +++ b/app/Observers/VminfoObserver.php @@ -2,6 +2,7 @@ namespace App\Observers; +use App\Models\Device; use App\Models\Eventlog; use App\Models\Vminfo; use LibreNMS\Enum\Severity; @@ -28,6 +29,13 @@ public function created(Vminfo $vminfo): void public function updating(Vminfo $vminfo) { foreach ($vminfo->getDirty() as $field => $value) { + if ($field === 'device_id') { + $from = Device::find($vminfo->getOriginal('device_id'))?->hostname; + Eventlog::log("Virtual Machine migrated: $vminfo->vmwVmDisplayName from $from", $value, 'vm', Severity::Notice, $vminfo->vmwVmVMID); + + continue; + } + Eventlog::log($vminfo->vmwVmDisplayName . ' (' . preg_replace('/^vmwVm/', '', $field) . ') -> ' . $value, $vminfo->device_id, 'vm'); } } diff --git a/app/Patches/Patch.php b/app/Patches/Patch.php index fe585d12fb9..3af94039685 100644 --- a/app/Patches/Patch.php +++ b/app/Patches/Patch.php @@ -100,13 +100,7 @@ public function migrations(): array public function changesDependencies(): bool { - foreach ($this->files as $file) { - if (in_array($file['path'], ['composer.json', 'composer.lock'])) { - return true; - } - } - - return false; + return array_any($this->files, fn ($file) => in_array($file['path'], ['composer.json', 'composer.lock'])); } /** diff --git a/app/Patches/PatchManager.php b/app/Patches/PatchManager.php index a3d4013d5cc..db59c297986 100644 --- a/app/Patches/PatchManager.php +++ b/app/Patches/PatchManager.php @@ -44,11 +44,11 @@ */ class PatchManager { - private const DIFF_URL = 'https://github.com/librenms/librenms/pull/%d.diff'; - private const RAW_URL = 'https://raw.githubusercontent.com/librenms/librenms/%s/%s'; + private const string DIFF_URL = 'https://github.com/librenms/librenms/pull/%d.diff'; + private const string RAW_URL = 'https://raw.githubusercontent.com/librenms/librenms/%s/%s'; /** Directories cleaned of untracked files by reset() */ - private const RESET_DIRS = ['app/', 'bootstrap/', 'database/', 'doc/', 'html/', 'includes/', 'LibreNMS/', 'licenses/', 'misc/', 'mibs/', 'resources/', 'routes/', 'scripts/', 'tests/']; + private const array RESET_DIRS = ['app/', 'bootstrap/', 'database/', 'doc/', 'html/', 'includes/', 'LibreNMS/', 'licenses/', 'misc/', 'mibs/', 'resources/', 'routes/', 'scripts/', 'tests/']; private readonly string $baseDir; private readonly string $storageDir; diff --git a/app/Policies/VrfLitePolicy.php b/app/Policies/VrfLitePolicy.php deleted file mode 100644 index 6204025065e..00000000000 --- a/app/Policies/VrfLitePolicy.php +++ /dev/null @@ -1,47 +0,0 @@ -globalPrefix = 'routing'; - } - - /** - * Determine whether the user can view any models. - */ - public function viewAny(User $user): bool - { - return $this->hasGlobalPermission($user, 'view', true) - || $this->hasGlobalPermission($user, 'viewAll'); - } - - /** - * Determine whether the user can view all models. - */ - public function viewAll(User $user): bool - { - return $this->hasGlobalPermission($user, 'viewAll'); - } - - /** - * Determine whether the user can view the model. - */ - public function view(User $user, VrfLite $vrfLite): bool - { - if ($this->hasGlobalPermission($user, 'viewAll')) { - return true; - } - - return $this->hasGlobalPermission($user, 'view', true) - && Permissions::canAccessDevice($vrfLite->device_id, $user); - } -} diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 0d262f2b4c3..aa76953d9c0 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -8,6 +8,7 @@ use App\ApiClients\NominatimApi; use App\Discovery\Sensor as DiscoverySensor; use App\Facades\LibrenmsConfig; +use App\Horizon\Supervisors; use App\Models\Device; use App\Models\DeviceGroup; use App\Models\Location; @@ -15,15 +16,22 @@ use App\Models\Sensor; use App\Models\User; use App\Policies\RolePolicy; +use Illuminate\Console\Application as ConsoleApplication; +use Illuminate\Console\Events\CommandStarting; use Illuminate\Contracts\Foundation\Application; use Illuminate\Database\Eloquent\Relations\Relation; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Blade; +use Illuminate\Support\Facades\Event; use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Log; use Illuminate\Support\ServiceProvider; use Illuminate\Validation\Rules\Password; +use Laravel\Horizon\Console\HorizonCommand; +use Laravel\Horizon\Events\MasterSupervisorLooped; +use Laravel\Horizon\Horizon; +use Laravel\Horizon\MasterSupervisor; use Laravel\Sanctum\Sanctum; use LibreNMS\Cache\Device as DeviceCache; use LibreNMS\Cache\PermissionsCache; @@ -36,6 +44,9 @@ use LibreNMS\Data\Source\Snmp\SnmpTranslatorInterface; use LibreNMS\Enum\SensorType; use LibreNMS\Interfaces\Geocoder; +use LibreNMS\RRD\Backend\PhpRrd; +use LibreNMS\RRD\Backend\RrdBackendInterface; +use LibreNMS\RRD\Backend\Rrdtool; use LibreNMS\Util\Binaries; use LibreNMS\Util\Git; use LibreNMS\Util\IP; @@ -71,6 +82,7 @@ public function register(): void $this->app->scoped('sensor-discovery', fn (Application $app) => new DiscoverySensor($app->make('device-cache')->getPrimary())); $this->app->singleton('git', fn () => new Git()); + $this->app->singleton(Supervisors::class); $this->app->bind(Device::class, function (Application $app) { /** @var DeviceCache $cache */ @@ -88,6 +100,12 @@ public function register(): void }); $this->app->bind(SnmpTranslatorInterface::class, NetSnmp::class); $this->app->bind(SnmpQueryInterface::class, SnmpQueryBuilder::class); + + $this->app->singleton(RrdBackendInterface::class, function (Application $app) { + $rrdcached = LibrenmsConfig::get('rrdcached') ?: null; + + return LibrenmsConfig::get('rrd.backend') === 'php-rrd' ? new PhpRrd($rrdcached) : new Rrdtool($rrdcached, version: (string) LibrenmsConfig::get('rrdtool_version', '1.7.0')); + }); } /** @@ -113,6 +131,28 @@ public function boot(): void }); $this->bootAuth(); + $this->bootHorizon(); + } + + /** + * Horizon runs the queue workers with their supervisors from the node's settings. + * Status and statistics do not depend on it, see QueueServiceProvider. + */ + private function bootHorizon(): void + { + if (! class_exists(Horizon::class)) { + return; + } + + Horizon::auth(fn ($request): bool => Supervisors::supported() && Gate::check('worker.horizon', [$request->user()])); + ConsoleApplication::starting(fn (ConsoleApplication $artisan) => $artisan->addCommand($this->app->make(HorizonCommand::class)->setAliases(['worker']))); + MasterSupervisor::$nameResolver = fn (): string => Supervisors::masterBasename(); + Event::listen(CommandStarting::class, function (CommandStarting $event): void { + if ($event->command == 'horizon') { + $this->app->make(Supervisors::class)->start(); + } + }); + Event::listen(MasterSupervisorLooped::class, fn (MasterSupervisorLooped $event) => $this->app->make(Supervisors::class)->looped($event->master)); } private function bootCustomBladeDirectives(): void @@ -128,7 +168,7 @@ private function bootCustomBladeDirectives(): void Blade::directive('signedGraphTag', fn ($vars) => "'; ?>"); - Blade::directive('graphImage', fn ($vars, $flags = 0) => ""); + Blade::directive('graphImage', fn ($expression) => ""); } private function configureMorphAliases(): void @@ -230,13 +270,7 @@ private function bootCustomValidators() return false; } - foreach ($value as $key => $_) { - if (is_string($key) && strlen(trim($key)) == 0) { - return false; - } - } - - return true; + return array_all($value, fn ($_, $key) => ! (is_string($key) && strlen(trim($key)) == 0)); }); Validator::extend('date_or_relative', function ($attribute, $value, $parameters, $validator) { @@ -263,7 +297,8 @@ public function bootAuth(): void return $request->header('X-Auth-Token') ?? $request->bearerToken() ?? $request->query('api_token') - ?? $request->input('api_token'); + ?? $request->input('api_token') + ?? $request->getPassword(); } return $request->bearerToken(); diff --git a/app/Providers/DatastoreServiceProvider.php b/app/Providers/DatastoreServiceProvider.php index b147f2c7725..990ecd47a76 100644 --- a/app/Providers/DatastoreServiceProvider.php +++ b/app/Providers/DatastoreServiceProvider.php @@ -34,7 +34,7 @@ class DatastoreServiceProvider extends ServiceProvider { protected $namespace = 'LibreNMS\\Data\\Store\\'; - private const STORES = [ + private const array STORES = [ \LibreNMS\Data\Store\Graphite::class, \LibreNMS\Data\Store\InfluxDB::class, \LibreNMS\Data\Store\InfluxDBv2::class, @@ -43,7 +43,7 @@ class DatastoreServiceProvider extends ServiceProvider \LibreNMS\Data\Store\Rrd::class, \LibreNMS\Data\Store\Kafka::class, ]; - private const CLIENTS = [ + private const array CLIENTS = [ \InfluxDB\Database::class => [\LibreNMS\Data\Store\InfluxDB::class, 'createFromConfig'], \RdKafka\Producer::class => [\LibreNMS\Data\Store\Kafka::class, 'getClient'], ]; diff --git a/app/Providers/LegacyUserProvider.php b/app/Providers/LegacyUserProvider.php index 751fef40641..1034ac29458 100644 --- a/app/Providers/LegacyUserProvider.php +++ b/app/Providers/LegacyUserProvider.php @@ -26,6 +26,7 @@ namespace App\Providers; +use App\Facades\LibrenmsConfig; use App\Models\User; use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Contracts\Auth\UserProvider; @@ -33,6 +34,7 @@ use Illuminate\Database\QueryException; use Illuminate\Support\Facades\DB; use LibreNMS\Authentication\LegacyAuth; +use LibreNMS\Authentication\MysqlAuthorizer; use LibreNMS\Exceptions\AuthenticationException; use LibreNMS\Util\Debug; use Log; @@ -91,7 +93,7 @@ public function retrieveByToken($identifier, $token): ?Authenticatable $rememberToken = $user->getRememberToken(); if ($rememberToken && hash_equals($rememberToken, $token)) { - if (LegacyAuth::get()->userExists($user->username)) { + if ($this->isLocalFallbackUser($user) || LegacyAuth::get()->userExists($user->username)) { return $user; } } @@ -125,7 +127,7 @@ public function updateRememberToken(Authenticatable $user, $token): void */ public function validateCredentials(Authenticatable $user, array $credentials) { - $authorizer = LegacyAuth::get(); + $authorizer = $user instanceof User && $this->isLocalFallbackUser($user) ? MysqlAuthorizer::asFallback() : LegacyAuth::get(); try { // try authentication methods @@ -153,6 +155,19 @@ public function validateCredentials(Authenticatable $user, array $credentials) return false; } + private function localFallbackEnabled(): bool + { + // external auth (http-auth, sso, ...) already identified the user, there is no password to check + return LibrenmsConfig::get('auth_fallback_local') + && LegacyAuth::getType() !== 'mysql' + && ! LegacyAuth::get()->authIsExternal(); + } + + private function isLocalFallbackUser(User $user): bool + { + return $user->auth_type === 'mysql' && $this->localFallbackEnabled(); + } + /** * Retrieve a user by the given credentials. * @@ -163,31 +178,52 @@ public function retrieveByCredentials(array $credentials) { $auth = LegacyAuth::get(); $type = LegacyAuth::getType(); - - // ldap based auth we should bind before using, otherwise searches may fail due to anonymous bind - if (method_exists($auth, 'bind')) { - $auth->bind($credentials); - } - $username = $credentials['username'] ?? null; - $auth_id = $auth->getUserid($username); - $new_user = $auth->getUser($auth_id); + $localFallback = $this->localFallbackEnabled(); - if (empty($new_user)) { - // some legacy auth create users in the authenticate method, if it doesn't exist yet, lets try authenticate (Laravel calls retrieveByCredentials first) - try { - $auth->authenticate($credentials); - $auth_id = $auth->getUserid($username); - $new_user = $auth->getUser($auth_id); - } catch (AuthenticationException $ae) { - toast()->error($ae->getMessage()); + $auth_id = null; + $new_user = null; + $auth_error = null; + + try { + // ldap based auth we should bind before using, otherwise searches may fail due to anonymous bind + if (method_exists($auth, 'bind')) { + $auth->bind($credentials); } + $auth_id = $auth->getUserid($username); + $new_user = $auth->getUser($auth_id); + if (empty($new_user)) { - Log::error("Auth Error ($type): No user ($auth_id) [$username] from " . Request::ip()); + // some legacy auth create users in the authenticate method, if it doesn't exist yet, lets try authenticate (Laravel calls retrieveByCredentials first) + try { + $auth->authenticate($credentials); + $auth_id = $auth->getUserid($username); + $new_user = $auth->getUser($auth_id); + } catch (AuthenticationException $ae) { + $auth_error = $ae->getMessage(); + } + } + } catch (\Throwable $e) { + if (! $localFallback) { + throw $e; + } + // an unreachable server can surface as any error type + Log::error("Auth Error ($type): lookup of [$username] failed, trying local users", ['exception' => $e]); + } - return null; + if (empty($new_user)) { + $local = $localFallback ? User::where('auth_type', 'mysql')->firstWhere('username', $username) : null; + if ($local) { + return $local; } + + if ($auth_error !== null) { + toast()->error($auth_error); + } + Log::error("Auth Error ($type): No user ($auth_id) [$username] from " . Request::ip()); + + return null; } unset($new_user['user_id']); @@ -218,7 +254,7 @@ public function retrieveByCredentials(array $credentials) public function rehashPasswordIfRequired(Authenticatable $user, #[\SensitiveParameter] array $credentials, bool $force = false) { // TODO: NEEDS TO BE VERIFIED CORRECT SOLUTION - if (! isset($credentials['password']) || empty($user->getAuthPassword())) { + if (! $user instanceof User || ! isset($credentials['password']) || empty($user->getAuthPassword())) { return; } $hasher = app(HasherContract::class); @@ -227,8 +263,7 @@ public function rehashPasswordIfRequired(Authenticatable $user, #[\SensitivePara return; } - $user->forceFill([ - $user->getAuthPasswordName() => $hasher->make($credentials['password']), - ])->save(); + $user->setAttribute($user->getAuthPasswordName(), $hasher->make($credentials['password'])); + $user->save(); } } diff --git a/app/Providers/QueueServiceProvider.php b/app/Providers/QueueServiceProvider.php new file mode 100644 index 00000000000..af8dfd22f96 --- /dev/null +++ b/app/Providers/QueueServiceProvider.php @@ -0,0 +1,58 @@ +app->singleton(WorkedQueues::class); + } + + public function boot(): void + { + Queue::createPayloadUsing(fn (?string $connection, ?string $queue, array $payload): array => JobPayload::extra($payload)); + + // a failure to record status is logged, it does not fail the job + Event::listen(Looping::class, function (Looping $event): void { + rescue(fn () => $this->app->make(WorkedQueues::class)->looping((string) $event->queue)); + }); + Event::listen(JobProcessing::class, function (JobProcessing $event): void { + $this->worker($event->job, function (Job $job): void { + $this->app->make(WorkedQueues::class)->jobStarted($job); + $this->app->make(RetryTracker::class)->jobStarted($job); + }); + }); + Event::listen(JobReleasedAfterException::class, function (JobReleasedAfterException $event): void { + $this->worker($event->job, fn (Job $job) => $this->app->make(RetryTracker::class)->jobReleased($job, (int) $event->backoff)); + }); + } + + /** + * Only jobs run by queue workers, not jobs run right away (dispatchSync, sync driver) + * + * @param callable(Job): void $callback + */ + private function worker(Job $job, callable $callback): void + { + if (! $job instanceof SyncJob) { + rescue(fn () => $callback($job)); + } + } +} diff --git a/app/Queue/DeviceLocks.php b/app/Queue/DeviceLocks.php new file mode 100644 index 00000000000..afd57e40ec8 --- /dev/null +++ b/app/Queue/DeviceLocks.php @@ -0,0 +1,53 @@ +pollJob($device); + $lock = new UniqueLock($this->cache); + + // taking it is the only way to check, give it back right away + if ($lock->acquire($job)) { + $lock->release($job); + + return false; + } + + return true; + } + + /** + * Let DispatchPollingWork queue the device again + */ + public function release(Device $device): void + { + new UniqueLock($this->cache)->release($this->pollJob($device)); + } + + private function pollJob(Device $device): PollDevice + { + return new PollDevice($device->device_id, ModuleList::fromUserOverrides([])) + ->onQueue(PollDevice::queueFor((int) $device->poller_group)); + } +} diff --git a/app/Queue/FailedJobs.php b/app/Queue/FailedJobs.php new file mode 100644 index 00000000000..7ef5c7cf67b --- /dev/null +++ b/app/Queue/FailedJobs.php @@ -0,0 +1,89 @@ + + */ + public function list(?int $device_id = null, ?string $job = null, int $limit = 50): Collection + { + return FailedJob::query() + ->when($device_id !== null, fn ($query) => $query->where('payload->device_id', $device_id)) + ->when($job !== null, fn ($query) => $query->where('payload->displayName', $job)) + ->orderByDesc('id') + ->limit($limit) + ->get() + ->map($this->present(...)); + } + + public function count(): int + { + return FailedJob::count(); + } + + public function retry(string $uuid): void + { + Artisan::call('queue:retry', ['id' => [$uuid]]); + } + + public function forget(string $uuid): void + { + app('queue.failer')->forget($uuid); + } + + /** + * The exception class and message, without the location and stack trace + */ + public static function exceptionSummary(string $exception): string + { + $head = Str::before($exception, "\nStack trace:"); + + // a closure location is its source code, which spans lines + // a file location is the last "in /path:line", the message itself may mention files + if (preg_match('#^(.*?) in laravel-serializable-closure://.*:\d+$#s', $head, $matches) + || preg_match('#^(.*) in /[^\n]*:\d+$#s', $head, $matches)) { + $head = $matches[1]; + } + + return trim((string) preg_replace('/\s+/', ' ', $head)); + } + + /** + * @return FailedJobRow + */ + private function present(FailedJob $job): array + { + $payload = (array) $job->payload; + $exception = mb_convert_encoding((string) $job->exception, 'UTF-8'); + + return [ + 'id' => (string) $job->uuid, + 'name' => JobPayload::name($payload), + 'queue' => (string) $job->queue, + 'status' => 'failed', + 'device_id' => JobPayload::deviceId($payload), + 'attempts' => isset($payload['attempts']) ? (int) $payload['attempts'] : null, + 'finished' => $job->failed_at, + 'error' => self::exceptionSummary($exception), + 'exception' => $exception, + ]; + } +} diff --git a/app/Queue/JobPayload.php b/app/Queue/JobPayload.php new file mode 100644 index 00000000000..e4736594eaa --- /dev/null +++ b/app/Queue/JobPayload.php @@ -0,0 +1,46 @@ + $payload + * @return array + */ + public static function extra(array $payload): array + { + $command = $payload['data']['command'] ?? null; + + return is_object($command) && in_array(DeviceJob::class, class_uses_recursive($command)) + ? ['device_id' => $command->deviceId()] + : []; + } + + /** + * The device a job is for + * + * @param array $payload + */ + public static function deviceId(array $payload): ?int + { + return isset($payload['device_id']) ? (int) $payload['device_id'] : null; + } + + /** + * Job class basename, displayName is the class unless the job names itself + * + * @param array $payload + */ + public static function name(array $payload): string + { + return class_basename((string) ($payload['displayName'] ?? '')); + } +} diff --git a/app/Queue/PollingQueues.php b/app/Queue/PollingQueues.php new file mode 100644 index 00000000000..1731c6f8a23 --- /dev/null +++ b/app/Queue/PollingQueues.php @@ -0,0 +1,39 @@ + + */ + public function pollingQueues(): array + { + $intervals = [PollingQueues::SCHEDULER => DispatchPollingWork::INTERVAL]; + $groups = Device::where('disabled', 0)->distinct()->pluck('poller_group')->map(intval(...))->all(); + + foreach (PollingQueues::forGroups($groups, poll: WorkerNode::inUse('poller'), discover: false) as $queue) { + $intervals[$queue] = DispatchPollingWork::pollInterval(); + } + foreach (PollingQueues::forGroups($groups, poll: false, discover: WorkerNode::inUse('discovery')) as $queue) { + $intervals[$queue] = DispatchPollingWork::discoveryInterval(); + } + + return $intervals; + } + + /** + * Polling queues and the default queue with job counts by state. + * Delayed jobs are split into retries of down devices and work scheduled by DispatchPollingWork. + * Busy is the average number of workers the queue's devices keep busy, from their last poll or discovery, + * workers are the ones Horizon nodes are configured to run for it (unknown for other queue workers). + * + * @param Collection|null $retrying from RetryTracker::retrying() + * @return Collection + */ + public function queues(?Collection $retrying = null): Collection + { + $queue = Queue::connection(); + $intervals = $this->pollingQueues() + [PollingQueues::DEFAULT => null]; + ksort($intervals); + $names = array_keys($intervals); + // a retry that is due has left the delayed jobs + $retryCounts = ($retrying ?? $this->retries->retrying())->filter(fn (array $retry): bool => $retry['retry_at']->isFuture())->countBy('queue'); + $worked = $this->worked->worked($names); + $ages = $this->ages($names); + $busy = $this->busyWorkers(); + $workers = $this->configuredWorkers(); + + return collect($intervals)->map(function (?int $interval, string $name) use ($queue, $retryCounts, $worked, $ages, $busy, $workers): array { + $retries = (int) $retryCounts->get($name, 0); + + return [ + 'name' => $name, + 'pending' => self::size($queue, 'pendingSize', $name), + 'scheduled' => max(0, self::size($queue, 'delayedSize', $name) - $retries), + 'retrying' => $retries, + 'reserved' => self::size($queue, 'reservedSize', $name), + 'worked' => in_array($name, $worked), + 'age' => $ages[$name], + 'interval' => $interval, + 'busy' => $busy[$name] ?? null, + 'workers' => $workers[$name] ?? null, + ]; + })->values(); + } + + /** + * Seconds the oldest job ready to run has been in each queue, 0 when none are waiting + * + * @param string[] $queues + * @return array + */ + public function ages(array $queues): array + { + $queue = Queue::connection(); + $ages = []; + + foreach ($queues as $name) { + $oldest = self::size($queue, 'creationTimeOfOldestPendingJob', $name); + $ages[$name] = $oldest ? max(0, now()->getTimestamp() - $oldest) : 0; + } + + return $ages; + } + + /** + * Queue worker nodes on the pollers page (Horizon) and the queues their settings give them + * + * @return Collection}> + */ + public function workers(): Collection + { + $active = PollerCluster::isQueueWorker()->isActive()->pluck('id'); + + return PollerCluster::isQueueWorker()->get() + ->map(fn (PollerCluster $node): array => [ + 'name' => (string) ($node->poller_name ?: $node->node_id), + 'status' => $active->contains($node->id) ? 'running' : 'inactive', + 'last_report' => $node->last_report, + 'queues' => collect(WorkerNode::queues($node))->filter()->flatMap(fn (array $type): array => $type['queues'])->all(), + ]) + ->sortBy('name') + ->values(); + } + + /** + * Average workers busy per polling queue: the time its devices took on their last run over the interval they run in + * + * @return array + */ + private function busyWorkers(): array + { + $busy = []; + $groups = Device::where('disabled', 0) + ->groupBy('poller_group') + ->select('poller_group') + ->selectRaw('SUM(`last_polled_timetaken`) AS `poll`, SUM(`last_discovered_timetaken`) AS `discovery`') + ->toBase() + ->get(); + + foreach ($groups as $group) { + $busy[PollDevice::queueFor((int) $group->poller_group)] = round((float) $group->poll / DispatchPollingWork::pollFrequency(), 1); + $busy[DiscoverDevice::queueFor((int) $group->poller_group)] = round((float) $group->discovery / DispatchPollingWork::discoveryFrequency(), 1); + } + + return $busy; + } + + /** + * Workers the active Horizon nodes run for each queue, from their settings + * + * @return array + */ + private function configuredWorkers(): array + { + $workers = []; + + foreach (PollerCluster::isQueueWorker()->isActive()->get() as $node) { + foreach (array_filter(WorkerNode::queues($node)) as $type) { + foreach ($type['queues'] as $name) { + $workers[$name] = ($workers[$name] ?? 0) + $type['workers']; + } + } + } + + return $workers; + } + + /** + * Up devices not polled in twice the poll interval, last_polled is only updated when a device is up + * + * @return \Illuminate\Database\Eloquent\Collection + */ + public function overdueDevices(?int $limit = null): \Illuminate\Database\Eloquent\Collection + { + return Device::where('disabled', 0) + ->where('status', 1) + ->where('last_polled', '<', now()->subSeconds(DispatchPollingWork::pollInterval() * 2)) + ->orderBy('last_polled') + ->when($limit, fn ($query) => $query->limit($limit)) + ->get(); + } + + public function recordDispatched(): void + { + Cache::put(self::DISPATCHED_KEY, now()->getTimestamp(), 3600); + } + + /** + * When DispatchPollingWork last completed a run, null if it has not in the last hour + */ + public function lastDispatched(): ?Carbon + { + $time = Cache::get(self::DISPATCHED_KEY); + + return $time ? Carbon::createFromTimestamp((int) $time) : null; + } + + /** + * A queue size, the redis and database queue drivers have them + */ + private static function size(object $queue, string $method, string $name): int + { + return method_exists($queue, $method) ? (int) $queue->$method($name) : 0; + } +} diff --git a/app/Queue/RetryTracker.php b/app/Queue/RetryTracker.php new file mode 100644 index 00000000000..82c2e78c6b3 --- /dev/null +++ b/app/Queue/RetryTracker.php @@ -0,0 +1,78 @@ + + */ + public function retrying(): Collection + { + // a retry is recorded per device and job, for devices that are down + $keys = Device::where('status', 0)->pluck('device_id') + ->crossJoin(array_map(class_basename(...), self::RETRY_JOBS)) + ->map(fn (array $key): string => self::key(...$key)) + ->all(); + + /** @var array $retries */ + $retries = empty($keys) ? [] : Cache::many($keys); + + return collect($retries) + ->filter() + ->map(fn (array $retry): array => ['retry_at' => Carbon::createFromTimestamp($retry['retry_at'])] + $retry) + ->sortBy('retry_at') + ->values(); + } + + public function jobReleased(Job $job, int $backoff): void + { + $payload = $job->payload(); + $device_id = JobPayload::deviceId($payload); + if ($device_id === null) { + return; + } + + $name = JobPayload::name($payload); + Cache::put(self::key($device_id, $name), [ + 'device_id' => $device_id, + 'name' => $name, + 'queue' => $job->getQueue(), + 'attempt' => $job->attempts(), + 'tries' => $job->maxTries(), + 'retry_at' => now()->getTimestamp() + $backoff, + ], $backoff + self::STALE); + } + + public function jobStarted(Job $job): void + { + // only a job that ran before can be a retry + $payload = $job->payload(); + $device_id = JobPayload::deviceId($payload); + if ($job->attempts() > 1 && $device_id !== null) { + Cache::forget(self::key($device_id, JobPayload::name($payload))); + } + } + + private static function key(int $device_id, string $name): string + { + return "queue-retrying:$device_id:$name"; + } +} diff --git a/app/Queue/WorkedQueues.php b/app/Queue/WorkedQueues.php new file mode 100644 index 00000000000..77c51ffc1cf --- /dev/null +++ b/app/Queue/WorkedQueues.php @@ -0,0 +1,90 @@ + ! empty($records[self::key($queue)]))); + } + + /** + * Runs on every loop of a worker process, between jobs and while it waits for jobs + * + * @param string $queues comma separated queues the worker works + */ + public function looping(string $queues): void + { + $now = time(); + if ($now < $this->nextHeartbeat) { + return; + } + $this->nextHeartbeat = $now + self::HEARTBEAT; + + $this->queues = array_values(array_filter(explode(',', $queues))); + $this->record(self::HEARTBEAT * 2); + } + + /** + * A worker does not loop while it runs a job, its queues stay worked until the job would time out + */ + public function jobStarted(Job $job): void + { + $this->record((int) $job->timeout() + self::HEARTBEAT); + } + + /** + * Record this process's queues as worked for the given seconds, without shortening a longer record of another process + */ + private function record(int $seconds): void + { + $seconds = max($seconds, self::HEARTBEAT * 2); + $until = time() + $seconds; + // refreshed when it is extended by a heartbeat or more, which is always the case before it expires + if (empty($this->queues) || $until - $this->recordedUntil < self::HEARTBEAT) { + return; + } + $this->recordedUntil = $until; + + // the value is when the record expires + foreach (Cache::many(array_map(self::key(...), $this->queues)) as $key => $expires) { + if ((int) $expires < $until) { + Cache::put($key, $until, $seconds); + } + } + } + + private static function key(string $queue): string + { + return "queue-worked:$queue"; + } +} diff --git a/app/Queue/WorkerNode.php b/app/Queue/WorkerNode.php new file mode 100644 index 00000000000..dfd20e1556a --- /dev/null +++ b/app/Queue/WorkerNode.php @@ -0,0 +1,60 @@ +poller_version = self::VERSION; + + return $node; + } + + /** + * Polling or discovery, or the given task, is scheduled to run on the queue workers + */ + public static function inUse(?string $task = null): bool + { + return array_any($task === null ? ['poller', 'discovery'] : [$task], fn ($type) => LibrenmsConfig::get("schedule_type.$type") == self::SCHEDULE_TYPE); + } + + /** + * Poll and discovery queues of the node's poller groups and the workers configured for them, null if disabled + * + * @return array{poller: NodeQueues|null, discovery: NodeQueues|null} + */ + public static function queues(PollerCluster $node): array + { + $groups = array_map(intval(...), explode(',', (string) $node->getSettingValue('poller_groups'))); + + return [ + 'poller' => $node->getSettingValue('poller_enabled') ? [ + 'queues' => PollingQueues::forGroups($groups, poll: true, discover: false), + 'workers' => (int) $node->getSettingValue('poller_workers'), + ] : null, + 'discovery' => $node->getSettingValue('discovery_enabled') ? [ + 'queues' => PollingQueues::forGroups($groups, poll: false, discover: true), + 'workers' => (int) $node->getSettingValue('discovery_workers'), + ] : null, + ]; + } +} diff --git a/app/View/Components/Device/EditTabs.php b/app/View/Components/Device/EditTabs.php index 866dcb5b296..3f50f990189 100644 --- a/app/View/Components/Device/EditTabs.php +++ b/app/View/Components/Device/EditTabs.php @@ -42,7 +42,6 @@ public function __construct( ?string $tab = null, ) { $this->tab = $tab ?? Request::segment(4, 'edit'); - $snmpEnabled = $this->device->polling()->isEnabled(PollingMethodType::Snmp); $this->tabs = [ 'edit' => [ @@ -55,14 +54,14 @@ public function __construct( ], ]; - if ($snmpEnabled) { + if ($this->device->ports()->exists()) { $this->tabs['ports'] = [ 'text' => __('Ports'), 'link' => route('device.edit.ports', $this->device->device_id), ]; } - if ($device->bgppeers()->exists()) { + if ($device->bgppeers()->exists() || $device->vrfs()->exists()) { $this->tabs['routing'] = [ 'text' => __('Routing'), 'link' => route('device.edit.routing', $this->device->device_id), @@ -76,7 +75,7 @@ public function __construct( ]; } - if ($snmpEnabled) { + if ($this->device->polling()->isEnabled(PollingMethodType::Snmp)) { $this->tabs['apps'] = [ 'text' => __('Applications'), 'link' => url('/device/device=' . $this->device->device_id . '/tab=edit/section=apps/'), @@ -88,12 +87,10 @@ public function __construct( 'link' => url('/device/device=' . $this->device->device_id . '/tab=edit/section=alert-rules/'), ]; - if ($snmpEnabled) { - $this->tabs['modules'] = [ - 'text' => __('Modules'), - 'link' => route('device.edit.modules', $this->device->device_id), - ]; - } + $this->tabs['modules'] = [ + 'text' => __('Modules'), + 'link' => route('device.edit.modules', $this->device->device_id), + ]; if (LibrenmsConfig::get('show_services')) { $this->tabs['services'] = [ @@ -116,15 +113,21 @@ public function __construct( ]; } - if ($snmpEnabled) { + if ($this->device->storage()->exists()) { $this->tabs['storage'] = [ 'text' => __('Storage'), 'link' => route('device.edit.storage', $this->device->device_id), ]; + } + + if ($this->device->processors()->exists()) { $this->tabs['processors'] = [ 'text' => __('Processors'), 'link' => route('device.edit.processors', $this->device->device_id), ]; + } + + if ($this->device->mempools()->exists()) { $this->tabs['mempools'] = [ 'text' => __('Memory'), 'link' => route('device.edit.mempools', $this->device->device_id), diff --git a/app/View/Components/Device/LogTabs.php b/app/View/Components/Device/LogTabs.php index 4bf43ff168a..28fd4e215a5 100644 --- a/app/View/Components/Device/LogTabs.php +++ b/app/View/Components/Device/LogTabs.php @@ -46,7 +46,7 @@ public function __construct( ]; $this->tabs['eventlog'] = [ - 'text' => __('Event Log'), + 'text' => __('Eventlog'), 'link' => route('device.eventlog', $this->device->device_id), ]; diff --git a/app/View/Components/Device/Overview/Eventlog.php b/app/View/Components/Device/Overview/Eventlog.php index 62c6af39fd2..68fcad9f497 100644 --- a/app/View/Components/Device/Overview/Eventlog.php +++ b/app/View/Components/Device/Overview/Eventlog.php @@ -6,7 +6,7 @@ use Closure; use Illuminate\Contracts\View\View; use Illuminate\View\Component; -use LibreNMS\Enum\Severity; +use LibreNMS\Util\Html; class Eventlog extends Component { @@ -26,14 +26,7 @@ public function __construct( ) { $this->rows = $eventlogs->map(fn (\App\Models\Eventlog $entry): array => [ 'entry' => $entry, - 'severityClass' => match ($entry->severity) { - Severity::Ok => 'label-success', - Severity::Error => 'label-danger', - Severity::Info => 'label-info', - Severity::Notice => 'label-primary', - Severity::Warning => 'label-warning', - default => 'label-default', - }, + 'severityClass' => Html::severityClass($entry->severity), 'port' => $entry->type === 'interface' && $entry->reference !== null ? $ports->get((int) $entry->reference) : null, ])->values()->all(); } diff --git a/app/View/Components/Device/Overview/Processors.php b/app/View/Components/Device/Overview/Processors.php index be71866a4ed..235a793a75c 100644 --- a/app/View/Components/Device/Overview/Processors.php +++ b/app/View/Components/Device/Overview/Processors.php @@ -29,7 +29,7 @@ public function __construct(public Device $device) 'processors' => $processors ->map(fn (Processor $processor): Processor => $processor) ->values(), - 'usage' => (int) ceil($processors->avg('processor_usage')), + 'usage' => (int) ceil($processors->avg('processor_usage') ?? 0), 'warning' => $processors->avg('processor_perc_warn'), ], ); diff --git a/app/View/Components/Device/Page.php b/app/View/Components/Device/Page.php index 9b019876bed..70a2d9c56a1 100644 --- a/app/View/Components/Device/Page.php +++ b/app/View/Components/Device/Page.php @@ -27,7 +27,6 @@ namespace App\View\Components\Device; use App\Facades\DeviceCache; -use App\Facades\LibrenmsConfig; use App\Models\Device; use App\Models\Vminfo; use Closure; @@ -35,6 +34,7 @@ use Illuminate\Support\Facades\Lang; use Illuminate\View\Component; use LibreNMS\Enum\DeviceStatus; +use LibreNMS\Enum\DeviceType; use LibreNMS\Util\Graph; class Page extends Component @@ -54,7 +54,7 @@ public function __construct( ) { $device->loadCount(['ports', 'sensors', 'wirelessSensors']); DeviceCache::setPrimary($device->device_id); // set primary device in case it was not set by controller - $this->pagetitle = $subtitle ? ($device->displayName() . ': ' . $subtitle) : $device->displayName(); + $this->pagetitle = $subtitle ? ($device->display . ': ' . $subtitle) : $device->display; $this->alertClass = $device->disabled ? 'alert-info' : ($device->status ? '' : 'alert-danger'); $this->awaitingDiscovery = ! $device->disabled && $device->last_discovered === null; $this->isEditPage = request()->routeIs('device.edit*') || str_replace('tab=', '', (string) request()->route('tab')) === 'edit'; @@ -94,12 +94,9 @@ public function render(): View|Closure|string private function populateTypeFields(): void { - foreach (LibrenmsConfig::get('device_types', []) as $type) { - if (isset($type['type']) && $type['type'] == $this->device->type) { - $this->typeIcon = $type['icon'] ?? null; - $this->typeText = $type['text'] ?? $this->device->type; - break; - } + $this->typeIcon = DeviceType::icons()[$this->device->type] ?? null; + if ($this->typeIcon) { + $this->typeText = DeviceType::labelFor($this->device->type); } } diff --git a/app/View/Components/DeviceLink.php b/app/View/Components/DeviceLink.php index a83d050fd07..a832ca6723b 100644 --- a/app/View/Components/DeviceLink.php +++ b/app/View/Components/DeviceLink.php @@ -40,7 +40,7 @@ public function __construct($device, ?string $tab = null, ?string $section = nul $this->tab = $tab; $this->section = $section; $this->status = $this->status(); - $this->href = route('device', ['device' => $device->device_id ?? 1, 'tab' => $tab, 'section' => $section]); + $this->href = route('device', ['device' => $this->device->device_id ?? 1, 'tab' => $tab, 'section' => $section]); } /** diff --git a/app/View/Components/Label.php b/app/View/Components/Label.php index 59401dbbf86..880176fa38e 100644 --- a/app/View/Components/Label.php +++ b/app/View/Components/Label.php @@ -6,6 +6,7 @@ use Illuminate\Contracts\View\View; use Illuminate\View\Component; use LibreNMS\Enum\Severity; +use LibreNMS\Util\Html; class Label extends Component { @@ -17,14 +18,7 @@ class Label extends Component public function __construct( public ?Severity $status = null ) { - $this->statusClass = match ($status) { - Severity::Ok => 'label-success', - Severity::Error => 'label-danger', - Severity::Info => 'label-info', - Severity::Notice => 'label-primary', - Severity::Warning => 'label-warning', - default => 'label-default', - }; + $this->statusClass = Html::severityClass($status ?? Severity::Unknown); } /** diff --git a/app/View/Components/Routing/BgpPeerTable.php b/app/View/Components/Routing/BgpPeerTable.php index 7b72114cd9d..51291c5232b 100644 --- a/app/View/Components/Routing/BgpPeerTable.php +++ b/app/View/Components/Routing/BgpPeerTable.php @@ -200,35 +200,17 @@ private function loadCbgp(Collection $peers): Collection */ private function resolveLinkedPorts(Collection $peers): array { - $ipv4s = []; - $ipv6s = []; - foreach ($peers as $peer) { - if (! str_contains($peer->bgpPeerIdentifier, ':')) { - $ipv4s[$peer->bgpPeerIdentifier][] = $peer; - } elseif ($parsed = IP::parse($peer->bgpPeerIdentifier, true)) { - $ipv6s[$parsed->uncompressed()][] = $peer; - } - } - - $ports = []; + // unnumbered peers use the interface name as identifier + $addresses = $peers->mapWithKeys(fn (BgpPeer $peer) => [ + "$peer->device_id|$peer->bgpPeerIdentifier" => (IP::parse($peer->bgpPeerIdentifier, true) ?? IP::parse($peer->bgpPeerRemoteAddr ?? '', true))?->uncompressed(), + ])->filter(); - if (! empty($ipv4s)) { - foreach (Ipv4Address::whereIn('ipv4_address', array_keys($ipv4s))->with('port.device')->get() as $ip) { - foreach ($ip->port ? $ipv4s[$ip->ipv4_address] : [] as $peer) { - $ports["$peer->device_id|$peer->bgpPeerIdentifier"] = $ip->port; - } - } - } - - if (! empty($ipv6s)) { - foreach (Ipv6Address::whereIn('ipv6_address', array_keys($ipv6s))->with('port.device')->get() as $ip) { - foreach ($ip->port ? ($ipv6s[$ip->ipv6_address] ?? []) : [] as $peer) { - $ports["$peer->device_id|$peer->bgpPeerIdentifier"] = $ip->port; - } - } - } + $ips = Ipv4Address::whereIn('ipv4_address', $addresses)->has('port')->with('port.device')->get()->groupBy('ipv4_address')->toBase() + ->merge(Ipv6Address::whereIn('ipv6_address', $addresses)->has('port')->with('port.device')->get()->groupBy('ipv6_address')); - return $ports; + // addresses may not be unique (link-local, VRFs) + return $addresses->map(fn (string $address) => $ips->get($address)?->containsOneItem() ? $ips[$address]->first()->port : null) + ->filter()->all(); } /** diff --git a/app/View/Components/Submenu.php b/app/View/Components/Submenu.php index e5a22170217..bb45a87983e 100644 --- a/app/View/Components/Submenu.php +++ b/app/View/Components/Submenu.php @@ -26,13 +26,8 @@ public function isSelected(string $url): bool if (isset($parsed_url['query']) && $parsed_url['path'] === $this->selected) { parse_str($parsed_url['query'], $vars); $request = request(); - foreach ($vars as $key => $value) { - if ($request->input($key) !== $value) { - return false; - } - } - return true; + return array_all($vars, fn ($value, $key) => ! ($request->input($key) !== $value)); } return $url === $this->selected; diff --git a/app/View/Components/VminfoGraphs.php b/app/View/Components/VminfoGraphs.php new file mode 100644 index 00000000000..573e0226a9e --- /dev/null +++ b/app/View/Components/VminfoGraphs.php @@ -0,0 +1,102 @@ + */ + public array $tiles; + + /** + * @param LengthAwarePaginator $vms + * @param array> $filterFields + * @param array $filter + */ + public function __construct( + public LengthAwarePaginator $vms, + public string $graph, + public array $filterFields = [], + public array $filter = [], + public ?string $from = null, + public ?string $to = null, + ) { + $graphTemplate = array_filter([ + 'type' => self::types()[$graph]['type'], + 'from' => $from ?? '-1d', + 'to' => $to, + 'height' => 110, + 'width' => session('widescreen') ? 270 : 315, + 'legend' => 'no', + 'title' => 'yes', + ]); + + $this->tiles = $vms->getCollection()->map(fn (Vminfo $vm): array => [ + 'link' => route('device.vm.show', ['device' => $vm->device_id, 'vminfo' => $vm->id]), + 'graphTag' => Url::lazyGraphTag(['id' => $vm->id] + $graphTemplate, 'tw:w-full tw:h-auto'), + ])->values()->all(); + } + + /** + * Graphs a virtual machine may record, keyed by the slug used in urls. + * + * @return array + */ + public static function types(): array + { + return [ + 'cpu' => ['type' => 'vminfo_cpu', 'metric' => 'vm.cpu', 'title' => __('CPU Usage'), 'label' => __('CPU')], + 'mem' => ['type' => 'vminfo_mem', 'metric' => 'vm.memory', 'title' => __('Memory Usage'), 'label' => __('Memory')], + 'disk' => ['type' => 'vminfo_disk', 'metric' => 'vm.disk', 'title' => __('Disk Usage'), 'label' => __('Disk')], + 'diskio_bits' => ['type' => 'vminfo_diskio_bits', 'metric' => 'vm.diskio', 'title' => __('Disk I/O'), 'label' => __('Disk I/O')], + 'diskio_ops' => ['type' => 'vminfo_diskio_ops', 'metric' => 'vm.diskops', 'title' => __('Disk Operations'), 'label' => __('Disk Ops')], + 'net' => ['type' => 'vminfo_net', 'metric' => 'vm.net', 'title' => __('Network Traffic'), 'label' => __('Network')], + ]; + } + + /** + * @return array + */ + public static function validationRules(): array + { + return [ + 'graph' => ['nullable', Rule::in(array_keys(self::types()))], + 'per_page' => ['nullable', Rule::in(self::PER_PAGE_OPTIONS)], + 'from' => ['nullable', 'date_or_relative'], + 'to' => ['nullable', 'date_or_relative'], + ]; + } + + /** + * Option bar entries to switch between the list and each graph. + * + * @param array $query current query string + * @param Closure(array): string $url builds a link to the page from a query string + * @return array + */ + public static function nav(array $query, Closure $url): array + { + $query = array_diff_key($query, array_flip(['graph', 'page'])); + $nav = ['list' => ['text' => __('List'), 'link' => $url(array_diff_key($query, array_flip(['per_page', 'from', 'to'])))]]; + + foreach (self::types() as $slug => $graph) { + $nav[$slug] = ['text' => $graph['label'], 'link' => $url(['graph' => $slug] + $query)]; + } + + return $nav; + } + + public function render(): View|Closure|string + { + return view('components.vminfo-graphs'); + } +} diff --git a/app/View/FieldSchema/FieldDefinition.php b/app/View/FieldSchema/FieldDefinition.php index 20b8d1c7c88..7ec85a89078 100644 --- a/app/View/FieldSchema/FieldDefinition.php +++ b/app/View/FieldSchema/FieldDefinition.php @@ -27,6 +27,7 @@ namespace App\View\FieldSchema; use Illuminate\Validation\Rule; +use LibreNMS\Enum\SecretType; class FieldDefinition { @@ -34,6 +35,8 @@ class FieldDefinition * @param array|null $options * @param array|null $visibleIf * @param array|string|null $rules + * @param array|null $fixedIf + * @param SecretType[]|null $secretTypes */ public function __construct( public string $key, @@ -47,6 +50,9 @@ public function __construct( public int|float|null $min = null, public int|float|null $max = null, public ?string $placeholder = null, + public ?array $secretTypes = null, + public ?array $fixedIf = null, + public mixed $fixedValue = null, ) { } @@ -89,6 +95,20 @@ public function visibleIf(?array $visibleIf): static return $this; } + /** + * Show the select as the option for $value, disabled, when the conditions match. + * Its own value is kept and submitted, whatever uses it must ignore it in that case. + * + * @param array $conditions + */ + public function fixedIf(array $conditions, mixed $value): static + { + $this->fixedIf = $conditions; + $this->fixedValue = $value; + + return $this; + } + /** * @param array|string|null $rules */ @@ -127,6 +147,16 @@ public function placeholder(?string $placeholder): static return $this; } + /** + * Only used with these types of secret, the form hides the field for other types. + */ + public function forSecretTypes(SecretType ...$secretTypes): static + { + $this->secretTypes = $secretTypes; + + return $this; + } + public function getDefault(): mixed { $val = null; @@ -263,6 +293,8 @@ public function toSchemaField(string $dataVar = 'formData'): array 'key' => $this->key, 'field_type' => $this->type, 'visible_if_expression' => $this->buildVisibleIfExpression($dataVar), + 'fixed_if_expression' => empty($this->fixedIf) ? null : static::buildVisibleIfExpressionFromArray($this->fixedIf, $dataVar), + 'fixed_text' => $this->fixedIf ? ($this->options[$this->fixedValue] ?? null) : null, ]; } diff --git a/app/View/PollingMethodSecretForm.php b/app/View/PollingMethodSecretForm.php new file mode 100644 index 00000000000..f5f2ad8cde7 --- /dev/null +++ b/app/View/PollingMethodSecretForm.php @@ -0,0 +1,40 @@ + $method + * @param Collection|null $secrets the secrets to pick from, the ones the method can use are included + * @return array{secret_types: list>}>, schema_defaults: object, available_secrets: Collection, secret_type_by_id: array} + */ + public static function make(PollingMethod $method, ?Collection $secrets = null, string $dataVar = 'formData'): array + { + $secretTypes = $method->secretTypes(); + $available = ($secrets ?? collect())->filter(fn (Secret $secret): bool => $method->usesSecretType($secret->secret_type))->values(); + + return [ + 'secret_types' => array_map(fn (SecretType $secretType): array => [ + 'type' => $secretType->value, + 'label' => $secretType->label(), + 'schema_fields' => $secretType->definition()->buildSchemaFields($dataVar), + ], $secretTypes), + // the types have different fields, so the defaults of all of them can be set at once + // an object because Alpine sets the fields by name, those are lost when an empty JSON array is posted + 'schema_defaults' => (object) array_merge(...array_map(fn (SecretType $secretType): array => $secretType->definition()->schemaDefaults(), $secretTypes)), + 'available_secrets' => $available, + // the settings shown depend on the type of the selected secret + 'secret_type_by_id' => $available->mapWithKeys(fn (Secret $secret): array => [$secret->id => $secret->secret_type->value])->all(), + ]; + } +} diff --git a/app/View/SimpleTemplate.php b/app/View/SimpleTemplate.php index f66d69d968f..e9f2e107c96 100644 --- a/app/View/SimpleTemplate.php +++ b/app/View/SimpleTemplate.php @@ -189,6 +189,7 @@ private function executeFilter(string $value, string $filterName, array $args): // String manipulation 'replace' => count($args) >= 2 ? str_replace($args[0], $args[1], $value) : $value, 'slice' => $this->sliceFilter($value, $args), + 'pad' => $this->padFilter($value, $args), // Encoding/escaping 'escape' => $this->escapeFilter($value, $args), @@ -266,6 +267,17 @@ private function dateFilter(string $value, array $args): string return date($format, $timestamp); } + private function padFilter(string $value, array $args): string + { + $direction = match ($args[2] ?? 'left') { + 'right' => STR_PAD_RIGHT, + 'both' => STR_PAD_BOTH, + default => STR_PAD_LEFT, + }; + + return str_pad($value, $args[0] ?? 0, $args[1] ?? ' ', $direction); + } + public function __toString(): string { return (string) preg_replace_callback($this->regex, $this->callback ?? function ($matches) { diff --git a/billing-calculate.php b/billing-calculate.php index 692d146da5a..847b7906127 100755 --- a/billing-calculate.php +++ b/billing-calculate.php @@ -10,6 +10,7 @@ */ use App\Facades\LibrenmsConfig; +use Illuminate\Database\QueryException; use LibreNMS\Billing; use LibreNMS\Util\Debug; use LibreNMS\Util\Number; @@ -38,127 +39,131 @@ foreach (dbFetchRows('SELECT * FROM `bills` ORDER BY `bill_id`') as $bill) { echo str_pad($bill['bill_id'] . ' ' . $bill['bill_name'], 30) . " \n"; - $i = 0; - while ($i <= 24) { - unset($class); - unset($rate_data); - $day_data = Billing::getDates($bill['bill_day'], $i); + try { + $i = 0; + while ($i <= 24) { + unset($class); + unset($rate_data); + $day_data = Billing::getDates($bill['bill_day'], $i); - $datefrom = $day_data['0']; - $dateto = $day_data['1']; + $datefrom = $day_data['0']; + $dateto = $day_data['1']; - $check = dbFetchRow('SELECT * FROM `bill_history` WHERE bill_id = ? AND bill_datefrom = ? AND bill_dateto = ? LIMIT 1', [$bill['bill_id'], $datefrom, $dateto]); + $check = dbFetchRow('SELECT * FROM `bill_history` WHERE bill_id = ? AND bill_datefrom = ? AND bill_dateto = ? LIMIT 1', [$bill['bill_id'], $datefrom, $dateto]); - $date_updated = $check ? str_replace(['-', ':', ' '], '', $check['updated']) : 0; + $date_updated = $check ? str_replace(['-', ':', ' '], '', $check['updated']) : 0; - // A closed period whose history was written after it ended will not change; skip it before touching bill_data - if ($dateto <= $date_updated) { - $i++; - continue; - } - - $period = Billing::getPeriod($bill['bill_id'], $datefrom, $dateto); - - // Send the current dir_95th to the getRates function so it knows to aggregate or return the max in/out value and highest direction - $dir_95th = $bill['dir_95th']; - - if ($period['period'] > 0 && $dateto > $date_updated) { - $rate_data = Billing::getRates($bill['bill_id'], $datefrom, $dateto, $dir_95th); - $rate_95th = $rate_data['rate_95th']; - $dir_95th = $rate_data['dir_95th']; - $total_data = $rate_data['total_data']; - $rate_average = $rate_data['rate_average']; - - if ($bill['bill_type'] == 'cdr') { - $type = 'CDR'; - $allowed = $bill['bill_cdr']; - $used = $rate_data['rate_95th']; - $allowed_text = Number::formatSi($allowed, 2, 0, 'bps'); - $used_text = Number::formatSi($used, 2, 0, 'bps'); - $overuse = ($used - $allowed); - $overuse = (($overuse <= 0) ? '0' : $overuse); - $percent = Number::calculatePercent($rate_data['rate_95th'], $bill['bill_cdr']); - } elseif ($bill['bill_type'] == 'quota') { - $type = 'Quota'; - $allowed = $bill['bill_quota']; - $used = $rate_data['total_data']; - $allowed_text = Billing::formatBytes($allowed); - $used_text = Billing::formatBytes($used); - $overuse = ($used - $allowed); - $overuse = (($overuse <= 0) ? '0' : $overuse); - $percent = Number::calculatePercent($rate_data['total_data'], $bill['bill_quota']); - } - - echo \Carbon\Carbon::parse($datefrom)->toDateTimeString() . ' to ' . \Carbon\Carbon::parse($dateto)->toDateTimeString() . ' ' . str_pad($type, 8) . ' ' . str_pad($allowed_text, 10) . ' ' . str_pad($used_text, 10) . ' ' . $percent . '%'; - - if ($i == '0') { - $update = [ - 'rate_95th' => $rate_data['rate_95th'], - 'rate_95th_in' => $rate_data['rate_95th_in'], - 'rate_95th_out' => $rate_data['rate_95th_out'], - 'dir_95th' => $rate_data['dir_95th'], - 'total_data' => $rate_data['total_data'], - 'total_data_in' => $rate_data['total_data_in'], - 'total_data_out' => $rate_data['total_data_out'], - 'rate_average' => $rate_data['rate_average'], - 'rate_average_in' => $rate_data['rate_average_in'], - 'rate_average_out' => $rate_data['rate_average_out'], - 'bill_last_calc' => ['NOW()'], - ]; - - dbUpdate($update, 'bills', '`bill_id` = ?', [$bill['bill_id']]); - echo ' Updated! '; + // A closed period whose history was written after it ended will not change; skip it before touching bill_data + if ($dateto <= $date_updated) { + $i++; + continue; } - if (isset($check['bill_id']) && $check['bill_id'] == $bill['bill_id']) { - $update = [ - 'rate_95th' => $rate_data['rate_95th'], - 'rate_95th_in' => $rate_data['rate_95th_in'], - 'rate_95th_out' => $rate_data['rate_95th_out'], - 'dir_95th' => $rate_data['dir_95th'], - 'rate_average' => $rate_data['rate_average'], - 'rate_average_in' => $rate_data['rate_average_in'], - 'rate_average_out' => $rate_data['rate_average_out'], - 'traf_total' => $rate_data['total_data'], - 'traf_in' => $rate_data['total_data_in'], - 'traf_out' => $rate_data['total_data_out'], - 'bill_peak_out' => $period['peak_out'], - 'bill_peak_in' => $period['peak_in'], - 'bill_used' => $used, - 'bill_overuse' => $overuse, - 'bill_percent' => $percent, - 'updated' => ['NOW()'], - ]; - - dbUpdate($update, 'bill_history', '`bill_hist_id` = ?', [$check['bill_hist_id']]); - echo ' Updated history! '; - } else { - $update = [ - 'rate_95th' => $rate_data['rate_95th'], - 'rate_95th_in' => $rate_data['rate_95th_in'], - 'rate_95th_out' => $rate_data['rate_95th_out'], - 'dir_95th' => $rate_data['dir_95th'], - 'rate_average' => $rate_data['rate_average'], - 'rate_average_in' => $rate_data['rate_average_in'], - 'rate_average_out' => $rate_data['rate_average_out'], - 'traf_total' => $rate_data['total_data'], - 'traf_in' => $rate_data['total_data_in'], - 'traf_out' => $rate_data['total_data_out'], - 'bill_datefrom' => $datefrom, - 'bill_dateto' => $dateto, - 'bill_type' => $type, - 'bill_allowed' => $allowed, - 'bill_used' => $used, - 'bill_overuse' => $overuse, - 'bill_percent' => $percent, - 'bill_id' => $bill['bill_id'], - ]; - dbInsert($update, 'bill_history'); - echo ' Generated history! '; + $period = Billing::getPeriod($bill['bill_id'], $datefrom, $dateto); + + // Send the current dir_95th to the getRates function so it knows to aggregate or return the max in/out value and highest direction + $dir_95th = $bill['dir_95th']; + + if ($period['period'] > 0 && $dateto > $date_updated) { + $rate_data = Billing::getRates($bill['bill_id'], $datefrom, $dateto, $dir_95th); + $rate_95th = $rate_data['rate_95th']; + $dir_95th = $rate_data['dir_95th']; + $total_data = $rate_data['total_data']; + $rate_average = $rate_data['rate_average']; + + if ($bill['bill_type'] == 'cdr') { + $type = 'CDR'; + $allowed = $bill['bill_cdr']; + $used = $rate_data['rate_95th']; + $allowed_text = Number::formatSi($allowed, 2, 0, 'bps'); + $used_text = Number::formatSi($used, 2, 0, 'bps'); + $overuse = ($used - $allowed); + $overuse = (($overuse <= 0) ? '0' : $overuse); + $percent = Number::calculatePercent($rate_data['rate_95th'], $bill['bill_cdr']); + } elseif ($bill['bill_type'] == 'quota') { + $type = 'Quota'; + $allowed = $bill['bill_quota']; + $used = $rate_data['total_data']; + $allowed_text = Billing::formatBytes($allowed); + $used_text = Billing::formatBytes($used); + $overuse = ($used - $allowed); + $overuse = (($overuse <= 0) ? '0' : $overuse); + $percent = Number::calculatePercent($rate_data['total_data'], $bill['bill_quota']); + } + + echo \Carbon\Carbon::parse($datefrom)->toDateTimeString() . ' to ' . \Carbon\Carbon::parse($dateto)->toDateTimeString() . ' ' . str_pad($type, 8) . ' ' . str_pad($allowed_text, 10) . ' ' . str_pad($used_text, 10) . ' ' . $percent . '%'; + + if ($i == '0') { + $update = [ + 'rate_95th' => $rate_data['rate_95th'], + 'rate_95th_in' => $rate_data['rate_95th_in'], + 'rate_95th_out' => $rate_data['rate_95th_out'], + 'dir_95th' => $rate_data['dir_95th'], + 'total_data' => $rate_data['total_data'], + 'total_data_in' => $rate_data['total_data_in'], + 'total_data_out' => $rate_data['total_data_out'], + 'rate_average' => $rate_data['rate_average'], + 'rate_average_in' => $rate_data['rate_average_in'], + 'rate_average_out' => $rate_data['rate_average_out'], + 'bill_last_calc' => ['NOW()'], + ]; + + dbUpdate($update, 'bills', '`bill_id` = ?', [$bill['bill_id']]); + echo ' Updated! '; + } + + if (isset($check['bill_id']) && $check['bill_id'] == $bill['bill_id']) { + $update = [ + 'rate_95th' => $rate_data['rate_95th'], + 'rate_95th_in' => $rate_data['rate_95th_in'], + 'rate_95th_out' => $rate_data['rate_95th_out'], + 'dir_95th' => $rate_data['dir_95th'], + 'rate_average' => $rate_data['rate_average'], + 'rate_average_in' => $rate_data['rate_average_in'], + 'rate_average_out' => $rate_data['rate_average_out'], + 'traf_total' => $rate_data['total_data'], + 'traf_in' => $rate_data['total_data_in'], + 'traf_out' => $rate_data['total_data_out'], + 'bill_peak_out' => $period['peak_out'], + 'bill_peak_in' => $period['peak_in'], + 'bill_used' => $used, + 'bill_overuse' => $overuse, + 'bill_percent' => $percent, + 'updated' => ['NOW()'], + ]; + + dbUpdate($update, 'bill_history', '`bill_hist_id` = ?', [$check['bill_hist_id']]); + echo ' Updated history! '; + } else { + $update = [ + 'rate_95th' => $rate_data['rate_95th'], + 'rate_95th_in' => $rate_data['rate_95th_in'], + 'rate_95th_out' => $rate_data['rate_95th_out'], + 'dir_95th' => $rate_data['dir_95th'], + 'rate_average' => $rate_data['rate_average'], + 'rate_average_in' => $rate_data['rate_average_in'], + 'rate_average_out' => $rate_data['rate_average_out'], + 'traf_total' => $rate_data['total_data'], + 'traf_in' => $rate_data['total_data_in'], + 'traf_out' => $rate_data['total_data_out'], + 'bill_datefrom' => $datefrom, + 'bill_dateto' => $dateto, + 'bill_type' => $type, + 'bill_allowed' => $allowed, + 'bill_used' => $used, + 'bill_overuse' => $overuse, + 'bill_percent' => $percent, + 'bill_id' => $bill['bill_id'], + ]; + dbInsert($update, 'bill_history'); + echo ' Generated history! '; + } //end if + echo "\n\n"; } //end if - echo "\n\n"; - } //end if - $i++; - } //end while + $i++; + } //end while + } catch (QueryException $e) { + Log::error("Failed to calculate bill {$bill['bill_id']}: " . $e->getMessage()); + } }//end foreach diff --git a/bootstrap/app.php b/bootstrap/app.php index f4c007ba956..94cadc1bc20 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -3,6 +3,7 @@ use Illuminate\Foundation\Application; use Illuminate\Foundation\Configuration\Exceptions; use Illuminate\Foundation\Configuration\Middleware; +use Illuminate\Http\Request; return Application::configure(basePath: dirname(__DIR__)) ->registered(function ($app): void { @@ -60,10 +61,19 @@ ]); }) ->withExceptions(function (Exceptions $exceptions): void { + $exceptions->shouldRenderJsonWhen( + fn (Request $request) => $request->is('api/*') || $request->expectsJson(), + ); new \App\Exceptions\ErrorReporting($exceptions); $exceptions->map( \Binaryk\LaravelRestify\Exceptions\RepositoryNotFoundException::class, fn (\Binaryk\LaravelRestify\Exceptions\RepositoryNotFoundException $e) => new \Symfony\Component\HttpKernel\Exception\NotFoundHttpException($e->getMessage(), $e), ); - })->create(); + }) + ->booting(function (Application $app): void { + // Resolve the exception handler early so ErrorReporting installs its error handler + // after Laravel's HandleExceptions bootstrapper, otherwise warnings become exceptions in production + $app->make(\Illuminate\Contracts\Debug\ExceptionHandler::class); + }) + ->create(); diff --git a/bootstrap/providers.php b/bootstrap/providers.php index 05dd114eb4e..57a3abd02fa 100644 --- a/bootstrap/providers.php +++ b/bootstrap/providers.php @@ -9,4 +9,5 @@ App\Providers\SnmptrapProvider::class, App\Providers\PluginProvider::class, App\Providers\RestifyServiceProvider::class, + App\Providers\QueueServiceProvider::class, ]; diff --git a/composer.json b/composer.json index 26ded03ade2..bfac7d6fb90 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "homepage": "https://www.librenms.org/", "license": "GPL-3.0-or-later", "require": { - "php": "^8.2", + "php": "^8.4", "ext-curl": "*", "ext-gd": "*", "ext-json": "*", @@ -29,17 +29,17 @@ "ext-xml": "*", "ext-zlib": "*", "amenadiel/jpgraph": "^4", - "binaryk/laravel-restify": "^9.11", + "binaryk/laravel-restify": "^10.4", "clue/socket-raw": "^1.4", "dapphp/radius": "^3.0", "enshrined/svg-sanitize": "^1.0.0", - "fico7489/laravel-pivot": "^3.0", "influxdata/influxdb-client-php": "^3.8", "influxdb/influxdb-php": "^1.15", "jalle19/certificate-parser": "^4.0", "justinrainbow/json-schema": "^6.4", - "laravel-notification-channels/webpush": "^10.0", - "laravel/framework": "^12.10", + "laravel-notification-channels/webpush": "^10.5", + "laravel/framework": "^13.32", + "laravel/horizon": "^5.50", "laravel/sanctum": "^4.3.1", "laravel/tinker": "^3.0", "laravel/ui": "^4.6", @@ -47,19 +47,18 @@ "mews/purifier": "^3.4", "mikepultz/netdns2": "^1.5", "nesbot/carbon": "^3.8", - "nunomaduro/laravel-console-summary": "^1.13", + "nunomaduro/laravel-console-summary": "^1.14", "pear/console_color2": "^0.1", "php-amqplib/php-amqplib": "^3.1", "phpmailer/phpmailer": "^7.0", "predis/predis": "^3.0", - "socialiteproviders/manager": "^4.8", - "spatie/laravel-ignition": "^2.9", - "spatie/laravel-permission": "^6.16", - "symfony/yaml": "^7.2", + "socialiteproviders/manager": "^4.9", + "spatie/laravel-permission": "^7.3", + "symfony/yaml": "^7.4", "tightenco/ziggy": "^2.0" }, "require-dev": { - "barryvdh/laravel-ide-helper": "^3.5", + "barryvdh/laravel-ide-helper": "^3.7", "coding-socks/lost-in-translation": "^0.3.5", "composer/composer": "^2.8", "fakerphp/faker": "^1.23", @@ -75,14 +74,16 @@ "phpstan/phpstan-mockery": "^2.0", "phpstan/phpstan-phpunit": "^2.0", "phpunit/phpunit": "^11.5.33 || ^12.3.7", - "rector/rector": "^2.6" + "rector/rector": "^2.6", + "spatie/laravel-ignition": "^2.9" }, "suggest": { "ext-gmp": "Used for browser push notifications", "ext-ldap": "*", + "ext-pcntl": "Required to run the queue worker (lnms worker)", "ext-memcached": "Required if you utilize wrapper based distributed polling", "ext-mysqlnd": "*", - "ext-posix": "Allows for additional validation tests" + "ext-posix": "Required to run the queue worker (lnms worker)" }, "config": { "process-timeout": 900, @@ -163,6 +164,9 @@ "@test:unit", "@test:lint", "@test:types" + ], + "pre-package-uninstall": [ + "Illuminate\\Foundation\\ComposerScripts::prePackageUninstall" ] }, "support": { diff --git a/composer.lock b/composer.lock index 19e2d42bd76..787e6f86196 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0dffc143e5a5a50f30f4807d9a3ad6d9", + "content-hash": "f1e7f88b1c92547ca7d85330166b59bc", "packages": [ { "name": "acmephp/ssl", @@ -141,38 +141,44 @@ }, { "name": "binaryk/laravel-restify", - "version": "9.11.3", + "version": "10.5.6", "source": { "type": "git", "url": "https://github.com/BinarCode/laravel-restify.git", - "reference": "47c8863a21bb80c245ca362617dbbfee00f0e10e" + "reference": "6d81f32a9cea12984e0066841f59745e6fe8fa12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/BinarCode/laravel-restify/zipball/47c8863a21bb80c245ca362617dbbfee00f0e10e", - "reference": "47c8863a21bb80c245ca362617dbbfee00f0e10e", + "url": "https://api.github.com/repos/BinarCode/laravel-restify/zipball/6d81f32a9cea12984e0066841f59745e6fe8fa12", + "reference": "6d81f32a9cea12984e0066841f59745e6fe8fa12", "shasum": "" }, "require": { - "illuminate/contracts": "^11.0|^12.0", - "laravel/pint": "^1.0", - "php": "^8.2", + "illuminate/contracts": "^12.0|^13.0", + "laravel/framework": "^12.0|^13.0", + "laravel/mcp": "^0.4.1|^0.5|^0.6|^0.7|^0.8|^0.9|^1.0", + "php": "^8.3", "spatie/laravel-data": "^4.4", "spatie/laravel-package-tools": "^1.12", "spatie/once": "^3.0" }, "require-dev": { "brianium/paratest": "^7.0.6", - "doctrine/dbal": "^3.0|^4.0", + "larastan/larastan": "^3.12", + "laravel/pint": "^1.25.1", + "laravel/sanctum": "^4.0", "nunomaduro/collision": "^8.1", - "openai-php/laravel": "^0.8.1|^0.11", - "orchestra/testbench": "^9.0|^10.0", + "openai-php/laravel": "^0.8.1|^0.11|^0.19", + "orchestra/testbench": "^10.0|^11.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0|^2.0", "phpstan/phpstan-phpunit": "^1.0|^2.0", "phpunit/phpunit": "^10.0|^11.0|^12.0", - "spatie/laravel-ray": "^1.9", - "vimeo/psalm": "^6.0@dev" + "spatie/laravel-ray": "^1.9" + }, + "suggest": { + "nuwave/lighthouse": "For GraphQL schema generation and resolvers (^6.0)", + "pusher/pusher-php-server": "For real-time broadcasting features (^7.0)" }, "type": "library", "extra": { @@ -183,6 +189,9 @@ "providers": [ "Binaryk\\LaravelRestify\\LaravelRestifyServiceProvider" ] + }, + "branch-alias": { + "dev-feat/mcp-invocation-descriptor": "10.4.x-dev" } }, "autoload": { @@ -214,30 +223,30 @@ ], "support": { "issues": "https://github.com/BinarCode/laravel-restify/issues", - "source": "https://github.com/BinarCode/laravel-restify/tree/9.11.3" + "source": "https://github.com/BinarCode/laravel-restify/tree/10.5.6" }, - "time": "2025-08-22T09:55:48+00:00" + "time": "2026-11-02T18:22:24+00:00" }, { "name": "brick/math", - "version": "0.14.8", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/brick/math.git", - "reference": "63422359a44b7f06cae63c3b429b59e8efcc0629" + "reference": "2effe05d2177c451b86c6a073196a4034c02f211" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brick/math/zipball/63422359a44b7f06cae63c3b429b59e8efcc0629", - "reference": "63422359a44b7f06cae63c3b429b59e8efcc0629", + "url": "https://api.github.com/repos/brick/math/zipball/2effe05d2177c451b86c6a073196a4034c02f211", + "reference": "2effe05d2177c451b86c6a073196a4034c02f211", "shasum": "" }, "require": { "php": "^8.2" }, "require-dev": { - "php-coveralls/php-coveralls": "^2.2", - "phpstan/phpstan": "2.1.22", + "phpstan/phpstan": "2.2.13", + "phpstan/phpstan-phpunit": "2.0.18", "phpunit/phpunit": "^11.5" }, "type": "library", @@ -268,7 +277,7 @@ ], "support": { "issues": "https://github.com/brick/math/issues", - "source": "https://github.com/brick/math/tree/0.14.8" + "source": "https://github.com/brick/math/tree/1.0.0" }, "funding": [ { @@ -276,7 +285,7 @@ "type": "github" } ], - "time": "2026-02-10T14:33:43+00:00" + "time": "2026-09-12T10:28:18+00:00" }, { "name": "carbonphp/carbon-doctrine-types", @@ -633,20 +642,20 @@ }, { "name": "doctrine/deprecations", - "version": "1.1.6", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca" + "reference": "d2e16653a734c8784c1851ad68b02f997b53ca82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca", - "reference": "d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/d2e16653a734c8784c1851ad68b02f997b53ca82", + "reference": "d2e16653a734c8784c1851ad68b02f997b53ca82", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^7.4 || ^8.0" }, "conflict": { "phpunit/phpunit": "<=7.5 || >=14" @@ -675,29 +684,29 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.6" + "source": "https://github.com/doctrine/deprecations/tree/1.2.0" }, - "time": "2026-02-07T07:09:04+00:00" + "time": "2026-11-11T10:04:49+00:00" }, { "name": "doctrine/inflector", - "version": "2.1.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b" + "reference": "46351b6812b7b6d52b82c3efa5dfb786a198ec88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/6d6c96277ea252fc1304627204c3d5e6e15faa3b", - "reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/46351b6812b7b6d52b82c3efa5dfb786a198ec88", + "reference": "46351b6812b7b6d52b82c3efa5dfb786a198ec88", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^12.0 || ^13.0", + "doctrine/coding-standard": "^12.0 || ^14.0", "phpstan/phpstan": "^1.12 || ^2.0", "phpstan/phpstan-phpunit": "^1.4 || ^2.0", "phpstan/phpstan-strict-rules": "^1.6 || ^2.0", @@ -751,7 +760,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.1.0" + "source": "https://github.com/doctrine/inflector/tree/2.1.1" }, "funding": [ { @@ -767,7 +776,7 @@ "type": "tidelift" } ], - "time": "2025-08-10T19:31:58+00:00" + "time": "2026-10-26T08:14:14+00:00" }, { "name": "doctrine/lexer", @@ -846,16 +855,16 @@ }, { "name": "dragonmantank/cron-expression", - "version": "v3.6.0", + "version": "v3.6.1", "source": { "type": "git", "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "d61a8a9604ec1f8c3d150d09db6ce98b32675013" + "reference": "4189372ffeff09bf14f731f67a9de90c7b413ebe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/d61a8a9604ec1f8c3d150d09db6ce98b32675013", - "reference": "d61a8a9604ec1f8c3d150d09db6ce98b32675013", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/4189372ffeff09bf14f731f67a9de90c7b413ebe", + "reference": "4189372ffeff09bf14f731f67a9de90c7b413ebe", "shasum": "" }, "require": { @@ -866,8 +875,8 @@ }, "require-dev": { "phpstan/extension-installer": "^1.4.3", - "phpstan/phpstan": "^1.12.32|^2.1.31", - "phpunit/phpunit": "^8.5.48|^9.0" + "phpstan/phpstan": "^2.1.31", + "phpunit/phpunit": "^11.5.43 || ^12.4" }, "type": "library", "extra": { @@ -898,7 +907,7 @@ ], "support": { "issues": "https://github.com/dragonmantank/cron-expression/issues", - "source": "https://github.com/dragonmantank/cron-expression/tree/v3.6.0" + "source": "https://github.com/dragonmantank/cron-expression/tree/v3.6.1" }, "funding": [ { @@ -906,7 +915,7 @@ "type": "github" } ], - "time": "2025-10-31T18:51:33+00:00" + "time": "2026-10-19T17:53:57+00:00" }, { "name": "egulias/email-validator", @@ -977,16 +986,16 @@ }, { "name": "enshrined/svg-sanitize", - "version": "1.0.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/darylldoyle/svg-sanitizer.git", - "reference": "f3300fcd1bbf67d205b52217c75d0f7d6a8c47ff" + "reference": "1976ff93c8d8a234cdd3ff99626bd43ecf11bf49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/f3300fcd1bbf67d205b52217c75d0f7d6a8c47ff", - "reference": "f3300fcd1bbf67d205b52217c75d0f7d6a8c47ff", + "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/1976ff93c8d8a234cdd3ff99626bd43ecf11bf49", + "reference": "1976ff93c8d8a234cdd3ff99626bd43ecf11bf49", "shasum": "" }, "require": { @@ -1016,9 +1025,9 @@ "description": "An SVG sanitizer for PHP", "support": { "issues": "https://github.com/darylldoyle/svg-sanitizer/issues", - "source": "https://github.com/darylldoyle/svg-sanitizer/tree/1.0.0" + "source": "https://github.com/darylldoyle/svg-sanitizer/tree/1.1.1" }, - "time": "2026-09-01T09:35:47+00:00" + "time": "2026-10-20T09:45:10+00:00" }, { "name": "ezyang/htmlpurifier", @@ -1081,60 +1090,6 @@ }, "time": "2026-09-15T15:42:51+00:00" }, - { - "name": "fico7489/laravel-pivot", - "version": "3.0.13", - "source": { - "type": "git", - "url": "https://github.com/fico7489/laravel-pivot.git", - "reference": "d36bbebb108b7b6828251c4b001b255084061a2f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fico7489/laravel-pivot/zipball/d36bbebb108b7b6828251c4b001b255084061a2f", - "reference": "d36bbebb108b7b6828251c4b001b255084061a2f", - "shasum": "" - }, - "require": { - "illuminate/database": "5.5.*|6.*|7.*|8.*|9.*|10.*|11.*|12.*" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "*", - "orchestra/testbench": "*" - }, - "type": "library", - "autoload": { - "psr-4": { - "Fico7489\\Laravel\\Pivot\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Filip Horvat", - "email": "filip.horvat@am2studio.hr", - "homepage": "http://am2studio.hr", - "role": "Developer" - } - ], - "description": "This package introduces new eloquent events for sync(), attach(), detach() or updateExistingPivot() methods on BelongsToMany relation.", - "homepage": "https://github.com/fico7489/laravel-pivot", - "keywords": [ - "eloquent events", - "eloquent extra events", - "laravel BelongsToMany events", - "laravel pivot events", - "laravel sync events" - ], - "support": { - "issues": "https://github.com/fico7489/laravel-pivot/issues", - "source": "https://github.com/fico7489/laravel-pivot" - }, - "time": "2025-05-05T10:34:41+00:00" - }, { "name": "firebase/php-jwt", "version": "v7.2.1", @@ -1344,22 +1299,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.15.5", + "version": "7.16.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "ee80339fd9177ba44c49cdb653ff02a4d1106b9a" + "reference": "81755d989b3007ca7f88a069857553cd08e7dc2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ee80339fd9177ba44c49cdb653ff02a4d1106b9a", - "reference": "ee80339fd9177ba44c49cdb653ff02a4d1106b9a", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/81755d989b3007ca7f88a069857553cd08e7dc2e", + "reference": "81755d989b3007ca7f88a069857553cd08e7dc2e", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^2.5.3", - "guzzlehttp/psr7": "^2.13.1", + "guzzlehttp/promises": "^2.6", + "guzzlehttp/psr7": "^2.13.2", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.5 || ^3.0", @@ -1452,7 +1407,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.15.5" + "source": "https://github.com/guzzle/guzzle/tree/7.16.1" }, "funding": [ { @@ -1468,20 +1423,20 @@ "type": "tidelift" } ], - "time": "2026-08-24T09:21:06+00:00" + "time": "2026-10-25T21:35:21+00:00" }, { "name": "guzzlehttp/promises", - "version": "2.5.3", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "cde49999552d185d64715fe9c1f77a2aadd2f9f1" + "reference": "3d88c829bd5f13d13847b39067dbf09a60af2154" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/cde49999552d185d64715fe9c1f77a2aadd2f9f1", - "reference": "cde49999552d185d64715fe9c1f77a2aadd2f9f1", + "url": "https://api.github.com/repos/guzzle/promises/zipball/3d88c829bd5f13d13847b39067dbf09a60af2154", + "reference": "3d88c829bd5f13d13847b39067dbf09a60af2154", "shasum": "" }, "require": { @@ -1536,7 +1491,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.5.3" + "source": "https://github.com/guzzle/promises/tree/2.6.0" }, "funding": [ { @@ -1552,20 +1507,20 @@ "type": "tidelift" } ], - "time": "2026-08-24T09:11:28+00:00" + "time": "2026-10-18T12:46:59+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.13.1", + "version": "2.13.3", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "95e7828100de18b4e269fb1703be530082d5166d" + "reference": "6d3cd8285a97eaa352956a4ada92fa03ecce1c4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/95e7828100de18b4e269fb1703be530082d5166d", - "reference": "95e7828100de18b4e269fb1703be530082d5166d", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/6d3cd8285a97eaa352956a4ada92fa03ecce1c4e", + "reference": "6d3cd8285a97eaa352956a4ada92fa03ecce1c4e", "shasum": "" }, "require": { @@ -1655,7 +1610,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.13.1" + "source": "https://github.com/guzzle/psr7/tree/2.13.3" }, "funding": [ { @@ -1671,30 +1626,30 @@ "type": "tidelift" } ], - "time": "2026-08-24T09:13:11+00:00" + "time": "2026-11-12T15:57:42+00:00" }, { "name": "guzzlehttp/uri-template", - "version": "v1.0.11", + "version": "v2.0.1", "source": { "type": "git", "url": "https://github.com/guzzle/uri-template.git", - "reference": "d0058dccf4299d70c3d9da3378b8908b32780368" + "reference": "7a466ad606491eb6528c717482f7cca77f1851f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/uri-template/zipball/d0058dccf4299d70c3d9da3378b8908b32780368", - "reference": "d0058dccf4299d70c3d9da3378b8908b32780368", + "url": "https://api.github.com/repos/guzzle/uri-template/zipball/7a466ad606491eb6528c717482f7cca77f1851f3", + "reference": "7a466ad606491eb6528c717482f7cca77f1851f3", "shasum": "" }, "require": { - "php": "^7.2.5 || ^8.0", + "php": "^7.4 || ^8.0", "symfony/polyfill-php80": "^1.25" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.52 || ^9.6.34", - "uri-template/tests": "1.0.0" + "phpunit/phpunit": "^9.6.34", + "uri-template/tests": "1.0.2" }, "type": "library", "extra": { @@ -1741,7 +1696,7 @@ ], "support": { "issues": "https://github.com/guzzle/uri-template/issues", - "source": "https://github.com/guzzle/uri-template/tree/v1.0.11" + "source": "https://github.com/guzzle/uri-template/tree/v2.0.1" }, "funding": [ { @@ -1757,7 +1712,7 @@ "type": "tidelift" } ], - "time": "2026-08-24T09:15:32+00:00" + "time": "2026-08-24T17:13:02+00:00" }, { "name": "influxdata/influxdb-client-php", @@ -1938,16 +1893,16 @@ }, { "name": "justinrainbow/json-schema", - "version": "6.13.1", + "version": "6.14.0", "source": { "type": "git", "url": "https://github.com/jsonrainbow/json-schema.git", - "reference": "e54aacc4c0657b3a4af4f628428d2702146828c6" + "reference": "bae415e135dd68260c2d020ba392850231e9b1ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/e54aacc4c0657b3a4af4f628428d2702146828c6", - "reference": "e54aacc4c0657b3a4af4f628428d2702146828c6", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/bae415e135dd68260c2d020ba392850231e9b1ab", + "reference": "bae415e135dd68260c2d020ba392850231e9b1ab", "shasum": "" }, "require": { @@ -1997,9 +1952,9 @@ ], "support": { "issues": "https://github.com/jsonrainbow/json-schema/issues", - "source": "https://github.com/jsonrainbow/json-schema/tree/6.13.1" + "source": "https://github.com/jsonrainbow/json-schema/tree/6.14.0" }, - "time": "2026-09-30T07:42:28+00:00" + "time": "2026-10-24T08:53:34+00:00" }, { "name": "laravel-notification-channels/webpush", @@ -2069,24 +2024,24 @@ }, { "name": "laravel/framework", - "version": "v12.69.3", + "version": "v13.42.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "58ea544a2a80dc03c168e13a5dc9a1d176a88717" + "reference": "f5c01f6b63803f16f38ebb31622c4fea412bd022" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/58ea544a2a80dc03c168e13a5dc9a1d176a88717", - "reference": "58ea544a2a80dc03c168e13a5dc9a1d176a88717", + "url": "https://api.github.com/repos/laravel/framework/zipball/f5c01f6b63803f16f38ebb31622c4fea412bd022", + "reference": "f5c01f6b63803f16f38ebb31622c4fea412bd022", "shasum": "" }, "require": { - "brick/math": "^0.11|^0.12|^0.13|^0.14", + "brick/math": "^0.14.2 || ^0.15 || ^0.16 || ^0.17 || ^0.18 || ^0.19 || ^0.20 || ^1.0", "composer-runtime-api": "^2.2", "doctrine/inflector": "^2.0.5", "dragonmantank/cron-expression": "^3.4", - "egulias/email-validator": "^3.2.1|^4.0", + "egulias/email-validator": "^4.0", "ext-ctype": "*", "ext-filter": "*", "ext-hash": "*", @@ -2095,36 +2050,39 @@ "ext-session": "*", "ext-tokenizer": "*", "fruitcake/php-cors": "^1.3", - "guzzlehttp/guzzle": "^7.8.2", - "guzzlehttp/uri-template": "^1.0", - "laravel/prompts": "^0.3.0", - "laravel/serializable-closure": "^1.3|^2.0", + "guzzlehttp/guzzle": "^7.8.2 || ^8.0", + "guzzlehttp/promises": "^2.0.3 || ^3.0", + "guzzlehttp/psr7": "^2.9 || ^3.0", + "guzzlehttp/uri-template": "^1.0 || ^2.0", + "laravel/prompts": "^0.3.25", + "laravel/serializable-closure": "^2.0.10", "league/commonmark": "^2.8.1", "league/flysystem": "^3.25.1", "league/flysystem-local": "^3.25.1", - "league/uri": "^7.5.1", - "monolog/monolog": "^3.0", + "league/uri": "^7.6", + "monolog/monolog": "^3.10", "nesbot/carbon": "^3.8.4", "nunomaduro/termwind": "^2.0", - "php": "^8.2", - "psr/container": "^1.1.1|^2.0.1", - "psr/log": "^1.0|^2.0|^3.0", - "psr/simple-cache": "^1.0|^2.0|^3.0", + "php": "^8.3", + "psr/container": "^1.1.1 || ^2.0.1", + "psr/http-message": "^1.0 || ^2.0", + "psr/log": "^1.0 || ^2.0 || ^3.0", + "psr/simple-cache": "^1.0 || ^2.0 || ^3.0", "ramsey/uuid": "^4.7", - "symfony/console": "^7.2.0", - "symfony/error-handler": "^7.2.0", - "symfony/finder": "^7.2.0", - "symfony/http-foundation": "^7.2.0", - "symfony/http-kernel": "^7.2.0", - "symfony/mailer": "^7.2.0", - "symfony/mime": "^7.2.0", - "symfony/polyfill-php83": "^1.33", - "symfony/polyfill-php84": "^1.34", - "symfony/polyfill-php85": "^1.34", - "symfony/process": "^7.2.0", - "symfony/routing": "^7.2.0", - "symfony/uid": "^7.2.0", - "symfony/var-dumper": "^7.2.0", + "symfony/console": "^7.4.0 || ^8.0.0", + "symfony/error-handler": "^7.4.0 || ^8.0.0", + "symfony/finder": "^7.4.0 || ^8.0.0", + "symfony/http-foundation": "^7.4.0 || ^8.0.0", + "symfony/http-kernel": "^7.4.0 || ^8.0.0", + "symfony/mailer": "^7.4.0 || ^8.0.0", + "symfony/mime": "^7.4.0 || ^8.0.0", + "symfony/polyfill-php84": "^1.36", + "symfony/polyfill-php85": "^1.36", + "symfony/polyfill-php86": "^1.36", + "symfony/process": "^7.4.5 || ^8.0.5", + "symfony/routing": "^7.4.0 || ^8.0.0", + "symfony/uid": "^7.4.0 || ^8.0.0", + "symfony/var-dumper": "^7.4.0 || ^8.0.0", "tijsverkoyen/css-to-inline-styles": "^2.2.5", "vlucas/phpdotenv": "^5.6.1", "voku/portable-ascii": "^2.0.2" @@ -2133,9 +2091,9 @@ "tightenco/collect": "<5.5.33" }, "provide": { - "psr/container-implementation": "1.1|2.0", - "psr/log-implementation": "1.0|2.0|3.0", - "psr/simple-cache-implementation": "1.0|2.0|3.0" + "psr/container-implementation": "1.1 || 2.0", + "psr/log-implementation": "1.0 || 2.0 || 3.0", + "psr/simple-cache-implementation": "1.0 || 2.0 || 3.0" }, "replace": { "illuminate/auth": "self.version", @@ -2156,6 +2114,7 @@ "illuminate/filesystem": "self.version", "illuminate/hashing": "self.version", "illuminate/http": "self.version", + "illuminate/image": "self.version", "illuminate/json-schema": "self.version", "illuminate/log": "self.version", "illuminate/macroable": "self.version", @@ -2177,12 +2136,12 @@ "spatie/once": "*" }, "require-dev": { - "ably/ably-php": "^1.0", + "ably/pubsub-server": "^1.0|^2.0", "aws/aws-sdk-php": "^3.322.9", "ext-gmp": "*", "fakerphp/faker": "^1.24", - "guzzlehttp/promises": "^2.0.3", - "guzzlehttp/psr7": "^2.4", + "intervention/image": "^4.2", + "jasonmccreary/double": "^1.1", "laravel/pint": "^1.18", "league/flysystem-aws-s3-v3": "^3.25.1", "league/flysystem-ftp": "^3.25.1", @@ -2191,22 +2150,25 @@ "league/flysystem-sftp-v3": "^3.25.1", "mockery/mockery": "^1.6.10", "opis/json-schema": "^2.4.1", - "orchestra/testbench-core": "^10.9.0", - "pda/pheanstalk": "^5.0.6|^7.0.0", + "orchestra/testbench-core": "^11.6.0", + "pda/pheanstalk": "^7.0.0 || ^8.0.0", "php-http/discovery": "^1.15", - "phpstan/phpstan": "^2.1.41", - "phpunit/phpunit": "^10.5.35|^11.5.3|^12.0.1", - "predis/predis": "^2.3|^3.0", - "resend/resend-php": "^0.10.0|^1.0", - "symfony/cache": "^7.2.0", - "symfony/http-client": "^7.2.0", - "symfony/psr-http-message-bridge": "^7.2.0", - "symfony/translation": "^7.2.0" + "phpstan/phpstan": "2.3.5", + "phpunit/phpunit": "^11.5.50 || ^12.5.8 || ^13.0.3", + "predis/predis": "^2.3 || ^3.0", + "rector/rector": "2.6.3", + "resend/resend-php": "^1.0", + "symfony/cache": "^7.4.0 || ^8.0.0", + "symfony/http-client": "^7.4.0 || ^8.0.0", + "symfony/mercure": "^0.8.0", + "symfony/psr-http-message-bridge": "^7.4.0 || ^8.0.0", + "symfony/translation": "^7.4.0 || ^8.0.0", + "web-token/jwt-library": "^4.1" }, "suggest": { - "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).", + "ably/pubsub-server": "Required to use the Ably broadcast driver (^1.0|^2.0).", "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.322.9).", - "brianium/paratest": "Required to run tests in parallel (^7.0|^8.0).", + "brianium/paratest": "Required to run tests in parallel (^7.0 || ^8.0).", "ext-apcu": "Required to use the APC cache driver.", "ext-fileinfo": "Required to use the Filesystem class.", "ext-ftp": "Required to use the Flysystem FTP driver.", @@ -2215,9 +2177,10 @@ "ext-pcntl": "Required to use all features of the queue worker and console signal trapping.", "ext-pdo": "Required to use all database features.", "ext-posix": "Required to use all features of the queue worker.", - "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0|^6.0).", + "ext-redis": "Required to use the Redis cache and queue drivers (^4.0 || ^5.0 || ^6.0).", "fakerphp/faker": "Required to generate fake data using the fake() helper (^1.23).", "filp/whoops": "Required for friendly error pages in development (^2.14.3).", + "intervention/image": "Required to use the image processing features (^4.2).", "laravel/tinker": "Required to use the tinker console command (^2.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.25.1).", "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.25.1).", @@ -2225,24 +2188,26 @@ "league/flysystem-read-only": "Required to use read-only disks (^3.25.1)", "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.25.1).", "mockery/mockery": "Required to use mocking (^1.6).", - "pda/pheanstalk": "Required to use the beanstalk queue driver (^5.0).", + "pda/pheanstalk": "Required to use the beanstalk queue driver (^7.0 || ^8.0).", "php-http/discovery": "Required to use PSR-7 bridging features (^1.15).", - "phpunit/phpunit": "Required to use assertions and run tests (^10.5.35|^11.5.3|^12.0.1).", - "predis/predis": "Required to use the predis connector (^2.3|^3.0).", - "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", - "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).", - "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0|^1.0).", - "symfony/cache": "Required to PSR-6 cache bridge (^7.2).", - "symfony/filesystem": "Required to enable support for relative symbolic links (^7.2).", - "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.2).", - "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.2).", - "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.2).", - "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.2)." + "phpunit/phpunit": "Required to use assertions and run tests (^11.5.50 || ^12.5.8 || ^13.0.3).", + "predis/predis": "Required to use the predis connector (^2.3 || ^3.0).", + "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0 || ^7.0).", + "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0 || ^1.0).", + "spatie/fork": "Required to use the 'fork' concurrency driver (^1.2).", + "symfony/cache": "Required to PSR-6 cache bridge (^7.4 || ^8.0).", + "symfony/filesystem": "Required to enable support for relative symbolic links (^7.4 || ^8.0).", + "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.4 || ^8.0).", + "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.4 || ^8.0).", + "symfony/mercure": "Required to use the Mercure broadcast driver (^0.8).", + "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.4 || ^8.0).", + "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.4 || ^8.0).", + "web-token/jwt-library": "Required to sign Mercure JWTs and use end-to-end encrypted channels (^4.1)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "12.x-dev" + "dev-master": "13.0.x-dev" } }, "autoload": { @@ -2287,50 +2252,139 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2026-09-29T12:53:25+00:00" + "time": "2026-11-10T15:54:30+00:00" }, { - "name": "laravel/pint", - "version": "v1.30.4", + "name": "laravel/horizon", + "version": "v5.51.0", "source": { "type": "git", - "url": "https://github.com/laravel/pint.git", - "reference": "a96cb6eee2961905d2fce7207aefb80945bf6b28" + "url": "https://github.com/laravel/horizon.git", + "reference": "e168e56b97a4a4bb2b7481c1ad01b1be1e49963e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pint/zipball/a96cb6eee2961905d2fce7207aefb80945bf6b28", - "reference": "a96cb6eee2961905d2fce7207aefb80945bf6b28", + "url": "https://api.github.com/repos/laravel/horizon/zipball/e168e56b97a4a4bb2b7481c1ad01b1be1e49963e", + "reference": "e168e56b97a4a4bb2b7481c1ad01b1be1e49963e", "shasum": "" }, "require": { "ext-json": "*", - "ext-mbstring": "*", - "ext-tokenizer": "*", - "ext-xml": "*", - "php": "^8.2.0" + "ext-pcntl": "*", + "ext-posix": "*", + "illuminate/contracts": "^9.21|^10.0|^11.0|^12.0|^13.0", + "illuminate/queue": "^9.21|^10.0|^11.0|^12.0|^13.0", + "illuminate/support": "^9.21|^10.0|^11.0|^12.0|^13.0", + "laravel/sentinel": "^1.0", + "nesbot/carbon": "^2.17|^3.0", + "php": "^8.0", + "ramsey/uuid": "^4.0", + "symfony/console": "^6.0|^7.0|^8.0", + "symfony/error-handler": "^6.0|^7.0|^8.0", + "symfony/polyfill-php83": "^1.28", + "symfony/process": "^6.0|^7.0|^8.0" }, "require-dev": { - "composer/semver": "^3.4.4", - "friendsofphp/php-cs-fixer": "^3.95.18", - "illuminate/view": "^12.65.0", - "larastan/larastan": "^3.10.0", - "laravel-zero/framework": "^12.1.0", - "laravel/agent-detector": "^2.0.2", - "laravel/prompts": "^0.3.22", - "mockery/mockery": "^1.6.12", - "nunomaduro/termwind": "^2.4.0", - "pestphp/pest": "^3.8.7" + "mockery/mockery": "^1.0", + "orchestra/testbench": "^7.56|^8.37|^9.16|^10.9|^11.0", + "phpstan/phpstan": "^1.10|^2.0", + "predis/predis": "^1.1|^2.0|^3.0" }, - "bin": [ - "builds/pint" + "suggest": { + "ext-redis": "Required to use the Redis PHP driver.", + "predis/predis": "Required when not using the Redis PHP driver (^1.1|^2.0|^3.0)." + }, + "type": "library", + "extra": { + "laravel": { + "aliases": { + "Horizon": "Laravel\\Horizon\\Horizon" + }, + "providers": [ + "Laravel\\Horizon\\HorizonServiceProvider" + ] + }, + "branch-alias": { + "dev-master": "6.x-dev" + } + }, + "autoload": { + "psr-4": { + "Laravel\\Horizon\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" ], - "type": "project", + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "Dashboard and code-driven configuration for Laravel queues.", + "keywords": [ + "laravel", + "queue" + ], + "support": { + "issues": "https://github.com/laravel/horizon/issues", + "source": "https://github.com/laravel/horizon/tree/v5.51.0" + }, + "time": "2026-11-02T15:26:17+00:00" + }, + { + "name": "laravel/mcp", + "version": "v1.2.0", + "source": { + "type": "git", + "url": "https://github.com/laravel/mcp.git", + "reference": "4df5077a6002e629bb587560b9b48e1ccaea6478" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/mcp/zipball/4df5077a6002e629bb587560b9b48e1ccaea6478", + "reference": "4df5077a6002e629bb587560b9b48e1ccaea6478", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-mbstring": "*", + "illuminate/console": "^12.41.1|^13.0", + "illuminate/container": "^12.41.1|^13.0", + "illuminate/contracts": "^12.41.1|^13.0", + "illuminate/http": "^12.41.1|^13.0", + "illuminate/json-schema": "^12.41.1|^13.0", + "illuminate/routing": "^12.41.1|^13.0", + "illuminate/support": "^12.41.1|^13.0", + "illuminate/validation": "^12.41.1|^13.0", + "php": "^8.2", + "symfony/process": "^7.4.5|^8.0.5" + }, + "require-dev": { + "jasonmccreary/double": "^1.0", + "laravel/pint": "^1.20", + "orchestra/testbench": "^10.8|^11.0", + "pestphp/pest": "^3.8.5|^4.3.2", + "phpstan/phpstan": "^2.1.27", + "rector/rector": "^2.2.4" + }, + "type": "library", + "extra": { + "laravel": { + "aliases": { + "Mcp": "Laravel\\Mcp\\Facades\\Mcp" + }, + "providers": [ + "Laravel\\Mcp\\Server\\McpServiceProvider" + ] + } + }, "autoload": { "psr-4": { - "App\\": "app/", - "Database\\Seeders\\": "database/seeders/", - "Database\\Factories\\": "database/factories/" + "Laravel\\Mcp\\": "src/", + "Laravel\\Mcp\\Server\\": "src/Server/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2339,38 +2393,34 @@ ], "authors": [ { - "name": "Nuno Maduro", - "email": "enunomaduro@gmail.com" + "name": "Taylor Otwell", + "email": "taylor@laravel.com" } ], - "description": "An opinionated code formatter for PHP.", - "homepage": "https://laravel.com", + "description": "Rapidly build MCP servers for your Laravel applications.", + "homepage": "https://github.com/laravel/mcp", "keywords": [ - "dev", - "format", - "formatter", - "lint", - "linter", - "php" + "laravel", + "mcp" ], "support": { - "issues": "https://github.com/laravel/pint/issues", - "source": "https://github.com/laravel/pint" + "issues": "https://github.com/laravel/mcp/issues", + "source": "https://github.com/laravel/mcp" }, - "time": "2026-08-05T16:47:22+00:00" + "time": "2026-11-10T19:22:22+00:00" }, { "name": "laravel/prompts", - "version": "v0.3.24", + "version": "v0.3.27", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "5d3cdef29e93ca3b62b1871359db3078cd99908b" + "reference": "abdfc75a1ae6c6f21522daed50da7124cbff09d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/5d3cdef29e93ca3b62b1871359db3078cd99908b", - "reference": "5d3cdef29e93ca3b62b1871359db3078cd99908b", + "url": "https://api.github.com/repos/laravel/prompts/zipball/abdfc75a1ae6c6f21522daed50da7124cbff09d2", + "reference": "abdfc75a1ae6c6f21522daed50da7124cbff09d2", "shasum": "" }, "require": { @@ -2413,23 +2463,22 @@ ], "description": "Add beautiful and user-friendly forms to your command-line applications.", "support": { - "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.3.24" + "source": "https://github.com/laravel/prompts/tree/v0.3.27" }, - "time": "2026-08-20T12:55:36+00:00" + "time": "2026-11-09T16:07:10+00:00" }, { "name": "laravel/sanctum", - "version": "v4.3.3", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/laravel/sanctum.git", - "reference": "fee27a573d1a013af3721d86153a65e0b11927e6" + "reference": "a28ea5d4c2b123420562d6a3a233414f84b70774" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sanctum/zipball/fee27a573d1a013af3721d86153a65e0b11927e6", - "reference": "fee27a573d1a013af3721d86153a65e0b11927e6", + "url": "https://api.github.com/repos/laravel/sanctum/zipball/a28ea5d4c2b123420562d6a3a233414f84b70774", + "reference": "a28ea5d4c2b123420562d6a3a233414f84b70774", "shasum": "" }, "require": { @@ -2442,6 +2491,7 @@ "symfony/console": "^7.0|^8.0" }, "require-dev": { + "jasonmccreary/double": "^1.0", "mockery/mockery": "^1.6", "orchestra/testbench": "^9.15|^10.8|^11.0", "phpstan/phpstan": "^1.10" @@ -2479,20 +2529,76 @@ "issues": "https://github.com/laravel/sanctum/issues", "source": "https://github.com/laravel/sanctum" }, - "time": "2026-06-23T18:26:55+00:00" + "time": "2026-11-02T15:42:32+00:00" + }, + { + "name": "laravel/sentinel", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/laravel/sentinel.git", + "reference": "972d9885d9d14312a118e9565c4e6ecc5e751ea1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/sentinel/zipball/972d9885d9d14312a118e9565c4e6ecc5e751ea1", + "reference": "972d9885d9d14312a118e9565c4e6ecc5e751ea1", + "shasum": "" + }, + "require": { + "ext-json": "*", + "illuminate/container": "^8.37|^9.0|^10.0|^11.0|^12.0|^13.0", + "php": "^8.0" + }, + "require-dev": { + "laravel/pint": "^1.27", + "orchestra/testbench": "^6.47.1|^7.56|^8.37|^9.16|^10.9|^11.0", + "phpstan/phpstan": "^2.1.33" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Laravel\\Sentinel\\SentinelServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Laravel\\Sentinel\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + }, + { + "name": "Mior Muhammad Zaki", + "email": "mior@laravel.com" + } + ], + "support": { + "source": "https://github.com/laravel/sentinel/tree/v1.1.0" + }, + "time": "2026-03-24T14:03:38+00:00" }, { "name": "laravel/serializable-closure", - "version": "v2.1.0", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "2d5869a838bbcf37e0d8b0568fc41914e81374b5" + "reference": "2bfb44e8af009b553ed2c060c94b0bc3c67b4769" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/2d5869a838bbcf37e0d8b0568fc41914e81374b5", - "reference": "2d5869a838bbcf37e0d8b0568fc41914e81374b5", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/2bfb44e8af009b553ed2c060c94b0bc3c67b4769", + "reference": "2bfb44e8af009b553ed2c060c94b0bc3c67b4769", "shasum": "" }, "require": { @@ -2540,38 +2646,38 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2026-09-22T14:32:34+00:00" + "time": "2026-10-14T21:20:29+00:00" }, { "name": "laravel/socialite", - "version": "v5.31.0", + "version": "v5.32.0", "source": { "type": "git", "url": "https://github.com/laravel/socialite.git", - "reference": "f721b2cbec327ab820bd6aabea6ab211cfcc9f08" + "reference": "d766b8b85c4fd77eb1643455e12a80a2fb9b28b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/socialite/zipball/f721b2cbec327ab820bd6aabea6ab211cfcc9f08", - "reference": "f721b2cbec327ab820bd6aabea6ab211cfcc9f08", + "url": "https://api.github.com/repos/laravel/socialite/zipball/d766b8b85c4fd77eb1643455e12a80a2fb9b28b7", + "reference": "d766b8b85c4fd77eb1643455e12a80a2fb9b28b7", "shasum": "" }, "require": { "ext-json": "*", "firebase/php-jwt": "^6.4|^7.0", - "guzzlehttp/guzzle": "^6.0|^7.0|^8.0", - "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0|^13.0", - "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0|^13.0", - "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0|^13.0", + "guzzlehttp/guzzle": "^7.15.2|^8.0.1", + "illuminate/contracts": "^12.0|^13.0", + "illuminate/http": "^12.0|^13.0", + "illuminate/support": "^12.0|^13.0", "league/oauth1-client": "^1.11", - "php": "^8.1", + "php": "^8.2", "phpseclib/phpseclib": "^4.0" }, "require-dev": { "mockery/mockery": "^1.0", - "orchestra/testbench": "^4.18|^5.20|^6.47|^7.55|^8.36|^9.15|^10.8|^11.0", + "orchestra/testbench": "^10.8|^11.0", "phpstan/phpstan": "^1.12.23", - "phpunit/phpunit": "^8.0|^9.3|^10.4|^11.5|^12.0" + "phpunit/phpunit": "^11.5|^12.0" }, "type": "library", "extra": { @@ -2612,20 +2718,20 @@ "issues": "https://github.com/laravel/socialite/issues", "source": "https://github.com/laravel/socialite" }, - "time": "2026-08-31T13:49:19+00:00" + "time": "2026-11-10T15:21:02+00:00" }, { "name": "laravel/tinker", - "version": "v3.0.2", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "4faba77764bd33411735936acdf30446d058c78b" + "reference": "5fab2518167975b302e10d1fdf9a8c8113849201" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/4faba77764bd33411735936acdf30446d058c78b", - "reference": "4faba77764bd33411735936acdf30446d058c78b", + "url": "https://api.github.com/repos/laravel/tinker/zipball/5fab2518167975b302e10d1fdf9a8c8113849201", + "reference": "5fab2518167975b302e10d1fdf9a8c8113849201", "shasum": "" }, "require": { @@ -2633,13 +2739,12 @@ "illuminate/contracts": "^8.0|^9.0|^10.0|^11.0|^12.0|^13.0", "illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0|^13.0", "php": "^8.1", - "psy/psysh": "^0.12.0", + "psy/psysh": "^0.12.19", "symfony/var-dumper": "^5.4|^6.0|^7.0|^8.0" }, "require-dev": { - "mockery/mockery": "~1.3.3|^1.4.2", "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^10.5|^11.5" + "phpunit/phpunit": "^10.5|^11.5|^12.5|^13.4" }, "suggest": { "illuminate/database": "The Illuminate Database package (^8.0|^9.0|^10.0|^11.0|^12.0|^13.0)." @@ -2679,9 +2784,9 @@ ], "support": { "issues": "https://github.com/laravel/tinker/issues", - "source": "https://github.com/laravel/tinker/tree/v3.0.2" + "source": "https://github.com/laravel/tinker/tree/v3.1.0" }, - "time": "2026-03-17T14:54:13+00:00" + "time": "2026-10-16T11:13:33+00:00" }, { "name": "laravel/ui", @@ -2748,16 +2853,16 @@ }, { "name": "league/commonmark", - "version": "2.10.3", + "version": "2.10.7", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "6efbd9c472b91db0a3350fcd601c8332c2382e1f" + "reference": "8eb53e906fd60c67038d22f1f1cab420ed58b8be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/6efbd9c472b91db0a3350fcd601c8332c2382e1f", - "reference": "6efbd9c472b91db0a3350fcd601c8332c2382e1f", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/8eb53e906fd60c67038d22f1f1cab420ed58b8be", + "reference": "8eb53e906fd60c67038d22f1f1cab420ed58b8be", "shasum": "" }, "require": { @@ -2851,7 +2956,7 @@ "type": "tidelift" } ], - "time": "2026-09-21T13:07:34+00:00" + "time": "2026-10-31T13:35:37+00:00" }, { "name": "league/config", @@ -3201,20 +3306,21 @@ }, { "name": "league/uri", - "version": "7.8.1", + "version": "7.10.0", "source": { "type": "git", "url": "https://github.com/thephpleague/uri.git", - "reference": "08cf38e3924d4f56238125547b5720496fac8fd4" + "reference": "be89e2382e37acdef232259071ade5180821397b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri/zipball/08cf38e3924d4f56238125547b5720496fac8fd4", - "reference": "08cf38e3924d4f56238125547b5720496fac8fd4", + "url": "https://api.github.com/repos/thephpleague/uri/zipball/be89e2382e37acdef232259071ade5180821397b", + "reference": "be89e2382e37acdef232259071ade5180821397b", "shasum": "" }, "require": { - "league/uri-interfaces": "^7.8.1", + "ext-mbstring": "*", + "league/uri-interfaces": "^7.10.0", "php": "^8.1", "psr/http-factory": "^1" }, @@ -3287,7 +3393,7 @@ "docs": "https://uri.thephpleague.com", "forum": "https://thephpleague.slack.com", "issues": "https://github.com/thephpleague/uri-src/issues", - "source": "https://github.com/thephpleague/uri/tree/7.8.1" + "source": "https://github.com/thephpleague/uri/tree/7.10.0" }, "funding": [ { @@ -3295,20 +3401,20 @@ "type": "github" } ], - "time": "2026-03-15T20:22:25+00:00" + "time": "2026-11-04T12:45:07+00:00" }, { "name": "league/uri-interfaces", - "version": "7.8.1", + "version": "7.10.0", "source": { "type": "git", "url": "https://github.com/thephpleague/uri-interfaces.git", - "reference": "85d5c77c5d6d3af6c54db4a78246364908f3c928" + "reference": "ea66240cff4ae9a56ce85d577a04d038b771e51c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/85d5c77c5d6d3af6c54db4a78246364908f3c928", - "reference": "85d5c77c5d6d3af6c54db4a78246364908f3c928", + "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/ea66240cff4ae9a56ce85d577a04d038b771e51c", + "reference": "ea66240cff4ae9a56ce85d577a04d038b771e51c", "shasum": "" }, "require": { @@ -3371,7 +3477,7 @@ "docs": "https://uri.thephpleague.com", "forum": "https://thephpleague.slack.com", "issues": "https://github.com/thephpleague/uri-src/issues", - "source": "https://github.com/thephpleague/uri-interfaces/tree/7.8.1" + "source": "https://github.com/thephpleague/uri-interfaces/tree/7.10.0" }, "funding": [ { @@ -3379,7 +3485,7 @@ "type": "github" } ], - "time": "2026-03-08T20:05:35+00:00" + "time": "2026-11-04T12:45:07+00:00" }, { "name": "librenms/plugin-interfaces", @@ -3802,16 +3908,16 @@ }, { "name": "nesbot/carbon", - "version": "3.14.1", + "version": "3.15.1", "source": { "type": "git", "url": "https://github.com/CarbonPHP/carbon.git", - "reference": "34e9109535165bf1d7ff17a610492372ae73a896" + "reference": "ce0e5636fae7d1e99856eb70cae4c719a284aa08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/34e9109535165bf1d7ff17a610492372ae73a896", - "reference": "34e9109535165bf1d7ff17a610492372ae73a896", + "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ce0e5636fae7d1e99856eb70cae4c719a284aa08", + "reference": "ce0e5636fae7d1e99856eb70cae4c719a284aa08", "shasum": "" }, "require": { @@ -3821,6 +3927,7 @@ "psr/clock": "^1.0", "symfony/clock": "^6.3.12 || ^7.0 || ^8.0", "symfony/polyfill-mbstring": "^1.0", + "symfony/polyfill-time": "^1.0", "symfony/translation": "^4.4.18 || ^5.2.1 || ^6.0 || ^7.0 || ^8.0" }, "provide": { @@ -3831,7 +3938,7 @@ "doctrine/orm": "^2.15.2 || ^3.0", "friendsofphp/php-cs-fixer": "^v3.87.1", "kylekatarnls/multi-tester": "^2.5.3", - "phpmd/phpmd": "^2.15.0", + "phpmd/phpmd": "^3.0@dev", "phpstan/extension-installer": "^1.4.3", "phpstan/phpstan": "^2.1.22", "phpunit/phpunit": "^10.5.53", @@ -3903,37 +4010,37 @@ "type": "tidelift" } ], - "time": "2026-09-27T12:07:26+00:00" + "time": "2026-10-25T14:32:48+00:00" }, { "name": "nette/schema", - "version": "v1.3.6", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "c54350438cd6914616f790a49cb424605f421562" + "reference": "af9fa8a86bfca9b02b10346220db26e62ef942ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/c54350438cd6914616f790a49cb424605f421562", - "reference": "c54350438cd6914616f790a49cb424605f421562", + "url": "https://api.github.com/repos/nette/schema/zipball/af9fa8a86bfca9b02b10346220db26e62ef942ec", + "reference": "af9fa8a86bfca9b02b10346220db26e62ef942ec", "shasum": "" }, "require": { "nette/utils": "^4.0", - "php": "8.1 - 8.5" + "php": "8.1 - 8.6" }, "require-dev": { - "nette/phpstan-rules": "^1.0", + "nette/phpstan-rules": "^1.0.7", "nette/tester": "^2.6", "phpstan/extension-installer": "^1.4@stable", - "phpstan/phpstan": "^2.1.39@stable", + "phpstan/phpstan": "^2.3@stable", "tracy/tracy": "^2.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -3954,40 +4061,40 @@ { "name": "David Grudl", "homepage": "https://davidgrudl.com" - }, - { - "name": "Nette Community", - "homepage": "https://nette.org/contributors" } ], - "description": "📐 Nette Schema: validating data structures against a given Schema.", - "homepage": "https://nette.org", + "description": "📐 Nette Schema: validates and normalizes data such as configuration or API input against a schema described in a few readable lines of PHP, with precise error messages.", + "homepage": "https://doc.nette.org/schema", "keywords": [ - "config", - "nette" + "configuration", + "data validation", + "nette", + "normalization", + "schema", + "validation" ], "support": { "issues": "https://github.com/nette/schema/issues", - "source": "https://github.com/nette/schema/tree/v1.3.6" + "source": "https://github.com/nette/schema/tree/v1.4.0" }, - "time": "2026-08-16T21:58:41+00:00" + "time": "2026-10-22T02:12:50+00:00" }, { "name": "nette/utils", - "version": "v4.1.5", + "version": "v4.1.6", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "b043439dbdf954e6c28b5ea7e34b0100f83165e0" + "reference": "6bf24518accf32cf845bca305e0b92078700fd01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/b043439dbdf954e6c28b5ea7e34b0100f83165e0", - "reference": "b043439dbdf954e6c28b5ea7e34b0100f83165e0", + "url": "https://api.github.com/repos/nette/utils/zipball/6bf24518accf32cf845bca305e0b92078700fd01", + "reference": "6bf24518accf32cf845bca305e0b92078700fd01", "shasum": "" }, "require": { - "php": "8.2 - 8.5" + "php": "8.2 - 8.6" }, "conflict": { "nette/finder": "<3", @@ -4059,9 +4166,9 @@ ], "support": { "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v4.1.5" + "source": "https://github.com/nette/utils/tree/v4.1.6" }, - "time": "2026-07-17T23:02:45+00:00" + "time": "2026-10-20T17:07:56+00:00" }, { "name": "nikic/php-parser", @@ -4184,31 +4291,31 @@ }, { "name": "nunomaduro/termwind", - "version": "v2.4.0", + "version": "v2.4.1", "source": { "type": "git", "url": "https://github.com/nunomaduro/termwind.git", - "reference": "712a31b768f5daea284c2169a7d227031001b9a8" + "reference": "9b85ae4d802403bfc004ea633ce542bc262ee5c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/712a31b768f5daea284c2169a7d227031001b9a8", - "reference": "712a31b768f5daea284c2169a7d227031001b9a8", + "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/9b85ae4d802403bfc004ea633ce542bc262ee5c3", + "reference": "9b85ae4d802403bfc004ea633ce542bc262ee5c3", "shasum": "" }, "require": { "ext-mbstring": "*", "php": "^8.2", - "symfony/console": "^7.4.4 || ^8.0.4" + "symfony/console": "^7.4.23 || ^8.1.11" }, "require-dev": { - "illuminate/console": "^11.47.0", - "laravel/pint": "^1.27.1", - "mockery/mockery": "^1.6.12", - "pestphp/pest": "^2.36.0 || ^3.8.4 || ^4.3.2", - "phpstan/phpstan": "^1.12.32", + "illuminate/console": "^11.51 || ^12.70 || ^13.40", + "laravel/pint": "^1.30.4", + "mockery/mockery": "^1.6.15", + "pestphp/pest": "^2.36.1 || ^3.8.7 || ^4.7.8 || ^5.3.5", + "phpstan/phpstan": "^1.12.34", "phpstan/phpstan-strict-rules": "^1.6.2", - "symfony/var-dumper": "^7.3.5 || ^8.0.4", + "symfony/var-dumper": "^7.4.22 || ^8.1.10", "thecodingmachine/phpstan-strict-rules": "^1.0.0" }, "type": "library", @@ -4251,7 +4358,7 @@ ], "support": { "issues": "https://github.com/nunomaduro/termwind/issues", - "source": "https://github.com/nunomaduro/termwind/tree/v2.4.0" + "source": "https://github.com/nunomaduro/termwind/tree/v2.4.1" }, "funding": [ { @@ -4267,20 +4374,20 @@ "type": "github" } ], - "time": "2026-02-16T23:10:27+00:00" + "time": "2026-11-07T03:57:16+00:00" }, { "name": "paragonie/constant_time_encoding", - "version": "v3.1.3", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/paragonie/constant_time_encoding.git", - "reference": "d5b01a39b3415c2cd581d3bd3a3575c1ebbd8e77" + "reference": "5efef6e6cb43e088ccab7d0c1e2f2ab25b9e8b54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/d5b01a39b3415c2cd581d3bd3a3575c1ebbd8e77", - "reference": "d5b01a39b3415c2cd581d3bd3a3575c1ebbd8e77", + "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/5efef6e6cb43e088ccab7d0c1e2f2ab25b9e8b54", + "reference": "5efef6e6cb43e088ccab7d0c1e2f2ab25b9e8b54", "shasum": "" }, "require": { @@ -4336,7 +4443,7 @@ "issues": "https://github.com/paragonie/constant_time_encoding/issues", "source": "https://github.com/paragonie/constant_time_encoding" }, - "time": "2025-09-24T15:06:41+00:00" + "time": "2026-11-06T20:31:19+00:00" }, { "name": "pear/console_color2", @@ -4978,16 +5085,16 @@ }, { "name": "phpmailer/phpmailer", - "version": "v7.1.1", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "1bc1716a507a65e039d4ac9d9adebbbd0d346e15" + "reference": "f5eb50148734d03bbbb81825c722c1889636d51a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1bc1716a507a65e039d4ac9d9adebbbd0d346e15", - "reference": "1bc1716a507a65e039d4ac9d9adebbbd0d346e15", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/f5eb50148734d03bbbb81825c722c1889636d51a", + "reference": "f5eb50148734d03bbbb81825c722c1889636d51a", "shasum": "" }, "require": { @@ -5002,7 +5109,7 @@ "php-parallel-lint/php-console-highlighter": "^1.0.0", "php-parallel-lint/php-parallel-lint": "^1.3.2", "phpcompatibility/php-compatibility": "^10.0.0@dev", - "squizlabs/php_codesniffer": "^3.13.5", + "squizlabs/php_codesniffer": "^3.13.6 || ^4.0.2", "yoast/phpunit-polyfills": "^1.0.4" }, "suggest": { @@ -5048,7 +5155,7 @@ "description": "PHPMailer is a full-featured email creation and transfer class for PHP", "support": { "issues": "https://github.com/PHPMailer/PHPMailer/issues", - "source": "https://github.com/PHPMailer/PHPMailer/tree/v7.1.1" + "source": "https://github.com/PHPMailer/PHPMailer/tree/v7.2.0" }, "funding": [ { @@ -5056,7 +5163,7 @@ "type": "github" } ], - "time": "2026-05-18T08:06:14+00:00" + "time": "2026-11-07T15:15:17+00:00" }, { "name": "phpoption/phpoption", @@ -5135,16 +5242,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "4.0.1", + "version": "4.0.3", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "bb7b959c8159957edae6f5084ebbac765d310e16" + "reference": "6077cecfed9e371993d3aa339b0afeb23f7bf636" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/bb7b959c8159957edae6f5084ebbac765d310e16", - "reference": "bb7b959c8159957edae6f5084ebbac765d310e16", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/6077cecfed9e371993d3aa339b0afeb23f7bf636", + "reference": "6077cecfed9e371993d3aa339b0afeb23f7bf636", "shasum": "" }, "require": { @@ -5168,9 +5275,6 @@ }, "type": "library", "autoload": { - "files": [ - "phpseclib/bootstrap.php" - ], "psr-4": { "phpseclib4\\": "phpseclib/" } @@ -5207,8 +5311,7 @@ }, { "name": "Jack Worman", - "email": "jack.worman@gmail.com", - "homepage": "https://jackworman.com", + "email": "jack.worman@proton.me", "role": "Developer" } ], @@ -5235,7 +5338,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/4.0.1" + "source": "https://github.com/phpseclib/phpseclib/tree/4.0.3" }, "funding": [ { @@ -5251,20 +5354,20 @@ "type": "tidelift" } ], - "time": "2026-08-26T12:15:13+00:00" + "time": "2026-11-02T10:46:03+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "2.3.6", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "1427af4647235b4a73b13940b1f1258d3584f36e" + "reference": "af8e840551031d254cfdb3a18a62c3470a309c10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/1427af4647235b4a73b13940b1f1258d3584f36e", - "reference": "1427af4647235b4a73b13940b1f1258d3584f36e", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/af8e840551031d254cfdb3a18a62c3470a309c10", + "reference": "af8e840551031d254cfdb3a18a62c3470a309c10", "shasum": "" }, "require": { @@ -5296,22 +5399,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.6" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.4.1" }, - "time": "2026-09-27T20:07:45+00:00" + "time": "2026-10-30T19:36:28+00:00" }, { "name": "predis/predis", - "version": "v3.6.1", + "version": "v3.7.1", "source": { "type": "git", "url": "https://github.com/predis/predis.git", - "reference": "e2db96312ecf57a01a3477bf192d1ebc0ad7e9fb" + "reference": "2496e6d91ba4e137b47a6b802dc7e088ebf31df4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/predis/predis/zipball/e2db96312ecf57a01a3477bf192d1ebc0ad7e9fb", - "reference": "e2db96312ecf57a01a3477bf192d1ebc0ad7e9fb", + "url": "https://api.github.com/repos/predis/predis/zipball/2496e6d91ba4e137b47a6b802dc7e088ebf31df4", + "reference": "2496e6d91ba4e137b47a6b802dc7e088ebf31df4", "shasum": "" }, "require": { @@ -5353,7 +5456,7 @@ ], "support": { "issues": "https://github.com/predis/predis/issues", - "source": "https://github.com/predis/predis/tree/v3.6.1" + "source": "https://github.com/predis/predis/tree/v3.7.1" }, "funding": [ { @@ -5361,7 +5464,7 @@ "type": "github" } ], - "time": "2026-09-17T20:41:00+00:00" + "time": "2026-11-03T17:55:20+00:00" }, { "name": "psr/clock", @@ -6054,26 +6157,26 @@ }, { "name": "socialiteproviders/manager", - "version": "4.9.2", + "version": "4.10.0", "source": { "type": "git", "url": "https://github.com/SocialiteProviders/Manager.git", - "reference": "35372dc62787e61e91cfec73f45fd5d5ae0f8891" + "reference": "65ad770276875682e246e5435566146bf0baebf2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/35372dc62787e61e91cfec73f45fd5d5ae0f8891", - "reference": "35372dc62787e61e91cfec73f45fd5d5ae0f8891", + "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/65ad770276875682e246e5435566146bf0baebf2", + "reference": "65ad770276875682e246e5435566146bf0baebf2", "shasum": "" }, "require": { - "illuminate/support": "^11.0 || ^12.0 || ^13.0", - "laravel/socialite": "^5.5", - "php": "^8.2" + "illuminate/support": "^12.0 || ^13.0", + "laravel/socialite": "^5.29", + "php": "^8.3" }, "require-dev": { - "mockery/mockery": "^1.2", - "phpunit/phpunit": "^9.0" + "mockery/mockery": "^1.6", + "phpunit/phpunit": "^12.5" }, "type": "library", "extra": { @@ -6124,115 +6227,122 @@ "issues": "https://github.com/socialiteproviders/manager/issues", "source": "https://github.com/socialiteproviders/manager" }, - "time": "2026-03-18T22:13:24+00:00" + "time": "2026-08-16T00:16:22+00:00" }, { - "name": "spatie/backtrace", - "version": "1.8.2", + "name": "spatie/laravel-data", + "version": "4.23.1", "source": { "type": "git", - "url": "https://github.com/spatie/backtrace.git", - "reference": "8ffe78be5ed355b5009e3dd989d183433e9a5adc" + "url": "https://github.com/spatie/laravel-data.git", + "reference": "23d0748b9712767ca4af795fa8a25dbc8c2492e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/backtrace/zipball/8ffe78be5ed355b5009e3dd989d183433e9a5adc", - "reference": "8ffe78be5ed355b5009e3dd989d183433e9a5adc", + "url": "https://api.github.com/repos/spatie/laravel-data/zipball/23d0748b9712767ca4af795fa8a25dbc8c2492e0", + "reference": "23d0748b9712767ca4af795fa8a25dbc8c2492e0", "shasum": "" }, "require": { - "php": "^7.3 || ^8.0" + "illuminate/contracts": "^10.0|^11.0|^12.0|^13.0", + "php": "^8.1", + "phpdocumentor/reflection-common": "^2.2", + "phpdocumentor/reflection-docblock": "^5.3 || ^6.0", + "phpdocumentor/type-resolver": "^1.7 || ^2.0", + "spatie/laravel-package-tools": "^1.9.0", + "spatie/php-structure-discoverer": "^2.0" }, "require-dev": { - "ext-json": "*", - "laravel/serializable-closure": "^1.3 || ^2.0", - "phpunit/phpunit": "^9.3 || ^11.4.3", - "spatie/phpunit-snapshot-assertions": "^4.2 || ^5.1.6", - "symfony/var-dumper": "^5.1|^6.0|^7.0|^8.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Spatie\\Backtrace\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" + "fakerphp/faker": "^1.14", + "friendsofphp/php-cs-fixer": "^3.0", + "inertiajs/inertia-laravel": "^2.0|^3.0", + "livewire/livewire": "^3.0|^4.0", + "mockery/mockery": "^1.6", + "nesbot/carbon": "^2.63|^3.0", + "orchestra/testbench": "^8.37.0|^9.16|^10.9|^11.0", + "pestphp/pest": "^2.36|^3.8|^4.3", + "pestphp/pest-plugin-laravel": "^2.4|^3.0|^4.0", + "pestphp/pest-plugin-livewire": "^2.1|^3.0|^4.0", + "phpbench/phpbench": "^1.2", + "phpstan/extension-installer": "^1.1", + "spatie/invade": "^1.0", + "spatie/laravel-typescript-transformer": "^2.5", + "spatie/pest-plugin-snapshots": "^2.1", + "spatie/test-time": "^1.2" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Spatie\\LaravelData\\LaravelDataServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Spatie\\LaravelData\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" ], "authors": [ { - "name": "Freek Van de Herten", - "email": "freek@spatie.be", - "homepage": "https://spatie.be", + "name": "Ruben Van Assche", + "email": "ruben@spatie.be", "role": "Developer" } ], - "description": "A better backtrace", - "homepage": "https://github.com/spatie/backtrace", + "description": "Create unified resources and data transfer objects", + "homepage": "https://github.com/spatie/laravel-data", "keywords": [ - "Backtrace", + "laravel", + "laravel-data", "spatie" ], "support": { - "issues": "https://github.com/spatie/backtrace/issues", - "source": "https://github.com/spatie/backtrace/tree/1.8.2" + "issues": "https://github.com/spatie/laravel-data/issues", + "source": "https://github.com/spatie/laravel-data/tree/4.23.1" }, "funding": [ { - "url": "https://github.com/sponsors/spatie", + "url": "https://github.com/spatie", "type": "github" - }, - { - "url": "https://spatie.be/open-source/support-us", - "type": "other" } ], - "time": "2026-03-11T13:48:28+00:00" + "time": "2026-10-26T09:29:36+00:00" }, { - "name": "spatie/error-solutions", - "version": "1.1.3", + "name": "spatie/laravel-package-tools", + "version": "1.93.3", "source": { "type": "git", - "url": "https://github.com/spatie/error-solutions.git", - "reference": "e495d7178ca524f2dd0fe6a1d99a1e608e1c9936" + "url": "https://github.com/spatie/laravel-package-tools.git", + "reference": "7aeef26bd8d4909bec744dbf47aee7d1395588c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/error-solutions/zipball/e495d7178ca524f2dd0fe6a1d99a1e608e1c9936", - "reference": "e495d7178ca524f2dd0fe6a1d99a1e608e1c9936", + "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/7aeef26bd8d4909bec744dbf47aee7d1395588c1", + "reference": "7aeef26bd8d4909bec744dbf47aee7d1395588c1", "shasum": "" }, "require": { - "php": "^8.0" + "illuminate/contracts": "^10.0|^11.0|^12.0|^13.0", + "php": "^8.1" }, "require-dev": { - "illuminate/broadcasting": "^10.0|^11.0|^12.0", - "illuminate/cache": "^10.0|^11.0|^12.0", - "illuminate/support": "^10.0|^11.0|^12.0", - "livewire/livewire": "^2.11|^3.5.20", - "openai-php/client": "^0.10.1", - "orchestra/testbench": "8.22.3|^9.0|^10.0", - "pestphp/pest": "^2.20|^3.0", - "phpstan/phpstan": "^2.1", - "psr/simple-cache": "^3.0", - "psr/simple-cache-implementation": "^3.0", - "spatie/ray": "^1.28", - "symfony/cache": "^5.4|^6.0|^7.0", - "symfony/process": "^5.4|^6.0|^7.0", - "vlucas/phpdotenv": "^5.5" - }, - "suggest": { - "openai-php/client": "Require get solutions from OpenAI", - "simple-cache-implementation": "To cache solutions from OpenAI" + "mockery/mockery": "^1.5", + "orchestra/testbench": "^8.0|^9.2|^10.0|^11.0", + "pestphp/pest": "^2.1|^3.1|^4.0", + "phpunit/php-code-coverage": "^10.0|^11.0|^12.0", + "phpunit/phpunit": "^10.5|^11.5|^12.5", + "spatie/pest-plugin-test-time": "^2.2|^3.0" }, "type": "library", "autoload": { "psr-4": { - "Spatie\\Ignition\\": "legacy/ignition", - "Spatie\\ErrorSolutions\\": "src", - "Spatie\\LaravelIgnition\\": "legacy/laravel-ignition" + "Spatie\\LaravelPackageTools\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -6241,64 +6351,70 @@ ], "authors": [ { - "name": "Ruben Van Assche", - "email": "ruben@spatie.be", + "name": "Freek Van der Herten", + "email": "freek@spatie.be", "role": "Developer" } ], - "description": "This is my package error-solutions", - "homepage": "https://github.com/spatie/error-solutions", + "description": "Tools for creating Laravel packages", + "homepage": "https://github.com/spatie/laravel-package-tools", "keywords": [ - "error-solutions", + "laravel-package-tools", "spatie" ], "support": { - "issues": "https://github.com/spatie/error-solutions/issues", - "source": "https://github.com/spatie/error-solutions/tree/1.1.3" + "issues": "https://github.com/spatie/laravel-package-tools/issues", + "source": "https://github.com/spatie/laravel-package-tools/tree/1.93.3" }, "funding": [ { - "url": "https://github.com/Spatie", + "url": "https://github.com/spatie", "type": "github" } ], - "time": "2025-02-14T12:29:50+00:00" + "time": "2026-09-28T07:16:50+00:00" }, { - "name": "spatie/flare-client-php", - "version": "1.11.1", + "name": "spatie/laravel-permission", + "version": "7.4.2", "source": { "type": "git", - "url": "https://github.com/spatie/flare-client-php.git", - "reference": "53f41b08a27cc039e1a8ed2be9a202e924f31bad" + "url": "https://github.com/spatie/laravel-permission.git", + "reference": "15a9daf02ba02d3ae77aaa6da582708231ef999b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/53f41b08a27cc039e1a8ed2be9a202e924f31bad", - "reference": "53f41b08a27cc039e1a8ed2be9a202e924f31bad", + "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/15a9daf02ba02d3ae77aaa6da582708231ef999b", + "reference": "15a9daf02ba02d3ae77aaa6da582708231ef999b", "shasum": "" }, "require": { - "illuminate/pipeline": "^8.0|^9.0|^10.0|^11.0|^12.0|^13.0", - "php": "^8.0", - "spatie/backtrace": "^1.6.1", - "symfony/http-foundation": "^5.2|^6.0|^7.0|^8.0", - "symfony/mime": "^5.2|^6.0|^7.0|^8.0", - "symfony/process": "^5.2|^6.0|^7.0|^8.0", - "symfony/var-dumper": "^5.2|^6.0|^7.0|^8.0" + "illuminate/auth": "^12.0|^13.0", + "illuminate/container": "^12.0|^13.0", + "illuminate/contracts": "^12.0|^13.0", + "illuminate/database": "^12.0|^13.0", + "php": "^8.3", + "spatie/laravel-package-tools": "^1.0" }, "require-dev": { - "dms/phpunit-arraysubset-asserts": "^0.5.0", - "pestphp/pest": "^1.20|^2.0", - "phpstan/extension-installer": "^1.1", - "phpstan/phpstan-deprecation-rules": "^1.0", - "phpstan/phpstan-phpunit": "^1.0", - "spatie/pest-plugin-snapshots": "^1.0|^2.0" + "larastan/larastan": "^3.9", + "laravel/passport": "^13.0", + "laravel/pint": "^1.0", + "orchestra/testbench": "^10.0|^11.0", + "pestphp/pest": "^3.0|^4.0", + "pestphp/pest-plugin-laravel": "^3.0|^4.1", + "phpstan/phpstan": "^2.1" }, "type": "library", "extra": { + "laravel": { + "providers": [ + "Spatie\\Permission\\PermissionServiceProvider" + ] + }, "branch-alias": { - "dev-main": "1.3.x-dev" + "dev-main": "7.x-dev", + "dev-master": "7.x-dev" } }, "autoload": { @@ -6306,24 +6422,36 @@ "src/helpers.php" ], "psr-4": { - "Spatie\\FlareClient\\": "src" + "Spatie\\Permission\\": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "description": "Send PHP errors to Flare", - "homepage": "https://github.com/spatie/flare-client-php", + "authors": [ + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + } + ], + "description": "Permission handling for Laravel 12 and up", + "homepage": "https://github.com/spatie/laravel-permission", "keywords": [ - "exception", - "flare", - "reporting", + "acl", + "laravel", + "permission", + "permissions", + "rbac", + "roles", + "security", "spatie" ], "support": { - "issues": "https://github.com/spatie/flare-client-php/issues", - "source": "https://github.com/spatie/flare-client-php/tree/1.11.1" + "issues": "https://github.com/spatie/laravel-permission/issues", + "source": "https://github.com/spatie/laravel-permission/tree/7.4.2" }, "funding": [ { @@ -6331,59 +6459,54 @@ "type": "github" } ], - "time": "2026-05-15T09:31:32+00:00" + "time": "2026-05-30T19:21:26+00:00" }, { - "name": "spatie/ignition", - "version": "1.16.0", + "name": "spatie/php-structure-discoverer", + "version": "2.4.4", "source": { "type": "git", - "url": "https://github.com/spatie/ignition.git", - "reference": "b59385bb7aa24dae81bcc15850ebecfda7b40838" + "url": "https://github.com/spatie/php-structure-discoverer.git", + "reference": "fa2b7dae8e8a22c0306154c4b052420e054f7e2b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/ignition/zipball/b59385bb7aa24dae81bcc15850ebecfda7b40838", - "reference": "b59385bb7aa24dae81bcc15850ebecfda7b40838", + "url": "https://api.github.com/repos/spatie/php-structure-discoverer/zipball/fa2b7dae8e8a22c0306154c4b052420e054f7e2b", + "reference": "fa2b7dae8e8a22c0306154c4b052420e054f7e2b", "shasum": "" }, "require": { - "ext-json": "*", - "ext-mbstring": "*", - "php": "^8.0", - "spatie/backtrace": "^1.7.1", - "spatie/error-solutions": "^1.1.2", - "spatie/flare-client-php": "^1.9", - "symfony/console": "^5.4.42|^6.0|^7.0|^8.0", - "symfony/http-foundation": "^5.4.42|^6.0|^7.0|^8.0", - "symfony/mime": "^5.4.42|^6.0|^7.0|^8.0", - "symfony/var-dumper": "^5.4.42|^6.0|^7.0|^8.0" + "illuminate/collections": "^11.0|^12.0|^13.0", + "php": "^8.3", + "spatie/laravel-package-tools": "^1.92.7", + "symfony/finder": "^6.0|^7.3.5|^8.0" }, "require-dev": { - "illuminate/cache": "^9.52|^10.0|^11.0|^12.0|^13.0", - "mockery/mockery": "^1.4", - "pestphp/pest": "^1.20|^2.0|^3.0", - "phpstan/extension-installer": "^1.1", - "phpstan/phpstan-deprecation-rules": "^1.0", - "phpstan/phpstan-phpunit": "^1.0", - "psr/simple-cache-implementation": "*", - "symfony/cache": "^5.4.38|^6.0|^7.0|^8.0", - "symfony/process": "^5.4.35|^6.0|^7.0|^8.0", - "vlucas/phpdotenv": "^5.5" + "amphp/parallel": "^2.3.2", + "illuminate/console": "^11.0|^12.0|^13.0", + "nunomaduro/collision": "^7.0|^8.8.3", + "orchestra/testbench": "^9.5|^10.8|^11.0", + "pestphp/pest": "^3.8|^4.0", + "pestphp/pest-plugin-laravel": "^3.2|^4.0", + "phpstan/extension-installer": "^1.4.3", + "phpstan/phpstan-deprecation-rules": "^1.2.1", + "phpstan/phpstan-phpunit": "^1.4.2", + "spatie/laravel-ray": "^1.43.1" }, "suggest": { - "openai-php/client": "Require get solutions from OpenAI", - "simple-cache-implementation": "To cache solutions from OpenAI" + "amphp/parallel": "When you want to use the Parallel discover worker" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.5.x-dev" + "laravel": { + "providers": [ + "Spatie\\StructureDiscoverer\\StructureDiscovererServiceProvider" + ] } }, "autoload": { "psr-4": { - "Spatie\\Ignition\\": "src" + "Spatie\\StructureDiscoverer\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -6392,451 +6515,47 @@ ], "authors": [ { - "name": "Spatie", - "email": "info@spatie.be", + "name": "Ruben Van Assche", + "email": "ruben@spatie.be", "role": "Developer" } ], - "description": "A beautiful error page for PHP applications.", - "homepage": "https://flareapp.io/ignition", + "description": "Automatically discover structures within your PHP application", + "homepage": "https://github.com/spatie/php-structure-discoverer", "keywords": [ - "error", - "flare", + "discover", "laravel", - "page" + "php", + "php-structure-discoverer" ], "support": { - "docs": "https://flareapp.io/docs/ignition-for-laravel/introduction", - "forum": "https://twitter.com/flareappio", - "issues": "https://github.com/spatie/ignition/issues", - "source": "https://github.com/spatie/ignition" + "issues": "https://github.com/spatie/php-structure-discoverer/issues", + "source": "https://github.com/spatie/php-structure-discoverer/tree/2.4.4" }, "funding": [ { - "url": "https://github.com/spatie", + "url": "https://github.com/LaravelAutoDiscoverer", "type": "github" } ], - "time": "2026-03-17T10:51:08+00:00" + "time": "2026-06-15T07:14:32+00:00" }, { - "name": "spatie/laravel-data", - "version": "4.23.0", + "name": "spomky-labs/base64url", + "version": "v2.0.4", "source": { "type": "git", - "url": "https://github.com/spatie/laravel-data.git", - "reference": "230543769c996e407fec2873930626aed7dd0d3b" + "url": "https://github.com/Spomky-Labs/base64url.git", + "reference": "7752ce931ec285da4ed1f4c5aa27e45e097be61d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-data/zipball/230543769c996e407fec2873930626aed7dd0d3b", - "reference": "230543769c996e407fec2873930626aed7dd0d3b", + "url": "https://api.github.com/repos/Spomky-Labs/base64url/zipball/7752ce931ec285da4ed1f4c5aa27e45e097be61d", + "reference": "7752ce931ec285da4ed1f4c5aa27e45e097be61d", "shasum": "" }, "require": { - "illuminate/contracts": "^10.0|^11.0|^12.0|^13.0", - "php": "^8.1", - "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/reflection-docblock": "^5.3 || ^6.0", - "phpdocumentor/type-resolver": "^1.7 || ^2.0", - "spatie/laravel-package-tools": "^1.9.0", - "spatie/php-structure-discoverer": "^2.0" - }, - "require-dev": { - "fakerphp/faker": "^1.14", - "friendsofphp/php-cs-fixer": "^3.0", - "inertiajs/inertia-laravel": "^2.0|^3.0", - "livewire/livewire": "^3.0|^4.0", - "mockery/mockery": "^1.6", - "nesbot/carbon": "^2.63|^3.0", - "orchestra/testbench": "^8.37.0|^9.16|^10.9|^11.0", - "pestphp/pest": "^2.36|^3.8|^4.3", - "pestphp/pest-plugin-laravel": "^2.4|^3.0|^4.0", - "pestphp/pest-plugin-livewire": "^2.1|^3.0|^4.0", - "phpbench/phpbench": "^1.2", - "phpstan/extension-installer": "^1.1", - "spatie/invade": "^1.0", - "spatie/laravel-typescript-transformer": "^2.5", - "spatie/pest-plugin-snapshots": "^2.1", - "spatie/test-time": "^1.2" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Spatie\\LaravelData\\LaravelDataServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Spatie\\LaravelData\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ruben Van Assche", - "email": "ruben@spatie.be", - "role": "Developer" - } - ], - "description": "Create unified resources and data transfer objects", - "homepage": "https://github.com/spatie/laravel-data", - "keywords": [ - "laravel", - "laravel-data", - "spatie" - ], - "support": { - "issues": "https://github.com/spatie/laravel-data/issues", - "source": "https://github.com/spatie/laravel-data/tree/4.23.0" - }, - "funding": [ - { - "url": "https://github.com/spatie", - "type": "github" - } - ], - "time": "2026-05-08T14:41:13+00:00" - }, - { - "name": "spatie/laravel-ignition", - "version": "2.12.0", - "source": { - "type": "git", - "url": "https://github.com/spatie/laravel-ignition.git", - "reference": "45b3b6e1e73fc161cba2149972698644b99594ee" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/45b3b6e1e73fc161cba2149972698644b99594ee", - "reference": "45b3b6e1e73fc161cba2149972698644b99594ee", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "ext-json": "*", - "ext-mbstring": "*", - "illuminate/support": "^11.0|^12.0|^13.0", - "nesbot/carbon": "^2.72|^3.0", - "php": "^8.2", - "spatie/ignition": "^1.16", - "symfony/console": "^7.4|^8.0", - "symfony/var-dumper": "^7.4|^8.0" - }, - "require-dev": { - "livewire/livewire": "^3.7.0|^4.0|dev-josh/v3-laravel-13-support", - "mockery/mockery": "^1.6.12", - "openai-php/client": "^0.10.3|^0.19", - "orchestra/testbench": "^v9.16.0|^10.6|^11.0", - "pestphp/pest": "^3.7|^4.0", - "phpstan/extension-installer": "^1.4.3", - "phpstan/phpstan-deprecation-rules": "^2.0.3", - "phpstan/phpstan-phpunit": "^2.0.8", - "vlucas/phpdotenv": "^5.6.2" - }, - "suggest": { - "openai-php/client": "Require get solutions from OpenAI", - "psr/simple-cache-implementation": "Needed to cache solutions from OpenAI" - }, - "type": "library", - "extra": { - "laravel": { - "aliases": { - "Flare": "Spatie\\LaravelIgnition\\Facades\\Flare" - }, - "providers": [ - "Spatie\\LaravelIgnition\\IgnitionServiceProvider" - ] - } - }, - "autoload": { - "files": [ - "src/helpers.php" - ], - "psr-4": { - "Spatie\\LaravelIgnition\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Spatie", - "email": "info@spatie.be", - "role": "Developer" - } - ], - "description": "A beautiful error page for Laravel applications.", - "homepage": "https://flareapp.io/ignition", - "keywords": [ - "error", - "flare", - "laravel", - "page" - ], - "support": { - "docs": "https://flareapp.io/docs/ignition-for-laravel/introduction", - "forum": "https://twitter.com/flareappio", - "issues": "https://github.com/spatie/laravel-ignition/issues", - "source": "https://github.com/spatie/laravel-ignition" - }, - "funding": [ - { - "url": "https://github.com/spatie", - "type": "github" - } - ], - "time": "2026-03-17T12:20:04+00:00" - }, - { - "name": "spatie/laravel-package-tools", - "version": "1.93.3", - "source": { - "type": "git", - "url": "https://github.com/spatie/laravel-package-tools.git", - "reference": "7aeef26bd8d4909bec744dbf47aee7d1395588c1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/7aeef26bd8d4909bec744dbf47aee7d1395588c1", - "reference": "7aeef26bd8d4909bec744dbf47aee7d1395588c1", - "shasum": "" - }, - "require": { - "illuminate/contracts": "^10.0|^11.0|^12.0|^13.0", - "php": "^8.1" - }, - "require-dev": { - "mockery/mockery": "^1.5", - "orchestra/testbench": "^8.0|^9.2|^10.0|^11.0", - "pestphp/pest": "^2.1|^3.1|^4.0", - "phpunit/php-code-coverage": "^10.0|^11.0|^12.0", - "phpunit/phpunit": "^10.5|^11.5|^12.5", - "spatie/pest-plugin-test-time": "^2.2|^3.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Spatie\\LaravelPackageTools\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Freek Van der Herten", - "email": "freek@spatie.be", - "role": "Developer" - } - ], - "description": "Tools for creating Laravel packages", - "homepage": "https://github.com/spatie/laravel-package-tools", - "keywords": [ - "laravel-package-tools", - "spatie" - ], - "support": { - "issues": "https://github.com/spatie/laravel-package-tools/issues", - "source": "https://github.com/spatie/laravel-package-tools/tree/1.93.3" - }, - "funding": [ - { - "url": "https://github.com/spatie", - "type": "github" - } - ], - "time": "2026-09-28T07:16:50+00:00" - }, - { - "name": "spatie/laravel-permission", - "version": "6.25.0", - "source": { - "type": "git", - "url": "https://github.com/spatie/laravel-permission.git", - "reference": "d7d4cb0d58616722f1afc90e0484e4825155b9b3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/d7d4cb0d58616722f1afc90e0484e4825155b9b3", - "reference": "d7d4cb0d58616722f1afc90e0484e4825155b9b3", - "shasum": "" - }, - "require": { - "illuminate/auth": "^8.12|^9.0|^10.0|^11.0|^12.0|^13.0", - "illuminate/container": "^8.12|^9.0|^10.0|^11.0|^12.0|^13.0", - "illuminate/contracts": "^8.12|^9.0|^10.0|^11.0|^12.0|^13.0", - "illuminate/database": "^8.12|^9.0|^10.0|^11.0|^12.0|^13.0", - "php": "^8.0" - }, - "require-dev": { - "laravel/passport": "^11.0|^12.0|^13.0", - "laravel/pint": "^1.0", - "orchestra/testbench": "^6.23|^7.0|^8.0|^9.0|^10.0|^11.0", - "pestphp/pest": "^2.0|^3.0|^4.0", - "pestphp/pest-plugin-laravel": "^2.0|^3.0|^4.0" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Spatie\\Permission\\PermissionServiceProvider" - ] - }, - "branch-alias": { - "dev-main": "6.x-dev", - "dev-master": "6.x-dev" - } - }, - "autoload": { - "files": [ - "src/helpers.php" - ], - "psr-4": { - "Spatie\\Permission\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Freek Van der Herten", - "email": "freek@spatie.be", - "homepage": "https://spatie.be", - "role": "Developer" - } - ], - "description": "Permission handling for Laravel 8.0 and up", - "homepage": "https://github.com/spatie/laravel-permission", - "keywords": [ - "acl", - "laravel", - "permission", - "permissions", - "rbac", - "roles", - "security", - "spatie" - ], - "support": { - "issues": "https://github.com/spatie/laravel-permission/issues", - "source": "https://github.com/spatie/laravel-permission/tree/6.25.0" - }, - "funding": [ - { - "url": "https://github.com/spatie", - "type": "github" - } - ], - "time": "2026-03-17T22:46:46+00:00" - }, - { - "name": "spatie/php-structure-discoverer", - "version": "2.3.2", - "source": { - "type": "git", - "url": "https://github.com/spatie/php-structure-discoverer.git", - "reference": "6c46e069349c7f2f6ebbe00429332c9e6b70fa92" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/spatie/php-structure-discoverer/zipball/6c46e069349c7f2f6ebbe00429332c9e6b70fa92", - "reference": "6c46e069349c7f2f6ebbe00429332c9e6b70fa92", - "shasum": "" - }, - "require": { - "illuminate/collections": "^10.0|^11.0|^12.0", - "php": "^8.1", - "spatie/laravel-package-tools": "^1.4.3", - "symfony/finder": "^6.0|^7.0" - }, - "require-dev": { - "amphp/parallel": "^2.2", - "illuminate/console": "^10.0|^11.0|^12.0", - "laravel/pint": "^1.0", - "nunomaduro/collision": "^7.0|^8.0", - "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0", - "pestphp/pest": "^2.0|^3.0", - "pestphp/pest-plugin-laravel": "^2.0|^3.0", - "phpstan/extension-installer": "^1.1", - "phpstan/phpstan-deprecation-rules": "^1.0", - "phpstan/phpstan-phpunit": "^1.0", - "phpunit/phpunit": "^9.5|^10.0|^11.5.3", - "spatie/laravel-ray": "^1.26" - }, - "suggest": { - "amphp/parallel": "When you want to use the Parallel discover worker" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Spatie\\StructureDiscoverer\\StructureDiscovererServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Spatie\\StructureDiscoverer\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ruben Van Assche", - "email": "ruben@spatie.be", - "role": "Developer" - } - ], - "description": "Automatically discover structures within your PHP application", - "homepage": "https://github.com/spatie/php-structure-discoverer", - "keywords": [ - "discover", - "laravel", - "php", - "php-structure-discoverer" - ], - "support": { - "issues": "https://github.com/spatie/php-structure-discoverer/issues", - "source": "https://github.com/spatie/php-structure-discoverer/tree/2.3.2" - }, - "funding": [ - { - "url": "https://github.com/LaravelAutoDiscoverer", - "type": "github" - } - ], - "time": "2025-09-22T14:58:17+00:00" - }, - { - "name": "spomky-labs/base64url", - "version": "v2.0.4", - "source": { - "type": "git", - "url": "https://github.com/Spomky-Labs/base64url.git", - "reference": "7752ce931ec285da4ed1f4c5aa27e45e097be61d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Spomky-Labs/base64url/zipball/7752ce931ec285da4ed1f4c5aa27e45e097be61d", - "reference": "7752ce931ec285da4ed1f4c5aa27e45e097be61d", - "shasum": "" - }, - "require": { - "php": ">=7.1" + "php": ">=7.1" }, "require-dev": { "phpstan/extension-installer": "^1.0", @@ -6998,22 +6717,21 @@ }, { "name": "symfony/clock", - "version": "v7.4.8", + "version": "v8.1.9", "source": { "type": "git", "url": "https://github.com/symfony/clock.git", - "reference": "674fa3b98e21531dd040e613479f5f6fa8f32111" + "reference": "945ea3b64d6da9c1c2c354fe5c07b27455df6442" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/clock/zipball/674fa3b98e21531dd040e613479f5f6fa8f32111", - "reference": "674fa3b98e21531dd040e613479f5f6fa8f32111", + "url": "https://api.github.com/repos/symfony/clock/zipball/945ea3b64d6da9c1c2c354fe5c07b27455df6442", + "reference": "945ea3b64d6da9c1c2c354fe5c07b27455df6442", "shasum": "" }, "require": { - "php": ">=8.2", - "psr/clock": "^1.0", - "symfony/polyfill-php83": "^1.28" + "php": ">=8.4.1", + "psr/clock": "^1.0" }, "provide": { "psr/clock-implementation": "1.0" @@ -7052,7 +6770,7 @@ "time" ], "support": { - "source": "https://github.com/symfony/clock/tree/v7.4.8" + "source": "https://github.com/symfony/clock/tree/v8.1.9" }, "funding": [ { @@ -7072,51 +6790,53 @@ "type": "tidelift" } ], - "time": "2026-03-24T13:12:05+00:00" + "time": "2026-10-12T14:32:04+00:00" }, { "name": "symfony/console", - "version": "v7.4.20", + "version": "v8.1.11", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "d7bca2fe05241dc7732d0c8b6d551b879f5d0a7d" + "reference": "5a315b092b81f3e920e9daea1a2ae4c66ed298b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/d7bca2fe05241dc7732d0c8b6d551b879f5d0a7d", - "reference": "d7bca2fe05241dc7732d0c8b6d551b879f5d0a7d", + "url": "https://api.github.com/repos/symfony/console/zipball/5a315b092b81f3e920e9daea1a2ae4c66ed298b9", + "reference": "5a315b092b81f3e920e9daea1a2ae4c66ed298b9", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.4.1", "symfony/deprecation-contracts": "^2.5|^3", - "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-mbstring": "^1.0", + "symfony/polyfill-php85": "^1.32", "symfony/service-contracts": "^2.5|^3", - "symfony/string": "^7.2|^8.0" + "symfony/string": "^7.4.6|^8.0.6" }, "conflict": { - "symfony/dependency-injection": "<6.4", - "symfony/dotenv": "<6.4", - "symfony/event-dispatcher": "<6.4", - "symfony/lock": "<6.4", - "symfony/process": "<6.4" + "symfony/dependency-injection": "<8.1", + "symfony/event-dispatcher": "<8.1" }, "provide": { "psr/log-implementation": "1.0|2.0|3.0" }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^6.4|^7.0|^8.0", - "symfony/dependency-injection": "^6.4|^7.0|^8.0", - "symfony/event-dispatcher": "^6.4|^7.0|^8.0", - "symfony/http-foundation": "^6.4|^7.0|^8.0", - "symfony/http-kernel": "^6.4|^7.0|^8.0", - "symfony/lock": "^6.4|^7.0|^8.0", - "symfony/messenger": "^6.4|^7.0|^8.0", - "symfony/process": "^6.4|^7.0|^8.0", - "symfony/stopwatch": "^6.4|^7.0|^8.0", - "symfony/var-dumper": "^6.4|^7.0|^8.0" + "symfony/config": "^7.4|^8.0", + "symfony/dependency-injection": "^8.1", + "symfony/event-dispatcher": "^8.1", + "symfony/filesystem": "^7.4|^8.0", + "symfony/http-foundation": "^7.4|^8.0", + "symfony/http-kernel": "^7.4|^8.0", + "symfony/lock": "^7.4|^8.0", + "symfony/messenger": "^7.4|^8.0", + "symfony/mime": "^7.4|^8.0", + "symfony/process": "^7.4|^8.0", + "symfony/stopwatch": "^7.4|^8.0", + "symfony/uid": "^7.4|^8.0", + "symfony/validator": "^7.4|^8.0", + "symfony/var-dumper": "^7.4|^8.0" }, "type": "library", "autoload": { @@ -7150,7 +6870,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.4.20" + "source": "https://github.com/symfony/console/tree/v8.1.11" }, "funding": [ { @@ -7170,24 +6890,24 @@ "type": "tidelift" } ], - "time": "2026-09-18T15:55:00+00:00" + "time": "2026-11-04T07:07:11+00:00" }, { "name": "symfony/css-selector", - "version": "v7.4.18", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "fecf40067fc8d8880ea87b8ac227600b9aadd1d0" + "reference": "9cfd588b8b07cf83e3426b030dbafd2291c132d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/fecf40067fc8d8880ea87b8ac227600b9aadd1d0", - "reference": "fecf40067fc8d8880ea87b8ac227600b9aadd1d0", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/9cfd588b8b07cf83e3426b030dbafd2291c132d9", + "reference": "9cfd588b8b07cf83e3426b030dbafd2291c132d9", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=8.4.1" }, "type": "library", "autoload": { @@ -7219,7 +6939,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v7.4.18" + "source": "https://github.com/symfony/css-selector/tree/v8.1.10" }, "funding": [ { @@ -7239,20 +6959,20 @@ "type": "tidelift" } ], - "time": "2026-08-23T10:03:40+00:00" + "time": "2026-10-18T14:56:39+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.7.1", + "version": "v3.8.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "f3202fa1b5097b0af062dc978b32ecf63404e31d" + "reference": "feb1edf4e546af3b85c5caebe8359a20db230ca3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/f3202fa1b5097b0af062dc978b32ecf63404e31d", - "reference": "f3202fa1b5097b0af062dc978b32ecf63404e31d", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/feb1edf4e546af3b85c5caebe8359a20db230ca3", + "reference": "feb1edf4e546af3b85c5caebe8359a20db230ca3", "shasum": "" }, "require": { @@ -7265,7 +6985,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.7-dev" + "dev-main": "3.8-dev" } }, "autoload": { @@ -7290,7 +7010,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.7.1" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.8.1" }, "funding": [ { @@ -7310,37 +7030,36 @@ "type": "tidelift" } ], - "time": "2026-06-05T06:23:12+00:00" + "time": "2026-09-16T14:15:10+00:00" }, { "name": "symfony/error-handler", - "version": "v7.4.20", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "82239fe00f7cdc9f17c4166fff4ebdc22bd26ec0" + "reference": "84c6d73f990ae22dbd45625c056d7ff99ca6810d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/82239fe00f7cdc9f17c4166fff4ebdc22bd26ec0", - "reference": "82239fe00f7cdc9f17c4166fff4ebdc22bd26ec0", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/84c6d73f990ae22dbd45625c056d7ff99ca6810d", + "reference": "84c6d73f990ae22dbd45625c056d7ff99ca6810d", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.4.1", "psr/log": "^1|^2|^3", "symfony/polyfill-php85": "^1.32", - "symfony/var-dumper": "^6.4|^7.0|^8.0" + "symfony/var-dumper": "^7.4|^8.0" }, "conflict": { - "symfony/deprecation-contracts": "<2.5", - "symfony/http-kernel": "<6.4" + "symfony/deprecation-contracts": "<2.5" }, "require-dev": { - "symfony/console": "^6.4|^7.0|^8.0", + "symfony/console": "^7.4|^8.0", "symfony/deprecation-contracts": "^2.5|^3", - "symfony/http-kernel": "^6.4|^7.0|^8.0", - "symfony/serializer": "^6.4|^7.0|^8.0", + "symfony/http-kernel": "^7.4|^8.0", + "symfony/serializer": "^7.4|^8.0", "symfony/webpack-encore-bundle": "^1.0|^2.0" }, "bin": [ @@ -7372,7 +7091,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v7.4.20" + "source": "https://github.com/symfony/error-handler/tree/v8.1.10" }, "funding": [ { @@ -7392,28 +7111,29 @@ "type": "tidelift" } ], - "time": "2026-09-22T18:56:40+00:00" + "time": "2026-10-25T14:40:25+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v7.4.17", + "version": "v8.1.5", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "d269974ee93c61d03620ffee358355bfdb471d66" + "reference": "7458da64220376b2e0dc2d8451bf43382c1ad297" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d269974ee93c61d03620ffee358355bfdb471d66", - "reference": "d269974ee93c61d03620ffee358355bfdb471d66", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7458da64220376b2e0dc2d8451bf43382c1ad297", + "reference": "7458da64220376b2e0dc2d8451bf43382c1ad297", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.4.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/event-dispatcher-contracts": "^2.5|^3" }, "conflict": { - "symfony/dependency-injection": "<6.4", + "symfony/security-http": "<7.4", "symfony/service-contracts": "<2.5" }, "provide": { @@ -7422,14 +7142,14 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^6.4|^7.0|^8.0", - "symfony/dependency-injection": "^6.4|^7.0|^8.0", - "symfony/error-handler": "^6.4|^7.0|^8.0", - "symfony/expression-language": "^6.4|^7.0|^8.0", - "symfony/framework-bundle": "^6.4|^7.0|^8.0", - "symfony/http-foundation": "^6.4|^7.0|^8.0", + "symfony/config": "^7.4|^8.0", + "symfony/dependency-injection": "^7.4|^8.0", + "symfony/error-handler": "^7.4|^8.0", + "symfony/expression-language": "^7.4|^8.0", + "symfony/framework-bundle": "^7.4|^8.0", + "symfony/http-foundation": "^7.4|^8.0", "symfony/service-contracts": "^2.5|^3", - "symfony/stopwatch": "^6.4|^7.0|^8.0" + "symfony/stopwatch": "^7.4|^8.0" }, "type": "library", "autoload": { @@ -7457,7 +7177,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v7.4.17" + "source": "https://github.com/symfony/event-dispatcher/tree/v8.1.5" }, "funding": [ { @@ -7477,20 +7197,20 @@ "type": "tidelift" } ], - "time": "2026-08-21T17:40:08+00:00" + "time": "2026-08-21T17:47:34+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.7.1", + "version": "v3.8.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "c7de7a00ffb67842132da02ea92988a39ccd9f4e" + "reference": "658e29751424da3ef4758c60f769e59d1b2981eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c7de7a00ffb67842132da02ea92988a39ccd9f4e", - "reference": "c7de7a00ffb67842132da02ea92988a39ccd9f4e", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/658e29751424da3ef4758c60f769e59d1b2981eb", + "reference": "658e29751424da3ef4758c60f769e59d1b2981eb", "shasum": "" }, "require": { @@ -7504,7 +7224,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.7-dev" + "dev-main": "3.8-dev" } }, "autoload": { @@ -7537,7 +7257,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.7.1" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.8.1" }, "funding": [ { @@ -7557,27 +7277,27 @@ "type": "tidelift" } ], - "time": "2026-06-05T06:23:12+00:00" + "time": "2026-09-16T14:15:10+00:00" }, { "name": "symfony/finder", - "version": "v7.4.20", + "version": "v8.1.11", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "2dd31e5208db7a0fda7bfc998ad727b79c2e4d1e" + "reference": "a2902e479ba5691d20d51d100a715ea19ad2c837" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/2dd31e5208db7a0fda7bfc998ad727b79c2e4d1e", - "reference": "2dd31e5208db7a0fda7bfc998ad727b79c2e4d1e", + "url": "https://api.github.com/repos/symfony/finder/zipball/a2902e479ba5691d20d51d100a715ea19ad2c837", + "reference": "a2902e479ba5691d20d51d100a715ea19ad2c837", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=8.4.1" }, "require-dev": { - "symfony/filesystem": "^6.4|^7.0|^8.0" + "symfony/filesystem": "^7.4|^8.0" }, "type": "library", "autoload": { @@ -7605,7 +7325,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.4.20" + "source": "https://github.com/symfony/finder/tree/v8.1.11" }, "funding": [ { @@ -7625,41 +7345,40 @@ "type": "tidelift" } ], - "time": "2026-09-26T06:31:10+00:00" + "time": "2026-11-02T10:58:30+00:00" }, { "name": "symfony/http-foundation", - "version": "v7.4.20", + "version": "v8.1.11", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "9d0761c0da6bd5b801b401666834901a9a1ffc33" + "reference": "30fa3efe6e736b0d06f5331cc6abe813582c0a26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9d0761c0da6bd5b801b401666834901a9a1ffc33", - "reference": "9d0761c0da6bd5b801b401666834901a9a1ffc33", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/30fa3efe6e736b0d06f5331cc6abe813582c0a26", + "reference": "30fa3efe6e736b0d06f5331cc6abe813582c0a26", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.4.1", "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "^1.1" }, "conflict": { - "doctrine/dbal": "<3.6", - "symfony/cache": "<6.4.12|>=7.0,<7.1.5" + "doctrine/dbal": "<4.3" }, "require-dev": { - "doctrine/dbal": "^3.6|^4", + "doctrine/dbal": "^4.3", "predis/predis": "^1.1|^2.0", - "symfony/cache": "^6.4.12|^7.1.5|^8.0", - "symfony/clock": "^6.4|^7.0|^8.0", - "symfony/dependency-injection": "^6.4|^7.0|^8.0", - "symfony/expression-language": "^6.4|^7.0|^8.0", - "symfony/http-kernel": "^6.4|^7.0|^8.0", - "symfony/mime": "^6.4|^7.0|^8.0", - "symfony/rate-limiter": "^6.4|^7.0|^8.0" + "symfony/cache": "^7.4|^8.0", + "symfony/clock": "^7.4|^8.0", + "symfony/dependency-injection": "^7.4|^8.0", + "symfony/expression-language": "^7.4|^8.0", + "symfony/http-kernel": "^7.4|^8.0", + "symfony/mime": "^7.4|^8.0", + "symfony/rate-limiter": "^7.4|^8.0" }, "type": "library", "autoload": { @@ -7687,7 +7406,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v7.4.20" + "source": "https://github.com/symfony/http-foundation/tree/v8.1.11" }, "funding": [ { @@ -7707,78 +7426,69 @@ "type": "tidelift" } ], - "time": "2026-09-24T07:12:44+00:00" + "time": "2026-11-04T08:39:20+00:00" }, { "name": "symfony/http-kernel", - "version": "v7.4.20", + "version": "v8.1.11", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "392784b5d7b959b8d872542a2530c50c540a788f" + "reference": "460658504e26a2794aa614b4fbe6cf9bac2076fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/392784b5d7b959b8d872542a2530c50c540a788f", - "reference": "392784b5d7b959b8d872542a2530c50c540a788f", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/460658504e26a2794aa614b4fbe6cf9bac2076fe", + "reference": "460658504e26a2794aa614b4fbe6cf9bac2076fe", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.4.1", "psr/log": "^1|^2|^3", "symfony/deprecation-contracts": "^2.5|^3", - "symfony/error-handler": "^6.4|^7.0|^8.0", - "symfony/event-dispatcher": "^7.3|^8.0", + "symfony/error-handler": "^7.4|^8.0", + "symfony/event-dispatcher": "^7.4|^8.0", "symfony/http-foundation": "^7.4|^8.0", "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "symfony/browser-kit": "<6.4", - "symfony/cache": "<6.4", - "symfony/config": "<6.4", - "symfony/console": "<6.4", - "symfony/dependency-injection": "<6.4", - "symfony/doctrine-bridge": "<6.4", + "symfony/dependency-injection": "<8.1", "symfony/flex": "<2.10", - "symfony/form": "<6.4", - "symfony/http-client": "<6.4", "symfony/http-client-contracts": "<2.5", - "symfony/mailer": "<6.4", - "symfony/messenger": "<6.4", - "symfony/translation": "<6.4", + "symfony/serializer": "<7.4.15|>=8.0,<8.0.15|>=8.1,<8.1.2", "symfony/translation-contracts": "<2.5", - "symfony/twig-bridge": "<6.4", - "symfony/validator": "<6.4", - "symfony/var-dumper": "<6.4", - "twig/twig": "<3.12" + "symfony/var-dumper": "<8.1", + "symfony/web-profiler-bundle": "<8.1", + "twig/twig": "<3.21" }, "provide": { "psr/log-implementation": "1.0|2.0|3.0" }, "require-dev": { "psr/cache": "^1.0|^2.0|^3.0", - "symfony/browser-kit": "^6.4|^7.0|^8.0", - "symfony/clock": "^6.4|^7.0|^8.0", - "symfony/config": "^6.4|^7.0|^8.0", - "symfony/console": "^6.4|^7.0|^8.0", - "symfony/css-selector": "^6.4|^7.0|^8.0", - "symfony/dependency-injection": "^6.4.1|^7.0.1|^8.0", - "symfony/dom-crawler": "^6.4|^7.0|^8.0", - "symfony/expression-language": "^6.4|^7.0|^8.0", - "symfony/finder": "^6.4|^7.0|^8.0", + "symfony/browser-kit": "^7.4|^8.0", + "symfony/clock": "^7.4|^8.0", + "symfony/config": "^7.4|^8.0", + "symfony/console": "^7.4|^8.0", + "symfony/css-selector": "^7.4|^8.0", + "symfony/dependency-injection": "^8.1", + "symfony/dom-crawler": "^7.4|^8.0", + "symfony/expression-language": "^7.4|^8.0", + "symfony/finder": "^7.4|^8.0", "symfony/http-client-contracts": "^2.5|^3", - "symfony/process": "^6.4|^7.0|^8.0", - "symfony/property-access": "^7.1|^8.0", - "symfony/routing": "^6.4|^7.0|^8.0", - "symfony/serializer": "^7.1|^8.0", - "symfony/stopwatch": "^6.4|^7.0|^8.0", - "symfony/translation": "^6.4|^7.0|^8.0", + "symfony/process": "^7.4|^8.0", + "symfony/property-access": "^7.4|^8.0", + "symfony/rate-limiter": "^7.4|^8.0", + "symfony/routing": "^7.4|^8.0", + "symfony/serializer": "^7.4|^8.0", + "symfony/stopwatch": "^7.4|^8.0", + "symfony/translation": "^7.4|^8.0", "symfony/translation-contracts": "^2.5|^3", - "symfony/uid": "^6.4|^7.0|^8.0", - "symfony/validator": "^6.4|^7.0|^8.0", - "symfony/var-dumper": "^6.4|^7.0|^8.0", - "symfony/var-exporter": "^6.4|^7.0|^8.0", - "twig/twig": "^3.12|^4.0" + "symfony/uid": "^7.4|^8.0", + "symfony/validator": "^7.4|^8.0", + "symfony/var-dumper": "^8.1", + "symfony/var-exporter": "^7.4|^8.0", + "twig/twig": "^3.21|^4.0" }, "type": "library", "autoload": { @@ -7806,7 +7516,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v7.4.20" + "source": "https://github.com/symfony/http-kernel/tree/v8.1.11" }, "funding": [ { @@ -7826,43 +7536,39 @@ "type": "tidelift" } ], - "time": "2026-09-29T14:05:16+00:00" + "time": "2026-11-04T11:29:46+00:00" }, { "name": "symfony/mailer", - "version": "v7.4.19", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "6f6f2441bef07a42d2617b9b3aadf04a321aa514" + "reference": "4ba81a8f04fbf0bb1691f7bff760b301f1956fd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/6f6f2441bef07a42d2617b9b3aadf04a321aa514", - "reference": "6f6f2441bef07a42d2617b9b3aadf04a321aa514", + "url": "https://api.github.com/repos/symfony/mailer/zipball/4ba81a8f04fbf0bb1691f7bff760b301f1956fd7", + "reference": "4ba81a8f04fbf0bb1691f7bff760b301f1956fd7", "shasum": "" }, "require": { "egulias/email-validator": "^2.1.10|^3|^4", - "php": ">=8.2", + "php": ">=8.4.1", "psr/event-dispatcher": "^1", "psr/log": "^1|^2|^3", - "symfony/event-dispatcher": "^6.4|^7.0|^8.0", - "symfony/mime": "^7.2|^8.0", + "symfony/event-dispatcher": "^7.4|^8.0", + "symfony/mime": "^7.4|^8.0", "symfony/service-contracts": "^2.5|^3" }, "conflict": { - "symfony/http-client-contracts": "<2.5", - "symfony/http-kernel": "<6.4", - "symfony/messenger": "<6.4", - "symfony/mime": "<6.4", - "symfony/twig-bridge": "<6.4" + "symfony/http-client-contracts": "<2.5" }, "require-dev": { - "symfony/console": "^6.4|^7.0|^8.0", - "symfony/http-client": "^6.4|^7.0|^8.0", - "symfony/messenger": "^6.4|^7.0|^8.0", - "symfony/twig-bridge": "^6.4|^7.0|^8.0" + "symfony/console": "^7.4|^8.0", + "symfony/http-client": "^7.4|^8.0", + "symfony/messenger": "^7.4|^8.0", + "symfony/twig-bridge": "^7.4|^8.0" }, "type": "library", "autoload": { @@ -7890,7 +7596,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v7.4.19" + "source": "https://github.com/symfony/mailer/tree/v8.1.10" }, "funding": [ { @@ -7910,44 +7616,41 @@ "type": "tidelift" } ], - "time": "2026-09-15T06:01:15+00:00" + "time": "2026-10-23T17:06:53+00:00" }, { "name": "symfony/mime", - "version": "v7.4.19", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "f8ac7d0a800bcabbcd1f7de56594cf05e6cd5693" + "reference": "8d1232052c9cdef170ed9608b3147bca4f61ff69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/f8ac7d0a800bcabbcd1f7de56594cf05e6cd5693", - "reference": "f8ac7d0a800bcabbcd1f7de56594cf05e6cd5693", + "url": "https://api.github.com/repos/symfony/mime/zipball/8d1232052c9cdef170ed9608b3147bca4f61ff69", + "reference": "8d1232052c9cdef170ed9608b3147bca4f61ff69", "shasum": "" }, "require": { - "php": ">=8.2", - "symfony/deprecation-contracts": "^2.5|^3", + "php": ">=8.4.1", "symfony/polyfill-intl-idn": "^1.10", "symfony/polyfill-mbstring": "^1.0" }, "conflict": { "egulias/email-validator": "~3.0.0", "phpdocumentor/reflection-docblock": "<5.2|>=7", - "phpdocumentor/type-resolver": "<1.5.1", - "symfony/mailer": "<6.4", - "symfony/serializer": "<6.4.3|>7.0,<7.0.3" + "phpdocumentor/type-resolver": "<1.5.1" }, "require-dev": { "egulias/email-validator": "^2.1.10|^3.1|^4", "league/html-to-markdown": "^5.0", "phpdocumentor/reflection-docblock": "^5.2|^6.0", - "symfony/dependency-injection": "^6.4|^7.0|^8.0", - "symfony/process": "^6.4|^7.0|^8.0", - "symfony/property-access": "^6.4|^7.0|^8.0", - "symfony/property-info": "^6.4|^7.0|^8.0", - "symfony/serializer": "^6.4.44|^7.4.17|^8.1.5" + "symfony/dependency-injection": "^7.4|^8.0", + "symfony/process": "^7.4|^8.0", + "symfony/property-access": "^7.4|^8.0", + "symfony/property-info": "^7.4|^8.0", + "symfony/serializer": "^7.4.17|^8.1.5" }, "type": "library", "autoload": { @@ -7979,7 +7682,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v7.4.19" + "source": "https://github.com/symfony/mime/tree/v8.1.10" }, "funding": [ { @@ -7999,24 +7702,24 @@ "type": "tidelift" } ], - "time": "2026-09-04T10:45:44+00:00" + "time": "2026-10-28T17:58:38+00:00" }, { "name": "symfony/options-resolver", - "version": "v7.4.8", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "2888fcdc4dc2fd5f7c7397be78631e8af12e02b4" + "reference": "68cc43038d234c69d510c62f37bd0058b40d548a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/2888fcdc4dc2fd5f7c7397be78631e8af12e02b4", - "reference": "2888fcdc4dc2fd5f7c7397be78631e8af12e02b4", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/68cc43038d234c69d510c62f37bd0058b40d548a", + "reference": "68cc43038d234c69d510c62f37bd0058b40d548a", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.4.1", "symfony/deprecation-contracts": "^2.5|^3" }, "type": "library", @@ -8050,7 +7753,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v7.4.8" + "source": "https://github.com/symfony/options-resolver/tree/v8.1.10" }, "funding": [ { @@ -8070,7 +7773,7 @@ "type": "tidelift" } ], - "time": "2026-03-24T13:12:05+00:00" + "time": "2026-10-18T14:56:39+00:00" }, { "name": "symfony/polyfill-ctype", @@ -8157,16 +7860,16 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.43.0", + "version": "v1.43.3", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "5cac8f4db97208823aa353f59a01faad2da52c75" + "reference": "5a8f33c87aeecffce24e721b5064fab05f4becf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5cac8f4db97208823aa353f59a01faad2da52c75", - "reference": "5cac8f4db97208823aa353f59a01faad2da52c75", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5a8f33c87aeecffce24e721b5064fab05f4becf8", + "reference": "5a8f33c87aeecffce24e721b5064fab05f4becf8", "shasum": "" }, "require": { @@ -8215,7 +7918,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.43.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.43.3" }, "funding": [ { @@ -8235,7 +7938,7 @@ "type": "tidelift" } ], - "time": "2026-09-25T15:46:47+00:00" + "time": "2026-10-15T09:18:53+00:00" }, { "name": "symfony/polyfill-intl-idn", @@ -8411,16 +8114,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.43.0", + "version": "v1.43.3", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "4d5d331bf731e0aedbc6b2f5e61135b7b7996a72" + "reference": "122889ed24dc000165bcbfd77ec412f15cbdfc6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/4d5d331bf731e0aedbc6b2f5e61135b7b7996a72", - "reference": "4d5d331bf731e0aedbc6b2f5e61135b7b7996a72", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/122889ed24dc000165bcbfd77ec412f15cbdfc6a", + "reference": "122889ed24dc000165bcbfd77ec412f15cbdfc6a", "shasum": "" }, "require": { @@ -8472,7 +8175,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.43.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.43.3" }, "funding": [ { @@ -8492,7 +8195,7 @@ "type": "tidelift" } ], - "time": "2026-09-24T15:19:04+00:00" + "time": "2026-10-28T09:35:49+00:00" }, { "name": "symfony/polyfill-php80", @@ -8898,6 +8601,169 @@ ], "time": "2026-09-25T15:46:47+00:00" }, + { + "name": "symfony/polyfill-php86", + "version": "v1.43.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php86.git", + "reference": "8840df45b24f33a49dc419fa18dc0057231ae1d8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php86/zipball/8840df45b24f33a49dc419fa18dc0057231ae1d8", + "reference": "8840df45b24f33a49dc419fa18dc0057231ae1d8", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php86\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.6+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php86/tree/v1.43.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2026-09-25T15:46:47+00:00" + }, + { + "name": "symfony/polyfill-time", + "version": "v1.42.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-time.git", + "reference": "ac9f1ed802dd58f37e720388130c088434aa09fc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-time/zipball/ac9f1ed802dd58f37e720388130c088434aa09fc", + "reference": "ac9f1ed802dd58f37e720388130c088434aa09fc", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Time\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ignace Philippe Nyamagana Butera", + "email": "nyamsprod@gmail.com" + }, + { + "name": "Tim Düsterhus", + "email": "tim@tideways-gmbh.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Time API added to PHP 8.6", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "duration", + "polyfill", + "portable", + "shim", + "time" + ], + "support": { + "source": "https://github.com/symfony/polyfill-time/tree/v1.42.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2026-08-07T13:08:13+00:00" + }, { "name": "symfony/polyfill-uuid", "version": "v1.43.0", @@ -8983,20 +8849,20 @@ }, { "name": "symfony/process", - "version": "v7.4.19", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "ed0ae095b86994d370d5791612e55984f15aa30e" + "reference": "08aa69fa0998bb65a089f9e148a2c0f8b391398e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/ed0ae095b86994d370d5791612e55984f15aa30e", - "reference": "ed0ae095b86994d370d5791612e55984f15aa30e", + "url": "https://api.github.com/repos/symfony/process/zipball/08aa69fa0998bb65a089f9e148a2c0f8b391398e", + "reference": "08aa69fa0998bb65a089f9e148a2c0f8b391398e", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=8.4.1" }, "type": "library", "autoload": { @@ -9024,7 +8890,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.4.19" + "source": "https://github.com/symfony/process/tree/v8.1.10" }, "funding": [ { @@ -9044,38 +8910,33 @@ "type": "tidelift" } ], - "time": "2026-09-02T12:38:34+00:00" + "time": "2026-10-25T14:40:25+00:00" }, { "name": "symfony/routing", - "version": "v7.4.20", + "version": "v8.1.11", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "2bacb72be5eadeaf9874d5accb75bfb33d21c74b" + "reference": "f3fefc6cad3748d538be970ca81b71f06d7aa8b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/2bacb72be5eadeaf9874d5accb75bfb33d21c74b", - "reference": "2bacb72be5eadeaf9874d5accb75bfb33d21c74b", + "url": "https://api.github.com/repos/symfony/routing/zipball/f3fefc6cad3748d538be970ca81b71f06d7aa8b3", + "reference": "f3fefc6cad3748d538be970ca81b71f06d7aa8b3", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.4.1", "symfony/deprecation-contracts": "^2.5|^3" }, - "conflict": { - "symfony/config": "<6.4", - "symfony/dependency-injection": "<6.4", - "symfony/yaml": "<6.4" - }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^6.4|^7.0|^8.0", - "symfony/dependency-injection": "^6.4|^7.0|^8.0", - "symfony/expression-language": "^6.4|^7.0|^8.0", - "symfony/http-foundation": "^6.4|^7.0|^8.0", - "symfony/yaml": "^6.4|^7.0|^8.0" + "symfony/config": "^7.4|^8.0", + "symfony/dependency-injection": "^7.4|^8.0", + "symfony/expression-language": "^7.4|^8.0", + "symfony/http-foundation": "^7.4|^8.0", + "symfony/yaml": "^7.4|^8.0" }, "type": "library", "autoload": { @@ -9109,7 +8970,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v7.4.20" + "source": "https://github.com/symfony/routing/tree/v8.1.11" }, "funding": [ { @@ -9129,20 +8990,20 @@ "type": "tidelift" } ], - "time": "2026-09-28T19:09:50+00:00" + "time": "2026-11-04T08:39:20+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.7.3", + "version": "v3.8.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "15e6a07ec2a2c75ceb1b21dd98105ee8456d2257" + "reference": "052852a96fd5e5ebdb617dba22031e41a3300fb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/15e6a07ec2a2c75ceb1b21dd98105ee8456d2257", - "reference": "15e6a07ec2a2c75ceb1b21dd98105ee8456d2257", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/052852a96fd5e5ebdb617dba22031e41a3300fb5", + "reference": "052852a96fd5e5ebdb617dba22031e41a3300fb5", "shasum": "" }, "require": { @@ -9160,7 +9021,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.7-dev" + "dev-main": "3.8-dev" } }, "autoload": { @@ -9196,7 +9057,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.7.3" + "source": "https://github.com/symfony/service-contracts/tree/v3.8.1" }, "funding": [ { @@ -9216,39 +9077,38 @@ "type": "tidelift" } ], - "time": "2026-07-27T15:39:01+00:00" + "time": "2026-10-20T17:38:25+00:00" }, { "name": "symfony/string", - "version": "v7.4.19", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "02731ce2bd26514bec9efc0baef2cd0b0cf67f46" + "reference": "6c6110979c0150393bbb336170e286d51ab4d76c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/02731ce2bd26514bec9efc0baef2cd0b0cf67f46", - "reference": "02731ce2bd26514bec9efc0baef2cd0b0cf67f46", + "url": "https://api.github.com/repos/symfony/string/zipball/6c6110979c0150393bbb336170e286d51ab4d76c", + "reference": "6c6110979c0150393bbb336170e286d51ab4d76c", "shasum": "" }, "require": { - "php": ">=8.2", - "symfony/deprecation-contracts": "^2.5|^3.0", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-intl-grapheme": "~1.33", - "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0" + "php": ">=8.4.1", + "symfony/polyfill-ctype": "^1.8", + "symfony/polyfill-intl-grapheme": "^1.33", + "symfony/polyfill-intl-normalizer": "^1.0", + "symfony/polyfill-mbstring": "^1.0" }, "conflict": { "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/emoji": "^7.1|^8.0", - "symfony/http-client": "^6.4|^7.0|^8.0", - "symfony/intl": "^6.4|^7.0|^8.0", + "symfony/emoji": "^7.4|^8.0", + "symfony/http-client": "^7.4|^8.0", + "symfony/intl": "^7.4|^8.0", "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^6.4|^7.0|^8.0" + "symfony/var-exporter": "^7.4|^8.0" }, "type": "library", "autoload": { @@ -9287,7 +9147,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.4.19" + "source": "https://github.com/symfony/string/tree/v8.1.10" }, "funding": [ { @@ -9307,38 +9167,31 @@ "type": "tidelift" } ], - "time": "2026-09-11T14:46:58+00:00" + "time": "2026-10-23T17:06:53+00:00" }, { "name": "symfony/translation", - "version": "v7.4.17", + "version": "v8.1.11", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "2ee1e4a3b32a528a642babe041ff7c440b213b4b" + "reference": "d065adf56e5508293e80d7c140b0a9e043b63e9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/2ee1e4a3b32a528a642babe041ff7c440b213b4b", - "reference": "2ee1e4a3b32a528a642babe041ff7c440b213b4b", + "url": "https://api.github.com/repos/symfony/translation/zipball/d065adf56e5508293e80d7c140b0a9e043b63e9c", + "reference": "d065adf56e5508293e80d7c140b0a9e043b63e9c", "shasum": "" }, "require": { - "php": ">=8.2", - "symfony/deprecation-contracts": "^2.5|^3", - "symfony/polyfill-mbstring": "~1.0", - "symfony/translation-contracts": "^2.5.3|^3.3" + "php": ">=8.4.1", + "symfony/polyfill-mbstring": "^1.0", + "symfony/translation-contracts": "^3.6.1" }, "conflict": { "nikic/php-parser": "<5.0", - "symfony/config": "<6.4", - "symfony/console": "<6.4", - "symfony/dependency-injection": "<6.4", "symfony/http-client-contracts": "<2.5", - "symfony/http-kernel": "<6.4", - "symfony/service-contracts": "<2.5", - "symfony/twig-bundle": "<6.4", - "symfony/yaml": "<6.4" + "symfony/service-contracts": "<2.5" }, "provide": { "symfony/translation-implementation": "2.3|3.0" @@ -9346,17 +9199,17 @@ "require-dev": { "nikic/php-parser": "^5.0", "psr/log": "^1|^2|^3", - "symfony/config": "^6.4|^7.0|^8.0", - "symfony/console": "^6.4|^7.0|^8.0", - "symfony/dependency-injection": "^6.4|^7.0|^8.0", - "symfony/finder": "^6.4|^7.0|^8.0", + "symfony/config": "^7.4|^8.0", + "symfony/console": "^7.4|^8.0", + "symfony/dependency-injection": "^7.4|^8.0", + "symfony/finder": "^7.4|^8.0", "symfony/http-client-contracts": "^2.5|^3.0", - "symfony/http-kernel": "^6.4|^7.0|^8.0", - "symfony/intl": "^6.4|^7.0|^8.0", + "symfony/http-kernel": "^7.4|^8.0", + "symfony/intl": "^7.4|^8.0", "symfony/polyfill-intl-icu": "^1.21", - "symfony/routing": "^6.4|^7.0|^8.0", + "symfony/routing": "^7.4|^8.0", "symfony/service-contracts": "^2.5|^3", - "symfony/yaml": "^6.4|^7.0|^8.0" + "symfony/yaml": "^7.4|^8.0" }, "type": "library", "autoload": { @@ -9387,7 +9240,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v7.4.17" + "source": "https://github.com/symfony/translation/tree/v8.1.11" }, "funding": [ { @@ -9407,20 +9260,20 @@ "type": "tidelift" } ], - "time": "2026-08-21T17:40:08+00:00" + "time": "2026-11-01T22:27:46+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.7.1", + "version": "v3.8.1", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "ccb206b98faccc511ebae8e5fad50f2dc0b30621" + "reference": "0a3ae917402632fcba2aeddae9c98332f3d7dd05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/ccb206b98faccc511ebae8e5fad50f2dc0b30621", - "reference": "ccb206b98faccc511ebae8e5fad50f2dc0b30621", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/0a3ae917402632fcba2aeddae9c98332f3d7dd05", + "reference": "0a3ae917402632fcba2aeddae9c98332f3d7dd05", "shasum": "" }, "require": { @@ -9433,7 +9286,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.7-dev" + "dev-main": "3.8-dev" } }, "autoload": { @@ -9469,7 +9322,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.7.1" + "source": "https://github.com/symfony/translation-contracts/tree/v3.8.1" }, "funding": [ { @@ -9489,28 +9342,28 @@ "type": "tidelift" } ], - "time": "2026-06-05T06:23:12+00:00" + "time": "2026-10-03T08:17:19+00:00" }, { "name": "symfony/uid", - "version": "v7.4.20", + "version": "v8.1.9", "source": { "type": "git", "url": "https://github.com/symfony/uid.git", - "reference": "a96bbdb02a04ff3b5592cee6741b03edc78b56aa" + "reference": "cb487cf30380f0b0b090973bb9c0588193c06685" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/uid/zipball/a96bbdb02a04ff3b5592cee6741b03edc78b56aa", - "reference": "a96bbdb02a04ff3b5592cee6741b03edc78b56aa", + "url": "https://api.github.com/repos/symfony/uid/zipball/cb487cf30380f0b0b090973bb9c0588193c06685", + "reference": "cb487cf30380f0b0b090973bb9c0588193c06685", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.4.1", "symfony/polyfill-uuid": "^1.15" }, "require-dev": { - "symfony/console": "^6.4|^7.0|^8.0" + "symfony/console": "^7.4|^8.0" }, "type": "library", "autoload": { @@ -9547,7 +9400,7 @@ "uuid" ], "support": { - "source": "https://github.com/symfony/uid/tree/v7.4.20" + "source": "https://github.com/symfony/uid/tree/v8.1.9" }, "funding": [ { @@ -9567,35 +9420,35 @@ "type": "tidelift" } ], - "time": "2026-09-23T16:18:28+00:00" + "time": "2026-10-12T14:32:04+00:00" }, { "name": "symfony/var-dumper", - "version": "v7.4.18", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "e088da50b813f32473a76871616cbb8fa54653a8" + "reference": "3412a5af7d34a19515a77890fc804fe8e50d1a4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e088da50b813f32473a76871616cbb8fa54653a8", - "reference": "e088da50b813f32473a76871616cbb8fa54653a8", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3412a5af7d34a19515a77890fc804fe8e50d1a4f", + "reference": "3412a5af7d34a19515a77890fc804fe8e50d1a4f", "shasum": "" }, "require": { - "php": ">=8.2", - "symfony/deprecation-contracts": "^2.5|^3", - "symfony/polyfill-mbstring": "~1.0" + "php": ">=8.4.1", + "symfony/polyfill-mbstring": "^1.0" }, "conflict": { - "symfony/console": "<6.4" + "symfony/console": "<7.4", + "symfony/error-handler": "<7.4" }, "require-dev": { - "symfony/console": "^6.4|^7.0|^8.0", - "symfony/http-kernel": "^6.4|^7.0|^8.0", - "symfony/process": "^6.4|^7.0|^8.0", - "symfony/uid": "^6.4|^7.0|^8.0", + "symfony/console": "^7.4|^8.0", + "symfony/http-kernel": "^7.4|^8.0", + "symfony/process": "^7.4|^8.0", + "symfony/uid": "^7.4|^8.0", "twig/twig": "^3.12|^4.0" }, "bin": [ @@ -9634,7 +9487,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v7.4.18" + "source": "https://github.com/symfony/var-dumper/tree/v8.1.10" }, "funding": [ { @@ -9654,20 +9507,20 @@ "type": "tidelift" } ], - "time": "2026-08-30T20:10:52+00:00" + "time": "2026-10-26T21:55:04+00:00" }, { "name": "symfony/yaml", - "version": "v7.4.20", + "version": "v7.4.23", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "0222bf4dfaa1e3ceb8fff579635d655f2950d5a7" + "reference": "1e601207ffe627a2e621faa9d661f1d32dcf1cec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/0222bf4dfaa1e3ceb8fff579635d655f2950d5a7", - "reference": "0222bf4dfaa1e3ceb8fff579635d655f2950d5a7", + "url": "https://api.github.com/repos/symfony/yaml/zipball/1e601207ffe627a2e621faa9d661f1d32dcf1cec", + "reference": "1e601207ffe627a2e621faa9d661f1d32dcf1cec", "shasum": "" }, "require": { @@ -9710,7 +9563,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v7.4.20" + "source": "https://github.com/symfony/yaml/tree/v7.4.23" }, "funding": [ { @@ -9730,20 +9583,20 @@ "type": "tidelift" } ], - "time": "2026-09-26T06:31:10+00:00" + "time": "2026-11-04T08:27:22+00:00" }, { "name": "tightenco/ziggy", - "version": "v2.6.4", + "version": "v2.6.5", "source": { "type": "git", "url": "https://github.com/tighten/ziggy.git", - "reference": "c32a3eaad1574df8b953281680bba89bd3217dc2" + "reference": "d250c158c75bb10d33e6ebc9b67d65872593ae1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tighten/ziggy/zipball/c32a3eaad1574df8b953281680bba89bd3217dc2", - "reference": "c32a3eaad1574df8b953281680bba89bd3217dc2", + "url": "https://api.github.com/repos/tighten/ziggy/zipball/d250c158c75bb10d33e6ebc9b67d65872593ae1a", + "reference": "d250c158c75bb10d33e6ebc9b67d65872593ae1a", "shasum": "" }, "require": { @@ -9798,9 +9651,9 @@ ], "support": { "issues": "https://github.com/tighten/ziggy/issues", - "source": "https://github.com/tighten/ziggy/tree/v2.6.4" + "source": "https://github.com/tighten/ziggy/tree/v2.6.5" }, - "time": "2026-08-18T17:28:45+00:00" + "time": "2026-10-10T22:16:55+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -9859,16 +9712,16 @@ }, { "name": "vlucas/phpdotenv", - "version": "v5.7.0", + "version": "v5.8.0", "source": { "type": "git", - "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "301c07936b16d88628b126b01d082ba153cf4c40" + "url": "https://github.com/phpdotenv/phpdotenv.git", + "reference": "96149103e62ac67e915f6d2ef59b72dee2e011e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/301c07936b16d88628b126b01d082ba153cf4c40", - "reference": "301c07936b16d88628b126b01d082ba153cf4c40", + "url": "https://api.github.com/repos/phpdotenv/phpdotenv/zipball/96149103e62ac67e915f6d2ef59b72dee2e011e0", + "reference": "96149103e62ac67e915f6d2ef59b72dee2e011e0", "shasum": "" }, "require": { @@ -9895,7 +9748,7 @@ "forward-command": false }, "branch-alias": { - "dev-master": "5.6-dev" + "dev-master": "5.8-dev" } }, "autoload": { @@ -9926,8 +9779,8 @@ "environment" ], "support": { - "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v5.7.0" + "issues": "https://github.com/phpdotenv/phpdotenv/issues", + "source": "https://github.com/phpdotenv/phpdotenv/tree/v5.8.0" }, "funding": [ { @@ -9939,7 +9792,7 @@ "type": "tidelift" } ], - "time": "2026-08-24T18:07:49+00:00" + "time": "2026-10-25T16:26:19+00:00" }, { "name": "voku/portable-ascii", @@ -10017,16 +9870,16 @@ }, { "name": "web-token/jwt-library", - "version": "4.2.3", + "version": "4.2.7", "source": { "type": "git", "url": "https://github.com/web-token/jwt-library.git", - "reference": "db962c3ad8bc91c531a49dd373f0a641fc507bfd" + "reference": "62643a2f31274c546a7d158ceab6dd5c052db911" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/web-token/jwt-library/zipball/db962c3ad8bc91c531a49dd373f0a641fc507bfd", - "reference": "db962c3ad8bc91c531a49dd373f0a641fc507bfd", + "url": "https://api.github.com/repos/web-token/jwt-library/zipball/62643a2f31274c546a7d158ceab6dd5c052db911", + "reference": "62643a2f31274c546a7d158ceab6dd5c052db911", "shasum": "" }, "require": { @@ -10090,8 +9943,7 @@ "symfony" ], "support": { - "issues": "https://github.com/web-token/jwt-library/issues", - "source": "https://github.com/web-token/jwt-library/tree/4.2.3" + "source": "https://github.com/web-token/jwt-library/tree/4.2.7" }, "funding": [ { @@ -10103,7 +9955,7 @@ "type": "patreon" } ], - "time": "2026-09-12T18:50:35+00:00" + "time": "2026-11-08T14:44:36+00:00" }, { "name": "webmozart/assert", @@ -10167,16 +10019,16 @@ "packages-dev": [ { "name": "barryvdh/laravel-ide-helper", - "version": "v3.7.0", + "version": "v3.8.0", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "ad7e37676f1ff985d55ef1b6b96a0c0a40f2609a" + "reference": "f9521af2a0ed5ff1d70386cac3fae547a96be947" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/ad7e37676f1ff985d55ef1b6b96a0c0a40f2609a", - "reference": "ad7e37676f1ff985d55ef1b6b96a0c0a40f2609a", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/f9521af2a0ed5ff1d70386cac3fae547a96be947", + "reference": "f9521af2a0ed5ff1d70386cac3fae547a96be947", "shasum": "" }, "require": { @@ -10213,7 +10065,7 @@ ] }, "branch-alias": { - "dev-master": "3.6-dev" + "dev-master": "3.7-dev" } }, "autoload": { @@ -10246,7 +10098,7 @@ ], "support": { "issues": "https://github.com/barryvdh/laravel-ide-helper/issues", - "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.7.0" + "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.8.0" }, "funding": [ { @@ -10258,7 +10110,7 @@ "type": "github" } ], - "time": "2026-03-17T14:12:51+00:00" + "time": "2026-09-15T12:58:37+00:00" }, { "name": "barryvdh/reflection-docblock", @@ -10374,16 +10226,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.5.14", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "0c8abba0634f637bd78c4e451981da368d403463" + "reference": "0c64479fae6952ba4cf021a72c0ac530394c91d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/0c8abba0634f637bd78c4e451981da368d403463", - "reference": "0c8abba0634f637bd78c4e451981da368d403463", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/0c64479fae6952ba4cf021a72c0ac530394c91d4", + "reference": "0c64479fae6952ba4cf021a72c0ac530394c91d4", "shasum": "" }, "require": { @@ -10430,7 +10282,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.5.14" + "source": "https://github.com/composer/ca-bundle/tree/1.6.1" }, "funding": [ { @@ -10442,20 +10294,20 @@ "type": "github" } ], - "time": "2026-08-21T14:57:29+00:00" + "time": "2026-10-29T14:10:42+00:00" }, { "name": "composer/class-map-generator", - "version": "1.8.0", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "c0efbeb2f3fd7e23c7f180a59765c0b48a31fbc4" + "reference": "5fa48e0e1992ea8a786df3ceca80625c9a643b75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/c0efbeb2f3fd7e23c7f180a59765c0b48a31fbc4", - "reference": "c0efbeb2f3fd7e23c7f180a59765c0b48a31fbc4", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/5fa48e0e1992ea8a786df3ceca80625c9a643b75", + "reference": "5fa48e0e1992ea8a786df3ceca80625c9a643b75", "shasum": "" }, "require": { @@ -10499,7 +10351,7 @@ ], "support": { "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.8.0" + "source": "https://github.com/composer/class-map-generator/tree/1.9.0" }, "funding": [ { @@ -10511,25 +10363,25 @@ "type": "github" } ], - "time": "2026-09-25T15:24:19+00:00" + "time": "2026-11-03T10:10:19+00:00" }, { "name": "composer/composer", - "version": "2.10.3", + "version": "2.11.2", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "f0de0bf90226853b841672f086d8b58b02332504" + "reference": "12c820dbc3f030954b1d09f5884fcf1e9d29d6cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/f0de0bf90226853b841672f086d8b58b02332504", - "reference": "f0de0bf90226853b841672f086d8b58b02332504", + "url": "https://api.github.com/repos/composer/composer/zipball/12c820dbc3f030954b1d09f5884fcf1e9d29d6cb", + "reference": "12c820dbc3f030954b1d09f5884fcf1e9d29d6cb", "shasum": "" }, "require": { - "composer/ca-bundle": "^1.5", - "composer/class-map-generator": "^1.4.0", + "composer/ca-bundle": "^1.6", + "composer/class-map-generator": "^1.8.0", "composer/metadata-minifier": "^1.0", "composer/pcre": "^2.3 || ^3.3", "composer/semver": "^3.3", @@ -10538,7 +10390,7 @@ "ext-filter": "*", "ext-hash": "*", "ext-json": "*", - "justinrainbow/json-schema": "^6.5.1", + "justinrainbow/json-schema": "^6.6.3", "php": "^7.2.5 || ^8.0", "psr/log": "^1.0 || ^2.0 || ^3.0", "react/promise": "^3.3", @@ -10555,7 +10407,7 @@ "symfony/process": "^5.4.47 || ^6.4.25 || ^7.1.10 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1.11.8", + "phpstan/phpstan": "1.12.33", "phpstan/phpstan-deprecation-rules": "^1.2.0", "phpstan/phpstan-phpunit": "^1.4.0", "phpstan/phpstan-strict-rules": "^1.6.0", @@ -10579,7 +10431,7 @@ ] }, "branch-alias": { - "dev-main": "2.10-dev" + "dev-main": "2.11-dev" } }, "autoload": { @@ -10614,7 +10466,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.10.3" + "source": "https://github.com/composer/composer/tree/2.11.2" }, "funding": [ { @@ -10626,7 +10478,7 @@ "type": "github" } ], - "time": "2026-08-27T11:34:23+00:00" + "time": "2026-11-10T09:09:37+00:00" }, { "name": "composer/metadata-minifier", @@ -10771,16 +10623,16 @@ }, { "name": "composer/semver", - "version": "3.5.0", + "version": "3.6.0", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "f7a296f4c4cf8cb8bb83e35d6951a406bb11afa5" + "reference": "d92543b7ede9c4ec6b59853cefb061e39866d2cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/f7a296f4c4cf8cb8bb83e35d6951a406bb11afa5", - "reference": "f7a296f4c4cf8cb8bb83e35d6951a406bb11afa5", + "url": "https://api.github.com/repos/composer/semver/zipball/d92543b7ede9c4ec6b59853cefb061e39866d2cf", + "reference": "d92543b7ede9c4ec6b59853cefb061e39866d2cf", "shasum": "" }, "require": { @@ -10832,7 +10684,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.5.0" + "source": "https://github.com/composer/semver/tree/3.6.0" }, "funding": [ { @@ -10844,7 +10696,7 @@ "type": "github" } ], - "time": "2026-09-24T14:38:51+00:00" + "time": "2026-10-29T09:13:34+00:00" }, { "name": "composer/spdx-licenses", @@ -11053,16 +10905,16 @@ }, { "name": "filp/whoops", - "version": "2.18.5", + "version": "2.19.3", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "baec851ad6ae00db8bd0fdd30d208afc1b71c56e" + "reference": "d5480d53f10069dc4620a39f87e38e8945d47322" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/baec851ad6ae00db8bd0fdd30d208afc1b71c56e", - "reference": "baec851ad6ae00db8bd0fdd30d208afc1b71c56e", + "url": "https://api.github.com/repos/filp/whoops/zipball/d5480d53f10069dc4620a39f87e38e8945d47322", + "reference": "d5480d53f10069dc4620a39f87e38e8945d47322", "shasum": "" }, "require": { @@ -11112,7 +10964,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.18.5" + "source": "https://github.com/filp/whoops/tree/2.19.3" }, "funding": [ { @@ -11120,20 +10972,20 @@ "type": "github" } ], - "time": "2026-09-18T12:00:00+00:00" + "time": "2026-11-09T23:30:17+00:00" }, { "name": "fruitcake/laravel-debugbar", - "version": "v4.4.4", + "version": "v4.4.5", "source": { "type": "git", "url": "https://github.com/fruitcake/laravel-debugbar.git", - "reference": "02274537e13944ad1990c521bd06d0fb3578ba17" + "reference": "679c389306cd6255dbb3d2a9350d846c2e991dcc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fruitcake/laravel-debugbar/zipball/02274537e13944ad1990c521bd06d0fb3578ba17", - "reference": "02274537e13944ad1990c521bd06d0fb3578ba17", + "url": "https://api.github.com/repos/fruitcake/laravel-debugbar/zipball/679c389306cd6255dbb3d2a9350d846c2e991dcc", + "reference": "679c389306cd6255dbb3d2a9350d846c2e991dcc", "shasum": "" }, "require": { @@ -11211,7 +11063,7 @@ ], "support": { "issues": "https://github.com/fruitcake/laravel-debugbar/issues", - "source": "https://github.com/fruitcake/laravel-debugbar/tree/v4.4.4" + "source": "https://github.com/fruitcake/laravel-debugbar/tree/v4.4.5" }, "funding": [ { @@ -11223,7 +11075,7 @@ "type": "github" } ], - "time": "2026-09-24T10:05:29+00:00" + "time": "2026-10-28T13:25:29+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -11323,16 +11175,16 @@ }, { "name": "larastan/larastan", - "version": "v3.13.0", + "version": "v3.15.0", "source": { "type": "git", "url": "https://github.com/larastan/larastan.git", - "reference": "24ee69a7705ffc7c2cd8a3c96a5f498a4c2de5e3" + "reference": "ffb29680700b7e56000183ddacd68fab991f690b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/larastan/larastan/zipball/24ee69a7705ffc7c2cd8a3c96a5f498a4c2de5e3", - "reference": "24ee69a7705ffc7c2cd8a3c96a5f498a4c2de5e3", + "url": "https://api.github.com/repos/larastan/larastan/zipball/ffb29680700b7e56000183ddacd68fab991f690b", + "reference": "ffb29680700b7e56000183ddacd68fab991f690b", "shasum": "" }, "require": { @@ -11345,13 +11197,13 @@ "illuminate/pipeline": "^11.44.2 || ^12.4.1 || ^13", "illuminate/support": "^11.44.2 || ^12.4.1 || ^13", "php": "^8.2", - "phpstan/phpstan": "^2.3.0" + "phpstan/phpstan": "^2.3.5" }, "require-dev": { "doctrine/coding-standard": "^14", "laravel/framework": "^11.44.2 || ^12.7.2 || ^13", "mockery/mockery": "^1.6.12", - "nikic/php-parser": "^5.4", + "nikic/php-parser": "^5.6", "orchestra/canvas": "^v9.2.2 || ^10.0.1 || ^11", "orchestra/testbench-core": "^9.12.0 || ^10.1 || ^11", "phpstan/phpstan-deprecation-rules": "^2.0.1", @@ -11400,7 +11252,7 @@ ], "support": { "issues": "https://github.com/larastan/larastan/issues", - "source": "https://github.com/larastan/larastan/tree/v3.13.0" + "source": "https://github.com/larastan/larastan/tree/v3.15.0" }, "funding": [ { @@ -11408,20 +11260,20 @@ "type": "github" } ], - "time": "2026-10-07T14:14:28+00:00" + "time": "2026-11-11T15:06:29+00:00" }, { "name": "laravel/boost", - "version": "v2.10.1", + "version": "v2.10.4", "source": { "type": "git", "url": "https://github.com/laravel/boost.git", - "reference": "3e7bab5c7c80b6d2764ef3db1e3eb801204da84e" + "reference": "9cd5e7d81300b5dee4c8b1619ec4b36f4a6367fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/boost/zipball/3e7bab5c7c80b6d2764ef3db1e3eb801204da84e", - "reference": "3e7bab5c7c80b6d2764ef3db1e3eb801204da84e", + "url": "https://api.github.com/repos/laravel/boost/zipball/9cd5e7d81300b5dee4c8b1619ec4b36f4a6367fd", + "reference": "9cd5e7d81300b5dee4c8b1619ec4b36f4a6367fd", "shasum": "" }, "require": { @@ -11436,10 +11288,11 @@ "php": "^8.2" }, "require-dev": { + "jasonmccreary/double": "^1.0", "laravel/pint": "^1.27.0", "mockery/mockery": "^1.6.12", "orchestra/testbench": "^9.15.0|^10.6|^11.0", - "pestphp/pest": "^2.36.0|^3.8.4|^4.1.5", + "pestphp/pest": "^2.36.0|^3.8.4|^4.1.5|^5.3.3", "phpstan/phpstan": "^2.1.27", "rector/rector": "^2.1" }, @@ -11474,29 +11327,29 @@ "issues": "https://github.com/laravel/boost/issues", "source": "https://github.com/laravel/boost" }, - "time": "2026-10-01T02:02:28+00:00" + "time": "2026-10-29T18:31:16+00:00" }, { "name": "laravel/dusk", - "version": "v8.7.0", + "version": "v8.8.0", "source": { "type": "git", "url": "https://github.com/laravel/dusk.git", - "reference": "c4d814bf4d417a49fdb8a2e60cd05a906d00fae7" + "reference": "23f49df0447b018a38c7aac0662410331b9cc552" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/dusk/zipball/c4d814bf4d417a49fdb8a2e60cd05a906d00fae7", - "reference": "c4d814bf4d417a49fdb8a2e60cd05a906d00fae7", + "url": "https://api.github.com/repos/laravel/dusk/zipball/23f49df0447b018a38c7aac0662410331b9cc552", + "reference": "23f49df0447b018a38c7aac0662410331b9cc552", "shasum": "" }, "require": { "ext-json": "*", "ext-zip": "*", "guzzlehttp/guzzle": "^7.5|^8.0", - "illuminate/console": "^10.0|^11.0|^12.0|^13.0", - "illuminate/support": "^10.0|^11.0|^12.0|^13.0", - "php": "^8.1", + "illuminate/console": "^12.0|^13.0", + "illuminate/support": "^12.0|^13.0", + "php": "^8.2", "php-webdriver/webdriver": "^1.15.2", "symfony/console": "^6.2|^7.0|^8.0", "symfony/finder": "^6.2|^7.0|^8.0", @@ -11504,11 +11357,11 @@ "vlucas/phpdotenv": "^5.2" }, "require-dev": { - "laravel/framework": "^10.0|^11.0|^12.0|^13.0", + "laravel/framework": "^12.69|^13.30", "mockery/mockery": "^1.6", - "orchestra/testbench-core": "^8.19|^9.17|^10.8|^11.0", - "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^10.1|^11.0|^12.0.1", + "orchestra/testbench-core": "^10.8|^11.0", + "phpstan/phpstan": "2.2.15", + "phpunit/phpunit": "^11.0|^12.0.1|^13.0", "psy/psysh": "^0.11.12|^0.12", "symfony/yaml": "^6.2|^7.0|^8.0" }, @@ -11545,60 +11398,52 @@ "webdriver" ], "support": { - "source": "https://github.com/laravel/dusk/tree/v8.7.0" + "source": "https://github.com/laravel/dusk/tree/v8.8.0" }, - "time": "2026-08-26T13:30:23+00:00" + "time": "2026-11-09T14:41:34+00:00" }, { - "name": "laravel/mcp", - "version": "v1.0.1", + "name": "laravel/pint", + "version": "v1.32.3", "source": { "type": "git", - "url": "https://github.com/laravel/mcp.git", - "reference": "92987a9d03847801299ff4abe909ba7686147dde" + "url": "https://github.com/laravel/pint.git", + "reference": "1cf8e0320bed4b3c6e51df92039a5636c3887728" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/mcp/zipball/92987a9d03847801299ff4abe909ba7686147dde", - "reference": "92987a9d03847801299ff4abe909ba7686147dde", + "url": "https://api.github.com/repos/laravel/pint/zipball/1cf8e0320bed4b3c6e51df92039a5636c3887728", + "reference": "1cf8e0320bed4b3c6e51df92039a5636c3887728", "shasum": "" }, "require": { "ext-json": "*", "ext-mbstring": "*", - "illuminate/console": "^11.45.3|^12.41.1|^13.0", - "illuminate/container": "^11.45.3|^12.41.1|^13.0", - "illuminate/contracts": "^11.45.3|^12.41.1|^13.0", - "illuminate/http": "^11.45.3|^12.41.1|^13.0", - "illuminate/json-schema": "^12.41.1|^13.0", - "illuminate/routing": "^11.45.3|^12.41.1|^13.0", - "illuminate/support": "^11.45.3|^12.41.1|^13.0", - "illuminate/validation": "^11.45.3|^12.41.1|^13.0", - "php": "^8.2", - "symfony/process": "^7.4.5|^8.0.5" + "ext-tokenizer": "*", + "ext-xml": "*", + "php": "^8.3.0" }, "require-dev": { - "laravel/pint": "^1.20", - "orchestra/testbench": "^9.15|^10.8|^11.0", - "pestphp/pest": "^3.8.5|^4.3.2", - "phpstan/phpstan": "^2.1.27", - "rector/rector": "^2.2.4" - }, - "type": "library", - "extra": { - "laravel": { - "aliases": { - "Mcp": "Laravel\\Mcp\\Facades\\Mcp" - }, - "providers": [ - "Laravel\\Mcp\\Server\\McpServiceProvider" - ] - } + "composer/semver": "^3.6.0", + "friendsofphp/php-cs-fixer": "^3.95.30", + "illuminate/view": "^13.42.0", + "larastan/larastan": "^3.15.0", + "laravel-zero/framework": "^13.0.0", + "laravel/agent-detector": "^2.0.5", + "laravel/prompts": "^0.3.27", + "mockery/mockery": "^1.6.15", + "nunomaduro/termwind": "^2.4.1", + "pestphp/pest": "^4.7.8" }, + "bin": [ + "builds/pint" + ], + "type": "project", "autoload": { "psr-4": { - "Laravel\\Mcp\\": "src/", - "Laravel\\Mcp\\Server\\": "src/Server/" + "App\\": "app/", + "Database\\Seeders\\": "database/seeders/", + "Database\\Factories\\": "database/factories/" } }, "notification-url": "https://packagist.org/downloads/", @@ -11607,21 +11452,25 @@ ], "authors": [ { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" + "name": "Nuno Maduro", + "email": "enunomaduro@gmail.com" } ], - "description": "Rapidly build MCP servers for your Laravel applications.", - "homepage": "https://github.com/laravel/mcp", + "description": "An opinionated code formatter for PHP.", + "homepage": "https://laravel.com", "keywords": [ - "laravel", - "mcp" + "dev", + "format", + "formatter", + "lint", + "linter", + "php" ], "support": { - "issues": "https://github.com/laravel/mcp/issues", - "source": "https://github.com/laravel/mcp" + "issues": "https://github.com/laravel/pint/issues", + "source": "https://github.com/laravel/pint" }, - "time": "2026-09-24T10:45:09+00:00" + "time": "2026-11-11T16:45:13+00:00" }, { "name": "laravel/roster", @@ -11829,36 +11678,36 @@ }, { "name": "nunomaduro/collision", - "version": "v8.9.5", + "version": "v8.9.6", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "fb53eacd509a1d303858e2d20cfebf2d630254ec" + "reference": "68806f9257968f23775bee62970cb90925b79d51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/fb53eacd509a1d303858e2d20cfebf2d630254ec", - "reference": "fb53eacd509a1d303858e2d20cfebf2d630254ec", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/68806f9257968f23775bee62970cb90925b79d51", + "reference": "68806f9257968f23775bee62970cb90925b79d51", "shasum": "" }, "require": { - "filp/whoops": "^2.18.4", - "nunomaduro/termwind": "^2.4.0", + "filp/whoops": "^2.19.3", + "nunomaduro/termwind": "^2.4.1", "php": "^8.2.0", - "symfony/console": "^7.4.14 || ^8.1.1" + "symfony/console": "^7.4.23 || ^8.1.11" }, "conflict": { "laravel/framework": "<11.48.0 || >=14.0.0", "phpunit/phpunit": "<11.5.50 || >=14.0.0" }, "require-dev": { - "brianium/paratest": "^7.8.5", - "larastan/larastan": "^3.10.0", - "laravel/framework": "^11.48.0 || ^12.56.0 || ^13.20.0", - "laravel/pint": "^1.29.3", - "orchestra/testbench-core": "^9.12.0 || ^10.12.1 || ^11.3.5", - "pestphp/pest": "^3.8.5 || ^4.7.5 || ^5.0.0", - "sebastian/environment": "^7.2.1 || ^8.1.2 || ^9.3.2" + "brianium/paratest": "^7.8.6", + "larastan/larastan": "^3.14.0", + "laravel/framework": "^11.57.1 || ^12.72.0 || ^13.40.0", + "laravel/pint": "^1.30.4", + "orchestra/testbench-core": "^9.24.0 || ^10.16.0 || ^11.6.0", + "pestphp/pest": "^3.8.7 || ^4.7.8 || ^5.3.5", + "sebastian/environment": "^7.2.1 || ^8.1.2 || ^9.3.3" }, "type": "library", "extra": { @@ -11921,7 +11770,7 @@ "type": "patreon" } ], - "time": "2026-07-15T19:09:14+00:00" + "time": "2026-11-10T17:06:52+00:00" }, { "name": "phar-io/manifest", @@ -12043,16 +11892,16 @@ }, { "name": "php-debugbar/php-debugbar", - "version": "v3.8.0", + "version": "v3.8.1", "source": { "type": "git", "url": "https://github.com/php-debugbar/php-debugbar.git", - "reference": "18ced90d4b882ed449b2278fea8692f8f7d1c13c" + "reference": "d04a382b80e320c7abdbe9fc66e83b34e80edef4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/18ced90d4b882ed449b2278fea8692f8f7d1c13c", - "reference": "18ced90d4b882ed449b2278fea8692f8f7d1c13c", + "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/d04a382b80e320c7abdbe9fc66e83b34e80edef4", + "reference": "d04a382b80e320c7abdbe9fc66e83b34e80edef4", "shasum": "" }, "require": { @@ -12129,7 +11978,7 @@ ], "support": { "issues": "https://github.com/php-debugbar/php-debugbar/issues", - "source": "https://github.com/php-debugbar/php-debugbar/tree/v3.8.0" + "source": "https://github.com/php-debugbar/php-debugbar/tree/v3.8.1" }, "funding": [ { @@ -12141,7 +11990,7 @@ "type": "github" } ], - "time": "2026-07-02T12:38:20+00:00" + "time": "2026-10-25T20:20:41+00:00" }, { "name": "php-debugbar/symfony-bridge", @@ -12338,11 +12187,11 @@ }, { "name": "phpstan/phpstan", - "version": "2.3.1", + "version": "2.3.5", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/6155239b488e95d26d1ebd95c6b4bb294d7f09db", - "reference": "6155239b488e95d26d1ebd95c6b4bb294d7f09db", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/645a1bd6bead15fc1b8474137467961d0fa30a79", + "reference": "645a1bd6bead15fc1b8474137467961d0fa30a79", "shasum": "" }, "require": { @@ -12398,7 +12247,7 @@ "type": "github" } ], - "time": "2026-10-08T21:09:11+00:00" + "time": "2026-11-03T12:14:22+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -12502,22 +12351,22 @@ }, { "name": "phpstan/phpstan-phpunit", - "version": "2.0.21", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-phpunit.git", - "reference": "8dbdc3a3e2d7c5dfea655d20ecca5bc9b1b1e441" + "reference": "ffff35d4f96c4642d7f41a3515d90afa0f58be62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/8dbdc3a3e2d7c5dfea655d20ecca5bc9b1b1e441", - "reference": "8dbdc3a3e2d7c5dfea655d20ecca5bc9b1b1e441", + "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/ffff35d4f96c4642d7f41a3515d90afa0f58be62", + "reference": "ffff35d4f96c4642d7f41a3515d90afa0f58be62", "shasum": "" }, "require": { "phar-io/version": "^3.2", "php": "^7.4 || ^8.0", - "phpstan/phpstan": "^2.2.6" + "phpstan/phpstan": "^2.3.0" }, "conflict": { "phpunit/phpunit": "<7.0" @@ -12554,41 +12403,39 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan-phpunit/issues", - "source": "https://github.com/phpstan/phpstan-phpunit/tree/2.0.21" + "source": "https://github.com/phpstan/phpstan-phpunit/tree/2.1.2" }, - "time": "2026-10-01T11:59:29+00:00" + "time": "2026-11-12T15:27:53+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "11.0.12", + "version": "12.5.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "2c1ed04922802c15e1de5d7447b4856de949cf56" + "reference": "7440368d94738d54f2c1de24dbd3871793bbb0dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2c1ed04922802c15e1de5d7447b4856de949cf56", - "reference": "2c1ed04922802c15e1de5d7447b4856de949cf56", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7440368d94738d54f2c1de24dbd3871793bbb0dd", + "reference": "7440368d94738d54f2c1de24dbd3871793bbb0dd", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^5.7.0", - "php": ">=8.2", - "phpunit/php-file-iterator": "^5.1.0", - "phpunit/php-text-template": "^4.0.1", - "sebastian/code-unit-reverse-lookup": "^4.0.1", - "sebastian/complexity": "^4.0.1", - "sebastian/environment": "^7.2.1", - "sebastian/lines-of-code": "^3.0.1", - "sebastian/version": "^5.0.2", - "theseer/tokenizer": "^1.3.1" + "nikic/php-parser": "^5.9.0", + "php": ">=8.3", + "phpunit/php-text-template": "^5.0.1", + "sebastian/complexity": "^5.0", + "sebastian/environment": "^8.1.2", + "sebastian/lines-of-code": "^4.0.1", + "sebastian/version": "^6.0", + "theseer/tokenizer": "^2.0.1" }, "require-dev": { - "phpunit/phpunit": "^11.5.46" + "phpunit/phpunit": "^12.5.37" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -12597,7 +12444,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "11.0.x-dev" + "dev-main": "12.5.x-dev" } }, "autoload": { @@ -12626,7 +12473,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.12" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.5.8" }, "funding": [ { @@ -12646,32 +12493,32 @@ "type": "tidelift" } ], - "time": "2025-12-24T07:01:01+00:00" + "time": "2026-10-03T14:03:50+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "5.1.1", + "version": "6.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "2f3a64888c814fc235386b7387dd5b5ed92ad903" + "reference": "a248d1640ab059b075f53a2ef0f9856e864e06b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/2f3a64888c814fc235386b7387dd5b5ed92ad903", - "reference": "2f3a64888c814fc235386b7387dd5b5ed92ad903", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a248d1640ab059b075f53a2ef0f9856e864e06b5", + "reference": "a248d1640ab059b075f53a2ef0f9856e864e06b5", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^11.3" + "phpunit/phpunit": "^12.5.33" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "5.1-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -12699,7 +12546,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.1.1" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/6.0.2" }, "funding": [ { @@ -12719,28 +12566,28 @@ "type": "tidelift" } ], - "time": "2026-02-02T13:52:54+00:00" + "time": "2026-08-25T14:40:53+00:00" }, { "name": "phpunit/php-invoker", - "version": "5.0.1", + "version": "6.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-invoker.git", - "reference": "c1ca3814734c07492b3d4c5f794f4b0995333da2" + "reference": "12b54e689b07a25a9b41e57736dfab6ec9ae5406" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/c1ca3814734c07492b3d4c5f794f4b0995333da2", - "reference": "c1ca3814734c07492b3d4c5f794f4b0995333da2", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/12b54e689b07a25a9b41e57736dfab6ec9ae5406", + "reference": "12b54e689b07a25a9b41e57736dfab6ec9ae5406", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=8.3" }, "require-dev": { "ext-pcntl": "*", - "phpunit/phpunit": "^11.0" + "phpunit/phpunit": "^12.0" }, "suggest": { "ext-pcntl": "*" @@ -12748,7 +12595,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "5.0-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -12775,7 +12622,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-invoker/issues", "security": "https://github.com/sebastianbergmann/php-invoker/security/policy", - "source": "https://github.com/sebastianbergmann/php-invoker/tree/5.0.1" + "source": "https://github.com/sebastianbergmann/php-invoker/tree/6.0.0" }, "funding": [ { @@ -12783,32 +12630,32 @@ "type": "github" } ], - "time": "2024-07-03T05:07:44+00:00" + "time": "2025-02-07T04:58:58+00:00" }, { "name": "phpunit/php-text-template", - "version": "4.0.1", + "version": "5.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "3e0404dc6b300e6bf56415467ebcb3fe4f33e964" + "reference": "babab73b7ef9fae406f2eb3ee11323a61caa63d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/3e0404dc6b300e6bf56415467ebcb3fe4f33e964", - "reference": "3e0404dc6b300e6bf56415467ebcb3fe4f33e964", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/babab73b7ef9fae406f2eb3ee11323a61caa63d5", + "reference": "babab73b7ef9fae406f2eb3ee11323a61caa63d5", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^11.0" + "phpunit/phpunit": "^12.5.37" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "4.0-dev" + "dev-main": "5.0-dev" } }, "autoload": { @@ -12835,40 +12682,52 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-text-template/issues", "security": "https://github.com/sebastianbergmann/php-text-template/security/policy", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/4.0.1" + "source": "https://github.com/sebastianbergmann/php-text-template/tree/5.0.1" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/php-text-template", + "type": "tidelift" } ], - "time": "2024-07-03T05:08:43+00:00" + "time": "2026-10-03T04:51:29+00:00" }, { "name": "phpunit/php-timer", - "version": "7.0.1", + "version": "8.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "3b415def83fbcb41f991d9ebf16ae4ad8b7837b3" + "reference": "f258ce36aa457f3aa3339f9ed4c81fc66dc8c2cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3b415def83fbcb41f991d9ebf16ae4ad8b7837b3", - "reference": "3b415def83fbcb41f991d9ebf16ae4ad8b7837b3", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/f258ce36aa457f3aa3339f9ed4c81fc66dc8c2cc", + "reference": "f258ce36aa457f3aa3339f9ed4c81fc66dc8c2cc", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^11.0" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "7.0-dev" + "dev-main": "8.0-dev" } }, "autoload": { @@ -12895,7 +12754,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-timer/issues", "security": "https://github.com/sebastianbergmann/php-timer/security/policy", - "source": "https://github.com/sebastianbergmann/php-timer/tree/7.0.1" + "source": "https://github.com/sebastianbergmann/php-timer/tree/8.0.0" }, "funding": [ { @@ -12903,20 +12762,20 @@ "type": "github" } ], - "time": "2024-07-03T05:09:35+00:00" + "time": "2025-02-07T04:59:38+00:00" }, { "name": "phpunit/phpunit", - "version": "11.5.56", + "version": "12.5.44", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "5f83edffa6967c3db468d48a695ec7bcb02e9256" + "reference": "47d052b58672b016b512974c1139346306c8ca24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5f83edffa6967c3db468d48a695ec7bcb02e9256", - "reference": "5f83edffa6967c3db468d48a695ec7bcb02e9256", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/47d052b58672b016b512974c1139346306c8ca24", + "reference": "47d052b58672b016b512974c1139346306c8ca24", "shasum": "" }, "require": { @@ -12926,38 +12785,34 @@ "ext-libxml": "*", "ext-mbstring": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.13.4", + "myclabs/deep-copy": "^1.14.0", "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", - "php": ">=8.2", - "phpunit/php-code-coverage": "^11.0.12", - "phpunit/php-file-iterator": "^5.1.1", - "phpunit/php-invoker": "^5.0.1", - "phpunit/php-text-template": "^4.0.1", - "phpunit/php-timer": "^7.0.1", - "sebastian/cli-parser": "^3.0.2", - "sebastian/code-unit": "^3.0.3", - "sebastian/comparator": "^6.3.3", - "sebastian/diff": "^6.0.2", - "sebastian/environment": "^7.2.1", - "sebastian/exporter": "^6.3.2", - "sebastian/global-state": "^7.0.2", - "sebastian/object-enumerator": "^6.0.1", - "sebastian/recursion-context": "^6.0.3", - "sebastian/type": "^5.1.3", - "sebastian/version": "^5.0.2", + "php": ">=8.3", + "phpunit/php-code-coverage": "^12.5.8", + "phpunit/php-file-iterator": "^6.0.2", + "phpunit/php-invoker": "^6.0.0", + "phpunit/php-text-template": "^5.0.1", + "phpunit/php-timer": "^8.0.0", + "sebastian/cli-parser": "^4.2.1", + "sebastian/comparator": "^7.1.8", + "sebastian/diff": "^7.0.1", + "sebastian/environment": "^8.1.2", + "sebastian/exporter": "^7.0.3", + "sebastian/global-state": "^8.0.3", + "sebastian/object-enumerator": "^7.0.0", + "sebastian/recursion-context": "^7.0.1", + "sebastian/type": "^6.0.4", + "sebastian/version": "^6.0.2", "staabm/side-effects-detector": "^1.0.5" }, - "suggest": { - "ext-soap": "To be able to generate mocks based on WSDL files" - }, "bin": [ "phpunit" ], "type": "library", "extra": { "branch-alias": { - "dev-main": "11.5-dev" + "dev-main": "12.5-dev" } }, "autoload": { @@ -12989,7 +12844,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.56" + "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.44" }, "funding": [ { @@ -12997,7 +12852,7 @@ "type": "other" } ], - "time": "2026-07-06T14:52:39+00:00" + "time": "2026-11-13T11:09:06+00:00" }, { "name": "react/promise", @@ -13074,21 +12929,21 @@ }, { "name": "rector/rector", - "version": "2.6.7", + "version": "2.8.4", "source": { "type": "git", "url": "https://github.com/rectorphp/rector.git", - "reference": "f4aa224edb9b0630fb43826d4cb6a49b62e48d4c" + "reference": "55acbd956d7e3907f7d21aab54edd68a310609e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rectorphp/rector/zipball/f4aa224edb9b0630fb43826d4cb6a49b62e48d4c", - "reference": "f4aa224edb9b0630fb43826d4cb6a49b62e48d4c", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/55acbd956d7e3907f7d21aab54edd68a310609e6", + "reference": "55acbd956d7e3907f7d21aab54edd68a310609e6", "shasum": "" }, "require": { "php": "^7.4|^8.0", - "phpstan/phpstan": "^2.2.14" + "phpstan/phpstan": "^2.3.5" }, "conflict": { "rector/rector-doctrine": "*", @@ -13119,7 +12974,7 @@ ], "support": { "issues": "https://github.com/rectorphp/rector/issues", - "source": "https://github.com/rectorphp/rector/tree/2.6.7" + "source": "https://github.com/rectorphp/rector/tree/2.8.4" }, "funding": [ { @@ -13127,32 +12982,32 @@ "type": "github" } ], - "time": "2026-09-13T20:17:44+00:00" + "time": "2026-11-03T18:48:08+00:00" }, { "name": "sebastian/cli-parser", - "version": "3.0.2", + "version": "4.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "15c5dd40dc4f38794d383bb95465193f5e0ae180" + "reference": "7d05781b13f7dec9043a629a21d086ed74582a15" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/15c5dd40dc4f38794d383bb95465193f5e0ae180", - "reference": "15c5dd40dc4f38794d383bb95465193f5e0ae180", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/7d05781b13f7dec9043a629a21d086ed74582a15", + "reference": "7d05781b13f7dec9043a629a21d086ed74582a15", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^11.0" + "phpunit/phpunit": "^12.5.25" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "4.2-dev" } }, "autoload": { @@ -13176,40 +13031,145 @@ "support": { "issues": "https://github.com/sebastianbergmann/cli-parser/issues", "security": "https://github.com/sebastianbergmann/cli-parser/security/policy", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/3.0.2" + "source": "https://github.com/sebastianbergmann/cli-parser/tree/4.2.1" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/cli-parser", + "type": "tidelift" } ], - "time": "2024-07-03T04:41:36+00:00" + "time": "2026-05-17T05:29:34+00:00" }, { - "name": "sebastian/code-unit", - "version": "3.0.3", + "name": "sebastian/comparator", + "version": "7.1.8", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit.git", - "reference": "54391c61e4af8078e5b276ab082b6d3c54c9ad64" + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "7c65c1e79836812819705b473a90c12399542485" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/54391c61e4af8078e5b276ab082b6d3c54c9ad64", - "reference": "54391c61e4af8078e5b276ab082b6d3c54c9ad64", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/7c65c1e79836812819705b473a90c12399542485", + "reference": "7c65c1e79836812819705b473a90c12399542485", "shasum": "" }, "require": { - "php": ">=8.2" + "ext-dom": "*", + "ext-mbstring": "*", + "php": ">=8.3", + "sebastian/diff": "^7.0", + "sebastian/exporter": "^7.0.3" }, "require-dev": { - "phpunit/phpunit": "^11.5" + "phpunit/phpunit": "^12.5.25" + }, + "suggest": { + "ext-bcmath": "For comparing BcMath\\Number objects" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "7.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "https://github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/comparator/issues", + "security": "https://github.com/sebastianbergmann/comparator/security/policy", + "source": "https://github.com/sebastianbergmann/comparator/tree/7.1.8" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator", + "type": "tidelift" + } + ], + "time": "2026-05-21T04:45:25+00:00" + }, + { + "name": "sebastian/complexity", + "version": "5.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/complexity.git", + "reference": "bad4316aba5303d0221f43f8cee37eb58d384bbb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/bad4316aba5303d0221f43f8cee37eb58d384bbb", + "reference": "bad4316aba5303d0221f43f8cee37eb58d384bbb", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^5.0", + "php": ">=8.3" + }, + "require-dev": { + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "5.0-dev" } }, "autoload": { @@ -13228,45 +13188,202 @@ "role": "lead" } ], - "description": "Collection of value objects that represent the PHP code units", - "homepage": "https://github.com/sebastianbergmann/code-unit", + "description": "Library for calculating the complexity of PHP code units", + "homepage": "https://github.com/sebastianbergmann/complexity", + "support": { + "issues": "https://github.com/sebastianbergmann/complexity/issues", + "security": "https://github.com/sebastianbergmann/complexity/security/policy", + "source": "https://github.com/sebastianbergmann/complexity/tree/5.0.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2025-02-07T04:55:25+00:00" + }, + { + "name": "sebastian/diff", + "version": "7.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6", + "reference": "cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6", + "shasum": "" + }, + "require": { + "php": ">=8.3" + }, + "require-dev": { + "phpunit/phpunit": "^12.5.33", + "symfony/process": "^7.4.17" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "7.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff", + "udiff", + "unidiff", + "unified diff" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "security": "https://github.com/sebastianbergmann/diff/security/policy", + "source": "https://github.com/sebastianbergmann/diff/tree/7.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/diff", + "type": "tidelift" + } + ], + "time": "2026-08-25T15:35:54+00:00" + }, + { + "name": "sebastian/environment", + "version": "8.1.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "9d32c685773823b1983e256ae4ecd48a10d6e439" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/9d32c685773823b1983e256ae4ecd48a10d6e439", + "reference": "9d32c685773823b1983e256ae4ecd48a10d6e439", + "shasum": "" + }, + "require": { + "php": ">=8.3" + }, + "require-dev": { + "phpunit/phpunit": "^12.5.26" + }, + "suggest": { + "ext-posix": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "8.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "https://github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], "support": { - "issues": "https://github.com/sebastianbergmann/code-unit/issues", - "security": "https://github.com/sebastianbergmann/code-unit/security/policy", - "source": "https://github.com/sebastianbergmann/code-unit/tree/3.0.3" + "issues": "https://github.com/sebastianbergmann/environment/issues", + "security": "https://github.com/sebastianbergmann/environment/security/policy", + "source": "https://github.com/sebastianbergmann/environment/tree/8.1.2" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/environment", + "type": "tidelift" } ], - "time": "2025-03-19T07:56:08+00:00" + "time": "2026-05-25T13:40:20+00:00" }, { - "name": "sebastian/code-unit-reverse-lookup", - "version": "4.0.1", + "name": "sebastian/exporter", + "version": "7.0.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "183a9b2632194febd219bb9246eee421dad8d45e" + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "c5e21b5de653ce0a769fb36f5cdfcb5e7a32cf23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/183a9b2632194febd219bb9246eee421dad8d45e", - "reference": "183a9b2632194febd219bb9246eee421dad8d45e", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c5e21b5de653ce0a769fb36f5cdfcb5e7a32cf23", + "reference": "c5e21b5de653ce0a769fb36f5cdfcb5e7a32cf23", "shasum": "" }, "require": { - "php": ">=8.2" + "ext-mbstring": "*", + "php": ">=8.3", + "sebastian/recursion-context": "^7.0.1" }, "require-dev": { - "phpunit/phpunit": "^11.0" + "phpunit/phpunit": "^12.5.25" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "4.0-dev" + "dev-main": "7.0-dev" } }, "autoload": { @@ -13282,54 +13399,82 @@ { "name": "Sebastian Bergmann", "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" } ], - "description": "Looks up which function or method a line of code belongs to", - "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "https://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], "support": { - "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "security": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/security/policy", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/4.0.1" + "issues": "https://github.com/sebastianbergmann/exporter/issues", + "security": "https://github.com/sebastianbergmann/exporter/security/policy", + "source": "https://github.com/sebastianbergmann/exporter/tree/7.0.3" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/exporter", + "type": "tidelift" } ], - "time": "2024-07-03T04:45:54+00:00" + "time": "2026-05-20T04:37:17+00:00" }, { - "name": "sebastian/comparator", - "version": "6.3.3", + "name": "sebastian/global-state", + "version": "8.0.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2c95e1e86cb8dd41beb8d502057d1081ccc8eca9" + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "b164d3274d6537ab462591c5755f76a8f5b1aae9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2c95e1e86cb8dd41beb8d502057d1081ccc8eca9", - "reference": "2c95e1e86cb8dd41beb8d502057d1081ccc8eca9", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/b164d3274d6537ab462591c5755f76a8f5b1aae9", + "reference": "b164d3274d6537ab462591c5755f76a8f5b1aae9", "shasum": "" }, "require": { - "ext-dom": "*", - "ext-mbstring": "*", - "php": ">=8.2", - "sebastian/diff": "^6.0", - "sebastian/exporter": "^6.0" + "php": ">=8.3", + "sebastian/object-reflector": "^5.0", + "sebastian/recursion-context": "^7.0.1" }, "require-dev": { - "phpunit/phpunit": "^11.4" - }, - "suggest": { - "ext-bcmath": "For comparing BcMath\\Number objects" + "ext-dom": "*", + "phpunit/phpunit": "^12.5.28" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "6.3-dev" + "dev-main": "8.0-dev" } }, "autoload": { @@ -13345,31 +13490,17 @@ { "name": "Sebastian Bergmann", "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" } ], - "description": "Provides the functionality to compare PHP values for equality", - "homepage": "https://github.com/sebastianbergmann/comparator", + "description": "Snapshotting of global state", + "homepage": "https://www.github.com/sebastianbergmann/global-state", "keywords": [ - "comparator", - "compare", - "equality" + "global state" ], "support": { - "issues": "https://github.com/sebastianbergmann/comparator/issues", - "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.3" + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "security": "https://github.com/sebastianbergmann/global-state/security/policy", + "source": "https://github.com/sebastianbergmann/global-state/tree/8.0.3" }, "funding": [ { @@ -13385,32 +13516,32 @@ "type": "thanks_dev" }, { - "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator", + "url": "https://tidelift.com/funding/github/packagist/sebastian/global-state", "type": "tidelift" } ], - "time": "2026-01-24T09:26:40+00:00" + "time": "2026-06-01T15:10:33+00:00" }, { - "name": "sebastian/complexity", + "name": "sebastian/lines-of-code", "version": "4.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "ee41d384ab1906c68852636b6de493846e13e5a0" + "url": "https://github.com/sebastianbergmann/lines-of-code.git", + "reference": "d543b8ef219dcd8da262cbb958639a96bedba10e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/ee41d384ab1906c68852636b6de493846e13e5a0", - "reference": "ee41d384ab1906c68852636b6de493846e13e5a0", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/d543b8ef219dcd8da262cbb958639a96bedba10e", + "reference": "d543b8ef219dcd8da262cbb958639a96bedba10e", "shasum": "" }, "require": { - "nikic/php-parser": "^5.0", - "php": ">=8.2" + "nikic/php-parser": "^5.7.0", + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^11.0" + "phpunit/phpunit": "^12.5.25" }, "type": "library", "extra": { @@ -13434,46 +13565,59 @@ "role": "lead" } ], - "description": "Library for calculating the complexity of PHP code units", - "homepage": "https://github.com/sebastianbergmann/complexity", + "description": "Library for counting the lines of code in PHP source code", + "homepage": "https://github.com/sebastianbergmann/lines-of-code", "support": { - "issues": "https://github.com/sebastianbergmann/complexity/issues", - "security": "https://github.com/sebastianbergmann/complexity/security/policy", - "source": "https://github.com/sebastianbergmann/complexity/tree/4.0.1" + "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", + "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy", + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/4.0.1" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/lines-of-code", + "type": "tidelift" } ], - "time": "2024-07-03T04:49:50+00:00" + "time": "2026-05-19T16:22:07+00:00" }, { - "name": "sebastian/diff", - "version": "6.0.2", + "name": "sebastian/object-enumerator", + "version": "7.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544" + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "1effe8e9b8e068e9ae228e542d5d11b5d16db894" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/b4ccd857127db5d41a5b676f24b51371d76d8544", - "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1effe8e9b8e068e9ae228e542d5d11b5d16db894", + "reference": "1effe8e9b8e068e9ae228e542d5d11b5d16db894", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=8.3", + "sebastian/object-reflector": "^5.0", + "sebastian/recursion-context": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^11.0", - "symfony/process": "^4.2 || ^5" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "6.0-dev" + "dev-main": "7.0-dev" } }, "autoload": { @@ -13489,24 +13633,14 @@ { "name": "Sebastian Bergmann", "email": "sebastian@phpunit.de" - }, - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" } ], - "description": "Diff implementation", - "homepage": "https://github.com/sebastianbergmann/diff", - "keywords": [ - "diff", - "udiff", - "unidiff", - "unified diff" - ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", "support": { - "issues": "https://github.com/sebastianbergmann/diff/issues", - "security": "https://github.com/sebastianbergmann/diff/security/policy", - "source": "https://github.com/sebastianbergmann/diff/tree/6.0.2" + "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", + "security": "https://github.com/sebastianbergmann/object-enumerator/security/policy", + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/7.0.0" }, "funding": [ { @@ -13514,35 +13648,32 @@ "type": "github" } ], - "time": "2024-07-03T04:53:05+00:00" + "time": "2025-02-07T04:57:48+00:00" }, { - "name": "sebastian/environment", - "version": "7.2.1", + "name": "sebastian/object-reflector", + "version": "5.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "a5c75038693ad2e8d4b6c15ba2403532647830c4" + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "4bfa827c969c98be1e527abd576533293c634f6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/a5c75038693ad2e8d4b6c15ba2403532647830c4", - "reference": "a5c75038693ad2e8d4b6c15ba2403532647830c4", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/4bfa827c969c98be1e527abd576533293c634f6a", + "reference": "4bfa827c969c98be1e527abd576533293c634f6a", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^11.3" - }, - "suggest": { - "ext-posix": "*" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "7.2-dev" + "dev-main": "5.0-dev" } }, "autoload": { @@ -13560,64 +13691,45 @@ "email": "sebastian@phpunit.de" } ], - "description": "Provides functionality to handle HHVM/PHP environments", - "homepage": "https://github.com/sebastianbergmann/environment", - "keywords": [ - "Xdebug", - "environment", - "hhvm" - ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", "support": { - "issues": "https://github.com/sebastianbergmann/environment/issues", - "security": "https://github.com/sebastianbergmann/environment/security/policy", - "source": "https://github.com/sebastianbergmann/environment/tree/7.2.1" + "issues": "https://github.com/sebastianbergmann/object-reflector/issues", + "security": "https://github.com/sebastianbergmann/object-reflector/security/policy", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/5.0.0" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://liberapay.com/sebastianbergmann", - "type": "liberapay" - }, - { - "url": "https://thanks.dev/u/gh/sebastianbergmann", - "type": "thanks_dev" - }, - { - "url": "https://tidelift.com/funding/github/packagist/sebastian/environment", - "type": "tidelift" } ], - "time": "2025-05-21T11:55:47+00:00" + "time": "2025-02-07T04:58:17+00:00" }, { - "name": "sebastian/exporter", - "version": "6.3.2", + "name": "sebastian/recursion-context", + "version": "7.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "70a298763b40b213ec087c51c739efcaa90bcd74" + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "0b01998a7d5b1f122911a66bebcb8d46f0c82d8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/70a298763b40b213ec087c51c739efcaa90bcd74", - "reference": "70a298763b40b213ec087c51c739efcaa90bcd74", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/0b01998a7d5b1f122911a66bebcb8d46f0c82d8c", + "reference": "0b01998a7d5b1f122911a66bebcb8d46f0c82d8c", "shasum": "" }, "require": { - "ext-mbstring": "*", - "php": ">=8.2", - "sebastian/recursion-context": "^6.0" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^11.3" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "6.3-dev" + "dev-main": "7.0-dev" } }, "autoload": { @@ -13638,29 +13750,17 @@ "name": "Jeff Welch", "email": "whatthejeff@gmail.com" }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, { "name": "Adam Harvey", "email": "aharvey@php.net" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" } ], - "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "https://www.github.com/sebastianbergmann/exporter", - "keywords": [ - "export", - "exporter" - ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { - "issues": "https://github.com/sebastianbergmann/exporter/issues", - "security": "https://github.com/sebastianbergmann/exporter/security/policy", - "source": "https://github.com/sebastianbergmann/exporter/tree/6.3.2" + "issues": "https://github.com/sebastianbergmann/recursion-context/issues", + "security": "https://github.com/sebastianbergmann/recursion-context/security/policy", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/7.0.1" }, "funding": [ { @@ -13676,39 +13776,36 @@ "type": "thanks_dev" }, { - "url": "https://tidelift.com/funding/github/packagist/sebastian/exporter", + "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context", "type": "tidelift" } ], - "time": "2025-09-24T06:12:51+00:00" + "time": "2025-08-13T04:44:59+00:00" }, { - "name": "sebastian/global-state", - "version": "7.0.2", + "name": "sebastian/type", + "version": "6.0.4", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "3be331570a721f9a4b5917f4209773de17f747d7" + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "82ff822c2edc46724be9f7411d3163021f602773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/3be331570a721f9a4b5917f4209773de17f747d7", - "reference": "3be331570a721f9a4b5917f4209773de17f747d7", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/82ff822c2edc46724be9f7411d3163021f602773", + "reference": "82ff822c2edc46724be9f7411d3163021f602773", "shasum": "" }, "require": { - "php": ">=8.2", - "sebastian/object-reflector": "^4.0", - "sebastian/recursion-context": "^6.0" + "php": ">=8.3" }, "require-dev": { - "ext-dom": "*", - "phpunit/phpunit": "^11.0" + "phpunit/phpunit": "^12.5.25" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "7.0-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -13723,52 +13820,58 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Snapshotting of global state", - "homepage": "https://www.github.com/sebastianbergmann/global-state", - "keywords": [ - "global state" - ], + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", "support": { - "issues": "https://github.com/sebastianbergmann/global-state/issues", - "security": "https://github.com/sebastianbergmann/global-state/security/policy", - "source": "https://github.com/sebastianbergmann/global-state/tree/7.0.2" + "issues": "https://github.com/sebastianbergmann/type/issues", + "security": "https://github.com/sebastianbergmann/type/security/policy", + "source": "https://github.com/sebastianbergmann/type/tree/6.0.4" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/type", + "type": "tidelift" } ], - "time": "2024-07-03T04:57:36+00:00" + "time": "2026-05-20T06:45:45+00:00" }, { - "name": "sebastian/lines-of-code", - "version": "3.0.1", + "name": "sebastian/version", + "version": "6.0.2", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "d36ad0d782e5756913e42ad87cb2890f4ffe467a" + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "a8b6643a19ba6c8125a473623e45fb8cbb0e4159" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/d36ad0d782e5756913e42ad87cb2890f4ffe467a", - "reference": "d36ad0d782e5756913e42ad87cb2890f4ffe467a", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/a8b6643a19ba6c8125a473623e45fb8cbb0e4159", + "reference": "a8b6643a19ba6c8125a473623e45fb8cbb0e4159", "shasum": "" }, "require": { - "nikic/php-parser": "^5.0", - "php": ">=8.2" - }, - "require-dev": { - "phpunit/phpunit": "^11.0" + "php": ">=8.3" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -13787,424 +13890,464 @@ "role": "lead" } ], - "description": "Library for counting the lines of code in PHP source code", - "homepage": "https://github.com/sebastianbergmann/lines-of-code", + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", "support": { - "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/3.0.1" + "issues": "https://github.com/sebastianbergmann/version/issues", + "security": "https://github.com/sebastianbergmann/version/security/policy", + "source": "https://github.com/sebastianbergmann/version/tree/6.0.2" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/version", + "type": "tidelift" } ], - "time": "2024-07-03T04:58:38+00:00" + "time": "2026-11-09T06:30:55+00:00" }, { - "name": "sebastian/object-enumerator", - "version": "6.0.1", + "name": "seld/jsonlint", + "version": "1.12.2", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "f5b498e631a74204185071eb41f33f38d64608aa" + "url": "https://github.com/Seldaek/jsonlint.git", + "reference": "4882a0459c88772e4afa3a73ee81b7824490aa9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/f5b498e631a74204185071eb41f33f38d64608aa", - "reference": "f5b498e631a74204185071eb41f33f38d64608aa", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/4882a0459c88772e4afa3a73ee81b7824490aa9c", + "reference": "4882a0459c88772e4afa3a73ee81b7824490aa9c", "shasum": "" }, "require": { - "php": ">=8.2", - "sebastian/object-reflector": "^4.0", - "sebastian/recursion-context": "^6.0" + "php": "^5.3 || ^7.0 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^11.0" + "phpstan/phpstan": "^1.11", + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13" }, + "bin": [ + "bin/jsonlint" + ], "type": "library", - "extra": { - "branch-alias": { - "dev-main": "6.0-dev" - } - }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Seld\\JsonLint\\": "src/Seld/JsonLint/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "https://seld.be" } ], - "description": "Traverses array structures and object graphs to enumerate all referenced objects", - "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "description": "JSON Linter", + "keywords": [ + "json", + "linter", + "parser", + "validator" + ], "support": { - "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "security": "https://github.com/sebastianbergmann/object-enumerator/security/policy", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/6.0.1" + "issues": "https://github.com/Seldaek/jsonlint/issues", + "source": "https://github.com/Seldaek/jsonlint/tree/1.12.2" }, "funding": [ { - "url": "https://github.com/sebastianbergmann", + "url": "https://github.com/Seldaek", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint", + "type": "tidelift" } ], - "time": "2024-07-03T05:00:13+00:00" + "time": "2026-11-03T10:16:18+00:00" }, { - "name": "sebastian/object-reflector", - "version": "4.0.1", + "name": "seld/phar-utils", + "version": "1.2.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "6e1a43b411b2ad34146dee7524cb13a068bb35f9" + "url": "https://github.com/Seldaek/phar-utils.git", + "reference": "65fb381613fd31745d39a740a112a233f978d2d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/6e1a43b411b2ad34146dee7524cb13a068bb35f9", - "reference": "6e1a43b411b2ad34146dee7524cb13a068bb35f9", + "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/65fb381613fd31745d39a740a112a233f978d2d9", + "reference": "65fb381613fd31745d39a740a112a233f978d2d9", "shasum": "" }, "require": { - "php": ">=8.2" - }, - "require-dev": { - "phpunit/phpunit": "^11.0" + "php": ">=5.3" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "4.0-dev" + "dev-master": "1.x-dev" } }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Seld\\PharUtils\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" } ], - "description": "Allows reflection of object attributes, including inherited and non-public ones", - "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "description": "PHAR file format utilities, for when PHP phars you up", + "keywords": [ + "phar" + ], "support": { - "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "security": "https://github.com/sebastianbergmann/object-reflector/security/policy", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/4.0.1" + "issues": "https://github.com/Seldaek/phar-utils/issues", + "source": "https://github.com/Seldaek/phar-utils/tree/1.2.3" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2024-07-03T05:01:32+00:00" + "time": "2026-10-01T08:16:23+00:00" }, { - "name": "sebastian/recursion-context", - "version": "6.0.3", + "name": "seld/signal-handler", + "version": "2.0.2", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "f6458abbf32a6c8174f8f26261475dc133b3d9dc" + "url": "https://github.com/Seldaek/signal-handler.git", + "reference": "04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/f6458abbf32a6c8174f8f26261475dc133b3d9dc", - "reference": "f6458abbf32a6c8174f8f26261475dc133b3d9dc", + "url": "https://api.github.com/repos/Seldaek/signal-handler/zipball/04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98", + "reference": "04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=7.2.0" }, "require-dev": { - "phpunit/phpunit": "^11.3" + "phpstan/phpstan": "^1", + "phpstan/phpstan-deprecation-rules": "^1.0", + "phpstan/phpstan-phpunit": "^1", + "phpstan/phpstan-strict-rules": "^1.3", + "phpunit/phpunit": "^7.5.20 || ^8.5.23", + "psr/log": "^1 || ^2 || ^3" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "6.0-dev" + "dev-main": "2.x-dev" } }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Seld\\Signal\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" } ], - "description": "Provides functionality to recursively process PHP variables", - "homepage": "https://github.com/sebastianbergmann/recursion-context", + "description": "Simple unix signal handler that silently fails where signals are not supported for easy cross-platform development", + "keywords": [ + "posix", + "sigint", + "signal", + "sigterm", + "unix" + ], "support": { - "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "security": "https://github.com/sebastianbergmann/recursion-context/security/policy", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/6.0.3" + "issues": "https://github.com/Seldaek/signal-handler/issues", + "source": "https://github.com/Seldaek/signal-handler/tree/2.0.2" }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - }, - { - "url": "https://liberapay.com/sebastianbergmann", - "type": "liberapay" - }, - { - "url": "https://thanks.dev/u/gh/sebastianbergmann", - "type": "thanks_dev" - }, - { - "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context", - "type": "tidelift" - } - ], - "time": "2025-08-13T04:42:22+00:00" + "time": "2023-09-03T09:24:00+00:00" }, { - "name": "sebastian/type", - "version": "5.1.3", + "name": "spatie/backtrace", + "version": "1.8.2", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/type.git", - "reference": "f77d2d4e78738c98d9a68d2596fe5e8fa380f449" + "url": "https://github.com/spatie/backtrace.git", + "reference": "8ffe78be5ed355b5009e3dd989d183433e9a5adc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/f77d2d4e78738c98d9a68d2596fe5e8fa380f449", - "reference": "f77d2d4e78738c98d9a68d2596fe5e8fa380f449", + "url": "https://api.github.com/repos/spatie/backtrace/zipball/8ffe78be5ed355b5009e3dd989d183433e9a5adc", + "reference": "8ffe78be5ed355b5009e3dd989d183433e9a5adc", "shasum": "" }, "require": { - "php": ">=8.2" + "php": "^7.3 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^11.3" + "ext-json": "*", + "laravel/serializable-closure": "^1.3 || ^2.0", + "phpunit/phpunit": "^9.3 || ^11.4.3", + "spatie/phpunit-snapshot-assertions": "^4.2 || ^5.1.6", + "symfony/var-dumper": "^5.1|^6.0|^7.0|^8.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "5.1-dev" - } - }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Spatie\\Backtrace\\": "src" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Freek Van de Herten", + "email": "freek@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" } ], - "description": "Collection of value objects that represent the types of the PHP type system", - "homepage": "https://github.com/sebastianbergmann/type", + "description": "A better backtrace", + "homepage": "https://github.com/spatie/backtrace", + "keywords": [ + "Backtrace", + "spatie" + ], "support": { - "issues": "https://github.com/sebastianbergmann/type/issues", - "security": "https://github.com/sebastianbergmann/type/security/policy", - "source": "https://github.com/sebastianbergmann/type/tree/5.1.3" + "issues": "https://github.com/spatie/backtrace/issues", + "source": "https://github.com/spatie/backtrace/tree/1.8.2" }, "funding": [ { - "url": "https://github.com/sebastianbergmann", + "url": "https://github.com/sponsors/spatie", "type": "github" }, { - "url": "https://liberapay.com/sebastianbergmann", - "type": "liberapay" - }, - { - "url": "https://thanks.dev/u/gh/sebastianbergmann", - "type": "thanks_dev" - }, - { - "url": "https://tidelift.com/funding/github/packagist/sebastian/type", - "type": "tidelift" + "url": "https://spatie.be/open-source/support-us", + "type": "other" } ], - "time": "2025-08-09T06:55:48+00:00" + "time": "2026-03-11T13:48:28+00:00" }, { - "name": "sebastian/version", - "version": "5.0.2", + "name": "spatie/error-solutions", + "version": "1.1.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874" + "url": "https://github.com/spatie/error-solutions.git", + "reference": "e495d7178ca524f2dd0fe6a1d99a1e608e1c9936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c687e3387b99f5b03b6caa64c74b63e2936ff874", - "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874", + "url": "https://api.github.com/repos/spatie/error-solutions/zipball/e495d7178ca524f2dd0fe6a1d99a1e608e1c9936", + "reference": "e495d7178ca524f2dd0fe6a1d99a1e608e1c9936", "shasum": "" }, - "require": { - "php": ">=8.2" + "require": { + "php": "^8.0" + }, + "require-dev": { + "illuminate/broadcasting": "^10.0|^11.0|^12.0", + "illuminate/cache": "^10.0|^11.0|^12.0", + "illuminate/support": "^10.0|^11.0|^12.0", + "livewire/livewire": "^2.11|^3.5.20", + "openai-php/client": "^0.10.1", + "orchestra/testbench": "8.22.3|^9.0|^10.0", + "pestphp/pest": "^2.20|^3.0", + "phpstan/phpstan": "^2.1", + "psr/simple-cache": "^3.0", + "psr/simple-cache-implementation": "^3.0", + "spatie/ray": "^1.28", + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "vlucas/phpdotenv": "^5.5" + }, + "suggest": { + "openai-php/client": "Require get solutions from OpenAI", + "simple-cache-implementation": "To cache solutions from OpenAI" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "5.0-dev" - } - }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "Spatie\\Ignition\\": "legacy/ignition", + "Spatie\\ErrorSolutions\\": "src", + "Spatie\\LaravelIgnition\\": "legacy/laravel-ignition" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Ruben Van Assche", + "email": "ruben@spatie.be", + "role": "Developer" } ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version", + "description": "This is my package error-solutions", + "homepage": "https://github.com/spatie/error-solutions", + "keywords": [ + "error-solutions", + "spatie" + ], "support": { - "issues": "https://github.com/sebastianbergmann/version/issues", - "security": "https://github.com/sebastianbergmann/version/security/policy", - "source": "https://github.com/sebastianbergmann/version/tree/5.0.2" + "issues": "https://github.com/spatie/error-solutions/issues", + "source": "https://github.com/spatie/error-solutions/tree/1.1.3" }, "funding": [ { - "url": "https://github.com/sebastianbergmann", + "url": "https://github.com/Spatie", "type": "github" } ], - "time": "2024-10-09T05:16:32+00:00" + "time": "2025-02-14T12:29:50+00:00" }, { - "name": "seld/jsonlint", - "version": "1.12.1", + "name": "spatie/flare-client-php", + "version": "1.11.2", "source": { "type": "git", - "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "9a90eb5d32d5a500296bf43f946d60246444d5f7" + "url": "https://github.com/spatie/flare-client-php.git", + "reference": "181cab18224b7ed3ec66bccdf645c0e04a1aa3b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/9a90eb5d32d5a500296bf43f946d60246444d5f7", - "reference": "9a90eb5d32d5a500296bf43f946d60246444d5f7", + "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/181cab18224b7ed3ec66bccdf645c0e04a1aa3b1", + "reference": "181cab18224b7ed3ec66bccdf645c0e04a1aa3b1", "shasum": "" }, "require": { - "php": "^5.3 || ^7.0 || ^8.0" + "illuminate/pipeline": "^8.0|^9.0|^10.0|^11.0|^12.0|^13.0", + "php": "^8.0", + "spatie/backtrace": "^1.6.1", + "symfony/http-foundation": "^5.2|^6.0|^7.0|^8.0", + "symfony/mime": "^5.2|^6.0|^7.0|^8.0", + "symfony/process": "^5.2|^6.0|^7.0|^8.0", + "symfony/var-dumper": "^5.2|^6.0|^7.0|^8.0" }, "require-dev": { - "phpstan/phpstan": "^1.11", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13" + "dms/phpunit-arraysubset-asserts": "^0.5.0", + "pestphp/pest": "^1.20|^2.0", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan-deprecation-rules": "^1.0", + "phpstan/phpstan-phpunit": "^1.0", + "spatie/pest-plugin-snapshots": "^1.0|^2.0" }, - "bin": [ - "bin/jsonlint" - ], "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.3.x-dev" + } + }, "autoload": { + "files": [ + "src/helpers.php" + ], "psr-4": { - "Seld\\JsonLint\\": "src/Seld/JsonLint/" + "Spatie\\FlareClient\\": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "https://seld.be" - } - ], - "description": "JSON Linter", + "description": "Send PHP errors to Flare", + "homepage": "https://github.com/spatie/flare-client-php", "keywords": [ - "json", - "linter", - "parser", - "validator" + "exception", + "flare", + "reporting", + "spatie" ], "support": { - "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.12.1" + "issues": "https://github.com/spatie/flare-client-php/issues", + "source": "https://github.com/spatie/flare-client-php/tree/1.11.2" }, "funding": [ { - "url": "https://github.com/Seldaek", + "url": "https://github.com/spatie", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint", - "type": "tidelift" } ], - "time": "2026-06-12T11:32:29+00:00" + "time": "2026-11-04T15:14:45+00:00" }, { - "name": "seld/phar-utils", - "version": "1.2.3", + "name": "spatie/ignition", + "version": "1.16.0", "source": { "type": "git", - "url": "https://github.com/Seldaek/phar-utils.git", - "reference": "65fb381613fd31745d39a740a112a233f978d2d9" + "url": "https://github.com/spatie/ignition.git", + "reference": "b59385bb7aa24dae81bcc15850ebecfda7b40838" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/65fb381613fd31745d39a740a112a233f978d2d9", - "reference": "65fb381613fd31745d39a740a112a233f978d2d9", + "url": "https://api.github.com/repos/spatie/ignition/zipball/b59385bb7aa24dae81bcc15850ebecfda7b40838", + "reference": "b59385bb7aa24dae81bcc15850ebecfda7b40838", "shasum": "" }, "require": { - "php": ">=5.3" + "ext-json": "*", + "ext-mbstring": "*", + "php": "^8.0", + "spatie/backtrace": "^1.7.1", + "spatie/error-solutions": "^1.1.2", + "spatie/flare-client-php": "^1.9", + "symfony/console": "^5.4.42|^6.0|^7.0|^8.0", + "symfony/http-foundation": "^5.4.42|^6.0|^7.0|^8.0", + "symfony/mime": "^5.4.42|^6.0|^7.0|^8.0", + "symfony/var-dumper": "^5.4.42|^6.0|^7.0|^8.0" + }, + "require-dev": { + "illuminate/cache": "^9.52|^10.0|^11.0|^12.0|^13.0", + "mockery/mockery": "^1.4", + "pestphp/pest": "^1.20|^2.0|^3.0", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan-deprecation-rules": "^1.0", + "phpstan/phpstan-phpunit": "^1.0", + "psr/simple-cache-implementation": "*", + "symfony/cache": "^5.4.38|^6.0|^7.0|^8.0", + "symfony/process": "^5.4.35|^6.0|^7.0|^8.0", + "vlucas/phpdotenv": "^5.5" + }, + "suggest": { + "openai-php/client": "Require get solutions from OpenAI", + "simple-cache-implementation": "To cache solutions from OpenAI" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-main": "1.5.x-dev" } }, "autoload": { "psr-4": { - "Seld\\PharUtils\\": "src/" + "Spatie\\Ignition\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -14213,54 +14356,90 @@ ], "authors": [ { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be" + "name": "Spatie", + "email": "info@spatie.be", + "role": "Developer" } ], - "description": "PHAR file format utilities, for when PHP phars you up", + "description": "A beautiful error page for PHP applications.", + "homepage": "https://flareapp.io/ignition", "keywords": [ - "phar" + "error", + "flare", + "laravel", + "page" ], "support": { - "issues": "https://github.com/Seldaek/phar-utils/issues", - "source": "https://github.com/Seldaek/phar-utils/tree/1.2.3" + "docs": "https://flareapp.io/docs/ignition-for-laravel/introduction", + "forum": "https://twitter.com/flareappio", + "issues": "https://github.com/spatie/ignition/issues", + "source": "https://github.com/spatie/ignition" }, - "time": "2026-10-01T08:16:23+00:00" + "funding": [ + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2026-03-17T10:51:08+00:00" }, { - "name": "seld/signal-handler", - "version": "2.0.2", + "name": "spatie/laravel-ignition", + "version": "2.13.0", "source": { "type": "git", - "url": "https://github.com/Seldaek/signal-handler.git", - "reference": "04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98" + "url": "https://github.com/spatie/laravel-ignition.git", + "reference": "0cf60c3e1a63e7fc5ea04d6fb0a162057724f041" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/signal-handler/zipball/04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98", - "reference": "04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98", + "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/0cf60c3e1a63e7fc5ea04d6fb0a162057724f041", + "reference": "0cf60c3e1a63e7fc5ea04d6fb0a162057724f041", "shasum": "" }, "require": { - "php": ">=7.2.0" + "ext-curl": "*", + "ext-json": "*", + "ext-mbstring": "*", + "illuminate/support": "^13.0", + "nesbot/carbon": "^3.13.3", + "php": "^8.4", + "spatie/ignition": "^1.16", + "symfony/console": "^7.4|^8.0", + "symfony/var-dumper": "^7.4|^8.0" }, "require-dev": { - "phpstan/phpstan": "^1", - "phpstan/phpstan-deprecation-rules": "^1.0", - "phpstan/phpstan-phpunit": "^1", - "phpstan/phpstan-strict-rules": "^1.3", - "phpunit/phpunit": "^7.5.20 || ^8.5.23", - "psr/log": "^1 || ^2 || ^3" + "livewire/livewire": "^3.7.0|^4.0|dev-josh/v3-laravel-13-support", + "mockery/mockery": "^1.6.12", + "openai-php/client": "^0.10.3|^0.19", + "orchestra/testbench": "^11.0", + "pestphp/pest": "^5.3.5", + "phpstan/extension-installer": "^1.4.3", + "phpstan/phpstan-deprecation-rules": "^2.0.3", + "phpstan/phpstan-phpunit": "^2.0.8", + "vlucas/phpdotenv": "^5.6.2" + }, + "suggest": { + "openai-php/client": "Require get solutions from OpenAI", + "psr/simple-cache-implementation": "Needed to cache solutions from OpenAI" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "2.x-dev" + "laravel": { + "aliases": { + "Flare": "Spatie\\LaravelIgnition\\Facades\\Flare" + }, + "providers": [ + "Spatie\\LaravelIgnition\\IgnitionServiceProvider" + ] } }, "autoload": { + "files": [ + "src/helpers.php" + ], "psr-4": { - "Seld\\Signal\\": "src/" + "Spatie\\LaravelIgnition\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -14269,24 +14448,32 @@ ], "authors": [ { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" + "name": "Spatie", + "email": "info@spatie.be", + "role": "Developer" } ], - "description": "Simple unix signal handler that silently fails where signals are not supported for easy cross-platform development", + "description": "A beautiful error page for Laravel applications.", + "homepage": "https://flareapp.io/ignition", "keywords": [ - "posix", - "sigint", - "signal", - "sigterm", - "unix" + "error", + "flare", + "laravel", + "page" ], "support": { - "issues": "https://github.com/Seldaek/signal-handler/issues", - "source": "https://github.com/Seldaek/signal-handler/tree/2.0.2" + "docs": "https://flareapp.io/docs/ignition-for-laravel/introduction", + "forum": "https://twitter.com/flareappio", + "issues": "https://github.com/spatie/laravel-ignition/issues", + "source": "https://github.com/spatie/laravel-ignition" }, - "time": "2023-09-03T09:24:00+00:00" + "funding": [ + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2026-11-06T15:11:05+00:00" }, { "name": "staabm/side-effects-detector", @@ -14342,25 +14529,26 @@ }, { "name": "symfony/filesystem", - "version": "v7.4.18", + "version": "v8.1.11", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "90d412aa5277c6819db39e7605aa46b1019e3232" + "reference": "58f57b6a33e3495f7f41e01258f1ae5ef76cccd2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/90d412aa5277c6819db39e7605aa46b1019e3232", - "reference": "90d412aa5277c6819db39e7605aa46b1019e3232", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/58f57b6a33e3495f7f41e01258f1ae5ef76cccd2", + "reference": "58f57b6a33e3495f7f41e01258f1ae5ef76cccd2", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.4.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.8" }, "require-dev": { - "symfony/process": "^6.4|^7.0|^8.0" + "symfony/process": "^7.4|^8.0" }, "type": "library", "autoload": { @@ -14388,7 +14576,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v7.4.18" + "source": "https://github.com/symfony/filesystem/tree/v8.1.11" }, "funding": [ { @@ -14408,7 +14596,7 @@ "type": "tidelift" } ], - "time": "2026-08-23T10:03:40+00:00" + "time": "2026-11-04T08:39:20+00:00" }, { "name": "symfony/polyfill-php73", @@ -14572,23 +14760,23 @@ }, { "name": "theseer/tokenizer", - "version": "1.3.1", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "b7489ce515e168639d17feec34b8847c326b0b3c" + "reference": "7989e43bf381af0eac72e4f0ca5bcbfa81658be4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b7489ce515e168639d17feec34b8847c326b0b3c", - "reference": "b7489ce515e168639d17feec34b8847c326b0b3c", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/7989e43bf381af0eac72e4f0ca5bcbfa81658be4", + "reference": "7989e43bf381af0eac72e4f0ca5bcbfa81658be4", "shasum": "" }, "require": { "ext-dom": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": "^7.2 || ^8.0" + "php": "^8.1" }, "type": "library", "autoload": { @@ -14610,7 +14798,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.3.1" + "source": "https://github.com/theseer/tokenizer/tree/2.0.1" }, "funding": [ { @@ -14618,7 +14806,7 @@ "type": "github" } ], - "time": "2025-11-17T20:03:58+00:00" + "time": "2025-12-08T11:19:18+00:00" } ], "aliases": [], @@ -14627,7 +14815,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^8.2", + "php": "^8.4", "ext-curl": "*", "ext-gd": "*", "ext-json": "*", diff --git a/config/database.php b/config/database.php index e3391f4ae7d..8f868900c0f 100644 --- a/config/database.php +++ b/config/database.php @@ -9,11 +9,49 @@ */ use Illuminate\Support\Str; +use Pdo\Mysql; return [ + + /* + |-------------------------------------------------------------------------- + | Default Database Connection Name + |-------------------------------------------------------------------------- + | + | Here you may specify which of the database connections below you wish + | to use as your default connection for database operations. This is + | the connection which will be utilized unless another connection + | is explicitly specified when you execute a query / statement. + | + */ + 'default' => env('DB_CONNECTION', env('DBTEST') ? 'testing' : 'mysql'), + /* + |-------------------------------------------------------------------------- + | Database Connections + |-------------------------------------------------------------------------- + | + | Below are all of the database connections defined for your application. + | An example configuration is provided for each database system which + | is supported by Laravel. You're free to add / remove connections. + | + */ + 'connections' => [ + + 'sqlite' => [ + 'driver' => 'sqlite', + 'url' => env('DB_URL'), + 'database' => env('DB_DATABASE', database_path('database.sqlite')), + 'prefix' => '', + 'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true), + 'busy_timeout' => null, + 'journal_mode' => null, + 'synchronous' => null, + 'transaction_mode' => 'DEFERRED', + ], + 'mysql' => [ 'driver' => 'mysql', 'url' => env('DB_URL'), @@ -31,14 +69,64 @@ 'engine' => null, 'sslmode' => env('DB_SSLMODE', 'disabled'), 'options' => extension_loaded('pdo_mysql') ? [ - (defined('Pdo\Mysql::ATTR_SSL_VERIFY_SERVER_CERT') ? constant('Pdo\Mysql::ATTR_SSL_VERIFY_SERVER_CERT') : PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT) => env('MYSQL_ATTR_SSL_VERIFY_SERVER_CERT', false), + Mysql::ATTR_SSL_VERIFY_SERVER_CERT => env('MYSQL_ATTR_SSL_VERIFY_SERVER_CERT', false), ] + array_filter([ - (defined('Pdo\Mysql::ATTR_SSL_CA') ? constant('Pdo\Mysql::ATTR_SSL_CA') : PDO::MYSQL_ATTR_SSL_CA) => env('MYSQL_ATTR_SSL_CA'), - (defined('Pdo\Mysql::ATTR_SSL_CERT') ? constant('Pdo\Mysql::ATTR_SSL_CERT') : PDO::MYSQL_ATTR_SSL_CERT) => env('MYSQL_ATTR_SSL_CERT'), - (defined('Pdo\Mysql::ATTR_SSL_KEY') ? constant('Pdo\Mysql::ATTR_SSL_KEY') : PDO::MYSQL_ATTR_SSL_KEY) => env('MYSQL_ATTR_SSL_KEY'), + Mysql::ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + Mysql::ATTR_SSL_CERT => env('MYSQL_ATTR_SSL_CERT'), + Mysql::ATTR_SSL_KEY => env('MYSQL_ATTR_SSL_KEY'), + ]) : [], + ], + + 'mariadb' => [ + 'driver' => 'mariadb', + 'url' => env('DB_URL'), + 'host' => env('DB_HOST', '127.0.0.1'), + 'port' => env('DB_PORT', '3306'), + 'database' => env('DB_DATABASE', 'librenms'), + 'username' => env('DB_USERNAME', 'librenms'), + 'password' => env('DB_PASSWORD', ''), + 'unix_socket' => env('DB_SOCKET', ''), + 'charset' => env('DB_CHARSET', 'utf8mb4'), + 'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'), + 'prefix' => '', + 'prefix_indexes' => true, + 'strict' => true, + 'engine' => null, + 'options' => extension_loaded('pdo_mysql') ? array_filter([ + Mysql::ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), ]) : [], ], + 'pgsql' => [ + 'driver' => 'pgsql', + 'url' => env('DB_URL'), + 'host' => env('DB_HOST', '127.0.0.1'), + 'port' => env('DB_PORT', '5432'), + 'database' => env('DB_DATABASE', 'laravel'), + 'username' => env('DB_USERNAME', 'root'), + 'password' => env('DB_PASSWORD', ''), + 'charset' => env('DB_CHARSET', 'utf8'), + 'prefix' => '', + 'prefix_indexes' => true, + 'search_path' => 'public', + 'sslmode' => env('DB_SSLMODE', 'prefer'), + ], + + 'sqlsrv' => [ + 'driver' => 'sqlsrv', + 'url' => env('DB_URL'), + 'host' => env('DB_HOST', 'localhost'), + 'port' => env('DB_PORT', '1433'), + 'database' => env('DB_DATABASE', 'laravel'), + 'username' => env('DB_USERNAME', 'root'), + 'password' => env('DB_PASSWORD', ''), + 'charset' => env('DB_CHARSET', 'utf8'), + 'prefix' => '', + 'prefix_indexes' => true, + // 'encrypt' => env('DB_ENCRYPT', 'yes'), + // 'trust_server_certificate' => env('DB_TRUST_SERVER_CERTIFICATE', 'false'), + ], + 'mysql_cluster' => [ 'read' => [ 'host' => [ @@ -81,7 +169,7 @@ 'strict' => true, 'engine' => null, 'options' => extension_loaded('pdo_mysql') ? array_filter([ - Pdo\Mysql::ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + Mysql::ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), ]) : [], ], @@ -112,31 +200,61 @@ 'database' => database_path('testing.sqlite'), 'prefix' => '', 'foreign_key_constraints' => true, + // throwaway test database; skipping fsync makes migrations ~20x faster + 'synchronous' => 'off', ], + ], + /* + |-------------------------------------------------------------------------- + | Migration Repository Table + |-------------------------------------------------------------------------- + | + | This table keeps track of all the migrations that have already run for + | your application. Using this information, we can determine which of + | the migrations on disk haven't actually been run on the database. + | + */ + 'migrations' => [ 'table' => 'migrations', 'update_date_on_publish' => false, // disable to preserve original behavior for existing applications ], + /* + |-------------------------------------------------------------------------- + | Redis Databases + |-------------------------------------------------------------------------- + | + | Redis is an open source, fast, and advanced key-value store that also + | provides a richer body of commands than a typical key-value system + | such as Memcached. You may define your connection settings here. + | + */ + 'redis' => [ 'client' => env('REDIS_CLIENT', 'predis'), 'options' => [ - 'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_database_'), + 'cluster' => env('REDIS_CLUSTER', 'redis'), + 'prefix' => env('REDIS_PREFIX', Str::slug((string) env('APP_NAME', 'laravel'), '_') . '_database_'), + 'persistent' => env('REDIS_PERSISTENT', false), ], 'default' => [ 'scheme' => env('REDIS_SCHEME', 'tcp'), - 'url' => env('REDIS_URL'), 'host' => env('REDIS_HOST', '127.0.0.1'), 'username' => env('REDIS_USERNAME'), 'password' => env('REDIS_PASSWORD'), 'port' => env('REDIS_PORT', '6379'), 'database' => env('REDIS_DB', '0'), + 'max_retries' => env('REDIS_MAX_RETRIES', 3), + 'backoff_algorithm' => env('REDIS_BACKOFF_ALGORITHM', 'decorrelated_jitter'), + 'backoff_base' => env('REDIS_BACKOFF_BASE', 100), + 'backoff_cap' => env('REDIS_BACKOFF_CAP', 1000), ], 'cache' => [ @@ -147,6 +265,10 @@ 'password' => env('REDIS_PASSWORD'), 'port' => env('REDIS_PORT', '6379'), 'database' => env('REDIS_CACHE_DB', '1'), + 'max_retries' => env('REDIS_MAX_RETRIES', 3), + 'backoff_algorithm' => env('REDIS_BACKOFF_ALGORITHM', 'decorrelated_jitter'), + 'backoff_base' => env('REDIS_BACKOFF_BASE', 100), + 'backoff_cap' => env('REDIS_BACKOFF_CAP', 1000), ], 'sentinel_session' => [ diff --git a/config/filesystems.php b/config/filesystems.php index 745cff831a2..ca66eceff3c 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -10,17 +10,84 @@ return [ + /* + |-------------------------------------------------------------------------- + | Default Filesystem Disk + |-------------------------------------------------------------------------- + | + | Here you may specify the default filesystem disk that should be used + | by the framework. The "local" disk, as well as a variety of cloud + | based disks are available to your application for file storage. + | + */ + + 'default' => env('FILESYSTEM_DISK', 'local'), + + /* + |-------------------------------------------------------------------------- + | Filesystem Disks + |-------------------------------------------------------------------------- + | + | Below you may configure as many filesystem disks as necessary, and you + | may even configure multiple disks for the same driver. Examples for + | most supported storage drivers are configured here for reference. + | + | Supported drivers: "local", "ftp", "sftp", "s3" + | + */ + 'disks' => [ + 'local' => [ 'driver' => 'local', 'root' => storage_path('app'), + 'serve' => true, 'throw' => false, + 'report' => false, ], 'base' => [ 'driver' => 'local', 'root' => base_path(), ], + + 'public' => [ + 'driver' => 'local', + 'root' => storage_path('app/public'), + 'url' => rtrim(env('APP_URL', 'http://localhost'), '/') . '/storage', + 'visibility' => 'public', + 'throw' => false, + 'report' => false, + ], + + 's3' => [ + 'driver' => 's3', + 'key' => env('AWS_ACCESS_KEY_ID'), + 'secret' => env('AWS_SECRET_ACCESS_KEY'), + 'region' => env('AWS_DEFAULT_REGION'), + 'bucket' => env('AWS_BUCKET'), + 'url' => env('AWS_URL'), + 'endpoint' => env('AWS_ENDPOINT'), + 'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false), + 'throw' => false, + 'report' => false, + ], + + ], + + /* + |-------------------------------------------------------------------------- + | Symbolic Links + |-------------------------------------------------------------------------- + | + | Here you may configure the symbolic links that will be created when the + | `storage:link` Artisan command is executed. The array keys should be + | the locations of the links and the values should be their targets. + | + */ + + 'links' => [ + public_path('storage') => storage_path('app/public'), ], ]; diff --git a/config/flare.php b/config/flare.php deleted file mode 100644 index e6a2e99808b..00000000000 --- a/config/flare.php +++ /dev/null @@ -1,103 +0,0 @@ - env('FLARE_KEY', 'quYFBTFNKHLBqFCoeo5yDVOQNbs6muV1'), - - /* - |-------------------------------------------------------------------------- - | Middleware - |-------------------------------------------------------------------------- - | - | These middleware will modify the contents of the report sent to Flare. - | - */ - - 'flare_middleware' => [ - RemoveRequestIp::class, - AddNotifierName::class, - AddEnvironmentInformation::class, - AddExceptionInformation::class, - AddDumps::class, - /* - AddLogs::class => [ - 'maximum_number_of_collected_logs' => 200, - ], - */ - AddQueries::class => [ - 'maximum_number_of_collected_queries' => 50, - 'report_query_bindings' => true, - ], - AddJobs::class => [ - 'max_chained_job_reporting_depth' => 5, - ], - - // add git information, but cache it unlike the upstream provider - App\Logging\Reporting\Middleware\AddGitInformation::class, - - // Add more LibreNMS related info - App\Logging\Reporting\Middleware\CleanContext::class, - App\Logging\Reporting\Middleware\SetGroups::class, - App\Logging\Reporting\Middleware\SetInstanceId::class, - - CensorRequestBodyFields::class => [ - 'censor_fields' => [ - 'password', - 'password_confirmation', - // LibreNMS - 'username', - 'sysContact', - 'community', - 'authname', - 'authpass', - 'cryptopass', - ], - ], - CensorRequestHeaders::class => [ - 'headers' => [ - 'API-KEY', - ], - ], - ], - - /* - |-------------------------------------------------------------------------- - | Reporting log statements - |-------------------------------------------------------------------------- - | - | If this setting is `false` log statements won't be sent as events to Flare, - | no matter which error level you specified in the Flare log channel. - | - */ - - 'send_logs_as_events' => false, -]; diff --git a/config/horizon.php b/config/horizon.php new file mode 100644 index 00000000000..adf02f36ce4 --- /dev/null +++ b/config/horizon.php @@ -0,0 +1,296 @@ + env('HORIZON_NAME'), + + /* + |-------------------------------------------------------------------------- + | Horizon Domain + |-------------------------------------------------------------------------- + | + | This is the subdomain where Horizon will be accessible from. If this + | setting is null, Horizon will reside under the same domain as the + | application. Otherwise, this value will serve as the subdomain. + | + */ + + 'domain' => env('HORIZON_DOMAIN'), + + /* + |-------------------------------------------------------------------------- + | Horizon Path + |-------------------------------------------------------------------------- + | + | This is the URI path where Horizon will be accessible from. Feel free + | to change this path to anything you like. Note that the URI will not + | affect the paths of its internal API that aren't exposed to users. + | + */ + + 'path' => env('HORIZON_PATH', 'horizon'), + + /* + |-------------------------------------------------------------------------- + | Horizon Redis Connection + |-------------------------------------------------------------------------- + | + | This is the name of the Redis connection where Horizon will store the + | meta information required for it to function. It includes the list + | of supervisors, failed jobs, job metrics, and other information. + | + */ + + 'use' => 'default', + + /* + |-------------------------------------------------------------------------- + | Horizon Redis Prefix + |-------------------------------------------------------------------------- + | + | This prefix will be used when storing all Horizon data in Redis. You + | may modify the prefix when you are running multiple installations + | of Horizon on the same server so that they don't have problems. + | + */ + + 'prefix' => env( + 'HORIZON_PREFIX', + Str::slug(env('APP_NAME', 'laravel'), '_') . '_horizon:' + ), + + /* + |-------------------------------------------------------------------------- + | Horizon Route Middleware + |-------------------------------------------------------------------------- + | + | These middleware will get attached onto each Horizon route, giving you + | the chance to add your own middleware to this list or change any of + | the existing middleware. Or, you can simply stick with this list. + | + */ + + 'middleware' => ['web', 'auth'], + + /* + |-------------------------------------------------------------------------- + | Queue Wait Time Thresholds + |-------------------------------------------------------------------------- + | + | This option allows you to configure when the LongWaitDetected event + | will be fired. Every connection / queue combination may have its + | own, unique threshold (in seconds) before this event is fired. + | + */ + + 'waits' => [ + 'redis:scheduler' => 10, + 'redis:default' => 60, + ], + + /* + |-------------------------------------------------------------------------- + | Job Trimming Times + |-------------------------------------------------------------------------- + | + | Here you can configure for how long (in minutes) you desire Horizon to + | persist the recent and failed jobs. Typically, recent jobs are kept + | for one hour while all failed jobs are stored for an entire week. + | + */ + + 'trim' => [ + 'recent' => 60, + 'pending' => 60, + 'completed' => 60, + 'recent_failed' => 4320, + 'failed' => 4320, + 'monitored' => 10080, + ], + + /* + |-------------------------------------------------------------------------- + | Silenced Jobs + |-------------------------------------------------------------------------- + | + | Silencing a job will instruct Horizon to not place the job in the list + | of completed jobs within the Horizon dashboard. This setting may be + | used to fully remove any noisy jobs from the completed jobs list. + | + */ + + 'silenced' => [ + App\Jobs\DispatchPollingWork::class, // runs every 10 seconds + ], + + 'silenced_tags' => [ + // 'notifications', + ], + + /* + |-------------------------------------------------------------------------- + | Metrics + |-------------------------------------------------------------------------- + | + | Here you can configure how many snapshots should be kept to display in + | the metrics graph. This will get used in combination with Horizon's + | `horizon:snapshot` schedule to define how long to retain metrics. + | + */ + + 'metrics' => [ + 'trim_snapshots' => [ + 'job' => 24, + 'queue' => 24, + ], + ], + + /* + |-------------------------------------------------------------------------- + | Fast Termination + |-------------------------------------------------------------------------- + | + | When this option is enabled, Horizon's "terminate" command will not + | wait on all of the workers to terminate unless the --wait option + | is provided. Fast termination can shorten deployment delay by + | allowing a new instance of Horizon to start while the last + | instance will continue to terminate each of its workers. + | + | LibreNMS: enabled so restarting Horizon (settings change, update, + | memory limit) does not wait for long discoveries to finish. + | + */ + + 'fast_termination' => true, + + /* + |-------------------------------------------------------------------------- + | Memory Limit (MB) + |-------------------------------------------------------------------------- + | + | This value describes the maximum amount of memory the Horizon master + | supervisor may consume before it is terminated and restarted. For + | configuring these limits on your workers, see the next section. + | + */ + + 'memory_limit' => 64, + + /* + |-------------------------------------------------------------------------- + | Queue Worker Configuration + |-------------------------------------------------------------------------- + | + | Here you may define the queue worker settings used by your application + | in all environments. These supervisors and settings handle all your + | queued jobs and will be provisioned by Horizon during deployment. + | + */ + + 'defaults' => [ + // runs DispatchPollingWork, a single worker keeps it responsive + 'supervisor-scheduler' => [ + 'connection' => 'redis', + 'queue' => ['scheduler'], + 'balance' => false, + 'minProcesses' => 1, + 'maxProcesses' => 1, + 'maxTime' => 0, + 'maxJobs' => 0, + 'memory' => 128, + 'tries' => 1, + 'timeout' => 60, + 'nice' => 0, + ], + // maintenance and other jobs on the default queue + 'supervisor-default' => [ + 'connection' => 'redis', + 'queue' => ['default'], + 'balance' => 'auto', + 'autoScalingStrategy' => 'time', + 'minProcesses' => 1, + 'maxProcesses' => 3, + 'maxTime' => 0, + 'maxJobs' => 0, + 'memory' => 128, + 'tries' => 1, + 'timeout' => 300, // < queue retry_after + 'nice' => 0, + ], + // queues and maxProcesses are set from this node's poller settings by WorkerNode + 'supervisor-poll' => [ + 'connection' => 'redis', + 'queue' => ['poll'], + 'balance' => 'auto', + 'autoScalingStrategy' => 'time', + 'minProcesses' => 1, + 'maxProcesses' => 24, + 'maxTime' => 0, + 'maxJobs' => 0, + 'memory' => 256, + 'tries' => 1, // PollDevice::$tries takes precedence + 'timeout' => 630, // > PollDevice::$timeout, < queue retry_after + 'nice' => 0, + ], + 'supervisor-discovery' => [ + 'connection' => 'redis', + 'queue' => ['discovery'], + 'balance' => 'auto', + 'autoScalingStrategy' => 'time', + 'minProcesses' => 1, + 'maxProcesses' => 16, + 'maxTime' => 0, + 'maxJobs' => 0, + 'memory' => 256, + 'tries' => 1, // DiscoverDevice::$tries takes precedence + 'timeout' => 3630, // > DiscoverDevice::$timeout, < queue retry_after + 'nice' => 0, + ], + ], + + 'environments' => [ + '*' => [ + 'supervisor-scheduler' => [], + 'supervisor-default' => [], + 'supervisor-poll' => [], + 'supervisor-discovery' => [], + ], + ], + + /* + |-------------------------------------------------------------------------- + | File Watcher Configuration + |-------------------------------------------------------------------------- + | + | The following list of directories and files will be watched when using + | the `horizon:listen` command. Whenever any directories or files are + | changed, Horizon will automatically restart to apply all changes. + | + */ + + 'watch' => [ + 'app', + 'bootstrap', + 'config/**/*.php', + 'database/**/*.php', + 'public/**/*.php', + 'resources/**/*.php', + 'routes', + 'composer.lock', + 'composer.json', + '.env', + ], +]; diff --git a/config/ignition.php b/config/ignition.php index d4691e12e5a..9a1cc752fc9 100644 --- a/config/ignition.php +++ b/config/ignition.php @@ -66,13 +66,12 @@ |-------------------------------------------------------------------------- | | You can share local errors with colleagues or others around the world. - | Sharing is completely free and doesn't require an account on Flare. | | If necessary, you can completely disable sharing below. | */ - 'enable_share_button' => env('IGNITION_SHARING_ENABLED', true), + 'enable_share_button' => env('IGNITION_SHARING_ENABLED', false), /* |-------------------------------------------------------------------------- diff --git a/config/laravel-console-summary.php b/config/laravel-console-summary.php index ae60dec74b9..64fc664f24e 100644 --- a/config/laravel-console-summary.php +++ b/config/laravel-console-summary.php @@ -34,7 +34,6 @@ 'env', 'env:*', 'event:*', - 'flare:*', 'help', 'ide-helper:*', 'install:*', diff --git a/config/logging.php b/config/logging.php index 1cae0bdb927..601b8dbe3b3 100644 --- a/config/logging.php +++ b/config/logging.php @@ -8,27 +8,67 @@ | request an environment variable to be created upstream or send a pull request. */ +use Monolog\Handler\NullHandler; use Monolog\Handler\StreamHandler; +use Monolog\Handler\SyslogUdpHandler; use Monolog\Processor\PsrLogMessageProcessor; return [ + + /* + |-------------------------------------------------------------------------- + | Default Log Channel + |-------------------------------------------------------------------------- + | + | This option defines the default log channel that is utilized to write + | messages to your logs. The value provided here should match one of + | the channels present in the list of "channels" configured below. + | + */ + 'default' => env('LOG_CHANNEL', 'stack'), + /* + |-------------------------------------------------------------------------- + | Deprecations Log Channel + |-------------------------------------------------------------------------- + | + | This option controls the log channel that should be used to log warnings + | regarding deprecated PHP and library features. This allows you to get + | your application ready for upcoming major versions of dependencies. + | + */ + 'deprecations' => [ 'channel' => env('LOG_DEPRECATIONS_CHANNEL', 'null'), - 'trace' => false, + 'trace' => env('LOG_DEPRECATIONS_TRACE', false), ], + /* + |-------------------------------------------------------------------------- + | Log Channels + |-------------------------------------------------------------------------- + | + | Here you may configure the log channels for your application. Laravel + | utilizes the Monolog PHP logging library, which includes a variety + | of powerful log handlers and formatters that you're free to use. + | + | Available drivers: "single", "daily", "monthly", "slack", "syslog", + | "errorlog", "monolog", "custom", "stack" + | + */ + 'channels' => [ + 'stack' => [ 'driver' => 'stack', - 'channels' => ['log_file', 'flare'], + 'channels' => ['log_file'], 'ignore_exceptions' => false, ], 'console' => [ 'driver' => 'stack', - 'channels' => ['log_file', 'stdout', 'flare'], + 'channels' => ['log_file', 'stdout'], 'ignore_exceptions' => false, ], @@ -50,17 +90,79 @@ 'level' => env('STDOUT_LOG_LEVEL', 'info'), ], + 'single' => [ + 'driver' => 'single', + 'path' => storage_path('logs/laravel.log'), + 'level' => env('LOG_LEVEL', 'debug'), + 'replace_placeholders' => true, + ], + + 'daily' => [ + 'driver' => 'daily', + 'path' => storage_path('logs/laravel.log'), + 'level' => env('LOG_LEVEL', 'debug'), + 'max_files' => env('LOG_DAILY_DAYS', 14), + 'replace_placeholders' => true, + ], + + 'monthly' => [ + 'driver' => 'monthly', + 'path' => storage_path('logs/laravel.log'), + 'level' => env('LOG_LEVEL', 'debug'), + 'max_files' => 3, + 'replace_placeholders' => true, + ], + + 'slack' => [ + 'driver' => 'slack', + 'url' => env('LOG_SLACK_WEBHOOK_URL'), + 'username' => env('LOG_SLACK_USERNAME', env('APP_NAME', 'Laravel')), + 'emoji' => env('LOG_SLACK_EMOJI', ':boom:'), + 'level' => env('LOG_LEVEL', 'critical'), + 'replace_placeholders' => true, + ], + + 'papertrail' => [ + 'driver' => 'monolog', + 'level' => env('LOG_LEVEL', 'debug'), + 'handler' => env('LOG_PAPERTRAIL_HANDLER', SyslogUdpHandler::class), + 'handler_with' => [ + 'host' => env('PAPERTRAIL_URL'), + 'port' => env('PAPERTRAIL_PORT'), + 'connectionString' => 'tls://' . env('PAPERTRAIL_URL') . ':' . env('PAPERTRAIL_PORT'), + ], + 'processors' => [PsrLogMessageProcessor::class], + ], + 'stderr' => [ 'driver' => 'monolog', 'level' => env('LOG_LEVEL', 'debug'), 'handler' => StreamHandler::class, - 'formatter' => env('LOG_STDERR_FORMATTER', App\Logging\CliColorFormatter::class), - 'with' => [ + 'handler_with' => [ 'stream' => 'php://stderr', ], + 'formatter' => env('LOG_STDERR_FORMATTER', App\Logging\CliColorFormatter::class), 'processors' => [PsrLogMessageProcessor::class], ], + 'syslog' => [ + 'driver' => 'syslog', + 'level' => env('LOG_LEVEL', 'debug'), + 'facility' => env('LOG_SYSLOG_FACILITY', LOG_USER), + 'replace_placeholders' => true, + ], + + 'errorlog' => [ + 'driver' => 'errorlog', + 'level' => env('LOG_LEVEL', 'debug'), + 'replace_placeholders' => true, + ], + + 'null' => [ + 'driver' => 'monolog', + 'handler' => NullHandler::class, + ], + 'deprecations_channel' => [ // don't name deprecations 'driver' => 'monolog', 'handler' => StreamHandler::class, @@ -70,9 +172,10 @@ ], ], - 'flare' => [ - 'driver' => 'flare', + 'emergency' => [ + 'path' => storage_path('logs/laravel.log'), ], + ], ]; diff --git a/config/queue.php b/config/queue.php index 5272e2407b3..e1f3d9abf51 100644 --- a/config/queue.php +++ b/config/queue.php @@ -27,9 +27,9 @@ ], - // framework default is sqlite + // framework default is sqlite, the queue pages read failed jobs from this table (App\Models\FailedJob) 'failed' => [ - 'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'), + 'driver' => 'database-uuids', 'database' => env('DB_CONNECTION', env('DBTEST') ? 'testing' : 'mysql'), 'table' => 'failed_jobs', ], diff --git a/config/sanctum.php b/config/sanctum.php index cc4fc09aabf..eaab5f12ed4 100644 --- a/config/sanctum.php +++ b/config/sanctum.php @@ -1,5 +1,8 @@ [ - 'authenticate_session' => Laravel\Sanctum\Http\Middleware\AuthenticateSession::class, - 'encrypt_cookies' => Illuminate\Cookie\Middleware\EncryptCookies::class, - 'validate_csrf_token' => Illuminate\Foundation\Http\Middleware\ValidateCsrfToken::class, + 'authenticate_session' => AuthenticateSession::class, + 'encrypt_cookies' => EncryptCookies::class, + 'validate_csrf_token' => PreventRequestForgery::class, ], ]; diff --git a/config/snmptraps.php b/config/snmptraps.php index 23f9c23b037..5d6af4e15c6 100644 --- a/config/snmptraps.php +++ b/config/snmptraps.php @@ -91,6 +91,7 @@ 'ENTITY-MIB::entConfigChange' => LibreNMS\Snmptrap\Handlers\EntityDatabaseConfigChanged::class, 'EQUIPMENT-MIB::equipStatusTrap' => LibreNMS\Snmptrap\Handlers\EquipStatusTrap::class, 'FORTINET-FORTIGATE-MIB::fgTrapAvOversize' => LibreNMS\Snmptrap\Handlers\FgTrapAvOversize::class, + 'FORTINET-FORTIGATE-MIB::fgTrapDhcp' => LibreNMS\Snmptrap\Handlers\FgTrapDhcp::class, 'FORTINET-FORTIGATE-MIB::fgTrapIpsAnomaly' => LibreNMS\Snmptrap\Handlers\FgTrapIpsAnomaly::class, 'FORTINET-FORTIGATE-MIB::fgTrapIpsPkgUpdate' => LibreNMS\Snmptrap\Handlers\FgTrapIpsPkgUpdate::class, 'FORTINET-FORTIGATE-MIB::fgTrapIpsSignature' => LibreNMS\Snmptrap\Handlers\FgTrapIpsSignature::class, diff --git a/daily.php b/daily.php index f71fe7714e0..e9c6568ffaf 100644 --- a/daily.php +++ b/daily.php @@ -25,8 +25,9 @@ if ($options['f'] === 'composer_get_plugins') { $output = []; - $plugins = is_file('composer.plugins.json') ? - json_decode(file_get_contents('composer.plugins.json')) : []; + $plugins_file = getenv('LIBRENMS_COMPOSER_PLUGINS') ?: 'composer.plugins.json'; + $plugins = is_file($plugins_file) ? + json_decode(file_get_contents($plugins_file)) : []; foreach ($plugins->require ?? [] as $package => $version) { $output[] = "$package:$version"; diff --git a/daily.sh b/daily.sh index 70f788c68f8..6061dcb5486 100755 --- a/daily.sh +++ b/daily.sh @@ -95,6 +95,24 @@ status_run() { return ${exit_code} } +# Laravel can return a distinct exit code when it skips an isolated command. +update_schema() { + # Variables are expanded by status_run's bash -c. + # shellcheck disable=SC2016 + status_run 'Updating SQL-Schema' ' + lock_busy=75 + deadline=$((SECONDS + 55 * 60)) + while (( SECONDS < deadline )); do + ./lnms migrate --force --no-interaction --isolated="$lock_busy" + result=$? + (( result == lock_busy )) || exit "$result" + sleep 5 + done + echo "Timed out waiting for the schema migration lock." >&2 + exit "$lock_busy" + ' +} + ####################################### # Call daily.php # Globals: @@ -143,7 +161,7 @@ set_notifiable_result() { # Exit-Code: 0 >= min ver, 1 < min ver ####################################### check_dependencies() { - local branch ver_71 ver_72 ver_73 ver_81 ver_82 python3 phpver pythonver old_branches msg + local branch ver_71 ver_72 ver_73 ver_81 ver_82 ver_84 python3 phpver pythonver old_branches msg branch=$(git rev-parse --abbrev-ref HEAD) @@ -155,12 +173,13 @@ check_dependencies() { ver_73=$(php -r "echo (int)version_compare(PHP_VERSION, '7.3', '<');") ver_81=$(php -r "echo (int)version_compare(PHP_VERSION, '8.1', '<');") ver_82=$(php -r "echo (int)version_compare(PHP_VERSION, '8.2', '<');") + ver_84=$(php -r "echo (int)version_compare(PHP_VERSION, '8.4', '<');") python3=$(python3 -c "import sys;print(int(sys.version_info < (3, 4)))" 2> /dev/null) phpver="master" pythonver="master" - old_branches="^(php53|php56|php71-python2|php72|php73|php81)$" - if [[ $branch =~ $old_branches ]] && [[ "$ver_82" == "0" && "$python3" == "0" ]]; then + old_branches="^(php53|php56|php71-python2|php72|php73|php81|php82)$" + if [[ $branch =~ $old_branches ]] && [[ "$ver_84" == "0" && "$python3" == "0" ]]; then status_run "Supported PHP and Python version, switched back to master branch." 'git checkout master' elif [[ "$ver_71" != "0" ]]; then phpver="php56" @@ -196,6 +215,11 @@ check_dependencies() { if [[ "$branch" != "php81" ]]; then status_run "Unsupported PHP version, switched to php81 branch." 'git checkout php81' fi + elif [[ "$ver_84" != "0" ]]; then + phpver="php82" + if [[ "$branch" != "php82" ]]; then + status_run "Unsupported PHP version, switched to php82 branch." 'git checkout php82' + fi fi set_notifiable_result phpver ${phpver} @@ -289,7 +313,7 @@ main () { if [[ -z "$arg" ]]; then up=$(php daily.php -f update >&2; echo $?) if [[ "$up" == "0" ]]; then - "${DAILY_SCRIPT}" no-code-update + "${DAILY_SCRIPT}" no-code-update || return $? set_notifiable_result update 1 # make sure there are no update notifications if update is disabled exit fi @@ -297,8 +321,8 @@ main () { check_dependencies php_ver_ret=$? - # Clear caches before update - status_run 'Clearing caches' 'php artisan optimize:clear' + # Clear local bootstrap caches without flushing another node's migration lock. + status_run 'Clearing bootstrap caches' 'php artisan optimize:clear --except=cache' # Restore composer files if user installed plugins (patch:pre-update does this when test patches are applied) if [[ ! -f "$PATCHES_FILE" ]]; then @@ -362,7 +386,7 @@ main () { no-code-update) # Updates of the code are disabled, just check for schema updates # and clean up the db. - status_run 'Updating SQL-Schema' './lnms migrate --force --no-interaction --isolated' + update_schema || return $? status_run 'Cleaning up DB' "'$DAILY_SCRIPT' cleanup" ;; post-pull) @@ -388,7 +412,10 @@ main () { fi # List all tasks to do after pull in the order of execution - status_run 'Updating SQL-Schema' './lnms migrate --force --no-interaction --isolated' + update_schema || return $? + if [[ "$old_version" != "$new_version" && "$QUEUE_CONNECTION" == 'redis' ]]; then + status_run 'Restarting queue workers' 'php artisan horizon:terminate' + fi status_run 'Cleaning up DB' "$DAILY_SCRIPT cleanup" ;; cleanup) diff --git a/database/factories/DeviceFactory.php b/database/factories/DeviceFactory.php index 82c5aa79ed9..966c901e83e 100644 --- a/database/factories/DeviceFactory.php +++ b/database/factories/DeviceFactory.php @@ -3,6 +3,7 @@ namespace Database\Factories; use Illuminate\Database\Eloquent\Factories\Factory; +use LibreNMS\Enum\DeviceType; /** @extends Factory<\App\Models\Device> */ class DeviceFactory extends Factory @@ -15,26 +16,7 @@ public function definition(): array return [ 'hostname' => $this->faker->domainWord() . '-' . $this->faker->domainWord() . '-' . $this->faker->domainWord() . '.' . $this->faker->domainName(), 'ip' => $this->faker->randomElement([$this->faker->ipv4(), $this->faker->ipv6()]), - 'type' => $this->faker->randomElement([ - 'appliance', - 'camera', - 'collaboration', - 'encoder', - 'environment', - 'firewall', - 'loadbalancer', - 'management', - 'network', - 'power', - 'printer', - 'proxy', - 'sensor', - 'server', - 'storage', - 'timing', - 'wireless', - 'workstation', - ]), + 'type' => $this->faker->randomElement(array_column(DeviceType::cases(), 'value')), 'sysDescr' => $this->faker->text(64), 'status' => $status = random_int(0, 1), 'status_reason' => $status == 0 ? $this->faker->randomElement(['snmp', 'icmp']) : '', // allow invalid states? diff --git a/database/factories/DeviceGroupFactory.php b/database/factories/DeviceGroupFactory.php index 4f2090b839c..0468568a107 100644 --- a/database/factories/DeviceGroupFactory.php +++ b/database/factories/DeviceGroupFactory.php @@ -13,7 +13,7 @@ class DeviceGroupFactory extends Factory public function definition(): array { return [ - 'name' => $this->faker->domainWord(), + 'name' => $this->faker->domainWord() . '-' . $this->faker->unique()->numberBetween(1, 999999), 'desc' => $this->faker->text(255), 'type' => 'static', ]; diff --git a/database/factories/HrDeviceFactory.php b/database/factories/HrDeviceFactory.php index a7b468434f4..2f3f11c9a85 100644 --- a/database/factories/HrDeviceFactory.php +++ b/database/factories/HrDeviceFactory.php @@ -11,8 +11,6 @@ */ class HrDeviceFactory extends Factory { - protected $model = HrDevice::class; - public function definition(): array { return [ diff --git a/database/factories/PollerClusterFactory.php b/database/factories/PollerClusterFactory.php index 72513b192bc..679c2f2dcc4 100644 --- a/database/factories/PollerClusterFactory.php +++ b/database/factories/PollerClusterFactory.php @@ -2,6 +2,7 @@ namespace Database\Factories; +use App\Queue\WorkerNode; use Illuminate\Database\Eloquent\Factories\Factory; /** @extends Factory<\App\Models\PollerCluster> */ @@ -12,10 +13,15 @@ public function definition(): array return [ 'node_id' => $this->faker->unique()->uuid(), 'poller_name' => $this->faker->unique()->domainWord() . '-poller', - 'poller_version' => '24.10.0', + 'poller_version' => 'librenms-service', 'poller_groups' => '0', 'last_report' => $this->faker->dateTimeThisMonth(), 'master' => 0, ]; } + + public function worker(): static + { + return $this->state(['poller_version' => WorkerNode::VERSION]); + } } diff --git a/database/factories/PortsFdbFactory.php b/database/factories/PortsFdbFactory.php index a74f10648e1..bef98c8d353 100644 --- a/database/factories/PortsFdbFactory.php +++ b/database/factories/PortsFdbFactory.php @@ -12,7 +12,7 @@ public function definition(): array return [ 'port_id' => $this->faker->numberBetween(1, 100), 'mac_address' => $this->faker->macAddress(), - 'vlan_id' => $this->faker->numberBetween(1, 4094), + 'vlan' => $this->faker->numberBetween(1, 4094), 'device_id' => $this->faker->numberBetween(1, 100), ]; } diff --git a/database/factories/SecretFactory.php b/database/factories/SecretFactory.php index f0dc562a269..ae0c57a9875 100644 --- a/database/factories/SecretFactory.php +++ b/database/factories/SecretFactory.php @@ -22,7 +22,7 @@ class SecretFactory extends Factory public function definition(): array { return [ - 'secret_type' => $this->faker->randomElement(SecretType::cases()), + 'secret_type' => $this->faker->randomElement(SecretType::known()), 'description' => $this->faker->text(), 'data' => ['username' => 'username', 'password' => 'password'], ]; diff --git a/database/factories/VrfLiteFactory.php b/database/factories/VrfLiteFactory.php deleted file mode 100644 index 0f0170ebbcf..00000000000 --- a/database/factories/VrfLiteFactory.php +++ /dev/null @@ -1,21 +0,0 @@ - */ -class VrfLiteFactory extends Factory -{ - /** - * Define the model's default state. - */ - public function definition(): array - { - return [ - 'context_name' => $this->faker->word(), - 'intance_name' => $this->faker->word(), - 'vrf_name' => 'VRF_' . $this->faker->word(), - ]; - } -} diff --git a/database/migrations/2020_11_02_164331_add_powerstate_enum_to_vminfo.php b/database/migrations/2020_11_02_164331_add_powerstate_enum_to_vminfo.php index d2242eadd65..83f78e1bf87 100644 --- a/database/migrations/2020_11_02_164331_add_powerstate_enum_to_vminfo.php +++ b/database/migrations/2020_11_02_164331_add_powerstate_enum_to_vminfo.php @@ -21,7 +21,7 @@ public function up(): void continue; } - $vm->vmwVmState = PowerState::STATES[strtolower($vm->vmwVmState)] ?? PowerState::UNKNOWN; + $vm->vmwVmState = PowerState::parse($vm->vmwVmState); $vm->update(); } }); diff --git a/database/migrations/2022_07_19_081224_plugins_unique_index.php b/database/migrations/2022_07_19_081224_plugins_unique_index.php index 7ceff831c35..815116eee78 100644 --- a/database/migrations/2022_07_19_081224_plugins_unique_index.php +++ b/database/migrations/2022_07_19_081224_plugins_unique_index.php @@ -20,8 +20,8 @@ public function up(): void // find the newest id with settings $valid_plugins[] = DB::table('plugins') ->where(['version' => $plugin->version, 'plugin_name' => $plugin->plugin_name]) - ->orderBy('settings', 'DESC') - ->orderBy('plugin_id', 'DESC') + ->orderBy('settings', 'desc') + ->orderBy('plugin_id', 'desc') ->value('plugin_id'); } DB::table('plugins')->whereNotIn('plugin_id', $valid_plugins)->delete(); diff --git a/database/migrations/2026_04_01_162956_migrate_snmp_secrets.php b/database/migrations/2026_04_01_162956_migrate_snmp_secrets.php index eaf6efc0356..ed4879015b5 100644 --- a/database/migrations/2026_04_01_162956_migrate_snmp_secrets.php +++ b/database/migrations/2026_04_01_162956_migrate_snmp_secrets.php @@ -5,7 +5,7 @@ return new class extends Migration { - private const PORT_ASSOCIATION_MODES = [1 => 'ifIndex', 2 => 'ifName', 3 => 'ifDescr', 4 => 'ifAlias']; + private const array PORT_ASSOCIATION_MODES = [1 => 'ifIndex', 2 => 'ifName', 3 => 'ifDescr', 4 => 'ifAlias']; /** @var array */ private array $secretMap = []; diff --git a/database/migrations/2026_09_16_120000_widen_ent_physical_rev_columns.php b/database/migrations/2026_09_16_120000_widen_ent_physical_rev_columns.php index cd09e169c70..8262135efb5 100644 --- a/database/migrations/2026_09_16_120000_widen_ent_physical_rev_columns.php +++ b/database/migrations/2026_09_16_120000_widen_ent_physical_rev_columns.php @@ -11,7 +11,7 @@ * octets. The columns held 96, so a device that reports a longer string aborted the * entity-physical update with a data too long error on every discovery and poll. */ - private const COLUMNS = [ + private const array COLUMNS = [ 'entPhysicalHardwareRev', 'entPhysicalFirmwareRev', 'entPhysicalSoftwareRev', diff --git a/database/migrations/2026_09_22_000001_add_expiration_index_to_cache_table.php b/database/migrations/2026_09_22_000001_add_expiration_index_to_cache_table.php new file mode 100644 index 00000000000..a41cb2f0282 --- /dev/null +++ b/database/migrations/2026_09_22_000001_add_expiration_index_to_cache_table.php @@ -0,0 +1,40 @@ +index('expiration'); + }); + } + + if (! Schema::hasIndex('cache_locks', 'cache_locks_expiration_index')) { + $connection = Schema::getConnection(); + if (in_array($connection->getDriverName(), ['mysql', 'mariadb'], true)) { + $table = $connection->getQueryGrammar()->wrapTable('cache_locks'); + $connection->statement("ALTER TABLE $table ROW_FORMAT=DYNAMIC"); + } + + Schema::table('cache_locks', function (Blueprint $table): void { + $table->index('expiration'); + }); + } + } + + public function down(): void + { + Schema::table('cache', function (Blueprint $table): void { + $table->dropIndex(['expiration']); + }); + + Schema::table('cache_locks', function (Blueprint $table): void { + $table->dropIndex(['expiration']); + }); + } +}; diff --git a/database/migrations/2026_09_26_000000_drop_unused_device_columns.php b/database/migrations/2026_09_26_000000_drop_unused_device_columns.php index 9a8f7e98455..bd4a01dc0dc 100644 --- a/database/migrations/2026_09_26_000000_drop_unused_device_columns.php +++ b/database/migrations/2026_09_26_000000_drop_unused_device_columns.php @@ -7,9 +7,9 @@ return new class extends Migration { - private const OLD_FIELD = 'devices.last_ping_timetaken'; - private const NEW_FIELD = 'device_stats.ping_rtt_last'; - private const NEW_SQL = '(SELECT ping_rtt_last FROM device_stats WHERE device_stats.device_id = devices.device_id)'; + private const string OLD_FIELD = 'devices.last_ping_timetaken'; + private const string NEW_FIELD = 'device_stats.ping_rtt_last'; + private const string NEW_SQL = '(SELECT ping_rtt_last FROM device_stats WHERE device_stats.device_id = devices.device_id)'; /** * Ping data is stored in device_stats, agent_uptime and last_poll_attempted are never written. diff --git a/database/migrations/2026_10_08_000000_remove_error_reporting_data.php b/database/migrations/2026_10_08_000000_remove_error_reporting_data.php new file mode 100644 index 00000000000..6f096c0d34d --- /dev/null +++ b/database/migrations/2026_10_08_000000_remove_error_reporting_data.php @@ -0,0 +1,17 @@ +where('name', 'error_reporting_uuid')->delete(); + } + + public function down(): void + { + // deleted data cannot be restored + } +}; diff --git a/database/migrations/2026_10_20_000000_remove_proxmox_table.php b/database/migrations/2026_10_20_000000_remove_proxmox_table.php new file mode 100644 index 00000000000..87f3fedb192 --- /dev/null +++ b/database/migrations/2026_10_20_000000_remove_proxmox_table.php @@ -0,0 +1,64 @@ +exists(); + + Schema::dropIfExists('proxmox'); + Schema::dropIfExists('proxmox_ports'); + + $appIds = DB::table('applications')->where('app_type', 'proxmox')->pluck('app_id'); + DB::table('application_metrics')->whereIn('app_id', $appIds)->delete(); + DB::table('applications')->whereIn('app_id', $appIds)->delete(); + + DB::table('config')->where('config_name', 'enable_proxmox')->delete(); + + if ($hadVms || $appIds->isNotEmpty()) { + Notifications::create( + 'Proxmox application removed', + 'The Proxmox application has been replaced and its data removed, those devices are no longer collecting Proxmox data. ' + . 'To monitor Proxmox VE, an administrator needs to add the Proxmox API polling method to each host. It collects CPU, memory, disk and network usage of VMs and LXC containers. ' + . 'Existing Proxmox traffic graphs are not carried over. The proxmox agent script can be removed from the hosts. ' + . 'See https://docs.librenms.org/Extensions/Proxmox/', + 'migration', + 2, + ); + } + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::create('proxmox', function (Blueprint $table): void { + $table->increments('id'); + $table->unsignedInteger('device_id')->default(0); + $table->integer('vmid'); + $table->string('cluster'); + $table->string('description')->nullable(); + $table->timestamp('last_seen')->useCurrent(); + $table->unique(['cluster', 'vmid']); + }); + + Schema::create('proxmox_ports', function (Blueprint $table): void { + $table->increments('id'); + $table->integer('vm_id'); + $table->string('port', 10); + $table->timestamp('last_seen')->useCurrent(); + $table->unique(['vm_id', 'port']); + }); + } +}; diff --git a/database/migrations/2026_10_20_000000_split_snmp_secrets.php b/database/migrations/2026_10_20_000000_split_snmp_secrets.php new file mode 100644 index 00000000000..da41a66aefa --- /dev/null +++ b/database/migrations/2026_10_20_000000_split_snmp_secrets.php @@ -0,0 +1,196 @@ + $kept secret id by type and data */ + $kept = []; + foreach (DB::table('secrets')->whereIn('secret_type', ['snmp-community', 'snmp-v3'])->orderBy('id')->get(['id', 'secret_type', 'data']) as $secret) { + $kept[$this->key($secret->secret_type, $this->decrypt($secret))] ??= $secret->id; + } + + foreach (DB::table('secrets')->where('secret_type', 'snmp')->orderBy('id')->get(['id', 'data']) as $secret) { + $data = $this->decrypt($secret); + $version = $data['version'] ?? 'v2c'; + + if ($version === 'v3') { + $type = 'snmp-v3'; + $newData = array_filter(array_intersect_key($data, array_flip(self::V3_KEYS)), fn ($v) => $v !== null); + $newData['authname'] = ($newData['authname'] ?? '') ?: 'root'; // the user net-snmp was given without one + } else { + $type = 'snmp-community'; + $newData = ['community' => (string) ($data['community'] ?? '')]; + } + ksort($newData); + $key = $this->key($type, $newData); + + DB::transaction(function () use ($secret, $version, $type, $newData, $key, &$kept): void { + if ($version === 'v1') { + $this->setVersion($secret->id, 'v1'); + } + + if (isset($kept[$key])) { + $this->replaceSecret($secret->id, $kept[$key]); + + return; + } + + DB::table('secrets')->where('id', $secret->id)->update([ + 'secret_type' => $type, + 'data' => encrypt(json_encode($newData, JSON_THROW_ON_ERROR)), + 'updated_at' => now(), + ]); + $kept[$key] = $secret->id; + }, 3); // pollers keep running, retry if they changed a method at the same time + } + } + + /** + * The secrets hold the version again. A community used with v1 and v2c becomes a secret for each version. + */ + public function down(): void + { + foreach (DB::table('secrets')->whereIn('secret_type', ['snmp-community', 'snmp-v3'])->orderBy('id')->get() as $secret) { + $data = $this->decrypt($secret); + $isV3 = $secret->secret_type === 'snmp-v3'; + + // a community is v2c unless its method sets v1 + $methodsByVersion = DB::table('device_polling_methods') + ->where('method_type', 'snmp') + ->where('secret_id', $secret->id) + ->get(['id', 'settings']) + ->groupBy(fn ($method) => $isV3 ? 'v3' : ((json_decode((string) $method->settings, true)['version'] ?? null) === 'v1' ? 'v1' : 'v2c')); + $versions = $methodsByVersion->keys()->all() ?: [$isV3 ? 'v3' : 'v2c']; + + DB::transaction(function () use ($secret, $data, $methodsByVersion, $versions): void { + $first = array_shift($versions); + DB::table('secrets')->where('id', $secret->id)->update([ + 'secret_type' => 'snmp', + 'data' => encrypt(json_encode(['version' => $first] + $data, JSON_THROW_ON_ERROR)), + 'updated_at' => now(), + ]); + + foreach ($versions as $version) { + $copyId = DB::table('secrets')->insertGetId([ + 'description' => $this->uniqueDescription("$secret->description ($version)"), + 'secret_type' => 'snmp', + 'data' => encrypt(json_encode(['version' => $version] + $data, JSON_THROW_ON_ERROR)), + 'created_at' => now(), + 'updated_at' => now(), + ]); + DB::table('device_polling_methods')->whereIn('id', $methodsByVersion[$version]->pluck('id'))->update(['secret_id' => $copyId]); + } + }); + } + + // the old settings have no version, it was in the secret + DB::table('device_polling_methods')->where('method_type', 'snmp')->get(['id', 'settings'])->each(function ($method): void { + $settings = json_decode((string) $method->settings, true); + if (is_array($settings) && array_key_exists('version', $settings)) { + unset($settings['version']); + DB::table('device_polling_methods')->where('id', $method->id)->update(['settings' => json_encode($settings)]); + } + }); + } + + /** + * Failing to decrypt fails the migration, the type of the secret is not known without its data. + * Each secret is split in its own transaction, so it can run again once APP_KEY is fixed. + * + * @return array + */ + private function decrypt(object $secret): array + { + try { + $data = json_decode((string) decrypt($secret->data), true, 512, JSON_THROW_ON_ERROR); + } catch (DecryptException|JsonException $e) { + throw new RuntimeException("SNMP secret $secret->id could not be decrypted. Every poller must use the APP_KEY the secrets were encrypted with.", previous: $e); + } + + return is_array($data) ? $data : []; + } + + private function setVersion(int $secretId, string $version): void + { + $methods = DB::table('device_polling_methods') + ->where('method_type', 'snmp') + ->where('secret_id', $secretId) + ->lockForUpdate() // a plain read takes a snapshot, MariaDB fails the update if a poller changed a method since + ->get(['id', 'settings']); + + foreach ($methods as $method) { + $settings = json_decode((string) $method->settings, true); + $settings = is_array($settings) ? $settings : []; + $settings['version'] = $version; + DB::table('device_polling_methods')->where('id', $method->id)->update(['settings' => json_encode($settings)]); + } + } + + /** + * Credentials with the same type and data are the same secret. + * + * @param array $data + */ + private function key(string $type, array $data): string + { + ksort($data); + + return $type . ':' . json_encode($data); + } + + /** + * Replace the secret everywhere it is used, in the same transaction, so a later run does not find it. + */ + private function replaceSecret(int $secretId, int $replacementId): void + { + DB::table('device_polling_methods')->where('secret_id', $secretId)->update(['secret_id' => $replacementId]); + DB::table('secrets')->where('id', $secretId)->delete(); + $this->replaceDefaultCredential($secretId, $replacementId); + } + + private function uniqueDescription(string $description): string + { + $unique = $description; + for ($i = 2; DB::table('secrets')->where('description', $unique)->exists(); $i++) { + $unique = "$description #$i"; + } + + return $unique; + } + + /** + * The default credentials keep their order, with the replacement where the secret was. + */ + private function replaceDefaultCredential(int $secretId, int $replacementId): void + { + $value = DB::table('config')->where('config_name', 'snmp.default_credentials')->lockForUpdate()->value('config_value'); + $ids = json_decode((string) $value, true); + if (! is_array($ids)) { + return; + } + + $newIds = collect($ids) + ->map(fn ($id) => (int) $id === $secretId ? $replacementId : (int) $id) + ->unique() + ->values() + ->all(); + + if ($newIds !== $ids) { + DB::table('config')->where('config_name', 'snmp.default_credentials')->update(['config_value' => json_encode($newIds)]); + \App\Facades\LibrenmsConfig::invalidateCache(); + } + } +}; diff --git a/database/migrations/2026_10_22_000000_add_polling_method_to_mempools_table.php b/database/migrations/2026_10_22_000000_add_polling_method_to_mempools_table.php new file mode 100644 index 00000000000..c0148267807 --- /dev/null +++ b/database/migrations/2026_10_22_000000_add_polling_method_to_mempools_table.php @@ -0,0 +1,22 @@ +string('polling_method', 32)->default('snmp')->after('device_id'); + }); + } + + public function down(): void + { + Schema::table('mempools', function (Blueprint $table): void { + $table->dropColumn('polling_method'); + }); + } +}; diff --git a/database/migrations/2026_10_22_000000_compress_bgp_peer_ipv6_identifiers.php b/database/migrations/2026_10_22_000000_compress_bgp_peer_ipv6_identifiers.php new file mode 100644 index 00000000000..ce4afabb155 --- /dev/null +++ b/database/migrations/2026_10_22_000000_compress_bgp_peer_ipv6_identifiers.php @@ -0,0 +1,51 @@ +compress('bgpPeers', ['device_id', 'context_name', 'vrf_id']); + $this->compress('bgpPeers_cbgp', ['device_id', 'afi', 'safi']); + } + + public function down(): void + { + // compressed addresses are valid for every version + } + + /** + * @param string[] $scope columns that identify a row together with the identifier + */ + private function compress(string $table, array $scope): void + { + $rows = DB::table($table)->where('bgpPeerIdentifier', 'like', '%:%')->get(); + + foreach ($rows as $row) { + $packed = @inet_pton($row->bgpPeerIdentifier); + $compressed = $packed === false ? false : inet_ntop($packed); + if ($compressed === false || $compressed === $row->bgpPeerIdentifier) { + continue; + } + + $peer = DB::table($table); + foreach ($scope as $column) { + $peer->where($column, $row->$column); + } + + $old = (clone $peer)->where('bgpPeerIdentifier', $row->bgpPeerIdentifier); + if ((clone $peer)->where('bgpPeerIdentifier', $compressed)->exists()) { + $old->delete(); // already rediscovered under the new identifier + } else { + $old->update(['bgpPeerIdentifier' => $compressed]); + } + } + } +}; diff --git a/database/migrations/2026_10_22_000001_add_context_to_bgp_peers_cbgp_unique.php b/database/migrations/2026_10_22_000001_add_context_to_bgp_peers_cbgp_unique.php new file mode 100644 index 00000000000..cc1bb7deb20 --- /dev/null +++ b/database/migrations/2026_10_22_000001_add_context_to_bgp_peers_cbgp_unique.php @@ -0,0 +1,29 @@ +dropUnique('bgppeers_cbgp_device_id_bgppeeridentifier_afi_safi_unique'); + $table->dropIndex('bgppeers_cbgp_device_id_bgppeeridentifier_context_name_index'); + $table->unique(['device_id', 'bgpPeerIdentifier', 'context_name', 'afi', 'safi'], 'bgppeers_cbgp_peer_family_unique'); + }); + } + + public function down(): void + { + Schema::table('bgpPeers_cbgp', function (Blueprint $table): void { + $table->dropUnique('bgppeers_cbgp_peer_family_unique'); + $table->index(['device_id', 'bgpPeerIdentifier', 'context_name']); + $table->unique(['device_id', 'bgpPeerIdentifier', 'afi', 'safi']); + }); + } +}; diff --git a/database/migrations/2026_10_24_000000_add_context_name_to_vrfs_table.php b/database/migrations/2026_10_24_000000_add_context_name_to_vrfs_table.php new file mode 100644 index 00000000000..3b55fd81bfc --- /dev/null +++ b/database/migrations/2026_10_24_000000_add_context_name_to_vrfs_table.php @@ -0,0 +1,29 @@ +string('context_name', 128)->nullable()->after('vrf_name'); + $table->boolean('context_manual')->default(false)->after('context_name'); + $table->boolean('vrf_manual')->default(false)->after('context_manual'); + $table->boolean('context_verified')->default(false)->after('vrf_manual'); + $table->unsignedTinyInteger('context_failures')->default(0)->after('context_verified'); + $table->boolean('context_enabled')->default(true)->after('context_verified'); + $table->index(['device_id', 'context_name']); + }); + } + + public function down(): void + { + Schema::table('vrfs', function (Blueprint $table): void { + $table->dropIndex(['device_id', 'context_name']); + $table->dropColumn(['context_name', 'context_manual', 'vrf_manual', 'context_verified', 'context_failures', 'context_enabled']); + }); + } +}; diff --git a/database/migrations/2026_10_24_000001_merge_vrf_contexts_into_vrfs.php b/database/migrations/2026_10_24_000001_merge_vrf_contexts_into_vrfs.php new file mode 100644 index 00000000000..076df983a69 --- /dev/null +++ b/database/migrations/2026_10_24_000001_merge_vrf_contexts_into_vrfs.php @@ -0,0 +1,124 @@ +get() as $vrfLite) { + $name = (string) $vrfLite->vrf_name; + if ($name === '' || strcasecmp($name, 'default') == 0) { + continue; // not a VRF (bridge domain contexts) or the default VRF + } + + $updated = DB::table('vrfs') + ->where('device_id', $vrfLite->device_id) + ->where('vrf_name', $name) + ->whereNull('context_name') + ->update(['context_name' => $vrfLite->context_name, 'context_verified' => true]); + + if (! $updated && ! DB::table('vrfs')->where('device_id', $vrfLite->device_id)->where('vrf_name', $name)->exists()) { + DB::table('vrfs')->insert([ + 'device_id' => $vrfLite->device_id, + 'vrf_oid' => $name, + 'vrf_name' => $name, + 'context_name' => $vrfLite->context_name, + 'context_verified' => true, + 'mplsVpnVrfDescription' => '', + ]); + } + } + + // vrf_oid is the VRF index used in the vendor MIB, without prefixes + foreach (DB::table('vrfs')->where('vrf_oid', 'like', 'firebrick.%')->get(['vrf_id', 'vrf_oid']) as $vrf) { + DB::table('vrfs')->where('vrf_id', $vrf->vrf_id)->update(['vrf_oid' => substr((string) $vrf->vrf_oid, 10)]); + } + + // ARISTA-VRF-MIB is indexed by the length prefixed VRF name + $aristaVrfs = DB::table('vrfs') + ->join('devices', 'devices.device_id', '=', 'vrfs.device_id') + ->whereIn('devices.os', ['arista_eos', 'arista-mos']) + ->get(['vrfs.vrf_id', 'vrfs.vrf_oid']); + foreach ($aristaVrfs as $vrf) { + $oid = (string) $vrf->vrf_oid; + if (! preg_match('/^\d+(\.\d+)*$/', $oid)) { + $encoded = implode('.', [strlen($oid), ...array_map(ord(...), str_split($oid))]); + DB::table('vrfs')->where('vrf_id', $vrf->vrf_id)->update(['vrf_oid' => $encoded]); + } + } + + Schema::drop('vrf_lite_cisco'); + + // manual contexts were a device setting, they are now stored on the VRF they expose + foreach (DB::table('devices_attribs')->where('attrib_type', 'routing_snmp_contexts')->get() as $attrib) { + $contexts = json_decode((string) $attrib->attrib_value, true); + foreach (is_array($contexts) ? $contexts : [] as $context) { + if (! is_string($context) || $context === '' || strcasecmp($context, 'default') == 0) { + continue; + } + + $findVrf = fn (string $column) => DB::table('vrfs')->where('device_id', $attrib->device_id)->where($column, $context)->first(); + + if ($findVrf('context_name') !== null) { + continue; // the device maps it + } + + $named = $findVrf('vrf_name'); + if ($named !== null) { + if ($named->context_name === null) { + DB::table('vrfs')->where('vrf_id', $named->vrf_id)->update(['context_name' => $context, 'context_manual' => true]); + } + + continue; + } + + // VRFs only known through their context have a prefixed vrf_oid, so it never matches a MIB index + DB::table('vrfs')->insert([ + 'device_id' => $attrib->device_id, + 'vrf_oid' => 'context:' . $context, + 'vrf_name' => $context, + 'context_name' => $context, + 'context_manual' => true, + 'vrf_manual' => true, + 'mplsVpnVrfDescription' => '', + ]); + } + } + + DB::table('devices_attribs')->where('attrib_type', 'routing_snmp_contexts')->delete(); + } + + public function down(): void + { + foreach (DB::table('vrfs')->where('context_manual', true)->get()->groupBy('device_id') as $deviceId => $vrfs) { + DB::table('devices_attribs')->insert([ + 'device_id' => $deviceId, + 'attrib_type' => 'routing_snmp_contexts', + 'attrib_value' => json_encode($vrfs->pluck('context_name')->values()->all()), + ]); + } + DB::table('vrfs')->where('vrf_manual', true)->delete(); + + Schema::create('vrf_lite_cisco', function (Blueprint $table): void { + $table->increments('vrf_lite_cisco_id'); + $table->unsignedInteger('device_id')->index(); + $table->string('context_name', 128)->index(); + $table->string('intance_name', 128)->nullable()->default(''); + $table->string('vrf_name', 128)->nullable()->default('Default')->index(); + $table->index(['device_id', 'context_name', 'vrf_name']); + }); + + foreach (DB::table('vrfs')->whereNotNull('context_name')->where('context_manual', false)->get() as $vrf) { + DB::table('vrf_lite_cisco')->insert([ + 'device_id' => $vrf->device_id, + 'context_name' => $vrf->context_name, + 'vrf_name' => $vrf->vrf_name, + ]); + } + } +}; diff --git a/database/migrations/2026_10_24_000002_remove_vrf_enable_settings.php b/database/migrations/2026_10_24_000002_remove_vrf_enable_settings.php new file mode 100644 index 00000000000..6d66064b070 --- /dev/null +++ b/database/migrations/2026_10_24_000002_remove_vrf_enable_settings.php @@ -0,0 +1,26 @@ +where('config_name', 'enable_vrfs')->value('config_value'); + if ($enabled !== null && json_decode((string) $enabled) === false) { + DB::table('config')->updateOrInsert(['config_name' => 'discovery_modules.vrf'], ['config_value' => 'false']); + } + + // cisco-vrf-lite is now part of the vrf module + DB::table('config')->whereIn('config_name', ['enable_vrfs', 'enable_vrf_lite_cisco'])->delete(); + DB::table('config')->where('config_name', 'like', '%discovery_modules.cisco-vrf-lite')->delete(); + DB::table('devices_attribs')->where('attrib_type', 'discover_cisco-vrf-lite')->delete(); + } + + public function down(): void + { + // + } +}; diff --git a/database/migrations/2026_10_28_000000_update_processors_table.php b/database/migrations/2026_10_28_000000_update_processors_table.php new file mode 100644 index 00000000000..b6042077b4f --- /dev/null +++ b/database/migrations/2026_10_28_000000_update_processors_table.php @@ -0,0 +1,39 @@ +dropColumn('entPhysicalIndex'); + $table->integer('processor_usage')->nullable()->change(); + $table->integer('processor_perc_warn_custom')->nullable()->after('processor_perc_warn'); + }); + + // keep thresholds users already set, discovery did not update processor_perc_warn before this + DB::table('processors') + ->whereNotNull('processor_perc_warn') + ->where('processor_perc_warn', '!=', LibrenmsConfig::get('processor_perc_warn', 75)) + ->update(['processor_perc_warn_custom' => DB::raw('processor_perc_warn')]); + } + + public function down(): void + { + Schema::table('processors', function (Blueprint $table): void { + $table->dropColumn('processor_perc_warn_custom'); + }); + + DB::table('processors')->whereNull('processor_usage')->update(['processor_usage' => 0]); + + Schema::table('processors', function (Blueprint $table): void { + $table->integer('processor_usage')->nullable(false)->change(); + $table->integer('entPhysicalIndex')->default(0)->after('processor_id'); + }); + } +}; diff --git a/database/migrations/2026_10_30_200223_add_phone_to_users.php b/database/migrations/2026_10_30_200223_add_phone_to_users.php new file mode 100644 index 00000000000..55b8240902d --- /dev/null +++ b/database/migrations/2026_10_30_200223_add_phone_to_users.php @@ -0,0 +1,28 @@ +string('phone', 15)->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('users', function (Blueprint $table): void { + $table->dropColumn('phone'); + }); + } +}; diff --git a/database/migrations/2026_10_31_000000_split_device_types_config.php b/database/migrations/2026_10_31_000000_split_device_types_config.php new file mode 100644 index 00000000000..f7474d7f22f --- /dev/null +++ b/database/migrations/2026_10_31_000000_split_device_types_config.php @@ -0,0 +1,39 @@ +where('config_name', 'device_types')->value('config_value'); + if ($rawConfig === null) { + return; + } + + $types = json_decode((string) $rawConfig, true); + if (is_array($types)) { + $definitions = LibrenmsConfig::getDefinitions(); + $removed = ['appliance', 'camera', 'encoder', 'environmental', 'proxy', 'sensor']; + + foreach ($types as $type) { + if (! isset($type['type'], $type['icon']) || in_array($type['type'], $removed, true)) { + continue; + } + + $setting = "device_types.{$type['type']}"; + $default = $definitions[$setting]['default'] ?? null; + if ($type['icon'] !== $default) { + DB::table('config')->updateOrInsert( + ['config_name' => $setting], + ['config_value' => json_encode($type['icon'], JSON_UNESCAPED_SLASHES)] + ); + } + } + } + + DB::table('config')->where('config_name', 'device_types')->delete(); + } +}; diff --git a/database/migrations/2026_11_03_000000_add_cluster_id_to_vminfo.php b/database/migrations/2026_11_03_000000_add_cluster_id_to_vminfo.php new file mode 100644 index 00000000000..9b8744d80b5 --- /dev/null +++ b/database/migrations/2026_11_03_000000_add_cluster_id_to_vminfo.php @@ -0,0 +1,31 @@ +string('cluster_id', 64)->nullable(); + $table->unique(['cluster_id', 'vm_type', 'vmwVmVMID']); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('vminfo', function (Blueprint $table): void { + $table->dropUnique(['cluster_id', 'vm_type', 'vmwVmVMID']); + $table->dropColumn('cluster_id'); + }); + } +}; diff --git a/database/migrations/2026_11_04_000000_replace_ports_fdb_vlan_id_with_vlan.php b/database/migrations/2026_11_04_000000_replace_ports_fdb_vlan_id_with_vlan.php new file mode 100644 index 00000000000..500ebdaacb9 --- /dev/null +++ b/database/migrations/2026_11_04_000000_replace_ports_fdb_vlan_id_with_vlan.php @@ -0,0 +1,45 @@ +unsignedInteger('vlan')->nullable()->after('mac_address')->index(); + }); + + // Timos and Edgeswitch could store the VLAN number as vlan_id, which may match an unrelated vlans row. + // Those stay null and discovery finds them again. + DB::table('ports_fdb') + ->whereNotIn('device_id', DB::table('devices')->select('device_id')->whereIn('os', ['edgeswitch', 'timos'])) + ->update(['vlan' => DB::raw( + 'NULLIF((SELECT vlan_vlan FROM vlans WHERE vlans.vlan_id = ports_fdb.vlan_id AND vlans.device_id = ports_fdb.device_id), 0)' + )]); + + Schema::table('ports_fdb', function (Blueprint $table): void { + $table->dropIndex('ports_fdb_vlan_id_index'); + $table->dropColumn('vlan_id'); + }); + } + + public function down(): void + { + Schema::table('ports_fdb', function (Blueprint $table): void { + $table->unsignedInteger('vlan_id')->default(0)->after('mac_address')->index(); + }); + + DB::table('ports_fdb')->update(['vlan_id' => DB::raw( + 'COALESCE((SELECT vlan_id FROM vlans WHERE vlans.vlan_vlan = ports_fdb.vlan AND vlans.device_id = ports_fdb.device_id LIMIT 1), 0)' + )]); + + Schema::table('ports_fdb', function (Blueprint $table): void { + $table->dropIndex('ports_fdb_vlan_index'); + $table->dropColumn('vlan'); + }); + } +}; diff --git a/database/migrations/2026_11_09_091308_migrate_callback_enabled_to_reporting_usage.php b/database/migrations/2026_11_09_091308_migrate_callback_enabled_to_reporting_usage.php new file mode 100644 index 00000000000..ef357f09568 --- /dev/null +++ b/database/migrations/2026_11_09_091308_migrate_callback_enabled_to_reporting_usage.php @@ -0,0 +1,24 @@ +where('name', 'enabled')->value('value'); + if ($enabled === null) { + return; + } + + if (! DB::table('config')->where('config_name', 'reporting.usage')->exists()) { + DB::table('config')->insert([ + 'config_name' => 'reporting.usage', + 'config_value' => json_encode($enabled == 1), + ]); + } + + DB::table('callback')->where('name', 'enabled')->delete(); + } +}; diff --git a/delhost.php b/delhost.php index 5b14fa953a4..56566c5973a 100755 --- a/delhost.php +++ b/delhost.php @@ -16,11 +16,13 @@ // Remove a host and all related data from the system if ($argv[1]) { $host = strtolower($argv[1]); - $id = getidbyname($host); - if ($id) { - echo delete_device($id) . "\n"; - } else { + $device = DeviceCache::get($host); + if (! $device->exists) { echo "Host doesn't exist!\n"; + } elseif ($device->delete()) { + echo "Removed device {$device->hostname}\n"; + } else { + echo "Failed to remove device {$device->hostname}\n"; } } else { echo "Host Removal Tool\nUsage: ./delhost.php \n"; diff --git a/dist/librenms-worker.service b/dist/librenms-worker.service new file mode 100644 index 00000000000..992106ebf03 --- /dev/null +++ b/dist/librenms-worker.service @@ -0,0 +1,19 @@ +[Unit] +Description=LibreNMS Queue Worker +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +WorkingDirectory=/opt/librenms/ +ExecStart=/usr/bin/env php artisan worker --no-ansi --no-interaction +User=librenms +Group=librenms +# Horizon exits to apply changed settings, it is started again here +Restart=always +RestartSec=5 +# only stop Horizon, its workers finish their running jobs after it exits (horizon fast_termination) +KillMode=process + +[Install] +WantedBy=multi-user.target diff --git a/doc/API/Devices.md b/doc/API/Devices.md index 677451b1e6b..37cfdf5ef8c 100644 --- a/doc/API/Devices.md +++ b/doc/API/Devices.md @@ -812,7 +812,7 @@ Output: "ports_fdb_id": 10, "port_id": 10000, "mac_address": "1aaa2bbb3ccc", - "vlan_id": 20000, + "vlan": 200, "device_id": 1, "created_at": "2019-01-1 01:01:01", "updated_at": "2019-01-1 01:01:01" diff --git a/doc/API/Switching.md b/doc/API/Switching.md index 64566ce1a27..ebe2e6a4433 100644 --- a/doc/API/Switching.md +++ b/doc/API/Switching.md @@ -224,7 +224,7 @@ Output: "ports_fdb_id": 10, "port_id": 10000, "mac_address": "1aaa2bbb3ccc", - "vlan_id": 20000, + "vlan": 200, "device_id": 1, "created_at": "2019-01-1 01:01:01", "updated_at": "2019-01-1 01:01:01" diff --git a/doc/Alerting/Templates.md b/doc/Alerting/Templates.md index 29112e83291..880e9661904 100644 --- a/doc/Alerting/Templates.md +++ b/doc/Alerting/Templates.md @@ -324,8 +324,8 @@ To see the available data, run this command on a device with the app: `lnms report:devices -o json -r applications $device | jq -S .applications | less`. Then read the app data section. -The index `[0]` is necessary because the legacy apps proxmox and drbd -do not use app data. They can have several instances instead. +The index `[0]` is necessary because the legacy app drbd +does not use app data. It can have several instances instead. #### Metrics @@ -643,7 +643,7 @@ Apart from the default template, these templates are included: }; @endphp { - "type": "message" + "type": "message", "attachments": [ { "contentType": "application/vnd.microsoft.card.adaptive", @@ -673,8 +673,11 @@ Apart from the default template, these templates are included: "type": "TextBlock", "text": "**📌 State:** @switch ($alert->state) @case (0) OK ✅ @break - @case (1) Warning ⚠️ @break - @case (2) Critical ❌ @break + @case (1) Active ❌ @break + @case (2) Acknowledged @break + @case (3) Worse @break + @case (4) Better @break + @case (5) Changed @break @default Unknown @endswitch", "wrap": true, "color": "{{ $state_color }}", @@ -767,7 +770,7 @@ Apart from the default template, these templates are included: "type": "Action.OpenUrl", "title": "View Alert", "style": "positive", - "url": "https://librenms.server.utsc.utoronto.ca/device/{{ $alert->device_id }}/faults" + "url": "https://my.librenms.install/device/{{ $alert->device_id }}/faults" } ] } diff --git a/doc/Alerting/Transports/Cisco-Spark.md b/doc/Alerting/Transports/Cisco-Spark.md index bb27a86d193..1bf685efe51 100644 --- a/doc/Alerting/Transports/Cisco-Spark.md +++ b/doc/Alerting/Transports/Cisco-Spark.md @@ -9,8 +9,8 @@ syntax. For more information about the Cisco Spark RoomID and token, read these pages: -- [Getting started](https://developer.ciscospark.com/getting-started.html) -- [Rooms](https://developer.ciscospark.com/resource-rooms.html) +- [Getting started](https://developer.webex.com/docs/getting-started) +- [Rooms](https://developer.webex.com/docs/api/v1/rooms) **Example:** diff --git a/doc/Developing/Graphs.md b/doc/Developing/Graphs.md new file mode 100644 index 00000000000..8865c0a85db --- /dev/null +++ b/doc/Developing/Graphs.md @@ -0,0 +1,272 @@ +source: Developing/Graphs.md + +# Creating Graphs + +Create new time-series graphs with a PHP class in `app/Graphs`. The class +describes which stored metrics to show and how to draw them. LibreNMS handles +RRD file lookup, rendering, and the standard legend. + +This guide builds a device graph for active Pulse Secure users. It uses the +data collected in [Custom Device Graphs](os/Custom-Graphs.md). + +## Before you start + +The metric must already be collected by a poller. A graph reads stored data; +it does not poll the device or create RRD files. For this example, the poller +stores the measurement `pulse_users` with a field named `users`. + +For most device graphs, extend `App\Graphs\Device\DeviceGraph`. It provides +access to the requested device through `$this->device()` and checks that the +user can view that device. + +## 1. Choose the graph name + +A graph name has two parts: a type and a subtype, separated by the first +underscore. LibreNMS uses these parts to find the class automatically. + +| Graph name | Class | File | +| --- | --- | --- | +| `device_pulse_users` | `App\Graphs\Device\PulseUsersGraph` | `app/Graphs/Device/PulseUsersGraph.php` | +| `device_netstat_ip` | `App\Graphs\Device\NetstatIpGraph` | `app/Graphs/Device/NetstatIpGraph.php` | +| `device_processor` | `App\Graphs\Device\ProcessorGraph` | `app/Graphs/Device/ProcessorGraph.php` | + +No factory registration or new route is needed. The graph name does not have +to match the stored measurement, but the metric identity in the next step must. + +## 2. Create the graph class + +Create `app/Graphs/Device/PulseUsersGraph.php` with this content: + +```php +device()->display . ' :: Active Users'; + } + + /** + * @return array + */ + public function getSeries(): array + { + $metric = $this->metric('pulse_users'); + + return [ + 'users' => new DataSeries( + metric: $metric, + field: 'users', + description: 'Active Users', + style: new SeriesStyle(fill: true), + ), + ]; + } + + protected function options(): GraphOptions + { + return new GraphOptions( + scaleMin: 0, + verticalLabel: 'Users', + legendTitle: 'Users', + ); + } +} +``` + +The class has three jobs: + +- `getTitle()` supplies the graph's title text. +- `getSeries()` returns the values to plot, keyed by a unique series name. + Each `DataSeries` selects a stored field and gives it a legend label. +- `options()` sets graph-wide presentation options. It is optional; omit it + to use the defaults. + +### Match the stored data + +`MetricIdentity` identifies a stored metric by its measurement and tags, the +same ones used when storing the data. What the metric belongs to is a tag too: +`$this->metric('pulse_users')` is the measurement `pulse_users` with the +`hostname` tag of the device. `DataSeries::field` selects the dataset inside +that measurement. Field names must match the stored dataset names exactly. + +Include the tags that tell one series from another, with short names that do +not repeat the measurement: `type`, not `processor_type`. Tags that can change, +such as a description, do not belong in the identity. Use a model's +`metricIdentity()` method when it provides one, so the graph and poller share +the same identity: + +```php +$processor->metricIdentity('processor'); + +// the same as +new MetricIdentity('processor', [ + 'hostname' => $processor->device->hostname, + 'type' => $processor->processor_type, + 'index' => $processor->processor_index, +]); +``` + +#### RRD files + +The RRD file is found in the directory of the first tag, which is `hostname` +for a metric of a device, and named after the measurement followed by the +other tag values, in order. `$this->metric('pulse_users')` reads +`pulse_users.rrd`. + +A metric whose names were cleaned up is still stored under the names it had +before, unless `datastore.canonical_metrics` is enabled. +`LibreNMS\Data\Store\MetricNames` lists those names by measurement, for all +datastores. Identify the metric by its clean measurement and tags: the graph +finds the file under either name. + +## 3. Add the graph to the device's Graphs tab + +Class discovery makes a graph renderable. Listing it on the device's +**Graphs** tab requires two separate pieces: + +- `graph_types.device.pulse_users` defines the graph's label and section for + all devices. It does not enable the graph on any device. +- `$this->enableGraph('pulse_users')` marks the graph as available on the + device being polled. It does not define the graph's label or section. + +The Graphs tab lists the graphs enabled for that device and uses `graph_types` +to place them in sections and label them. + +For a contribution, add the graph's metadata to +`resources/definitions/config_definitions.json`: + +```json +"graph_types.device.pulse_users": { + "default": { + "section": "firewall", + "order": 0, + "descr": "Active Users" + }, + "type": "graph" +} +``` + +This is one entry in the existing JSON object; add a comma between entries. +To customize the setting locally, use `lnms config:set`: + +```bash +lnms config:set graph_types.device.pulse_users '{"section":"firewall","order":0,"descr":"Active Users"}' +``` + +Then have the poller enable the subtype after collecting valid data. In an OS +poller's `pollOS()` method, this is: + +```php +$this->enableGraph('pulse_users'); +``` + +Use the subtype `pulse_users` here, without the `device_` prefix. See +[Custom Device Graphs](os/Custom-Graphs.md) for the complete polling example. + +## 4. Display and check the graph + +After polling has created the RRD file and enabled the graph, open the device's +**Graphs** tab and select the **Firewall** section. + +To show the same graph in an existing Blade view that has a `$device` variable, +use the graph component: + +```blade + +``` + +The component supplies the graph URL and links to the full graph page. On that +page, **Show RRD Command** displays the generated command for troubleshooting. + +Check that the label and units are correct, recent values appear after polling, +and a user without access to the device cannot view the graph. + +## Customize the appearance + +Add more `DataSeries` entries to `getSeries()` to draw several values on the +same graph. They may use different fields or different metric identities. +Series are drawn in array order. + +### Series options + +Set these named arguments on `SeriesStyle` to control an individual series: + +| Option | Effect | +| --- | --- | +| `color: '0000cc'` | Sets a hex line or area color, without `#`. Otherwise, uses the graph palette. | +| `fill: true` | Fills the area beneath a line. | +| `fillColor: '9999cc'` | Sets the fill color; the default is a transparent version of the line color. | +| `stacked: true` | Draws an area above the preceding stacked series. | +| `invert: true` | Draws below zero, unless `webui.graph_stacked` is enabled. | +| `drawScale: 0.5` | Scales only the drawing; legend values retain the series value. | +| `stackAverage: true` | Divides the drawing by the number of drawn series with this set, so a stack of percentages shows their average. | + +To convert the values themselves, use `scale` on `DataSeries`. For example, +`scale: 8, unit: 'bps'` converts a stored bytes-per-second field to bits per +second, including the legend values. Setting `unit` alone only adds a suffix; +it does not convert values. + +### Graph options + +Common named arguments on `GraphOptions` are: + +| Option | Purpose | +| --- | --- | +| `scaleMin`, `scaleMax` | Sets the lower and upper scale limits. | +| `scaleRigid` | Controls whether the graph strictly follows the scale limits. | +| `verticalLabel` | Labels the vertical axis. | +| `legendTitle` | Adds a heading above the series labels. | +| `palette` | Selects a palette from `graph_colours`; defaults to `mixed`. | +| `base` | Sets the scaling base, such as `1024` for binary units. | +| `unitsExponent` | Controls the axis unit exponent; `0` uses unprefixed units. | + +For example, a percentage graph can use `scaleMin: 0, scaleMax: 100, +scaleRigid: true`. See `app/Data/Graphing/GraphOptions.php` for all options. + +## Troubleshooting + +| Symptom | What to check | +| --- | --- | +| Graph is missing from the Graphs tab | Check the `graph_types.device` entry and that polling calls `enableGraph()` with the same subtype. | +| No data | Confirm polling has created the RRD file and the metric identity matches the stored filename. Missing files are skipped; if no series remain, the graph reports no data. | +| Draw error | Check the field name against the RRD dataset and inspect **Show RRD Command**. | +| Graph cannot be found | Check the class namespace, filename, and type/subtype naming. | +| Access denied | Check that the requested device exists and the user has permission to view it. | + +## Migrating an existing graph + +Create the class using the existing graph name so callers can keep using that +name. LibreNMS prefers a matching graph class over a legacy +`includes/html/graphs//.inc.php` file. If no class matches, it +falls back to the legacy include. + +Replace legacy RRD filename and dataset variables with `MetricIdentity` and +`DataSeries`, and move presentation settings into `SeriesStyle` and +`GraphOptions`. Compare the resulting graph and legend before removing the +old include. + +For working examples, read `app/Graphs/Device/NetstatIpGraph.php` for multiple +fields and inverted series, or `app/Graphs/Device/ProcessorGraph.php` for one +series per model and stacked drawing. Their regression tests are in +`tests/Feature/Graphs/Device`. + +For graph types outside device graphs, extend `AbstractSeriesGraph` and +implement `isAuthorized()` for the entities being displayed, using `canView()` +for each entity. Users need permission to view the entity; guests may only view +graphs when `allow_unauth_graphs` or `allow_unauth_graphs_cidr` allows them, or +when the caller vouched for the request (a signed graph URL or an alert +image). Graph-specific request rules belong in `validation()`, and typed input +is available through `$this->params->input`. Override `getPageContext()` to +choose the device, port or subtitle shown in the graph page heading. + +A series graph only declares its series and options; `RrdGraphRenderer` +draws them with rrdtool. Override `renderer()` to draw them with another +backend. diff --git a/doc/Developing/Support-New-OS.md b/doc/Developing/Support-New-OS.md index 7a71196616d..0b18011fc98 100644 --- a/doc/Developing/Support-New-OS.md +++ b/doc/Developing/Support-New-OS.md @@ -51,8 +51,8 @@ Use this workflow when LibreNMS does not yet support the target operating system - Prefer vector (SVG) over bitmap (PNG). - See [Icons and Logos](os/Initial-Detection.md#icon-and-logo). 5. **Test Fixtures (Mandatory)**: - - Capture a real SNMP recording: `tests/snmpsim/.snmprec`. - - Generate expected test data JSON: `./lnms dev:generate-test-data --variant=""`. + - Capture a real SNMP recording: `./lnms dev:collect-snmprec -M `. + - Generate expected test data JSON: `./lnms dev:generate-test-data _`. - Verify tests pass: `./lnms dev:check unit -o `. - See [Unit Tests](os/Test-Units.md). @@ -67,8 +67,8 @@ Use this workflow to add sensors, processors, mempools, or support for a new har - For alternative definitions of the exact same sensor, keep identical indexes with `skip_values`. - Add any missing vendor MIBs to `mibs//`. 3. **Update Test Fixtures**: - - To update existing base module test data: `./lnms dev:generate-test-data -m `. - - To add a new hardware variant: capture `tests/snmpsim/_.snmprec` and run `./lnms dev:generate-test-data --variant=""`. + - To update existing module test data: `./lnms dev:generate-test-data _ -m `. + - To add a new hardware model: run `./lnms dev:collect-snmprec -M ` and `./lnms dev:generate-test-data _`. 4. **Verify**: - Run module verification: `./lnms dev:check unit -o --os-modules-only`. - See [Unit Tests](os/Test-Units.md). @@ -105,10 +105,10 @@ Use this workflow to add sensors, processors, mempools, or support for a new har - **Placement**: Save in `mibs//`. Name the file to match the MIB module definition line exactly, without a file extension. Do not include standard RFC MIBs in vendor directories. ### Testing & Verification -- **Real Device Data Only**: Every OS must include test fixtures (`tests/snmpsim/.snmprec` and `tests/data/.json`). +- **Real Device Data Only**: Every OS must include test fixtures (`tests/snmpsim/_.snmprec` and `tests/data/_.json`). - **No Fabricated Files**: Do not fabricate `snmprec` files. Only capture them from an actual device or convert them from `snmpwalk` output from an actual device. - **Sanitization**: Sanitize recordings to remove private IPs, passwords, and community strings. Do not break SNMP data types or OID structures during sanitization. -- **Fixture Generation**: For new base fixtures, pass `--variant=""`: `./lnms dev:generate-test-data --variant=""`. +- **Fixture Generation**: `./lnms dev:generate-test-data _`. - **Run Tests**: Run `./lnms dev:check unit -o `. All tests must pass before submitting a pull request. --- diff --git a/doc/Developing/os/Custom-Graphs.md b/doc/Developing/os/Custom-Graphs.md index 94597746b20..b770056daed 100644 --- a/doc/Developing/os/Custom-Graphs.md +++ b/doc/Developing/os/Custom-Graphs.md @@ -1,5 +1,10 @@ # Custom Device Graphs +To add a custom device graph, define where it appears, collect its data, and +create a graph class. This page covers the definition and polling steps. See +[Creating Graphs](../Graphs.md) for the class-based graph method and a complete +`PulseUsersGraph` example that displays the data collected below. + First define your graphs in `resources/definitions/config_definitions.json`. Your work is then available to everyone. @@ -23,15 +28,18 @@ available to everyone. }, ``` -Without a contribution, put the definitions in `config.php`. +To customize these settings locally, use `lnms config:set`. -```config.php -// Pulse Secure Graphs -$config['graph_types']['device']['pulse_users'] = ['section' => 'firewall', 'order' => 0, 'descr' => 'Active Users']; -$config['graph_types']['device']['pulse_sessions'] = ['section' => 'firewall', 'order' => 0, 'descr' => 'Active Sessions']; +```bash +lnms config:set graph_types.device.pulse_users '{"section":"firewall","order":0,"descr":"Active Users"}' +lnms config:set graph_types.device.pulse_sessions '{"section":"firewall","order":0,"descr":"Active Sessions"}' ``` -#### Polling OS +These settings define the graphs' labels and sections. The poller enables each +graph for an individual device by calling `enableGraph()` after collecting +valid data. + +## Polling OS OS polling is not always the correct place for your own polling code. For guidance, ask a core developer on @@ -43,9 +51,9 @@ Update the example file with more polling: LibreNMS/OS/Pulse.php ``` -This code declares two graphs: one for the number of users and one for -the number of sessions. The two graphs appear in the firewall section -of the graphs tab. The definition include file sets this position. +The example below collects the number of users and enables `pulse_users` for +this device. The graph settings above place it in the firewall section of the +Graphs tab. Add equivalent polling for `pulse_sessions` to show sessions too. ```php > Runtime for discovery module 'core': 0.0240 seconds with 66536 bytes >> SNMP: [2/0.06s] MySQL: [3/0.00s] RRD: [0/0.00s] #### Unload disco module core #### -#### Load disco module sensors #### +#### Load discovery module sensors #### Pre-cache adva_fsp150: ENTITY-SENSOR: Caching OIDs: entPhysicalDescr entPhysicalName entPhySensorType entPhySensorScale entPhySensorPrecision entPhySensorValue entPhySensorOperStatus Airflow: @@ -601,7 +602,7 @@ Signal_loss: >> Runtime for discovery module 'sensors': 3.9340 seconds with 190024 bytes >> SNMP: [16/3.89s] MySQL: [36/0.03s] RRD: [0/0.00s] -#### Unload disco module sensors #### +#### Unload discovery module sensors #### Discovered in 5.521 seconds diff --git a/doc/Developing/os/Mem-CPU-Information.md b/doc/Developing/os/Mem-CPU-Information.md index 09f6d927bd0..ace66bb92d0 100644 --- a/doc/Developing/os/Mem-CPU-Information.md +++ b/doc/Developing/os/Mem-CPU-Information.md @@ -57,11 +57,11 @@ Valid data entry keys: Sensors](Health-Information.md) - `snmp_flags` more net-snmp flags -##### Custom Processor Discovery and Polling +##### Custom Mempool Discovery and Polling For your own discovery or polling, implement the MempoolsDiscovery -interface and the MempoolsPolling interface in the OS class. -MempoolsPolling is optional. Without it, LibreNMS uses the standard +interface and override the pollMempools method in the OS class. +Overriding pollMempools is optional. Without it, LibreNMS uses the standard polling with the OIDs from the database. The OS class files are in `LibreNMS\OS`. @@ -71,10 +71,8 @@ The OS class files are in `LibreNMS\OS`. namespace LibreNMS\OS; -use LibreNMS\Interfaces\Discovery\MempoolsDiscovery; -use LibreNMS\Interfaces\Polling\MempoolsPolling; - -class Example extends \LibreNMS\OS implements MempoolsDiscovery, MempoolsPolling +use Illuminate\Database\Eloquent\Collection; +class Example extends \LibreNMS\OS { /** * Discover a Collection of Mempool models. @@ -88,10 +86,10 @@ class Example extends \LibreNMS\OS implements MempoolsDiscovery, MempoolsPolling } /** - * @param \Illuminate\Support\Collection $mempools \App\Models\Mempool - * @return \Illuminate\Support\Collection \App\Models\Mempool + * @param \Illuminate\Database\Eloquent\Collection $mempools \App\Models\Mempool + * @return \Illuminate\Database\Eloquent\Collection the mempools that were polled */ - public function pollMempools($mempools) + public function pollMempools(Collection $mempools): Collection { // TODO: Implement pollMempools() method. } @@ -124,7 +122,7 @@ Key | Default | Description oid | required | The textual OID of the data. It is a table or a single value num_oid | optional | The numeric OID of the polling data. It usually ends with {{ $index }}. Without this key, the discovery process calculates it value | optional | The OID of the data. It applies mainly to a table -precision | 1 | The multiplier of the data. With a negative value, LibreNMS multiplies the data and then subtracts the result from 100 +precision | 1 | The divisor of the data. With a negative value, LibreNMS divides the data and then subtracts the result from 100 (for idle values) descr | Processor | The description of this processor. It is an OID or a plain string. The values {{ $index }} and {{$count}} are useful type | | The name of this sensor. With the index, it builds a unique id for this sensor index | {{ $index }} | The index of this sensor. The default is the index of the OID @@ -142,6 +140,13 @@ Accessing values within yaml: For your own discovery or polling, implement the ProcessorDiscovery interface and the ProcessorPolling interface in the OS class. +ProcessorPolling is optional. Without it, LibreNMS polls the +processor_oid from the database. Call `$this->discoverYamlProcessors()` +from your discovery if the OS also has a processors section in its yaml. + +Set `processor_usage` to the raw value from the device. The Processor +model applies `processor_precision` to it. Leave it null if the value +is unknown. Discovery drops processors without a usage value. OS Class files reside under `LibreNMS\OS` @@ -149,7 +154,8 @@ OS Class files reside under `LibreNMS\OS` */ - public function discoverProcessors() + public function discoverProcessors(): Collection { - // discovery code here + return new Collection([ + new Processor([ + 'processor_type' => 'example', + 'processor_index' => 0, + 'processor_oid' => '.1.3.6.1.4.1.1234.1.0', + 'processor_descr' => 'Processor', + 'processor_precision' => 1, + 'processor_usage' => \SnmpQuery::get('EXAMPLE-MIB::cpuUsage.0')->value(), + ]), + ]); } /** - * Poll processor data. This can be implemented if custom polling is needed. + * Poll processor data. Only needed if processor_oid can't be polled directly. * - * @param array $processors Array of processor entries from the database that need to be polled - * @return array of polled data + * @param Collection $processors processor_usage is null on each processor + * @return Collection */ - public function pollProcessors(array $processors) + public function pollProcessors(Collection $processors): Collection { - // polling code here + foreach ($processors as $processor) { + $processor->processor_usage = 42; // raw value, leave null on failure + } + + return $processors; } } ``` diff --git a/doc/Developing/os/Test-Units.md b/doc/Developing/os/Test-Units.md index 1054bcd0661..f19f90efb96 100644 --- a/doc/Developing/os/Test-Units.md +++ b/doc/Developing/os/Test-Units.md @@ -19,17 +19,31 @@ way. ???+ warning "If test data already exists" > Test data can already exist for a different device or configuration -> with the same OS. In that case, use the `--variant (-v)` option to -> give a different variant of the OS. LibreNMS tests each variant -> separately. With only one variant, do not give a variant name. +> with the same OS. Each device model has its own file: for a Linksys +> WRT54G with the OS `linksys`, the model `wrt54g` saves +> `linksys_wrt54g.snmprec`. LibreNMS tests each file separately. ### 1. Collect SNMP data -`lnms dev:collect-snmprec` collects the data for the tests. Run -`dev:collect-snmprec` with ` --variant ''`. It then captures -all the discovery data and the polling data of a device in LibreNMS. -Run the command again after you add more support. For more options, -read the command line help. +`lnms dev:collect-snmprec` collects the data for the tests. It +captures all the discovery data and the polling data of a device in +LibreNMS. Run it with the device ID, IP, or hostname: + +``` +lnms dev:collect-snmprec 42 +``` + +If you leave out the device, the command asks for it. LibreNMS must +detect the device as its own OS first. The command does +not collect data from a generic device, because it would leave data out. + +The command asks for the device model, and then saves the data to +`tests/snmpsim/_.snmprec`. To skip the question, give the +model with `-M`, for example `lnms dev:collect-snmprec 42 -M wrt54g`. + +The command always replaces the file. It does not merge the data with an +existing file. Run the command again after you add more support. For more +options, read the command line help (`lnms dev:collect-snmprec --help`). - **Do not fabricate snmprec files**. You must only capture snmprec files from an actual device or convert them from snmpwalk output from an @@ -42,15 +56,12 @@ read the command line help. After you collect the SNMP data, run `lnms dev:generate-test-data`: -- For a new base OS fixture, pass the `--variant=""` option: - `lnms dev:generate-test-data --variant=""`. - You must include this option when creating a new fixture for the first - time. Without this option, the command searches only for existing JSON - files. -- To update existing JSON fixtures, run: - `lnms dev:generate-test-data `. -- For an OS variant, use a lowercase variant name: - `lnms dev:generate-test-data --variant=""`. +- The argument is a fixture file name prefix. `ios` matches every + fixture starting with `ios` (`ios`, `iosxe`, `ios_c3560`, ...), while + `ios_` matches only the `ios` models. Use `all` for every fixture. +- To create a new fixture, give the exact name of the snmprec file, for + example `lnms dev:generate-test-data linksys_wrt54g`. +- To update existing JSON fixtures, run the same command again. This command dumps the database entries after discovery and after polling into a JSON file (`tests/data/.json`). Do not edit this @@ -90,8 +101,8 @@ This command runs snmpsim with the test data: lnms dev:simulate ``` -You can then run SNMP queries against it. Use the OS, and the variant, -as the community. Use 127.1.6.1:1161 as the host. +You can then run SNMP queries against it. Use the file name without +`.snmprec` as the community. Use 127.1.6.1:1161 as the host. ```bash snmpget -v 2c -c ios_c3560e 127.1.6.1:1161 sysDescr.0 @@ -167,33 +178,28 @@ parameters in `/tests/module_tables.yaml`. ## Example workflow -If the base os (.snmprec) already contains test data for the -module you are testing or that data conflicts with your new data, you -must use a variant to store your test data (-v ). - ### Add initial detection 1. Add device to LibreNMS. It is generic and device_id = 42 -1. Run `lnms dev:collect-snmprec 42 --variant ''`. It creates the first snmprec file -1. [Add initial detection](Initial-Detection.md) for `example-os` +1. [Add initial detection](Initial-Detection.md) for `linksys` 1. Run discovery to make sure it detects properly `lnms device:discover -vv 42` 1. Add any additional os items like version, hardware, features, or serial. -1. If there is additional snmp data required, run - `lnms dev:collect-snmprec 42 --variant ''` -1. Run `lnms dev:generate-test-data example-os` to update the +1. Run `lnms dev:collect-snmprec 42 -M wrt54g` to save + `linksys_wrt54g.snmprec` +1. Run `lnms dev:generate-test-data linksys_wrt54g` to create the dumped database data. 1. Review data. If you modified the snmprec or code (do not modify the json - manually) run `lnms dev:generate-test-data example-os -m os --variant ''` + manually) run `lnms dev:generate-test-data linksys_wrt54g -m os` 1. Run `lnms dev:check unit --db --snmpsim` 1. If the tests succeed submit a pull request ### Additional module support or test data 1. Add code to support module or support already exists. -1. Run `lnms dev:collect-snmprec 42 --variant '' -m `. It adds - more data to the snmprec file +1. Run `lnms dev:collect-snmprec 42 -M wrt54g`. It replaces the snmprec file +1. Run `lnms dev:generate-test-data linksys_wrt54g` 1. Review data. If you modified the snmprec (do not modify the json - manually) run `lnms dev:generate-test-data example-os --variant '' -m ` + manually) run `lnms dev:generate-test-data linksys_wrt54g -m ` 1. Run `lnms dev:check unit --db --snmpsim` 1. If the tests succeed submit a pull request diff --git a/doc/Extensions/Agent-Setup.md b/doc/Extensions/Agent-Setup.md index cb441bb3ee7..a23a1e2447e 100644 --- a/doc/Extensions/Agent-Setup.md +++ b/doc/Extensions/Agent-Setup.md @@ -61,8 +61,8 @@ instructions of each application. | --- | --- | | `/etc/init.d/xinetd restart` | `systemctl enable check_mk.socket && systemctl start check_mk.socket` | -8: Log in to the LibreNMS web interface and edit the monitored device. -In the modules section, enable unix-agent. +8: In LibreNMS, add the Unix Agent method under Device -> Edit -> Polling. +This enables the unix-agent module. 9: Then enable your applications under Applications. diff --git a/doc/Extensions/Applications.md b/doc/Extensions/Applications.md index c9b54fba2c9..41cf921f361 100644 --- a/doc/Extensions/Applications.md +++ b/doc/Extensions/Applications.md @@ -30,23 +30,23 @@ the extend script as that user. !!! example In this example, `snmpd` runs as `Debian-snmp` and the extend is for - proxmox. These commands must run without an error: + unbound. These commands must run without an error: ```bash - sudo -u Debian-snmp /usr/local/bin/proxmox + sudo -u Debian-snmp /etc/snmp/unbound ``` If a command fails, use sudo with the extend command. For the example above, add this line to the sudoers file: ```bash - Debian-snmp ALL = NOPASSWD: /usr/local/bin/proxmox + Debian-snmp ALL = NOPASSWD: /etc/snmp/unbound ``` - Then add sudo to the extend command. For proxmox, the result is: + Then add sudo to the extend command. For unbound, the result is: ```bash - extend proxmox /usr/bin/sudo /usr/local/bin/proxmox + extend unbound /usr/bin/sudo /etc/snmp/unbound ``` ### Restart snmpd @@ -178,8 +178,6 @@ LibreNMS during discovery and polling. ## Agent The unix-agent does not have a discovery module, only a poller -module. That poller module is always disabled by default. It needs to -need a manual enable with the agent. LibreNMS -automatically enabled by the unix-agent poller module. It is better to +module. Adding the Unix Agent polling method to a device enables it. It is better to ensure that your application is enabled for monitoring. You can check by following the steps under the `SNMP Extend` heading. diff --git a/doc/Extensions/Applications/PowerDNS Recursor.md b/doc/Extensions/Applications/PowerDNS Recursor.md index 2eb08b9a92c..5788aaf9e4d 100644 --- a/doc/Extensions/Applications/PowerDNS Recursor.md +++ b/doc/Extensions/Applications/PowerDNS Recursor.md @@ -7,7 +7,7 @@ A recursive DNS server: The LibreNMS polling host must be able to connect to port 8082 on the monitored device. The web-server must be enabled, see the Recursor - docs: + docs: ## Variables diff --git a/doc/Extensions/Applications/Proxmox.md b/doc/Extensions/Applications/Proxmox.md deleted file mode 100644 index 114d9e09b70..00000000000 --- a/doc/Extensions/Applications/Proxmox.md +++ /dev/null @@ -1,45 +0,0 @@ -# Proxmox - - -## Install prerequisites - -=== "Debian/Ubuntu" - - ```bash - apt install libpve-apiclient-perl - ``` - -## SNMP Extend - -2. Download the script onto the host. - - ``` - wget https://raw.githubusercontent.com/librenms/librenms-agent/master/agent-local/proxmox -O /usr/local/bin/proxmox - ``` - -3. Make the script executable. - - ```bash - chmod +x /usr/local/bin/proxmox - ``` - -4. Edit your `snmpd.conf` file, usually `/etc/snmp/snmpd.conf`, and add: - - ```bash - extend proxmox /usr/local/bin/proxmox - ``` - -5. Note: if your snmpd does not run as root, call - the script using sudo and modify the "extend" line - - ```bash - extend proxmox /usr/bin/sudo /usr/local/bin/proxmox - ``` - - after, edit your sudo users (usually `visudo`) and add at the bottom: - - ```bash - Debian-snmp ALL=(ALL) NOPASSWD: /usr/local/bin/proxmox - ``` - -6. Restart snmpd on your host. \ No newline at end of file diff --git a/doc/Extensions/Authentication.md b/doc/Extensions/Authentication.md index 63b2ff6b52b..bdcb630238e 100644 --- a/doc/Extensions/Authentication.md +++ b/doc/Extensions/Authentication.md @@ -36,6 +36,34 @@ the same time. lnms config:set auth_mechanism mysql ``` +## Local fallback + +When `auth_mechanism` is `active_directory`, `ldap` or `radius`, users created in LibreNMS +(authentication type `mysql`) can not log in. Enable this to keep a local +break-glass account working, for example while the directory server is down: + +!!! setting "auth/general" + ```bash + lnms config:set auth_fallback_local true + ``` + +Create the local user with `lnms user:add`. + +The configured authentication is always tried first. Only if it does not find +the user, or cannot be reached, a local user with that name can log in with its +LibreNMS password. A directory user that can be looked up is never checked +against a local password. If the directory cannot be reached, or does not allow +the user to be searched (for example LDAP without a bind user and with +anonymous search disabled), a local user with the same name as a directory +user can log in, so use a distinct name for the break-glass account. + +This does not apply to external authentication (`http-auth`, `sso`, +`ad-authorization` and `ldap-authorization`), the web server already decides +who the user is. + +While another `auth_mechanism` is active, the password of a local user can not +be changed in the web UI. + ## User Roles See [Authorization](Authorization.md) for more details on roles and permissions. diff --git a/doc/Extensions/Proxmox.md b/doc/Extensions/Proxmox.md index 8d30cb4b3e4..226a20d87d4 100644 --- a/doc/Extensions/Proxmox.md +++ b/doc/Extensions/Proxmox.md @@ -1,50 +1,74 @@ -# Proxmox graphing +# Proxmox -LibreNMS creates graphs of the Proxmox **VMs** on your monitored -machines. It creates only traffic graphs, one for each interface of -each VM. IO graphs can come later. +LibreNMS discovers the virtual machines and LXC containers of Proxmox VE +hosts and polls their CPU, memory, disk, disk IO and network usage with the +Proxmox VE API. Disk operations are only available for virtual machines. -The final goal is a traffic bill for each VM, on any physical machine. +Add the Proxmox API polling method to **every node** of a cluster, each node +reports the guests it runs. The guests of a node without the method are not +monitored. -## Enabling Proxmox graphs +A guest shows under the device of the node it runs on. When it migrates, the +new node takes it over at its next poll and logs a migrated event. The guest +keeps its page and its graphs. -To enable the Proxmox graphs, do these steps: +The graphs of a guest are stored per cluster instead of per device, in +`rrd/proxmox-/`. The cluster id comes from the fingerprint of the +Proxmox root CA, so clusters with the same name stay apart. Regenerating the +root CA starts new graphs, rename the directory to keep the old ones. -In `config.php`, enable Proxmox: +## Create an API token -```php -$config['enable_proxmox'] = 1; -``` - -Then install git and [librenms-agent](Applications.md) on the Proxmox -machines. Then enable the Proxmox script: +On the Proxmox host, create a user and an API token with the `PVEAuditor` +role. ```bash -cp /opt/librenms-agent/agent-local/proxmox /usr/lib/check_mk_agent/local/proxmox -chmod +x /usr/lib/check_mk_agent/local/proxmox +pveum user add librenms@pve +pveum aclmod / -user librenms@pve -role PVEAuditor +pveum user token add librenms@pve monitoring --privsep 0 ``` -Then enable and start the check_mk service with systemd: +Note the token ID (`librenms@pve!monitoring`) and the secret value, the +secret is only shown once. -```bash -cp /opt/librenms-agent/check_mk@.service /opt/librenms-agent/check_mk.socket /etc/systemd/system -systemctl daemon-reload -systemctl enable check_mk.socket && systemctl start check_mk.socket -``` +Disk usage of a virtual machine is read from the QEMU guest agent when it +runs in the virtual machine, otherwise the hypervisor values are used. The +guest OS of a virtual machine also comes from the agent. Hypervisor values +report no used space for virtual machines and the size of the boot disk only. + +### Guest agent access -Then enable the librenms-agent flag and the proxmox application flag on -the monitored device in LibreNMS. The application then appears in -LibreNMS. A new item also appears in the top menu. This item selects -the cluster to view. +On Proxmox VE 9 and later, `PVEAuditor` includes `VM.GuestAgent.Audit`, so the +token stays read-only and can use the guest agent. -## Note, if you want to use use xinetd instead of systemd +On Proxmox VE 8 and earlier, `PVEAuditor` does not grant guest agent access. +The guest OS is not collected and disk usage uses the hypervisor values. -xinetd can start the librenms-agent in place of systemd. One use case -is an old Proxmox installation. Install the librenms-agent, as above. -Then copy and enable the xinetd config. Then restart the xinetd -service: +Collecting them on these versions requires `VM.Monitor`, but that privilege +also allows guest-changing agent operations, such as running commands, writing +files and setting passwords. The token is then no longer read-only, so only +grant it if you accept that scope: ```bash -cp check_mk_xinetd /etc/xinetd.d/check_mk -/etc/init.d/xinetd restart +pveum role add LibreNMSGuestAgent --privs VM.Monitor +pveum aclmod /vms -user librenms@pve -role LibreNMSGuestAgent ``` + +## Add the polling method + +On the device, go to Edit -> Polling, add the **Proxmox API** method and +create a secret with the token ID and the token secret. + +| Setting | Default | +|------------------------|--------------------| +| Hostname | device's hostname | +| Port | 8006 | +| Timeout | 10 seconds | +| Verify TLS Certificate | Yes | + +Proxmox VE uses a self-signed certificate by default. Install a trusted +certificate on the host, or set Verify TLS Certificate to No. + +The Proxmox API method enables the `vminfo` module for the device, the +virtual machines are discovered during the next discovery. A device setting +in Edit -> Modules overrides it. diff --git a/doc/Extensions/metrics/InfluxDB.md b/doc/Extensions/metrics/InfluxDB.md index b93c757039f..2bbbab95b7c 100644 --- a/doc/Extensions/metrics/InfluxDB.md +++ b/doc/Extensions/metrics/InfluxDB.md @@ -22,6 +22,35 @@ cannot help with them. RRD continues to work in the normal way. LibreNMS therefore also continues to work in the normal way. +## Create the database + +For HTTP/HTTPS writes, create the database on your InfluxDB server before +enabling the datastore. +LibreNMS writes to the configured database but does not check for or create it. +Existing installations with the database already present need no changes. + +Run this using the InfluxDB CLI, authenticating as an administrator if required: + +```sql +CREATE DATABASE "librenms" +``` + +If authentication is enabled, grant the LibreNMS user write access to that +database. Database administration privileges are not required for LibreNMS. +Use the same database name in `influxdb.db` below. + +For UDP, the InfluxDB listener's `database` setting selects the destination, +not `influxdb.db`. InfluxDB creates that database when the listener starts. + +For a fresh official InfluxDB 1.8 Docker container, set `INFLUXDB_DB=librenms` +on the InfluxDB container before its first startup. Initialization variables +only apply to a new data directory; for an existing volume, create the database +using the CLI instead. See the [InfluxDB Docker initialization documentation](https://docs.influxdata.com/influxdb/v1/introduction/install/docker/#initialize-influxdb). + +When sending metrics through a write-only relay such as Telegraf, provision the +destination database on the backing InfluxDB server rather than the relay. +Set Telegraf's `outputs.influxdb.database` to that database name. + ## Configuration !!! setting "poller/influxdb" diff --git a/doc/General/Changelogs/2017.md b/doc/General/Changelogs/2017.md index 4868c13153f..b7a13ed3d9c 100644 --- a/doc/General/Changelogs/2017.md +++ b/doc/General/Changelogs/2017.md @@ -809,7 +809,7 @@ search: * Vlan port mappings not removed ([#6423](https://github.com/librenms/librenms/issues/6423)) * Fix alerts not honouring interval over 5m ([#6438](https://github.com/librenms/librenms/issues/6438)) * Improve CiscoSB polling time ([#6447](https://github.com/librenms/librenms/issues/6447)) -* Updated cisco and juniper component macros to exclude disabled sensors ([#6493](https://github.com/librenms/librenms/issues/64649393)) +* Updated cisco and juniper component macros to exclude disabled sensors ([#6493](https://github.com/librenms/librenms/issues/6493)) * Added more safety checking into create_state_index() ([#6516](https://github.com/librenms/librenms/issues/6516)) * Fixed inconsistent device discovery ([#6518](https://github.com/librenms/librenms/issues/6518)) * Fixed notifications by email to Active Directory admins ([#6134](https://github.com/librenms/librenms/issues/6134)) @@ -1096,7 +1096,7 @@ search: * Added serial, model and version support for HPE MSL ([#5667](https://github.com/librenms/librenms/issues/5667)) * Added support for Kemp Loadbalancers ([#5668](https://github.com/librenms/librenms/issues/5668)) * Additional TPLink JetStream support ([#5909](https://github.com/librenms/librenms/issues/5909)) -* Additional detection for Dasan devices ([#5711](https://github.com/librenms/librenms/issue/5711)) +* Additional detection for Dasan devices ([#5711](https://github.com/librenms/librenms/issues/5711)) * Added initial support for Meinberg LANTIME OS v6 ([#5719](https://github.com/librenms/librenms/pull/5719)) * Added support for Zyxel XS ([#5730](https://github.com/librenms/librenms/issues/5730)) * Added support for Exterity AvediaPlayer ([#5732](https://github.com/librenms/librenms/pull/5732)) diff --git a/doc/Installation/Install-LibreNMS.md b/doc/Installation/Install-LibreNMS.md index d9ca8bff2d9..bb4d26ea365 100644 --- a/doc/Installation/Install-LibreNMS.md +++ b/doc/Installation/Install-LibreNMS.md @@ -714,6 +714,7 @@ systemctl restart snmpd ``` cp /opt/librenms/dist/librenms.cron /etc/cron.d/librenms +chmod 644 /etc/cron.d/librenms ``` !!! note @@ -740,6 +741,7 @@ configuration file: ``` cp /opt/librenms/misc/librenms.logrotate /etc/logrotate.d/librenms +chmod 644 /etc/logrotate.d/librenms ``` ## Web installer diff --git a/doc/Support/Configuration.md b/doc/Support/Configuration.md index 3cc7d3f08c3..6881c1848ab 100644 --- a/doc/Support/Configuration.md +++ b/doc/Support/Configuration.md @@ -719,14 +719,23 @@ in Device -> Edit -> Polling -> SNMP. > NOTE: `timeout` is the time to wait for an answer. `exec_timeout` is > the maximum time for a query. -SNMP credentials (communities and v3 users) are stored encrypted as -secrets. Manage them in the web interface under Settings (the gear menu) --> Secrets. Secrets are encrypted with `APP_KEY`, so every poller must -use the same `APP_KEY`. +SNMP credentials are stored encrypted as secrets of two types: SNMP +v1/v2c Community and SNMP v3. Manage them in the web interface +under Settings (the gear menu) -> Secrets. Secrets are encrypted with +`APP_KEY`, so every poller must use the same `APP_KEY`. + +A v3 secret is always used with SNMP v3. A community is used with v2c, +or v1 when the SNMP version of the device's SNMP polling method is set +to v1, so one community secret works for v1 and v2c devices. + +When you add a device without setting the SNMP version, a community is +tried with v2c first, and with v1 after every other credential failed. +If v1 replies, the device's SNMP version is set to v1. The default credentials are the secrets that LibreNMS tries, in order, when you add a device without credentials. Auto discovery uses them too. -Select them in the web interface, or give the secret ids: +If the device's SNMP version is set, only the secrets for that version +are tried. Select them in the web interface, or give the secret ids: !!! setting "poller/snmp" ```bash @@ -854,10 +863,6 @@ Read [Billing](../Extensions/Billing-Module.md). lnms config:set enable_pseudowires true # Enable Pseudowires ``` -```bash -lnms config:set enable_vrfs true # Enable VRFs -``` - ## Port extensions Read [Port-Description-Parser](../Extensions/Interface-Description-Parsing.md). diff --git a/doc/Support/Discovery Support.md b/doc/Support/Discovery Support.md index 0bd6a112811..20d7f7f82c6 100644 --- a/doc/Support/Discovery Support.md +++ b/doc/Support/Discovery Support.md @@ -83,10 +83,9 @@ the web interface at Device -> Settings -> Modules. lnms config:set discovery_modules.entity-state false lnms config:set discovery_modules.processors true lnms config:set discovery_modules.mempools true - lnms config:set discovery_modules.cisco-vrf-lite true lnms config:set discovery_modules.mac-accounting true lnms config:set discovery_modules.cisco-pw false - lnms config:set discovery_modules.vrf false + lnms config:set discovery_modules.vrf true lnms config:set discovery_modules.cisco-cef false lnms config:set discovery_modules.slas false lnms config:set discovery_modules.cisco-otv false @@ -94,7 +93,7 @@ the web interface at Device -> Settings -> Modules. lnms config:set discovery_modules.ipv6-addresses true lnms config:set discovery_modules.route false lnms config:set discovery_modules.sensors true - lnms config:set discovery_modules.ipmi true + lnms config:set discovery_modules.ipmi false lnms config:set discovery_modules.storage true lnms config:set discovery_modules.hr-device true lnms config:set discovery_modules.discovery-protocols true @@ -152,8 +151,6 @@ ports that the configuration options ignore. `mempools`: memory detection support for devices. -`cisco-vrf-lite`: VRF-Lite detection and support. - `ipv4-addresses`: IPv4 address detection. `ipv6-addresses`: IPv6 address detection. @@ -164,7 +161,7 @@ history data. The default route limit is 1000. To change the limit, use `sensors`: sensor detection for temperature, humidity, voltage, and more. -`ipmi`: IPMI sensor detection via ipmitool when IPMI login details are supplied. +`ipmi`: IPMI sensor detection via ipmitool. Enabled by the IPMI polling method. `storage`: storage detection for hard disks. @@ -189,7 +186,10 @@ with history data. `cisco-pw`: pseudowire detection and support. -`vrf`: VRF detection and support. +`vrf`: VRF detection, the interfaces in each VRF and the SNMP contexts that expose them. +Contexts come from the device (CISCO-CONTEXT-MAPPING-MIB) or are added under Device -> Edit -> Routing. +Each discovery checks that a context answers. The routing modules walk the default context and every +context that answered, unless it is disabled under Device -> Edit -> Routing. `cisco-cef`: CEF detection and support. diff --git a/doc/Support/Environment-Variables.md b/doc/Support/Environment-Variables.md index 24007b5b738..f28126747ee 100644 --- a/doc/Support/Environment-Variables.md +++ b/doc/Support/Environment-Variables.md @@ -57,6 +57,27 @@ LIBRENMS_USER=librenms LIBRENMS_GROUP=librenms ``` +## Composer packages + +`lnms plugin:add` records the packages you add in `composer.plugins.json` +in the install directory. This variable moves that file, for example to +a persistent volume. + +```dotenv +LIBRENMS_COMPOSER_PLUGINS=/data/composer.plugins.json +``` + +`lnms plugin:sync` installs all packages in that file again. + +The plugin commands also honor the `COMPOSER` and `COMPOSER_VENDOR_DIR` +variables of Composer. Set them in the environment to leave the +`composer.json`, `composer.lock` and `vendor` of the install directory +unchanged. If the file in `COMPOSER` does not exist, it is created from +the `composer.json` and `composer.lock` of the install directory. +The directory in `COMPOSER_VENDOR_DIR` must already contain the installed +packages, for example a copy of `vendor`. LibreNMS loads `vendor` from +the install directory, so link it to that directory. + ## Debug This variable increases the information that LibreNMS shows for an error. diff --git a/doc/Support/Poller Support.md b/doc/Support/Poller Support.md index 1a109e05133..eb163d749fd 100644 --- a/doc/Support/Poller Support.md +++ b/doc/Support/Poller Support.md @@ -45,7 +45,7 @@ the web interface at Device -> Edit -> Modules. ```bash lnms config:set poller_modules.unix-agent false lnms config:set poller_modules.os true - lnms config:set poller_modules.ipmi true + lnms config:set poller_modules.ipmi false lnms config:set poller_modules.sensors true lnms config:set poller_modules.processors true lnms config:set poller_modules.mempools true @@ -116,7 +116,7 @@ module for the Linux OS, use these commands: `os`: OS detection. This module finds the OS of the device. -`ipmi`: it enables IPMI support when you supply the IPMI login details. +`ipmi`: IPMI sensor polling. Enabled by the IPMI polling method. `sensors`: sensor detection for temperature, humidity, voltage, and more. diff --git a/html/build/assets/app-C9c4h1Zv.css b/html/build/assets/app-C9c4h1Zv.css deleted file mode 100644 index 968cfb8ecb8..00000000000 --- a/html/build/assets/app-C9c4h1Zv.css +++ /dev/null @@ -1,2 +0,0 @@ -/*! tailwindcss v4.3.3 | MIT License | https://tailwindcss.com */ -@layer properties{@supports (((-webkit-hyphens:none)) and (not (margin-trim:inline))) or ((-moz-orient:inline) and (not (color:rgb(from red r g b)))){*,:before,:after,::backdrop{--tw-translate-x:0;--tw-translate-y:0;--tw-translate-z:0;--tw-scale-x:1;--tw-scale-y:1;--tw-scale-z:1;--tw-rotate-x:initial;--tw-rotate-y:initial;--tw-rotate-z:initial;--tw-skew-x:initial;--tw-skew-y:initial;--tw-space-y-reverse:0;--tw-divide-y-reverse:0;--tw-border-style:solid;--tw-leading:initial;--tw-font-weight:initial;--tw-tracking:initial;--tw-shadow:0 0 #0000;--tw-shadow-color:initial;--tw-shadow-alpha:100%;--tw-inset-shadow:0 0 #0000;--tw-inset-shadow-color:initial;--tw-inset-shadow-alpha:100%;--tw-ring-color:initial;--tw-ring-shadow:0 0 #0000;--tw-inset-ring-color:initial;--tw-inset-ring-shadow:0 0 #0000;--tw-ring-inset:initial;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-offset-shadow:0 0 #0000;--tw-backdrop-blur:initial;--tw-backdrop-brightness:initial;--tw-backdrop-contrast:initial;--tw-backdrop-grayscale:initial;--tw-backdrop-hue-rotate:initial;--tw-backdrop-invert:initial;--tw-backdrop-opacity:initial;--tw-backdrop-saturate:initial;--tw-backdrop-sepia:initial;--tw-duration:initial;--tw-ease:initial;--tw-content:""}}}#toast-container-top-right{z-index:999999;position:fixed;top:55px;right:12px}#toast-container-top-right a{font-weight:700}#toast-container-top-right>div{background-position:10px;background-repeat:no-repeat;width:304px;min-height:50px}.toast-error{background-image:url(data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMzIgMzIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGNpcmNsZSBjeD0iMTYiIGN5PSIxNiIgcj0iMTUiIGZpbGw9IiNmZmYiLz48cGF0aCBkPSJNMTYgMEExNiAxNiAwIDAgMCAwIDE2YTE2IDE2IDAgMCAwIDE2IDE2IDE2IDE2IDAgMCAwIDE2LTE2QTE2IDE2IDAgMCAwIDE2IDB6bS02IDlhMSAxIDAgMCAxIC43MDcuMjkzTDE2IDE0LjU4Nmw1LjI5My01LjI5M2ExIDEgMCAwIDEgMS40MTQgMCAxIDEgMCAwIDEgMCAxLjQxNEwxNy40MTQgMTZsNS4yOTMgNS4yOTNhMSAxIDAgMCAxIDAgMS40MTQgMSAxIDAgMCAxLTEuNDE0IDBMMTYgMTcuNDE0bC01LjI5MyA1LjI5M2ExIDEgMCAwIDEtMS40MTQgMCAxIDEgMCAwIDEgMC0xLjQxNEwxNC41ODYgMTZsLTUuMjkzLTUuMjkzYTEgMSAwIDAgMSAwLTEuNDE0QTEgMSAwIDAgMSAxMCA5eiIgZmlsbD0iI2RjMjYyNiIvPjwvc3ZnPg==);background-size:32px}.toast-info{background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMiAzMiI+PGNpcmNsZSBjeD0iMTYiIGN5PSIxNiIgcj0iMTUiIGZpbGw9IiNmZmYiLz48cGF0aCBkPSJNMTYgMEExNiAxNiAwIDAgMCAwIDE2YTE2IDE2IDAgMCAwIDE2IDE2IDE2IDE2IDAgMCAwIDE2LTE2QTE2IDE2IDAgMCAwIDE2IDB6bTAgNmM1LjUxMSAwIDEwIDQuNDg5IDEwIDEwcy00LjQ4OSAxMC0xMCAxMFM2IDIxLjUxMSA2IDE2IDEwLjQ4OSA2IDE2IDZ6bTAgMmMtNC40MyAwLTggMy41Ny04IDhzMy41NyA4IDggOCA4LTMuNTcgOC04LTMuNTctOC04LTh6bTAgM2ExIDEgMCAwIDEgMSAxdjRhMSAxIDAgMCAxLTEgMSAxIDEgMCAwIDEtMS0xdi00YTEgMSAwIDAgMSAxLTF6bTAgOGguMDFhMSAxIDAgMCAxIDEgMSAxIDEgMCAwIDEtMSAxSDE2YTEgMSAwIDAgMS0xLTEgMSAxIDAgMCAxIDEtMXoiIGZpbGw9IiMyNTYzZWIiIC8+PC9zdmc+);background-size:32px}.toast-success{background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMiAzMiI+PGNpcmNsZSBjeD0iMTYiIGN5PSIxNiIgcj0iMTUiIGZpbGw9IiNmZmYiLz48cGF0aCBkPSJNMTYgMEExNiAxNiAwIDAgMCAwIDE2YTE2IDE2IDAgMCAwIDE2IDE2IDE2IDE2IDAgMCAwIDE2LTE2QTE2IDE2IDAgMCAwIDE2IDB6bTcgMTBhMSAxIDAgMCAxIC43MDcuMjkzIDEgMSAwIDAgMSAwIDEuNDE0bC0xMCAxMGExIDEgMCAwIDEtMS40MTQgMGwtNC00YTEgMSAwIDAgMSAwLTEuNDE0IDEgMSAwIDAgMSAxLjQxNCAwTDEzIDE5LjU4Nmw5LjI5My05LjI5M0ExIDEgMCAwIDEgMjMgMTB6IiBmaWxsPSIjMDU5NjY5IiAvPjwvc3ZnPg==);background-size:32px}.toast-warning{background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMiAzMiI+PGNpcmNsZSBjeD0iMTYiIGN5PSIxNiIgcj0iMTUiIGZpbGw9IiNmZmYiLz48cGF0aCBkPSJNMTYgMEExNiAxNiAwIDAgMCAwIDE2YTE2IDE2IDAgMCAwIDE2IDE2IDE2IDE2IDAgMCAwIDE2LTE2QTE2IDE2IDAgMCAwIDE2IDB6bTAgNi4xNTZjMS4wMTYgMCAyLjAzMi40OSAyLjU5OCAxLjQ2OWw2LjkyNyAxMmMxLjEzMSAxLjk1OC0uMzM2IDQuNS0yLjU5NyA0LjVIOS4wNzJjLTIuMjYxIDAtMy43MjgtMi41NDItMi41OTctNC41bDYuOTI3LTEyYy41NjYtLjk3OSAxLjU4Mi0xLjQ2OSAyLjU5OC0xLjQ2OXptMCAxLjkzOGMtLjMzIDAtLjY2LjE3Ny0uODY1LjUzMWwtNi45MyAxMmMtLjQwOS43MDguMDQ5IDEuNS44NjcgMS41aDEzLjg1NmMuODE4IDAgMS4yNzYtLjc5Mi44NjctMS41bC02LjkzLTEyYy0uMjA0LS4zNTQtLjUzNC0uNTMxLS44NjUtLjUzMXptMCA0LjAzMWExIDEgMCAwIDEgMSAxdjJhMSAxIDAgMCAxLTEgMSAxIDEgMCAwIDEtMS0xdi0yYTEgMSAwIDAgMSAxLTF6bTAgNmguMDFhMSAxIDAgMCAxIDEgMSAxIDEgMCAwIDEtMSAxSDE2YTEgMSAwIDAgMS0xLTEgMSAxIDAgMCAxIDEtMXoiIGZpbGw9IiNkOTc3MDYiLz48L3N2Zz4=);background-size:32px}.toast-progress{opacity:.4;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=40);height:4px;filter:alpha(opacity=40);background-color:#000;position:absolute;bottom:0;left:0}@layer theme{:root,:host{--tw-font-sans:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";--tw-font-mono:ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;--tw-color-red-50:oklch(97.1% .013 17.38);--tw-color-red-100:oklch(93.6% .032 17.717);--tw-color-red-200:oklch(88.5% .062 18.334);--tw-color-red-300:oklch(80.8% .114 19.571);--tw-color-red-400:oklch(70.4% .191 22.216);--tw-color-red-500:oklch(63.7% .237 25.331);--tw-color-red-600:oklch(57.7% .245 27.325);--tw-color-red-700:oklch(50.5% .213 27.518);--tw-color-red-800:oklch(44.4% .177 26.899);--tw-color-red-900:oklch(39.6% .141 25.723);--tw-color-red-950:oklch(25.8% .092 26.042);--tw-color-orange-400:oklch(75% .183 55.934);--tw-color-orange-600:oklch(64.6% .222 41.116);--tw-color-amber-50:oklch(98.7% .022 95.277);--tw-color-amber-100:oklch(96.2% .059 95.617);--tw-color-amber-200:oklch(92.4% .12 95.746);--tw-color-amber-300:oklch(87.9% .169 91.605);--tw-color-amber-400:oklch(82.8% .189 84.429);--tw-color-amber-500:oklch(76.9% .188 70.08);--tw-color-amber-600:oklch(66.6% .179 58.318);--tw-color-amber-700:oklch(55.5% .163 48.998);--tw-color-amber-800:oklch(47.3% .137 46.201);--tw-color-amber-900:oklch(41.4% .112 45.904);--tw-color-amber-950:oklch(27.9% .077 45.635);--tw-color-yellow-50:oklch(98.7% .026 102.212);--tw-color-yellow-100:oklch(97.3% .071 103.193);--tw-color-yellow-200:oklch(94.5% .129 101.54);--tw-color-yellow-400:oklch(85.2% .199 91.936);--tw-color-yellow-500:oklch(79.5% .184 86.047);--tw-color-yellow-600:oklch(68.1% .162 75.834);--tw-color-yellow-800:oklch(47.6% .114 61.907);--tw-color-yellow-900:oklch(42.1% .095 57.708);--tw-color-green-50:oklch(98.2% .018 155.826);--tw-color-green-100:oklch(96.2% .044 156.743);--tw-color-green-200:oklch(92.5% .084 155.995);--tw-color-green-300:oklch(87.1% .15 154.449);--tw-color-green-400:oklch(79.2% .209 151.711);--tw-color-green-500:oklch(72.3% .219 149.579);--tw-color-green-600:oklch(62.7% .194 149.214);--tw-color-green-700:oklch(52.7% .154 150.069);--tw-color-green-800:oklch(44.8% .119 151.328);--tw-color-green-900:oklch(39.3% .095 152.535);--tw-color-green-950:oklch(26.6% .065 152.934);--tw-color-emerald-100:oklch(95% .052 163.051);--tw-color-emerald-600:oklch(59.6% .145 163.225);--tw-color-emerald-700:oklch(50.8% .118 165.612);--tw-color-emerald-900:oklch(37.8% .077 168.94);--tw-color-blue-50:oklch(97% .014 254.604);--tw-color-blue-100:oklch(93.2% .032 255.585);--tw-color-blue-200:oklch(88.2% .059 254.128);--tw-color-blue-300:oklch(80.9% .105 251.813);--tw-color-blue-400:oklch(70.7% .165 254.624);--tw-color-blue-500:oklch(62.3% .214 259.815);--tw-color-blue-600:oklch(54.6% .245 262.881);--tw-color-blue-700:oklch(48.8% .243 264.376);--tw-color-blue-800:oklch(42.4% .199 265.638);--tw-color-blue-900:oklch(37.9% .146 265.522);--tw-color-blue-950:oklch(28.2% .091 267.935);--tw-color-purple-100:oklch(94.6% .033 307.174);--tw-color-purple-300:oklch(82.7% .119 306.383);--tw-color-purple-800:oklch(43.8% .218 303.724);--tw-color-purple-900:oklch(38.1% .176 304.987);--tw-color-slate-100:oklch(96.8% .007 247.896);--tw-color-slate-200:oklch(92.9% .013 255.508);--tw-color-slate-300:oklch(86.9% .022 252.894);--tw-color-slate-400:oklch(70.4% .04 256.788);--tw-color-slate-500:oklch(55.4% .046 257.417);--tw-color-slate-700:oklch(37.2% .044 257.287);--tw-color-slate-800:oklch(27.9% .041 260.031);--tw-color-gray-50:oklch(98.5% .002 247.839);--tw-color-gray-100:oklch(96.7% .003 264.542);--tw-color-gray-200:oklch(92.8% .006 264.531);--tw-color-gray-300:oklch(87.2% .01 258.338);--tw-color-gray-400:oklch(70.7% .022 261.325);--tw-color-gray-500:oklch(55.1% .027 264.364);--tw-color-gray-600:oklch(44.6% .03 256.802);--tw-color-gray-700:oklch(37.3% .034 259.733);--tw-color-gray-800:oklch(27.8% .033 256.848);--tw-color-gray-900:oklch(21% .034 264.665);--tw-color-zinc-800:oklch(27.4% .006 286.033);--tw-color-zinc-900:oklch(21% .006 285.885);--tw-color-neutral-50:oklch(98.5% 0 none);--tw-color-neutral-100:oklch(97% 0 none);--tw-color-neutral-200:oklch(92.2% 0 none);--tw-color-neutral-300:oklch(87% 0 none);--tw-color-neutral-400:oklch(70.8% 0 none);--tw-color-neutral-500:oklch(55.6% 0 none);--tw-color-neutral-600:oklch(43.9% 0 none);--tw-color-neutral-700:oklch(37.1% 0 none);--tw-color-neutral-900:oklch(20.5% 0 none);--tw-color-neutral-950:oklch(14.5% 0 none);--tw-color-black:#000;--tw-color-white:#fff;--tw-spacing:.25rem;--tw-container-sm:24rem;--tw-container-md:28rem;--tw-container-lg:32rem;--tw-container-xl:36rem;--tw-container-2xl:42rem;--tw-container-3xl:48rem;--tw-container-4xl:56rem;--tw-container-5xl:64rem;--tw-text-xs:.75rem;--tw-text-xs--line-height:calc(1 / .75);--tw-text-sm:.875rem;--tw-text-sm--line-height:calc(1.25 / .875);--tw-text-base:1rem;--tw-text-base--line-height:calc(1.5 / 1);--tw-text-lg:1.125rem;--tw-text-lg--line-height:calc(1.75 / 1.125);--tw-text-xl:1.25rem;--tw-text-xl--line-height:calc(1.75 / 1.25);--tw-text-2xl:1.5rem;--tw-text-2xl--line-height:calc(2 / 1.5);--tw-text-3xl:1.875rem;--tw-text-3xl--line-height:calc(2.25 / 1.875);--tw-text-4xl:2.25rem;--tw-text-4xl--line-height:calc(2.5 / 2.25);--tw-text-7xl:4.5rem;--tw-text-7xl--line-height:1;--tw-font-weight-normal:400;--tw-font-weight-medium:500;--tw-font-weight-semibold:600;--tw-font-weight-bold:700;--tw-tracking-tight:-.025em;--tw-tracking-wider:.05em;--tw-leading-tight:1.25;--tw-leading-normal:1.5;--tw-radius-sm:.25rem;--tw-radius-md:.375rem;--tw-radius-lg:.5rem;--tw-radius-xl:.75rem;--tw-radius-2xl:1rem;--tw-ease-in:cubic-bezier(.4, 0, 1, 1);--tw-ease-out:cubic-bezier(0, 0, .2, 1);--tw-ease-in-out:cubic-bezier(.4, 0, .2, 1);--tw-animate-spin:spin 1s linear infinite;--tw-animate-pulse:pulse 2s cubic-bezier(.4, 0, .6, 1) infinite;--tw-blur-xs:4px;--tw-default-transition-duration:.15s;--tw-default-transition-timing-function:cubic-bezier(.4, 0, .2, 1);--tw-default-font-family:var(--tw-font-sans);--tw-default-mono-font-family:var(--tw-font-mono);--tw-color-dark-gray-100:#4f565d;--tw-color-dark-gray-200:#3e444c;--tw-color-dark-gray-300:#353a41;--tw-color-dark-gray-400:#2e3338;--tw-color-dark-gray-500:#272b30;--tw-color-dark-white-100:#f9fafb;--tw-color-dark-white-200:#c8c8c8;--tw-color-dark-white-300:#bebfbf;--tw-color-dark-white-400:#acb6bf;--tw-border-width-0_5:.5px}}@layer base{*,:after,:before,::backdrop{box-sizing:border-box;border:0 solid;margin:0;padding:0}::file-selector-button{box-sizing:border-box;border:0 solid;margin:0;padding:0}html,:host{-webkit-text-size-adjust:100%;tab-size:4;line-height:1.5;font-family:var(--tw-default-font-family,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji");font-feature-settings:var(--tw-default-font-feature-settings,normal);font-variation-settings:var(--tw-default-font-variation-settings,normal);-webkit-tap-highlight-color:transparent}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;-webkit-text-decoration:inherit;-webkit-text-decoration:inherit;-webkit-text-decoration:inherit;-webkit-text-decoration:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:var(--tw-default-mono-font-family,ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace);font-feature-settings:var(--tw-default-mono-font-feature-settings,normal);font-variation-settings:var(--tw-default-mono-font-variation-settings,normal);font-size:1em}small{font-size:80%}sub,sup{vertical-align:baseline;font-size:75%;line-height:0;position:relative}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}:-moz-focusring:where(:not(iframe)){outline:auto}progress{vertical-align:baseline}summary{display:list-item}ol,ul,menu{list-style:none}img,svg,video,canvas,audio,iframe,embed,object{vertical-align:middle;display:block}img,video{max-width:100%;height:auto}button,input,select,optgroup,textarea{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}::file-selector-button{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}:where(select:is([multiple],[size])) optgroup{font-weight:bolder}:where(select:is([multiple],[size])) optgroup option{padding-inline-start:20px}::file-selector-button{margin-inline-end:4px}::placeholder{opacity:1}@supports (not ((-webkit-appearance:-apple-pay-button))) or (contain-intrinsic-size:1px){::placeholder{color:currentColor}@supports (color:color-mix(in lab, red, red)){::placeholder{color:color-mix(in oklab, currentcolor 50%, transparent)}}}textarea{resize:vertical}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-date-and-time-value{min-height:1lh;text-align:inherit}::-webkit-datetime-edit{display:inline-flex}::-webkit-datetime-edit-fields-wrapper{padding:0}::-webkit-datetime-edit{padding-block:0}::-webkit-datetime-edit-year-field{padding-block:0}::-webkit-datetime-edit-month-field{padding-block:0}::-webkit-datetime-edit-day-field{padding-block:0}::-webkit-datetime-edit-hour-field{padding-block:0}::-webkit-datetime-edit-minute-field{padding-block:0}::-webkit-datetime-edit-second-field{padding-block:0}::-webkit-datetime-edit-millisecond-field{padding-block:0}::-webkit-datetime-edit-meridiem-field{padding-block:0}::-webkit-calendar-picker-indicator{line-height:1}:-moz-ui-invalid{box-shadow:none}button,input:where([type=button],[type=reset],[type=submit]){appearance:button}::file-selector-button{appearance:button}::-webkit-inner-spin-button{height:auto}::-webkit-outer-spin-button{height:auto}[hidden]:where(:not([hidden=until-found])){display:none!important}button:not(:disabled),[role=button]:not(:disabled){cursor:pointer}*,:after,:before,::backdrop{border-color:var(--color-gray-200,currentColor)}::file-selector-button{border-color:var(--color-gray-200,currentColor)}}@layer components{html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-family:sans-serif}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{vertical-align:baseline;display:inline-block}audio:not([controls]){height:0;display:none}[hidden],template{display:none}a{background-color:#0000}a:active,a:hover{outline:0}abbr[title]{text-decoration:underline;border-bottom:none;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{vertical-align:baseline;font-size:75%;line-height:0;position:relative}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner{border:0;padding:0}input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button{height:auto}input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button{-webkit-appearance:none}input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}@media print{*,:after,:before{color:#000!important;text-shadow:none!important;-webkit-box-shadow:none!important;box-shadow:none!important;background:0 0!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^=\#]:after,a[href^=javascript\:]:after{content:""}blockquote,pre{page-break-inside:avoid;border:1px solid #999}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:Glyphicons Halflings;src:url(/build/assets/glyphicons-halflings-regular-BUJKDMgK.eot);src:url(/build/assets/glyphicons-halflings-regular-BUJKDMgK.eot?#iefix)format("embedded-opentype"),url(/build/assets/glyphicons-halflings-regular-DzqM6ju8.woff2)format("woff2"),url(/build/assets/glyphicons-halflings-regular-BKjkU69z.woff)format("woff"),url(/build/assets/glyphicons-halflings-regular-DrwTMapi.ttf)format("truetype"),url(/build/assets/glyphicons-halflings-regular-CSehLiBc.svg#glyphicons_halflingsregular)format("svg")}.glyphicon{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-family:Glyphicons Halflings;font-style:normal;font-weight:400;line-height:1;display:inline-block;position:relative;top:1px}.glyphicon-asterisk:before{content:"*"}.glyphicon-plus:before{content:"+"}.glyphicon-eur:before,.glyphicon-euro:before{content:"€"}.glyphicon-minus:before{content:"−"}.glyphicon-cloud:before{content:"☁"}.glyphicon-envelope:before{content:"✉"}.glyphicon-pencil:before{content:"✏"}.glyphicon-glass:before{content:""}.glyphicon-music:before{content:""}.glyphicon-search:before{content:""}.glyphicon-heart:before{content:""}.glyphicon-star:before{content:""}.glyphicon-star-empty:before{content:""}.glyphicon-user:before{content:""}.glyphicon-film:before{content:""}.glyphicon-th-large:before{content:""}.glyphicon-th:before{content:""}.glyphicon-th-list:before{content:""}.glyphicon-ok:before{content:""}.glyphicon-remove:before{content:""}.glyphicon-zoom-in:before{content:""}.glyphicon-zoom-out:before{content:""}.glyphicon-off:before{content:""}.glyphicon-signal:before{content:""}.glyphicon-cog:before{content:""}.glyphicon-trash:before{content:""}.glyphicon-home:before{content:""}.glyphicon-file:before{content:""}.glyphicon-time:before{content:""}.glyphicon-road:before{content:""}.glyphicon-download-alt:before{content:""}.glyphicon-download:before{content:""}.glyphicon-upload:before{content:""}.glyphicon-inbox:before{content:""}.glyphicon-play-circle:before{content:""}.glyphicon-repeat:before{content:""}.glyphicon-refresh:before{content:""}.glyphicon-list-alt:before{content:""}.glyphicon-lock:before{content:""}.glyphicon-flag:before{content:""}.glyphicon-headphones:before{content:""}.glyphicon-volume-off:before{content:""}.glyphicon-volume-down:before{content:""}.glyphicon-volume-up:before{content:""}.glyphicon-qrcode:before{content:""}.glyphicon-barcode:before{content:""}.glyphicon-tag:before{content:""}.glyphicon-tags:before{content:""}.glyphicon-book:before{content:""}.glyphicon-bookmark:before{content:""}.glyphicon-print:before{content:""}.glyphicon-camera:before{content:""}.glyphicon-font:before{content:""}.glyphicon-bold:before{content:""}.glyphicon-italic:before{content:""}.glyphicon-text-height:before{content:""}.glyphicon-text-width:before{content:""}.glyphicon-align-left:before{content:""}.glyphicon-align-center:before{content:""}.glyphicon-align-right:before{content:""}.glyphicon-align-justify:before{content:""}.glyphicon-list:before{content:""}.glyphicon-indent-left:before{content:""}.glyphicon-indent-right:before{content:""}.glyphicon-facetime-video:before{content:""}.glyphicon-picture:before{content:""}.glyphicon-map-marker:before{content:""}.glyphicon-adjust:before{content:""}.glyphicon-tint:before{content:""}.glyphicon-edit:before{content:""}.glyphicon-share:before{content:""}.glyphicon-check:before{content:""}.glyphicon-move:before{content:""}.glyphicon-step-backward:before{content:""}.glyphicon-fast-backward:before{content:""}.glyphicon-backward:before{content:""}.glyphicon-play:before{content:""}.glyphicon-pause:before{content:""}.glyphicon-stop:before{content:""}.glyphicon-forward:before{content:""}.glyphicon-fast-forward:before{content:""}.glyphicon-step-forward:before{content:""}.glyphicon-eject:before{content:""}.glyphicon-chevron-left:before{content:""}.glyphicon-chevron-right:before{content:""}.glyphicon-plus-sign:before{content:""}.glyphicon-minus-sign:before{content:""}.glyphicon-remove-sign:before{content:""}.glyphicon-ok-sign:before{content:""}.glyphicon-question-sign:before{content:""}.glyphicon-info-sign:before{content:""}.glyphicon-screenshot:before{content:""}.glyphicon-remove-circle:before{content:""}.glyphicon-ok-circle:before{content:""}.glyphicon-ban-circle:before{content:""}.glyphicon-arrow-left:before{content:""}.glyphicon-arrow-right:before{content:""}.glyphicon-arrow-up:before{content:""}.glyphicon-arrow-down:before{content:""}.glyphicon-share-alt:before{content:""}.glyphicon-resize-full:before{content:""}.glyphicon-resize-small:before{content:""}.glyphicon-exclamation-sign:before{content:""}.glyphicon-gift:before{content:""}.glyphicon-leaf:before{content:""}.glyphicon-fire:before{content:""}.glyphicon-eye-open:before{content:""}.glyphicon-eye-close:before{content:""}.glyphicon-warning-sign:before{content:""}.glyphicon-plane:before{content:""}.glyphicon-calendar:before{content:""}.glyphicon-random:before{content:""}.glyphicon-comment:before{content:""}.glyphicon-magnet:before{content:""}.glyphicon-chevron-up:before{content:""}.glyphicon-chevron-down:before{content:""}.glyphicon-retweet:before{content:""}.glyphicon-shopping-cart:before{content:""}.glyphicon-folder-close:before{content:""}.glyphicon-folder-open:before{content:""}.glyphicon-resize-vertical:before{content:""}.glyphicon-resize-horizontal:before{content:""}.glyphicon-hdd:before{content:""}.glyphicon-bullhorn:before{content:""}.glyphicon-bell:before{content:""}.glyphicon-certificate:before{content:""}.glyphicon-thumbs-up:before{content:""}.glyphicon-thumbs-down:before{content:""}.glyphicon-hand-right:before{content:""}.glyphicon-hand-left:before{content:""}.glyphicon-hand-up:before{content:""}.glyphicon-hand-down:before{content:""}.glyphicon-circle-arrow-right:before{content:""}.glyphicon-circle-arrow-left:before{content:""}.glyphicon-circle-arrow-up:before{content:""}.glyphicon-circle-arrow-down:before{content:""}.glyphicon-globe:before{content:""}.glyphicon-wrench:before{content:""}.glyphicon-tasks:before{content:""}.glyphicon-filter:before{content:""}.glyphicon-briefcase:before{content:""}.glyphicon-fullscreen:before{content:""}.glyphicon-dashboard:before{content:""}.glyphicon-paperclip:before{content:""}.glyphicon-heart-empty:before{content:""}.glyphicon-link:before{content:""}.glyphicon-phone:before{content:""}.glyphicon-pushpin:before{content:""}.glyphicon-usd:before{content:""}.glyphicon-gbp:before{content:""}.glyphicon-sort:before{content:""}.glyphicon-sort-by-alphabet:before{content:""}.glyphicon-sort-by-alphabet-alt:before{content:""}.glyphicon-sort-by-order:before{content:""}.glyphicon-sort-by-order-alt:before{content:""}.glyphicon-sort-by-attributes:before{content:""}.glyphicon-sort-by-attributes-alt:before{content:""}.glyphicon-unchecked:before{content:""}.glyphicon-expand:before{content:""}.glyphicon-collapse-down:before{content:""}.glyphicon-collapse-up:before{content:""}.glyphicon-log-in:before{content:""}.glyphicon-flash:before{content:""}.glyphicon-log-out:before{content:""}.glyphicon-new-window:before{content:""}.glyphicon-record:before{content:""}.glyphicon-save:before{content:""}.glyphicon-open:before{content:""}.glyphicon-saved:before{content:""}.glyphicon-import:before{content:""}.glyphicon-export:before{content:""}.glyphicon-send:before{content:""}.glyphicon-floppy-disk:before{content:""}.glyphicon-floppy-saved:before{content:""}.glyphicon-floppy-remove:before{content:""}.glyphicon-floppy-save:before{content:""}.glyphicon-floppy-open:before{content:""}.glyphicon-credit-card:before{content:""}.glyphicon-transfer:before{content:""}.glyphicon-cutlery:before{content:""}.glyphicon-header:before{content:""}.glyphicon-compressed:before{content:""}.glyphicon-earphone:before{content:""}.glyphicon-phone-alt:before{content:""}.glyphicon-tower:before{content:""}.glyphicon-stats:before{content:""}.glyphicon-sd-video:before{content:""}.glyphicon-hd-video:before{content:""}.glyphicon-subtitles:before{content:""}.glyphicon-sound-stereo:before{content:""}.glyphicon-sound-dolby:before{content:""}.glyphicon-sound-5-1:before{content:""}.glyphicon-sound-6-1:before{content:""}.glyphicon-sound-7-1:before{content:""}.glyphicon-copyright-mark:before{content:""}.glyphicon-registration-mark:before{content:""}.glyphicon-cloud-download:before{content:""}.glyphicon-cloud-upload:before{content:""}.glyphicon-tree-conifer:before{content:""}.glyphicon-tree-deciduous:before{content:""}.glyphicon-cd:before{content:""}.glyphicon-save-file:before{content:""}.glyphicon-open-file:before{content:""}.glyphicon-level-up:before{content:""}.glyphicon-copy:before{content:""}.glyphicon-paste:before{content:""}.glyphicon-alert:before{content:""}.glyphicon-equalizer:before{content:""}.glyphicon-king:before{content:""}.glyphicon-queen:before{content:""}.glyphicon-pawn:before{content:""}.glyphicon-bishop:before{content:""}.glyphicon-knight:before{content:""}.glyphicon-baby-formula:before{content:""}.glyphicon-tent:before{content:"⛺"}.glyphicon-blackboard:before{content:""}.glyphicon-bed:before{content:""}.glyphicon-apple:before{content:""}.glyphicon-erase:before{content:""}.glyphicon-hourglass:before{content:"⌛"}.glyphicon-lamp:before{content:""}.glyphicon-duplicate:before{content:""}.glyphicon-piggy-bank:before{content:""}.glyphicon-scissors:before{content:""}.glyphicon-bitcoin:before,.glyphicon-btc:before,.glyphicon-xbt:before{content:""}.glyphicon-yen:before,.glyphicon-jpy:before{content:"¥"}.glyphicon-ruble:before,.glyphicon-rub:before{content:"₽"}.glyphicon-scale:before{content:""}.glyphicon-ice-lolly:before{content:""}.glyphicon-ice-lolly-tasted:before{content:""}.glyphicon-education:before{content:""}.glyphicon-option-horizontal:before{content:""}.glyphicon-option-vertical:before{content:""}.glyphicon-menu-hamburger:before{content:""}.glyphicon-modal-window:before{content:""}.glyphicon-oil:before{content:""}.glyphicon-grain:before{content:""}.glyphicon-sunglasses:before{content:""}.glyphicon-text-size:before{content:""}.glyphicon-text-color:before{content:""}.glyphicon-text-background:before{content:""}.glyphicon-object-align-top:before{content:""}.glyphicon-object-align-bottom:before{content:""}.glyphicon-object-align-horizontal:before{content:""}.glyphicon-object-align-left:before{content:""}.glyphicon-object-align-vertical:before{content:""}.glyphicon-object-align-right:before{content:""}.glyphicon-triangle-right:before{content:""}.glyphicon-triangle-left:before{content:""}.glyphicon-triangle-bottom:before{content:""}.glyphicon-triangle-top:before{content:""}.glyphicon-console:before{content:""}.glyphicon-superscript:before{content:""}.glyphicon-subscript:before{content:""}.glyphicon-menu-left:before{content:""}.glyphicon-menu-right:before{content:""}.glyphicon-menu-down:before{content:""}.glyphicon-menu-up:before{content:""}*,:after,:before{box-sizing:border-box}html{-webkit-tap-highlight-color:#0000;font-size:10px}body{color:#333;background-color:#fff;font-family:Helvetica Neue,Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{max-width:100%;height:auto;display:block}.img-rounded{border-radius:6px}.img-thumbnail{-o-transition:all .2s ease-in-out;background-color:#fff;border:1px solid #ddd;border-radius:4px;max-width:100%;height:auto;padding:4px;line-height:1.42857;transition:all .2s ease-in-out;display:inline-block}.img-circle{border-radius:50%}hr{border:0;border-top:1px solid #eee;margin-top:20px;margin-bottom:20px}.sr-only{clip:rect(0,0,0,0);border:0;width:1px;height:1px;margin:-1px;padding:0;position:absolute;overflow:hidden}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;width:auto;height:auto;margin:0;position:static;overflow:visible}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{color:inherit;font-family:inherit;font-weight:500;line-height:1.1}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{color:#777;font-weight:400;line-height:1}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (width>=768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{background-color:#fcf8e3;padding:.2em}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{border-bottom:1px solid #eee;margin:40px 0 20px;padding-bottom:9px}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{margin-left:-5px;padding-left:0;list-style:none}.list-inline>li{padding-left:5px;padding-right:5px;display:inline-block}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857}dt{font-weight:700}dd{margin-left:0}@media (width>=768px){.dl-horizontal dt{float:left;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap;width:160px;overflow:hidden}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help}.initialism{text-transform:uppercase;font-size:90%}blockquote{border-left:5px solid #eee;margin:0 0 20px;padding:10px 20px;font-size:17.5px}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{color:#777;font-size:80%;line-height:1.42857;display:block}blockquote .small:before,blockquote footer:before,blockquote small:before{content:"— "}.blockquote-reverse,blockquote.pull-right{text-align:right;border-left:0;border-right:5px solid #eee;padding-left:0;padding-right:15px}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:""}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:" —"}address{margin-bottom:20px;font-style:normal;line-height:1.42857}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,Courier New,monospace}code{color:#c7254e;background-color:#f9f2f4;border-radius:4px;padding:2px 4px;font-size:90%}kbd{color:#fff;background-color:#333;border-radius:3px;padding:2px 4px;font-size:90%;box-shadow:inset 0 -1px #00000040}kbd kbd{-webkit-box-shadow:none;box-shadow:none;padding:0;font-size:100%;font-weight:700}pre{color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px;margin:0 0 10px;padding:9.5px;font-size:13px;line-height:1.42857;display:block}pre code{font-size:inherit;color:inherit;white-space:pre-wrap;background-color:#0000;border-radius:0;padding:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{margin-left:auto;margin-right:auto;padding-left:15px;padding-right:15px}@media (width>=768px){.container{width:750px}}@media (width>=992px){.container{width:970px}}@media (width>=1200px){.container{width:1170px}}.container-fluid{margin-left:auto;margin-right:auto;padding-left:15px;padding-right:15px}.row{margin-left:-15px;margin-right:-15px}.row-no-gutters{margin-left:0;margin-right:0}.row-no-gutters [class*=col-]{padding-left:0;padding-right:0}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{min-height:1px;padding-left:15px;padding-right:15px;position:relative}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.6667%}.col-xs-10{width:83.3333%}.col-xs-9{width:75%}.col-xs-8{width:66.6667%}.col-xs-7{width:58.3333%}.col-xs-6{width:50%}.col-xs-5{width:41.6667%}.col-xs-4{width:33.3333%}.col-xs-3{width:25%}.col-xs-2{width:16.6667%}.col-xs-1{width:8.33333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.6667%}.col-xs-pull-10{right:83.3333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.6667%}.col-xs-pull-7{right:58.3333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.6667%}.col-xs-pull-4{right:33.3333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.6667%}.col-xs-pull-1{right:8.33333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.6667%}.col-xs-push-10{left:83.3333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.6667%}.col-xs-push-7{left:58.3333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.6667%}.col-xs-push-4{left:33.3333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.6667%}.col-xs-push-1{left:8.33333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.6667%}.col-xs-offset-10{margin-left:83.3333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.6667%}.col-xs-offset-7{margin-left:58.3333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.6667%}.col-xs-offset-4{margin-left:33.3333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.6667%}.col-xs-offset-1{margin-left:8.33333%}.col-xs-offset-0{margin-left:0}@media (width>=768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.6667%}.col-sm-10{width:83.3333%}.col-sm-9{width:75%}.col-sm-8{width:66.6667%}.col-sm-7{width:58.3333%}.col-sm-6{width:50%}.col-sm-5{width:41.6667%}.col-sm-4{width:33.3333%}.col-sm-3{width:25%}.col-sm-2{width:16.6667%}.col-sm-1{width:8.33333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.6667%}.col-sm-pull-10{right:83.3333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.6667%}.col-sm-pull-7{right:58.3333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.6667%}.col-sm-pull-4{right:33.3333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.6667%}.col-sm-pull-1{right:8.33333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.6667%}.col-sm-push-10{left:83.3333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.6667%}.col-sm-push-7{left:58.3333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.6667%}.col-sm-push-4{left:33.3333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.6667%}.col-sm-push-1{left:8.33333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.6667%}.col-sm-offset-10{margin-left:83.3333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.6667%}.col-sm-offset-7{margin-left:58.3333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.6667%}.col-sm-offset-4{margin-left:33.3333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.6667%}.col-sm-offset-1{margin-left:8.33333%}.col-sm-offset-0{margin-left:0}}@media (width>=992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.6667%}.col-md-10{width:83.3333%}.col-md-9{width:75%}.col-md-8{width:66.6667%}.col-md-7{width:58.3333%}.col-md-6{width:50%}.col-md-5{width:41.6667%}.col-md-4{width:33.3333%}.col-md-3{width:25%}.col-md-2{width:16.6667%}.col-md-1{width:8.33333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.6667%}.col-md-pull-10{right:83.3333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.6667%}.col-md-pull-7{right:58.3333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.6667%}.col-md-pull-4{right:33.3333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.6667%}.col-md-pull-1{right:8.33333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.6667%}.col-md-push-10{left:83.3333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.6667%}.col-md-push-7{left:58.3333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.6667%}.col-md-push-4{left:33.3333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.6667%}.col-md-push-1{left:8.33333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.6667%}.col-md-offset-10{margin-left:83.3333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.6667%}.col-md-offset-7{margin-left:58.3333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.6667%}.col-md-offset-4{margin-left:33.3333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.6667%}.col-md-offset-1{margin-left:8.33333%}.col-md-offset-0{margin-left:0}}@media (width>=1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.6667%}.col-lg-10{width:83.3333%}.col-lg-9{width:75%}.col-lg-8{width:66.6667%}.col-lg-7{width:58.3333%}.col-lg-6{width:50%}.col-lg-5{width:41.6667%}.col-lg-4{width:33.3333%}.col-lg-3{width:25%}.col-lg-2{width:16.6667%}.col-lg-1{width:8.33333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.6667%}.col-lg-pull-10{right:83.3333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.6667%}.col-lg-pull-7{right:58.3333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.6667%}.col-lg-pull-4{right:33.3333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.6667%}.col-lg-pull-1{right:8.33333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.6667%}.col-lg-push-10{left:83.3333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.6667%}.col-lg-push-7{left:58.3333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.6667%}.col-lg-push-4{left:33.3333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.6667%}.col-lg-push-1{left:8.33333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.6667%}.col-lg-offset-10{margin-left:83.3333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.6667%}.col-lg-offset-7{margin-left:58.3333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.6667%}.col-lg-offset-4{margin-left:33.3333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.6667%}.col-lg-offset-1{margin-left:8.33333%}.col-lg-offset-0{margin-left:0}}table{background-color:#0000}table col[class*=col-]{float:none;display:table-column;position:static}table td[class*=col-],table th[class*=col-]{float:none;display:table-cell;position:static}caption{color:#777;text-align:left;padding-top:8px;padding-bottom:8px}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{vertical-align:top;border-top:1px solid #ddd;padding:8px;line-height:1.42857}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered,.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover,.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (width<=767px){.table-responsive{-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd;width:100%;margin-bottom:15px;overflow-y:hidden}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{border:0;min-width:0;margin:0;padding:0}legend{width:100%;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5;margin-bottom:20px;padding:0;display:block}label{max-width:100%;margin-bottom:5px;font-weight:700;display:inline-block}input[type=search]{box-sizing:border-box;appearance:none}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9 ;line-height:normal}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}input[type=file]{display:block}input[type=range]{width:100%;display:block}select[multiple],select[size]{height:auto}input[type=checkbox]:focus,input[type=file]:focus,input[type=radio]:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{color:#555;padding-top:7px;font-size:14px;line-height:1.42857;display:block}.form-control{color:#555;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;display:block;box-shadow:inset 0 1px 1px #00000013}.form-control:focus{border-color:#66afe9;outline:0;box-shadow:inset 0 1px 1px #00000013,0 0 8px #66afe999}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-placeholder-shown{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control::-ms-expand{background-color:#0000;border:0}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{opacity:1;background-color:#eee}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}@media screen and (-webkit-device-pixel-ratio>=0){input[type=date].form-control,input[type=datetime-local].form-control,input[type=month].form-control,input[type=time].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],.input-group-sm input[type=time],input[type=date].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm,input[type=time].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],.input-group-lg input[type=time],input[type=date].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg,input[type=time].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{margin-top:10px;margin-bottom:10px;display:block;position:relative}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.checkbox label,.radio label{cursor:pointer;min-height:20px;margin-bottom:0;padding-left:20px;font-weight:400}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{margin-top:4px\9 ;margin-left:-20px;position:absolute}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{vertical-align:middle;cursor:pointer;margin-bottom:0;padding-left:20px;font-weight:400;display:inline-block;position:relative}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}.form-control-static{min-height:34px;margin-bottom:0;padding-top:7px;padding-bottom:7px}.form-control-static.input-lg,.form-control-static.input-sm{padding-left:0;padding-right:0}.input-sm{border-radius:3px;height:30px;padding:5px 10px;font-size:12px;line-height:1.5}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{border-radius:3px;height:30px;padding:5px 10px;font-size:12px;line-height:1.5}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{border-radius:6px;height:46px;padding:10px 16px;font-size:18px;line-height:1.33333}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{border-radius:6px;height:46px;padding:10px 16px;font-size:18px;line-height:1.33333}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.33333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{z-index:2;text-align:center;pointer-events:none;width:34px;height:34px;line-height:34px;display:block;position:absolute;top:0;right:0}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;box-shadow:inset 0 1px 1px #00000013}.has-success .form-control:focus{border-color:#2b542c;box-shadow:inset 0 1px 1px #00000013,0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;box-shadow:inset 0 1px 1px #00000013}.has-warning .form-control:focus{border-color:#66512c;box-shadow:inset 0 1px 1px #00000013,0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;box-shadow:inset 0 1px 1px #00000013}.has-error .form-control:focus{border-color:#843534;box-shadow:inset 0 1px 1px #00000013,0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{color:#737373;margin-top:5px;margin-bottom:10px;display:block}@media (width>=768px){.form-inline .form-group{vertical-align:middle;margin-bottom:0;display:inline-block}.form-inline .form-control{vertical-align:middle;width:auto;display:inline-block}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{vertical-align:middle;display:inline-table}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{vertical-align:middle;margin-bottom:0}.form-inline .checkbox,.form-inline .radio{vertical-align:middle;margin-top:0;margin-bottom:0;display:inline-block}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{margin-left:0;position:relative}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{margin-top:0;margin-bottom:0;padding-top:7px}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-left:-15px;margin-right:-15px}@media (width>=768px){.form-horizontal .control-label{text-align:right;margin-bottom:0;padding-top:7px}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (width>=768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;user-select:none;background-image:none;border:1px solid #0000;border-radius:4px;margin-bottom:0;padding:6px 12px;font-size:14px;font-weight:400;line-height:1.42857;display:inline-block}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;box-shadow:inset 0 3px 5px #00000020}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);opacity:.65;-webkit-box-shadow:none;box-shadow:none}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;background-image:none;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;background-image:none;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;background-image:none;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;background-image:none;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;background-image:none;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;background-image:none;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{color:#337ab7;border-radius:0;font-weight:400}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{-webkit-box-shadow:none;box-shadow:none;background-color:#0000}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:#0000}.btn-link:focus,.btn-link:hover{color:#23527c;background-color:#0000;text-decoration:underline}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{border-radius:6px;padding:10px 16px;font-size:18px;line-height:1.33333}.btn-group-sm>.btn,.btn-sm{border-radius:3px;padding:5px 10px;font-size:12px;line-height:1.5}.btn-group-xs>.btn,.btn-xs{border-radius:3px;padding:1px 5px;font-size:12px;line-height:1.5}.btn-block{width:100%;display:block}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{-o-transition-property:height,visibility;-o-transition-duration:.35s;-o-transition-timing-function:ease;height:0;transition-property:height,visibility;transition-duration:.35s;transition-timing-function:ease;position:relative;overflow:hidden}.caret{vertical-align:middle;border-top:4px dashed;border-top:4px solid\9 ;border-left:4px solid #0000;border-right:4px solid #0000;width:0;height:0;margin-left:2px;display:inline-block}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{z-index:1000;float:left;text-align:left;background-color:#fff;background-clip:padding-box;border:1px solid #00000026;border-radius:4px;min-width:160px;margin:2px 0 0;padding:5px 0;font-size:14px;list-style:none;display:none;position:absolute;top:100%;left:0;box-shadow:0 6px 12px #0000002d}.dropdown-menu.pull-right{left:auto;right:0}.dropdown-menu .divider{background-color:#e5e5e5;height:1px;margin:9px 0;overflow:hidden}.dropdown-menu>li>a{clear:both;color:#333;white-space:nowrap;padding:3px 20px;font-weight:400;line-height:1.42857;display:block}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;background-color:#f5f5f5;text-decoration:none}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;background-color:#337ab7;outline:0;text-decoration:none}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{cursor:not-allowed;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-color:#0000;background-image:none;text-decoration:none}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{left:auto;right:0}.dropdown-menu-left{left:0;right:auto}.dropdown-header{color:#777;white-space:nowrap;padding:3px 20px;font-size:12px;line-height:1.42857;display:block}.dropdown-backdrop{z-index:990;position:fixed;inset:0}.pull-right>.dropdown-menu{left:auto;right:0}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9 }.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{margin-bottom:2px;top:auto;bottom:100%}@media (width>=768px){.navbar-right .dropdown-menu{left:auto;right:0}.navbar-right .dropdown-menu-left{left:0;right:auto}}.btn-group,.btn-group-vertical{vertical-align:middle;display:inline-block;position:relative}.btn-group-vertical>.btn,.btn-group>.btn{float:left;position:relative}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-left:12px;padding-right:12px}.btn-group.open .dropdown-toggle{box-shadow:inset 0 3px 5px #00000020}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{float:none;width:100%;max-width:100%;display:block}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-radius:4px 4px 0 0}.btn-group-vertical>.btn:last-child:not(:first-child){border-radius:0 0 4px 4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{table-layout:fixed;border-collapse:separate;width:100%;display:table}.btn-group-justified>.btn,.btn-group-justified>.btn-group{float:none;width:1%;display:table-cell}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{clip:rect(0,0,0,0);pointer-events:none;position:absolute}.input-group{border-collapse:separate;display:table;position:relative}.input-group[class*=col-]{float:none;padding-left:0;padding-right:0}.input-group .form-control{z-index:2;float:left;width:100%;margin-bottom:0;position:relative}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{border-radius:6px;height:46px;padding:10px 16px;font-size:18px;line-height:1.33333}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{border-radius:3px;height:30px;padding:5px 10px;font-size:12px;line-height:1.5}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{white-space:nowrap;vertical-align:middle;width:1%}.input-group-addon{color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px;padding:6px 12px;font-size:14px;font-weight:400;line-height:1}.input-group-addon.input-sm{border-radius:3px;padding:5px 10px;font-size:12px}.input-group-addon.input-lg{border-radius:6px;padding:10px 16px;font-size:18px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{white-space:nowrap;font-size:0;position:relative}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{margin-bottom:0;padding-left:0;list-style:none}.nav>li{display:block;position:relative}.nav>li>a{padding:10px 15px;display:block;position:relative}.nav>li>a:focus,.nav>li>a:hover{background-color:#eee;text-decoration:none}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;cursor:not-allowed;background-color:#0000;text-decoration:none}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{background-color:#e5e5e5;height:1px;margin:9px 0;overflow:hidden}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{border:1px solid #0000;border-radius:4px 4px 0 0;margin-right:2px;line-height:1.42857}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:#0000}.nav-tabs.nav-justified{border-bottom:0;width:100%}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (width>=768px){.nav-tabs.nav-justified>li{width:1%;display:table-cell}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{border-radius:4px;margin-right:0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (width>=768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (width>=768px){.nav-justified>li{width:1%;display:table-cell}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{border-radius:4px;margin-right:0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (width>=768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{border-top-left-radius:0;border-top-right-radius:0;margin-top:-1px}.navbar{border:1px solid #0000;min-height:50px;margin-bottom:20px;position:relative}@media (width>=768px){.navbar{border-radius:4px}.navbar-header{float:left}}.navbar-collapse{-webkit-overflow-scrolling:touch;border-top:1px solid #0000;padding-left:15px;padding-right:15px;overflow-x:visible;box-shadow:inset 0 1px #ffffff1a}.navbar-collapse.in{overflow-y:auto}@media (width>=768px){.navbar-collapse{width:auto;-webkit-box-shadow:none;box-shadow:none;border-top:0}.navbar-collapse.collapse{padding-bottom:0;height:auto!important;display:block!important;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-left:0;padding-right:0}}.navbar-fixed-bottom,.navbar-fixed-top{z-index:1030;position:fixed;left:0;right:0}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (device-width<=480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}@media (width>=768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{border-width:0 0 1px;top:0}.navbar-fixed-bottom{border-width:1px 0 0;margin-bottom:0;bottom:0}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-left:-15px;margin-right:-15px}@media (width>=768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-left:0;margin-right:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (width>=768px){.navbar-static-top{border-radius:0}}.navbar-brand{float:left;height:50px;padding:15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (width>=768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{float:right;background-color:#0000;background-image:none;border:1px solid #0000;border-radius:4px;margin-top:8px;margin-bottom:8px;margin-right:15px;padding:9px 10px;position:relative}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{border-radius:1px;width:22px;height:2px;display:block}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (width>=768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (width<=767px){.navbar-nav .open .dropdown-menu{float:none;width:auto;-webkit-box-shadow:none;box-shadow:none;background-color:#0000;border:0;margin-top:0;position:static}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (width>=768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{border-top:1px solid #0000;border-bottom:1px solid #0000;margin:8px -15px;padding:10px 15px;box-shadow:inset 0 1px #ffffff1a,0 1px #ffffff1a}@media (width>=768px){.navbar-form .form-group{vertical-align:middle;margin-bottom:0;display:inline-block}.navbar-form .form-control{vertical-align:middle;width:auto;display:inline-block}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{vertical-align:middle;display:inline-table}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{vertical-align:middle;margin-bottom:0}.navbar-form .checkbox,.navbar-form .radio{vertical-align:middle;margin-top:0;margin-bottom:0;display:inline-block}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{margin-left:0;position:relative}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (width<=767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (width>=768px){.navbar-form{width:auto;-webkit-box-shadow:none;box-shadow:none;border:0;margin-left:0;margin-right:0;padding-top:0;padding-bottom:0}}.navbar-nav>li>.dropdown-menu{border-top-left-radius:0;border-top-right-radius:0;margin-top:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-radius:4px 4px 0 0;margin-bottom:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (width>=768px){.navbar-text{float:left;margin-left:15px;margin-right:15px}.navbar-left{float:left!important}.navbar-right{margin-right:-15px;float:right!important}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:#0000}.navbar-default .navbar-text,.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:#0000}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:#0000}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (width<=767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:#0000}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:#0000}}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:#0000}.navbar-inverse .navbar-text,.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:#0000}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:#0000}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (width<=767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:#0000}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:#0000}}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{background-color:#f5f5f5;border-radius:4px;margin-bottom:20px;padding:8px 15px;list-style:none}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{color:#ccc;content:"/ ";padding:0 5px}.breadcrumb>.active{color:#777}.pagination{border-radius:4px;margin:20px 0;padding-left:0;display:inline-block}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{float:left;color:#337ab7;background-color:#fff;border:1px solid #ddd;margin-left:-1px;padding:6px 12px;line-height:1.42857;text-decoration:none;position:relative}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{border-top-left-radius:4px;border-bottom-left-radius:4px;margin-left:0}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.33333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{text-align:center;margin:20px 0;padding-left:0;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{background-color:#fff;border:1px solid #ddd;border-radius:15px;padding:5px 14px;display:inline-block}.pager li>a:focus,.pager li>a:hover{background-color:#eee;text-decoration:none}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;display:inline}a.label:focus,a.label:hover{color:#fff;cursor:pointer;text-decoration:none}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;display:inline-block}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{padding:1px 5px;top:0}a.badge:focus,a.badge:hover{color:#fff;cursor:pointer;text-decoration:none}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{color:inherit;background-color:#eee;margin-bottom:30px;padding-top:30px;padding-bottom:30px}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px;padding-left:15px;padding-right:15px}.jumbotron .container{max-width:100%}@media screen and (width>=768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-left:60px;padding-right:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{-o-transition:border .2s ease-in-out;background-color:#fff;border:1px solid #ddd;border-radius:4px;margin-bottom:20px;padding:4px;line-height:1.42857;transition:border .2s ease-in-out;display:block}.thumbnail a>img,.thumbnail>img{margin-left:auto;margin-right:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{color:#333;padding:9px}.alert{border:1px solid #0000;border-radius:4px;margin-bottom:20px;padding:15px}.alert h4{color:inherit;margin-top:0}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{color:inherit;position:relative;top:-2px;right:-21px}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@keyframes progress-bar-stripes{0%{background-position:40px 0}to{background-position:0 0}}.progress{background-color:#f5f5f5;border-radius:4px;height:20px;margin-bottom:20px;overflow:hidden;box-shadow:inset 0 1px 2px #0000001a}.progress-bar{float:left;color:#fff;text-align:center;-o-transition:width .6s ease;background-color:#337ab7;width:0%;height:100%;font-size:12px;line-height:20px;transition:width .6s;box-shadow:inset 0 -1px #00000026}.progress-bar-striped,.progress-striped .progress-bar{-webkit-background-size:40px 40px;background-image:linear-gradient(45deg,#ffffff26 25%,#0000 25% 50%,#ffffff26 50% 75%,#0000 75%,#0000);background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{animation:2s linear infinite progress-bar-stripes}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:linear-gradient(45deg,#ffffff26 25%,#0000 25% 50%,#ffffff26 50% 75%,#0000 75%,#0000)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:linear-gradient(45deg,#ffffff26 25%,#0000 25% 50%,#ffffff26 50% 75%,#0000 75%,#0000)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:linear-gradient(45deg,#ffffff26 25%,#0000 25% 50%,#ffffff26 50% 75%,#0000 75%,#0000)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:linear-gradient(45deg,#ffffff26 25%,#0000 25% 50%,#ffffff26 50% 75%,#0000 75%,#0000)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{zoom:1;overflow:hidden}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{vertical-align:top;display:table-cell}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{margin-bottom:20px;padding-left:0}.list-group-item{background-color:#fff;border:1px solid #ddd;margin-bottom:-1px;padding:10px 15px;display:block;position:relative}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{border-bottom-right-radius:4px;border-bottom-left-radius:4px;margin-bottom:0}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;background-color:#f5f5f5;text-decoration:none}button.list-group-item{text-align:left;width:100%}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{background-color:#fff;border:1px solid #0000;border-radius:4px;margin-bottom:20px;box-shadow:0 1px 1px #0000000d}.panel-body{padding:15px}.panel-heading{border-bottom:1px solid #0000;border-top-left-radius:3px;border-top-right-radius:3px;padding:10px 15px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{color:inherit;margin-top:0;margin-bottom:0;font-size:16px}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px;padding:10px 15px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child,.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-left:15px;padding-right:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th,.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{border:0;margin-bottom:0}.panel-group{margin-bottom:20px}.panel-group .panel{border-radius:4px;margin-bottom:0}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{height:0;padding:0;display:block;position:relative;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{border:0;width:100%;height:100%;position:absolute;top:0;bottom:0;left:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;min-height:20px;margin-bottom:20px;padding:19px;box-shadow:inset 0 1px 1px #0000000d}.well blockquote{border-color:#00000026}.well-lg{border-radius:6px;padding:24px}.well-sm{border-radius:3px;padding:9px}.close{float:right;color:#000;text-shadow:0 1px #fff;filter:alpha(opacity=20);opacity:.2;font-size:21px;font-weight:700;line-height:1}.close:focus,.close:hover{color:#000;cursor:pointer;filter:alpha(opacity=50);opacity:.5;text-decoration:none}button.close{cursor:pointer;appearance:none;background:0 0;border:0;padding:0}.modal-open{overflow:hidden}.modal{z-index:1050;-webkit-overflow-scrolling:touch;outline:0;display:none;position:fixed;inset:0;overflow:hidden}.modal.fade .modal-dialog{-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;transform:translateY(-25%)}.modal.in .modal-dialog{transform:translate(0)}.modal-open .modal{overflow:hidden auto}.modal-dialog{width:auto;margin:10px;position:relative}.modal-content{background-color:#fff;background-clip:padding-box;border:1px solid #0003;border-radius:6px;outline:0;position:relative;box-shadow:0 3px 9px #00000080}.modal-backdrop{z-index:1040;background-color:#000;position:fixed;inset:0}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{border-bottom:1px solid #e5e5e5;padding:15px}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857}.modal-body{padding:15px;position:relative}.modal-footer{text-align:right;border-top:1px solid #e5e5e5;padding:15px}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{width:50px;height:50px;position:absolute;top:-9999px;overflow:scroll}@media (width>=768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{box-shadow:0 5px 15px #00000080}.modal-sm{width:300px}}@media (width>=992px){.modal-lg{width:900px}}.tooltip{z-index:1070;line-break:auto;text-align:left;text-align:start;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;font-family:Helvetica Neue,Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857;text-decoration:none;display:block;position:absolute}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{margin-top:-3px;padding:5px 0}.tooltip.right{margin-left:3px;padding:0 5px}.tooltip.bottom{margin-top:3px;padding:5px 0}.tooltip.left{margin-left:-3px;padding:0 5px}.tooltip.top .tooltip-arrow{border-width:5px 5px 0;border-top-color:#000;margin-left:-5px;bottom:0;left:50%}.tooltip.top-left .tooltip-arrow{border-width:5px 5px 0;border-top-color:#000;margin-bottom:-5px;bottom:0;right:5px}.tooltip.top-right .tooltip-arrow{border-width:5px 5px 0;border-top-color:#000;margin-bottom:-5px;bottom:0;left:5px}.tooltip.right .tooltip-arrow{border-width:5px 5px 5px 0;border-right-color:#000;margin-top:-5px;top:50%;left:0}.tooltip.left .tooltip-arrow{border-width:5px 0 5px 5px;border-left-color:#000;margin-top:-5px;top:50%;right:0}.tooltip.bottom .tooltip-arrow{border-width:0 5px 5px;border-bottom-color:#000;margin-left:-5px;top:0;left:50%}.tooltip.bottom-left .tooltip-arrow{border-width:0 5px 5px;border-bottom-color:#000;margin-top:-5px;top:0;right:5px}.tooltip.bottom-right .tooltip-arrow{border-width:0 5px 5px;border-bottom-color:#000;margin-top:-5px;top:0;left:5px}.tooltip-inner{color:#fff;text-align:center;background-color:#000;border-radius:4px;max-width:200px;padding:3px 8px}.tooltip-arrow{border-style:solid;border-color:#0000;width:0;height:0;position:absolute}.popover{z-index:1060;line-break:auto;text-align:left;text-align:start;max-width:276px;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;background-clip:padding-box;border:1px solid #0003;border-radius:6px;padding:1px;font-family:Helvetica Neue,Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857;text-decoration:none;display:none;position:absolute;top:0;left:0;box-shadow:0 5px 10px #0003}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover>.arrow{border-width:11px}.popover>.arrow,.popover>.arrow:after{border-style:solid;border-color:#0000;width:0;height:0;display:block;position:absolute}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{border-top-color:#00000040;border-bottom-width:0;margin-left:-11px;bottom:-11px;left:50%}.popover.top>.arrow:after{content:" ";border-top-color:#fff;border-bottom-width:0;margin-left:-10px;bottom:1px}.popover.right>.arrow{border-left-width:0;border-right-color:#00000040;margin-top:-11px;top:50%;left:-11px}.popover.right>.arrow:after{content:" ";border-left-width:0;border-right-color:#fff;bottom:-10px;left:1px}.popover.bottom>.arrow{border-top-width:0;border-bottom-color:#00000040;margin-left:-11px;top:-11px;left:50%}.popover.bottom>.arrow:after{content:" ";border-top-width:0;border-bottom-color:#fff;margin-left:-10px;top:1px}.popover.left>.arrow{border-left-color:#00000040;border-right-width:0;margin-top:-11px;top:50%;right:-11px}.popover.left>.arrow:after{content:" ";border-left-color:#fff;border-right-width:0;bottom:-10px;right:1px}.popover-title{background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0;margin:0;padding:8px 14px;font-size:14px}.popover-content{padding:9px 14px}.carousel{position:relative}.carousel-inner{width:100%;position:relative;overflow:hidden}.carousel-inner>.item{-o-transition:.6s ease-in-out left;transition:left .6s ease-in-out;display:none;position:relative}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-o-transition:-o-transform .6s ease-in-out;backface-visibility:hidden;perspective:1000px;transition:transform .6s ease-in-out}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;transform:translate(100%)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;transform:translate(-100%)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;transform:translate(0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{width:100%;position:absolute;top:0}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{color:#fff;text-align:center;text-shadow:0 1px 2px #0009;width:15%;filter:alpha(opacity=50);opacity:.5;background-color:#0000;font-size:20px;position:absolute;top:0;bottom:0;left:0}.carousel-control.left{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#80000000", endColorstr="#00000000", GradientType=1);background-image:linear-gradient(90deg,#00000080 0,#0000 100%);background-repeat:repeat-x}.carousel-control.right{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#00000000", endColorstr="#80000000", GradientType=1);background-image:linear-gradient(90deg,#0000 0,#00000080 100%);background-repeat:repeat-x;left:auto;right:0}.carousel-control:focus,.carousel-control:hover{color:#fff;filter:alpha(opacity=90);opacity:.9;outline:0;text-decoration:none}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{z-index:5;margin-top:-10px;display:inline-block;position:absolute;top:50%}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px;left:50%}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px;right:50%}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:"‹"}.carousel-control .icon-next:before{content:"›"}.carousel-indicators{z-index:15;text-align:center;width:60%;margin-left:-30%;padding-left:0;list-style:none;position:absolute;bottom:10px;left:50%}.carousel-indicators li{text-indent:-999px;cursor:pointer;background-color:#000\9 ;background-color:#0000;border:1px solid #fff;border-radius:10px;width:10px;height:10px;margin:1px;display:inline-block}.carousel-indicators .active{background-color:#fff;width:12px;height:12px;margin:0}.carousel-caption{z-index:10;color:#fff;text-align:center;text-shadow:0 1px 2px #0009;padding-top:20px;padding-bottom:20px;position:absolute;bottom:20px;left:15%;right:15%}.carousel-caption .btn{text-shadow:none}@media screen and (width>=768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{padding-bottom:30px;left:20%;right:20%}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{content:" ";display:table}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{margin-left:auto;margin-right:auto;display:block}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:#0000;text-shadow:none;background-color:#0000;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs,.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (width<=767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}.visible-xs-block{display:block!important}.visible-xs-inline{display:inline!important}.visible-xs-inline-block{display:inline-block!important}}@media (width>=768px) and (width<=991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}.visible-sm-block{display:block!important}.visible-sm-inline{display:inline!important}.visible-sm-inline-block{display:inline-block!important}}@media (width>=992px) and (width<=1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}.visible-md-block{display:block!important}.visible-md-inline{display:inline!important}.visible-md-inline-block{display:inline-block!important}}@media (width>=1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}.visible-lg-block{display:block!important}.visible-lg-inline{display:inline!important}.visible-lg-inline-block{display:inline-block!important}}@media (width<=767px){.hidden-xs{display:none!important}}@media (width>=768px) and (width<=991px){.hidden-sm{display:none!important}}@media (width>=992px) and (width<=1199px){.hidden-md{display:none!important}}@media (width>=1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}.hidden-print{display:none!important}}.lnms-input{border-style:var(--tw-border-style);border-width:1px;border-color:var(--tw-color-gray-300);background-color:var(--tw-color-white);width:100%;height:30px;padding-inline:calc(var(--tw-spacing) * 2.5);border-radius:3px;display:block;color:var(--tw-color-gray-700)!important}.lnms-input::placeholder{color:var(--tw-color-gray-400)}.lnms-input:focus{border-color:var(--tw-color-blue-500);--tw-ring-shadow:var(--tw-ring-inset,) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color,currentcolor);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);--tw-ring-color:var(--tw-color-blue-500);--tw-outline-style:none;outline-style:none}.lnms-input:disabled{cursor:not-allowed;background-color:var(--tw-color-gray-100)}}@layer utilities{.tw\:pointer-events-none{pointer-events:none}.tw\:sr-only{clip-path:inset(50%);white-space:nowrap;border-width:0;width:1px;height:1px;margin:-1px;padding:0;position:absolute;overflow:hidden}.tw\:absolute{position:absolute}.tw\:fixed{position:fixed}.tw\:relative{position:relative}.tw\:inset-0{inset:0}.tw\:inset-y-0{inset-block:0}.tw\:-top-0\.5{top:calc(var(--tw-spacing) * -.5)}.tw\:-top-px{top:-1px}.tw\:top-0{top:0}.tw\:top-0\.5{top:calc(var(--tw-spacing) * .5)}.tw\:top-1{top:var(--tw-spacing)}.tw\:top-1\/2{top:50%}.tw\:top-16{top:calc(var(--tw-spacing) * 16)}.tw\:top-full{top:100%}.tw\:-right-0\.5{right:calc(var(--tw-spacing) * -.5)}.tw\:right-0{right:0}.tw\:right-1{right:var(--tw-spacing)}.tw\:right-1\!{right:var(--tw-spacing)!important}.tw\:right-2{right:calc(var(--tw-spacing) * 2)}.tw\:right-\[1em\]{right:1em}.tw\:bottom-0{bottom:0}.tw\:bottom-0\!{bottom:0!important}.tw\:left-0{left:0}.tw\:left-0\!{left:0!important}.tw\:left-0\.5{left:calc(var(--tw-spacing) * .5)}.tw\:left-1\!{left:var(--tw-spacing)!important}.tw\:left-1\/2{left:50%}.tw\:z-0{z-index:0}.tw\:z-10{z-index:10}.tw\:z-20{z-index:20}.tw\:z-50{z-index:50}.tw\:z-100{z-index:100}.tw\:z-9999{z-index:9999}.tw\:col-span-1{grid-column:span 1/span 1}.tw\:col-span-2{grid-column:span 2/span 2}.tw\:col-span-4{grid-column:span 4/span 4}.tw\:col-start-2{grid-column-start:2}.tw\:float-left{float:left}.tw\:float-right{float:right}.tw\:m-0{margin:0}.tw\:m-0\.5{margin:calc(var(--tw-spacing) * .5)}.tw\:m-3{margin:calc(var(--tw-spacing) * 3)}.tw\:m-auto{margin:auto}.tw\:mx-1{margin-inline:var(--tw-spacing)}.tw\:mx-4{margin-inline:calc(var(--tw-spacing) * 4)}.tw\:mx-5{margin-inline:calc(var(--tw-spacing) * 5)}.tw\:mx-10{margin-inline:calc(var(--tw-spacing) * 10)}.tw\:mx-auto{margin-inline:auto}.tw\:-my-3{margin-block:calc(var(--tw-spacing) * -3)}.tw\:my-1{margin-block:var(--tw-spacing)}.tw\:my-2{margin-block:calc(var(--tw-spacing) * 2)}.tw\:my-5{margin-block:calc(var(--tw-spacing) * 5)}.tw\:my-6{margin-block:calc(var(--tw-spacing) * 6)}.tw\:me-2{margin-inline-end:calc(var(--tw-spacing) * 2)}.tw\:-mt-4{margin-top:calc(var(--tw-spacing) * -4)}.tw\:mt-1{margin-top:var(--tw-spacing)}.tw\:mt-1\.5{margin-top:calc(var(--tw-spacing) * 1.5)}.tw\:mt-2{margin-top:calc(var(--tw-spacing) * 2)}.tw\:mt-3{margin-top:calc(var(--tw-spacing) * 3)}.tw\:mt-4{margin-top:calc(var(--tw-spacing) * 4)}.tw\:mt-5{margin-top:calc(var(--tw-spacing) * 5)}.tw\:mt-6{margin-top:calc(var(--tw-spacing) * 6)}.tw\:mt-10{margin-top:calc(var(--tw-spacing) * 10)}.tw\:mt-20{margin-top:calc(var(--tw-spacing) * 20)}.tw\:mr-0\.5{margin-right:calc(var(--tw-spacing) * .5)}.tw\:mr-1{margin-right:var(--tw-spacing)}.tw\:mr-2{margin-right:calc(var(--tw-spacing) * 2)}.tw\:mr-3{margin-right:calc(var(--tw-spacing) * 3)}.tw\:mr-auto{margin-right:auto}.tw\:-mb-px{margin-bottom:-1px}.tw\:mb-0{margin-bottom:0}.tw\:mb-0\!{margin-bottom:0!important}.tw\:mb-1{margin-bottom:var(--tw-spacing)}.tw\:mb-1\.5{margin-bottom:calc(var(--tw-spacing) * 1.5)}.tw\:mb-2{margin-bottom:calc(var(--tw-spacing) * 2)}.tw\:mb-2\.5{margin-bottom:calc(var(--tw-spacing) * 2.5)}.tw\:mb-3{margin-bottom:calc(var(--tw-spacing) * 3)}.tw\:mb-4{margin-bottom:calc(var(--tw-spacing) * 4)}.tw\:mb-5{margin-bottom:calc(var(--tw-spacing) * 5)}.tw\:mb-6{margin-bottom:calc(var(--tw-spacing) * 6)}.tw\:mb-\[3px\]{margin-bottom:3px}.tw\:mb-\[5px\]{margin-bottom:5px}.tw\:mb-\[10px\]{margin-bottom:10px}.tw\:-ml-px{margin-left:-1px}.tw\:ml-0\.5{margin-left:calc(var(--tw-spacing) * .5)}.tw\:ml-1{margin-left:var(--tw-spacing)}.tw\:ml-1\.5{margin-left:calc(var(--tw-spacing) * 1.5)}.tw\:ml-2{margin-left:calc(var(--tw-spacing) * 2)}.tw\:ml-3{margin-left:calc(var(--tw-spacing) * 3)}.tw\:ml-4{margin-left:calc(var(--tw-spacing) * 4)}.tw\:ml-5{margin-left:calc(var(--tw-spacing) * 5)}.tw\:ml-auto{margin-left:auto}.tw\:block{display:block}.tw\:flex{display:flex}.tw\:grid{display:grid}.tw\:hidden{display:none}.tw\:inline{display:inline}.tw\:inline-block{display:inline-block}.tw\:inline-flex{display:inline-flex}.tw\:h-0\.5{height:calc(var(--tw-spacing) * .5)}.tw\:h-1{height:var(--tw-spacing)}.tw\:h-1\.5{height:calc(var(--tw-spacing) * 1.5)}.tw\:h-1\/2{height:50%}.tw\:h-2{height:calc(var(--tw-spacing) * 2)}.tw\:h-3{height:calc(var(--tw-spacing) * 3)}.tw\:h-4{height:calc(var(--tw-spacing) * 4)}.tw\:h-5{height:calc(var(--tw-spacing) * 5)}.tw\:h-6{height:calc(var(--tw-spacing) * 6)}.tw\:h-7{height:calc(var(--tw-spacing) * 7)}.tw\:h-8{height:calc(var(--tw-spacing) * 8)}.tw\:h-9{height:calc(var(--tw-spacing) * 9)}.tw\:h-10{height:calc(var(--tw-spacing) * 10)}.tw\:h-12{height:calc(var(--tw-spacing) * 12)}.tw\:h-16{height:calc(var(--tw-spacing) * 16)}.tw\:h-24{height:calc(var(--tw-spacing) * 24)}.tw\:h-28{height:calc(var(--tw-spacing) * 28)}.tw\:h-\[1\.1em\]{height:1.1em}.tw\:h-\[22px\]{height:22px}.tw\:h-\[30px\]{height:30px}.tw\:h-\[85px\]{height:85px}.tw\:h-\[calc\(50\%\+1px\)\]{height:calc(50% + 1px)}.tw\:h-\[calc\(100\%-2\.6em\)\]{height:calc(100% - 2.6em)}.tw\:h-\[calc\(100vh-62px\)\]{height:calc(100vh - 62px)}.tw\:h-auto{height:auto}.tw\:h-full{height:100%}.tw\:h-screen{height:100vh}.tw\:max-h-40{max-height:calc(var(--tw-spacing) * 40)}.tw\:max-h-64{max-height:calc(var(--tw-spacing) * 64)}.tw\:max-h-80{max-height:calc(var(--tw-spacing) * 80)}.tw\:max-h-\[15em\]{max-height:15em}.tw\:max-h-\[70vh\]{max-height:70vh}.tw\:max-h-\[85vh\]{max-height:85vh}.tw\:max-h-\[calc\(100vh-1rem\)\]{max-height:calc(100vh - 1rem)}.tw\:max-h-\[calc\(100vh-80px\)\]{max-height:calc(100vh - 80px)}.tw\:min-h-0{min-height:0}.tw\:min-h-4{min-height:calc(var(--tw-spacing) * 4)}.tw\:min-h-8{min-height:calc(var(--tw-spacing) * 8)}.tw\:min-h-11{min-height:calc(var(--tw-spacing) * 11)}.tw\:min-h-13{min-height:calc(var(--tw-spacing) * 13)}.tw\:min-h-24{min-height:calc(var(--tw-spacing) * 24)}.tw\:min-h-\[28px\]{min-height:28px}.tw\:min-h-\[36px\]{min-height:36px}.tw\:min-h-\[400px\]{min-height:400px}.tw\:w-0{width:0}.tw\:w-1\.5{width:calc(var(--tw-spacing) * 1.5)}.tw\:w-2{width:calc(var(--tw-spacing) * 2)}.tw\:w-3{width:calc(var(--tw-spacing) * 3)}.tw\:w-4{width:calc(var(--tw-spacing) * 4)}.tw\:w-5{width:calc(var(--tw-spacing) * 5)}.tw\:w-6{width:calc(var(--tw-spacing) * 6)}.tw\:w-7{width:calc(var(--tw-spacing) * 7)}.tw\:w-8{width:calc(var(--tw-spacing) * 8)}.tw\:w-9{width:calc(var(--tw-spacing) * 9)}.tw\:w-10{width:calc(var(--tw-spacing) * 10)}.tw\:w-12{width:calc(var(--tw-spacing) * 12)}.tw\:w-16{width:calc(var(--tw-spacing) * 16)}.tw\:w-20{width:calc(var(--tw-spacing) * 20)}.tw\:w-25{width:calc(var(--tw-spacing) * 25)}.tw\:w-28{width:calc(var(--tw-spacing) * 28)}.tw\:w-32{width:calc(var(--tw-spacing) * 32)}.tw\:w-36{width:calc(var(--tw-spacing) * 36)}.tw\:w-48{width:calc(var(--tw-spacing) * 48)}.tw\:w-64{width:calc(var(--tw-spacing) * 64)}.tw\:w-\[1\.1em\]{width:1.1em}.tw\:w-\[2px\]{width:2px}.tw\:w-\[3px\]{width:3px}.tw\:w-\[48ch\]{width:48ch}.tw\:w-\[100px\]{width:100px}.tw\:w-\[139px\]{width:139px}.tw\:w-\[150px\]{width:150px}.tw\:w-\[200px\]{width:200px}.tw\:w-auto{width:auto}.tw\:w-auto\!{width:auto!important}.tw\:w-fit{width:fit-content}.tw\:w-full{width:100%}.tw\:w-max{width:max-content}.tw\:w-min{width:min-content}.tw\:max-w-\(--breakpoint-lg\){max-width:var(--breakpoint-lg)}.tw\:max-w-2xl{max-width:var(--tw-container-2xl)}.tw\:max-w-3xl{max-width:var(--tw-container-3xl)}.tw\:max-w-4xl{max-width:var(--tw-container-4xl)}.tw\:max-w-5xl{max-width:var(--tw-container-5xl)}.tw\:max-w-50{max-width:calc(var(--tw-spacing) * 50)}.tw\:max-w-100{max-width:calc(var(--tw-spacing) * 100)}.tw\:max-w-\[90vw\]{max-width:90vw}.tw\:max-w-\[170px\]{max-width:170px}.tw\:max-w-\[calc\(100vw-1rem\)\]{max-width:calc(100vw - 1rem)}.tw\:max-w-\[calc\(100vw-24px\)\]{max-width:calc(100vw - 24px)}.tw\:max-w-full{max-width:100%}.tw\:max-w-lg{max-width:var(--tw-container-lg)}.tw\:max-w-md{max-width:var(--tw-container-md)}.tw\:max-w-none{max-width:none}.tw\:max-w-sm{max-width:var(--tw-container-sm)}.tw\:max-w-xl{max-width:var(--tw-container-xl)}.tw\:min-w-0{min-width:0}.tw\:min-w-8{min-width:calc(var(--tw-spacing) * 8)}.tw\:min-w-10{min-width:calc(var(--tw-spacing) * 10)}.tw\:min-w-24{min-width:calc(var(--tw-spacing) * 24)}.tw\:min-w-32{min-width:calc(var(--tw-spacing) * 32)}.tw\:min-w-40{min-width:calc(var(--tw-spacing) * 40)}.tw\:min-w-44{min-width:calc(var(--tw-spacing) * 44)}.tw\:min-w-48{min-width:calc(var(--tw-spacing) * 48)}.tw\:min-w-64{min-width:calc(var(--tw-spacing) * 64)}.tw\:min-w-70{min-width:calc(var(--tw-spacing) * 70)}.tw\:min-w-fit{min-width:fit-content}.tw\:min-w-full{min-width:100%}.tw\:flex-1{flex:1}.tw\:shrink-0{flex-shrink:0}.tw\:grow{flex-grow:1}.tw\:border-collapse{border-collapse:collapse}.tw\:origin-top-left{transform-origin:0 0}.tw\:-translate-x-1\/2{--tw-translate-x:calc(calc(1 / 2 * 100%) * -1);translate:var(--tw-translate-x) var(--tw-translate-y)}.tw\:-translate-y-1\/2{--tw-translate-y:calc(calc(1 / 2 * 100%) * -1);translate:var(--tw-translate-x) var(--tw-translate-y)}.tw\:-translate-y-2{--tw-translate-y:calc(var(--tw-spacing) * -2);translate:var(--tw-translate-x) var(--tw-translate-y)}.tw\:translate-y-0{--tw-translate-y:0px;translate:var(--tw-translate-x) var(--tw-translate-y)}.tw\:scale-95{--tw-scale-x:95%;--tw-scale-y:95%;--tw-scale-z:95%;scale:var(--tw-scale-x) var(--tw-scale-y)}.tw\:scale-100{--tw-scale-x:100%;--tw-scale-y:100%;--tw-scale-z:100%;scale:var(--tw-scale-x) var(--tw-scale-y)}.tw\:-rotate-90{rotate:-90deg}.tw\:rotate-180{rotate:180deg}.tw\:transform{transform:var(--tw-rotate-x,) var(--tw-rotate-y,) var(--tw-rotate-z,) var(--tw-skew-x,) var(--tw-skew-y,)}.tw\:animate-pulse{animation:var(--tw-animate-pulse)}.tw\:animate-spin{animation:var(--tw-animate-spin)}.tw\:cursor-auto{cursor:auto}.tw\:cursor-crosshair{cursor:crosshair}.tw\:cursor-default{cursor:default}.tw\:cursor-move{cursor:move}.tw\:cursor-not-allowed{cursor:not-allowed}.tw\:cursor-pointer{cursor:pointer}.tw\:cursor-text{cursor:text}.tw\:scroll-px-2{scroll-padding-inline:calc(var(--tw-spacing) * 2)}.tw\:scrollbar-none{scrollbar-width:none}.tw\:scrollbar-thin{scrollbar-width:thin}.tw\:list-inside{list-style-position:inside}.tw\:list-disc{list-style-type:disc}.tw\:list-none{list-style-type:none}.tw\:appearance-none{appearance:none}.tw\:grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.tw\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.tw\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.tw\:grid-cols-4{grid-template-columns:repeat(4,minmax(0,1fr))}.tw\:grid-cols-5{grid-template-columns:repeat(5,minmax(0,1fr))}.tw\:grid-cols-6{grid-template-columns:repeat(6,minmax(0,1fr))}.tw\:grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.tw\:grid-cols-\[min-content_min-content_1fr\]{grid-template-columns:min-content min-content 1fr}.tw\:flex-col{flex-direction:column}.tw\:flex-col-reverse{flex-direction:column-reverse}.tw\:flex-row{flex-direction:row}.tw\:flex-row-reverse{flex-direction:row-reverse}.tw\:flex-nowrap{flex-wrap:nowrap}.tw\:flex-wrap{flex-wrap:wrap}.tw\:place-items-center{place-items:center}.tw\:items-baseline{align-items:baseline}.tw\:items-center{align-items:center}.tw\:items-end{align-items:flex-end}.tw\:items-start{align-items:flex-start}.tw\:items-stretch{align-items:stretch}.tw\:justify-between{justify-content:space-between}.tw\:justify-center{justify-content:center}.tw\:justify-end{justify-content:flex-end}.tw\:justify-start{justify-content:flex-start}.tw\:gap-0\.5{gap:calc(var(--tw-spacing) * .5)}.tw\:gap-1{gap:var(--tw-spacing)}.tw\:gap-1\.5{gap:calc(var(--tw-spacing) * 1.5)}.tw\:gap-2{gap:calc(var(--tw-spacing) * 2)}.tw\:gap-2\.5{gap:calc(var(--tw-spacing) * 2.5)}.tw\:gap-3{gap:calc(var(--tw-spacing) * 3)}.tw\:gap-3\.5{gap:calc(var(--tw-spacing) * 3.5)}.tw\:gap-4{gap:calc(var(--tw-spacing) * 4)}.tw\:gap-5{gap:calc(var(--tw-spacing) * 5)}.tw\:gap-6{gap:calc(var(--tw-spacing) * 6)}.tw\:gap-\[0\.5em\]{gap:.5em}.tw\:gap-px{gap:1px}:where(.tw\:space-y-1>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(var(--tw-spacing) * var(--tw-space-y-reverse));margin-block-end:calc(var(--tw-spacing) * calc(1 - var(--tw-space-y-reverse)))}:where(.tw\:space-y-1\.5>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--tw-spacing) * 1.5) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--tw-spacing) * 1.5) * calc(1 - var(--tw-space-y-reverse)))}:where(.tw\:space-y-2>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--tw-spacing) * 2) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--tw-spacing) * 2) * calc(1 - var(--tw-space-y-reverse)))}:where(.tw\:space-y-2\.5>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--tw-spacing) * 2.5) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--tw-spacing) * 2.5) * calc(1 - var(--tw-space-y-reverse)))}:where(.tw\:space-y-3>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--tw-spacing) * 3) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--tw-spacing) * 3) * calc(1 - var(--tw-space-y-reverse)))}:where(.tw\:space-y-4>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--tw-spacing) * 4) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--tw-spacing) * 4) * calc(1 - var(--tw-space-y-reverse)))}:where(.tw\:space-y-5>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--tw-spacing) * 5) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--tw-spacing) * 5) * calc(1 - var(--tw-space-y-reverse)))}:where(.tw\:space-y-6>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--tw-spacing) * 6) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--tw-spacing) * 6) * calc(1 - var(--tw-space-y-reverse)))}:where(.tw\:space-y-\[1em\]>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(1em * var(--tw-space-y-reverse));margin-block-end:calc(1em * calc(1 - var(--tw-space-y-reverse)))}.tw\:gap-x-1{column-gap:var(--tw-spacing)}.tw\:gap-x-4{column-gap:calc(var(--tw-spacing) * 4)}.tw\:gap-x-6{column-gap:calc(var(--tw-spacing) * 6)}.tw\:gap-y-5{row-gap:calc(var(--tw-spacing) * 5)}:where(.tw\:divide-y>:not(:last-child)){--tw-divide-y-reverse:0;border-bottom-style:var(--tw-border-style);border-top-style:var(--tw-border-style);border-top-width:calc(1px * var(--tw-divide-y-reverse));border-bottom-width:calc(1px * calc(1 - var(--tw-divide-y-reverse)))}:where(.tw\:divide-gray-100>:not(:last-child)){border-color:var(--tw-color-gray-100)}:where(.tw\:divide-gray-300>:not(:last-child)){border-color:var(--tw-color-gray-300)}.tw\:self-start{align-self:flex-start}.tw\:self-stretch{align-self:stretch}.tw\:truncate{text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.tw\:overflow-auto{overflow:auto}.tw\:overflow-hidden{overflow:hidden}.tw\:overflow-x-auto{overflow-x:auto}.tw\:overflow-x-hidden{overflow-x:hidden}.tw\:overflow-y-auto{overflow-y:auto}.tw\:overflow-y-hidden{overflow-y:hidden}.tw\:rounded{border-radius:.25rem}.tw\:rounded-2xl{border-radius:var(--tw-radius-2xl)}.tw\:rounded-2xl\!{border-radius:var(--tw-radius-2xl)!important}.tw\:rounded-\[0\.6em\]{border-radius:.6em}.tw\:rounded-\[3px\]{border-radius:3px}.tw\:rounded-\[4px\]\!{border-radius:4px!important}.tw\:rounded-full{border-radius:2147483647px}.tw\:rounded-lg{border-radius:var(--tw-radius-lg)}.tw\:rounded-md{border-radius:var(--tw-radius-md)}.tw\:rounded-none{border-radius:0}.tw\:rounded-sm{border-radius:var(--tw-radius-sm)}.tw\:rounded-xl{border-radius:var(--tw-radius-xl)}.tw\:rounded-t-2xl{border-top-left-radius:var(--tw-radius-2xl);border-top-right-radius:var(--tw-radius-2xl)}.tw\:rounded-t-lg{border-top-left-radius:var(--tw-radius-lg);border-top-right-radius:var(--tw-radius-lg)}.tw\:rounded-l-lg{border-top-left-radius:var(--tw-radius-lg);border-bottom-left-radius:var(--tw-radius-lg)}.tw\:rounded-l-md{border-top-left-radius:var(--tw-radius-md);border-bottom-left-radius:var(--tw-radius-md)}.tw\:rounded-tl-lg{border-top-left-radius:var(--tw-radius-lg)}.tw\:rounded-r-md{border-top-right-radius:var(--tw-radius-md);border-bottom-right-radius:var(--tw-radius-md)}.tw\:rounded-r-none{border-top-right-radius:0;border-bottom-right-radius:0}.tw\:rounded-tr-lg{border-top-right-radius:var(--tw-radius-lg)}.tw\:rounded-b-2xl{border-bottom-right-radius:var(--tw-radius-2xl);border-bottom-left-radius:var(--tw-radius-2xl)}.tw\:rounded-br-lg{border-bottom-right-radius:var(--tw-radius-lg)}.tw\:rounded-bl-lg{border-bottom-left-radius:var(--tw-radius-lg)}.tw\:border{border-style:var(--tw-border-style);border-width:1px}.tw\:border-0{border-style:var(--tw-border-style);border-width:0}.tw\:border-2{border-style:var(--tw-border-style);border-width:2px}.tw\:border-t{border-top-style:var(--tw-border-style);border-top-width:1px}.tw\:border-t-0\.5{border-top-style:var(--tw-border-style);border-top-width:var(--tw-border-width-0_5)}.tw\:border-r{border-right-style:var(--tw-border-style);border-right-width:1px}.tw\:border-r-0\.5{border-right-style:var(--tw-border-style);border-right-width:var(--tw-border-width-0_5)}.tw\:border-b{border-bottom-style:var(--tw-border-style);border-bottom-width:1px}.tw\:border-b-0{border-bottom-style:var(--tw-border-style);border-bottom-width:0}.tw\:border-b-0\.5{border-bottom-style:var(--tw-border-style);border-bottom-width:var(--tw-border-width-0_5)}.tw\:border-b-2{border-bottom-style:var(--tw-border-style);border-bottom-width:2px}.tw\:border-l-4{border-left-style:var(--tw-border-style);border-left-width:4px}.tw\:border-l-5{border-left-style:var(--tw-border-style);border-left-width:5px}.tw\:border-l-8{border-left-style:var(--tw-border-style);border-left-width:8px}.tw\:border-dashed{--tw-border-style:dashed;border-style:dashed}.tw\:border-none{--tw-border-style:none;border-style:none}.tw\:border-solid{--tw-border-style:solid;border-style:solid}.tw\:border-amber-300{border-color:var(--tw-color-amber-300)}.tw\:border-amber-400{border-color:var(--tw-color-amber-400)}.tw\:border-amber-500{border-color:var(--tw-color-amber-500)}.tw\:border-black\/10{border-color:var(--tw-color-black)}@supports (color:color-mix(in lab, red, red)){.tw\:border-black\/10{border-color:color-mix(in oklab, var(--tw-color-black) 10%, transparent)}}.tw\:border-blue-200{border-color:var(--tw-color-blue-200)}.tw\:border-blue-500{border-color:var(--tw-color-blue-500)}.tw\:border-blue-600{border-color:var(--tw-color-blue-600)}.tw\:border-current{border-color:currentColor}.tw\:border-emerald-600{border-color:var(--tw-color-emerald-600)}.tw\:border-gray-100{border-color:var(--tw-color-gray-100)}.tw\:border-gray-200,.tw\:border-gray-200\/80{border-color:var(--tw-color-gray-200)}@supports (color:color-mix(in lab, red, red)){.tw\:border-gray-200\/80{border-color:color-mix(in oklab, var(--tw-color-gray-200) 80%, transparent)}}.tw\:border-gray-300{border-color:var(--tw-color-gray-300)}.tw\:border-gray-400{border-color:var(--tw-color-gray-400)}.tw\:border-gray-500{border-color:var(--tw-color-gray-500)}.tw\:border-green-200{border-color:var(--tw-color-green-200)}.tw\:border-green-600{border-color:var(--tw-color-green-600)}.tw\:border-neutral-100{border-color:var(--tw-color-neutral-100)}.tw\:border-neutral-200{border-color:var(--tw-color-neutral-200)}.tw\:border-neutral-300{border-color:var(--tw-color-neutral-300)}.tw\:border-red-100{border-color:var(--tw-color-red-100)}.tw\:border-red-200{border-color:var(--tw-color-red-200)}.tw\:border-red-300{border-color:var(--tw-color-red-300)}.tw\:border-red-500{border-color:var(--tw-color-red-500)}.tw\:border-red-600{border-color:var(--tw-color-red-600)}.tw\:border-slate-200{border-color:var(--tw-color-slate-200)}.tw\:border-transparent{border-color:#0000}.tw\:border-yellow-200{border-color:var(--tw-color-yellow-200)}.tw\:border-yellow-600{border-color:var(--tw-color-yellow-600)}.tw\:border-t-blue-600{border-top-color:var(--tw-color-blue-600)}.tw\:border-l-amber-500{border-left-color:var(--tw-color-amber-500)}.tw\:border-l-amber-500\!{border-left-color:var(--tw-color-amber-500)!important}.tw\:border-l-black\!{border-left-color:var(--tw-color-black)!important}.tw\:border-l-blue-500\!{border-left-color:var(--tw-color-blue-500)!important}.tw\:border-l-gray-400\!{border-left-color:var(--tw-color-gray-400)!important}.tw\:border-l-green-600{border-left-color:var(--tw-color-green-600)}.tw\:border-l-green-600\!{border-left-color:var(--tw-color-green-600)!important}.tw\:border-l-red-600{border-left-color:var(--tw-color-red-600)}.tw\:border-l-red-600\!{border-left-color:var(--tw-color-red-600)!important}.tw\:bg-\[\#3a3f44\]{background-color:#3a3f44}.tw\:bg-\[\#e9e9e9\]{background-color:#e9e9e9}.tw\:bg-amber-50{background-color:var(--tw-color-amber-50)}.tw\:bg-amber-100,.tw\:bg-amber-100\/90{background-color:var(--tw-color-amber-100)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-amber-100\/90{background-color:color-mix(in oklab, var(--tw-color-amber-100) 90%, transparent)}}.tw\:bg-amber-400{background-color:var(--tw-color-amber-400)}.tw\:bg-amber-500{background-color:var(--tw-color-amber-500)}.tw\:bg-black\/5{background-color:var(--tw-color-black)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-black\/5{background-color:color-mix(in oklab, var(--tw-color-black) 5%, transparent)}}.tw\:bg-black\/10{background-color:var(--tw-color-black)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-black\/10{background-color:color-mix(in oklab, var(--tw-color-black) 10%, transparent)}}.tw\:bg-black\/50{background-color:var(--tw-color-black)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-black\/50{background-color:color-mix(in oklab, var(--tw-color-black) 50%, transparent)}}.tw\:bg-black\/60{background-color:var(--tw-color-black)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-black\/60{background-color:color-mix(in oklab, var(--tw-color-black) 60%, transparent)}}.tw\:bg-blue-50,.tw\:bg-blue-50\/20{background-color:var(--tw-color-blue-50)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-blue-50\/20{background-color:color-mix(in oklab, var(--tw-color-blue-50) 20%, transparent)}}.tw\:bg-blue-50\/50{background-color:var(--tw-color-blue-50)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-blue-50\/50{background-color:color-mix(in oklab, var(--tw-color-blue-50) 50%, transparent)}}.tw\:bg-blue-50\/60{background-color:var(--tw-color-blue-50)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-blue-50\/60{background-color:color-mix(in oklab, var(--tw-color-blue-50) 60%, transparent)}}.tw\:bg-blue-50\/70{background-color:var(--tw-color-blue-50)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-blue-50\/70{background-color:color-mix(in oklab, var(--tw-color-blue-50) 70%, transparent)}}.tw\:bg-blue-100{background-color:var(--tw-color-blue-100)}.tw\:bg-blue-500{background-color:var(--tw-color-blue-500)}.tw\:bg-blue-600{background-color:var(--tw-color-blue-600)}.tw\:bg-current{background-color:currentColor}.tw\:bg-emerald-600{background-color:var(--tw-color-emerald-600)}.tw\:bg-gray-50,.tw\:bg-gray-50\/70{background-color:var(--tw-color-gray-50)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-gray-50\/70{background-color:color-mix(in oklab, var(--tw-color-gray-50) 70%, transparent)}}.tw\:bg-gray-100{background-color:var(--tw-color-gray-100)}.tw\:bg-gray-100\!{background-color:var(--tw-color-gray-100)!important}.tw\:bg-gray-100\/90{background-color:var(--tw-color-gray-100)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-gray-100\/90{background-color:color-mix(in oklab, var(--tw-color-gray-100) 90%, transparent)}}.tw\:bg-gray-200{background-color:var(--tw-color-gray-200)}.tw\:bg-gray-300{background-color:var(--tw-color-gray-300)}.tw\:bg-gray-500{background-color:var(--tw-color-gray-500)}.tw\:bg-green-50{background-color:var(--tw-color-green-50)}.tw\:bg-green-100{background-color:var(--tw-color-green-100)}.tw\:bg-green-400{background-color:var(--tw-color-green-400)}.tw\:bg-green-600{background-color:var(--tw-color-green-600)}.tw\:bg-neutral-50,.tw\:bg-neutral-50\/50{background-color:var(--tw-color-neutral-50)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-neutral-50\/50{background-color:color-mix(in oklab, var(--tw-color-neutral-50) 50%, transparent)}}.tw\:bg-neutral-100{background-color:var(--tw-color-neutral-100)}.tw\:bg-neutral-600{background-color:var(--tw-color-neutral-600)}.tw\:bg-neutral-950\/60{background-color:var(--tw-color-neutral-950)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-neutral-950\/60{background-color:color-mix(in oklab, var(--tw-color-neutral-950) 60%, transparent)}}.tw\:bg-orange-400{background-color:var(--tw-color-orange-400)}.tw\:bg-purple-100{background-color:var(--tw-color-purple-100)}.tw\:bg-red-50{background-color:var(--tw-color-red-50)}.tw\:bg-red-100{background-color:var(--tw-color-red-100)}.tw\:bg-red-500{background-color:var(--tw-color-red-500)}.tw\:bg-red-600{background-color:var(--tw-color-red-600)}.tw\:bg-slate-100{background-color:var(--tw-color-slate-100)}.tw\:bg-transparent{background-color:#0000}.tw\:bg-white{background-color:var(--tw-color-white)}.tw\:bg-white\!{background-color:var(--tw-color-white)!important}.tw\:bg-white\/25{background-color:var(--tw-color-white)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-white\/25{background-color:color-mix(in oklab, var(--tw-color-white) 25%, transparent)}}.tw\:bg-yellow-50{background-color:var(--tw-color-yellow-50)}.tw\:bg-yellow-100{background-color:var(--tw-color-yellow-100)}.tw\:object-contain{object-fit:contain}.tw\:object-cover{object-fit:cover}.tw\:p-0{padding:0}.tw\:p-0\!{padding:0!important}.tw\:p-0\.5{padding:calc(var(--tw-spacing) * .5)}.tw\:p-1{padding:var(--tw-spacing)}.tw\:p-2{padding:calc(var(--tw-spacing) * 2)}.tw\:p-2\.5{padding:calc(var(--tw-spacing) * 2.5)}.tw\:p-3{padding:calc(var(--tw-spacing) * 3)}.tw\:p-4{padding:calc(var(--tw-spacing) * 4)}.tw\:p-5{padding:calc(var(--tw-spacing) * 5)}.tw\:p-6{padding:calc(var(--tw-spacing) * 6)}.tw\:p-10{padding:calc(var(--tw-spacing) * 10)}.tw\:p-\[5px\]{padding:5px}.tw\:px-0{padding-inline:0}.tw\:px-1{padding-inline:var(--tw-spacing)}.tw\:px-1\.5{padding-inline:calc(var(--tw-spacing) * 1.5)}.tw\:px-2{padding-inline:calc(var(--tw-spacing) * 2)}.tw\:px-2\.5{padding-inline:calc(var(--tw-spacing) * 2.5)}.tw\:px-3{padding-inline:calc(var(--tw-spacing) * 3)}.tw\:px-3\.5{padding-inline:calc(var(--tw-spacing) * 3.5)}.tw\:px-4{padding-inline:calc(var(--tw-spacing) * 4)}.tw\:px-5{padding-inline:calc(var(--tw-spacing) * 5)}.tw\:px-6{padding-inline:calc(var(--tw-spacing) * 6)}.tw\:px-\[1\.2em\]{padding-inline:1.2em}.tw\:px-\[1em\]{padding-inline:1em}.tw\:px-\[5px\]{padding-inline:5px}.tw\:py-0{padding-block:0}.tw\:py-0\.5{padding-block:calc(var(--tw-spacing) * .5)}.tw\:py-1{padding-block:var(--tw-spacing)}.tw\:py-1\.5{padding-block:calc(var(--tw-spacing) * 1.5)}.tw\:py-2{padding-block:calc(var(--tw-spacing) * 2)}.tw\:py-2\.5{padding-block:calc(var(--tw-spacing) * 2.5)}.tw\:py-3{padding-block:calc(var(--tw-spacing) * 3)}.tw\:py-3\.5{padding-block:calc(var(--tw-spacing) * 3.5)}.tw\:py-4{padding-block:calc(var(--tw-spacing) * 4)}.tw\:py-5{padding-block:calc(var(--tw-spacing) * 5)}.tw\:py-8{padding-block:calc(var(--tw-spacing) * 8)}.tw\:py-10{padding-block:calc(var(--tw-spacing) * 10)}.tw\:py-12{padding-block:calc(var(--tw-spacing) * 12)}.tw\:py-16{padding-block:calc(var(--tw-spacing) * 16)}.tw\:py-\[0\.8em\]{padding-block:.8em}.tw\:py-\[5px\]{padding-block:5px}.tw\:pt-1\.5{padding-top:calc(var(--tw-spacing) * 1.5)}.tw\:pt-2{padding-top:calc(var(--tw-spacing) * 2)}.tw\:pt-2\.5{padding-top:calc(var(--tw-spacing) * 2.5)}.tw\:pt-3{padding-top:calc(var(--tw-spacing) * 3)}.tw\:pt-3\!{padding-top:calc(var(--tw-spacing) * 3)!important}.tw\:pt-6{padding-top:calc(var(--tw-spacing) * 6)}.tw\:pt-\[5px\]{padding-top:5px}.tw\:pr-1{padding-right:var(--tw-spacing)}.tw\:pr-2{padding-right:calc(var(--tw-spacing) * 2)}.tw\:pr-3{padding-right:calc(var(--tw-spacing) * 3)}.tw\:pr-5{padding-right:calc(var(--tw-spacing) * 5)}.tw\:pr-7{padding-right:calc(var(--tw-spacing) * 7)}.tw\:pr-8{padding-right:calc(var(--tw-spacing) * 8)}.tw\:pb-0{padding-bottom:0}.tw\:pb-0\!{padding-bottom:0!important}.tw\:pb-2{padding-bottom:calc(var(--tw-spacing) * 2)}.tw\:pb-3{padding-bottom:calc(var(--tw-spacing) * 3)}.tw\:pb-4{padding-bottom:calc(var(--tw-spacing) * 4)}.tw\:pb-5{padding-bottom:calc(var(--tw-spacing) * 5)}.tw\:pl-0\!{padding-left:0!important}.tw\:pl-2{padding-left:calc(var(--tw-spacing) * 2)}.tw\:pl-3{padding-left:calc(var(--tw-spacing) * 3)}.tw\:pl-5{padding-left:calc(var(--tw-spacing) * 5)}.tw\:pl-6{padding-left:calc(var(--tw-spacing) * 6)}.tw\:pl-9{padding-left:calc(var(--tw-spacing) * 9)}.tw\:pl-20{padding-left:calc(var(--tw-spacing) * 20)}.tw\:text-center{text-align:center}.tw\:text-left{text-align:left}.tw\:text-right{text-align:right}.tw\:align-middle{vertical-align:middle}.tw\:align-text-top{vertical-align:text-top}.tw\:font-mono{font-family:var(--tw-font-mono)}.tw\:text-2xl{font-size:var(--tw-text-2xl);line-height:var(--tw-leading,var(--tw-text-2xl--line-height))}.tw\:text-3xl{font-size:var(--tw-text-3xl);line-height:var(--tw-leading,var(--tw-text-3xl--line-height))}.tw\:text-4xl{font-size:var(--tw-text-4xl);line-height:var(--tw-leading,var(--tw-text-4xl--line-height))}.tw\:text-7xl{font-size:var(--tw-text-7xl);line-height:var(--tw-leading,var(--tw-text-7xl--line-height))}.tw\:text-base{font-size:var(--tw-text-base);line-height:var(--tw-leading,var(--tw-text-base--line-height))}.tw\:text-lg{font-size:var(--tw-text-lg);line-height:var(--tw-leading,var(--tw-text-lg--line-height))}.tw\:text-sm{font-size:var(--tw-text-sm);line-height:var(--tw-leading,var(--tw-text-sm--line-height))}.tw\:text-xl{font-size:var(--tw-text-xl);line-height:var(--tw-leading,var(--tw-text-xl--line-height))}.tw\:text-xs{font-size:var(--tw-text-xs);line-height:var(--tw-leading,var(--tw-text-xs--line-height))}.tw\:text-\[0\.5rem\]{font-size:.5rem}.tw\:text-\[0\.85em\]{font-size:.85em}.tw\:text-\[0\.95em\]{font-size:.95em}.tw\:text-\[9px\]{font-size:9px}.tw\:text-\[11px\]{font-size:11px}.tw\:leading-5{--tw-leading:calc(var(--tw-spacing) * 5);line-height:calc(var(--tw-spacing) * 5)}.tw\:leading-6{--tw-leading:calc(var(--tw-spacing) * 6);line-height:calc(var(--tw-spacing) * 6)}.tw\:leading-7{--tw-leading:calc(var(--tw-spacing) * 7);line-height:calc(var(--tw-spacing) * 7)}.tw\:leading-normal{--tw-leading:var(--tw-leading-normal);line-height:var(--tw-leading-normal)}.tw\:leading-tight{--tw-leading:var(--tw-leading-tight);line-height:var(--tw-leading-tight)}.tw\:font-bold{--tw-font-weight:var(--tw-font-weight-bold);font-weight:var(--tw-font-weight-bold)}.tw\:font-medium{--tw-font-weight:var(--tw-font-weight-medium);font-weight:var(--tw-font-weight-medium)}.tw\:font-normal{--tw-font-weight:var(--tw-font-weight-normal);font-weight:var(--tw-font-weight-normal)}.tw\:font-semibold{--tw-font-weight:var(--tw-font-weight-semibold);font-weight:var(--tw-font-weight-semibold)}.tw\:tracking-tight{--tw-tracking:var(--tw-tracking-tight);letter-spacing:var(--tw-tracking-tight)}.tw\:tracking-wider{--tw-tracking:var(--tw-tracking-wider);letter-spacing:var(--tw-tracking-wider)}.tw\:text-nowrap{text-wrap:nowrap}.tw\:text-pretty{text-wrap:pretty}.tw\:break-words{overflow-wrap:break-word}.tw\:break-all{word-break:break-all}.tw\:text-ellipsis{text-overflow:ellipsis}.tw\:whitespace-nowrap{white-space:nowrap}.tw\:whitespace-pre-wrap{white-space:pre-wrap}.tw\:text-\[\#5cb85c\]{color:#5cb85c}.tw\:text-\[\#337ab7\]{color:#337ab7}.tw\:text-\[\#a94442\]{color:#a94442}.tw\:text-amber-600{color:var(--tw-color-amber-600)}.tw\:text-amber-700{color:var(--tw-color-amber-700)}.tw\:text-amber-800{color:var(--tw-color-amber-800)}.tw\:text-blue-200{color:var(--tw-color-blue-200)}.tw\:text-blue-500,.tw\:text-blue-500\/50{color:var(--tw-color-blue-500)}@supports (color:color-mix(in lab, red, red)){.tw\:text-blue-500\/50{color:color-mix(in oklab, var(--tw-color-blue-500) 50%, transparent)}}.tw\:text-blue-600{color:var(--tw-color-blue-600)}.tw\:text-blue-600\!{color:var(--tw-color-blue-600)!important}.tw\:text-blue-800{color:var(--tw-color-blue-800)}.tw\:text-blue-900{color:var(--tw-color-blue-900)}.tw\:text-current{color:currentColor}.tw\:text-gray-300{color:var(--tw-color-gray-300)}.tw\:text-gray-400{color:var(--tw-color-gray-400)}.tw\:text-gray-500{color:var(--tw-color-gray-500)}.tw\:text-gray-500\!{color:var(--tw-color-gray-500)!important}.tw\:text-gray-600{color:var(--tw-color-gray-600)}.tw\:text-gray-700{color:var(--tw-color-gray-700)}.tw\:text-gray-800{color:var(--tw-color-gray-800)}.tw\:text-gray-900{color:var(--tw-color-gray-900)}.tw\:text-green-400{color:var(--tw-color-green-400)}.tw\:text-green-600{color:var(--tw-color-green-600)}.tw\:text-green-700{color:var(--tw-color-green-700)}.tw\:text-green-800{color:var(--tw-color-green-800)}.tw\:text-inherit{color:inherit}.tw\:text-inherit\!{color:inherit!important}.tw\:text-neutral-400{color:var(--tw-color-neutral-400)}.tw\:text-neutral-400\!{color:var(--tw-color-neutral-400)!important}.tw\:text-neutral-500{color:var(--tw-color-neutral-500)}.tw\:text-neutral-500\!{color:var(--tw-color-neutral-500)!important}.tw\:text-neutral-600\!{color:var(--tw-color-neutral-600)!important}.tw\:text-neutral-700{color:var(--tw-color-neutral-700)}.tw\:text-neutral-700\!{color:var(--tw-color-neutral-700)!important}.tw\:text-neutral-900\!{color:var(--tw-color-neutral-900)!important}.tw\:text-orange-400{color:var(--tw-color-orange-400)}.tw\:text-orange-600{color:var(--tw-color-orange-600)}.tw\:text-purple-800{color:var(--tw-color-purple-800)}.tw\:text-red-200{color:var(--tw-color-red-200)}.tw\:text-red-500{color:var(--tw-color-red-500)}.tw\:text-red-600{color:var(--tw-color-red-600)}.tw\:text-red-600\!{color:var(--tw-color-red-600)!important}.tw\:text-red-700{color:var(--tw-color-red-700)}.tw\:text-red-800{color:var(--tw-color-red-800)}.tw\:text-slate-300{color:var(--tw-color-slate-300)}.tw\:text-slate-400{color:var(--tw-color-slate-400)}.tw\:text-slate-500{color:var(--tw-color-slate-500)}.tw\:text-slate-700{color:var(--tw-color-slate-700)}.tw\:text-slate-800{color:var(--tw-color-slate-800)}.tw\:text-white{color:var(--tw-color-white)}.tw\:text-white\!{color:var(--tw-color-white)!important}.tw\:text-yellow-600{color:var(--tw-color-yellow-600)}.tw\:text-yellow-800{color:var(--tw-color-yellow-800)}.tw\:capitalize{text-transform:capitalize}.tw\:uppercase{text-transform:uppercase}.tw\:italic{font-style:italic}.tw\:line-through{text-decoration-line:line-through}.tw\:no-underline{text-decoration-line:none}.tw\:no-underline\!{text-decoration-line:none!important}.tw\:underline{text-decoration-line:underline}.tw\:opacity-0{opacity:0}.tw\:opacity-25{opacity:.25}.tw\:opacity-30{opacity:.3}.tw\:opacity-50{opacity:.5}.tw\:opacity-60{opacity:.6}.tw\:opacity-70{opacity:.7}.tw\:opacity-75{opacity:.75}.tw\:opacity-80{opacity:.8}.tw\:opacity-90{opacity:.9}.tw\:opacity-100{opacity:1}.tw\:shadow-2xl{--tw-shadow:0 25px 50px -12px var(--tw-shadow-color,#00000040);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:shadow-2xs{--tw-shadow:0 1px var(--tw-shadow-color,#0000000d);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:shadow-lg{--tw-shadow:0 10px 15px -3px var(--tw-shadow-color,#0000001a), 0 4px 6px -4px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:shadow-md{--tw-shadow:0 4px 6px -1px var(--tw-shadow-color,#0000001a), 0 2px 4px -2px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:shadow-sm{--tw-shadow:0 1px 3px 0 var(--tw-shadow-color,#0000001a), 0 1px 2px -1px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:shadow-xl{--tw-shadow:0 20px 25px -5px var(--tw-shadow-color,#0000001a), 0 8px 10px -6px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:shadow-xs{--tw-shadow:0 1px 2px 0 var(--tw-shadow-color,#0000000d);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:ring,.tw\:ring-1{--tw-ring-shadow:var(--tw-ring-inset,) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color,currentcolor);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:ring-2{--tw-ring-shadow:var(--tw-ring-inset,) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color,currentcolor);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:ring-4{--tw-ring-shadow:var(--tw-ring-inset,) 0 0 0 calc(4px + var(--tw-ring-offset-width)) var(--tw-ring-color,currentcolor);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:inset-shadow-sm\/10{--tw-inset-shadow-alpha:10%;--tw-inset-shadow:inset 0 2px 4px var(--tw-inset-shadow-color,oklab(0% 0 0/.1));box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:ring-blue-100{--tw-ring-color:var(--tw-color-blue-100)}.tw\:ring-emerald-100{--tw-ring-color:var(--tw-color-emerald-100)}.tw\:ring-gray-200{--tw-ring-color:var(--tw-color-gray-200)}.tw\:ring-gray-300{--tw-ring-color:var(--tw-color-gray-300)}.tw\:ring-green-500{--tw-ring-color:var(--tw-color-green-500)}.tw\:ring-red-100{--tw-ring-color:var(--tw-color-red-100)}.tw\:ring-red-400{--tw-ring-color:var(--tw-color-red-400)}.tw\:ring-red-500{--tw-ring-color:var(--tw-color-red-500)}.tw\:ring-white{--tw-ring-color:var(--tw-color-white)}.tw\:backdrop-blur-xs{--tw-backdrop-blur:blur(var(--tw-blur-xs));-webkit-backdrop-filter:var(--tw-backdrop-blur,) var(--tw-backdrop-brightness,) var(--tw-backdrop-contrast,) var(--tw-backdrop-grayscale,) var(--tw-backdrop-hue-rotate,) var(--tw-backdrop-invert,) var(--tw-backdrop-opacity,) var(--tw-backdrop-saturate,) var(--tw-backdrop-sepia,);backdrop-filter:var(--tw-backdrop-blur,) var(--tw-backdrop-brightness,) var(--tw-backdrop-contrast,) var(--tw-backdrop-grayscale,) var(--tw-backdrop-hue-rotate,) var(--tw-backdrop-invert,) var(--tw-backdrop-opacity,) var(--tw-backdrop-saturate,) var(--tw-backdrop-sepia,)}.tw\:transition{transition-property:color,background-color,border-color,outline-color,text-decoration-color,fill,stroke,--tw-gradient-from,--tw-gradient-via,--tw-gradient-to,opacity,box-shadow,transform,translate,scale,rotate,filter,-webkit-backdrop-filter,backdrop-filter,display,content-visibility,overlay,pointer-events;transition-timing-function:var(--tw-ease,var(--tw-default-transition-timing-function));transition-duration:var(--tw-duration,var(--tw-default-transition-duration))}.tw\:transition-all{transition-property:all;transition-timing-function:var(--tw-ease,var(--tw-default-transition-timing-function));transition-duration:var(--tw-duration,var(--tw-default-transition-duration))}.tw\:transition-colors{transition-property:color,background-color,border-color,outline-color,text-decoration-color,fill,stroke,--tw-gradient-from,--tw-gradient-via,--tw-gradient-to;transition-timing-function:var(--tw-ease,var(--tw-default-transition-timing-function));transition-duration:var(--tw-duration,var(--tw-default-transition-duration))}.tw\:transition-opacity{transition-property:opacity;transition-timing-function:var(--tw-ease,var(--tw-default-transition-timing-function));transition-duration:var(--tw-duration,var(--tw-default-transition-duration))}.tw\:transition-transform{transition-property:transform,translate,scale,rotate;transition-timing-function:var(--tw-ease,var(--tw-default-transition-timing-function));transition-duration:var(--tw-duration,var(--tw-default-transition-duration))}.tw\:duration-75{--tw-duration:75ms;transition-duration:75ms}.tw\:duration-150{--tw-duration:.15s;transition-duration:.15s}.tw\:duration-200{--tw-duration:.2s;transition-duration:.2s}.tw\:duration-300{--tw-duration:.3s;transition-duration:.3s}.tw\:duration-700{--tw-duration:.7s;transition-duration:.7s}.tw\:ease-in{--tw-ease:var(--tw-ease-in);transition-timing-function:var(--tw-ease-in)}.tw\:ease-in-out{--tw-ease:var(--tw-ease-in-out);transition-timing-function:var(--tw-ease-in-out)}.tw\:ease-out{--tw-ease:var(--tw-ease-out);transition-timing-function:var(--tw-ease-out)}.tw\:outline-none{--tw-outline-style:none;outline-style:none}.tw\:select-none{-webkit-user-select:none;user-select:none}:is(.tw\:\*\:px-3>*){padding-inline:calc(var(--tw-spacing) * 3)}:is(.tw\:\*\:py-2>*){padding-block:calc(var(--tw-spacing) * 2)}:is(.tw\:\*\:font-semibold>*){--tw-font-weight:var(--tw-font-weight-semibold);font-weight:var(--tw-font-weight-semibold)}:is(.tw\:\*\:whitespace-nowrap>*){white-space:nowrap}.tw\:not-first\:border-l:not(:first-child){border-left-style:var(--tw-border-style);border-left-width:1px}@media (hover:hover){.tw\:group-hover\:w-10:is(:where(.tw\:group):hover *){width:calc(var(--tw-spacing) * 10)}.tw\:group-hover\:text-blue-600:is(:where(.tw\:group):hover *){color:var(--tw-color-blue-600)}}.tw\:group-has-\[\.filter-chip\:hover\]\/bar\:w-0:is(:where(.tw\:group\/bar):has(.filter-chip:hover) *){width:0}.tw\:peer-checked\:translate-x-4:is(:where(.tw\:peer):checked~*){--tw-translate-x:calc(var(--tw-spacing) * 4);translate:var(--tw-translate-x) var(--tw-translate-y)}.tw\:peer-checked\:translate-x-5:is(:where(.tw\:peer):checked~*){--tw-translate-x:calc(var(--tw-spacing) * 5);translate:var(--tw-translate-x) var(--tw-translate-y)}.tw\:peer-checked\:bg-blue-600:is(:where(.tw\:peer):checked~*){background-color:var(--tw-color-blue-600)}.tw\:peer-focus-visible\:ring-2:is(:where(.tw\:peer):focus-visible~*){--tw-ring-shadow:var(--tw-ring-inset,) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color,currentcolor);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:peer-focus-visible\:ring-blue-400:is(:where(.tw\:peer):focus-visible~*){--tw-ring-color:var(--tw-color-blue-400)}.tw\:peer-focus-visible\:ring-offset-2:is(:where(.tw\:peer):focus-visible~*){--tw-ring-offset-width:2px;--tw-ring-offset-shadow:var(--tw-ring-inset,) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color)}.tw\:peer-disabled\:cursor-not-allowed:is(:where(.tw\:peer):disabled~*){cursor:not-allowed}.tw\:peer-disabled\:opacity-50:is(:where(.tw\:peer):disabled~*){opacity:.5}.tw\:even\:bg-gray-50:nth-child(2n){background-color:var(--tw-color-gray-50)}.tw\:visited\:text-blue-900:visited{color:var(--tw-color-blue-900)}.tw\:visited\:text-gray-500\!:visited{color:var(--tw-color-gray-500)!important}.tw\:visited\:text-red-600:visited{color:var(--tw-color-red-600)}@media (hover:hover){.tw\:hover\:border-gray-300:hover{border-color:var(--tw-color-gray-300)}.tw\:hover\:border-gray-400:hover{border-color:var(--tw-color-gray-400)}.tw\:hover\:border-gray-500:hover{border-color:var(--tw-color-gray-500)}.tw\:hover\:bg-amber-50:hover{background-color:var(--tw-color-amber-50)}.tw\:hover\:bg-blue-50:hover{background-color:var(--tw-color-blue-50)}.tw\:hover\:bg-blue-600:hover{background-color:var(--tw-color-blue-600)}.tw\:hover\:bg-blue-700:hover{background-color:var(--tw-color-blue-700)}.tw\:hover\:bg-emerald-700:hover{background-color:var(--tw-color-emerald-700)}.tw\:hover\:bg-gray-50:hover{background-color:var(--tw-color-gray-50)}.tw\:hover\:bg-gray-100:hover{background-color:var(--tw-color-gray-100)}.tw\:hover\:bg-gray-200:hover{background-color:var(--tw-color-gray-200)}.tw\:hover\:bg-gray-200\!:hover{background-color:var(--tw-color-gray-200)!important}.tw\:hover\:bg-gray-500:hover{background-color:var(--tw-color-gray-500)}.tw\:hover\:bg-neutral-50:hover{background-color:var(--tw-color-neutral-50)}.tw\:hover\:bg-neutral-100:hover{background-color:var(--tw-color-neutral-100)}.tw\:hover\:bg-red-50:hover{background-color:var(--tw-color-red-50)}.tw\:hover\:bg-red-700:hover{background-color:var(--tw-color-red-700)}.tw\:hover\:text-blue-600:hover{color:var(--tw-color-blue-600)}.tw\:hover\:text-blue-800:hover{color:var(--tw-color-blue-800)}.tw\:hover\:text-gray-100:hover{color:var(--tw-color-gray-100)}.tw\:hover\:text-gray-400:hover{color:var(--tw-color-gray-400)}.tw\:hover\:text-gray-500:hover{color:var(--tw-color-gray-500)}.tw\:hover\:text-gray-700:hover{color:var(--tw-color-gray-700)}.tw\:hover\:text-gray-800:hover{color:var(--tw-color-gray-800)}.tw\:hover\:text-neutral-900\!:hover{color:var(--tw-color-neutral-900)!important}.tw\:hover\:text-red-500:hover{color:var(--tw-color-red-500)}.tw\:hover\:text-red-500\!:hover{color:var(--tw-color-red-500)!important}.tw\:hover\:text-red-600\!:hover{color:var(--tw-color-red-600)!important}.tw\:hover\:text-red-700\!:hover{color:var(--tw-color-red-700)!important}.tw\:hover\:text-white:hover{color:var(--tw-color-white)}.tw\:hover\:no-underline:hover{text-decoration-line:none}.tw\:hover\:underline:hover{text-decoration-line:underline}.tw\:hover\:opacity-100:hover{opacity:1}.tw\:hover\:shadow-xl:hover{--tw-shadow:0 20px 25px -5px var(--tw-shadow-color,#0000001a), 0 8px 10px -6px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}}.tw\:focus\:z-10:focus{z-index:10}.tw\:focus\:border-blue-300:focus{border-color:var(--tw-color-blue-300)}.tw\:focus\:border-blue-500:focus{border-color:var(--tw-color-blue-500)}.tw\:focus\:ring:focus{--tw-ring-shadow:var(--tw-ring-inset,) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color,currentcolor);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:focus\:ring-2:focus{--tw-ring-shadow:var(--tw-ring-inset,) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color,currentcolor);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:focus\:ring-\[\#337ab7\]:focus{--tw-ring-color:#337ab7}.tw\:focus\:ring-blue-500:focus,.tw\:focus\:ring-blue-500\/50:focus{--tw-ring-color:var(--tw-color-blue-500)}@supports (color:color-mix(in lab, red, red)){.tw\:focus\:ring-blue-500\/50:focus{--tw-ring-color:color-mix(in oklab, var(--tw-color-blue-500) 50%, transparent)}}.tw\:focus\:outline-hidden:focus{--tw-outline-style:none;outline-style:none}@media (forced-colors:active){.tw\:focus\:outline-hidden:focus{outline-offset:2px;outline:2px solid #0000}}.tw\:focus\:outline-none:focus{--tw-outline-style:none;outline-style:none}.tw\:active\:scale-95:active{--tw-scale-x:95%;--tw-scale-y:95%;--tw-scale-z:95%;scale:var(--tw-scale-x) var(--tw-scale-y)}.tw\:active\:bg-gray-100:active{background-color:var(--tw-color-gray-100)}.tw\:active\:text-gray-500:active{color:var(--tw-color-gray-500)}.tw\:active\:text-gray-700:active{color:var(--tw-color-gray-700)}.tw\:disabled\:cursor-not-allowed:disabled{cursor:not-allowed}.tw\:disabled\:opacity-20:disabled{opacity:.2}.tw\:disabled\:opacity-40:disabled{opacity:.4}.tw\:disabled\:opacity-50:disabled{opacity:.5}.tw\:has-checked\:border-blue-500:has(:checked){border-color:var(--tw-color-blue-500)}.tw\:has-checked\:bg-blue-50\/50:has(:checked){background-color:var(--tw-color-blue-50)}@supports (color:color-mix(in lab, red, red)){.tw\:has-checked\:bg-blue-50\/50:has(:checked){background-color:color-mix(in oklab, var(--tw-color-blue-50) 50%, transparent)}}@media not all and (width>=768px){.tw\:max-md\:absolute{position:absolute}.tw\:max-md\:relative{position:relative}.tw\:max-md\:top-3\.5{top:calc(var(--tw-spacing) * 3.5)}.tw\:max-md\:left-4{left:calc(var(--tw-spacing) * 4)}.tw\:max-md\:col-span-2{grid-column:span 2/span 2}.tw\:max-md\:block{display:block}.tw\:max-md\:flex{display:flex}.tw\:max-md\:grid{display:grid}.tw\:max-md\:hidden{display:none}.tw\:max-md\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.tw\:max-md\:gap-3{gap:calc(var(--tw-spacing) * 3)}.tw\:max-md\:px-4{padding-inline:calc(var(--tw-spacing) * 4)}.tw\:max-md\:py-3{padding-block:calc(var(--tw-spacing) * 3)}.tw\:max-md\:pl-11{padding-left:calc(var(--tw-spacing) * 11)}:is(.tw\:max-md\:\*\:p-0>*){padding:0}}@media not all and (width>=576px){.tw\:max-sm\:left-0{left:0}.tw\:max-sm\:w-full{width:100%}}@media (width>=576px){.tw\:sm\:mx-10{margin-inline:calc(var(--tw-spacing) * 10)}.tw\:sm\:block{display:block}.tw\:sm\:flex{display:flex}.tw\:sm\:hidden{display:none}.tw\:sm\:inline{display:inline}.tw\:sm\:inline-block{display:inline-block}.tw\:sm\:table-cell{display:table-cell}.tw\:sm\:h-10{height:calc(var(--tw-spacing) * 10)}.tw\:sm\:w-auto{width:auto}.tw\:sm\:flex-1{flex:1}.tw\:sm\:shrink-0{flex-shrink:0}.tw\:sm\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.tw\:sm\:flex-row{flex-direction:row}.tw\:sm\:items-center{align-items:center}.tw\:sm\:justify-between{justify-content:space-between}.tw\:sm\:rounded-l-lg{border-top-left-radius:var(--tw-radius-lg);border-bottom-left-radius:var(--tw-radius-lg)}.tw\:sm\:rounded-r-lg{border-top-right-radius:var(--tw-radius-lg);border-bottom-right-radius:var(--tw-radius-lg)}.tw\:sm\:rounded-tr-none{border-top-right-radius:0}.tw\:sm\:rounded-bl-none{border-bottom-left-radius:0}.tw\:sm\:border-r{border-right-style:var(--tw-border-style);border-right-width:1px}.tw\:sm\:border-b-0{border-bottom-style:var(--tw-border-style);border-bottom-width:0}.tw\:sm\:px-6{padding-inline:calc(var(--tw-spacing) * 6)}.tw\:sm\:py-0{padding-block:0}.tw\:sm\:break-normal{overflow-wrap:normal;word-break:normal}}@media (width>=768px){.tw\:md\:hidden{display:none}.tw\:md\:inline-block{display:inline-block}.tw\:md\:table-cell{display:table-cell}.tw\:md\:w-1\/4{width:25%}.tw\:md\:w-3\/4{width:75%}.tw\:md\:min-w-md{min-width:var(--tw-container-md)}.tw\:md\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.tw\:md\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.tw\:md\:flex-row{flex-direction:row}}@media (width>=992px){.tw\:lg\:sticky{position:sticky}.tw\:lg\:top-4{top:calc(var(--tw-spacing) * 4)}.tw\:lg\:top-\[calc\(52px\+1rem\)\]{top:calc(52px + 1rem)}.tw\:lg\:flex{display:flex}.tw\:lg\:hidden{display:none}.tw\:lg\:inline-block{display:inline-block}.tw\:lg\:max-h-\[70vh\]{max-height:70vh}.tw\:lg\:w-md{width:var(--tw-container-md)}.tw\:lg\:shrink-0{flex-shrink:0}.tw\:lg\:grid-cols-4{grid-template-columns:repeat(4,minmax(0,1fr))}.tw\:lg\:flex-row{flex-direction:row}}@media (width>=1200px){.tw\:xl\:hidden{display:none}.tw\:xl\:inline{display:inline}.tw\:xl\:inline-block{display:inline-block}}@media (width>=1440px){.tw\:2xl\:hidden{display:none}.tw\:2xl\:inline-block{display:inline-block}}.tw\:rtl\:flex-row-reverse:where(:is(:lang(ae),:lang(ar),:lang(arc),:lang(bcc),:lang(bqi),:lang(ckb),:lang(dv),:lang(fa),:lang(glk),:lang(he),:lang(ku),:lang(mzn),:lang(nqo),:lang(pnb),:lang(ps),:lang(sd),:lang(ug),:lang(ur),:lang(yi)),[dir=rtl],[dir=rtl] *){flex-direction:row-reverse}:where(.tw\:dark\:divide-dark-gray-300:where(.dark,.dark *)>:not(:last-child)){border-color:var(--tw-color-dark-gray-300)}:where(.tw\:dark\:divide-zinc-800:where(.dark,.dark *)>:not(:last-child)){border-color:var(--tw-color-zinc-800)}.tw\:dark\:rounded:where(.dark,.dark *){border-radius:.25rem}.tw\:dark\:rounded-lg:where(.dark,.dark *){border-radius:var(--tw-radius-lg)}.tw\:dark\:border-amber-600:where(.dark,.dark *){border-color:var(--tw-color-amber-600)}.tw\:dark\:border-amber-700:where(.dark,.dark *){border-color:var(--tw-color-amber-700)}.tw\:dark\:border-black\/60:where(.dark,.dark *){border-color:var(--tw-color-black)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:border-black\/60:where(.dark,.dark *){border-color:color-mix(in oklab, var(--tw-color-black) 60%, transparent)}}.tw\:dark\:border-blue-400:where(.dark,.dark *){border-color:var(--tw-color-blue-400)}.tw\:dark\:border-blue-500:where(.dark,.dark *){border-color:var(--tw-color-blue-500)}.tw\:dark\:border-blue-700:where(.dark,.dark *){border-color:var(--tw-color-blue-700)}.tw\:dark\:border-blue-800:where(.dark,.dark *){border-color:var(--tw-color-blue-800)}.tw\:dark\:border-blue-900:where(.dark,.dark *){border-color:var(--tw-color-blue-900)}.tw\:dark\:border-dark-gray-100:where(.dark,.dark *){border-color:var(--tw-color-dark-gray-100)}.tw\:dark\:border-dark-gray-200:where(.dark,.dark *){border-color:var(--tw-color-dark-gray-200)}.tw\:dark\:border-dark-gray-300:where(.dark,.dark *){border-color:var(--tw-color-dark-gray-300)}.tw\:dark\:border-dark-gray-400:where(.dark,.dark *),.tw\:dark\:border-dark-gray-400\/80:where(.dark,.dark *){border-color:var(--tw-color-dark-gray-400)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:border-dark-gray-400\/80:where(.dark,.dark *){border-color:color-mix(in oklab, var(--tw-color-dark-gray-400) 80%, transparent)}}.tw\:dark\:border-gray-600:where(.dark,.dark *){border-color:var(--tw-color-gray-600)}.tw\:dark\:border-gray-700:where(.dark,.dark *){border-color:var(--tw-color-gray-700)}.tw\:dark\:border-green-600:where(.dark,.dark *){border-color:var(--tw-color-green-600)}.tw\:dark\:border-green-700:where(.dark,.dark *){border-color:var(--tw-color-green-700)}.tw\:dark\:border-green-900:where(.dark,.dark *){border-color:var(--tw-color-green-900)}.tw\:dark\:border-red-500:where(.dark,.dark *){border-color:var(--tw-color-red-500)}.tw\:dark\:border-red-700:where(.dark,.dark *){border-color:var(--tw-color-red-700)}.tw\:dark\:border-red-800:where(.dark,.dark *){border-color:var(--tw-color-red-800)}.tw\:dark\:border-red-900:where(.dark,.dark *){border-color:var(--tw-color-red-900)}.tw\:dark\:border-yellow-800:where(.dark,.dark *){border-color:var(--tw-color-yellow-800)}.tw\:dark\:border-zinc-800:where(.dark,.dark *){border-color:var(--tw-color-zinc-800)}.tw\:dark\:bg-\[\#3e444c\]:where(.dark,.dark *){background-color:#3e444c}.tw\:dark\:bg-amber-900\/50:where(.dark,.dark *){background-color:var(--tw-color-amber-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-amber-900\/50:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-amber-900) 50%, transparent)}}.tw\:dark\:bg-amber-950\/40:where(.dark,.dark *){background-color:var(--tw-color-amber-950)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-amber-950\/40:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-amber-950) 40%, transparent)}}.tw\:dark\:bg-black\/40:where(.dark,.dark *){background-color:var(--tw-color-black)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-black\/40:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-black) 40%, transparent)}}.tw\:dark\:bg-blue-400:where(.dark,.dark *){background-color:var(--tw-color-blue-400)}.tw\:dark\:bg-blue-600:where(.dark,.dark *){background-color:var(--tw-color-blue-600)}.tw\:dark\:bg-blue-700:where(.dark,.dark *){background-color:var(--tw-color-blue-700)}.tw\:dark\:bg-blue-900\/20:where(.dark,.dark *){background-color:var(--tw-color-blue-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-blue-900\/20:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-blue-900) 20%, transparent)}}.tw\:dark\:bg-blue-900\/30:where(.dark,.dark *){background-color:var(--tw-color-blue-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-blue-900\/30:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-blue-900) 30%, transparent)}}.tw\:dark\:bg-blue-950:where(.dark,.dark *),.tw\:dark\:bg-blue-950\/30:where(.dark,.dark *){background-color:var(--tw-color-blue-950)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-blue-950\/30:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-blue-950) 30%, transparent)}}.tw\:dark\:bg-blue-950\/40:where(.dark,.dark *){background-color:var(--tw-color-blue-950)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-blue-950\/40:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-blue-950) 40%, transparent)}}.tw\:dark\:bg-dark-gray-100:where(.dark,.dark *){background-color:var(--tw-color-dark-gray-100)}.tw\:dark\:bg-dark-gray-200:where(.dark,.dark *){background-color:var(--tw-color-dark-gray-200)}.tw\:dark\:bg-dark-gray-300:where(.dark,.dark *){background-color:var(--tw-color-dark-gray-300)}.tw\:dark\:bg-dark-gray-300\!:where(.dark,.dark *){background-color:var(--tw-color-dark-gray-300)!important}.tw\:dark\:bg-dark-gray-400:where(.dark,.dark *),.tw\:dark\:bg-dark-gray-400\/90:where(.dark,.dark *){background-color:var(--tw-color-dark-gray-400)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-dark-gray-400\/90:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-dark-gray-400) 90%, transparent)}}.tw\:dark\:bg-dark-gray-500:where(.dark,.dark *){background-color:var(--tw-color-dark-gray-500)}.tw\:dark\:bg-dark-white-300:where(.dark,.dark *){background-color:var(--tw-color-dark-white-300)}.tw\:dark\:bg-gray-50:where(.dark,.dark *){background-color:var(--tw-color-gray-50)}.tw\:dark\:bg-gray-700:where(.dark,.dark *){background-color:var(--tw-color-gray-700)}.tw\:dark\:bg-gray-800:where(.dark,.dark *){background-color:var(--tw-color-gray-800)}.tw\:dark\:bg-green-900\/30:where(.dark,.dark *){background-color:var(--tw-color-green-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-green-900\/30:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-green-900) 30%, transparent)}}.tw\:dark\:bg-green-900\/40:where(.dark,.dark *){background-color:var(--tw-color-green-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-green-900\/40:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-green-900) 40%, transparent)}}.tw\:dark\:bg-green-950\/40:where(.dark,.dark *){background-color:var(--tw-color-green-950)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-green-950\/40:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-green-950) 40%, transparent)}}.tw\:dark\:bg-purple-900\/60:where(.dark,.dark *){background-color:var(--tw-color-purple-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-purple-900\/60:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-purple-900) 60%, transparent)}}.tw\:dark\:bg-red-900\/30:where(.dark,.dark *){background-color:var(--tw-color-red-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-red-900\/30:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-red-900) 30%, transparent)}}.tw\:dark\:bg-red-900\/30\!:where(.dark,.dark *){background-color:var(--tw-color-red-900)!important}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-red-900\/30\!:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-red-900) 30%, transparent)!important}}.tw\:dark\:bg-red-900\/40:where(.dark,.dark *){background-color:var(--tw-color-red-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-red-900\/40:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-red-900) 40%, transparent)}}.tw\:dark\:bg-transparent:where(.dark,.dark *){background-color:#0000}.tw\:dark\:bg-white\!:where(.dark,.dark *){background-color:var(--tw-color-white)!important}.tw\:dark\:bg-yellow-900\/40:where(.dark,.dark *){background-color:var(--tw-color-yellow-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-yellow-900\/40:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-yellow-900) 40%, transparent)}}.tw\:dark\:p-0\.5:where(.dark,.dark *){padding:calc(var(--tw-spacing) * .5)}.tw\:dark\:p-2:where(.dark,.dark *){padding:calc(var(--tw-spacing) * 2)}.tw\:dark\:text-\[\#ee5f5b\]:where(.dark,.dark *){color:#ee5f5b}.tw\:dark\:text-amber-200:where(.dark,.dark *){color:var(--tw-color-amber-200)}.tw\:dark\:text-amber-300:where(.dark,.dark *){color:var(--tw-color-amber-300)}.tw\:dark\:text-amber-400:where(.dark,.dark *){color:var(--tw-color-amber-400)}.tw\:dark\:text-blue-400:where(.dark,.dark *){color:var(--tw-color-blue-400)}.tw\:dark\:text-blue-400\!:where(.dark,.dark *){color:var(--tw-color-blue-400)!important}.tw\:dark\:text-blue-500:where(.dark,.dark *){color:var(--tw-color-blue-500)}.tw\:dark\:text-dark-gray-100:where(.dark,.dark *){color:var(--tw-color-dark-gray-100)}.tw\:dark\:text-dark-gray-300:where(.dark,.dark *){color:var(--tw-color-dark-gray-300)}.tw\:dark\:text-dark-gray-400:where(.dark,.dark *){color:var(--tw-color-dark-gray-400)}.tw\:dark\:text-dark-white-100:where(.dark,.dark *){color:var(--tw-color-dark-white-100)}.tw\:dark\:text-dark-white-100\!:where(.dark,.dark *){color:var(--tw-color-dark-white-100)!important}.tw\:dark\:text-dark-white-200:where(.dark,.dark *){color:var(--tw-color-dark-white-200)}.tw\:dark\:text-dark-white-200\!:where(.dark,.dark *){color:var(--tw-color-dark-white-200)!important}.tw\:dark\:text-dark-white-300:where(.dark,.dark *){color:var(--tw-color-dark-white-300)}.tw\:dark\:text-dark-white-300\!:where(.dark,.dark *){color:var(--tw-color-dark-white-300)!important}.tw\:dark\:text-dark-white-400:where(.dark,.dark *){color:var(--tw-color-dark-white-400)}.tw\:dark\:text-dark-white-400\!:where(.dark,.dark *){color:var(--tw-color-dark-white-400)!important}.tw\:dark\:text-gray-100:where(.dark,.dark *){color:var(--tw-color-gray-100)}.tw\:dark\:text-gray-200:where(.dark,.dark *){color:var(--tw-color-gray-200)}.tw\:dark\:text-gray-300:where(.dark,.dark *){color:var(--tw-color-gray-300)}.tw\:dark\:text-gray-400:where(.dark,.dark *){color:var(--tw-color-gray-400)}.tw\:dark\:text-gray-500:where(.dark,.dark *){color:var(--tw-color-gray-500)}.tw\:dark\:text-gray-600:where(.dark,.dark *){color:var(--tw-color-gray-600)}.tw\:dark\:text-gray-700:where(.dark,.dark *){color:var(--tw-color-gray-700)}.tw\:dark\:text-gray-800:where(.dark,.dark *){color:var(--tw-color-gray-800)}.tw\:dark\:text-gray-900:where(.dark,.dark *){color:var(--tw-color-gray-900)}.tw\:dark\:text-green-300:where(.dark,.dark *){color:var(--tw-color-green-300)}.tw\:dark\:text-green-400:where(.dark,.dark *){color:var(--tw-color-green-400)}.tw\:dark\:text-purple-300:where(.dark,.dark *){color:var(--tw-color-purple-300)}.tw\:dark\:text-red-300:where(.dark,.dark *){color:var(--tw-color-red-300)}.tw\:dark\:text-red-400:where(.dark,.dark *){color:var(--tw-color-red-400)}.tw\:dark\:text-red-400\!:where(.dark,.dark *){color:var(--tw-color-red-400)!important}.tw\:dark\:text-red-500:where(.dark,.dark *){color:var(--tw-color-red-500)}.tw\:dark\:text-red-500\!:where(.dark,.dark *){color:var(--tw-color-red-500)!important}.tw\:dark\:text-white:where(.dark,.dark *){color:var(--tw-color-white)}.tw\:dark\:text-white\!:where(.dark,.dark *){color:var(--tw-color-white)!important}.tw\:dark\:text-yellow-400:where(.dark,.dark *){color:var(--tw-color-yellow-400)}.tw\:dark\:text-yellow-500:where(.dark,.dark *){color:var(--tw-color-yellow-500)}.tw\:dark\:placeholder-gray-400:where(.dark,.dark *)::placeholder{color:var(--tw-color-gray-400)}.tw\:dark\:scheme-dark:where(.dark,.dark *){--lightningcss-light: ;--lightningcss-dark:initial;color-scheme:dark}.tw\:dark\:shadow-black\/30:where(.dark,.dark *){--tw-shadow-color:var(--tw-color-black)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:shadow-black\/30:where(.dark,.dark *){--tw-shadow-color:color-mix(in oklab, color-mix(in oklab, var(--tw-color-black) 30%, transparent) var(--tw-shadow-alpha), transparent)}}.tw\:dark\:ring-blue-900\/50:where(.dark,.dark *){--tw-ring-color:var(--tw-color-blue-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:ring-blue-900\/50:where(.dark,.dark *){--tw-ring-color:color-mix(in oklab, var(--tw-color-blue-900) 50%, transparent)}}.tw\:dark\:ring-dark-gray-200:where(.dark,.dark *){--tw-ring-color:var(--tw-color-dark-gray-200)}.tw\:dark\:ring-dark-gray-500:where(.dark,.dark *){--tw-ring-color:var(--tw-color-dark-gray-500)}.tw\:dark\:ring-emerald-900\/50:where(.dark,.dark *){--tw-ring-color:var(--tw-color-emerald-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:ring-emerald-900\/50:where(.dark,.dark *){--tw-ring-color:color-mix(in oklab, var(--tw-color-emerald-900) 50%, transparent)}}.tw\:dark\:ring-red-900\/50:where(.dark,.dark *){--tw-ring-color:var(--tw-color-red-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:ring-red-900\/50:where(.dark,.dark *){--tw-ring-color:color-mix(in oklab, var(--tw-color-red-900) 50%, transparent)}}@media (hover:hover){.tw\:dark\:group-hover\:text-blue-400:where(.dark,.dark *):is(:where(.tw\:group):hover *){color:var(--tw-color-blue-400)}}.tw\:dark\:peer-focus-visible\:ring-offset-dark-gray-500:where(.dark,.dark *):is(:where(.tw\:peer):focus-visible~*){--tw-ring-offset-color:var(--tw-color-dark-gray-500)}.tw\:dark\:even\:bg-zinc-900:where(.dark,.dark *):nth-child(2n){background-color:var(--tw-color-zinc-900)}.tw\:dark\:visited\:text-dark-white-100\!:where(.dark,.dark *):visited{color:var(--tw-color-dark-white-100)!important}.tw\:dark\:visited\:text-red-500\!:where(.dark,.dark *):visited{color:var(--tw-color-red-500)!important}@media (hover:hover){.tw\:dark\:hover\:border-gray-500:where(.dark,.dark *):hover{border-color:var(--tw-color-gray-500)}.tw\:dark\:hover\:bg-blue-500:where(.dark,.dark *):hover{background-color:var(--tw-color-blue-500)}.tw\:dark\:hover\:bg-blue-700:where(.dark,.dark *):hover{background-color:var(--tw-color-blue-700)}.tw\:dark\:hover\:bg-dark-gray-200:where(.dark,.dark *):hover{background-color:var(--tw-color-dark-gray-200)}.tw\:dark\:hover\:bg-dark-gray-300:where(.dark,.dark *):hover{background-color:var(--tw-color-dark-gray-300)}.tw\:dark\:hover\:bg-dark-gray-400:where(.dark,.dark *):hover{background-color:var(--tw-color-dark-gray-400)}.tw\:dark\:hover\:bg-dark-gray-500:where(.dark,.dark *):hover{background-color:var(--tw-color-dark-gray-500)}.tw\:dark\:hover\:bg-gray-200\!:where(.dark,.dark *):hover{background-color:var(--tw-color-gray-200)!important}.tw\:dark\:hover\:bg-gray-600:where(.dark,.dark *):hover{background-color:var(--tw-color-gray-600)}.tw\:dark\:hover\:bg-gray-700:where(.dark,.dark *):hover{background-color:var(--tw-color-gray-700)}.tw\:dark\:hover\:bg-gray-800:where(.dark,.dark *):hover{background-color:var(--tw-color-gray-800)}.tw\:dark\:hover\:bg-red-500:where(.dark,.dark *):hover{background-color:var(--tw-color-red-500)}.tw\:dark\:hover\:bg-red-900\/20:where(.dark,.dark *):hover{background-color:var(--tw-color-red-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:hover\:bg-red-900\/20:where(.dark,.dark *):hover{background-color:color-mix(in oklab, var(--tw-color-red-900) 20%, transparent)}}.tw\:dark\:hover\:bg-red-950\/40:where(.dark,.dark *):hover{background-color:var(--tw-color-red-950)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:hover\:bg-red-950\/40:where(.dark,.dark *):hover{background-color:color-mix(in oklab, var(--tw-color-red-950) 40%, transparent)}}.tw\:dark\:hover\:text-blue-300:where(.dark,.dark *):hover{color:var(--tw-color-blue-300)}.tw\:dark\:hover\:text-blue-400:where(.dark,.dark *):hover{color:var(--tw-color-blue-400)}.tw\:dark\:hover\:text-dark-white-100:where(.dark,.dark *):hover{color:var(--tw-color-dark-white-100)}.tw\:dark\:hover\:text-dark-white-100\!:where(.dark,.dark *):hover{color:var(--tw-color-dark-white-100)!important}.tw\:dark\:hover\:text-gray-300:where(.dark,.dark *):hover{color:var(--tw-color-gray-300)}.tw\:dark\:hover\:text-red-400\!:where(.dark,.dark *):hover{color:var(--tw-color-red-400)!important}.tw\:dark\:hover\:text-red-500\!:where(.dark,.dark *):hover{color:var(--tw-color-red-500)!important}.tw\:dark\:hover\:text-red-800\!:where(.dark,.dark *):hover{color:var(--tw-color-red-800)!important}.tw\:dark\:hover\:text-white:where(.dark,.dark *):hover{color:var(--tw-color-white)}}.tw\:dark\:focus\:border-blue-500:where(.dark,.dark *):focus{border-color:var(--tw-color-blue-500)}.tw\:dark\:focus\:border-blue-700:where(.dark,.dark *):focus{border-color:var(--tw-color-blue-700)}.tw\:dark\:focus\:border-blue-800:where(.dark,.dark *):focus{border-color:var(--tw-color-blue-800)}.tw\:dark\:focus\:ring-blue-500:where(.dark,.dark *):focus{--tw-ring-color:var(--tw-color-blue-500)}.tw\:dark\:active\:bg-gray-700:where(.dark,.dark *):active{background-color:var(--tw-color-gray-700)}.tw\:dark\:active\:text-gray-300:where(.dark,.dark *):active{color:var(--tw-color-gray-300)}.tw\:dark\:has-checked\:bg-blue-950\/30:where(.dark,.dark *):has(:checked){background-color:var(--tw-color-blue-950)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:has-checked\:bg-blue-950\/30:where(.dark,.dark *):has(:checked){background-color:color-mix(in oklab, var(--tw-color-blue-950) 30%, transparent)}}.tw\:\[\&_\.select2-search\\_\\_field\]\:w-\[0\.75em\]\! .select2-search__field{width:.75em!important}.tw\:\[\&_\.select2-search\\_\\_field\]\:min-w-0\! .select2-search__field{min-width:0!important}.tw\:\[\&_select\]\:px-3 select{padding-inline:calc(var(--tw-spacing) * 3)}.tw\:\[\&_select\]\:py-1\.5 select{padding-block:calc(var(--tw-spacing) * 1.5)}@media not all and (width>=768px){.tw\:max-md\:\[\&\>\[data-label\]\]\:before\:mb-1>[data-label]:before{content:var(--tw-content);margin-bottom:var(--tw-spacing)}.tw\:max-md\:\[\&\>\[data-label\]\]\:before\:block>[data-label]:before{content:var(--tw-content);display:block}.tw\:max-md\:\[\&\>\[data-label\]\]\:before\:tracking-wider>[data-label]:before{content:var(--tw-content);--tw-tracking:var(--tw-tracking-wider);letter-spacing:var(--tw-tracking-wider)}.tw\:max-md\:\[\&\>\[data-label\]\]\:before\:text-gray-500>[data-label]:before{content:var(--tw-content);color:var(--tw-color-gray-500)}.tw\:max-md\:\[\&\>\[data-label\]\]\:before\:uppercase>[data-label]:before{content:var(--tw-content);text-transform:uppercase}.tw\:max-md\:\[\&\>\[data-label\]\]\:before\:content-\[attr\(data-label\)\]>[data-label]:before{--tw-content:attr(data-label);content:var(--tw-content)}}html,body{font-size:14px}}.device-link-up{--tw-font-weight:var(--tw-font-weight-bold);font-weight:var(--tw-font-weight-bold);color:var(--tw-color-blue-900)}.device-link-up:visited{color:var(--tw-color-blue-900)}.device-link-up:where(.dark,.dark *),.device-link-up:where(.dark,.dark *):visited{color:var(--tw-color-dark-white-100)}.device-link-down{--tw-font-weight:var(--tw-font-weight-bold);font-weight:var(--tw-font-weight-bold);color:var(--tw-color-red-600)}.device-link-down:visited{color:var(--tw-color-red-600)}.device-link-down:where(.dark,.dark *),.device-link-down:where(.dark,.dark *):visited{color:var(--tw-color-red-500)!important}.device-link-disabled{--tw-font-weight:var(--tw-font-weight-bold);font-weight:var(--tw-font-weight-bold);color:var(--tw-color-gray-400)}.device-link-disabled:visited{color:var(--tw-color-gray-400)}.device-link-disabled:where(.dark,.dark *),.device-link-disabled:where(.dark,.dark *):visited{color:var(--tw-color-gray-500)!important}#coordinates-text{text-decoration-line:underline}.lnms-btn{align-items:center;gap:var(--tw-spacing);border-radius:var(--tw-radius-lg);padding-inline:calc(var(--tw-spacing) * 2);padding-block:var(--tw-spacing);--tw-font-weight:var(--tw-font-weight-normal);font-weight:var(--tw-font-weight-normal);text-decoration-line:none;display:inline-flex}.lnms-btn-badge{min-width:calc(var(--tw-spacing) * 5);border-radius:var(--tw-radius-xl);padding-inline:calc(var(--tw-spacing) * 1.5);font-size:var(--tw-text-xs);line-height:var(--tw-leading,var(--tw-text-xs--line-height));--tw-font-weight:var(--tw-font-weight-bold);font-weight:var(--tw-font-weight-bold);justify-content:center;align-items:center;display:inline-flex}.lnms-btn-default{background-color:#3a3f44;color:var(--tw-color-white)!important}@media (hover:hover){.lnms-btn-default:hover{background-color:#1e2023}}.lnms-btn-default:where(.dark,.dark *){border-style:var(--tw-border-style);border-width:1px;border-color:var(--tw-color-dark-gray-100);background-color:var(--tw-color-dark-gray-400);color:var(--tw-color-dark-white-100)!important}@media (hover:hover){.lnms-btn-default:where(.dark,.dark *):hover{background-color:var(--tw-color-dark-gray-300)}}.lnms-btn-default .lnms-btn-badge{background-color:var(--tw-color-white);color:#232628}.lnms-btn-success{background-color:#5cb85c;color:var(--tw-color-white)!important}@media (hover:hover){.lnms-btn-success:hover{background-color:#449d44}}.lnms-btn-success .lnms-btn-badge{background-color:var(--tw-color-white);color:#5cb85c}.lnms-btn-danger{background-color:#d9534f;color:var(--tw-color-white)!important}@media (hover:hover){.lnms-btn-danger:hover{background-color:#c9302c}}.lnms-btn-danger .lnms-btn-badge{background-color:var(--tw-color-white);color:#d9534f}.lnms-btn-primary{background-color:#337ab7;color:var(--tw-color-white)!important}@media (hover:hover){.lnms-btn-primary:hover{background-color:#286090}}.lnms-btn-primary .lnms-btn-badge{background-color:var(--tw-color-white);color:#337ab7}.lnms-btn-warning{background-color:#f0ad4e;color:var(--tw-color-white)!important}@media (hover:hover){.lnms-btn-warning:hover{background-color:#ec971f}}.lnms-btn-warning .lnms-btn-badge{background-color:var(--tw-color-white);color:#f0ad4e}.dark .leaflet-tile,html.dark .leaflet-tile{filter:brightness(.6)invert()contrast(3)hue-rotate(200deg)saturate(.3)brightness(.7)}@property --tw-translate-x{syntax:"*";inherits:false;initial-value:0}@property --tw-translate-y{syntax:"*";inherits:false;initial-value:0}@property --tw-translate-z{syntax:"*";inherits:false;initial-value:0}@property --tw-scale-x{syntax:"*";inherits:false;initial-value:1}@property --tw-scale-y{syntax:"*";inherits:false;initial-value:1}@property --tw-scale-z{syntax:"*";inherits:false;initial-value:1}@property --tw-rotate-x{syntax:"*";inherits:false}@property --tw-rotate-y{syntax:"*";inherits:false}@property --tw-rotate-z{syntax:"*";inherits:false}@property --tw-skew-x{syntax:"*";inherits:false}@property --tw-skew-y{syntax:"*";inherits:false}@property --tw-space-y-reverse{syntax:"*";inherits:false;initial-value:0}@property --tw-divide-y-reverse{syntax:"*";inherits:false;initial-value:0}@property --tw-border-style{syntax:"*";inherits:false;initial-value:solid}@property --tw-leading{syntax:"*";inherits:false}@property --tw-font-weight{syntax:"*";inherits:false}@property --tw-tracking{syntax:"*";inherits:false}@property --tw-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-shadow-color{syntax:"*";inherits:false}@property --tw-shadow-alpha{syntax:"";inherits:false;initial-value:100%}@property --tw-inset-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-inset-shadow-color{syntax:"*";inherits:false}@property --tw-inset-shadow-alpha{syntax:"";inherits:false;initial-value:100%}@property --tw-ring-color{syntax:"*";inherits:false}@property --tw-ring-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-inset-ring-color{syntax:"*";inherits:false}@property --tw-inset-ring-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-ring-inset{syntax:"*";inherits:false}@property --tw-ring-offset-width{syntax:"";inherits:false;initial-value:0}@property --tw-ring-offset-color{syntax:"*";inherits:false;initial-value:#fff}@property --tw-ring-offset-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-backdrop-blur{syntax:"*";inherits:false}@property --tw-backdrop-brightness{syntax:"*";inherits:false}@property --tw-backdrop-contrast{syntax:"*";inherits:false}@property --tw-backdrop-grayscale{syntax:"*";inherits:false}@property --tw-backdrop-hue-rotate{syntax:"*";inherits:false}@property --tw-backdrop-invert{syntax:"*";inherits:false}@property --tw-backdrop-opacity{syntax:"*";inherits:false}@property --tw-backdrop-saturate{syntax:"*";inherits:false}@property --tw-backdrop-sepia{syntax:"*";inherits:false}@property --tw-duration{syntax:"*";inherits:false}@property --tw-ease{syntax:"*";inherits:false}@property --tw-content{syntax:"*";inherits:false;initial-value:""}@keyframes spin{to{transform:rotate(360deg)}}@keyframes pulse{50%{opacity:.5}}.grid-stack{position:relative}.grid-stack-rtl{direction:ltr}.grid-stack-rtl>.grid-stack-item{direction:rtl}.grid-stack-placeholder>.placeholder-content{background-color:#0000001a;width:auto;margin:0;position:absolute;z-index:0!important}.grid-stack>.grid-stack-item{width:var(--gs-column-width);height:var(--gs-cell-height);padding:0;position:absolute;top:0}.grid-stack>.grid-stack-item>.grid-stack-item-content{width:auto;margin:0;position:absolute;overflow:hidden auto}.grid-stack>.grid-stack-item.size-to-content:not(.size-to-content-max)>.grid-stack-item-content{overflow-y:hidden}.grid-stack:not(.grid-stack-rtl)>.grid-stack-item{left:0}.grid-stack.grid-stack-rtl>.grid-stack-item{right:0}.grid-stack>.grid-stack-item>.grid-stack-item-content,.grid-stack>.grid-stack-placeholder>.placeholder-content{top:var(--gs-item-margin-top);right:var(--gs-item-margin-right);bottom:var(--gs-item-margin-bottom);left:var(--gs-item-margin-left)}.grid-stack-item>.ui-resizable-handle{-ms-touch-action:none;touch-action:none;font-size:.1px;display:block;position:absolute}.grid-stack-item.ui-resizable-autohide>.ui-resizable-handle,.grid-stack-item.ui-resizable-disabled>.ui-resizable-handle{display:none}.grid-stack-item>.ui-resizable-ne,.grid-stack-item>.ui-resizable-nw,.grid-stack-item>.ui-resizable-se,.grid-stack-item>.ui-resizable-sw{background-image:url("data:image/svg+xml;utf8,");background-position:50%;background-repeat:no-repeat}.grid-stack-item>.ui-resizable-ne,.grid-stack-item>.ui-resizable-sw{transform:rotate(45deg)}.grid-stack-item>.ui-resizable-nw,.grid-stack-item>.ui-resizable-se{transform:rotate(-45deg)}.grid-stack-item>.ui-resizable-nw{cursor:nw-resize;width:20px;height:20px;top:var(--gs-item-margin-top);left:var(--gs-item-margin-left)}.grid-stack-item>.ui-resizable-n{cursor:n-resize;height:10px;top:var(--gs-item-margin-top);left:25px;right:25px}.grid-stack-item>.ui-resizable-ne{cursor:ne-resize;width:20px;height:20px;top:var(--gs-item-margin-top);right:var(--gs-item-margin-right)}.grid-stack-item>.ui-resizable-e{cursor:e-resize;width:10px;top:15px;bottom:15px;right:var(--gs-item-margin-right)}.grid-stack-item>.ui-resizable-se{cursor:se-resize;width:20px;height:20px;bottom:var(--gs-item-margin-bottom);right:var(--gs-item-margin-right)}.grid-stack-item>.ui-resizable-s{cursor:s-resize;height:10px;left:25px;bottom:var(--gs-item-margin-bottom);right:25px}.grid-stack-item>.ui-resizable-sw{cursor:sw-resize;width:20px;height:20px;bottom:var(--gs-item-margin-bottom);left:var(--gs-item-margin-left)}.grid-stack-item>.ui-resizable-w{cursor:w-resize;width:10px;top:15px;bottom:15px;left:var(--gs-item-margin-left)}.grid-stack-item.ui-draggable-dragging>.ui-resizable-handle{display:none!important}.grid-stack-item.ui-draggable-dragging{will-change:left,right,top}.grid-stack-item.ui-resizable-resizing{will-change:width,height}.ui-draggable-dragging,.ui-resizable-resizing{z-index:10000}.ui-draggable-dragging>.grid-stack-item-content,.ui-resizable-resizing>.grid-stack-item-content{opacity:.8;box-shadow:1px 4px 6px #0003}.grid-stack-animate,.grid-stack-animate .grid-stack-item{transition:left .3s,right .3s,top .3s,height .3s,width .3s}.grid-stack-animate .grid-stack-item.grid-stack-placeholder,.grid-stack-animate .grid-stack-item.ui-draggable-dragging,.grid-stack-animate .grid-stack-item.ui-resizable-resizing{transition:left,right,top,height,width}.grid-stack>.grid-stack-item[gs-y="0"]{top:0}.grid-stack:not(.grid-stack-rtl)>.grid-stack-item[gs-x="0"]{left:0}.grid-stack.grid-stack-rtl>.grid-stack-item[gs-x="0"]{right:0} diff --git a/html/build/assets/app-Dhh4t1g7.css b/html/build/assets/app-Dhh4t1g7.css new file mode 100644 index 00000000000..2a89e0159f8 --- /dev/null +++ b/html/build/assets/app-Dhh4t1g7.css @@ -0,0 +1,2 @@ +/*! tailwindcss v4.3.3 | MIT License | https://tailwindcss.com */ +@layer properties{@supports (((-webkit-hyphens:none)) and (not (margin-trim:inline))) or ((-moz-orient:inline) and (not (color:rgb(from red r g b)))){*,:before,:after,::backdrop{--tw-translate-x:0;--tw-translate-y:0;--tw-translate-z:0;--tw-scale-x:1;--tw-scale-y:1;--tw-scale-z:1;--tw-rotate-x:initial;--tw-rotate-y:initial;--tw-rotate-z:initial;--tw-skew-x:initial;--tw-skew-y:initial;--tw-space-y-reverse:0;--tw-divide-y-reverse:0;--tw-border-style:solid;--tw-leading:initial;--tw-font-weight:initial;--tw-tracking:initial;--tw-ordinal:initial;--tw-slashed-zero:initial;--tw-numeric-figure:initial;--tw-numeric-spacing:initial;--tw-numeric-fraction:initial;--tw-shadow:0 0 #0000;--tw-shadow-color:initial;--tw-shadow-alpha:100%;--tw-inset-shadow:0 0 #0000;--tw-inset-shadow-color:initial;--tw-inset-shadow-alpha:100%;--tw-ring-color:initial;--tw-ring-shadow:0 0 #0000;--tw-inset-ring-color:initial;--tw-inset-ring-shadow:0 0 #0000;--tw-ring-inset:initial;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-offset-shadow:0 0 #0000;--tw-backdrop-blur:initial;--tw-backdrop-brightness:initial;--tw-backdrop-contrast:initial;--tw-backdrop-grayscale:initial;--tw-backdrop-hue-rotate:initial;--tw-backdrop-invert:initial;--tw-backdrop-opacity:initial;--tw-backdrop-saturate:initial;--tw-backdrop-sepia:initial;--tw-duration:initial;--tw-ease:initial;--tw-content:""}}}#toast-container-top-right{z-index:999999;position:fixed;top:55px;right:12px}#toast-container-top-right a{font-weight:700}#toast-container-top-right>div{background-position:10px;background-repeat:no-repeat;width:304px;min-height:50px}.toast-error{background-image:url(data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMzIgMzIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGNpcmNsZSBjeD0iMTYiIGN5PSIxNiIgcj0iMTUiIGZpbGw9IiNmZmYiLz48cGF0aCBkPSJNMTYgMEExNiAxNiAwIDAgMCAwIDE2YTE2IDE2IDAgMCAwIDE2IDE2IDE2IDE2IDAgMCAwIDE2LTE2QTE2IDE2IDAgMCAwIDE2IDB6bS02IDlhMSAxIDAgMCAxIC43MDcuMjkzTDE2IDE0LjU4Nmw1LjI5My01LjI5M2ExIDEgMCAwIDEgMS40MTQgMCAxIDEgMCAwIDEgMCAxLjQxNEwxNy40MTQgMTZsNS4yOTMgNS4yOTNhMSAxIDAgMCAxIDAgMS40MTQgMSAxIDAgMCAxLTEuNDE0IDBMMTYgMTcuNDE0bC01LjI5MyA1LjI5M2ExIDEgMCAwIDEtMS40MTQgMCAxIDEgMCAwIDEgMC0xLjQxNEwxNC41ODYgMTZsLTUuMjkzLTUuMjkzYTEgMSAwIDAgMSAwLTEuNDE0QTEgMSAwIDAgMSAxMCA5eiIgZmlsbD0iI2RjMjYyNiIvPjwvc3ZnPg==);background-size:32px}.toast-info{background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMiAzMiI+PGNpcmNsZSBjeD0iMTYiIGN5PSIxNiIgcj0iMTUiIGZpbGw9IiNmZmYiLz48cGF0aCBkPSJNMTYgMEExNiAxNiAwIDAgMCAwIDE2YTE2IDE2IDAgMCAwIDE2IDE2IDE2IDE2IDAgMCAwIDE2LTE2QTE2IDE2IDAgMCAwIDE2IDB6bTAgNmM1LjUxMSAwIDEwIDQuNDg5IDEwIDEwcy00LjQ4OSAxMC0xMCAxMFM2IDIxLjUxMSA2IDE2IDEwLjQ4OSA2IDE2IDZ6bTAgMmMtNC40MyAwLTggMy41Ny04IDhzMy41NyA4IDggOCA4LTMuNTcgOC04LTMuNTctOC04LTh6bTAgM2ExIDEgMCAwIDEgMSAxdjRhMSAxIDAgMCAxLTEgMSAxIDEgMCAwIDEtMS0xdi00YTEgMSAwIDAgMSAxLTF6bTAgOGguMDFhMSAxIDAgMCAxIDEgMSAxIDEgMCAwIDEtMSAxSDE2YTEgMSAwIDAgMS0xLTEgMSAxIDAgMCAxIDEtMXoiIGZpbGw9IiMyNTYzZWIiIC8+PC9zdmc+);background-size:32px}.toast-success{background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMiAzMiI+PGNpcmNsZSBjeD0iMTYiIGN5PSIxNiIgcj0iMTUiIGZpbGw9IiNmZmYiLz48cGF0aCBkPSJNMTYgMEExNiAxNiAwIDAgMCAwIDE2YTE2IDE2IDAgMCAwIDE2IDE2IDE2IDE2IDAgMCAwIDE2LTE2QTE2IDE2IDAgMCAwIDE2IDB6bTcgMTBhMSAxIDAgMCAxIC43MDcuMjkzIDEgMSAwIDAgMSAwIDEuNDE0bC0xMCAxMGExIDEgMCAwIDEtMS40MTQgMGwtNC00YTEgMSAwIDAgMSAwLTEuNDE0IDEgMSAwIDAgMSAxLjQxNCAwTDEzIDE5LjU4Nmw5LjI5My05LjI5M0ExIDEgMCAwIDEgMjMgMTB6IiBmaWxsPSIjMDU5NjY5IiAvPjwvc3ZnPg==);background-size:32px}.toast-warning{background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMiAzMiI+PGNpcmNsZSBjeD0iMTYiIGN5PSIxNiIgcj0iMTUiIGZpbGw9IiNmZmYiLz48cGF0aCBkPSJNMTYgMEExNiAxNiAwIDAgMCAwIDE2YTE2IDE2IDAgMCAwIDE2IDE2IDE2IDE2IDAgMCAwIDE2LTE2QTE2IDE2IDAgMCAwIDE2IDB6bTAgNi4xNTZjMS4wMTYgMCAyLjAzMi40OSAyLjU5OCAxLjQ2OWw2LjkyNyAxMmMxLjEzMSAxLjk1OC0uMzM2IDQuNS0yLjU5NyA0LjVIOS4wNzJjLTIuMjYxIDAtMy43MjgtMi41NDItMi41OTctNC41bDYuOTI3LTEyYy41NjYtLjk3OSAxLjU4Mi0xLjQ2OSAyLjU5OC0xLjQ2OXptMCAxLjkzOGMtLjMzIDAtLjY2LjE3Ny0uODY1LjUzMWwtNi45MyAxMmMtLjQwOS43MDguMDQ5IDEuNS44NjcgMS41aDEzLjg1NmMuODE4IDAgMS4yNzYtLjc5Mi44NjctMS41bC02LjkzLTEyYy0uMjA0LS4zNTQtLjUzNC0uNTMxLS44NjUtLjUzMXptMCA0LjAzMWExIDEgMCAwIDEgMSAxdjJhMSAxIDAgMCAxLTEgMSAxIDEgMCAwIDEtMS0xdi0yYTEgMSAwIDAgMSAxLTF6bTAgNmguMDFhMSAxIDAgMCAxIDEgMSAxIDEgMCAwIDEtMSAxSDE2YTEgMSAwIDAgMS0xLTEgMSAxIDAgMCAxIDEtMXoiIGZpbGw9IiNkOTc3MDYiLz48L3N2Zz4=);background-size:32px}.toast-progress{opacity:.4;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=40);height:4px;filter:alpha(opacity=40);background-color:#000;position:absolute;bottom:0;left:0}@layer theme{:root,:host{--tw-font-sans:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";--tw-font-mono:ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;--tw-color-red-50:oklch(97.1% .013 17.38);--tw-color-red-100:oklch(93.6% .032 17.717);--tw-color-red-200:oklch(88.5% .062 18.334);--tw-color-red-300:oklch(80.8% .114 19.571);--tw-color-red-400:oklch(70.4% .191 22.216);--tw-color-red-500:oklch(63.7% .237 25.331);--tw-color-red-600:oklch(57.7% .245 27.325);--tw-color-red-700:oklch(50.5% .213 27.518);--tw-color-red-800:oklch(44.4% .177 26.899);--tw-color-red-900:oklch(39.6% .141 25.723);--tw-color-red-950:oklch(25.8% .092 26.042);--tw-color-orange-400:oklch(75% .183 55.934);--tw-color-orange-600:oklch(64.6% .222 41.116);--tw-color-amber-50:oklch(98.7% .022 95.277);--tw-color-amber-100:oklch(96.2% .059 95.617);--tw-color-amber-200:oklch(92.4% .12 95.746);--tw-color-amber-300:oklch(87.9% .169 91.605);--tw-color-amber-400:oklch(82.8% .189 84.429);--tw-color-amber-500:oklch(76.9% .188 70.08);--tw-color-amber-600:oklch(66.6% .179 58.318);--tw-color-amber-700:oklch(55.5% .163 48.998);--tw-color-amber-800:oklch(47.3% .137 46.201);--tw-color-amber-900:oklch(41.4% .112 45.904);--tw-color-amber-950:oklch(27.9% .077 45.635);--tw-color-yellow-50:oklch(98.7% .026 102.212);--tw-color-yellow-100:oklch(97.3% .071 103.193);--tw-color-yellow-200:oklch(94.5% .129 101.54);--tw-color-yellow-400:oklch(85.2% .199 91.936);--tw-color-yellow-500:oklch(79.5% .184 86.047);--tw-color-yellow-600:oklch(68.1% .162 75.834);--tw-color-yellow-800:oklch(47.6% .114 61.907);--tw-color-yellow-900:oklch(42.1% .095 57.708);--tw-color-green-50:oklch(98.2% .018 155.826);--tw-color-green-100:oklch(96.2% .044 156.743);--tw-color-green-200:oklch(92.5% .084 155.995);--tw-color-green-300:oklch(87.1% .15 154.449);--tw-color-green-400:oklch(79.2% .209 151.711);--tw-color-green-500:oklch(72.3% .219 149.579);--tw-color-green-600:oklch(62.7% .194 149.214);--tw-color-green-700:oklch(52.7% .154 150.069);--tw-color-green-800:oklch(44.8% .119 151.328);--tw-color-green-900:oklch(39.3% .095 152.535);--tw-color-green-950:oklch(26.6% .065 152.934);--tw-color-emerald-100:oklch(95% .052 163.051);--tw-color-emerald-600:oklch(59.6% .145 163.225);--tw-color-emerald-700:oklch(50.8% .118 165.612);--tw-color-emerald-900:oklch(37.8% .077 168.94);--tw-color-sky-50:oklch(97.7% .013 236.62);--tw-color-sky-100:oklch(95.1% .026 236.824);--tw-color-sky-200:oklch(90.1% .058 230.902);--tw-color-sky-300:oklch(82.8% .111 230.318);--tw-color-sky-400:oklch(74.6% .16 232.661);--tw-color-sky-600:oklch(58.8% .158 241.966);--tw-color-sky-800:oklch(44.3% .11 240.79);--tw-color-sky-900:oklch(39.1% .09 240.876);--tw-color-sky-950:oklch(29.3% .066 243.157);--tw-color-blue-50:oklch(97% .014 254.604);--tw-color-blue-100:oklch(93.2% .032 255.585);--tw-color-blue-200:oklch(88.2% .059 254.128);--tw-color-blue-300:oklch(80.9% .105 251.813);--tw-color-blue-400:oklch(70.7% .165 254.624);--tw-color-blue-500:oklch(62.3% .214 259.815);--tw-color-blue-600:oklch(54.6% .245 262.881);--tw-color-blue-700:oklch(48.8% .243 264.376);--tw-color-blue-800:oklch(42.4% .199 265.638);--tw-color-blue-900:oklch(37.9% .146 265.522);--tw-color-blue-950:oklch(28.2% .091 267.935);--tw-color-purple-100:oklch(94.6% .033 307.174);--tw-color-purple-300:oklch(82.7% .119 306.383);--tw-color-purple-800:oklch(43.8% .218 303.724);--tw-color-purple-900:oklch(38.1% .176 304.987);--tw-color-slate-100:oklch(96.8% .007 247.896);--tw-color-slate-200:oklch(92.9% .013 255.508);--tw-color-slate-300:oklch(86.9% .022 252.894);--tw-color-slate-400:oklch(70.4% .04 256.788);--tw-color-slate-500:oklch(55.4% .046 257.417);--tw-color-slate-700:oklch(37.2% .044 257.287);--tw-color-slate-800:oklch(27.9% .041 260.031);--tw-color-gray-50:oklch(98.5% .002 247.839);--tw-color-gray-100:oklch(96.7% .003 264.542);--tw-color-gray-200:oklch(92.8% .006 264.531);--tw-color-gray-300:oklch(87.2% .01 258.338);--tw-color-gray-400:oklch(70.7% .022 261.325);--tw-color-gray-500:oklch(55.1% .027 264.364);--tw-color-gray-600:oklch(44.6% .03 256.802);--tw-color-gray-700:oklch(37.3% .034 259.733);--tw-color-gray-800:oklch(27.8% .033 256.848);--tw-color-gray-900:oklch(21% .034 264.665);--tw-color-zinc-800:oklch(27.4% .006 286.033);--tw-color-zinc-900:oklch(21% .006 285.885);--tw-color-neutral-50:oklch(98.5% 0 none);--tw-color-neutral-100:oklch(97% 0 none);--tw-color-neutral-200:oklch(92.2% 0 none);--tw-color-neutral-300:oklch(87% 0 none);--tw-color-neutral-400:oklch(70.8% 0 none);--tw-color-neutral-500:oklch(55.6% 0 none);--tw-color-neutral-600:oklch(43.9% 0 none);--tw-color-neutral-700:oklch(37.1% 0 none);--tw-color-neutral-900:oklch(20.5% 0 none);--tw-color-neutral-950:oklch(14.5% 0 none);--tw-color-black:#000;--tw-color-white:#fff;--tw-spacing:.25rem;--tw-container-sm:24rem;--tw-container-md:28rem;--tw-container-lg:32rem;--tw-container-xl:36rem;--tw-container-2xl:42rem;--tw-container-3xl:48rem;--tw-container-4xl:56rem;--tw-container-5xl:64rem;--tw-text-xs:.75rem;--tw-text-xs--line-height:calc(1 / .75);--tw-text-sm:.875rem;--tw-text-sm--line-height:calc(1.25 / .875);--tw-text-base:1rem;--tw-text-base--line-height:calc(1.5 / 1);--tw-text-lg:1.125rem;--tw-text-lg--line-height:calc(1.75 / 1.125);--tw-text-xl:1.25rem;--tw-text-xl--line-height:calc(1.75 / 1.25);--tw-text-2xl:1.5rem;--tw-text-2xl--line-height:calc(2 / 1.5);--tw-text-3xl:1.875rem;--tw-text-3xl--line-height:calc(2.25 / 1.875);--tw-text-4xl:2.25rem;--tw-text-4xl--line-height:calc(2.5 / 2.25);--tw-text-7xl:4.5rem;--tw-text-7xl--line-height:1;--tw-font-weight-normal:400;--tw-font-weight-medium:500;--tw-font-weight-semibold:600;--tw-font-weight-bold:700;--tw-tracking-tight:-.025em;--tw-tracking-wider:.05em;--tw-leading-tight:1.25;--tw-leading-normal:1.5;--tw-radius-sm:.25rem;--tw-radius-md:.375rem;--tw-radius-lg:.5rem;--tw-radius-xl:.75rem;--tw-radius-2xl:1rem;--tw-ease-in:cubic-bezier(.4, 0, 1, 1);--tw-ease-out:cubic-bezier(0, 0, .2, 1);--tw-ease-in-out:cubic-bezier(.4, 0, .2, 1);--tw-animate-spin:spin 1s linear infinite;--tw-animate-pulse:pulse 2s cubic-bezier(.4, 0, .6, 1) infinite;--tw-blur-xs:4px;--tw-default-transition-duration:.15s;--tw-default-transition-timing-function:cubic-bezier(.4, 0, .2, 1);--tw-default-font-family:var(--tw-font-sans);--tw-default-mono-font-family:var(--tw-font-mono);--tw-color-dark-gray-100:#4f565d;--tw-color-dark-gray-200:#3e444c;--tw-color-dark-gray-300:#353a41;--tw-color-dark-gray-400:#2e3338;--tw-color-dark-gray-500:#272b30;--tw-color-dark-white-100:#f9fafb;--tw-color-dark-white-200:#c8c8c8;--tw-color-dark-white-300:#bebfbf;--tw-color-dark-white-400:#acb6bf;--tw-border-width-0_5:.5px}}@layer base{*,:after,:before,::backdrop{box-sizing:border-box;border:0 solid;margin:0;padding:0}::file-selector-button{box-sizing:border-box;border:0 solid;margin:0;padding:0}html,:host{-webkit-text-size-adjust:100%;tab-size:4;line-height:1.5;font-family:var(--tw-default-font-family,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji");font-feature-settings:var(--tw-default-font-feature-settings,normal);font-variation-settings:var(--tw-default-font-variation-settings,normal);-webkit-tap-highlight-color:transparent}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;-webkit-text-decoration:inherit;-webkit-text-decoration:inherit;-webkit-text-decoration:inherit;-webkit-text-decoration:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:var(--tw-default-mono-font-family,ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace);font-feature-settings:var(--tw-default-mono-font-feature-settings,normal);font-variation-settings:var(--tw-default-mono-font-variation-settings,normal);font-size:1em}small{font-size:80%}sub,sup{vertical-align:baseline;font-size:75%;line-height:0;position:relative}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}:-moz-focusring:where(:not(iframe)){outline:auto}progress{vertical-align:baseline}summary{display:list-item}ol,ul,menu{list-style:none}img,svg,video,canvas,audio,iframe,embed,object{vertical-align:middle;display:block}img,video{max-width:100%;height:auto}button,input,select,optgroup,textarea{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}::file-selector-button{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}:where(select:is([multiple],[size])) optgroup{font-weight:bolder}:where(select:is([multiple],[size])) optgroup option{padding-inline-start:20px}::file-selector-button{margin-inline-end:4px}::placeholder{opacity:1}@supports (not ((-webkit-appearance:-apple-pay-button))) or (contain-intrinsic-size:1px){::placeholder{color:currentColor}@supports (color:color-mix(in lab, red, red)){::placeholder{color:color-mix(in oklab, currentcolor 50%, transparent)}}}textarea{resize:vertical}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-date-and-time-value{min-height:1lh;text-align:inherit}::-webkit-datetime-edit{display:inline-flex}::-webkit-datetime-edit-fields-wrapper{padding:0}::-webkit-datetime-edit{padding-block:0}::-webkit-datetime-edit-year-field{padding-block:0}::-webkit-datetime-edit-month-field{padding-block:0}::-webkit-datetime-edit-day-field{padding-block:0}::-webkit-datetime-edit-hour-field{padding-block:0}::-webkit-datetime-edit-minute-field{padding-block:0}::-webkit-datetime-edit-second-field{padding-block:0}::-webkit-datetime-edit-millisecond-field{padding-block:0}::-webkit-datetime-edit-meridiem-field{padding-block:0}::-webkit-calendar-picker-indicator{line-height:1}:-moz-ui-invalid{box-shadow:none}button,input:where([type=button],[type=reset],[type=submit]){appearance:button}::file-selector-button{appearance:button}::-webkit-inner-spin-button{height:auto}::-webkit-outer-spin-button{height:auto}[hidden]:where(:not([hidden=until-found])){display:none!important}button:not(:disabled),[role=button]:not(:disabled){cursor:pointer}*,:after,:before,::backdrop{border-color:var(--color-gray-200,currentColor)}::file-selector-button{border-color:var(--color-gray-200,currentColor)}}@layer components{html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-family:sans-serif}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{vertical-align:baseline;display:inline-block}audio:not([controls]){height:0;display:none}[hidden],template{display:none}a{background-color:#0000}a:active,a:hover{outline:0}abbr[title]{text-decoration:underline;border-bottom:none;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{vertical-align:baseline;font-size:75%;line-height:0;position:relative}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner{border:0;padding:0}input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button{height:auto}input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button{-webkit-appearance:none}input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}@media print{*,:after,:before{color:#000!important;text-shadow:none!important;-webkit-box-shadow:none!important;box-shadow:none!important;background:0 0!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^=\#]:after,a[href^=javascript\:]:after{content:""}blockquote,pre{page-break-inside:avoid;border:1px solid #999}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:Glyphicons Halflings;src:url(/build/assets/glyphicons-halflings-regular-BUJKDMgK.eot);src:url(/build/assets/glyphicons-halflings-regular-BUJKDMgK.eot?#iefix)format("embedded-opentype"),url(/build/assets/glyphicons-halflings-regular-DzqM6ju8.woff2)format("woff2"),url(/build/assets/glyphicons-halflings-regular-BKjkU69z.woff)format("woff"),url(/build/assets/glyphicons-halflings-regular-DrwTMapi.ttf)format("truetype"),url(/build/assets/glyphicons-halflings-regular-CSehLiBc.svg#glyphicons_halflingsregular)format("svg")}.glyphicon{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-family:Glyphicons Halflings;font-style:normal;font-weight:400;line-height:1;display:inline-block;position:relative;top:1px}.glyphicon-asterisk:before{content:"*"}.glyphicon-plus:before{content:"+"}.glyphicon-eur:before,.glyphicon-euro:before{content:"€"}.glyphicon-minus:before{content:"−"}.glyphicon-cloud:before{content:"☁"}.glyphicon-envelope:before{content:"✉"}.glyphicon-pencil:before{content:"✏"}.glyphicon-glass:before{content:""}.glyphicon-music:before{content:""}.glyphicon-search:before{content:""}.glyphicon-heart:before{content:""}.glyphicon-star:before{content:""}.glyphicon-star-empty:before{content:""}.glyphicon-user:before{content:""}.glyphicon-film:before{content:""}.glyphicon-th-large:before{content:""}.glyphicon-th:before{content:""}.glyphicon-th-list:before{content:""}.glyphicon-ok:before{content:""}.glyphicon-remove:before{content:""}.glyphicon-zoom-in:before{content:""}.glyphicon-zoom-out:before{content:""}.glyphicon-off:before{content:""}.glyphicon-signal:before{content:""}.glyphicon-cog:before{content:""}.glyphicon-trash:before{content:""}.glyphicon-home:before{content:""}.glyphicon-file:before{content:""}.glyphicon-time:before{content:""}.glyphicon-road:before{content:""}.glyphicon-download-alt:before{content:""}.glyphicon-download:before{content:""}.glyphicon-upload:before{content:""}.glyphicon-inbox:before{content:""}.glyphicon-play-circle:before{content:""}.glyphicon-repeat:before{content:""}.glyphicon-refresh:before{content:""}.glyphicon-list-alt:before{content:""}.glyphicon-lock:before{content:""}.glyphicon-flag:before{content:""}.glyphicon-headphones:before{content:""}.glyphicon-volume-off:before{content:""}.glyphicon-volume-down:before{content:""}.glyphicon-volume-up:before{content:""}.glyphicon-qrcode:before{content:""}.glyphicon-barcode:before{content:""}.glyphicon-tag:before{content:""}.glyphicon-tags:before{content:""}.glyphicon-book:before{content:""}.glyphicon-bookmark:before{content:""}.glyphicon-print:before{content:""}.glyphicon-camera:before{content:""}.glyphicon-font:before{content:""}.glyphicon-bold:before{content:""}.glyphicon-italic:before{content:""}.glyphicon-text-height:before{content:""}.glyphicon-text-width:before{content:""}.glyphicon-align-left:before{content:""}.glyphicon-align-center:before{content:""}.glyphicon-align-right:before{content:""}.glyphicon-align-justify:before{content:""}.glyphicon-list:before{content:""}.glyphicon-indent-left:before{content:""}.glyphicon-indent-right:before{content:""}.glyphicon-facetime-video:before{content:""}.glyphicon-picture:before{content:""}.glyphicon-map-marker:before{content:""}.glyphicon-adjust:before{content:""}.glyphicon-tint:before{content:""}.glyphicon-edit:before{content:""}.glyphicon-share:before{content:""}.glyphicon-check:before{content:""}.glyphicon-move:before{content:""}.glyphicon-step-backward:before{content:""}.glyphicon-fast-backward:before{content:""}.glyphicon-backward:before{content:""}.glyphicon-play:before{content:""}.glyphicon-pause:before{content:""}.glyphicon-stop:before{content:""}.glyphicon-forward:before{content:""}.glyphicon-fast-forward:before{content:""}.glyphicon-step-forward:before{content:""}.glyphicon-eject:before{content:""}.glyphicon-chevron-left:before{content:""}.glyphicon-chevron-right:before{content:""}.glyphicon-plus-sign:before{content:""}.glyphicon-minus-sign:before{content:""}.glyphicon-remove-sign:before{content:""}.glyphicon-ok-sign:before{content:""}.glyphicon-question-sign:before{content:""}.glyphicon-info-sign:before{content:""}.glyphicon-screenshot:before{content:""}.glyphicon-remove-circle:before{content:""}.glyphicon-ok-circle:before{content:""}.glyphicon-ban-circle:before{content:""}.glyphicon-arrow-left:before{content:""}.glyphicon-arrow-right:before{content:""}.glyphicon-arrow-up:before{content:""}.glyphicon-arrow-down:before{content:""}.glyphicon-share-alt:before{content:""}.glyphicon-resize-full:before{content:""}.glyphicon-resize-small:before{content:""}.glyphicon-exclamation-sign:before{content:""}.glyphicon-gift:before{content:""}.glyphicon-leaf:before{content:""}.glyphicon-fire:before{content:""}.glyphicon-eye-open:before{content:""}.glyphicon-eye-close:before{content:""}.glyphicon-warning-sign:before{content:""}.glyphicon-plane:before{content:""}.glyphicon-calendar:before{content:""}.glyphicon-random:before{content:""}.glyphicon-comment:before{content:""}.glyphicon-magnet:before{content:""}.glyphicon-chevron-up:before{content:""}.glyphicon-chevron-down:before{content:""}.glyphicon-retweet:before{content:""}.glyphicon-shopping-cart:before{content:""}.glyphicon-folder-close:before{content:""}.glyphicon-folder-open:before{content:""}.glyphicon-resize-vertical:before{content:""}.glyphicon-resize-horizontal:before{content:""}.glyphicon-hdd:before{content:""}.glyphicon-bullhorn:before{content:""}.glyphicon-bell:before{content:""}.glyphicon-certificate:before{content:""}.glyphicon-thumbs-up:before{content:""}.glyphicon-thumbs-down:before{content:""}.glyphicon-hand-right:before{content:""}.glyphicon-hand-left:before{content:""}.glyphicon-hand-up:before{content:""}.glyphicon-hand-down:before{content:""}.glyphicon-circle-arrow-right:before{content:""}.glyphicon-circle-arrow-left:before{content:""}.glyphicon-circle-arrow-up:before{content:""}.glyphicon-circle-arrow-down:before{content:""}.glyphicon-globe:before{content:""}.glyphicon-wrench:before{content:""}.glyphicon-tasks:before{content:""}.glyphicon-filter:before{content:""}.glyphicon-briefcase:before{content:""}.glyphicon-fullscreen:before{content:""}.glyphicon-dashboard:before{content:""}.glyphicon-paperclip:before{content:""}.glyphicon-heart-empty:before{content:""}.glyphicon-link:before{content:""}.glyphicon-phone:before{content:""}.glyphicon-pushpin:before{content:""}.glyphicon-usd:before{content:""}.glyphicon-gbp:before{content:""}.glyphicon-sort:before{content:""}.glyphicon-sort-by-alphabet:before{content:""}.glyphicon-sort-by-alphabet-alt:before{content:""}.glyphicon-sort-by-order:before{content:""}.glyphicon-sort-by-order-alt:before{content:""}.glyphicon-sort-by-attributes:before{content:""}.glyphicon-sort-by-attributes-alt:before{content:""}.glyphicon-unchecked:before{content:""}.glyphicon-expand:before{content:""}.glyphicon-collapse-down:before{content:""}.glyphicon-collapse-up:before{content:""}.glyphicon-log-in:before{content:""}.glyphicon-flash:before{content:""}.glyphicon-log-out:before{content:""}.glyphicon-new-window:before{content:""}.glyphicon-record:before{content:""}.glyphicon-save:before{content:""}.glyphicon-open:before{content:""}.glyphicon-saved:before{content:""}.glyphicon-import:before{content:""}.glyphicon-export:before{content:""}.glyphicon-send:before{content:""}.glyphicon-floppy-disk:before{content:""}.glyphicon-floppy-saved:before{content:""}.glyphicon-floppy-remove:before{content:""}.glyphicon-floppy-save:before{content:""}.glyphicon-floppy-open:before{content:""}.glyphicon-credit-card:before{content:""}.glyphicon-transfer:before{content:""}.glyphicon-cutlery:before{content:""}.glyphicon-header:before{content:""}.glyphicon-compressed:before{content:""}.glyphicon-earphone:before{content:""}.glyphicon-phone-alt:before{content:""}.glyphicon-tower:before{content:""}.glyphicon-stats:before{content:""}.glyphicon-sd-video:before{content:""}.glyphicon-hd-video:before{content:""}.glyphicon-subtitles:before{content:""}.glyphicon-sound-stereo:before{content:""}.glyphicon-sound-dolby:before{content:""}.glyphicon-sound-5-1:before{content:""}.glyphicon-sound-6-1:before{content:""}.glyphicon-sound-7-1:before{content:""}.glyphicon-copyright-mark:before{content:""}.glyphicon-registration-mark:before{content:""}.glyphicon-cloud-download:before{content:""}.glyphicon-cloud-upload:before{content:""}.glyphicon-tree-conifer:before{content:""}.glyphicon-tree-deciduous:before{content:""}.glyphicon-cd:before{content:""}.glyphicon-save-file:before{content:""}.glyphicon-open-file:before{content:""}.glyphicon-level-up:before{content:""}.glyphicon-copy:before{content:""}.glyphicon-paste:before{content:""}.glyphicon-alert:before{content:""}.glyphicon-equalizer:before{content:""}.glyphicon-king:before{content:""}.glyphicon-queen:before{content:""}.glyphicon-pawn:before{content:""}.glyphicon-bishop:before{content:""}.glyphicon-knight:before{content:""}.glyphicon-baby-formula:before{content:""}.glyphicon-tent:before{content:"⛺"}.glyphicon-blackboard:before{content:""}.glyphicon-bed:before{content:""}.glyphicon-apple:before{content:""}.glyphicon-erase:before{content:""}.glyphicon-hourglass:before{content:"⌛"}.glyphicon-lamp:before{content:""}.glyphicon-duplicate:before{content:""}.glyphicon-piggy-bank:before{content:""}.glyphicon-scissors:before{content:""}.glyphicon-bitcoin:before,.glyphicon-btc:before,.glyphicon-xbt:before{content:""}.glyphicon-yen:before,.glyphicon-jpy:before{content:"¥"}.glyphicon-ruble:before,.glyphicon-rub:before{content:"₽"}.glyphicon-scale:before{content:""}.glyphicon-ice-lolly:before{content:""}.glyphicon-ice-lolly-tasted:before{content:""}.glyphicon-education:before{content:""}.glyphicon-option-horizontal:before{content:""}.glyphicon-option-vertical:before{content:""}.glyphicon-menu-hamburger:before{content:""}.glyphicon-modal-window:before{content:""}.glyphicon-oil:before{content:""}.glyphicon-grain:before{content:""}.glyphicon-sunglasses:before{content:""}.glyphicon-text-size:before{content:""}.glyphicon-text-color:before{content:""}.glyphicon-text-background:before{content:""}.glyphicon-object-align-top:before{content:""}.glyphicon-object-align-bottom:before{content:""}.glyphicon-object-align-horizontal:before{content:""}.glyphicon-object-align-left:before{content:""}.glyphicon-object-align-vertical:before{content:""}.glyphicon-object-align-right:before{content:""}.glyphicon-triangle-right:before{content:""}.glyphicon-triangle-left:before{content:""}.glyphicon-triangle-bottom:before{content:""}.glyphicon-triangle-top:before{content:""}.glyphicon-console:before{content:""}.glyphicon-superscript:before{content:""}.glyphicon-subscript:before{content:""}.glyphicon-menu-left:before{content:""}.glyphicon-menu-right:before{content:""}.glyphicon-menu-down:before{content:""}.glyphicon-menu-up:before{content:""}*,:after,:before{box-sizing:border-box}html{-webkit-tap-highlight-color:#0000;font-size:10px}body{color:#333;background-color:#fff;font-family:Helvetica Neue,Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{max-width:100%;height:auto;display:block}.img-rounded{border-radius:6px}.img-thumbnail{-o-transition:all .2s ease-in-out;background-color:#fff;border:1px solid #ddd;border-radius:4px;max-width:100%;height:auto;padding:4px;line-height:1.42857;transition:all .2s ease-in-out;display:inline-block}.img-circle{border-radius:50%}hr{border:0;border-top:1px solid #eee;margin-top:20px;margin-bottom:20px}.sr-only{clip:rect(0,0,0,0);border:0;width:1px;height:1px;margin:-1px;padding:0;position:absolute;overflow:hidden}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;width:auto;height:auto;margin:0;position:static;overflow:visible}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{color:inherit;font-family:inherit;font-weight:500;line-height:1.1}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{color:#777;font-weight:400;line-height:1}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (width>=768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{background-color:#fcf8e3;padding:.2em}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{border-bottom:1px solid #eee;margin:40px 0 20px;padding-bottom:9px}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{margin-left:-5px;padding-left:0;list-style:none}.list-inline>li{padding-left:5px;padding-right:5px;display:inline-block}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857}dt{font-weight:700}dd{margin-left:0}@media (width>=768px){.dl-horizontal dt{float:left;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap;width:160px;overflow:hidden}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help}.initialism{text-transform:uppercase;font-size:90%}blockquote{border-left:5px solid #eee;margin:0 0 20px;padding:10px 20px;font-size:17.5px}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{color:#777;font-size:80%;line-height:1.42857;display:block}blockquote .small:before,blockquote footer:before,blockquote small:before{content:"— "}.blockquote-reverse,blockquote.pull-right{text-align:right;border-left:0;border-right:5px solid #eee;padding-left:0;padding-right:15px}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:""}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:" —"}address{margin-bottom:20px;font-style:normal;line-height:1.42857}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,Courier New,monospace}code{color:#c7254e;background-color:#f9f2f4;border-radius:4px;padding:2px 4px;font-size:90%}kbd{color:#fff;background-color:#333;border-radius:3px;padding:2px 4px;font-size:90%;box-shadow:inset 0 -1px #00000040}kbd kbd{-webkit-box-shadow:none;box-shadow:none;padding:0;font-size:100%;font-weight:700}pre{color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px;margin:0 0 10px;padding:9.5px;font-size:13px;line-height:1.42857;display:block}pre code{font-size:inherit;color:inherit;white-space:pre-wrap;background-color:#0000;border-radius:0;padding:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{margin-left:auto;margin-right:auto;padding-left:15px;padding-right:15px}@media (width>=768px){.container{width:750px}}@media (width>=992px){.container{width:970px}}@media (width>=1200px){.container{width:1170px}}.container-fluid{margin-left:auto;margin-right:auto;padding-left:15px;padding-right:15px}.row{margin-left:-15px;margin-right:-15px}.row-no-gutters{margin-left:0;margin-right:0}.row-no-gutters [class*=col-]{padding-left:0;padding-right:0}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{min-height:1px;padding-left:15px;padding-right:15px;position:relative}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.6667%}.col-xs-10{width:83.3333%}.col-xs-9{width:75%}.col-xs-8{width:66.6667%}.col-xs-7{width:58.3333%}.col-xs-6{width:50%}.col-xs-5{width:41.6667%}.col-xs-4{width:33.3333%}.col-xs-3{width:25%}.col-xs-2{width:16.6667%}.col-xs-1{width:8.33333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.6667%}.col-xs-pull-10{right:83.3333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.6667%}.col-xs-pull-7{right:58.3333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.6667%}.col-xs-pull-4{right:33.3333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.6667%}.col-xs-pull-1{right:8.33333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.6667%}.col-xs-push-10{left:83.3333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.6667%}.col-xs-push-7{left:58.3333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.6667%}.col-xs-push-4{left:33.3333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.6667%}.col-xs-push-1{left:8.33333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.6667%}.col-xs-offset-10{margin-left:83.3333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.6667%}.col-xs-offset-7{margin-left:58.3333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.6667%}.col-xs-offset-4{margin-left:33.3333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.6667%}.col-xs-offset-1{margin-left:8.33333%}.col-xs-offset-0{margin-left:0}@media (width>=768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.6667%}.col-sm-10{width:83.3333%}.col-sm-9{width:75%}.col-sm-8{width:66.6667%}.col-sm-7{width:58.3333%}.col-sm-6{width:50%}.col-sm-5{width:41.6667%}.col-sm-4{width:33.3333%}.col-sm-3{width:25%}.col-sm-2{width:16.6667%}.col-sm-1{width:8.33333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.6667%}.col-sm-pull-10{right:83.3333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.6667%}.col-sm-pull-7{right:58.3333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.6667%}.col-sm-pull-4{right:33.3333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.6667%}.col-sm-pull-1{right:8.33333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.6667%}.col-sm-push-10{left:83.3333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.6667%}.col-sm-push-7{left:58.3333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.6667%}.col-sm-push-4{left:33.3333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.6667%}.col-sm-push-1{left:8.33333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.6667%}.col-sm-offset-10{margin-left:83.3333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.6667%}.col-sm-offset-7{margin-left:58.3333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.6667%}.col-sm-offset-4{margin-left:33.3333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.6667%}.col-sm-offset-1{margin-left:8.33333%}.col-sm-offset-0{margin-left:0}}@media (width>=992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.6667%}.col-md-10{width:83.3333%}.col-md-9{width:75%}.col-md-8{width:66.6667%}.col-md-7{width:58.3333%}.col-md-6{width:50%}.col-md-5{width:41.6667%}.col-md-4{width:33.3333%}.col-md-3{width:25%}.col-md-2{width:16.6667%}.col-md-1{width:8.33333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.6667%}.col-md-pull-10{right:83.3333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.6667%}.col-md-pull-7{right:58.3333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.6667%}.col-md-pull-4{right:33.3333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.6667%}.col-md-pull-1{right:8.33333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.6667%}.col-md-push-10{left:83.3333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.6667%}.col-md-push-7{left:58.3333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.6667%}.col-md-push-4{left:33.3333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.6667%}.col-md-push-1{left:8.33333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.6667%}.col-md-offset-10{margin-left:83.3333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.6667%}.col-md-offset-7{margin-left:58.3333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.6667%}.col-md-offset-4{margin-left:33.3333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.6667%}.col-md-offset-1{margin-left:8.33333%}.col-md-offset-0{margin-left:0}}@media (width>=1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.6667%}.col-lg-10{width:83.3333%}.col-lg-9{width:75%}.col-lg-8{width:66.6667%}.col-lg-7{width:58.3333%}.col-lg-6{width:50%}.col-lg-5{width:41.6667%}.col-lg-4{width:33.3333%}.col-lg-3{width:25%}.col-lg-2{width:16.6667%}.col-lg-1{width:8.33333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.6667%}.col-lg-pull-10{right:83.3333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.6667%}.col-lg-pull-7{right:58.3333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.6667%}.col-lg-pull-4{right:33.3333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.6667%}.col-lg-pull-1{right:8.33333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.6667%}.col-lg-push-10{left:83.3333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.6667%}.col-lg-push-7{left:58.3333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.6667%}.col-lg-push-4{left:33.3333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.6667%}.col-lg-push-1{left:8.33333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.6667%}.col-lg-offset-10{margin-left:83.3333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.6667%}.col-lg-offset-7{margin-left:58.3333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.6667%}.col-lg-offset-4{margin-left:33.3333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.6667%}.col-lg-offset-1{margin-left:8.33333%}.col-lg-offset-0{margin-left:0}}table{background-color:#0000}table col[class*=col-]{float:none;display:table-column;position:static}table td[class*=col-],table th[class*=col-]{float:none;display:table-cell;position:static}caption{color:#777;text-align:left;padding-top:8px;padding-bottom:8px}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{vertical-align:top;border-top:1px solid #ddd;padding:8px;line-height:1.42857}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered,.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover,.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (width<=767px){.table-responsive{-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd;width:100%;margin-bottom:15px;overflow-y:hidden}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{border:0;min-width:0;margin:0;padding:0}legend{width:100%;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5;margin-bottom:20px;padding:0;display:block}label{max-width:100%;margin-bottom:5px;font-weight:700;display:inline-block}input[type=search]{box-sizing:border-box;appearance:none}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9 ;line-height:normal}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}input[type=file]{display:block}input[type=range]{width:100%;display:block}select[multiple],select[size]{height:auto}input[type=checkbox]:focus,input[type=file]:focus,input[type=radio]:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{color:#555;padding-top:7px;font-size:14px;line-height:1.42857;display:block}.form-control{color:#555;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;display:block;box-shadow:inset 0 1px 1px #00000013}.form-control:focus{border-color:#66afe9;outline:0;box-shadow:inset 0 1px 1px #00000013,0 0 8px #66afe999}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-placeholder-shown{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control::-ms-expand{background-color:#0000;border:0}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{opacity:1;background-color:#eee}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}@media screen and (-webkit-device-pixel-ratio>=0){input[type=date].form-control,input[type=datetime-local].form-control,input[type=month].form-control,input[type=time].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],.input-group-sm input[type=time],input[type=date].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm,input[type=time].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],.input-group-lg input[type=time],input[type=date].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg,input[type=time].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{margin-top:10px;margin-bottom:10px;display:block;position:relative}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.checkbox label,.radio label{cursor:pointer;min-height:20px;margin-bottom:0;padding-left:20px;font-weight:400}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{margin-top:4px\9 ;margin-left:-20px;position:absolute}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{vertical-align:middle;cursor:pointer;margin-bottom:0;padding-left:20px;font-weight:400;display:inline-block;position:relative}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}.form-control-static{min-height:34px;margin-bottom:0;padding-top:7px;padding-bottom:7px}.form-control-static.input-lg,.form-control-static.input-sm{padding-left:0;padding-right:0}.input-sm{border-radius:3px;height:30px;padding:5px 10px;font-size:12px;line-height:1.5}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{border-radius:3px;height:30px;padding:5px 10px;font-size:12px;line-height:1.5}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{border-radius:6px;height:46px;padding:10px 16px;font-size:18px;line-height:1.33333}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{border-radius:6px;height:46px;padding:10px 16px;font-size:18px;line-height:1.33333}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.33333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{z-index:2;text-align:center;pointer-events:none;width:34px;height:34px;line-height:34px;display:block;position:absolute;top:0;right:0}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;box-shadow:inset 0 1px 1px #00000013}.has-success .form-control:focus{border-color:#2b542c;box-shadow:inset 0 1px 1px #00000013,0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;box-shadow:inset 0 1px 1px #00000013}.has-warning .form-control:focus{border-color:#66512c;box-shadow:inset 0 1px 1px #00000013,0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;box-shadow:inset 0 1px 1px #00000013}.has-error .form-control:focus{border-color:#843534;box-shadow:inset 0 1px 1px #00000013,0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{color:#737373;margin-top:5px;margin-bottom:10px;display:block}@media (width>=768px){.form-inline .form-group{vertical-align:middle;margin-bottom:0;display:inline-block}.form-inline .form-control{vertical-align:middle;width:auto;display:inline-block}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{vertical-align:middle;display:inline-table}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{vertical-align:middle;margin-bottom:0}.form-inline .checkbox,.form-inline .radio{vertical-align:middle;margin-top:0;margin-bottom:0;display:inline-block}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{margin-left:0;position:relative}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{margin-top:0;margin-bottom:0;padding-top:7px}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-left:-15px;margin-right:-15px}@media (width>=768px){.form-horizontal .control-label{text-align:right;margin-bottom:0;padding-top:7px}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (width>=768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;user-select:none;background-image:none;border:1px solid #0000;border-radius:4px;margin-bottom:0;padding:6px 12px;font-size:14px;font-weight:400;line-height:1.42857;display:inline-block}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;box-shadow:inset 0 3px 5px #00000020}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);opacity:.65;-webkit-box-shadow:none;box-shadow:none}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;background-image:none;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;background-image:none;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;background-image:none;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;background-image:none;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;background-image:none;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;background-image:none;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{color:#337ab7;border-radius:0;font-weight:400}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{-webkit-box-shadow:none;box-shadow:none;background-color:#0000}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:#0000}.btn-link:focus,.btn-link:hover{color:#23527c;background-color:#0000;text-decoration:underline}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{border-radius:6px;padding:10px 16px;font-size:18px;line-height:1.33333}.btn-group-sm>.btn,.btn-sm{border-radius:3px;padding:5px 10px;font-size:12px;line-height:1.5}.btn-group-xs>.btn,.btn-xs{border-radius:3px;padding:1px 5px;font-size:12px;line-height:1.5}.btn-block{width:100%;display:block}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{-o-transition-property:height,visibility;-o-transition-duration:.35s;-o-transition-timing-function:ease;height:0;transition-property:height,visibility;transition-duration:.35s;transition-timing-function:ease;position:relative;overflow:hidden}.caret{vertical-align:middle;border-top:4px dashed;border-top:4px solid\9 ;border-left:4px solid #0000;border-right:4px solid #0000;width:0;height:0;margin-left:2px;display:inline-block}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{z-index:1000;float:left;text-align:left;background-color:#fff;background-clip:padding-box;border:1px solid #00000026;border-radius:4px;min-width:160px;margin:2px 0 0;padding:5px 0;font-size:14px;list-style:none;display:none;position:absolute;top:100%;left:0;box-shadow:0 6px 12px #0000002d}.dropdown-menu.pull-right{left:auto;right:0}.dropdown-menu .divider{background-color:#e5e5e5;height:1px;margin:9px 0;overflow:hidden}.dropdown-menu>li>a{clear:both;color:#333;white-space:nowrap;padding:3px 20px;font-weight:400;line-height:1.42857;display:block}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;background-color:#f5f5f5;text-decoration:none}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;background-color:#337ab7;outline:0;text-decoration:none}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{cursor:not-allowed;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-color:#0000;background-image:none;text-decoration:none}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{left:auto;right:0}.dropdown-menu-left{left:0;right:auto}.dropdown-header{color:#777;white-space:nowrap;padding:3px 20px;font-size:12px;line-height:1.42857;display:block}.dropdown-backdrop{z-index:990;position:fixed;inset:0}.pull-right>.dropdown-menu{left:auto;right:0}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9 }.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{margin-bottom:2px;top:auto;bottom:100%}@media (width>=768px){.navbar-right .dropdown-menu{left:auto;right:0}.navbar-right .dropdown-menu-left{left:0;right:auto}}.btn-group,.btn-group-vertical{vertical-align:middle;display:inline-block;position:relative}.btn-group-vertical>.btn,.btn-group>.btn{float:left;position:relative}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-left:12px;padding-right:12px}.btn-group.open .dropdown-toggle{box-shadow:inset 0 3px 5px #00000020}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{float:none;width:100%;max-width:100%;display:block}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-radius:4px 4px 0 0}.btn-group-vertical>.btn:last-child:not(:first-child){border-radius:0 0 4px 4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{table-layout:fixed;border-collapse:separate;width:100%;display:table}.btn-group-justified>.btn,.btn-group-justified>.btn-group{float:none;width:1%;display:table-cell}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{clip:rect(0,0,0,0);pointer-events:none;position:absolute}.input-group{border-collapse:separate;display:table;position:relative}.input-group[class*=col-]{float:none;padding-left:0;padding-right:0}.input-group .form-control{z-index:2;float:left;width:100%;margin-bottom:0;position:relative}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{border-radius:6px;height:46px;padding:10px 16px;font-size:18px;line-height:1.33333}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{border-radius:3px;height:30px;padding:5px 10px;font-size:12px;line-height:1.5}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{white-space:nowrap;vertical-align:middle;width:1%}.input-group-addon{color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px;padding:6px 12px;font-size:14px;font-weight:400;line-height:1}.input-group-addon.input-sm{border-radius:3px;padding:5px 10px;font-size:12px}.input-group-addon.input-lg{border-radius:6px;padding:10px 16px;font-size:18px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{white-space:nowrap;font-size:0;position:relative}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{margin-bottom:0;padding-left:0;list-style:none}.nav>li{display:block;position:relative}.nav>li>a{padding:10px 15px;display:block;position:relative}.nav>li>a:focus,.nav>li>a:hover{background-color:#eee;text-decoration:none}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;cursor:not-allowed;background-color:#0000;text-decoration:none}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{background-color:#e5e5e5;height:1px;margin:9px 0;overflow:hidden}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{border:1px solid #0000;border-radius:4px 4px 0 0;margin-right:2px;line-height:1.42857}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:#0000}.nav-tabs.nav-justified{border-bottom:0;width:100%}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (width>=768px){.nav-tabs.nav-justified>li{width:1%;display:table-cell}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{border-radius:4px;margin-right:0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (width>=768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (width>=768px){.nav-justified>li{width:1%;display:table-cell}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{border-radius:4px;margin-right:0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (width>=768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{border-top-left-radius:0;border-top-right-radius:0;margin-top:-1px}.navbar{border:1px solid #0000;min-height:50px;margin-bottom:20px;position:relative}@media (width>=768px){.navbar{border-radius:4px}.navbar-header{float:left}}.navbar-collapse{-webkit-overflow-scrolling:touch;border-top:1px solid #0000;padding-left:15px;padding-right:15px;overflow-x:visible;box-shadow:inset 0 1px #ffffff1a}.navbar-collapse.in{overflow-y:auto}@media (width>=768px){.navbar-collapse{width:auto;-webkit-box-shadow:none;box-shadow:none;border-top:0}.navbar-collapse.collapse{padding-bottom:0;height:auto!important;display:block!important;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-left:0;padding-right:0}}.navbar-fixed-bottom,.navbar-fixed-top{z-index:1030;position:fixed;left:0;right:0}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (device-width<=480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}@media (width>=768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{border-width:0 0 1px;top:0}.navbar-fixed-bottom{border-width:1px 0 0;margin-bottom:0;bottom:0}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-left:-15px;margin-right:-15px}@media (width>=768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-left:0;margin-right:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (width>=768px){.navbar-static-top{border-radius:0}}.navbar-brand{float:left;height:50px;padding:15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (width>=768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{float:right;background-color:#0000;background-image:none;border:1px solid #0000;border-radius:4px;margin-top:8px;margin-bottom:8px;margin-right:15px;padding:9px 10px;position:relative}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{border-radius:1px;width:22px;height:2px;display:block}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (width>=768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (width<=767px){.navbar-nav .open .dropdown-menu{float:none;width:auto;-webkit-box-shadow:none;box-shadow:none;background-color:#0000;border:0;margin-top:0;position:static}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (width>=768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{border-top:1px solid #0000;border-bottom:1px solid #0000;margin:8px -15px;padding:10px 15px;box-shadow:inset 0 1px #ffffff1a,0 1px #ffffff1a}@media (width>=768px){.navbar-form .form-group{vertical-align:middle;margin-bottom:0;display:inline-block}.navbar-form .form-control{vertical-align:middle;width:auto;display:inline-block}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{vertical-align:middle;display:inline-table}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{vertical-align:middle;margin-bottom:0}.navbar-form .checkbox,.navbar-form .radio{vertical-align:middle;margin-top:0;margin-bottom:0;display:inline-block}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{margin-left:0;position:relative}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (width<=767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (width>=768px){.navbar-form{width:auto;-webkit-box-shadow:none;box-shadow:none;border:0;margin-left:0;margin-right:0;padding-top:0;padding-bottom:0}}.navbar-nav>li>.dropdown-menu{border-top-left-radius:0;border-top-right-radius:0;margin-top:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-radius:4px 4px 0 0;margin-bottom:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (width>=768px){.navbar-text{float:left;margin-left:15px;margin-right:15px}.navbar-left{float:left!important}.navbar-right{margin-right:-15px;float:right!important}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:#0000}.navbar-default .navbar-text,.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:#0000}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:#0000}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (width<=767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:#0000}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:#0000}}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:#0000}.navbar-inverse .navbar-text,.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:#0000}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:#0000}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (width<=767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:#0000}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:#0000}}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{background-color:#f5f5f5;border-radius:4px;margin-bottom:20px;padding:8px 15px;list-style:none}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{color:#ccc;content:"/ ";padding:0 5px}.breadcrumb>.active{color:#777}.pagination{border-radius:4px;margin:20px 0;padding-left:0;display:inline-block}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{float:left;color:#337ab7;background-color:#fff;border:1px solid #ddd;margin-left:-1px;padding:6px 12px;line-height:1.42857;text-decoration:none;position:relative}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{border-top-left-radius:4px;border-bottom-left-radius:4px;margin-left:0}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.33333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{text-align:center;margin:20px 0;padding-left:0;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{background-color:#fff;border:1px solid #ddd;border-radius:15px;padding:5px 14px;display:inline-block}.pager li>a:focus,.pager li>a:hover{background-color:#eee;text-decoration:none}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;display:inline}a.label:focus,a.label:hover{color:#fff;cursor:pointer;text-decoration:none}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;display:inline-block}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{padding:1px 5px;top:0}a.badge:focus,a.badge:hover{color:#fff;cursor:pointer;text-decoration:none}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{color:inherit;background-color:#eee;margin-bottom:30px;padding-top:30px;padding-bottom:30px}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px;padding-left:15px;padding-right:15px}.jumbotron .container{max-width:100%}@media screen and (width>=768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-left:60px;padding-right:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{-o-transition:border .2s ease-in-out;background-color:#fff;border:1px solid #ddd;border-radius:4px;margin-bottom:20px;padding:4px;line-height:1.42857;transition:border .2s ease-in-out;display:block}.thumbnail a>img,.thumbnail>img{margin-left:auto;margin-right:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{color:#333;padding:9px}.alert{border:1px solid #0000;border-radius:4px;margin-bottom:20px;padding:15px}.alert h4{color:inherit;margin-top:0}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{color:inherit;position:relative;top:-2px;right:-21px}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@keyframes progress-bar-stripes{0%{background-position:40px 0}to{background-position:0 0}}.progress{background-color:#f5f5f5;border-radius:4px;height:20px;margin-bottom:20px;overflow:hidden;box-shadow:inset 0 1px 2px #0000001a}.progress-bar{float:left;color:#fff;text-align:center;-o-transition:width .6s ease;background-color:#337ab7;width:0%;height:100%;font-size:12px;line-height:20px;transition:width .6s;box-shadow:inset 0 -1px #00000026}.progress-bar-striped,.progress-striped .progress-bar{-webkit-background-size:40px 40px;background-image:linear-gradient(45deg,#ffffff26 25%,#0000 25% 50%,#ffffff26 50% 75%,#0000 75%,#0000);background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{animation:2s linear infinite progress-bar-stripes}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:linear-gradient(45deg,#ffffff26 25%,#0000 25% 50%,#ffffff26 50% 75%,#0000 75%,#0000)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:linear-gradient(45deg,#ffffff26 25%,#0000 25% 50%,#ffffff26 50% 75%,#0000 75%,#0000)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:linear-gradient(45deg,#ffffff26 25%,#0000 25% 50%,#ffffff26 50% 75%,#0000 75%,#0000)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:linear-gradient(45deg,#ffffff26 25%,#0000 25% 50%,#ffffff26 50% 75%,#0000 75%,#0000)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{zoom:1;overflow:hidden}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{vertical-align:top;display:table-cell}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{margin-bottom:20px;padding-left:0}.list-group-item{background-color:#fff;border:1px solid #ddd;margin-bottom:-1px;padding:10px 15px;display:block;position:relative}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{border-bottom-right-radius:4px;border-bottom-left-radius:4px;margin-bottom:0}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;background-color:#f5f5f5;text-decoration:none}button.list-group-item{text-align:left;width:100%}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{background-color:#fff;border:1px solid #0000;border-radius:4px;margin-bottom:20px;box-shadow:0 1px 1px #0000000d}.panel-body{padding:15px}.panel-heading{border-bottom:1px solid #0000;border-top-left-radius:3px;border-top-right-radius:3px;padding:10px 15px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{color:inherit;margin-top:0;margin-bottom:0;font-size:16px}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px;padding:10px 15px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child,.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-left:15px;padding-right:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th,.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{border:0;margin-bottom:0}.panel-group{margin-bottom:20px}.panel-group .panel{border-radius:4px;margin-bottom:0}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{height:0;padding:0;display:block;position:relative;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{border:0;width:100%;height:100%;position:absolute;top:0;bottom:0;left:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;min-height:20px;margin-bottom:20px;padding:19px;box-shadow:inset 0 1px 1px #0000000d}.well blockquote{border-color:#00000026}.well-lg{border-radius:6px;padding:24px}.well-sm{border-radius:3px;padding:9px}.close{float:right;color:#000;text-shadow:0 1px #fff;filter:alpha(opacity=20);opacity:.2;font-size:21px;font-weight:700;line-height:1}.close:focus,.close:hover{color:#000;cursor:pointer;filter:alpha(opacity=50);opacity:.5;text-decoration:none}button.close{cursor:pointer;appearance:none;background:0 0;border:0;padding:0}.modal-open{overflow:hidden}.modal{z-index:1050;-webkit-overflow-scrolling:touch;outline:0;display:none;position:fixed;inset:0;overflow:hidden}.modal.fade .modal-dialog{-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;transform:translateY(-25%)}.modal.in .modal-dialog{transform:translate(0)}.modal-open .modal{overflow:hidden auto}.modal-dialog{width:auto;margin:10px;position:relative}.modal-content{background-color:#fff;background-clip:padding-box;border:1px solid #0003;border-radius:6px;outline:0;position:relative;box-shadow:0 3px 9px #00000080}.modal-backdrop{z-index:1040;background-color:#000;position:fixed;inset:0}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{border-bottom:1px solid #e5e5e5;padding:15px}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857}.modal-body{padding:15px;position:relative}.modal-footer{text-align:right;border-top:1px solid #e5e5e5;padding:15px}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{width:50px;height:50px;position:absolute;top:-9999px;overflow:scroll}@media (width>=768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{box-shadow:0 5px 15px #00000080}.modal-sm{width:300px}}@media (width>=992px){.modal-lg{width:900px}}.tooltip{z-index:1070;line-break:auto;text-align:left;text-align:start;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;font-family:Helvetica Neue,Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857;text-decoration:none;display:block;position:absolute}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{margin-top:-3px;padding:5px 0}.tooltip.right{margin-left:3px;padding:0 5px}.tooltip.bottom{margin-top:3px;padding:5px 0}.tooltip.left{margin-left:-3px;padding:0 5px}.tooltip.top .tooltip-arrow{border-width:5px 5px 0;border-top-color:#000;margin-left:-5px;bottom:0;left:50%}.tooltip.top-left .tooltip-arrow{border-width:5px 5px 0;border-top-color:#000;margin-bottom:-5px;bottom:0;right:5px}.tooltip.top-right .tooltip-arrow{border-width:5px 5px 0;border-top-color:#000;margin-bottom:-5px;bottom:0;left:5px}.tooltip.right .tooltip-arrow{border-width:5px 5px 5px 0;border-right-color:#000;margin-top:-5px;top:50%;left:0}.tooltip.left .tooltip-arrow{border-width:5px 0 5px 5px;border-left-color:#000;margin-top:-5px;top:50%;right:0}.tooltip.bottom .tooltip-arrow{border-width:0 5px 5px;border-bottom-color:#000;margin-left:-5px;top:0;left:50%}.tooltip.bottom-left .tooltip-arrow{border-width:0 5px 5px;border-bottom-color:#000;margin-top:-5px;top:0;right:5px}.tooltip.bottom-right .tooltip-arrow{border-width:0 5px 5px;border-bottom-color:#000;margin-top:-5px;top:0;left:5px}.tooltip-inner{color:#fff;text-align:center;background-color:#000;border-radius:4px;max-width:200px;padding:3px 8px}.tooltip-arrow{border-style:solid;border-color:#0000;width:0;height:0;position:absolute}.popover{z-index:1060;line-break:auto;text-align:left;text-align:start;max-width:276px;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;background-clip:padding-box;border:1px solid #0003;border-radius:6px;padding:1px;font-family:Helvetica Neue,Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857;text-decoration:none;display:none;position:absolute;top:0;left:0;box-shadow:0 5px 10px #0003}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover>.arrow{border-width:11px}.popover>.arrow,.popover>.arrow:after{border-style:solid;border-color:#0000;width:0;height:0;display:block;position:absolute}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{border-top-color:#00000040;border-bottom-width:0;margin-left:-11px;bottom:-11px;left:50%}.popover.top>.arrow:after{content:" ";border-top-color:#fff;border-bottom-width:0;margin-left:-10px;bottom:1px}.popover.right>.arrow{border-left-width:0;border-right-color:#00000040;margin-top:-11px;top:50%;left:-11px}.popover.right>.arrow:after{content:" ";border-left-width:0;border-right-color:#fff;bottom:-10px;left:1px}.popover.bottom>.arrow{border-top-width:0;border-bottom-color:#00000040;margin-left:-11px;top:-11px;left:50%}.popover.bottom>.arrow:after{content:" ";border-top-width:0;border-bottom-color:#fff;margin-left:-10px;top:1px}.popover.left>.arrow{border-left-color:#00000040;border-right-width:0;margin-top:-11px;top:50%;right:-11px}.popover.left>.arrow:after{content:" ";border-left-color:#fff;border-right-width:0;bottom:-10px;right:1px}.popover-title{background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0;margin:0;padding:8px 14px;font-size:14px}.popover-content{padding:9px 14px}.carousel{position:relative}.carousel-inner{width:100%;position:relative;overflow:hidden}.carousel-inner>.item{-o-transition:.6s ease-in-out left;transition:left .6s ease-in-out;display:none;position:relative}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-o-transition:-o-transform .6s ease-in-out;backface-visibility:hidden;perspective:1000px;transition:transform .6s ease-in-out}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;transform:translate(100%)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;transform:translate(-100%)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;transform:translate(0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{width:100%;position:absolute;top:0}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{color:#fff;text-align:center;text-shadow:0 1px 2px #0009;width:15%;filter:alpha(opacity=50);opacity:.5;background-color:#0000;font-size:20px;position:absolute;top:0;bottom:0;left:0}.carousel-control.left{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#80000000", endColorstr="#00000000", GradientType=1);background-image:linear-gradient(90deg,#00000080 0,#0000 100%);background-repeat:repeat-x}.carousel-control.right{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#00000000", endColorstr="#80000000", GradientType=1);background-image:linear-gradient(90deg,#0000 0,#00000080 100%);background-repeat:repeat-x;left:auto;right:0}.carousel-control:focus,.carousel-control:hover{color:#fff;filter:alpha(opacity=90);opacity:.9;outline:0;text-decoration:none}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{z-index:5;margin-top:-10px;display:inline-block;position:absolute;top:50%}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px;left:50%}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px;right:50%}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:"‹"}.carousel-control .icon-next:before{content:"›"}.carousel-indicators{z-index:15;text-align:center;width:60%;margin-left:-30%;padding-left:0;list-style:none;position:absolute;bottom:10px;left:50%}.carousel-indicators li{text-indent:-999px;cursor:pointer;background-color:#000\9 ;background-color:#0000;border:1px solid #fff;border-radius:10px;width:10px;height:10px;margin:1px;display:inline-block}.carousel-indicators .active{background-color:#fff;width:12px;height:12px;margin:0}.carousel-caption{z-index:10;color:#fff;text-align:center;text-shadow:0 1px 2px #0009;padding-top:20px;padding-bottom:20px;position:absolute;bottom:20px;left:15%;right:15%}.carousel-caption .btn{text-shadow:none}@media screen and (width>=768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{padding-bottom:30px;left:20%;right:20%}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{content:" ";display:table}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{margin-left:auto;margin-right:auto;display:block}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:#0000;text-shadow:none;background-color:#0000;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs,.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (width<=767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}.visible-xs-block{display:block!important}.visible-xs-inline{display:inline!important}.visible-xs-inline-block{display:inline-block!important}}@media (width>=768px) and (width<=991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}.visible-sm-block{display:block!important}.visible-sm-inline{display:inline!important}.visible-sm-inline-block{display:inline-block!important}}@media (width>=992px) and (width<=1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}.visible-md-block{display:block!important}.visible-md-inline{display:inline!important}.visible-md-inline-block{display:inline-block!important}}@media (width>=1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}.visible-lg-block{display:block!important}.visible-lg-inline{display:inline!important}.visible-lg-inline-block{display:inline-block!important}}@media (width<=767px){.hidden-xs{display:none!important}}@media (width>=768px) and (width<=991px){.hidden-sm{display:none!important}}@media (width>=992px) and (width<=1199px){.hidden-md{display:none!important}}@media (width>=1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}.hidden-print{display:none!important}}.lnms-input{border-style:var(--tw-border-style);border-width:1px;border-color:var(--tw-color-gray-300);background-color:var(--tw-color-white);width:100%;height:30px;padding-inline:calc(var(--tw-spacing) * 2.5);border-radius:3px;display:block;color:var(--tw-color-gray-700)!important}.lnms-input::placeholder{color:var(--tw-color-gray-400)}.lnms-input:focus{border-color:var(--tw-color-blue-500);--tw-ring-shadow:var(--tw-ring-inset,) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color,currentcolor);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);--tw-ring-color:var(--tw-color-blue-500);--tw-outline-style:none;outline-style:none}.lnms-input:disabled{cursor:not-allowed;background-color:var(--tw-color-gray-100)}}@layer utilities{.tw\:pointer-events-none{pointer-events:none}.tw\:sr-only{clip-path:inset(50%);white-space:nowrap;border-width:0;width:1px;height:1px;margin:-1px;padding:0;position:absolute;overflow:hidden}.tw\:absolute{position:absolute}.tw\:fixed{position:fixed}.tw\:relative{position:relative}.tw\:inset-0{inset:0}.tw\:inset-y-0{inset-block:0}.tw\:-top-0\.5{top:calc(var(--tw-spacing) * -.5)}.tw\:-top-px{top:-1px}.tw\:top-0{top:0}.tw\:top-0\.5{top:calc(var(--tw-spacing) * .5)}.tw\:top-1{top:var(--tw-spacing)}.tw\:top-1\/2{top:50%}.tw\:top-16{top:calc(var(--tw-spacing) * 16)}.tw\:top-full{top:100%}.tw\:-right-0\.5{right:calc(var(--tw-spacing) * -.5)}.tw\:right-0{right:0}.tw\:right-1{right:var(--tw-spacing)}.tw\:right-1\!{right:var(--tw-spacing)!important}.tw\:right-2{right:calc(var(--tw-spacing) * 2)}.tw\:right-\[1em\]{right:1em}.tw\:bottom-0{bottom:0}.tw\:bottom-0\!{bottom:0!important}.tw\:left-0{left:0}.tw\:left-0\!{left:0!important}.tw\:left-0\.5{left:calc(var(--tw-spacing) * .5)}.tw\:left-1\!{left:var(--tw-spacing)!important}.tw\:left-1\/2{left:50%}.tw\:left-3{left:calc(var(--tw-spacing) * 3)}.tw\:z-0{z-index:0}.tw\:z-10{z-index:10}.tw\:z-20{z-index:20}.tw\:z-50{z-index:50}.tw\:z-100{z-index:100}.tw\:z-9999{z-index:9999}.tw\:col-span-1{grid-column:span 1/span 1}.tw\:col-span-2{grid-column:span 2/span 2}.tw\:col-span-4{grid-column:span 4/span 4}.tw\:col-start-2{grid-column-start:2}.tw\:float-left{float:left}.tw\:float-right{float:right}.tw\:m-0{margin:0}.tw\:m-0\.5{margin:calc(var(--tw-spacing) * .5)}.tw\:m-3{margin:calc(var(--tw-spacing) * 3)}.tw\:m-auto{margin:auto}.tw\:mx-1{margin-inline:var(--tw-spacing)}.tw\:mx-4{margin-inline:calc(var(--tw-spacing) * 4)}.tw\:mx-5{margin-inline:calc(var(--tw-spacing) * 5)}.tw\:mx-10{margin-inline:calc(var(--tw-spacing) * 10)}.tw\:mx-auto{margin-inline:auto}.tw\:-my-3{margin-block:calc(var(--tw-spacing) * -3)}.tw\:my-0\!{margin-block:0!important}.tw\:my-1{margin-block:var(--tw-spacing)}.tw\:my-2{margin-block:calc(var(--tw-spacing) * 2)}.tw\:my-5{margin-block:calc(var(--tw-spacing) * 5)}.tw\:my-6{margin-block:calc(var(--tw-spacing) * 6)}.tw\:me-2{margin-inline-end:calc(var(--tw-spacing) * 2)}.tw\:-mt-4{margin-top:calc(var(--tw-spacing) * -4)}.tw\:mt-0{margin-top:0}.tw\:mt-0\.5{margin-top:calc(var(--tw-spacing) * .5)}.tw\:mt-1{margin-top:var(--tw-spacing)}.tw\:mt-1\.5{margin-top:calc(var(--tw-spacing) * 1.5)}.tw\:mt-2{margin-top:calc(var(--tw-spacing) * 2)}.tw\:mt-3{margin-top:calc(var(--tw-spacing) * 3)}.tw\:mt-4{margin-top:calc(var(--tw-spacing) * 4)}.tw\:mt-5{margin-top:calc(var(--tw-spacing) * 5)}.tw\:mt-6{margin-top:calc(var(--tw-spacing) * 6)}.tw\:mt-10{margin-top:calc(var(--tw-spacing) * 10)}.tw\:mt-20{margin-top:calc(var(--tw-spacing) * 20)}.tw\:mr-0\.5{margin-right:calc(var(--tw-spacing) * .5)}.tw\:mr-1{margin-right:var(--tw-spacing)}.tw\:mr-2{margin-right:calc(var(--tw-spacing) * 2)}.tw\:mr-3{margin-right:calc(var(--tw-spacing) * 3)}.tw\:mr-auto{margin-right:auto}.tw\:-mb-px{margin-bottom:-1px}.tw\:mb-0{margin-bottom:0}.tw\:mb-0\!{margin-bottom:0!important}.tw\:mb-1{margin-bottom:var(--tw-spacing)}.tw\:mb-1\.5{margin-bottom:calc(var(--tw-spacing) * 1.5)}.tw\:mb-2{margin-bottom:calc(var(--tw-spacing) * 2)}.tw\:mb-2\.5{margin-bottom:calc(var(--tw-spacing) * 2.5)}.tw\:mb-3{margin-bottom:calc(var(--tw-spacing) * 3)}.tw\:mb-4{margin-bottom:calc(var(--tw-spacing) * 4)}.tw\:mb-4\!{margin-bottom:calc(var(--tw-spacing) * 4)!important}.tw\:mb-5{margin-bottom:calc(var(--tw-spacing) * 5)}.tw\:mb-6{margin-bottom:calc(var(--tw-spacing) * 6)}.tw\:mb-\[3px\]{margin-bottom:3px}.tw\:mb-\[5px\]{margin-bottom:5px}.tw\:mb-\[10px\]{margin-bottom:10px}.tw\:-ml-px{margin-left:-1px}.tw\:ml-0\.5{margin-left:calc(var(--tw-spacing) * .5)}.tw\:ml-1{margin-left:var(--tw-spacing)}.tw\:ml-1\.5{margin-left:calc(var(--tw-spacing) * 1.5)}.tw\:ml-2{margin-left:calc(var(--tw-spacing) * 2)}.tw\:ml-3{margin-left:calc(var(--tw-spacing) * 3)}.tw\:ml-4{margin-left:calc(var(--tw-spacing) * 4)}.tw\:ml-5{margin-left:calc(var(--tw-spacing) * 5)}.tw\:ml-auto{margin-left:auto}.tw\:block{display:block}.tw\:flex{display:flex}.tw\:grid{display:grid}.tw\:hidden{display:none}.tw\:inline{display:inline}.tw\:inline-block{display:inline-block}.tw\:inline-flex{display:inline-flex}.tw\:h-0\.5{height:calc(var(--tw-spacing) * .5)}.tw\:h-1{height:var(--tw-spacing)}.tw\:h-1\.5{height:calc(var(--tw-spacing) * 1.5)}.tw\:h-1\/2{height:50%}.tw\:h-2{height:calc(var(--tw-spacing) * 2)}.tw\:h-3{height:calc(var(--tw-spacing) * 3)}.tw\:h-4{height:calc(var(--tw-spacing) * 4)}.tw\:h-5{height:calc(var(--tw-spacing) * 5)}.tw\:h-6{height:calc(var(--tw-spacing) * 6)}.tw\:h-7{height:calc(var(--tw-spacing) * 7)}.tw\:h-8{height:calc(var(--tw-spacing) * 8)}.tw\:h-9{height:calc(var(--tw-spacing) * 9)}.tw\:h-10{height:calc(var(--tw-spacing) * 10)}.tw\:h-12{height:calc(var(--tw-spacing) * 12)}.tw\:h-14{height:calc(var(--tw-spacing) * 14)}.tw\:h-16{height:calc(var(--tw-spacing) * 16)}.tw\:h-24{height:calc(var(--tw-spacing) * 24)}.tw\:h-28{height:calc(var(--tw-spacing) * 28)}.tw\:h-\[1\.1em\]{height:1.1em}.tw\:h-\[22px\]{height:22px}.tw\:h-\[30px\]{height:30px}.tw\:h-\[85px\]{height:85px}.tw\:h-\[calc\(50\%\+1px\)\]{height:calc(50% + 1px)}.tw\:h-\[calc\(100\%-2\.6em\)\]{height:calc(100% - 2.6em)}.tw\:h-\[calc\(100vh-62px\)\]{height:calc(100vh - 62px)}.tw\:h-auto{height:auto}.tw\:h-auto\!{height:auto!important}.tw\:h-full{height:100%}.tw\:h-screen{height:100vh}.tw\:max-h-8{max-height:calc(var(--tw-spacing) * 8)}.tw\:max-h-40{max-height:calc(var(--tw-spacing) * 40)}.tw\:max-h-64{max-height:calc(var(--tw-spacing) * 64)}.tw\:max-h-80{max-height:calc(var(--tw-spacing) * 80)}.tw\:max-h-96{max-height:calc(var(--tw-spacing) * 96)}.tw\:max-h-\[15em\]{max-height:15em}.tw\:max-h-\[70vh\]{max-height:70vh}.tw\:max-h-\[85vh\]{max-height:85vh}.tw\:max-h-\[calc\(100vh-1rem\)\]{max-height:calc(100vh - 1rem)}.tw\:max-h-\[calc\(100vh-80px\)\]{max-height:calc(100vh - 80px)}.tw\:min-h-0{min-height:0}.tw\:min-h-4{min-height:calc(var(--tw-spacing) * 4)}.tw\:min-h-8{min-height:calc(var(--tw-spacing) * 8)}.tw\:min-h-10{min-height:calc(var(--tw-spacing) * 10)}.tw\:min-h-11{min-height:calc(var(--tw-spacing) * 11)}.tw\:min-h-13{min-height:calc(var(--tw-spacing) * 13)}.tw\:min-h-24{min-height:calc(var(--tw-spacing) * 24)}.tw\:min-h-\[28px\]{min-height:28px}.tw\:min-h-\[36px\]{min-height:36px}.tw\:min-h-\[400px\]{min-height:400px}.tw\:w-0{width:0}.tw\:w-1\.5{width:calc(var(--tw-spacing) * 1.5)}.tw\:w-2{width:calc(var(--tw-spacing) * 2)}.tw\:w-3{width:calc(var(--tw-spacing) * 3)}.tw\:w-4{width:calc(var(--tw-spacing) * 4)}.tw\:w-5{width:calc(var(--tw-spacing) * 5)}.tw\:w-6{width:calc(var(--tw-spacing) * 6)}.tw\:w-7{width:calc(var(--tw-spacing) * 7)}.tw\:w-8{width:calc(var(--tw-spacing) * 8)}.tw\:w-9{width:calc(var(--tw-spacing) * 9)}.tw\:w-10{width:calc(var(--tw-spacing) * 10)}.tw\:w-12{width:calc(var(--tw-spacing) * 12)}.tw\:w-14{width:calc(var(--tw-spacing) * 14)}.tw\:w-16{width:calc(var(--tw-spacing) * 16)}.tw\:w-20{width:calc(var(--tw-spacing) * 20)}.tw\:w-25{width:calc(var(--tw-spacing) * 25)}.tw\:w-28{width:calc(var(--tw-spacing) * 28)}.tw\:w-32{width:calc(var(--tw-spacing) * 32)}.tw\:w-36{width:calc(var(--tw-spacing) * 36)}.tw\:w-48{width:calc(var(--tw-spacing) * 48)}.tw\:w-64{width:calc(var(--tw-spacing) * 64)}.tw\:w-\[1\.1em\]{width:1.1em}.tw\:w-\[2px\]{width:2px}.tw\:w-\[3px\]{width:3px}.tw\:w-\[48ch\]{width:48ch}.tw\:w-\[80px\]{width:80px}.tw\:w-\[100px\]{width:100px}.tw\:w-\[139px\]{width:139px}.tw\:w-\[150px\]{width:150px}.tw\:w-\[200px\]{width:200px}.tw\:w-auto{width:auto}.tw\:w-auto\!{width:auto!important}.tw\:w-fit{width:fit-content}.tw\:w-full{width:100%}.tw\:w-max{width:max-content}.tw\:w-min{width:min-content}.tw\:max-w-\(--breakpoint-lg\){max-width:var(--breakpoint-lg)}.tw\:max-w-2xl{max-width:var(--tw-container-2xl)}.tw\:max-w-3xl{max-width:var(--tw-container-3xl)}.tw\:max-w-3xl\!{max-width:var(--tw-container-3xl)!important}.tw\:max-w-4xl{max-width:var(--tw-container-4xl)}.tw\:max-w-5xl{max-width:var(--tw-container-5xl)}.tw\:max-w-8{max-width:calc(var(--tw-spacing) * 8)}.tw\:max-w-40{max-width:calc(var(--tw-spacing) * 40)}.tw\:max-w-50{max-width:calc(var(--tw-spacing) * 50)}.tw\:max-w-56{max-width:calc(var(--tw-spacing) * 56)}.tw\:max-w-64{max-width:calc(var(--tw-spacing) * 64)}.tw\:max-w-100{max-width:calc(var(--tw-spacing) * 100)}.tw\:max-w-\[90vw\]{max-width:90vw}.tw\:max-w-\[170px\]{max-width:170px}.tw\:max-w-\[calc\(100vw-1rem\)\]{max-width:calc(100vw - 1rem)}.tw\:max-w-\[calc\(100vw-24px\)\]{max-width:calc(100vw - 24px)}.tw\:max-w-full{max-width:100%}.tw\:max-w-lg{max-width:var(--tw-container-lg)}.tw\:max-w-md{max-width:var(--tw-container-md)}.tw\:max-w-none{max-width:none}.tw\:max-w-sm{max-width:var(--tw-container-sm)}.tw\:max-w-xl{max-width:var(--tw-container-xl)}.tw\:min-w-0{min-width:0}.tw\:min-w-8{min-width:calc(var(--tw-spacing) * 8)}.tw\:min-w-10{min-width:calc(var(--tw-spacing) * 10)}.tw\:min-w-24{min-width:calc(var(--tw-spacing) * 24)}.tw\:min-w-32{min-width:calc(var(--tw-spacing) * 32)}.tw\:min-w-40{min-width:calc(var(--tw-spacing) * 40)}.tw\:min-w-44{min-width:calc(var(--tw-spacing) * 44)}.tw\:min-w-48{min-width:calc(var(--tw-spacing) * 48)}.tw\:min-w-56{min-width:calc(var(--tw-spacing) * 56)}.tw\:min-w-64{min-width:calc(var(--tw-spacing) * 64)}.tw\:min-w-70{min-width:calc(var(--tw-spacing) * 70)}.tw\:min-w-fit{min-width:fit-content}.tw\:min-w-full{min-width:100%}.tw\:flex-1{flex:1}.tw\:flex-none{flex:none}.tw\:shrink-0{flex-shrink:0}.tw\:grow{flex-grow:1}.tw\:border-collapse{border-collapse:collapse}.tw\:origin-top-left{transform-origin:0 0}.tw\:-translate-x-1\/2{--tw-translate-x:calc(calc(1 / 2 * 100%) * -1);translate:var(--tw-translate-x) var(--tw-translate-y)}.tw\:-translate-y-1\/2{--tw-translate-y:calc(calc(1 / 2 * 100%) * -1);translate:var(--tw-translate-x) var(--tw-translate-y)}.tw\:-translate-y-2{--tw-translate-y:calc(var(--tw-spacing) * -2);translate:var(--tw-translate-x) var(--tw-translate-y)}.tw\:translate-y-0{--tw-translate-y:0px;translate:var(--tw-translate-x) var(--tw-translate-y)}.tw\:scale-95{--tw-scale-x:95%;--tw-scale-y:95%;--tw-scale-z:95%;scale:var(--tw-scale-x) var(--tw-scale-y)}.tw\:scale-100{--tw-scale-x:100%;--tw-scale-y:100%;--tw-scale-z:100%;scale:var(--tw-scale-x) var(--tw-scale-y)}.tw\:-rotate-90{rotate:-90deg}.tw\:rotate-180{rotate:180deg}.tw\:transform{transform:var(--tw-rotate-x,) var(--tw-rotate-y,) var(--tw-rotate-z,) var(--tw-skew-x,) var(--tw-skew-y,)}.tw\:animate-\[fadeIn_0\.4s_ease-out\]{animation:.4s ease-out fadeIn}.tw\:animate-pulse{animation:var(--tw-animate-pulse)}.tw\:animate-spin{animation:var(--tw-animate-spin)}.tw\:cursor-auto{cursor:auto}.tw\:cursor-crosshair{cursor:crosshair}.tw\:cursor-default{cursor:default}.tw\:cursor-help{cursor:help}.tw\:cursor-move{cursor:move}.tw\:cursor-not-allowed{cursor:not-allowed}.tw\:cursor-pointer{cursor:pointer}.tw\:cursor-text{cursor:text}.tw\:scroll-px-2{scroll-padding-inline:calc(var(--tw-spacing) * 2)}.tw\:scrollbar-none{scrollbar-width:none}.tw\:scrollbar-thin{scrollbar-width:thin}.tw\:list-inside{list-style-position:inside}.tw\:list-disc{list-style-type:disc}.tw\:list-none{list-style-type:none}.tw\:appearance-none{appearance:none}.tw\:grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.tw\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.tw\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.tw\:grid-cols-4{grid-template-columns:repeat(4,minmax(0,1fr))}.tw\:grid-cols-5{grid-template-columns:repeat(5,minmax(0,1fr))}.tw\:grid-cols-6{grid-template-columns:repeat(6,minmax(0,1fr))}.tw\:grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.tw\:grid-cols-\[min-content_min-content_1fr\]{grid-template-columns:min-content min-content 1fr}.tw\:flex-col{flex-direction:column}.tw\:flex-col-reverse{flex-direction:column-reverse}.tw\:flex-row{flex-direction:row}.tw\:flex-row-reverse{flex-direction:row-reverse}.tw\:flex-nowrap{flex-wrap:nowrap}.tw\:flex-wrap{flex-wrap:wrap}.tw\:place-items-center{place-items:center}.tw\:items-baseline{align-items:baseline}.tw\:items-center{align-items:center}.tw\:items-end{align-items:flex-end}.tw\:items-start{align-items:flex-start}.tw\:items-stretch{align-items:stretch}.tw\:justify-between{justify-content:space-between}.tw\:justify-center{justify-content:center}.tw\:justify-end{justify-content:flex-end}.tw\:justify-start{justify-content:flex-start}.tw\:gap-0\.5{gap:calc(var(--tw-spacing) * .5)}.tw\:gap-1{gap:var(--tw-spacing)}.tw\:gap-1\.5{gap:calc(var(--tw-spacing) * 1.5)}.tw\:gap-2{gap:calc(var(--tw-spacing) * 2)}.tw\:gap-2\.5{gap:calc(var(--tw-spacing) * 2.5)}.tw\:gap-3{gap:calc(var(--tw-spacing) * 3)}.tw\:gap-3\.5{gap:calc(var(--tw-spacing) * 3.5)}.tw\:gap-4{gap:calc(var(--tw-spacing) * 4)}.tw\:gap-5{gap:calc(var(--tw-spacing) * 5)}.tw\:gap-6{gap:calc(var(--tw-spacing) * 6)}.tw\:gap-\[0\.5em\]{gap:.5em}.tw\:gap-px{gap:1px}:where(.tw\:space-y-1>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(var(--tw-spacing) * var(--tw-space-y-reverse));margin-block-end:calc(var(--tw-spacing) * calc(1 - var(--tw-space-y-reverse)))}:where(.tw\:space-y-1\.5>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--tw-spacing) * 1.5) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--tw-spacing) * 1.5) * calc(1 - var(--tw-space-y-reverse)))}:where(.tw\:space-y-2>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--tw-spacing) * 2) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--tw-spacing) * 2) * calc(1 - var(--tw-space-y-reverse)))}:where(.tw\:space-y-2\.5>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--tw-spacing) * 2.5) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--tw-spacing) * 2.5) * calc(1 - var(--tw-space-y-reverse)))}:where(.tw\:space-y-3>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--tw-spacing) * 3) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--tw-spacing) * 3) * calc(1 - var(--tw-space-y-reverse)))}:where(.tw\:space-y-4>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--tw-spacing) * 4) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--tw-spacing) * 4) * calc(1 - var(--tw-space-y-reverse)))}:where(.tw\:space-y-5>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--tw-spacing) * 5) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--tw-spacing) * 5) * calc(1 - var(--tw-space-y-reverse)))}:where(.tw\:space-y-6>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--tw-spacing) * 6) * var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--tw-spacing) * 6) * calc(1 - var(--tw-space-y-reverse)))}:where(.tw\:space-y-\[1em\]>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(1em * var(--tw-space-y-reverse));margin-block-end:calc(1em * calc(1 - var(--tw-space-y-reverse)))}.tw\:gap-x-1{column-gap:var(--tw-spacing)}.tw\:gap-x-3{column-gap:calc(var(--tw-spacing) * 3)}.tw\:gap-x-4{column-gap:calc(var(--tw-spacing) * 4)}.tw\:gap-x-6{column-gap:calc(var(--tw-spacing) * 6)}.tw\:gap-y-2{row-gap:calc(var(--tw-spacing) * 2)}.tw\:gap-y-5{row-gap:calc(var(--tw-spacing) * 5)}:where(.tw\:divide-y>:not(:last-child)){--tw-divide-y-reverse:0;border-bottom-style:var(--tw-border-style);border-top-style:var(--tw-border-style);border-top-width:calc(1px * var(--tw-divide-y-reverse));border-bottom-width:calc(1px * calc(1 - var(--tw-divide-y-reverse)))}:where(.tw\:divide-gray-100>:not(:last-child)){border-color:var(--tw-color-gray-100)}:where(.tw\:divide-gray-300>:not(:last-child)){border-color:var(--tw-color-gray-300)}.tw\:self-start{align-self:flex-start}.tw\:self-stretch{align-self:stretch}.tw\:truncate{text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.tw\:overflow-auto{overflow:auto}.tw\:overflow-hidden{overflow:hidden}.tw\:overflow-x-auto{overflow-x:auto}.tw\:overflow-x-hidden{overflow-x:hidden}.tw\:overflow-y-auto{overflow-y:auto}.tw\:overflow-y-hidden{overflow-y:hidden}.tw\:rounded{border-radius:.25rem}.tw\:rounded-2xl{border-radius:var(--tw-radius-2xl)}.tw\:rounded-2xl\!{border-radius:var(--tw-radius-2xl)!important}.tw\:rounded-\[0\.6em\]{border-radius:.6em}.tw\:rounded-\[3px\]{border-radius:3px}.tw\:rounded-\[4px\]\!{border-radius:4px!important}.tw\:rounded-full{border-radius:2147483647px}.tw\:rounded-lg{border-radius:var(--tw-radius-lg)}.tw\:rounded-md{border-radius:var(--tw-radius-md)}.tw\:rounded-none{border-radius:0}.tw\:rounded-sm{border-radius:var(--tw-radius-sm)}.tw\:rounded-xl{border-radius:var(--tw-radius-xl)}.tw\:rounded-t-2xl{border-top-left-radius:var(--tw-radius-2xl);border-top-right-radius:var(--tw-radius-2xl)}.tw\:rounded-t-lg{border-top-left-radius:var(--tw-radius-lg);border-top-right-radius:var(--tw-radius-lg)}.tw\:rounded-t-none\!{border-top-left-radius:0!important;border-top-right-radius:0!important}.tw\:rounded-l-lg{border-top-left-radius:var(--tw-radius-lg);border-bottom-left-radius:var(--tw-radius-lg)}.tw\:rounded-l-md{border-top-left-radius:var(--tw-radius-md);border-bottom-left-radius:var(--tw-radius-md)}.tw\:rounded-tl-lg{border-top-left-radius:var(--tw-radius-lg)}.tw\:rounded-r-md{border-top-right-radius:var(--tw-radius-md);border-bottom-right-radius:var(--tw-radius-md)}.tw\:rounded-r-none{border-top-right-radius:0;border-bottom-right-radius:0}.tw\:rounded-tr-lg{border-top-right-radius:var(--tw-radius-lg)}.tw\:rounded-b-2xl{border-bottom-right-radius:var(--tw-radius-2xl);border-bottom-left-radius:var(--tw-radius-2xl)}.tw\:rounded-b-none\!{border-bottom-right-radius:0!important;border-bottom-left-radius:0!important}.tw\:rounded-br-lg{border-bottom-right-radius:var(--tw-radius-lg)}.tw\:rounded-bl-lg{border-bottom-left-radius:var(--tw-radius-lg)}.tw\:border{border-style:var(--tw-border-style);border-width:1px}.tw\:border-0{border-style:var(--tw-border-style);border-width:0}.tw\:border-2{border-style:var(--tw-border-style);border-width:2px}.tw\:border-t{border-top-style:var(--tw-border-style);border-top-width:1px}.tw\:border-t-0\!{border-top-style:var(--tw-border-style)!important;border-top-width:0!important}.tw\:border-t-0\.5{border-top-style:var(--tw-border-style);border-top-width:var(--tw-border-width-0_5)}.tw\:border-r{border-right-style:var(--tw-border-style);border-right-width:1px}.tw\:border-r-0\.5{border-right-style:var(--tw-border-style);border-right-width:var(--tw-border-width-0_5)}.tw\:border-b{border-bottom-style:var(--tw-border-style);border-bottom-width:1px}.tw\:border-b-0{border-bottom-style:var(--tw-border-style);border-bottom-width:0}.tw\:border-b-0\.5{border-bottom-style:var(--tw-border-style);border-bottom-width:var(--tw-border-width-0_5)}.tw\:border-b-2{border-bottom-style:var(--tw-border-style);border-bottom-width:2px}.tw\:border-l-4{border-left-style:var(--tw-border-style);border-left-width:4px}.tw\:border-l-5{border-left-style:var(--tw-border-style);border-left-width:5px}.tw\:border-l-8{border-left-style:var(--tw-border-style);border-left-width:8px}.tw\:border-dashed{--tw-border-style:dashed;border-style:dashed}.tw\:border-none{--tw-border-style:none;border-style:none}.tw\:border-solid{--tw-border-style:solid;border-style:solid}.tw\:border-amber-200{border-color:var(--tw-color-amber-200)}.tw\:border-amber-300{border-color:var(--tw-color-amber-300)}.tw\:border-amber-400{border-color:var(--tw-color-amber-400)}.tw\:border-amber-500{border-color:var(--tw-color-amber-500)}.tw\:border-black\/10{border-color:var(--tw-color-black)}@supports (color:color-mix(in lab, red, red)){.tw\:border-black\/10{border-color:color-mix(in oklab, var(--tw-color-black) 10%, transparent)}}.tw\:border-blue-200{border-color:var(--tw-color-blue-200)}.tw\:border-blue-500{border-color:var(--tw-color-blue-500)}.tw\:border-blue-600{border-color:var(--tw-color-blue-600)}.tw\:border-current{border-color:currentColor}.tw\:border-emerald-600{border-color:var(--tw-color-emerald-600)}.tw\:border-gray-100{border-color:var(--tw-color-gray-100)}.tw\:border-gray-200,.tw\:border-gray-200\/80{border-color:var(--tw-color-gray-200)}@supports (color:color-mix(in lab, red, red)){.tw\:border-gray-200\/80{border-color:color-mix(in oklab, var(--tw-color-gray-200) 80%, transparent)}}.tw\:border-gray-300{border-color:var(--tw-color-gray-300)}.tw\:border-gray-400{border-color:var(--tw-color-gray-400)}.tw\:border-gray-500{border-color:var(--tw-color-gray-500)}.tw\:border-green-200{border-color:var(--tw-color-green-200)}.tw\:border-green-600{border-color:var(--tw-color-green-600)}.tw\:border-neutral-100{border-color:var(--tw-color-neutral-100)}.tw\:border-neutral-200{border-color:var(--tw-color-neutral-200)}.tw\:border-neutral-300{border-color:var(--tw-color-neutral-300)}.tw\:border-red-100{border-color:var(--tw-color-red-100)}.tw\:border-red-200{border-color:var(--tw-color-red-200)}.tw\:border-red-300{border-color:var(--tw-color-red-300)}.tw\:border-red-400{border-color:var(--tw-color-red-400)}.tw\:border-red-500{border-color:var(--tw-color-red-500)}.tw\:border-red-600{border-color:var(--tw-color-red-600)}.tw\:border-sky-200{border-color:var(--tw-color-sky-200)}.tw\:border-slate-200{border-color:var(--tw-color-slate-200)}.tw\:border-transparent{border-color:#0000}.tw\:border-yellow-200{border-color:var(--tw-color-yellow-200)}.tw\:border-yellow-600{border-color:var(--tw-color-yellow-600)}.tw\:border-t-blue-600{border-top-color:var(--tw-color-blue-600)}.tw\:border-l-amber-500{border-left-color:var(--tw-color-amber-500)}.tw\:border-l-amber-500\!{border-left-color:var(--tw-color-amber-500)!important}.tw\:border-l-black\!{border-left-color:var(--tw-color-black)!important}.tw\:border-l-blue-500\!{border-left-color:var(--tw-color-blue-500)!important}.tw\:border-l-gray-400\!{border-left-color:var(--tw-color-gray-400)!important}.tw\:border-l-green-600{border-left-color:var(--tw-color-green-600)}.tw\:border-l-green-600\!{border-left-color:var(--tw-color-green-600)!important}.tw\:border-l-red-600{border-left-color:var(--tw-color-red-600)}.tw\:border-l-red-600\!{border-left-color:var(--tw-color-red-600)!important}.tw\:bg-\[\#3a3f44\]{background-color:#3a3f44}.tw\:bg-\[\#e9e9e9\]{background-color:#e9e9e9}.tw\:bg-amber-50{background-color:var(--tw-color-amber-50)}.tw\:bg-amber-100,.tw\:bg-amber-100\/90{background-color:var(--tw-color-amber-100)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-amber-100\/90{background-color:color-mix(in oklab, var(--tw-color-amber-100) 90%, transparent)}}.tw\:bg-amber-200\/60{background-color:var(--tw-color-amber-200)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-amber-200\/60{background-color:color-mix(in oklab, var(--tw-color-amber-200) 60%, transparent)}}.tw\:bg-amber-400{background-color:var(--tw-color-amber-400)}.tw\:bg-amber-500{background-color:var(--tw-color-amber-500)}.tw\:bg-black\/5{background-color:var(--tw-color-black)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-black\/5{background-color:color-mix(in oklab, var(--tw-color-black) 5%, transparent)}}.tw\:bg-black\/10{background-color:var(--tw-color-black)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-black\/10{background-color:color-mix(in oklab, var(--tw-color-black) 10%, transparent)}}.tw\:bg-black\/50{background-color:var(--tw-color-black)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-black\/50{background-color:color-mix(in oklab, var(--tw-color-black) 50%, transparent)}}.tw\:bg-black\/60{background-color:var(--tw-color-black)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-black\/60{background-color:color-mix(in oklab, var(--tw-color-black) 60%, transparent)}}.tw\:bg-blue-50,.tw\:bg-blue-50\/20{background-color:var(--tw-color-blue-50)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-blue-50\/20{background-color:color-mix(in oklab, var(--tw-color-blue-50) 20%, transparent)}}.tw\:bg-blue-50\/50{background-color:var(--tw-color-blue-50)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-blue-50\/50{background-color:color-mix(in oklab, var(--tw-color-blue-50) 50%, transparent)}}.tw\:bg-blue-50\/60{background-color:var(--tw-color-blue-50)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-blue-50\/60{background-color:color-mix(in oklab, var(--tw-color-blue-50) 60%, transparent)}}.tw\:bg-blue-50\/70{background-color:var(--tw-color-blue-50)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-blue-50\/70{background-color:color-mix(in oklab, var(--tw-color-blue-50) 70%, transparent)}}.tw\:bg-blue-100{background-color:var(--tw-color-blue-100)}.tw\:bg-blue-500{background-color:var(--tw-color-blue-500)}.tw\:bg-blue-600{background-color:var(--tw-color-blue-600)}.tw\:bg-current{background-color:currentColor}.tw\:bg-emerald-600{background-color:var(--tw-color-emerald-600)}.tw\:bg-gray-50,.tw\:bg-gray-50\/70{background-color:var(--tw-color-gray-50)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-gray-50\/70{background-color:color-mix(in oklab, var(--tw-color-gray-50) 70%, transparent)}}.tw\:bg-gray-100{background-color:var(--tw-color-gray-100)}.tw\:bg-gray-100\!{background-color:var(--tw-color-gray-100)!important}.tw\:bg-gray-100\/90{background-color:var(--tw-color-gray-100)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-gray-100\/90{background-color:color-mix(in oklab, var(--tw-color-gray-100) 90%, transparent)}}.tw\:bg-gray-200{background-color:var(--tw-color-gray-200)}.tw\:bg-gray-300{background-color:var(--tw-color-gray-300)}.tw\:bg-gray-500{background-color:var(--tw-color-gray-500)}.tw\:bg-green-50{background-color:var(--tw-color-green-50)}.tw\:bg-green-100{background-color:var(--tw-color-green-100)}.tw\:bg-green-400{background-color:var(--tw-color-green-400)}.tw\:bg-green-600{background-color:var(--tw-color-green-600)}.tw\:bg-neutral-50,.tw\:bg-neutral-50\/50{background-color:var(--tw-color-neutral-50)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-neutral-50\/50{background-color:color-mix(in oklab, var(--tw-color-neutral-50) 50%, transparent)}}.tw\:bg-neutral-100{background-color:var(--tw-color-neutral-100)}.tw\:bg-neutral-600{background-color:var(--tw-color-neutral-600)}.tw\:bg-neutral-950\/60{background-color:var(--tw-color-neutral-950)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-neutral-950\/60{background-color:color-mix(in oklab, var(--tw-color-neutral-950) 60%, transparent)}}.tw\:bg-orange-400{background-color:var(--tw-color-orange-400)}.tw\:bg-purple-100{background-color:var(--tw-color-purple-100)}.tw\:bg-red-50{background-color:var(--tw-color-red-50)}.tw\:bg-red-100{background-color:var(--tw-color-red-100)}.tw\:bg-red-500{background-color:var(--tw-color-red-500)}.tw\:bg-red-600{background-color:var(--tw-color-red-600)}.tw\:bg-sky-50{background-color:var(--tw-color-sky-50)}.tw\:bg-sky-100{background-color:var(--tw-color-sky-100)}.tw\:bg-slate-100{background-color:var(--tw-color-slate-100)}.tw\:bg-transparent{background-color:#0000}.tw\:bg-white{background-color:var(--tw-color-white)}.tw\:bg-white\!{background-color:var(--tw-color-white)!important}.tw\:bg-white\/25{background-color:var(--tw-color-white)}@supports (color:color-mix(in lab, red, red)){.tw\:bg-white\/25{background-color:color-mix(in oklab, var(--tw-color-white) 25%, transparent)}}.tw\:bg-yellow-50{background-color:var(--tw-color-yellow-50)}.tw\:bg-yellow-100{background-color:var(--tw-color-yellow-100)}.tw\:object-contain{object-fit:contain}.tw\:object-cover{object-fit:cover}.tw\:p-0{padding:0}.tw\:p-0\!{padding:0!important}.tw\:p-0\.5{padding:calc(var(--tw-spacing) * .5)}.tw\:p-1{padding:var(--tw-spacing)}.tw\:p-2{padding:calc(var(--tw-spacing) * 2)}.tw\:p-2\.5{padding:calc(var(--tw-spacing) * 2.5)}.tw\:p-3{padding:calc(var(--tw-spacing) * 3)}.tw\:p-4{padding:calc(var(--tw-spacing) * 4)}.tw\:p-5{padding:calc(var(--tw-spacing) * 5)}.tw\:p-6{padding:calc(var(--tw-spacing) * 6)}.tw\:p-10{padding:calc(var(--tw-spacing) * 10)}.tw\:p-\[5px\]{padding:5px}.tw\:px-0{padding-inline:0}.tw\:px-0\!{padding-inline:0!important}.tw\:px-1{padding-inline:var(--tw-spacing)}.tw\:px-1\.5{padding-inline:calc(var(--tw-spacing) * 1.5)}.tw\:px-2{padding-inline:calc(var(--tw-spacing) * 2)}.tw\:px-2\.5{padding-inline:calc(var(--tw-spacing) * 2.5)}.tw\:px-3{padding-inline:calc(var(--tw-spacing) * 3)}.tw\:px-3\.5{padding-inline:calc(var(--tw-spacing) * 3.5)}.tw\:px-4{padding-inline:calc(var(--tw-spacing) * 4)}.tw\:px-5{padding-inline:calc(var(--tw-spacing) * 5)}.tw\:px-6{padding-inline:calc(var(--tw-spacing) * 6)}.tw\:px-\[1\.2em\]{padding-inline:1.2em}.tw\:px-\[1em\]{padding-inline:1em}.tw\:px-\[5px\]{padding-inline:5px}.tw\:py-0{padding-block:0}.tw\:py-0\.5{padding-block:calc(var(--tw-spacing) * .5)}.tw\:py-1{padding-block:var(--tw-spacing)}.tw\:py-1\.5{padding-block:calc(var(--tw-spacing) * 1.5)}.tw\:py-2{padding-block:calc(var(--tw-spacing) * 2)}.tw\:py-2\.5{padding-block:calc(var(--tw-spacing) * 2.5)}.tw\:py-3{padding-block:calc(var(--tw-spacing) * 3)}.tw\:py-3\.5{padding-block:calc(var(--tw-spacing) * 3.5)}.tw\:py-4{padding-block:calc(var(--tw-spacing) * 4)}.tw\:py-5{padding-block:calc(var(--tw-spacing) * 5)}.tw\:py-6{padding-block:calc(var(--tw-spacing) * 6)}.tw\:py-8{padding-block:calc(var(--tw-spacing) * 8)}.tw\:py-10{padding-block:calc(var(--tw-spacing) * 10)}.tw\:py-12{padding-block:calc(var(--tw-spacing) * 12)}.tw\:py-16{padding-block:calc(var(--tw-spacing) * 16)}.tw\:py-\[0\.8em\]{padding-block:.8em}.tw\:py-\[5px\]{padding-block:5px}.tw\:py-px{padding-block:1px}.tw\:pt-1{padding-top:var(--tw-spacing)}.tw\:pt-1\.5{padding-top:calc(var(--tw-spacing) * 1.5)}.tw\:pt-2{padding-top:calc(var(--tw-spacing) * 2)}.tw\:pt-2\.5{padding-top:calc(var(--tw-spacing) * 2.5)}.tw\:pt-3{padding-top:calc(var(--tw-spacing) * 3)}.tw\:pt-3\!{padding-top:calc(var(--tw-spacing) * 3)!important}.tw\:pt-6{padding-top:calc(var(--tw-spacing) * 6)}.tw\:pt-\[5px\]{padding-top:5px}.tw\:pr-1{padding-right:var(--tw-spacing)}.tw\:pr-2{padding-right:calc(var(--tw-spacing) * 2)}.tw\:pr-3{padding-right:calc(var(--tw-spacing) * 3)}.tw\:pr-5{padding-right:calc(var(--tw-spacing) * 5)}.tw\:pr-7{padding-right:calc(var(--tw-spacing) * 7)}.tw\:pr-8{padding-right:calc(var(--tw-spacing) * 8)}.tw\:pr-8\!{padding-right:calc(var(--tw-spacing) * 8)!important}.tw\:pb-0{padding-bottom:0}.tw\:pb-0\!{padding-bottom:0!important}.tw\:pb-2{padding-bottom:calc(var(--tw-spacing) * 2)}.tw\:pb-3{padding-bottom:calc(var(--tw-spacing) * 3)}.tw\:pb-4{padding-bottom:calc(var(--tw-spacing) * 4)}.tw\:pb-5{padding-bottom:calc(var(--tw-spacing) * 5)}.tw\:pl-0\!{padding-left:0!important}.tw\:pl-2{padding-left:calc(var(--tw-spacing) * 2)}.tw\:pl-3{padding-left:calc(var(--tw-spacing) * 3)}.tw\:pl-4{padding-left:calc(var(--tw-spacing) * 4)}.tw\:pl-5{padding-left:calc(var(--tw-spacing) * 5)}.tw\:pl-6{padding-left:calc(var(--tw-spacing) * 6)}.tw\:pl-9{padding-left:calc(var(--tw-spacing) * 9)}.tw\:pl-9\!{padding-left:calc(var(--tw-spacing) * 9)!important}.tw\:pl-20{padding-left:calc(var(--tw-spacing) * 20)}.tw\:text-center{text-align:center}.tw\:text-left{text-align:left}.tw\:text-right{text-align:right}.tw\:align-bottom{vertical-align:bottom}.tw\:align-middle{vertical-align:middle}.tw\:align-text-top{vertical-align:text-top}.tw\:font-mono{font-family:var(--tw-font-mono)}.tw\:text-2xl{font-size:var(--tw-text-2xl);line-height:var(--tw-leading,var(--tw-text-2xl--line-height))}.tw\:text-3xl{font-size:var(--tw-text-3xl);line-height:var(--tw-leading,var(--tw-text-3xl--line-height))}.tw\:text-4xl{font-size:var(--tw-text-4xl);line-height:var(--tw-leading,var(--tw-text-4xl--line-height))}.tw\:text-7xl{font-size:var(--tw-text-7xl);line-height:var(--tw-leading,var(--tw-text-7xl--line-height))}.tw\:text-base{font-size:var(--tw-text-base);line-height:var(--tw-leading,var(--tw-text-base--line-height))}.tw\:text-lg{font-size:var(--tw-text-lg);line-height:var(--tw-leading,var(--tw-text-lg--line-height))}.tw\:text-lg\!{font-size:var(--tw-text-lg)!important;line-height:var(--tw-leading,var(--tw-text-lg--line-height))!important}.tw\:text-sm{font-size:var(--tw-text-sm);line-height:var(--tw-leading,var(--tw-text-sm--line-height))}.tw\:text-xl{font-size:var(--tw-text-xl);line-height:var(--tw-leading,var(--tw-text-xl--line-height))}.tw\:text-xs{font-size:var(--tw-text-xs);line-height:var(--tw-leading,var(--tw-text-xs--line-height))}.tw\:text-\[0\.5rem\]{font-size:.5rem}.tw\:text-\[0\.6rem\]{font-size:.6rem}.tw\:text-\[0\.85em\]{font-size:.85em}.tw\:text-\[0\.95em\]{font-size:.95em}.tw\:text-\[9px\]{font-size:9px}.tw\:text-\[11px\]{font-size:11px}.tw\:leading-5{--tw-leading:calc(var(--tw-spacing) * 5);line-height:calc(var(--tw-spacing) * 5)}.tw\:leading-6{--tw-leading:calc(var(--tw-spacing) * 6);line-height:calc(var(--tw-spacing) * 6)}.tw\:leading-7{--tw-leading:calc(var(--tw-spacing) * 7);line-height:calc(var(--tw-spacing) * 7)}.tw\:leading-none{--tw-leading:1;line-height:1}.tw\:leading-normal{--tw-leading:var(--tw-leading-normal);line-height:var(--tw-leading-normal)}.tw\:leading-tight{--tw-leading:var(--tw-leading-tight);line-height:var(--tw-leading-tight)}.tw\:font-bold{--tw-font-weight:var(--tw-font-weight-bold);font-weight:var(--tw-font-weight-bold)}.tw\:font-medium{--tw-font-weight:var(--tw-font-weight-medium);font-weight:var(--tw-font-weight-medium)}.tw\:font-normal{--tw-font-weight:var(--tw-font-weight-normal);font-weight:var(--tw-font-weight-normal)}.tw\:font-normal\!{--tw-font-weight:var(--tw-font-weight-normal)!important;font-weight:var(--tw-font-weight-normal)!important}.tw\:font-semibold{--tw-font-weight:var(--tw-font-weight-semibold);font-weight:var(--tw-font-weight-semibold)}.tw\:font-semibold\!{--tw-font-weight:var(--tw-font-weight-semibold)!important;font-weight:var(--tw-font-weight-semibold)!important}.tw\:tracking-tight{--tw-tracking:var(--tw-tracking-tight);letter-spacing:var(--tw-tracking-tight)}.tw\:tracking-wider{--tw-tracking:var(--tw-tracking-wider);letter-spacing:var(--tw-tracking-wider)}.tw\:text-balance{text-wrap:balance}.tw\:text-nowrap{text-wrap:nowrap}.tw\:text-pretty{text-wrap:pretty}.tw\:break-words{overflow-wrap:break-word}.tw\:wrap-anywhere{overflow-wrap:anywhere}.tw\:wrap-break-word{overflow-wrap:break-word}.tw\:break-all{word-break:break-all}.tw\:text-ellipsis{text-overflow:ellipsis}.tw\:whitespace-normal{white-space:normal}.tw\:whitespace-nowrap{white-space:nowrap}.tw\:whitespace-pre-wrap{white-space:pre-wrap}.tw\:text-\[\#5cb85c\]{color:#5cb85c}.tw\:text-\[\#337ab7\]{color:#337ab7}.tw\:text-\[\#a94442\]{color:#a94442}.tw\:text-amber-500{color:var(--tw-color-amber-500)}.tw\:text-amber-600{color:var(--tw-color-amber-600)}.tw\:text-amber-700{color:var(--tw-color-amber-700)}.tw\:text-amber-800{color:var(--tw-color-amber-800)}.tw\:text-amber-900{color:var(--tw-color-amber-900)}.tw\:text-blue-200{color:var(--tw-color-blue-200)}.tw\:text-blue-500,.tw\:text-blue-500\/50{color:var(--tw-color-blue-500)}@supports (color:color-mix(in lab, red, red)){.tw\:text-blue-500\/50{color:color-mix(in oklab, var(--tw-color-blue-500) 50%, transparent)}}.tw\:text-blue-600{color:var(--tw-color-blue-600)}.tw\:text-blue-600\!{color:var(--tw-color-blue-600)!important}.tw\:text-blue-800{color:var(--tw-color-blue-800)}.tw\:text-blue-900{color:var(--tw-color-blue-900)}.tw\:text-current{color:currentColor}.tw\:text-gray-300{color:var(--tw-color-gray-300)}.tw\:text-gray-400{color:var(--tw-color-gray-400)}.tw\:text-gray-500{color:var(--tw-color-gray-500)}.tw\:text-gray-500\!{color:var(--tw-color-gray-500)!important}.tw\:text-gray-600{color:var(--tw-color-gray-600)}.tw\:text-gray-700{color:var(--tw-color-gray-700)}.tw\:text-gray-800{color:var(--tw-color-gray-800)}.tw\:text-gray-900{color:var(--tw-color-gray-900)}.tw\:text-green-400{color:var(--tw-color-green-400)}.tw\:text-green-600{color:var(--tw-color-green-600)}.tw\:text-green-700{color:var(--tw-color-green-700)}.tw\:text-green-800{color:var(--tw-color-green-800)}.tw\:text-green-900{color:var(--tw-color-green-900)}.tw\:text-inherit{color:inherit}.tw\:text-inherit\!{color:inherit!important}.tw\:text-neutral-400{color:var(--tw-color-neutral-400)}.tw\:text-neutral-400\!{color:var(--tw-color-neutral-400)!important}.tw\:text-neutral-500{color:var(--tw-color-neutral-500)}.tw\:text-neutral-500\!{color:var(--tw-color-neutral-500)!important}.tw\:text-neutral-600\!{color:var(--tw-color-neutral-600)!important}.tw\:text-neutral-700{color:var(--tw-color-neutral-700)}.tw\:text-neutral-700\!{color:var(--tw-color-neutral-700)!important}.tw\:text-neutral-900\!{color:var(--tw-color-neutral-900)!important}.tw\:text-orange-400{color:var(--tw-color-orange-400)}.tw\:text-orange-600{color:var(--tw-color-orange-600)}.tw\:text-purple-800{color:var(--tw-color-purple-800)}.tw\:text-red-200{color:var(--tw-color-red-200)}.tw\:text-red-500{color:var(--tw-color-red-500)}.tw\:text-red-600{color:var(--tw-color-red-600)}.tw\:text-red-600\!{color:var(--tw-color-red-600)!important}.tw\:text-red-700{color:var(--tw-color-red-700)}.tw\:text-red-800{color:var(--tw-color-red-800)}.tw\:text-red-900{color:var(--tw-color-red-900)}.tw\:text-sky-600{color:var(--tw-color-sky-600)}.tw\:text-sky-800{color:var(--tw-color-sky-800)}.tw\:text-sky-900{color:var(--tw-color-sky-900)}.tw\:text-slate-300{color:var(--tw-color-slate-300)}.tw\:text-slate-400{color:var(--tw-color-slate-400)}.tw\:text-slate-500{color:var(--tw-color-slate-500)}.tw\:text-slate-700{color:var(--tw-color-slate-700)}.tw\:text-slate-800{color:var(--tw-color-slate-800)}.tw\:text-white{color:var(--tw-color-white)}.tw\:text-white\!{color:var(--tw-color-white)!important}.tw\:text-yellow-600{color:var(--tw-color-yellow-600)}.tw\:text-yellow-800{color:var(--tw-color-yellow-800)}.tw\:capitalize{text-transform:capitalize}.tw\:uppercase{text-transform:uppercase}.tw\:italic{font-style:italic}.tw\:tabular-nums{--tw-numeric-spacing:tabular-nums;font-variant-numeric:var(--tw-ordinal,) var(--tw-slashed-zero,) var(--tw-numeric-figure,) var(--tw-numeric-spacing,) var(--tw-numeric-fraction,)}.tw\:line-through{text-decoration-line:line-through}.tw\:no-underline{text-decoration-line:none}.tw\:no-underline\!{text-decoration-line:none!important}.tw\:underline{text-decoration-line:underline}.tw\:opacity-0{opacity:0}.tw\:opacity-25{opacity:.25}.tw\:opacity-30{opacity:.3}.tw\:opacity-50{opacity:.5}.tw\:opacity-60{opacity:.6}.tw\:opacity-70{opacity:.7}.tw\:opacity-75{opacity:.75}.tw\:opacity-80{opacity:.8}.tw\:opacity-90{opacity:.9}.tw\:opacity-100{opacity:1}.tw\:shadow-2xl{--tw-shadow:0 25px 50px -12px var(--tw-shadow-color,#00000040);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:shadow-2xs{--tw-shadow:0 1px var(--tw-shadow-color,#0000000d);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:shadow-lg{--tw-shadow:0 10px 15px -3px var(--tw-shadow-color,#0000001a), 0 4px 6px -4px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:shadow-md{--tw-shadow:0 4px 6px -1px var(--tw-shadow-color,#0000001a), 0 2px 4px -2px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:shadow-sm{--tw-shadow:0 1px 3px 0 var(--tw-shadow-color,#0000001a), 0 1px 2px -1px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:shadow-xl{--tw-shadow:0 20px 25px -5px var(--tw-shadow-color,#0000001a), 0 8px 10px -6px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:shadow-xs{--tw-shadow:0 1px 2px 0 var(--tw-shadow-color,#0000000d);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:ring,.tw\:ring-1{--tw-ring-shadow:var(--tw-ring-inset,) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color,currentcolor);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:ring-2{--tw-ring-shadow:var(--tw-ring-inset,) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color,currentcolor);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:ring-4{--tw-ring-shadow:var(--tw-ring-inset,) 0 0 0 calc(4px + var(--tw-ring-offset-width)) var(--tw-ring-color,currentcolor);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:inset-shadow-sm\/10{--tw-inset-shadow-alpha:10%;--tw-inset-shadow:inset 0 2px 4px var(--tw-inset-shadow-color,oklab(0% 0 0/.1));box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:ring-blue-100{--tw-ring-color:var(--tw-color-blue-100)}.tw\:ring-emerald-100{--tw-ring-color:var(--tw-color-emerald-100)}.tw\:ring-gray-200{--tw-ring-color:var(--tw-color-gray-200)}.tw\:ring-gray-300{--tw-ring-color:var(--tw-color-gray-300)}.tw\:ring-green-500{--tw-ring-color:var(--tw-color-green-500)}.tw\:ring-red-100{--tw-ring-color:var(--tw-color-red-100)}.tw\:ring-red-400{--tw-ring-color:var(--tw-color-red-400)}.tw\:ring-red-500{--tw-ring-color:var(--tw-color-red-500)}.tw\:ring-white{--tw-ring-color:var(--tw-color-white)}.tw\:backdrop-blur-xs{--tw-backdrop-blur:blur(var(--tw-blur-xs));-webkit-backdrop-filter:var(--tw-backdrop-blur,) var(--tw-backdrop-brightness,) var(--tw-backdrop-contrast,) var(--tw-backdrop-grayscale,) var(--tw-backdrop-hue-rotate,) var(--tw-backdrop-invert,) var(--tw-backdrop-opacity,) var(--tw-backdrop-saturate,) var(--tw-backdrop-sepia,);backdrop-filter:var(--tw-backdrop-blur,) var(--tw-backdrop-brightness,) var(--tw-backdrop-contrast,) var(--tw-backdrop-grayscale,) var(--tw-backdrop-hue-rotate,) var(--tw-backdrop-invert,) var(--tw-backdrop-opacity,) var(--tw-backdrop-saturate,) var(--tw-backdrop-sepia,)}.tw\:transition{transition-property:color,background-color,border-color,outline-color,text-decoration-color,fill,stroke,--tw-gradient-from,--tw-gradient-via,--tw-gradient-to,opacity,box-shadow,transform,translate,scale,rotate,filter,-webkit-backdrop-filter,backdrop-filter,display,content-visibility,overlay,pointer-events;transition-timing-function:var(--tw-ease,var(--tw-default-transition-timing-function));transition-duration:var(--tw-duration,var(--tw-default-transition-duration))}.tw\:transition-all{transition-property:all;transition-timing-function:var(--tw-ease,var(--tw-default-transition-timing-function));transition-duration:var(--tw-duration,var(--tw-default-transition-duration))}.tw\:transition-colors{transition-property:color,background-color,border-color,outline-color,text-decoration-color,fill,stroke,--tw-gradient-from,--tw-gradient-via,--tw-gradient-to;transition-timing-function:var(--tw-ease,var(--tw-default-transition-timing-function));transition-duration:var(--tw-duration,var(--tw-default-transition-duration))}.tw\:transition-opacity{transition-property:opacity;transition-timing-function:var(--tw-ease,var(--tw-default-transition-timing-function));transition-duration:var(--tw-duration,var(--tw-default-transition-duration))}.tw\:transition-transform{transition-property:transform,translate,scale,rotate;transition-timing-function:var(--tw-ease,var(--tw-default-transition-timing-function));transition-duration:var(--tw-duration,var(--tw-default-transition-duration))}.tw\:duration-75{--tw-duration:75ms;transition-duration:75ms}.tw\:duration-150{--tw-duration:.15s;transition-duration:.15s}.tw\:duration-200{--tw-duration:.2s;transition-duration:.2s}.tw\:duration-300{--tw-duration:.3s;transition-duration:.3s}.tw\:duration-700{--tw-duration:.7s;transition-duration:.7s}.tw\:ease-in{--tw-ease:var(--tw-ease-in);transition-timing-function:var(--tw-ease-in)}.tw\:ease-in-out{--tw-ease:var(--tw-ease-in-out);transition-timing-function:var(--tw-ease-in-out)}.tw\:ease-out{--tw-ease:var(--tw-ease-out);transition-timing-function:var(--tw-ease-out)}.tw\:outline-none{--tw-outline-style:none;outline-style:none}.tw\:select-none{-webkit-user-select:none;user-select:none}:is(.tw\:\*\:px-3>*){padding-inline:calc(var(--tw-spacing) * 3)}:is(.tw\:\*\:py-2>*){padding-block:calc(var(--tw-spacing) * 2)}:is(.tw\:\*\:font-semibold>*){--tw-font-weight:var(--tw-font-weight-semibold);font-weight:var(--tw-font-weight-semibold)}:is(.tw\:\*\:whitespace-nowrap>*){white-space:nowrap}.tw\:not-first\:border-l:not(:first-child){border-left-style:var(--tw-border-style);border-left-width:1px}@media (hover:hover){.tw\:group-hover\:w-10:is(:where(.tw\:group):hover *){width:calc(var(--tw-spacing) * 10)}.tw\:group-hover\:text-blue-600:is(:where(.tw\:group):hover *){color:var(--tw-color-blue-600)}}.tw\:group-has-\[\.filter-chip\:hover\]\/bar\:w-0:is(:where(.tw\:group\/bar):has(.filter-chip:hover) *){width:0}.tw\:peer-checked\:translate-x-4:is(:where(.tw\:peer):checked~*){--tw-translate-x:calc(var(--tw-spacing) * 4);translate:var(--tw-translate-x) var(--tw-translate-y)}.tw\:peer-checked\:translate-x-5:is(:where(.tw\:peer):checked~*){--tw-translate-x:calc(var(--tw-spacing) * 5);translate:var(--tw-translate-x) var(--tw-translate-y)}.tw\:peer-checked\:bg-blue-600:is(:where(.tw\:peer):checked~*){background-color:var(--tw-color-blue-600)}.tw\:peer-focus-visible\:ring-2:is(:where(.tw\:peer):focus-visible~*){--tw-ring-shadow:var(--tw-ring-inset,) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color,currentcolor);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:peer-focus-visible\:ring-blue-400:is(:where(.tw\:peer):focus-visible~*){--tw-ring-color:var(--tw-color-blue-400)}.tw\:peer-focus-visible\:ring-offset-2:is(:where(.tw\:peer):focus-visible~*){--tw-ring-offset-width:2px;--tw-ring-offset-shadow:var(--tw-ring-inset,) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color)}.tw\:peer-disabled\:cursor-not-allowed:is(:where(.tw\:peer):disabled~*){cursor:not-allowed}.tw\:peer-disabled\:opacity-50:is(:where(.tw\:peer):disabled~*){opacity:.5}.tw\:last\:mb-0:last-child{margin-bottom:0}.tw\:last\:rounded-b-\[inherit\]\!:last-child{border-bottom-right-radius:inherit!important;border-bottom-left-radius:inherit!important}.tw\:last\:border-b-0:last-child{border-bottom-style:var(--tw-border-style);border-bottom-width:0}.tw\:last\:border-b-0\!:last-child{border-bottom-style:var(--tw-border-style)!important;border-bottom-width:0!important}.tw\:even\:bg-gray-50:nth-child(2n){background-color:var(--tw-color-gray-50)}.tw\:visited\:text-blue-900:visited{color:var(--tw-color-blue-900)}.tw\:visited\:text-gray-500\!:visited{color:var(--tw-color-gray-500)!important}.tw\:visited\:text-red-600:visited{color:var(--tw-color-red-600)}@media (hover:hover){.tw\:hover\:border-gray-300:hover{border-color:var(--tw-color-gray-300)}.tw\:hover\:border-gray-400:hover{border-color:var(--tw-color-gray-400)}.tw\:hover\:border-gray-500:hover{border-color:var(--tw-color-gray-500)}.tw\:hover\:bg-amber-50:hover{background-color:var(--tw-color-amber-50)}.tw\:hover\:bg-blue-50:hover{background-color:var(--tw-color-blue-50)}.tw\:hover\:bg-blue-600:hover{background-color:var(--tw-color-blue-600)}.tw\:hover\:bg-blue-700:hover{background-color:var(--tw-color-blue-700)}.tw\:hover\:bg-emerald-700:hover{background-color:var(--tw-color-emerald-700)}.tw\:hover\:bg-gray-50:hover{background-color:var(--tw-color-gray-50)}.tw\:hover\:bg-gray-100:hover{background-color:var(--tw-color-gray-100)}.tw\:hover\:bg-gray-200:hover{background-color:var(--tw-color-gray-200)}.tw\:hover\:bg-gray-200\!:hover{background-color:var(--tw-color-gray-200)!important}.tw\:hover\:bg-gray-500:hover{background-color:var(--tw-color-gray-500)}.tw\:hover\:bg-neutral-50:hover{background-color:var(--tw-color-neutral-50)}.tw\:hover\:bg-neutral-100:hover{background-color:var(--tw-color-neutral-100)}.tw\:hover\:bg-red-50:hover{background-color:var(--tw-color-red-50)}.tw\:hover\:bg-red-700:hover{background-color:var(--tw-color-red-700)}.tw\:hover\:text-blue-600:hover{color:var(--tw-color-blue-600)}.tw\:hover\:text-blue-800:hover{color:var(--tw-color-blue-800)}.tw\:hover\:text-gray-100:hover{color:var(--tw-color-gray-100)}.tw\:hover\:text-gray-400:hover{color:var(--tw-color-gray-400)}.tw\:hover\:text-gray-500:hover{color:var(--tw-color-gray-500)}.tw\:hover\:text-gray-700:hover{color:var(--tw-color-gray-700)}.tw\:hover\:text-gray-800:hover{color:var(--tw-color-gray-800)}.tw\:hover\:text-neutral-900\!:hover{color:var(--tw-color-neutral-900)!important}.tw\:hover\:text-red-500:hover{color:var(--tw-color-red-500)}.tw\:hover\:text-red-500\!:hover{color:var(--tw-color-red-500)!important}.tw\:hover\:text-red-600:hover{color:var(--tw-color-red-600)}.tw\:hover\:text-red-600\!:hover{color:var(--tw-color-red-600)!important}.tw\:hover\:text-red-700\!:hover{color:var(--tw-color-red-700)!important}.tw\:hover\:text-white:hover{color:var(--tw-color-white)}.tw\:hover\:no-underline:hover{text-decoration-line:none}.tw\:hover\:underline:hover{text-decoration-line:underline}.tw\:hover\:opacity-100:hover{opacity:1}.tw\:hover\:shadow-xl:hover{--tw-shadow:0 20px 25px -5px var(--tw-shadow-color,#0000001a), 0 8px 10px -6px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}}.tw\:focus\:z-10:focus{z-index:10}.tw\:focus\:border-blue-300:focus{border-color:var(--tw-color-blue-300)}.tw\:focus\:border-blue-500:focus{border-color:var(--tw-color-blue-500)}.tw\:focus\:ring:focus{--tw-ring-shadow:var(--tw-ring-inset,) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color,currentcolor);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:focus\:ring-2:focus{--tw-ring-shadow:var(--tw-ring-inset,) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color,currentcolor);box-shadow:var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)}.tw\:focus\:ring-\[\#337ab7\]:focus{--tw-ring-color:#337ab7}.tw\:focus\:ring-blue-500:focus,.tw\:focus\:ring-blue-500\/50:focus{--tw-ring-color:var(--tw-color-blue-500)}@supports (color:color-mix(in lab, red, red)){.tw\:focus\:ring-blue-500\/50:focus{--tw-ring-color:color-mix(in oklab, var(--tw-color-blue-500) 50%, transparent)}}.tw\:focus\:outline-hidden:focus{--tw-outline-style:none;outline-style:none}@media (forced-colors:active){.tw\:focus\:outline-hidden:focus{outline-offset:2px;outline:2px solid #0000}}.tw\:focus\:outline-none:focus{--tw-outline-style:none;outline-style:none}.tw\:active\:scale-95:active{--tw-scale-x:95%;--tw-scale-y:95%;--tw-scale-z:95%;scale:var(--tw-scale-x) var(--tw-scale-y)}.tw\:active\:bg-gray-100:active{background-color:var(--tw-color-gray-100)}.tw\:active\:text-gray-500:active{color:var(--tw-color-gray-500)}.tw\:active\:text-gray-700:active{color:var(--tw-color-gray-700)}.tw\:disabled\:cursor-default:disabled{cursor:default}.tw\:disabled\:cursor-not-allowed:disabled{cursor:not-allowed}.tw\:disabled\:opacity-20:disabled{opacity:.2}.tw\:disabled\:opacity-40:disabled{opacity:.4}.tw\:disabled\:opacity-50:disabled{opacity:.5}.tw\:has-checked\:border-blue-500:has(:checked){border-color:var(--tw-color-blue-500)}.tw\:has-checked\:bg-blue-50\/50:has(:checked){background-color:var(--tw-color-blue-50)}@supports (color:color-mix(in lab, red, red)){.tw\:has-checked\:bg-blue-50\/50:has(:checked){background-color:color-mix(in oklab, var(--tw-color-blue-50) 50%, transparent)}}@media (prefers-reduced-motion:no-preference){.tw\:motion-safe\:animate-\[spin_3s_linear_infinite\]{animation:3s linear infinite spin}}@media not all and (width>=768px){.tw\:max-md\:absolute{position:absolute}.tw\:max-md\:relative{position:relative}.tw\:max-md\:top-3\.5{top:calc(var(--tw-spacing) * 3.5)}.tw\:max-md\:left-4{left:calc(var(--tw-spacing) * 4)}.tw\:max-md\:col-span-2{grid-column:span 2/span 2}.tw\:max-md\:block{display:block}.tw\:max-md\:flex{display:flex}.tw\:max-md\:grid{display:grid}.tw\:max-md\:hidden{display:none}.tw\:max-md\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.tw\:max-md\:gap-3{gap:calc(var(--tw-spacing) * 3)}.tw\:max-md\:px-4{padding-inline:calc(var(--tw-spacing) * 4)}.tw\:max-md\:py-3{padding-block:calc(var(--tw-spacing) * 3)}.tw\:max-md\:pl-11{padding-left:calc(var(--tw-spacing) * 11)}:is(.tw\:max-md\:\*\:p-0>*){padding:0}}@media not all and (width>=576px){.tw\:max-sm\:left-0{left:0}.tw\:max-sm\:w-full{width:100%}}@media (width>=576px){.tw\:sm\:col-span-2{grid-column:span 2/span 2}.tw\:sm\:mx-10{margin-inline:calc(var(--tw-spacing) * 10)}.tw\:sm\:block{display:block}.tw\:sm\:flex{display:flex}.tw\:sm\:hidden{display:none}.tw\:sm\:inline{display:inline}.tw\:sm\:inline-block{display:inline-block}.tw\:sm\:table-cell{display:table-cell}.tw\:sm\:h-10{height:calc(var(--tw-spacing) * 10)}.tw\:sm\:w-auto{width:auto}.tw\:sm\:flex-1{flex:1}.tw\:sm\:shrink-0{flex-shrink:0}.tw\:sm\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.tw\:sm\:flex-row{flex-direction:row}.tw\:sm\:items-center{align-items:center}.tw\:sm\:justify-between{justify-content:space-between}.tw\:sm\:rounded-l-lg{border-top-left-radius:var(--tw-radius-lg);border-bottom-left-radius:var(--tw-radius-lg)}.tw\:sm\:rounded-r-lg{border-top-right-radius:var(--tw-radius-lg);border-bottom-right-radius:var(--tw-radius-lg)}.tw\:sm\:rounded-tr-none{border-top-right-radius:0}.tw\:sm\:rounded-bl-none{border-bottom-left-radius:0}.tw\:sm\:border-r{border-right-style:var(--tw-border-style);border-right-width:1px}.tw\:sm\:border-b-0{border-bottom-style:var(--tw-border-style);border-bottom-width:0}.tw\:sm\:p-4{padding:calc(var(--tw-spacing) * 4)}.tw\:sm\:px-6{padding-inline:calc(var(--tw-spacing) * 6)}.tw\:sm\:py-0{padding-block:0}.tw\:sm\:break-normal{overflow-wrap:normal;word-break:normal}}@media (width>=768px){.tw\:md\:flex{display:flex}.tw\:md\:hidden{display:none}.tw\:md\:inline-block{display:inline-block}.tw\:md\:table-cell{display:table-cell}.tw\:md\:w-1\/4{width:25%}.tw\:md\:w-3\/4{width:75%}.tw\:md\:min-w-md{min-width:var(--tw-container-md)}.tw\:md\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.tw\:md\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.tw\:md\:flex-row{flex-direction:row}}@media (width>=992px){.tw\:lg\:sticky{position:sticky}.tw\:lg\:top-4{top:calc(var(--tw-spacing) * 4)}.tw\:lg\:top-\[calc\(52px\+1rem\)\]{top:calc(52px + 1rem)}.tw\:lg\:col-span-1{grid-column:span 1/span 1}.tw\:lg\:flex{display:flex}.tw\:lg\:hidden{display:none}.tw\:lg\:inline-block{display:inline-block}.tw\:lg\:max-h-\[70vh\]{max-height:70vh}.tw\:lg\:w-md{width:var(--tw-container-md)}.tw\:lg\:shrink-0{flex-shrink:0}.tw\:lg\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.tw\:lg\:grid-cols-4{grid-template-columns:repeat(4,minmax(0,1fr))}.tw\:lg\:grid-cols-\[1\.5fr_1fr_1fr_1fr\]{grid-template-columns:1.5fr 1fr 1fr 1fr}.tw\:lg\:flex-row{flex-direction:row}}@media (width>=1200px){.tw\:xl\:hidden{display:none}.tw\:xl\:inline{display:inline}.tw\:xl\:inline-block{display:inline-block}}@media (width>=1440px){.tw\:2xl\:hidden{display:none}.tw\:2xl\:inline-block{display:inline-block}}.tw\:rtl\:flex-row-reverse:where(:is(:lang(ae),:lang(ar),:lang(arc),:lang(bcc),:lang(bqi),:lang(ckb),:lang(dv),:lang(fa),:lang(glk),:lang(he),:lang(ku),:lang(mzn),:lang(nqo),:lang(pnb),:lang(ps),:lang(sd),:lang(ug),:lang(ur),:lang(yi)),[dir=rtl],[dir=rtl] *){flex-direction:row-reverse}:where(.tw\:dark\:divide-dark-gray-300:where(.dark,.dark *)>:not(:last-child)){border-color:var(--tw-color-dark-gray-300)}:where(.tw\:dark\:divide-zinc-800:where(.dark,.dark *)>:not(:last-child)){border-color:var(--tw-color-zinc-800)}.tw\:dark\:rounded:where(.dark,.dark *){border-radius:.25rem}.tw\:dark\:rounded-lg:where(.dark,.dark *){border-radius:var(--tw-radius-lg)}.tw\:dark\:border-amber-400\/20:where(.dark,.dark *){border-color:var(--tw-color-amber-400)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:border-amber-400\/20:where(.dark,.dark *){border-color:color-mix(in oklab, var(--tw-color-amber-400) 20%, transparent)}}.tw\:dark\:border-amber-600:where(.dark,.dark *){border-color:var(--tw-color-amber-600)}.tw\:dark\:border-amber-700:where(.dark,.dark *){border-color:var(--tw-color-amber-700)}.tw\:dark\:border-black\/60:where(.dark,.dark *){border-color:var(--tw-color-black)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:border-black\/60:where(.dark,.dark *){border-color:color-mix(in oklab, var(--tw-color-black) 60%, transparent)}}.tw\:dark\:border-blue-400:where(.dark,.dark *){border-color:var(--tw-color-blue-400)}.tw\:dark\:border-blue-500:where(.dark,.dark *){border-color:var(--tw-color-blue-500)}.tw\:dark\:border-blue-700:where(.dark,.dark *){border-color:var(--tw-color-blue-700)}.tw\:dark\:border-blue-800:where(.dark,.dark *){border-color:var(--tw-color-blue-800)}.tw\:dark\:border-blue-900:where(.dark,.dark *){border-color:var(--tw-color-blue-900)}.tw\:dark\:border-dark-gray-100:where(.dark,.dark *){border-color:var(--tw-color-dark-gray-100)}.tw\:dark\:border-dark-gray-200:where(.dark,.dark *){border-color:var(--tw-color-dark-gray-200)}.tw\:dark\:border-dark-gray-300:where(.dark,.dark *){border-color:var(--tw-color-dark-gray-300)}.tw\:dark\:border-dark-gray-400:where(.dark,.dark *),.tw\:dark\:border-dark-gray-400\/80:where(.dark,.dark *){border-color:var(--tw-color-dark-gray-400)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:border-dark-gray-400\/80:where(.dark,.dark *){border-color:color-mix(in oklab, var(--tw-color-dark-gray-400) 80%, transparent)}}.tw\:dark\:border-gray-600:where(.dark,.dark *){border-color:var(--tw-color-gray-600)}.tw\:dark\:border-gray-700:where(.dark,.dark *){border-color:var(--tw-color-gray-700)}.tw\:dark\:border-green-400\/20:where(.dark,.dark *){border-color:var(--tw-color-green-400)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:border-green-400\/20:where(.dark,.dark *){border-color:color-mix(in oklab, var(--tw-color-green-400) 20%, transparent)}}.tw\:dark\:border-green-600:where(.dark,.dark *){border-color:var(--tw-color-green-600)}.tw\:dark\:border-green-700:where(.dark,.dark *){border-color:var(--tw-color-green-700)}.tw\:dark\:border-green-900:where(.dark,.dark *){border-color:var(--tw-color-green-900)}.tw\:dark\:border-red-400\/20:where(.dark,.dark *){border-color:var(--tw-color-red-400)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:border-red-400\/20:where(.dark,.dark *){border-color:color-mix(in oklab, var(--tw-color-red-400) 20%, transparent)}}.tw\:dark\:border-red-500:where(.dark,.dark *){border-color:var(--tw-color-red-500)}.tw\:dark\:border-red-700:where(.dark,.dark *){border-color:var(--tw-color-red-700)}.tw\:dark\:border-red-800:where(.dark,.dark *){border-color:var(--tw-color-red-800)}.tw\:dark\:border-red-900:where(.dark,.dark *){border-color:var(--tw-color-red-900)}.tw\:dark\:border-sky-400\/20:where(.dark,.dark *){border-color:var(--tw-color-sky-400)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:border-sky-400\/20:where(.dark,.dark *){border-color:color-mix(in oklab, var(--tw-color-sky-400) 20%, transparent)}}.tw\:dark\:border-yellow-800:where(.dark,.dark *){border-color:var(--tw-color-yellow-800)}.tw\:dark\:border-zinc-800:where(.dark,.dark *){border-color:var(--tw-color-zinc-800)}.tw\:dark\:bg-\[\#3e444c\]:where(.dark,.dark *){background-color:#3e444c}.tw\:dark\:bg-amber-300\/20:where(.dark,.dark *){background-color:var(--tw-color-amber-300)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-amber-300\/20:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-amber-300) 20%, transparent)}}.tw\:dark\:bg-amber-400\/10:where(.dark,.dark *){background-color:var(--tw-color-amber-400)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-amber-400\/10:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-amber-400) 10%, transparent)}}.tw\:dark\:bg-amber-900\/40:where(.dark,.dark *){background-color:var(--tw-color-amber-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-amber-900\/40:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-amber-900) 40%, transparent)}}.tw\:dark\:bg-amber-900\/50:where(.dark,.dark *){background-color:var(--tw-color-amber-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-amber-900\/50:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-amber-900) 50%, transparent)}}.tw\:dark\:bg-amber-950\/40:where(.dark,.dark *){background-color:var(--tw-color-amber-950)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-amber-950\/40:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-amber-950) 40%, transparent)}}.tw\:dark\:bg-black\/40:where(.dark,.dark *){background-color:var(--tw-color-black)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-black\/40:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-black) 40%, transparent)}}.tw\:dark\:bg-blue-400:where(.dark,.dark *){background-color:var(--tw-color-blue-400)}.tw\:dark\:bg-blue-600:where(.dark,.dark *){background-color:var(--tw-color-blue-600)}.tw\:dark\:bg-blue-700:where(.dark,.dark *){background-color:var(--tw-color-blue-700)}.tw\:dark\:bg-blue-900\/20:where(.dark,.dark *){background-color:var(--tw-color-blue-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-blue-900\/20:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-blue-900) 20%, transparent)}}.tw\:dark\:bg-blue-900\/30:where(.dark,.dark *){background-color:var(--tw-color-blue-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-blue-900\/30:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-blue-900) 30%, transparent)}}.tw\:dark\:bg-blue-900\/40:where(.dark,.dark *){background-color:var(--tw-color-blue-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-blue-900\/40:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-blue-900) 40%, transparent)}}.tw\:dark\:bg-blue-950:where(.dark,.dark *),.tw\:dark\:bg-blue-950\/30:where(.dark,.dark *){background-color:var(--tw-color-blue-950)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-blue-950\/30:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-blue-950) 30%, transparent)}}.tw\:dark\:bg-blue-950\/40:where(.dark,.dark *){background-color:var(--tw-color-blue-950)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-blue-950\/40:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-blue-950) 40%, transparent)}}.tw\:dark\:bg-dark-gray-100:where(.dark,.dark *){background-color:var(--tw-color-dark-gray-100)}.tw\:dark\:bg-dark-gray-200:where(.dark,.dark *){background-color:var(--tw-color-dark-gray-200)}.tw\:dark\:bg-dark-gray-300:where(.dark,.dark *){background-color:var(--tw-color-dark-gray-300)}.tw\:dark\:bg-dark-gray-300\!:where(.dark,.dark *){background-color:var(--tw-color-dark-gray-300)!important}.tw\:dark\:bg-dark-gray-400:where(.dark,.dark *),.tw\:dark\:bg-dark-gray-400\/90:where(.dark,.dark *){background-color:var(--tw-color-dark-gray-400)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-dark-gray-400\/90:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-dark-gray-400) 90%, transparent)}}.tw\:dark\:bg-dark-gray-500:where(.dark,.dark *){background-color:var(--tw-color-dark-gray-500)}.tw\:dark\:bg-dark-white-300:where(.dark,.dark *){background-color:var(--tw-color-dark-white-300)}.tw\:dark\:bg-gray-50:where(.dark,.dark *){background-color:var(--tw-color-gray-50)}.tw\:dark\:bg-gray-700:where(.dark,.dark *){background-color:var(--tw-color-gray-700)}.tw\:dark\:bg-gray-800:where(.dark,.dark *){background-color:var(--tw-color-gray-800)}.tw\:dark\:bg-green-400\/10:where(.dark,.dark *){background-color:var(--tw-color-green-400)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-green-400\/10:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-green-400) 10%, transparent)}}.tw\:dark\:bg-green-900\/30:where(.dark,.dark *){background-color:var(--tw-color-green-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-green-900\/30:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-green-900) 30%, transparent)}}.tw\:dark\:bg-green-900\/40:where(.dark,.dark *){background-color:var(--tw-color-green-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-green-900\/40:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-green-900) 40%, transparent)}}.tw\:dark\:bg-green-950:where(.dark,.dark *),.tw\:dark\:bg-green-950\/40:where(.dark,.dark *){background-color:var(--tw-color-green-950)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-green-950\/40:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-green-950) 40%, transparent)}}.tw\:dark\:bg-purple-900\/60:where(.dark,.dark *){background-color:var(--tw-color-purple-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-purple-900\/60:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-purple-900) 60%, transparent)}}.tw\:dark\:bg-red-400\/10:where(.dark,.dark *){background-color:var(--tw-color-red-400)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-red-400\/10:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-red-400) 10%, transparent)}}.tw\:dark\:bg-red-900\/30:where(.dark,.dark *){background-color:var(--tw-color-red-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-red-900\/30:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-red-900) 30%, transparent)}}.tw\:dark\:bg-red-900\/30\!:where(.dark,.dark *){background-color:var(--tw-color-red-900)!important}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-red-900\/30\!:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-red-900) 30%, transparent)!important}}.tw\:dark\:bg-red-900\/40:where(.dark,.dark *){background-color:var(--tw-color-red-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-red-900\/40:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-red-900) 40%, transparent)}}.tw\:dark\:bg-red-950:where(.dark,.dark *){background-color:var(--tw-color-red-950)}.tw\:dark\:bg-sky-400\/10:where(.dark,.dark *){background-color:var(--tw-color-sky-400)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-sky-400\/10:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-sky-400) 10%, transparent)}}.tw\:dark\:bg-sky-950:where(.dark,.dark *){background-color:var(--tw-color-sky-950)}.tw\:dark\:bg-transparent:where(.dark,.dark *){background-color:#0000}.tw\:dark\:bg-white\!:where(.dark,.dark *){background-color:var(--tw-color-white)!important}.tw\:dark\:bg-yellow-900\/40:where(.dark,.dark *){background-color:var(--tw-color-yellow-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:bg-yellow-900\/40:where(.dark,.dark *){background-color:color-mix(in oklab, var(--tw-color-yellow-900) 40%, transparent)}}.tw\:dark\:p-0\.5:where(.dark,.dark *){padding:calc(var(--tw-spacing) * .5)}.tw\:dark\:p-2:where(.dark,.dark *){padding:calc(var(--tw-spacing) * 2)}.tw\:dark\:text-\[\#ee5f5b\]:where(.dark,.dark *){color:#ee5f5b}.tw\:dark\:text-amber-100:where(.dark,.dark *){color:var(--tw-color-amber-100)}.tw\:dark\:text-amber-200:where(.dark,.dark *){color:var(--tw-color-amber-200)}.tw\:dark\:text-amber-300:where(.dark,.dark *){color:var(--tw-color-amber-300)}.tw\:dark\:text-amber-400:where(.dark,.dark *){color:var(--tw-color-amber-400)}.tw\:dark\:text-blue-300:where(.dark,.dark *){color:var(--tw-color-blue-300)}.tw\:dark\:text-blue-400:where(.dark,.dark *){color:var(--tw-color-blue-400)}.tw\:dark\:text-blue-400\!:where(.dark,.dark *){color:var(--tw-color-blue-400)!important}.tw\:dark\:text-blue-500:where(.dark,.dark *){color:var(--tw-color-blue-500)}.tw\:dark\:text-dark-gray-100:where(.dark,.dark *){color:var(--tw-color-dark-gray-100)}.tw\:dark\:text-dark-gray-300:where(.dark,.dark *){color:var(--tw-color-dark-gray-300)}.tw\:dark\:text-dark-gray-400:where(.dark,.dark *){color:var(--tw-color-dark-gray-400)}.tw\:dark\:text-dark-white-100:where(.dark,.dark *){color:var(--tw-color-dark-white-100)}.tw\:dark\:text-dark-white-100\!:where(.dark,.dark *){color:var(--tw-color-dark-white-100)!important}.tw\:dark\:text-dark-white-200:where(.dark,.dark *){color:var(--tw-color-dark-white-200)}.tw\:dark\:text-dark-white-200\!:where(.dark,.dark *){color:var(--tw-color-dark-white-200)!important}.tw\:dark\:text-dark-white-300:where(.dark,.dark *){color:var(--tw-color-dark-white-300)}.tw\:dark\:text-dark-white-300\!:where(.dark,.dark *){color:var(--tw-color-dark-white-300)!important}.tw\:dark\:text-dark-white-400:where(.dark,.dark *){color:var(--tw-color-dark-white-400)}.tw\:dark\:text-dark-white-400\!:where(.dark,.dark *){color:var(--tw-color-dark-white-400)!important}.tw\:dark\:text-gray-100:where(.dark,.dark *){color:var(--tw-color-gray-100)}.tw\:dark\:text-gray-200:where(.dark,.dark *){color:var(--tw-color-gray-200)}.tw\:dark\:text-gray-300:where(.dark,.dark *){color:var(--tw-color-gray-300)}.tw\:dark\:text-gray-400:where(.dark,.dark *){color:var(--tw-color-gray-400)}.tw\:dark\:text-gray-500:where(.dark,.dark *){color:var(--tw-color-gray-500)}.tw\:dark\:text-gray-600:where(.dark,.dark *){color:var(--tw-color-gray-600)}.tw\:dark\:text-gray-700:where(.dark,.dark *){color:var(--tw-color-gray-700)}.tw\:dark\:text-gray-800:where(.dark,.dark *){color:var(--tw-color-gray-800)}.tw\:dark\:text-gray-900:where(.dark,.dark *){color:var(--tw-color-gray-900)}.tw\:dark\:text-green-100:where(.dark,.dark *){color:var(--tw-color-green-100)}.tw\:dark\:text-green-300:where(.dark,.dark *){color:var(--tw-color-green-300)}.tw\:dark\:text-green-400:where(.dark,.dark *){color:var(--tw-color-green-400)}.tw\:dark\:text-purple-300:where(.dark,.dark *){color:var(--tw-color-purple-300)}.tw\:dark\:text-red-100:where(.dark,.dark *){color:var(--tw-color-red-100)}.tw\:dark\:text-red-300:where(.dark,.dark *){color:var(--tw-color-red-300)}.tw\:dark\:text-red-400:where(.dark,.dark *){color:var(--tw-color-red-400)}.tw\:dark\:text-red-400\!:where(.dark,.dark *){color:var(--tw-color-red-400)!important}.tw\:dark\:text-red-500:where(.dark,.dark *){color:var(--tw-color-red-500)}.tw\:dark\:text-red-500\!:where(.dark,.dark *){color:var(--tw-color-red-500)!important}.tw\:dark\:text-sky-100:where(.dark,.dark *){color:var(--tw-color-sky-100)}.tw\:dark\:text-sky-300:where(.dark,.dark *){color:var(--tw-color-sky-300)}.tw\:dark\:text-sky-400:where(.dark,.dark *){color:var(--tw-color-sky-400)}.tw\:dark\:text-white:where(.dark,.dark *){color:var(--tw-color-white)}.tw\:dark\:text-white\!:where(.dark,.dark *){color:var(--tw-color-white)!important}.tw\:dark\:text-yellow-400:where(.dark,.dark *){color:var(--tw-color-yellow-400)}.tw\:dark\:text-yellow-500:where(.dark,.dark *){color:var(--tw-color-yellow-500)}.tw\:dark\:placeholder-gray-400:where(.dark,.dark *)::placeholder{color:var(--tw-color-gray-400)}.tw\:dark\:scheme-dark:where(.dark,.dark *){--lightningcss-light: ;--lightningcss-dark:initial;color-scheme:dark}.tw\:dark\:shadow-black\/30:where(.dark,.dark *){--tw-shadow-color:var(--tw-color-black)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:shadow-black\/30:where(.dark,.dark *){--tw-shadow-color:color-mix(in oklab, color-mix(in oklab, var(--tw-color-black) 30%, transparent) var(--tw-shadow-alpha), transparent)}}.tw\:dark\:ring-blue-900\/50:where(.dark,.dark *){--tw-ring-color:var(--tw-color-blue-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:ring-blue-900\/50:where(.dark,.dark *){--tw-ring-color:color-mix(in oklab, var(--tw-color-blue-900) 50%, transparent)}}.tw\:dark\:ring-dark-gray-200:where(.dark,.dark *){--tw-ring-color:var(--tw-color-dark-gray-200)}.tw\:dark\:ring-dark-gray-500:where(.dark,.dark *){--tw-ring-color:var(--tw-color-dark-gray-500)}.tw\:dark\:ring-emerald-900\/50:where(.dark,.dark *){--tw-ring-color:var(--tw-color-emerald-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:ring-emerald-900\/50:where(.dark,.dark *){--tw-ring-color:color-mix(in oklab, var(--tw-color-emerald-900) 50%, transparent)}}.tw\:dark\:ring-red-900\/50:where(.dark,.dark *){--tw-ring-color:var(--tw-color-red-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:ring-red-900\/50:where(.dark,.dark *){--tw-ring-color:color-mix(in oklab, var(--tw-color-red-900) 50%, transparent)}}@media (hover:hover){.tw\:dark\:group-hover\:text-blue-400:where(.dark,.dark *):is(:where(.tw\:group):hover *){color:var(--tw-color-blue-400)}}.tw\:dark\:peer-focus-visible\:ring-offset-dark-gray-500:where(.dark,.dark *):is(:where(.tw\:peer):focus-visible~*){--tw-ring-offset-color:var(--tw-color-dark-gray-500)}.tw\:dark\:even\:bg-zinc-900:where(.dark,.dark *):nth-child(2n){background-color:var(--tw-color-zinc-900)}.tw\:dark\:visited\:text-dark-white-100\!:where(.dark,.dark *):visited{color:var(--tw-color-dark-white-100)!important}.tw\:dark\:visited\:text-red-500\!:where(.dark,.dark *):visited{color:var(--tw-color-red-500)!important}@media (hover:hover){.tw\:dark\:hover\:border-gray-500:where(.dark,.dark *):hover{border-color:var(--tw-color-gray-500)}.tw\:dark\:hover\:bg-blue-500:where(.dark,.dark *):hover{background-color:var(--tw-color-blue-500)}.tw\:dark\:hover\:bg-blue-700:where(.dark,.dark *):hover{background-color:var(--tw-color-blue-700)}.tw\:dark\:hover\:bg-dark-gray-200:where(.dark,.dark *):hover{background-color:var(--tw-color-dark-gray-200)}.tw\:dark\:hover\:bg-dark-gray-300:where(.dark,.dark *):hover{background-color:var(--tw-color-dark-gray-300)}.tw\:dark\:hover\:bg-dark-gray-400:where(.dark,.dark *):hover{background-color:var(--tw-color-dark-gray-400)}.tw\:dark\:hover\:bg-dark-gray-500:where(.dark,.dark *):hover{background-color:var(--tw-color-dark-gray-500)}.tw\:dark\:hover\:bg-gray-200\!:where(.dark,.dark *):hover{background-color:var(--tw-color-gray-200)!important}.tw\:dark\:hover\:bg-gray-600:where(.dark,.dark *):hover{background-color:var(--tw-color-gray-600)}.tw\:dark\:hover\:bg-gray-700:where(.dark,.dark *):hover{background-color:var(--tw-color-gray-700)}.tw\:dark\:hover\:bg-gray-800:where(.dark,.dark *):hover{background-color:var(--tw-color-gray-800)}.tw\:dark\:hover\:bg-red-500:where(.dark,.dark *):hover{background-color:var(--tw-color-red-500)}.tw\:dark\:hover\:bg-red-900\/20:where(.dark,.dark *):hover{background-color:var(--tw-color-red-900)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:hover\:bg-red-900\/20:where(.dark,.dark *):hover{background-color:color-mix(in oklab, var(--tw-color-red-900) 20%, transparent)}}.tw\:dark\:hover\:bg-red-950\/40:where(.dark,.dark *):hover{background-color:var(--tw-color-red-950)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:hover\:bg-red-950\/40:where(.dark,.dark *):hover{background-color:color-mix(in oklab, var(--tw-color-red-950) 40%, transparent)}}.tw\:dark\:hover\:text-blue-300:where(.dark,.dark *):hover{color:var(--tw-color-blue-300)}.tw\:dark\:hover\:text-blue-400:where(.dark,.dark *):hover{color:var(--tw-color-blue-400)}.tw\:dark\:hover\:text-dark-white-100:where(.dark,.dark *):hover{color:var(--tw-color-dark-white-100)}.tw\:dark\:hover\:text-dark-white-100\!:where(.dark,.dark *):hover{color:var(--tw-color-dark-white-100)!important}.tw\:dark\:hover\:text-gray-300:where(.dark,.dark *):hover{color:var(--tw-color-gray-300)}.tw\:dark\:hover\:text-red-400\!:where(.dark,.dark *):hover{color:var(--tw-color-red-400)!important}.tw\:dark\:hover\:text-red-500\!:where(.dark,.dark *):hover{color:var(--tw-color-red-500)!important}.tw\:dark\:hover\:text-red-800\!:where(.dark,.dark *):hover{color:var(--tw-color-red-800)!important}.tw\:dark\:hover\:text-white:where(.dark,.dark *):hover{color:var(--tw-color-white)}}.tw\:dark\:focus\:border-blue-500:where(.dark,.dark *):focus{border-color:var(--tw-color-blue-500)}.tw\:dark\:focus\:border-blue-700:where(.dark,.dark *):focus{border-color:var(--tw-color-blue-700)}.tw\:dark\:focus\:border-blue-800:where(.dark,.dark *):focus{border-color:var(--tw-color-blue-800)}.tw\:dark\:focus\:ring-blue-500:where(.dark,.dark *):focus{--tw-ring-color:var(--tw-color-blue-500)}.tw\:dark\:active\:bg-gray-700:where(.dark,.dark *):active{background-color:var(--tw-color-gray-700)}.tw\:dark\:active\:text-gray-300:where(.dark,.dark *):active{color:var(--tw-color-gray-300)}.tw\:dark\:has-checked\:bg-blue-950\/30:where(.dark,.dark *):has(:checked){background-color:var(--tw-color-blue-950)}@supports (color:color-mix(in lab, red, red)){.tw\:dark\:has-checked\:bg-blue-950\/30:where(.dark,.dark *):has(:checked){background-color:color-mix(in oklab, var(--tw-color-blue-950) 30%, transparent)}}.tw\:\[\&_\.select2-search\\_\\_field\]\:w-\[0\.75em\]\! .select2-search__field{width:.75em!important}.tw\:\[\&_\.select2-search\\_\\_field\]\:min-w-0\! .select2-search__field{min-width:0!important}.tw\:\[\&_select\]\:px-3 select{padding-inline:calc(var(--tw-spacing) * 3)}.tw\:\[\&_select\]\:py-1\.5 select{padding-block:calc(var(--tw-spacing) * 1.5)}.tw\:\[\&\:\:-webkit-search-cancel-button\]\:appearance-none::-webkit-search-cancel-button{appearance:none}@media not all and (width>=768px){.tw\:max-md\:\[\&\>\[data-label\]\]\:before\:mb-1>[data-label]:before{content:var(--tw-content);margin-bottom:var(--tw-spacing)}.tw\:max-md\:\[\&\>\[data-label\]\]\:before\:block>[data-label]:before{content:var(--tw-content);display:block}.tw\:max-md\:\[\&\>\[data-label\]\]\:before\:tracking-wider>[data-label]:before{content:var(--tw-content);--tw-tracking:var(--tw-tracking-wider);letter-spacing:var(--tw-tracking-wider)}.tw\:max-md\:\[\&\>\[data-label\]\]\:before\:text-gray-500>[data-label]:before{content:var(--tw-content);color:var(--tw-color-gray-500)}.tw\:max-md\:\[\&\>\[data-label\]\]\:before\:uppercase>[data-label]:before{content:var(--tw-content);text-transform:uppercase}.tw\:max-md\:\[\&\>\[data-label\]\]\:before\:content-\[attr\(data-label\)\]>[data-label]:before{--tw-content:attr(data-label);content:var(--tw-content)}}.tw\:\[\&\>div\]\:justify-center>div{justify-content:center}html,body{font-size:14px}}.device-link-up{--tw-font-weight:var(--tw-font-weight-bold);font-weight:var(--tw-font-weight-bold);color:var(--tw-color-blue-900)}.device-link-up:visited{color:var(--tw-color-blue-900)}.device-link-up:where(.dark,.dark *),.device-link-up:where(.dark,.dark *):visited{color:var(--tw-color-dark-white-100)}.device-link-down{--tw-font-weight:var(--tw-font-weight-bold);font-weight:var(--tw-font-weight-bold);color:var(--tw-color-red-600)}.device-link-down:visited{color:var(--tw-color-red-600)}.device-link-down:where(.dark,.dark *),.device-link-down:where(.dark,.dark *):visited{color:var(--tw-color-red-500)!important}.device-link-disabled{--tw-font-weight:var(--tw-font-weight-bold);font-weight:var(--tw-font-weight-bold);color:var(--tw-color-gray-400)}.device-link-disabled:visited{color:var(--tw-color-gray-400)}.device-link-disabled:where(.dark,.dark *),.device-link-disabled:where(.dark,.dark *):visited{color:var(--tw-color-gray-500)!important}#coordinates-text{text-decoration-line:underline}.lnms-btn{align-items:center;gap:var(--tw-spacing);border-radius:var(--tw-radius-lg);padding-inline:calc(var(--tw-spacing) * 2);padding-block:var(--tw-spacing);--tw-font-weight:var(--tw-font-weight-normal);font-weight:var(--tw-font-weight-normal);text-decoration-line:none;display:inline-flex}.lnms-btn-badge{min-width:calc(var(--tw-spacing) * 5);border-radius:var(--tw-radius-xl);padding-inline:calc(var(--tw-spacing) * 1.5);font-size:var(--tw-text-xs);line-height:var(--tw-leading,var(--tw-text-xs--line-height));--tw-font-weight:var(--tw-font-weight-bold);font-weight:var(--tw-font-weight-bold);justify-content:center;align-items:center;display:inline-flex}.lnms-btn-default{background-color:#3a3f44;color:var(--tw-color-white)!important}@media (hover:hover){.lnms-btn-default:hover{background-color:#1e2023}}.lnms-btn-default:where(.dark,.dark *){border-style:var(--tw-border-style);border-width:1px;border-color:var(--tw-color-dark-gray-100);background-color:var(--tw-color-dark-gray-400);color:var(--tw-color-dark-white-100)!important}@media (hover:hover){.lnms-btn-default:where(.dark,.dark *):hover{background-color:var(--tw-color-dark-gray-300)}}.lnms-btn-default .lnms-btn-badge{background-color:var(--tw-color-white);color:#232628}.lnms-btn-success{background-color:#5cb85c;color:var(--tw-color-white)!important}@media (hover:hover){.lnms-btn-success:hover{background-color:#449d44}}.lnms-btn-success .lnms-btn-badge{background-color:var(--tw-color-white);color:#5cb85c}.lnms-btn-danger{background-color:#d9534f;color:var(--tw-color-white)!important}@media (hover:hover){.lnms-btn-danger:hover{background-color:#c9302c}}.lnms-btn-danger .lnms-btn-badge{background-color:var(--tw-color-white);color:#d9534f}.lnms-btn-primary{background-color:#337ab7;color:var(--tw-color-white)!important}@media (hover:hover){.lnms-btn-primary:hover{background-color:#286090}}.lnms-btn-primary .lnms-btn-badge{background-color:var(--tw-color-white);color:#337ab7}.lnms-btn-warning{background-color:#f0ad4e;color:var(--tw-color-white)!important}@media (hover:hover){.lnms-btn-warning:hover{background-color:#ec971f}}.lnms-btn-warning .lnms-btn-badge{background-color:var(--tw-color-white);color:#f0ad4e}.dark .leaflet-tile,html.dark .leaflet-tile{filter:brightness(.6)invert()contrast(3)hue-rotate(200deg)saturate(.3)brightness(.7)}@property --tw-translate-x{syntax:"*";inherits:false;initial-value:0}@property --tw-translate-y{syntax:"*";inherits:false;initial-value:0}@property --tw-translate-z{syntax:"*";inherits:false;initial-value:0}@property --tw-scale-x{syntax:"*";inherits:false;initial-value:1}@property --tw-scale-y{syntax:"*";inherits:false;initial-value:1}@property --tw-scale-z{syntax:"*";inherits:false;initial-value:1}@property --tw-rotate-x{syntax:"*";inherits:false}@property --tw-rotate-y{syntax:"*";inherits:false}@property --tw-rotate-z{syntax:"*";inherits:false}@property --tw-skew-x{syntax:"*";inherits:false}@property --tw-skew-y{syntax:"*";inherits:false}@property --tw-space-y-reverse{syntax:"*";inherits:false;initial-value:0}@property --tw-divide-y-reverse{syntax:"*";inherits:false;initial-value:0}@property --tw-border-style{syntax:"*";inherits:false;initial-value:solid}@property --tw-leading{syntax:"*";inherits:false}@property --tw-font-weight{syntax:"*";inherits:false}@property --tw-tracking{syntax:"*";inherits:false}@property --tw-ordinal{syntax:"*";inherits:false}@property --tw-slashed-zero{syntax:"*";inherits:false}@property --tw-numeric-figure{syntax:"*";inherits:false}@property --tw-numeric-spacing{syntax:"*";inherits:false}@property --tw-numeric-fraction{syntax:"*";inherits:false}@property --tw-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-shadow-color{syntax:"*";inherits:false}@property --tw-shadow-alpha{syntax:"";inherits:false;initial-value:100%}@property --tw-inset-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-inset-shadow-color{syntax:"*";inherits:false}@property --tw-inset-shadow-alpha{syntax:"";inherits:false;initial-value:100%}@property --tw-ring-color{syntax:"*";inherits:false}@property --tw-ring-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-inset-ring-color{syntax:"*";inherits:false}@property --tw-inset-ring-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-ring-inset{syntax:"*";inherits:false}@property --tw-ring-offset-width{syntax:"";inherits:false;initial-value:0}@property --tw-ring-offset-color{syntax:"*";inherits:false;initial-value:#fff}@property --tw-ring-offset-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-backdrop-blur{syntax:"*";inherits:false}@property --tw-backdrop-brightness{syntax:"*";inherits:false}@property --tw-backdrop-contrast{syntax:"*";inherits:false}@property --tw-backdrop-grayscale{syntax:"*";inherits:false}@property --tw-backdrop-hue-rotate{syntax:"*";inherits:false}@property --tw-backdrop-invert{syntax:"*";inherits:false}@property --tw-backdrop-opacity{syntax:"*";inherits:false}@property --tw-backdrop-saturate{syntax:"*";inherits:false}@property --tw-backdrop-sepia{syntax:"*";inherits:false}@property --tw-duration{syntax:"*";inherits:false}@property --tw-ease{syntax:"*";inherits:false}@property --tw-content{syntax:"*";inherits:false;initial-value:""}@keyframes spin{to{transform:rotate(360deg)}}@keyframes pulse{50%{opacity:.5}}.grid-stack{position:relative}.grid-stack-rtl{direction:ltr}.grid-stack-rtl>.grid-stack-item{direction:rtl}.grid-stack-placeholder>.placeholder-content{background-color:#0000001a;width:auto;margin:0;position:absolute;z-index:0!important}.grid-stack>.grid-stack-item{width:var(--gs-column-width);height:var(--gs-cell-height);padding:0;position:absolute;top:0}.grid-stack>.grid-stack-item>.grid-stack-item-content{width:auto;margin:0;position:absolute;overflow:hidden auto}.grid-stack>.grid-stack-item.size-to-content:not(.size-to-content-max)>.grid-stack-item-content{overflow-y:hidden}.grid-stack:not(.grid-stack-rtl)>.grid-stack-item{left:0}.grid-stack.grid-stack-rtl>.grid-stack-item{right:0}.grid-stack>.grid-stack-item>.grid-stack-item-content,.grid-stack>.grid-stack-placeholder>.placeholder-content{top:var(--gs-item-margin-top);right:var(--gs-item-margin-right);bottom:var(--gs-item-margin-bottom);left:var(--gs-item-margin-left)}.grid-stack-item>.ui-resizable-handle{-ms-touch-action:none;touch-action:none;font-size:.1px;display:block;position:absolute}.grid-stack-item.ui-resizable-autohide>.ui-resizable-handle,.grid-stack-item.ui-resizable-disabled>.ui-resizable-handle{display:none}.grid-stack-item>.ui-resizable-ne,.grid-stack-item>.ui-resizable-nw,.grid-stack-item>.ui-resizable-se,.grid-stack-item>.ui-resizable-sw{background-image:url("data:image/svg+xml;utf8,");background-position:50%;background-repeat:no-repeat}.grid-stack-item>.ui-resizable-ne,.grid-stack-item>.ui-resizable-sw{transform:rotate(45deg)}.grid-stack-item>.ui-resizable-nw,.grid-stack-item>.ui-resizable-se{transform:rotate(-45deg)}.grid-stack-item>.ui-resizable-nw{cursor:nw-resize;width:20px;height:20px;top:var(--gs-item-margin-top);left:var(--gs-item-margin-left)}.grid-stack-item>.ui-resizable-n{cursor:n-resize;height:10px;top:var(--gs-item-margin-top);left:25px;right:25px}.grid-stack-item>.ui-resizable-ne{cursor:ne-resize;width:20px;height:20px;top:var(--gs-item-margin-top);right:var(--gs-item-margin-right)}.grid-stack-item>.ui-resizable-e{cursor:e-resize;width:10px;top:15px;bottom:15px;right:var(--gs-item-margin-right)}.grid-stack-item>.ui-resizable-se{cursor:se-resize;width:20px;height:20px;bottom:var(--gs-item-margin-bottom);right:var(--gs-item-margin-right)}.grid-stack-item>.ui-resizable-s{cursor:s-resize;height:10px;left:25px;bottom:var(--gs-item-margin-bottom);right:25px}.grid-stack-item>.ui-resizable-sw{cursor:sw-resize;width:20px;height:20px;bottom:var(--gs-item-margin-bottom);left:var(--gs-item-margin-left)}.grid-stack-item>.ui-resizable-w{cursor:w-resize;width:10px;top:15px;bottom:15px;left:var(--gs-item-margin-left)}.grid-stack-item.ui-draggable-dragging>.ui-resizable-handle{display:none!important}.grid-stack-item.ui-draggable-dragging{will-change:left,right,top}.grid-stack-item.ui-resizable-resizing{will-change:width,height}.ui-draggable-dragging,.ui-resizable-resizing{z-index:10000}.ui-draggable-dragging>.grid-stack-item-content,.ui-resizable-resizing>.grid-stack-item-content{opacity:.8;box-shadow:1px 4px 6px #0003}.grid-stack-animate,.grid-stack-animate .grid-stack-item{transition:left .3s,right .3s,top .3s,height .3s,width .3s}.grid-stack-animate .grid-stack-item.grid-stack-placeholder,.grid-stack-animate .grid-stack-item.ui-draggable-dragging,.grid-stack-animate .grid-stack-item.ui-resizable-resizing{transition:left,right,top,height,width}.grid-stack>.grid-stack-item[gs-y="0"]{top:0}.grid-stack:not(.grid-stack-rtl)>.grid-stack-item[gs-x="0"]{left:0}.grid-stack.grid-stack-rtl>.grid-stack-item[gs-x="0"]{right:0} diff --git a/html/build/assets/app-5_rax02w.js b/html/build/assets/app-JvI2AlHY.js similarity index 73% rename from html/build/assets/app-5_rax02w.js rename to html/build/assets/app-JvI2AlHY.js index 7a84af47bb0..a671962ef19 100644 --- a/html/build/assets/app-5_rax02w.js +++ b/html/build/assets/app-JvI2AlHY.js @@ -32,7 +32,7 @@ Note: ".grid-stack" is required for proper CSS styling and drag/drop, and is the ${n?`Expression: "`+n+`" -`:``}`,t),setTimeout(()=>{throw e},0)}var pa=!0;function ma(e){let t=pa;pa=!1;let n=e();return pa=t,n}function ha(e,t,n={}){let r;return ga(e,t)(e=>r=e,n),r}function ga(...e){return z(...e)}var z=()=>{};function _a(e){z=e}var va;function ya(e){va=e}function ba(e,t){let n={};oa(n,e);let r=[n,...Yi(e)],i=typeof t==`function`?xa(r,t):wa(r,t,e);return ca.bind(null,e,t,i)}function xa(e,t){return(n=()=>{},{scope:r={},params:i=[],context:a}={})=>{pa?Ta(n,t.apply(Xi([r,...e]),i)):Ta(n,t,Xi([r,...e]),i)}}var Sa={};function Ca(e,t){if(Sa[e])return Sa[e];let n=Object.getPrototypeOf(async function(){}).constructor,r=/^[\n\s]*if.*\(.*\)/.test(e.trim())||/^(let|const)\s/.test(e.trim())?`(async()=>{ ${e} })()`:e,i=(()=>{try{let t=new n([`__self`,`scope`],`with (scope) { __self.result = ${r} }; __self.finished = true; return __self.result;`);return Object.defineProperty(t,"name",{value:`[Alpine] ${e}`}),t}catch(n){return la(n,t,e),Promise.resolve()}})();return Sa[e]=i,i}function wa(e,t,n){let r=Ca(t,n);return(i=()=>{},{scope:a={},params:o=[],context:s}={})=>{r.result=void 0,r.finished=!1;let c=Xi([a,...e]);if(typeof r==`function`){let e=r.call(s,r,c).catch(e=>la(e,n,t));r.finished?(Ta(i,r.result,c,o,n),r.result=void 0):e.then(e=>{Ta(i,e,c,o,n)}).catch(e=>la(e,n,t)).finally(()=>r.result=void 0)}}}function Ta(e,t,n,r,i){if(pa&&typeof t==`function`){let a=t.apply(n,r);a instanceof Promise?a.then(t=>Ta(e,t,n,r)).catch(e=>la(e,i,t)):e(a)}else typeof t==`object`&&t instanceof Promise?t.then(t=>e(t)):e(t)}function Ea(...e){return va(...e)}function Da(e,t,n={}){let r={};oa(r,e);let i=[r,...Yi(e)],a=Xi([n.scope??{},...i]),o=n.params??[];if(t.includes(`await`)){let e=Object.getPrototypeOf(async function(){}).constructor;return new e([`scope`],`with (scope) { let __result = ${/^[\n\s]*if.*\(.*\)/.test(t.trim())||/^(let|const)\s/.test(t.trim())?`(async()=>{ ${t} })()`:t}; return __result }`).call(n.context,a)}{let e=/^[\n\s]*if.*\(.*\)/.test(t.trim())||/^(let|const)\s/.test(t.trim())?`(()=>{ ${t} })()`:t,r=Function([`scope`],`with (scope) { let __result = ${e}; return __result }`).call(n.context,a);return typeof r==`function`&&pa?r.apply(a,o):r}}var Oa=`x-`;function ka(e=``){return Oa+e}function Aa(e){Oa=e}var ja={};function Ma(e,t){return ja[e]=t,{before(t){if(!ja[t]){console.warn(String.raw`Cannot find directive \`${t}\`. \`${e}\` will use the default order of execution`);return}let n=Za.indexOf(t);Za.splice(n>=0?n:Za.indexOf(`DEFAULT`),0,e)}}}function Na(e){return Object.keys(ja).includes(e)}function Pa(e,t,n){if(t=Array.from(t),e._x_virtualDirectives){let n=Object.entries(e._x_virtualDirectives).map(([e,t])=>({name:e,value:t})),r=Fa(n);n=n.map(e=>r.find(t=>t.name===e.name)?{name:`x-bind:${e.name}`,value:`"${e.value}"`}:e),t=t.concat(n)}let r={};return t.map(Wa((e,t)=>r[e]=t)).filter(qa).map(Ya(r,n)).sort(Qa).map(t=>Va(e,t))}function Fa(e){return Array.from(e).map(Wa()).filter(e=>!qa(e))}var Ia=!1,La=new Map,Ra=Symbol();function za(e){Ia=!0;let t=Symbol();Ra=t,La.set(t,[]);let n=()=>{for(;La.get(t).length;)La.get(t).shift()();La.delete(t)};e(n),Ia=!1,n()}function Ba(e){let t=[],n=e=>t.push(e),[r,i]=Si(e);return t.push(i),[{Alpine:zs,effect:r,cleanup:n,evaluateLater:ga.bind(ga,e),evaluate:ha.bind(ha,e)},()=>t.forEach(e=>e())]}function Va(e,t){let n=ja[t.type]||(()=>{}),[r,i]=Ba(e);ji(e,t.original,i);let a=()=>{e._x_ignore||e._x_ignoreSelf||(n.inline&&n.inline(e,t,r),n=n.bind(n,e,t,r),Ia?La.get(Ra).push(n):n())};return a.runCleanups=i,a}var Ha=(e,t)=>({name:n,value:r})=>(n.startsWith(e)&&(n=n.replace(e,t)),{name:n,value:r}),Ua=e=>e;function Wa(e=()=>{}){return({name:t,value:n})=>{let{name:r,value:i}=Ga.reduce((e,t)=>t(e),{name:t,value:n});return r!==t&&e(r,t),{name:r,value:i}}}var Ga=[];function Ka(e){Ga.push(e)}function qa({name:e}){return Ja().test(e)}var Ja=()=>RegExp(`^${Oa}([^:^.]+)\\b`);function Ya(e,t){return({name:n,value:r})=>{n===r&&(r=``);let i=n.match(Ja()),a=n.match(/:([a-zA-Z0-9\-_:]+)/),o=n.match(/\.[^.\]]+(?=[^\]]*$)/g)||[],s=t||e[n]||n;return{type:i?i[1]:null,value:a?a[1]:null,modifiers:o.map(e=>e.replace(`.`,``)),expression:r,original:s}}}var Xa=`DEFAULT`,Za=[`ignore`,`ref`,`id`,`data`,`anchor`,`bind`,`init`,`for`,`model`,`modelable`,`transition`,`show`,`if`,Xa,`teleport`];function Qa(e,t){let n=Za.indexOf(e.type)===-1?Xa:e.type,r=Za.indexOf(t.type)===-1?Xa:t.type;return Za.indexOf(n)-Za.indexOf(r)}function $a(e,t){if(typeof ShadowRoot==`function`&&e instanceof ShadowRoot){Array.from(e.children).forEach(e=>$a(e,t));return}let n=!1;if(t(e,()=>n=!0),n)return;let r=e.firstElementChild;for(;r;)$a(r,t,!1),r=r.nextElementSibling}var eo=!1;function to(e,t=()=>{}){return(...n)=>eo?t(...n):e(...n)}function no(e){return(...t)=>eo&&e(...t)}var ro=[];function io(e){ro.push(e)}function ao(e,t){ro.forEach(n=>n(e,t)),eo=!0,lo(()=>{No(t,(e,t)=>{t(e,()=>{})})}),eo=!1}var oo=!1;function so(e,t){t._x_dataStack||=e._x_dataStack,eo=!0,oo=!0,lo(()=>{co(t)}),eo=!1,oo=!1}function co(e){let t=!1;No(e,(e,n)=>{$a(e,(e,r)=>{if(t&&ko(e))return r();t=!0,n(e,r)})})}function lo(e){let t=mi;xi((e,n)=>{let r=t(e);return hi(r),()=>{}}),e(),xi(t)}var uo=0;function fo(e,t){let n=e._x_deferInit;n||(n=e._x_deferInit={pending:0,ownsIgnore:!e._x_ignore,queuedAttributes:new Map},n.ownsIgnore&&(e._x_ignore=!0),uo++),n.pending++,Promise.resolve(t).catch(t=>{try{la(t,e)}catch(e){setTimeout(()=>{throw e},0)}}).then(()=>po(e,n))}function po(e,t){t.pending--,!(t.pending>0)&&(Bi(),!(t.pending>0)&&e._x_deferInit===t&&(delete e._x_deferInit,t.ownsIgnore&&delete e._x_ignore,uo--,e.isConnected&&(go(t),No(e))))}function mo(e,t){if(uo===0)return!1;let n=Oo(e,e=>e._x_deferInit);return n?(ho(n._x_deferInit,e,t.map(({name:e})=>e)),!0):!1}function ho(e,t,n){let r=e.queuedAttributes.get(t);(!r||r.marker!==t._x_marker)&&(r={marker:t._x_marker,names:new Set},e.queuedAttributes.set(t,r)),n.forEach(e=>r.names.add(e))}function go(e){e.queuedAttributes.forEach((e,t)=>{if(!t.isConnected||!t._x_marker||t._x_marker!==e.marker)return;let n=Oo(t,e=>e._x_deferInit);if(n){ho(n._x_deferInit,t,Array.from(e.names));return}let r=Array.from(e.names).filter(e=>t.hasAttribute(e)).map(e=>({name:e,value:t.getAttribute(e)}));r.length!==0&&Pa(t,r).forEach(e=>e())})}io((e,t)=>{uo!==0&&e&&e.nodeType===1&&t&&t.nodeType===1&&Oo(e,e=>e._x_deferInit)&&(t._x_ignore=!0)});function _o(e,t,n={},r={}){return e.dispatchEvent(new CustomEvent(t,{detail:n,bubbles:!0,composed:!0,cancelable:!0,...r}))}function vo(e,...t){console.warn(`Alpine Warning: ${e}`,...t)}var yo=!1;function bo(){yo&&vo(`Alpine has already been initialized on this page. Calling Alpine.start() more than once can cause problems.`),yo=!0,document.body||vo("Unable to initialize. Trying to load Alpine before `` is available. Did you forget to add `defer` in Alpine's ` diff --git a/includes/html/pages/search/fdb.inc.php b/includes/html/pages/search/fdb.inc.php deleted file mode 100755 index 7ae12a7166e..00000000000 --- a/includes/html/pages/search/fdb.inc.php +++ /dev/null @@ -1,151 +0,0 @@ -
-
- FDB Entries -
- - - - - - - - - - - - - - - - -
- - diff --git a/includes/html/pages/search/ipv4.inc.php b/includes/html/pages/search/ipv4.inc.php deleted file mode 100644 index 36b77a054e4..00000000000 --- a/includes/html/pages/search/ipv4.inc.php +++ /dev/null @@ -1,104 +0,0 @@ -
-
- IPv4 Addresses -
- - - - - - - - - - -
- - diff --git a/includes/html/pages/search/ipv6.inc.php b/includes/html/pages/search/ipv6.inc.php deleted file mode 100644 index 1ea01b04f80..00000000000 --- a/includes/html/pages/search/ipv6.inc.php +++ /dev/null @@ -1,105 +0,0 @@ -
-
- IPv6 Addresses -
- - - - - - - - - - -
- - diff --git a/includes/html/pages/search/mac.inc.php b/includes/html/pages/search/mac.inc.php deleted file mode 100644 index 42b0471651c..00000000000 --- a/includes/html/pages/search/mac.inc.php +++ /dev/null @@ -1,112 +0,0 @@ -
-
- MAC Addresses -
- - - - - - - - - - - -
- - diff --git a/includes/html/pages/search/packages.inc.php b/includes/html/pages/search/packages.inc.php deleted file mode 100644 index 3701e9c613e..00000000000 --- a/includes/html/pages/search/packages.inc.php +++ /dev/null @@ -1,193 +0,0 @@ - - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * Package Search - * - * @author Daniel Preussker - * @copyright 2014 f0o, LibreNMS - * @license GPL - */ -print_optionbar_start(28); -?> -
- -
- - -
-
- - -
-
- - -
- -
- 0) { - $results = (int) $_POST['results_amount']; -} else { - $results = 50; -} - -?> -
- - - - - - -toArray() ?: [0]; - $where .= ' AND `D`.`device_id` IN ' . dbGenPlaceholders(count($device_ids)); - $param = array_merge($param, $device_ids); -} - -$query .= " WHERE packages.device_id = devices.device_id AND packages.name LIKE ? $sql_where GROUP BY packages.name"; -$param[] = '%' . $_POST['package'] . '%'; - -$where = ''; -$ver = ''; -$opt = ''; - -if (! empty($_POST['arch'])) { - $where .= ' AND packages.arch = ?'; - $param[] = $_POST['arch']; -} - -if (is_numeric($_REQUEST['device_id'])) { - $where .= ' AND packages.device_id = ?'; - $param[] = $_REQUEST['device_id']; -} - -$count_query .= $query . ' ) sub'; -$query .= $where . ' ORDER BY packages.name, packages.arch, packages.version'; -$count = dbFetchCell($count_query, $param); - -if (! isset($_POST['page_number']) && $_POST['page_number'] < 1) { - $page_number = 1; -} else { - $page_number = $_POST['page_number']; -} - -$start = ($page_number - 1) * $results; -$full_query = $query . " LIMIT $start,$results"; - -?> - - - - - - - $entry) { - $vers = []; - $arch = []; - $devs = []; - foreach ($entry as $variation) { - $variation['version'] = str_replace(':', '.', $variation['version']); - if (! in_array($variation['version'], $vers) && (empty($ver) || version_compare($variation['version'], $ver, $opt))) { - $vers[] = $variation['version']; - } - if (! in_array($variation['arch'], $arch)) { - $arch[] = $variation['arch']; - } - if (! in_array($variation['hostname'], $devs)) { - unset($variation['version']); - $devs[] = generate_device_link($variation); - } - } - if (count($arch) > 0 && count($vers) > 0) { - ?> - - - - - - - 0 && $count != $results) { - ?> - - - - - -
Packages
PackageVersionArchDevice
', array_map(e(...), $vers)); ?>', array_map(e(...), $arch)); ?>', $devs); ?>
- - - - - -
- diff --git a/includes/html/print-alert-rules.php b/includes/html/print-alert-rules.php index 46e25dc0b49..019f5d2c89f 100644 --- a/includes/html/print-alert-rules.php +++ b/includes/html/print-alert-rules.php @@ -315,7 +315,8 @@ $device_query = 'SELECT devices.device_id,devices.hostname FROM alert_device_map, devices WHERE alert_device_map.rule_id=? and alert_device_map.device_id = devices.device_id ORDER BY hostname'; $device_maps = dbFetchRows($device_query, [$rule['id']]); foreach ($device_maps as $device_map) { - $devices .= $except_device_or_group . '' . htmlentities((string) DeviceCache::get($device_map['device_id'])->displayName()) . '
'; + $var = DeviceCache::get($device_map['device_id']); + $devices .= $except_device_or_group . '' . htmlentities((string) $var->display) . '
'; } } diff --git a/includes/html/print-event.inc.php b/includes/html/print-event.inc.php deleted file mode 100644 index c6fa938d674..00000000000 --- a/includes/html/print-event.inc.php +++ /dev/null @@ -1,47 +0,0 @@ -'; - -echo ''; -echo '' . $icon . ''; -echo '' . $entry['datetime'] . ''; - -if ($device->exists) { - echo '' . Url::deviceLink($device, $device->shortDisplayName()) . ''; -} - -if ($entry['type'] == 'interface') { - $port = PortCache::get($entry['reference']); - $entry['link'] = '' . Url::portLink($port, Rewrite::shortenIfName(strtolower((string) $port->getLabel()))) . ''; -} else { - $entry['link'] = 'System'; -} - -echo '' . $entry['link'] . ''; - -echo '' . htmlspecialchars((string) $entry['message']) . ''; -echo ''; diff --git a/includes/html/table/app_ntp.inc.php b/includes/html/table/app_ntp.inc.php index 1e4422b611d..c1c04c63e61 100644 --- a/includes/html/table/app_ntp.inc.php +++ b/includes/html/table/app_ntp.inc.php @@ -1,5 +1,8 @@ $comp) { + if (Gate::denies('view', DeviceCache::get($devid))) { + continue; // user may not see this device + } + $device = device_by_id_cache($devid); // Loop through each component @@ -79,7 +86,7 @@ ]; // Do we want a graphrow. - if (is_array($graph_array)) { + if (isset($graph_array)) { $return_data = true; require 'includes/html/print-graphrow.inc.php'; unset($return_data); diff --git a/includes/html/table/as-selection.inc.php b/includes/html/table/as-selection.inc.php index cfb44f8c329..6b49c988892 100644 --- a/includes/html/table/as-selection.inc.php +++ b/includes/html/table/as-selection.inc.php @@ -8,6 +8,13 @@ // 4294967295 (Reserved) $sql = ' FROM `devices` WHERE `disabled` = 0 AND `ignore` = 0 AND `bgpLocalAs` > 0 AND (`bgpLocalAs` < 64512 OR `bgpLocalAs` > 65535) AND `bgpLocalAs` < 4200000000 '; +if (Gate::denies('viewAll', App\Models\Device::class)) { + $device_ids = Permissions::devicesForUser()->toArray() ?: [0]; + // @phpstan-ignore function.deprecated + $sql .= ' AND `device_id` IN ' . dbGenPlaceholders(count($device_ids)); + $param = array_merge($param, $device_ids); +} + if (isset($searchPhrase) && ! empty($searchPhrase)) { $sql .= ' AND (`bgpLocalAs` LIKE ?)'; $param[] = "%$searchPhrase%"; diff --git a/includes/html/table/component.inc.php b/includes/html/table/component.inc.php index 8888a46d470..0fcbf37914c 100644 --- a/includes/html/table/component.inc.php +++ b/includes/html/table/component.inc.php @@ -1,8 +1,21 @@ $current, + 'rowCount' => $rowCount, + 'rows' => [], + 'total' => 0, + ], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); + + return; +} $OBJCOMP = new LibreNMS\Component(); @@ -37,7 +50,7 @@ 'ignore' => '', ]; -foreach ($COMPONENTS[$device_id] as $ID => $AVP) { +foreach ($COMPONENTS[$device_id] ?? [] as $ID => $AVP) { if ($AVP['status'] == 0) { $class = 'green'; $status = 'Ok'; diff --git a/includes/html/table/eventlog.inc.php b/includes/html/table/eventlog.inc.php deleted file mode 100644 index d7a2f07fc08..00000000000 --- a/includes/html/table/eventlog.inc.php +++ /dev/null @@ -1,108 +0,0 @@ -' . Url::portLink($port, Rewrite::shortenIfName(strtolower((string) $port->getLabel()))) . ''; - } else { - $type = $eventlog['type']; - } - $severity_colour = $eventlog['severity']; - - if ($eventlog['username'] == '') { - $eventlog['username'] = 'System'; - } - - $response[] = [ - 'datetime' => "" . $eventlog['humandate'], - 'hostname' => Url::deviceLink($device, $device->shortDisplayName()), - 'type' => $type, - 'message' => htmlspecialchars((string) $eventlog['message']), - 'username' => $eventlog['username'], - ]; -} - -$output = [ - 'current' => $current, - 'rowCount' => $rowCount, - 'rows' => $response, - 'total' => $total, -]; -echo json_encode($output, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); diff --git a/includes/polling/applications/hv-monitor.inc.php b/includes/polling/applications/hv-monitor.inc.php index 043a9fb23a4..2f4f73202af 100644 --- a/includes/polling/applications/hv-monitor.inc.php +++ b/includes/polling/applications/hv-monitor.inc.php @@ -1,5 +1,6 @@ data = $app_data; unset($return_data['hv']); -update_application($app, 'OK', data_flatten($return_data)); +$metrics = collect(Arr::dot($return_data)) + ->reject(fn ($value) => is_array($value)) + ->mapWithKeys(fn ($value, $key) => [str_replace('.', '_', $key) => $value]) + ->all(); +update_application($app, 'OK', $metrics); diff --git a/includes/polling/applications/oslv_monitor.inc.php b/includes/polling/applications/oslv_monitor.inc.php index 07113b60767..d1bfb70617f 100644 --- a/includes/polling/applications/oslv_monitor.inc.php +++ b/includes/polling/applications/oslv_monitor.inc.php @@ -18,7 +18,6 @@ } $stat_vars = [ - 'active_anon', 'active_file', 'burst-time', 'copy-on-write-faults', @@ -30,7 +29,6 @@ 'elapsed-times', 'inactive_file', 'involuntary-context-switches', - 'kernel_stack', 'major-faults', 'minor-faults', 'nr_bursts', @@ -48,7 +46,6 @@ 'signals-taken', 'sock', 'stack-size', - 'swapcached', 'swaps', 'system-time', 'text-size', diff --git a/includes/polling/applications/proxmox.inc.php b/includes/polling/applications/proxmox.inc.php deleted file mode 100644 index 44eb3f7df15..00000000000 --- a/includes/polling/applications/proxmox.inc.php +++ /dev/null @@ -1,136 +0,0 @@ - 0) { - return true; - } - if ($row = dbFetchRow('SELECT id FROM proxmox WHERE vmid = ? AND cluster = ?', [$i, $c])) { - $pmxcache[$c][$i] = (int) $row['id']; - - return true; - } - - return false; - } -} - -if (\App\Facades\LibrenmsConfig::get('enable_proxmox') && ! empty($agent_data['app'][$name])) { - $proxmox = $agent_data['app'][$name]; -} elseif (\App\Facades\LibrenmsConfig::get('enable_proxmox')) { - $oid = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.7.112.114.111.120.109.111.120'; - $proxmox = SnmpQuery::get($oid)->value(); - $proxmox = preg_replace('/^.+\n/', '', (string) $proxmox); - $proxmox = str_replace("<<>>\n", '', $proxmox); -} - -if (! empty($proxmox)) { - $pmxlines = explode("\n", (string) $proxmox); - $pmxcluster = array_shift($pmxlines); - dbUpdate( - ['device_id' => $device['device_id'], 'app_type' => $name, 'app_instance' => $pmxcluster], - 'applications', - '`device_id` = ? AND `app_type` = ?', - [$device['device_id'], $name] - ); - - $metrics = []; - if (count($pmxlines) > 0) { - $pmxcache = []; - - foreach ($pmxlines as $vm) { - $vm = trim(str_replace('"', '', $vm)); - if (! preg_match('#^([^/]+)/([^/]+)/([^/]+)/([^/]+)/(.+)$#', $vm, $matches)) { - continue; - } - [, $vmid, $vmport, $vmpin, $vmpout, $vmdesc] = $matches; - - $rrd_def = RrdDefinition::make() - ->addDataset('INOCTETS', 'DERIVE', 0, 12500000000) - ->addDataset('OUTOCTETS', 'DERIVE', 0, 12500000000); - $fields = [ - 'INOCTETS' => $vmpin, - 'OUTOCTETS' => $vmpout, - ]; - - $proxmox_metric_prefix = "pmxcluster{$pmxcluster}_vmid{$vmid}_vmport$vmport"; - $metrics[$proxmox_metric_prefix] = $fields; - $tags = [ - 'name' => $name, - 'app_id' => $app->app_id, - 'pmxcluster' => $pmxcluster, - 'vmid' => $vmid, - 'vmport' => $vmport, - 'rrd_proxmox_name' => [ - 'pmxcluster' => $pmxcluster, - 'vmid' => $vmid, - 'vmport' => $vmport, - ], - 'rrd_def' => $rrd_def, - ]; - app('Datastore')->put($device, 'app', $tags, $fields); - - if (proxmox_vm_exists($vmid, $pmxcluster, $pmxcache) === true) { - dbUpdate([ - 'device_id' => $device['device_id'], - 'last_seen' => ['NOW()'], - 'description' => $vmdesc, - ], $name, '`vmid` = ? AND `cluster` = ?', [$vmid, $pmxcluster]); - } else { - $pmxcache[$pmxcluster][$vmid] = dbInsert([ - 'cluster' => $pmxcluster, - 'vmid' => $vmid, - 'description' => $vmdesc, - 'device_id' => $device['device_id'], - ], $name); - } - - if ($portid = proxmox_port_exists($vmid, $pmxcluster, $vmport) !== false) { - dbUpdate( - ['last_seen' => ['NOW()']], - 'proxmox_ports', - '`vm_id` = ? AND `port` = ?', - [$pmxcache[$pmxcluster][$vmid], $vmport] - ); - } else { - dbInsert(['vm_id' => $pmxcache[$pmxcluster][$vmid], 'port' => $vmport], 'proxmox_ports'); - } - } - } - - update_application($app, $proxmox, $metrics); -} - -unset($pmxlines, $pmxcluster, $pmxcdir, $proxmox, $pmxcache); diff --git a/includes/polling/bgp-peers.inc.php b/includes/polling/bgp-peers.inc.php deleted file mode 100644 index 9cda85e5bc1..00000000000 --- a/includes/polling/bgp-peers.inc.php +++ /dev/null @@ -1,905 +0,0 @@ -enumStrings() - ->numericIndex() - ->abortOnFailure() - ->walk([ - 'BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerIndex', - 'BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerState', - 'BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerStatus', - 'BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerInUpdates', - 'BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerOutUpdates', - 'BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerInTotalMessages', - 'BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerOutTotalMessages', - 'BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerFsmEstablishedTime', - 'BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerLocalAddr', - 'BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerRemoteAddrType', - 'BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerLastErrorReceived', - 'BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerLastErrorReceivedText', - ])->valuesByIndex(); - } elseif ($device['os_group'] === 'arista') { - $peer_data_check = snmpwalk_cache_oid($device, 'aristaBgp4V2PeerRemoteAs', [], 'ARISTA-BGP4V2-MIB'); - } elseif ($device['os'] === 'dell-os10') { - $peer_data_check = snmpwalk_cache_oid($device, 'os10bgp4V2PeerRemoteAs', [], 'DELLEMC-OS10-BGP4V2-MIB', 'dell'); // practically identical MIB as arista - } elseif ($device['os'] === 'timos') { - $peer_data_check = SnmpQuery::enumStrings()->numericIndex()->abortOnFailure()->walk([ - 'TIMETRA-BGP-MIB::tBgpPeerNgTable', - 'TIMETRA-BGP-MIB::tBgpPeerNgOperTable', - ])->valuesByIndex(); - } elseif ($device['os'] === 'firebrick') { - $peer_data_check = snmpwalk_cache_multi_oid($device, 'fbBgpPeerTable', [], 'FIREBRICK-BGP-MIB', 'firebrick'); - } elseif ($device['os'] === 'aos7') { - $peer_data_check = snmpwalk_cache_multi_oid($device, 'alaBgpPeerAS', [], 'ALCATEL-IND1-BGP-MIB', 'aos7'); - } elseif ($device['os'] === 'vrp') { - $peer_data_check = snmpwalk_cache_multi_oid($device, 'hwBgpPeerEntry', [], 'HUAWEI-BGP-VPN-MIB', 'huawei'); - } elseif ($device['os_group'] == 'cisco') { - $peer_data_check = snmpwalk_cache_oid($device, 'cbgpPeer2RemoteAs', [], 'CISCO-BGP4-MIB'); - } elseif ($device['os'] === 'vyos') { - $peer_data_check = \SnmpQuery::enumStrings()->walk('BGP4V2-MIB::bgp4V2PeerRemoteAs')->valuesByIndex(); - // Walk all per-peer data columns in one pass and index by IP for the polling loop - $vyos_peer_table = \SnmpQuery::enumStrings()->walk([ - 'BGP4V2-MIB::bgp4V2PeerState', - 'BGP4V2-MIB::bgp4V2PeerAdminStatus', - 'BGP4V2-MIB::bgp4V2PeerLocalAddr', - 'BGP4V2-MIB::bgp4V2PeerFsmEstablishedTime', - 'BGP4V2-MIB::bgp4V2PeerDescription', - 'BGP4V2-MIB::bgp4V2PeerLastErrorCodeReceived', - ])->valuesByIndex(); - // With BGP4V2-MIB loaded, index format is: - // "1.ipv4..192.0.2.1" (dot-notation, real FRR devices) - // "1.ipv4.\"192.0.2.1\"" (quoted, some snmpsim/implementations) - $vyos_by_ip = []; - foreach ($vyos_peer_table as $idx => $vals) { - if (! preg_match('/\.(ipv4|ipv6)\.(?:\.([0-9.]+)|"([^"]+)")$/', (string) $idx, $m)) { - continue; - } - $addrStr = $m[2] !== '' ? $m[2] : $m[3]; - try { - $ip = str_contains($addrStr, ':') ? IP::fromHexString($addrStr) : IP::fromSnmpString($addrStr); - $vyos_by_ip[$ip->uncompressed()] = $vals; - } catch (InvalidIpException) { - } - } - } elseif ($device['os'] == 'cumulus') { - $peer_data_check = snmpwalk_cache_oid($device, 'bgpPeerRemoteAs', [], 'CUMULUS-BGPUN-MIB'); - if (empty($peer_data_check)) { - $peer_data_check = \SnmpQuery::enumStrings()->hideMib()->walk('CUMULUS-BGPVRF-MIB::bgpPeerTable')->mapTable( - $peer_data_check = function ($data, $vrfId, $peerIdType, $ifFace) { - $data['vrfId'] = $vrfId; - $data['peerIdType'] = $peerIdType; - $data['ifIndex'] = explode('.', (string) $ifFace)[4]; - $peer[$data['bgpPeerIdentifier']] = $data; - - return $peer; - }); - $cumulus_vrf = true; - } - } else { - $peer_data_check = snmpwalk_cache_oid($device, 'bgpPeerRemoteAs', [], 'BGP4-MIB'); - } - // If a Cisco device has BGP peers in VRF(s), but no BGP peers in - // the default VRF: don't fall back to the default MIB, to avoid - // skipping IPv6 peers (CISCO-BGP4-MIB is required.) - // count(getVrfContexts) returns VRF's with a configured SNMP context - // e.g. snmp-server context context_name vrf vrf_name - // "> 0" because the default VRF is only included in the count, - // if it has a switch configured SNMP context. - // The issues occured on NX-OS (Nexus) and IOS-XR (ASR) devices. - // Using os_group 'cisco' breaks the 3560g snmpsim tests. - $vrf_contexts = DeviceCache::getPrimary()->getVrfContexts(); - $cisco_with_vrf = (($device['os'] == 'iosxr' || $device['os'] == 'nxos') && ! empty($vrf_contexts[0])); - if (empty($peer_data_check) && ! $cisco_with_vrf) { - $peer_data_check = snmpwalk_cache_oid($device, 'bgpPeerRemoteAs', [], 'BGP4-MIB'); - $generic = true; - } - - foreach ($peers as $peer) { - //add context if exist - $device['context_name'] = $peer['context_name']; - $vrfOid = $peer['vrf_oid']; - $vrfId = $peer['vrf_id']; - - try { - $peer_ip = IP::parse($peer['bgpPeerIdentifier']); - - d_echo("Checking BGP peer $peer_ip "); - - // --- Collect BGP data --- - // If a Cisco device has BGP peers in VRF(s), - // but no BGP peers in the default VRF, - // a SNMP (v3) walk without context will not find any - // cbgpPeer2RemoteAs, resulting in empty $peer_data_check. - // Without the or clause, we won't see the VRF BGP peers. - // ($peer_data_check isn't used in the Cisco code path,) - if (count($peer_data_check) > 0 || $cisco_with_vrf) { - if ($generic) { - d_echo("\nfallback to default mib"); - - $peer_identifier = $peer['bgpPeerIdentifier']; - $mib = 'BGP4-MIB'; - $oid_map = [ - 'bgpPeerState' => 'bgpPeerState', - 'bgpPeerAdminStatus' => 'bgpPeerAdminStatus', - 'bgpPeerInUpdates' => 'bgpPeerInUpdates', - 'bgpPeerOutUpdates' => 'bgpPeerOutUpdates', - 'bgpPeerInTotalMessages' => 'bgpPeerInTotalMessages', - 'bgpPeerOutTotalMessages' => 'bgpPeerOutTotalMessages', - 'bgpPeerFsmEstablishedTime' => 'bgpPeerFsmEstablishedTime', - 'bgpPeerInUpdateElapsedTime' => 'bgpPeerInUpdateElapsedTime', - 'bgpPeerLocalAddr' => 'bgpLocalAddr', // silly db field name - 'bgpPeerLastError' => 'bgpPeerLastErrorCode', - ]; - } elseif ($device['os'] == 'junos') { - if (! isset($junos)) { - // parse peer IP - $junos = []; - foreach ($peer_data_check as $peers => $jnx_peer_data) { - $exploded_ip = explode('.', (string) $peers); - $ip_offset = count($exploded_ip) > 30 ? -16 : -4; - $tmp_peer_ip = Oid::of(implode('.', array_slice($exploded_ip, $ip_offset)))->toIp()->uncompressed(); - $junos[$tmp_peer_ip] = $jnx_peer_data; - } - } - - $address = $peer_ip->uncompressed(); - $peer_data = [ - 'bgpPeerState' => $junos[$address]['BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerState'] ?? 'unknown', - 'bgpPeerAdminStatus' => $junos[$address]['BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerStatus'] ?? 'unknown', - 'bgpPeerInUpdates' => $junos[$address]['BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerInUpdates'] ?? 0, - 'bgpPeerOutUpdates' => $junos[$address]['BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerOutUpdates'] ?? 0, - 'bgpPeerInTotalMessages' => $junos[$address]['BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerInTotalMessages'] ?? 0, - 'bgpPeerOutTotalMessages' => $junos[$address]['BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerOutTotalMessages'] ?? 0, - 'bgpPeerFsmEstablishedTime' => $junos[$address]['BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerFsmEstablishedTime'] ?? 0, - 'bgpPeerLastErrorText' => $junos[$address]['BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerLastErrorReceivedText'] ?? null, - ]; - - $error_data = explode(' ', $junos[$address]['BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerLastErrorReceived'] ?? ' '); - $peer_data['bgpPeerLastErrorCode'] = intval($error_data[0]); - $peer_data['bgpPeerLastErrorSubCode'] = intval($error_data[1]); - $peer_data['bgpPeerInUpdateElapsedTime'] = null; - - try { - $peer_data['bgpLocalAddr'] = IP::fromHexString($junos[$address]['BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerLocalAddr'])->uncompressed(); - } catch (InvalidIpException) { - $peer_data['bgpLocalAddr'] = ''; - } - d_echo("State = {$peer_data['bgpPeerState']} - AdminStatus: {$peer_data['bgpPeerAdminStatus']}\n"); - } elseif ($device['os'] == 'vrp') { - d_echo("\nCaching Oids VRP..."); - if (! isset($bgpPeers)) { - //if not available, we timeout each time, to be fixed when split - $bgpPeersCache = snmpwalk_cache_oid($device, 'hwBgpPeerEntry', [], 'HUAWEI-BGP-VPN-MIB', 'huawei'); - $bgpPeersStats = snmpwalk_cache_oid($device, 'hwBgpPeerStatisticTable', [], 'HUAWEI-BGP-VPN-MIB', 'huawei', '-OQUbs'); - $bgp4updates = snmpwalk_cache_oid($device, 'bgpPeerEntry', [], 'BGP4-MIB', 'huawei', '-OQUbs'); - foreach ($bgpPeersCache as $key => $value) { - $oid = explode('.', (string) $key, 5); - $vrfInstance = $oid[0]; - $afi = $oid[1]; - $safi = $oid[2]; - $transp = $oid[3]; - $address = $oid[4]; - if (strlen($address) > 15) { - $address = IP::fromHexString($address)->compressed(); - } - $bgpPeers[$address][$vrfInstance] ??= []; - $bgpPeers[$address][$vrfInstance] = array_merge($bgpPeers[$address][$vrfInstance], $value); - //d_echo("$vrfInstance -- $address \t-- $value"); - } - foreach ($bgpPeersStats as $key => $value) { - $oid = explode('.', (string) $key, 4); - $vrfInstance = $oid[1]; - $address = $oid[3]; - if ($oid[2] > 4) { //ipv6 so we have to translate - $address = IP::fromSnmpString($oid[3])->compressed(); - } - if (is_array($bgpPeers[$address]) && is_array($bgpPeers[$address][$vrfInstance])) { - $bgpPeers[$address][$vrfInstance] = array_merge($bgpPeers[$address][$vrfInstance], $value); - } - } - } - $address = (string) $peer_ip; - $bgpPeer = $bgpPeers[$address]; - $peer_data = []; - if ($bgpPeer && count(array_keys($bgpPeer)) == 1) { // We have only one vrf with a peer with this IP - $vrfInstance = array_keys($bgpPeer)[0]; - $peer_data['bgpPeerState'] = $bgpPeers[$address][$vrfInstance]['hwBgpPeerState'] ?? null; - $peer_data['bgpPeerAdminStatus'] = $bgpPeers[$address][$vrfInstance]['hwBgpPeerAdminStatus'] ?? null; - $peer_data['bgpPeerInUpdates'] = $bgpPeers[$address][$vrfInstance]['hwBgpPeerInUpdateMsgs'] ?? null; - $peer_data['bgpPeerOutUpdates'] = $bgpPeers[$address][$vrfInstance]['hwBgpPeerOutUpdateMsgs'] ?? null; - $peer_data['bgpPeerInTotalMessages'] = $bgpPeers[$address][$vrfInstance]['hwBgpPeerInTotalMsgs'] ?? null; - $peer_data['bgpPeerOutTotalMessages'] = $bgpPeers[$address][$vrfInstance]['hwBgpPeerOutTotalMsgs'] ?? null; - $peer_data['bgpPeerFsmEstablishedTime'] = $bgpPeers[$address][$vrfInstance]['hwBgpPeerFsmEstablishedTime'] ?? null; - $peer_data['bgpPeerLastError'] = $bgpPeers[$address][$vrfInstance]['hwBgpPeerLastError'] ?? null; - } - d_echo("VPN : $vrfInstance for $address :\n"); - d_echo($peer_data); - if (empty($peer_data['bgpPeerInUpdates']) && isset($bgp4updates[$address]['bgpPeerInUpdates'])) { - $peer_data['bgpPeerInUpdates'] = $bgp4updates[$address]['bgpPeerInUpdates']; - } - if (empty($peer_data['bgpPeerOutUpdates']) && isset($bgp4updates[$address]['bgpPeerOutUpdates'])) { - $peer_data['bgpPeerOutUpdates'] = $bgp4updates[$address]['bgpPeerOutUpdates']; - } - if (empty($peer_data['bgpPeerInTotalMessages']) && isset($bgp4updates[$address]['bgpPeerInTotalMessages'])) { - $peer_data['bgpPeerInTotalMessages'] = $bgp4updates[$address]['bgpPeerInTotalMessages']; - } - if (empty($peer_data['bgpPeerOutTotalMessages']) && isset($bgp4updates[$address]['bgpPeerOutTotalMessages'])) { - $peer_data['bgpPeerOutTotalMessages'] = $bgp4updates[$address]['bgpPeerOutTotalMessages']; - } - if (empty($peer_data['bgpPeerState'])) { - $peer_data['bgpPeerState'] = $bgp4updates[$address]['bgpPeerState']; - } - if (empty($peer_data['bgpPeerAdminStatus']) && isset($bgp4updates[$address]['bgpPeerAdminStatus'])) { - $peer_data['bgpPeerAdminStatus'] = $bgp4updates[$address]['bgpPeerAdminStatus']; - } - if (empty($peer_data['bgpPeerLastError'])) { - $peer_data['bgpPeerLastError'] = $bgp4updates[$address]['bgpPeerLastError']; - } - $error_data = explode(' ', (string) $peer_data['bgpPeerLastError']); - $peer_data['bgpPeerLastErrorCode'] = intval($error_data[0]); - $peer_data['bgpPeerLastErrorSubCode'] = intval($error_data[1]); - unset($peer_data['bgpPeerLastError']); - } elseif ($device['os'] == 'timos') { - if (! isset($bgpPeers)) { - $bgpPeers = []; - foreach ($peer_data_check as $key => $value) { - $oid = explode('.', (string) $key); - $vrfInstance = $oid[0]; - $address = implode('.', array_slice($oid, 3)); - if (strlen($address) > 15) { - $address = IP::fromSnmpString($address)->compressed(); - } - $bgpPeers[$vrfInstance][$address] = $value; - } - } - $address = (string) $peer_ip; - $peerData = $bgpPeers[$vrfOid][$address] ?? null; - - if ($peerData === null) { - // VRF OID from database didn't match, search all VRFs for this peer - foreach ($bgpPeers as $candidatePeers) { - if (isset($candidatePeers[$address])) { - $peerData = $candidatePeers[$address]; - break; - } - } - } - - if ($peerData === null) { - Log::warning("Missing TIMETRA data for peer $address - peer may have configuration/data mismatch"); - continue; - } - $establishedTime = $peerData['TIMETRA-BGP-MIB::tBgpPeerFsmEstablishedTime'] ?? null; - - if ($establishedTime === null) { - $bgp4Peers ??= SnmpQuery::enumStrings()->numericIndex()->walk('BGP4-MIB::bgpPeerFsmEstablishedTime')->valuesByIndex(); - - $establishedTime = $bgp4Peers[$address]['BGP4-MIB::bgpPeerFsmEstablishedTime'] ?? 0; - } - - $peer_data = []; - $peer_data['bgpPeerDescr'] = $peerData['TIMETRA-BGP-MIB::tBgpPeerNgDescription'] ?? ''; - $peer_data['bgpPeerState'] = $peerData['TIMETRA-BGP-MIB::tBgpPeerNgConnState']; - if ($peerData['TIMETRA-BGP-MIB::tBgpPeerNgShutdown'] == '1') { - $peer_data['bgpPeerAdminStatus'] = 'adminShutdown'; - } else { - $peer_data['bgpPeerAdminStatus'] = $peerData['TIMETRA-BGP-MIB::tBgpPeerNgOperLastEvent']; - } - $peer_data['bgpPeerInTotalMessages'] = $peerData['TIMETRA-BGP-MIB::tBgpPeerNgOperMsgOctetsRcvd'] % (2 ** 32); // That are actually only octets available, - $peer_data['bgpPeerOutTotalMessages'] = $peerData['TIMETRA-BGP-MIB::tBgpPeerNgOperMsgOctetsSent'] % (2 ** 32); // not messages - $peer_data['bgpPeerFsmEstablishedTime'] = $establishedTime; - } elseif ($device['os'] == 'firebrick') { - // ToDo, It seems that bgpPeer(In|Out)Updates and bgpPeerInUpdateElapsedTime are actually not available over SNMP - $bgpPeer = null; - foreach ($peer_data_check as $key => $value) { - $oid = explode('.', (string) $key); - $protocol = $oid[0]; - $address = str_replace($oid[0] . '.', '', $key); - if (strlen($address) > 15) { - $address = IP::fromHexString($address)->compressed(); - } - - // Some older Firebrick software versions don't have this field - if (isset($value['fbBgpPeerLocalAddress'])) { - $peer_data['bgpLocalAddr'] = IP::fromHexString($value['fbBgpPeerLocalAddress'])->uncompressed(); - } - - if ($address == $peer_ip) { - // Map Firebrick BGP state (MIB enum strings) to standard BGP state names - $peer_data['bgpPeerState'] = match ($value['fbBgpPeerState']) { - 'idle', 'closed', 'preshutdown', 'shutdown' => 'idle', - 'active', 'openWait' => 'active', - 'openSent' => 'opensent', - 'openConfirm' => 'openconfirm', - 'established' => 'established', - default => 'idle', - }; - - $peer_data['bgpPeerRemoteAddr'] = $address; - $peer_data['bgpPeerRemoteAs'] = $value['fbBgpPeerRemoteAS']; - $peer_data['bgpPeerAdminStatus'] = 'start'; - $peer_data['bgpPeerInUpdates'] = 0; - $peer_data['bgpPeerOutUpdates'] = 0; - $peer_data['bgpPeerInTotalMessages'] = 0; - $peer_data['bgpPeerOutTotalMessages'] = 0; - $peer_data['bgpPeerFsmEstablishedTime'] = 0; - break; - } - } - } else { - $bgp_peer_ident = $peer_ip->toSnmpIndex(); - $ip_ver = $peer_ip->getFamily(); - if ($ip_ver == 'ipv6') { - $ip_type = 2; - $ip_len = 16; - } else { - $ip_type = 1; - $ip_len = 4; - } - - if ($device['os_group'] === 'arista') { - $peer_identifier = '1.' . $ip_type . '.' . $ip_len . '.' . $bgp_peer_ident; - $mib = 'ARISTA-BGP4V2-MIB'; - $oid_map = [ - 'aristaBgp4V2PeerState' => 'bgpPeerState', - 'aristaBgp4V2PeerAdminStatus' => 'bgpPeerAdminStatus', - 'aristaBgp4V2PeerInUpdates' => 'bgpPeerInUpdates', - 'aristaBgp4V2PeerOutUpdates' => 'bgpPeerOutUpdates', - 'aristaBgp4V2PeerInTotalMessages' => 'bgpPeerInTotalMessages', - 'aristaBgp4V2PeerOutTotalMessages' => 'bgpPeerOutTotalMessages', - 'aristaBgp4V2PeerFsmEstablishedTime' => 'bgpPeerFsmEstablishedTime', - 'aristaBgp4V2PeerInUpdatesElapsedTime' => 'bgpPeerInUpdateElapsedTime', - 'aristaBgp4V2PeerLocalAddr' => 'bgpLocalAddr', - 'aristaBgp4V2PeerDescription' => 'bgpPeerDescr', - 'aristaBgp4V2PeerLastErrorCodeReceived' => 'bgpPeerLastErrorCode', - 'aristaBgp4V2PeerLastErrorSubCodeReceived' => 'bgpPeerLastErrorSubCode', - 'aristaBgp4V2PeerLastErrorReceivedText' => 'bgpPeerLastErrorText', - ]; - } elseif ($device['os'] == 'dell-os10') { - $peer_identifier = '1.' . $ip_type . '.' . $ip_len . '.' . $bgp_peer_ident; - $mib = 'DELLEMC-OS10-BGP4V2-MIB'; - $oid_map = [ - 'os10bgp4V2PeerState' => 'bgpPeerState', - 'os10bgp4V2PeerAdminStatus' => 'bgpPeerAdminStatus', - 'os10bgp4V2PeerInUpdates' => 'bgpPeerInUpdates', - 'os10bgp4V2PeerOutUpdates' => 'bgpPeerOutUpdates', - 'os10bgp4V2PeerInTotalMessages' => 'bgpPeerInTotalMessages', - 'os10bgp4V2PeerOutTotalMessages' => 'bgpPeerOutTotalMessages', - 'os10bgp4V2PeerFsmEstablishedTime' => 'bgpPeerFsmEstablishedTime', - 'os10bgp4V2PeerInUpdatesElapsedTime' => 'bgpPeerInUpdateElapsedTime', - 'os10bgp4V2PeerLocalAddr' => 'bgpLocalAddr', - 'os10bgp4V2PeerDescription' => 'bgpPeerDescr', - 'os10bgp4V2PeerLastErrorCodeReceived' => 'bgpPeerLastErrorCode', - 'os10bgp4V2PeerLastErrorSubCodeReceived' => 'bgpPeerLastErrorSubCode', - 'os10bgp4V2PeerLastErrorReceivedText' => 'bgpPeerLastErrorText', - ]; - } elseif ($device['os'] == 'aos7') { - $peer_identifier = $peer['bgpPeerIdentifier']; - $peer_data = []; - $al_descr = snmpwalk_cache_multi_oid($device, 'alaBgpPeerName', [], 'ALCATEL-IND1-BGP-MIB', 'aos7', '-OQUs'); - $al_peer = snmpwalk_cache_multi_oid($device, 'BgpPeerEntry', [], 'BGP4-MIB', 'aos7', '-OQUs'); - $peer_data['bgpPeerDescr'] = $al_descr[$peer_identifier]['alaBgpPeerName']; - $peer_data['bgpPeerState'] = $al_peer[$peer_identifier]['bgpPeerState']; - $peer_data['bgpPeerAdminStatus'] = $al_peer[$peer_identifier]['bgpPeerAdminStatus']; - $peer_data['bgpPeerInUpdates'] = $al_peer[$peer_identifier]['bgpPeerInUpdates']; - $peer_data['bgpPeerOutUpdates'] = $al_peer[$peer_identifier]['bgpPeerOutUpdates']; - $peer_data['bgpPeerInTotalMessages'] = $al_peer[$peer_identifier]['bgpPeerInTotalMessages']; - $peer_data['bgpPeerOutTotalMessages'] = $al_peer[$peer_identifier]['bgpPeerOutTotalMessages']; - $peer_data['bgpPeerFsmEstablishedTime'] = $al_peer[$peer_identifier]['bgpPeerFsmEstablishedTime']; - $peer_data['bgpPeerInUpdateElapsedTime'] = $al_peer[$peer_identifier]['bgpPeerInUpdateElapsedTime']; - $error_data = explode(' ', (string) $al_peer[$peer_identifier]['bgpPeerLastError']); - $peer_data['bgpPeerLastErrorCode'] = intval($error_data[0]); - $peer_data['bgpPeerLastErrorSubCode'] = intval($error_data[1]); - } elseif ($device['os_group'] == 'cisco') { - $peer_identifiers = [$ip_ver, $peer_ip->toSnmpString()]; - $oid_map = [ - 'CISCO-BGP4-MIB::cbgpPeer2State' => 'bgpPeerState', - 'CISCO-BGP4-MIB::cbgpPeer2AdminStatus' => 'bgpPeerAdminStatus', - 'CISCO-BGP4-MIB::cbgpPeer2InUpdates' => 'bgpPeerInUpdates', - 'CISCO-BGP4-MIB::cbgpPeer2OutUpdates' => 'bgpPeerOutUpdates', - 'CISCO-BGP4-MIB::cbgpPeer2InTotalMessages' => 'bgpPeerInTotalMessages', - 'CISCO-BGP4-MIB::cbgpPeer2OutTotalMessages' => 'bgpPeerOutTotalMessages', - 'CISCO-BGP4-MIB::cbgpPeer2FsmEstablishedTime' => 'bgpPeerFsmEstablishedTime', - 'CISCO-BGP4-MIB::cbgpPeer2InUpdateElapsedTime' => 'bgpPeerInUpdateElapsedTime', - 'CISCO-BGP4-MIB::cbgpPeer2LocalAddr' => 'bgpLocalAddr', - 'CISCO-BGP4-MIB::cbgpPeer2LastError' => 'bgpPeerLastErrorCode', - 'CISCO-BGP4-MIB::cbgpPeer2LastErrorTxt' => 'bgpPeerLastErrorText', - ]; - } elseif ($device['os'] === 'vyos') { - $vals = $vyos_by_ip[$peer_ip->uncompressed()] ?? null; - if ($vals !== null) { - $peer_data = [ - 'bgpPeerState' => $vals['BGP4V2-MIB::bgp4V2PeerState'] ?? '', - 'bgpPeerAdminStatus' => $vals['BGP4V2-MIB::bgp4V2PeerAdminStatus'] ?? '', - 'bgpPeerFsmEstablishedTime' => $vals['BGP4V2-MIB::bgp4V2PeerFsmEstablishedTime'] ?? 0, - 'bgpPeerDescr' => $vals['BGP4V2-MIB::bgp4V2PeerDescription'] ?? '', - 'bgpPeerLastErrorCode' => $vals['BGP4V2-MIB::bgp4V2PeerLastErrorCodeReceived'] ?? 0, - 'bgpPeerInUpdateElapsedTime' => 0, - ]; - try { - $peer_data['bgpLocalAddr'] = IP::fromHexString($vals['BGP4V2-MIB::bgp4V2PeerLocalAddr'] ?? '')->uncompressed(); - } catch (InvalidIpException) { - $peer_data['bgpLocalAddr'] = '0.0.0.0'; - } - } - } elseif ($device['os'] == 'cumulus') { - $peer_identifier = $peer['bgpPeerIdentifier']; - $mib = 'CUMULUS-BGPUN-MIB'; - $oid_map = [ - 'bgpPeerState' => 'bgpPeerState', - 'bgpPeerAdminStatus' => 'bgpPeerAdminStatus', - 'bgpPeerInUpdates' => 'bgpPeerInUpdates', - 'bgpPeerOutUpdates' => 'bgpPeerOutUpdates', - 'bgpPeerInTotalMessages' => 'bgpPeerInTotalMessages', - 'bgpPeerOutTotalMessages' => 'bgpPeerOutTotalMessages', - 'bgpPeerFsmEstablishedTime' => 'bgpPeerFsmEstablishedTime', - 'bgpPeerInUpdateElapsedTime' => 'bgpPeerInUpdateElapsedTime', - 'bgpPeerLocalAddr' => 'bgpLocalAddr', - 'bgpPeerLastError' => 'bgpPeerLastErrorCode', - 'bgpPeerIface' => 'bgpPeerIface', - ]; - if ($cumulus_vrf) { - $bgp_peers = array_filter($peer_data_check->toArray(), fn ($peer) => $peer[$peer_identifier] ?? []); - $tmp_data = array_pop($bgp_peers)[$peer_identifier]; - $peer_data['bgpPeerDescr'] = $tmp_data['bgpPeerDesc']; - $peer_data['bgpPeerState'] = $tmp_data['bgpPeerState']; - $peer_data['bgpPeerAdminStatus'] = $tmp_data['bgpPeerAdminStatus']; - $peer_data['bgpPeerInUpdates'] = $tmp_data['bgpPeerInUpdates']; - $peer_data['bgpPeerOutUpdates'] = $tmp_data['bgpPeerOutUpdates']; - $peer_data['bgpPeerInTotalMessages'] = $tmp_data['bgpPeerInTotalMessages']; - $peer_data['bgpPeerOutTotalMessages'] = $tmp_data['bgpPeerOutTotalMessages']; - $peer_data['bgpPeerFsmEstablishedTime'] = $tmp_data['bgpPeerFsmEstablishedTime']; - $peer_data['bgpPeerInUpdateElapsedTime'] = $tmp_data['bgpPeerInUpdateElapsedTime']; - [$last_error_code, $last_error_subcode] = explode(' ', (string) $tmp_data['bgpPeerLastError']); - $peer_data['bgpPeerLastErrorCode'] = octdec($last_error_code); - $peer_data['bgpPeerLastErrorSubCode'] = octdec($last_error_subcode); - } - } else { - $peer_identifier = $peer['bgpPeerIdentifier']; - $mib = 'BGP4-MIB'; - $oid_map = [ - 'bgpPeerState' => 'bgpPeerState', - 'bgpPeerAdminStatus' => 'bgpPeerAdminStatus', - 'bgpPeerInUpdates' => 'bgpPeerInUpdates', - 'bgpPeerOutUpdates' => 'bgpPeerOutUpdates', - 'bgpPeerInTotalMessages' => 'bgpPeerInTotalMessages', - 'bgpPeerOutTotalMessages' => 'bgpPeerOutTotalMessages', - 'bgpPeerFsmEstablishedTime' => 'bgpPeerFsmEstablishedTime', - 'bgpPeerInUpdateElapsedTime' => 'bgpPeerInUpdateElapsedTime', - 'bgpPeerLocalAddr' => 'bgpLocalAddr', // silly db field name - 'bgpPeerLastError' => 'bgpPeerLastErrorCode', - ]; - } - } - } - - // --- Fetch peer data if it is not already filled in --- - if (empty($peer_data) && isset($peer_identifier, $oid_map, $mib)) { - d_echo("Fetching $mib data... \n"); - - $get_oids = array_map(fn ($oid) => "$oid.$peer_identifier", array_keys($oid_map)); - $peer_data_raw = snmp_get_multi($device, $get_oids, '-OQUs', $mib); - $peer_data_raw = reset($peer_data_raw); // get the first element of the array - } elseif (empty($peer_data) && isset($peer_identifiers, $oid_map)) { - d_echo("Walking data... \n"); - - $bgp_cache ??= SnmpQuery::enumStrings()->walk(array_keys($oid_map))->table(count($peer_identifiers)); - - // Fetch the snmp item related to this peer - $peer_data_raw = array_reduce($peer_identifiers, fn ($ret, $item) => $ret[$item] ?? [], $bgp_cache); - } - - // --- Fill in peer data if raw data has been fetched --- - if (! empty($peer_data_raw)) { - $peer_data = []; - - foreach ($oid_map as $source => $target) { - $v = $peer_data_raw[$source] ?? (in_array($target, $intFields) ? 0 : ''); - - if (Str::contains($source, 'LocalAddr')) { - try { - $v = IP::fromHexString($v)->uncompressed(); - } catch (InvalidIpException) { - // if parsing fails, leave the data as-is - } - } - $peer_data[$target] = $v; - } - if (strpos((string) $peer_data['bgpPeerLastErrorCode'], ' ')) { - // Some device return both Code and SubCode in the same snmp field, we need to split it - $splitted_codes = explode(' ', (string) $peer_data['bgpPeerLastErrorCode']); - $error_code = intval($splitted_codes[0]); - $error_subcode = intval($splitted_codes[1]); - $peer_data['bgpPeerLastErrorCode'] = $error_code; - $peer_data['bgpPeerLastErrorSubCode'] = $error_subcode; - } - - // --- Fill the bgpPeerIface column --- - if (isset($peer_data['bgpPeerIface']) && ! IP::isValid($peer_data['bgpPeerIface'])) { - // The column is already filled with the ifName, we change it to ifIndex - $peer_data['bgpPeerIface'] = DeviceCache::getPrimary()->ports()->where('ifName', '=', $peer_data['bgpPeerIface'])->value('ifIndex'); - } elseif (isset($peer_data['bgpPeerIface']) && is_numeric($peer_data['bgpPeerIface'])) { - // The column is already filled with the ifIndex, we leave it as is - } elseif (isset($peer_data['bgpPeerLocalAddr']) && IP::isValid($peer_data['bgpPeerLocalAddr'])) { - // else we use the bgpPeerLocalAddr to find ifIndex on the peer device - // Only populate bgpPeerIface when exactly one device has this IP — null when ambiguous (zero or multiple matches in environments with reused address space) - try { - $ip_address = IP::parse($peer_data['bgpPeerLocalAddr']); - $family = $ip_address->getFamily(); - $peer_data['bgpPeerIface'] = DB::table('ports')->join("{$family}_addresses", 'ports.port_id', '=', "{$family}_addresses.port_id")->where("{$family}_address", '=', $ip_address->uncompressed())->sole('ports.ifIndex')->ifIndex; - } catch (InvalidIpException|\Illuminate\Database\MultipleRecordsFoundException|\Illuminate\Database\RecordsNotFoundException) { - $peer_data['bgpPeerIface'] = null; - } - } elseif (isset($peer_data['bgpLocalAddr']) && IP::isValid($peer_data['bgpLocalAddr'])) { - // else we use the bgpLocalAddr to find ifIndex on the peer device - // Only populate bgpPeerIface when exactly one device has this IP — null when ambiguous (zero or multiple matches in environments with reused address space) - try { - $ip_address = IP::parse($peer_data['bgpLocalAddr']); - $family = $ip_address->getFamily(); - $peer_data['bgpPeerIface'] = DB::table('ports')->join("{$family}_addresses", 'ports.port_id', '=', "{$family}_addresses.port_id")->where("{$family}_address", '=', $ip_address->uncompressed())->sole('ports.ifIndex')->ifIndex; - } catch (InvalidIpException|\Illuminate\Database\MultipleRecordsFoundException|\Illuminate\Database\RecordsNotFoundException) { - $peer_data['bgpPeerIface'] = null; - } - } else { - $peer_data['bgpPeerIface'] = null; - } - } - } catch (InvalidIpException) { - // ignore - } - - if (empty($peer_data)) { - continue; // no data, try next peer - } - - d_echo($peer_data); - - // --- Send event log notices --- - if ($peer_data['bgpPeerFsmEstablishedTime']) { - if (! (is_array(\App\Facades\LibrenmsConfig::get('alerts.bgp.whitelist')) - && ! in_array($peer['bgpPeerRemoteAs'], \App\Facades\LibrenmsConfig::get('alerts.bgp.whitelist'))) - && ($peer_data['bgpPeerFsmEstablishedTime'] < $peer['bgpPeerFsmEstablishedTime'] - || $peer_data['bgpPeerState'] != $peer['bgpPeerState']) - ) { - $bgpErrorCode = Rewrite::bgpErrorCode($peer['bgpPeerLastErrorCode'] ?? '', $peer['bgpPeerLastErrorSubCode'] ?? ''); - if ($peer['bgpPeerState'] == $peer_data['bgpPeerState']) { - Eventlog::log('BGP Session Flap: ' . $peer['bgpPeerIdentifier'] . ' (AS' . $peer['bgpPeerRemoteAs'] . ' ' . $peer['bgpPeerDescr'] . '), last error: ' . $bgpErrorCode, $device['device_id'], 'bgpPeer', Severity::Warning, $peer_ip); - } elseif ($peer_data['bgpPeerState'] == 'established') { - Eventlog::log('BGP Session Up: ' . $peer['bgpPeerIdentifier'] . ' (AS' . $peer['bgpPeerRemoteAs'] . ' ' . $peer['bgpPeerDescr'] . ')', $device['device_id'], 'bgpPeer', Severity::Ok, $peer_ip); - } elseif ($peer['bgpPeerState'] == 'established') { - Eventlog::log('BGP Session Down: ' . $peer['bgpPeerIdentifier'] . ' (AS' . $peer['bgpPeerRemoteAs'] . ' ' . $peer['bgpPeerDescr'] . '), last error: ' . $bgpErrorCode, $device['device_id'], 'bgpPeer', Severity::Error, $peer_ip); - } - } - } - - // --- Update rrd data --- - $peer_rrd_name = \LibreNMS\Data\Store\Rrd::safeName('bgp-' . $peer['bgpPeerIdentifier']); - $peer_rrd_def = RrdDefinition::make() - ->addDataset('bgpPeerOutUpdates', 'COUNTER', null, 100000000000) - ->addDataset('bgpPeerInUpdates', 'COUNTER', null, 100000000000) - ->addDataset('bgpPeerOutTotal', 'COUNTER', null, 100000000000) - ->addDataset('bgpPeerInTotal', 'COUNTER', null, 100000000000) - ->addDataset('bgpPeerEstablished', 'GAUGE', 0); - // Validate data - $peer_data['bgpPeerFsmEstablishedTime'] = set_numeric($peer_data['bgpPeerFsmEstablishedTime'] ?? 0); - $peer_data['bgpPeerInUpdates'] = set_numeric($peer_data['bgpPeerInUpdates'] ?? 0); - $peer_data['bgpPeerOutUpdates'] = set_numeric($peer_data['bgpPeerOutUpdates'] ?? 0); - $peer_data['bgpPeerInTotalMessages'] = set_numeric($peer_data['bgpPeerInTotalMessages'] ?? 0); - $peer_data['bgpPeerOutTotalMessages'] = set_numeric($peer_data['bgpPeerOutTotalMessages'] ?? 0); - $peer_data['bgpPeerInUpdateElapsedTime'] = set_numeric($peer_data['bgpPeerInUpdateElapsedTime'] ?? 0); - - $fields = [ - 'bgpPeerOutUpdates' => $peer_data['bgpPeerOutUpdates'], - 'bgpPeerInUpdates' => $peer_data['bgpPeerInUpdates'], - 'bgpPeerOutTotal' => $peer_data['bgpPeerOutTotalMessages'], - 'bgpPeerInTotal' => $peer_data['bgpPeerInTotalMessages'], - 'bgpPeerEstablished' => $peer_data['bgpPeerFsmEstablishedTime'], - ]; - - $tags = [ - 'bgpPeerIdentifier' => $peer['bgpPeerIdentifier'], - 'rrd_name' => $peer_rrd_name, - 'rrd_def' => $peer_rrd_def, - ]; - app('Datastore')->put($device, 'bgp', $tags, $fields); - - // --- Update Database data --- - $peer['update'] = array_diff_assoc($peer_data, $peer); - unset($peer_data); - - if ($peer['update']) { - if ($vrfId) { - dbUpdate($peer['update'], 'bgpPeers', '`device_id` = ? AND `bgpPeerIdentifier` = ? AND `vrf_id` = ?', [$device['device_id'], $peer['bgpPeerIdentifier'], $vrfId]); - } else { - dbUpdate($peer['update'], 'bgpPeers', '`device_id` = ? AND `bgpPeerIdentifier` = ?', [$device['device_id'], $peer['bgpPeerIdentifier']]); - } - } - - // --- Populate cbgp data --- - if ($device['os_group'] == 'vrp' || $device['os_group'] == 'cisco' || $device['os'] == 'junos' || $device['os'] == 'aos7' || $device['os_group'] === 'arista' || $device['os'] == 'dell-os10' || $device['os'] == 'firebrick') { - // Poll each AFI/SAFI for this peer (using CISCO-BGP4-MIB or BGP4-V2-JUNIPER MIB) - $peer_afis = dbFetchRows('SELECT * FROM bgpPeers_cbgp WHERE `device_id` = ? AND bgpPeerIdentifier = ?', [$device['device_id'], $peer['bgpPeerIdentifier']]); - foreach ($peer_afis as $peer_afi) { - $afi = $peer_afi['afi']; - $safi = $peer_afi['safi']; - d_echo("$afi $safi\n"); - if ($device['os_group'] == 'cisco') { - $bgp_peer_ident = $peer_ip->toSnmpString(); - - $ip_ver = $peer_ip->getFamily(); - - $cbgpv2_cache ??= SnmpQuery::enumStrings()->walk([ - 'CISCO-BGP4-MIB::cbgpPeer2AcceptedPrefixes', - 'CISCO-BGP4-MIB::cbgpPeer2DeniedPrefixes', - 'CISCO-BGP4-MIB::cbgpPeer2PrefixAdminLimit', - 'CISCO-BGP4-MIB::cbgpPeer2PrefixThreshold', - 'CISCO-BGP4-MIB::cbgpPeer2PrefixClearThreshold', - 'CISCO-BGP4-MIB::cbgpPeer2AdvertisedPrefixes', - 'CISCO-BGP4-MIB::cbgpPeer2SuppressedPrefixes', - 'CISCO-BGP4-MIB::cbgpPeer2WithdrawnPrefixes', - ])->table(4); - - if (isset($cbgpv2_cache[$ip_ver])) { - $cbgp_data = [ - 'CISCO-BGP4-MIB::cbgpPeerAcceptedPrefixes' => $cbgpv2_cache[$ip_ver][$bgp_peer_ident][$afi][$safi]['CISCO-BGP4-MIB::cbgpPeer2AcceptedPrefixes'] ?? null, - 'CISCO-BGP4-MIB::cbgpPeerDeniedPrefixes' => $cbgpv2_cache[$ip_ver][$bgp_peer_ident][$afi][$safi]['CISCO-BGP4-MIB::cbgpPeer2DeniedPrefixes'] ?? null, - 'CISCO-BGP4-MIB::cbgpPeerPrefixAdminLimit' => $cbgpv2_cache[$ip_ver][$bgp_peer_ident][$afi][$safi]['CISCO-BGP4-MIB::cbgpPeer2PrefixAdminLimit'] ?? null, - 'CISCO-BGP4-MIB::cbgpPeerPrefixThreshold' => $cbgpv2_cache[$ip_ver][$bgp_peer_ident][$afi][$safi]['CISCO-BGP4-MIB::cbgpPeer2PrefixThreshold'] ?? null, - 'CISCO-BGP4-MIB::cbgpPeerPrefixClearThreshold' => $cbgpv2_cache[$ip_ver][$bgp_peer_ident][$afi][$safi]['CISCO-BGP4-MIB::cbgpPeer2PrefixClearThreshold'] ?? null, - 'CISCO-BGP4-MIB::cbgpPeerAdvertisedPrefixes' => $cbgpv2_cache[$ip_ver][$bgp_peer_ident][$afi][$safi]['CISCO-BGP4-MIB::cbgpPeer2AdvertisedPrefixes'] ?? null, - 'CISCO-BGP4-MIB::cbgpPeerSuppressedPrefixes' => $cbgpv2_cache[$ip_ver][$bgp_peer_ident][$afi][$safi]['CISCO-BGP4-MIB::cbgpPeer2SuppressedPrefixes'] ?? null, - 'CISCO-BGP4-MIB::cbgpPeerWithdrawnPrefixes' => $cbgpv2_cache[$ip_ver][$bgp_peer_ident][$afi][$safi]['CISCO-BGP4-MIB::cbgpPeer2WithdrawnPrefixes'] ?? null, - ]; - } else { - $cbgp_cache ??= SnmpQuery::enumStrings()->walk([ - 'CISCO-BGP4-MIB::cbgpPeerAcceptedPrefixes', - 'CISCO-BGP4-MIB::cbgpPeerDeniedPrefixes', - 'CISCO-BGP4-MIB::cbgpPeerPrefixAdminLimit', - 'CISCO-BGP4-MIB::cbgpPeerPrefixThreshold', - 'CISCO-BGP4-MIB::cbgpPeerPrefixClearThreshold', - 'CISCO-BGP4-MIB::cbgpPeerAdvertisedPrefixes', - 'CISCO-BGP4-MIB::cbgpPeerSuppressedPrefixes', - 'CISCO-BGP4-MIB::cbgpPeerWithdrawnPrefixes', - ])->table(4); - - // Use the legacy OIDs if we don't get a result above - $cbgp_data = $cbgp_cache[$bgp_peer_ident][$afi][$safi]; - } - d_echo($cbgp_data); - - $cbgpPeerAcceptedPrefixes = $cbgp_data['CISCO-BGP4-MIB::cbgpPeerAcceptedPrefixes']; - $cbgpPeerDeniedPrefixes = $cbgp_data['CISCO-BGP4-MIB::cbgpPeerDeniedPrefixes']; - $cbgpPeerPrefixAdminLimit = $cbgp_data['CISCO-BGP4-MIB::cbgpPeerPrefixAdminLimit'] ?? null; - $cbgpPeerPrefixThreshold = $cbgp_data['CISCO-BGP4-MIB::cbgpPeerPrefixThreshold'] ?? null; - $cbgpPeerPrefixClearThreshold = $cbgp_data['CISCO-BGP4-MIB::cbgpPeerPrefixClearThreshold'] ?? null; - $cbgpPeerAdvertisedPrefixes = max(0, $cbgp_data['CISCO-BGP4-MIB::cbgpPeerAdvertisedPrefixes'] - $cbgp_data['CISCO-BGP4-MIB::cbgpPeerWithdrawnPrefixes']); - $cbgpPeerWithdrawnPrefixes = 0; // no use, it is a gauge32 value, only the difference between cbgpPeerAdvertisedPrefixes and cbgpPeerWithdrawnPrefixes makes sense. - // CF CISCO-BGP4-MIB definition for both - $cbgpPeerSuppressedPrefixes = $cbgp_data['CISCO-BGP4-MIB::cbgpPeerSuppressedPrefixes']; - unset($cbgp_data); - } //end if - - if ($device['os'] == 'junos') { - $safis = [ - 'unicast' => 1, - 'multicast' => 2, - 'unicastAndMulticast' => 3, - 'labeledUnicast' => 4, - 'mvpn' => 5, - 'vpls' => 65, - 'evpn' => 70, - 'vpn' => 128, - 'rtfilter' => 132, - 'flow' => 133, - ]; - - $j_prefixes ??= SnmpQuery::walk([ - 'BGP4-V2-MIB-JUNIPER::jnxBgpM2PrefixInPrefixesAccepted', - 'BGP4-V2-MIB-JUNIPER::jnxBgpM2PrefixInPrefixesRejected', - 'BGP4-V2-MIB-JUNIPER::jnxBgpM2PrefixOutPrefixes', - ])->table(3); - - $jnxPeerIndex = $junos[$peer_ip->uncompressed()]['BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerIndex'] ?? null; - $current_peer_data = $j_prefixes[$jnxPeerIndex][$afi][$safis[$safi]] ?? []; - $cbgpPeerAcceptedPrefixes = $current_peer_data['BGP4-V2-MIB-JUNIPER::jnxBgpM2PrefixInPrefixesAccepted'] ?? null; - $cbgpPeerDeniedPrefixes = $current_peer_data['BGP4-V2-MIB-JUNIPER::jnxBgpM2PrefixInPrefixesRejected'] ?? null; - $cbgpPeerAdvertisedPrefixes = $current_peer_data['BGP4-V2-MIB-JUNIPER::jnxBgpM2PrefixOutPrefixes'] ?? null; - $cbgpPeerPrefixAdminLimit = null; - $cbgpPeerPrefixThreshold = null; - $cbgpPeerPrefixClearThreshold = null; - $cbgpPeerSuppressedPrefixes = null; - $cbgpPeerWithdrawnPrefixes = null; - }//end if - - if ($device['os_group'] === 'arista') { - $safis['multicast'] = 2; - $afis['ipv4'] = 1; - $afis['ipv6'] = 2; - if (str_contains((string) $peer['bgpPeerIdentifier'], ':')) { - $tmp_peer = str_replace(':', '', $peer['bgpPeerIdentifier']); - $tmp_peer = preg_replace('/([\w\d]{2})/', '\1:', $tmp_peer); - $tmp_peer = rtrim($tmp_peer, ':'); - } else { - $tmp_peer = $peer['bgpPeerIdentifier']; - } - $a_prefixes = snmpwalk_cache_multi_oid($device, 'aristaBgp4V2PrefixInPrefixesAccepted', [], 'ARISTA-BGP4V2-MIB', null, '-OQUs'); - $out_prefixes = snmpwalk_cache_multi_oid($device, 'aristaBgp4V2PrefixOutPrefixes', [], 'ARISTA-BGP4V2-MIB', null, '-OQUs'); - - $cbgpPeerAcceptedPrefixes = $a_prefixes["1.$afi.$tmp_peer.$afi.$safi"]['aristaBgp4V2PrefixInPrefixesAccepted'] ?? null; - $cbgpPeerAdvertisedPrefixes = $out_prefixes["1.$afi.$tmp_peer.$afi.$safi"]['aristaBgp4V2PrefixOutPrefixes'] ?? null; - } - - if ($device['os'] == 'dell-os10') { - $safis['unicast'] = 1; - $safis['multicast'] = 2; - $afis['ipv4'] = 1; - $afis['ipv6'] = 2; - if (str_contains((string) $peer['bgpPeerIdentifier'], ':')) { - $tmp_peer = str_replace(':', '', $peer['bgpPeerIdentifier']); - $tmp_peer = preg_replace('/([\w\d]{2})/', '\1:', $tmp_peer); - $tmp_peer = rtrim($tmp_peer, ':'); - } else { - $tmp_peer = $peer['bgpPeerIdentifier']; - } - $a_prefixes = snmpwalk_cache_multi_oid($device, 'os10bgp4V2PrefixInPrefixesAccepted', [], 'DELLEMC-OS10-BGP4V2-MIB', null, '-OQUs'); - $out_prefixes = snmpwalk_cache_multi_oid($device, 'os10bgp4V2PrefixOutPrefixes', [], 'DELLEMC-OS10-BGP4V2-MIB', null, '-OQUs'); - - $cbgpPeerAcceptedPrefixes = $a_prefixes["1.$afi.$tmp_peer.$afi.$safi"]['os10bgp4V2PrefixInPrefixesAccepted']; - $cbgpPeerAdvertisedPrefixes = $out_prefixes["1.$afi.$tmp_peer.$afi.$safi"]['os10bgp4V2PrefixOutPrefixes']; - } - - if ($device['os'] === 'aos7') { - $tmp_peer = $peer['bgpPeerIdentifier']; - $al_prefixes = snmpwalk_cache_multi_oid($device, 'alaBgpPeerRcvdPrefixes', [], 'ALCATEL-IND1-BGP-MIB', 'aos7', '-OQUs'); - $cbgpPeerAcceptedPrefixes = $al_prefixes[$tmp_peer]['alaBgpPeerRcvdPrefixes']; - } - - if ($device['os_group'] === 'vrp') { - $vrpPrefixes = snmpwalk_cache_multi_oid($device, 'hwBgpPeerPrefixRcvCounter', [], 'HUAWEI-BGP-VPN-MIB', null, '-OQUs'); - $vrpPrefixes = snmpwalk_cache_multi_oid($device, 'hwBgpPeerPrefixAdvCounter', $vrpPrefixes, 'HUAWEI-BGP-VPN-MIB', null, '-OQUs'); - - // only works in global routing table, as the vpnInstanceId is not available - // for now in the VRF discovery of VRP devices - $key4 = $vrfInstance . '.' . $afi . '.' . $safi . '.ipv4.' . $peer['bgpPeerIdentifier']; - $key6 = $vrfInstance . '.' . $afi . '.' . $safi . '.ipv6.' . $peer['bgpPeerIdentifier']; - - if (isset($vrpPrefixes[$key4])) { - $cbgpPeerAcceptedPrefixes = $vrpPrefixes[$key4]['hwBgpPeerPrefixRcvCounter']; - $cbgpPeerAdvertisedPrefixes = $vrpPrefixes[$key4]['hwBgpPeerPrefixAdvCounter']; - } - if (isset($vrpPrefixes[$key6])) { - $cbgpPeerAcceptedPrefixes = $vrpPrefixes[$key6]['hwBgpPeerPrefixRcvCounter']; - $cbgpPeerAdvertisedPrefixes = $vrpPrefixes[$key6]['hwBgpPeerPrefixAdvCounter']; - } - } - - if ($device['os'] == 'firebrick') { - foreach ($peer_data_check as $key => $value) { - $oid = explode('.', (string) $key); - $protocol = $oid[0]; - $address = str_replace($oid[0] . '.', '', $key); - if (strlen($address) > 15) { - $address = IP::fromHexString($address)->compressed(); - } - if ($address == $peer['bgpPeerIdentifier']) { - $cbgpPeerAcceptedPrefixes = $value['fbBgpPeerReceivedIpv4Prefixes'] + $value['fbBgpPeerReceivedIpv6Prefixes']; - $cbgpPeerAdvertisedPrefixes = $value['fbBgpPeerExported']; - break; - } - } - } - - // Validate data - $cbgpPeerAcceptedPrefixes = set_numeric($cbgpPeerAcceptedPrefixes ?? 0); - $cbgpPeerDeniedPrefixes = set_numeric($cbgpPeerDeniedPrefixes ?? 0); - $cbgpPeerPrefixAdminLimit = set_numeric($cbgpPeerPrefixAdminLimit ?? 0); - $cbgpPeerPrefixThreshold = set_numeric($cbgpPeerPrefixThreshold ?? 0); - $cbgpPeerPrefixClearThreshold = set_numeric($cbgpPeerPrefixClearThreshold ?? 0); - $cbgpPeerAdvertisedPrefixes = set_numeric($cbgpPeerAdvertisedPrefixes ?? 0); - $cbgpPeerSuppressedPrefixes = set_numeric($cbgpPeerSuppressedPrefixes ?? 0); - $cbgpPeerWithdrawnPrefixes = set_numeric($cbgpPeerWithdrawnPrefixes ?? 0); - - $cbgpPeers_cbgp_fields = [ - 'AcceptedPrefixes' => $cbgpPeerAcceptedPrefixes, - 'DeniedPrefixes' => $cbgpPeerDeniedPrefixes, - 'PrefixAdminLimit' => $cbgpPeerPrefixAdminLimit, - 'PrefixThreshold' => $cbgpPeerPrefixThreshold, - 'PrefixClearThreshold' => $cbgpPeerPrefixClearThreshold, - 'AdvertisedPrefixes' => $cbgpPeerAdvertisedPrefixes, - 'SuppressedPrefixes' => $cbgpPeerSuppressedPrefixes, - 'WithdrawnPrefixes' => $cbgpPeerWithdrawnPrefixes, - ]; - - foreach ($cbgpPeers_cbgp_fields as $field => $value) { - if ($peer_afi[$field] != $value) { - $peer['c_update'][$field] = $value; - } - } - - $oids = [ - 'AcceptedPrefixes', - 'DeniedPrefixes', - 'AdvertisedPrefixes', - 'SuppressedPrefixes', - 'WithdrawnPrefixes', - ]; - - foreach ($oids as $oid) { - $tmp_prev = set_numeric($peer_afi[$oid]); - $tmp_delta = $cbgpPeers_cbgp_fields[$oid] - $tmp_prev; - if ($peer_afi[$oid . '_delta'] != $tmp_delta) { - $peer['c_update'][$oid . '_delta'] = $tmp_delta; - } - if ($peer_afi[$oid . '_prev'] != $tmp_prev) { - $peer['c_update'][$oid . '_prev'] = $tmp_prev; - } - } - - if (! empty($peer['c_update'])) { - dbUpdate( - $peer['c_update'], - 'bgpPeers_cbgp', - '`device_id` = ? AND bgpPeerIdentifier = ? AND afi = ? AND safi = ?', - [$device['device_id'], $peer['bgpPeerIdentifier'], $afi, $safi] - ); - } - - $cbgp_rrd_name = \LibreNMS\Data\Store\Rrd::safeName('cbgp-' . $peer['bgpPeerIdentifier'] . ".$afi.$safi"); - $cbgp_rrd_def = RrdDefinition::make() - ->addDataset('AcceptedPrefixes', 'GAUGE', null, 100000000000) - ->addDataset('DeniedPrefixes', 'GAUGE', null, 100000000000) - ->addDataset('AdvertisedPrefixes', 'GAUGE', null, 100000000000) - ->addDataset('SuppressedPrefixes', 'GAUGE', null, 100000000000) - ->addDataset('WithdrawnPrefixes', 'GAUGE', null, 100000000000); - $fields = [ - 'AcceptedPrefixes' => $cbgpPeerAcceptedPrefixes, - 'DeniedPrefixes' => $cbgpPeerDeniedPrefixes, - 'AdvertisedPrefixes' => $cbgpPeerAdvertisedPrefixes, - 'SuppressedPrefixes' => $cbgpPeerSuppressedPrefixes, - 'WithdrawnPrefixes' => $cbgpPeerWithdrawnPrefixes, - ]; - - $tags = [ - 'bgpPeerIdentifier' => $peer['bgpPeerIdentifier'], - 'afi' => $afi, - 'safi' => $safi, - 'rrd_name' => $cbgp_rrd_name, - 'rrd_def' => $cbgp_rrd_def, - ]; - app('Datastore')->put($device, 'cbgp', $tags, $fields); - } //end foreach - } //end if - d_echo("\n"); - } //end foreach -} //end if - -unset($peers, $peer_data_tmp, $j_prefixes, $bgp_cache, $cbgp_cache, $cbgpv2_cache, $vyos_peer_table, $vyos_by_ip); diff --git a/includes/polling/cisco-cef.inc.php b/includes/polling/cisco-cef.inc.php deleted file mode 100644 index 7789071769f..00000000000 --- a/includes/polling/cisco-cef.inc.php +++ /dev/null @@ -1,117 +0,0 @@ -walk('CISCO-CEF-MIB::cefSwitchingStatsTable')->table(3); - $polled = time(); - - $cefs_query = dbFetchRows('SELECT * FROM `cef_switching` WHERE `device_id` = ?', [$device['device_id']]); - $cefs_db = []; - foreach ($cefs_query as $ceftmp) { - $cef_id = $device['device_id'] . '-' . $ceftmp['entPhysicalIndex'] . '-' . $ceftmp['afi'] . '-' . $ceftmp['cef_index']; - $cefs_db[$cef_id] = $ceftmp['cef_switching_id']; - } - - d_echo($cefs); - - if (is_array($cefs)) { - if (! isset($entity_array) || ! is_array($entity_array)) { - $progress = ProgressList::start('Caching OIDs'); - $entity_array = []; - $progress->add('entPhysicalDescr'); - $entity_array = snmpwalk_cache_multi_oid($device, 'entPhysicalDescr', $entity_array, 'ENTITY-MIB'); - $progress->add('entPhysicalName'); - $entity_array = snmpwalk_cache_multi_oid($device, 'entPhysicalName', $entity_array, 'ENTITY-MIB'); - $progress->add('entPhysicalModelName'); - $entity_array = snmpwalk_cache_multi_oid($device, 'entPhysicalModelName', $entity_array, 'ENTITY-MIB'); - $progress->end(); - } - - foreach ($cefs as $entity => $afis) { - $entity_name = $entity_array[$entity]['entPhysicalName'] . ' - ' . $entity_array[$entity]['entPhysicalModelName']; - Log::info("\n$entity $entity_name"); - foreach ($afis as $afi => $paths) { - Log::info(" |- $afi"); - foreach ($paths as $index => $cef_stat) { - Log::info(' | |-' . $index . ': ' . $cef_stat['cefSwitchingPath'], ['nlb' => true]); - - $cef_id = $device['device_id'] . '-' . $entity . '-' . $afi . '-' . $index; - - // if (dbFetchCell("SELECT COUNT(*) FROM `cef_switching` WHERE `device_id` = ? AND `entPhysicalIndex` = ? AND `afi` = ? AND `cef_index` = ?", array($device['device_id'], $entity, $afi, $path)) != "1") - if (! isset($cefs_db[$cef_id])) { - dbInsert(['device_id' => $device['device_id'], 'entPhysicalIndex' => $entity, 'afi' => $afi, 'cef_index' => $index, 'cef_path' => $cef_stat['cefSwitchingPath']], 'cef_switching'); - Log::info('+', ['nlb' => true]); - } - - unset($cefs_db[$cef_id]); - - $cef_entry = dbFetchRow('SELECT * FROM `cef_switching` WHERE `device_id` = ? AND `entPhysicalIndex` = ? AND `afi` = ? AND `cef_index` = ?', [$device['device_id'], $entity, $afi, $index]); - - $rrd_name = ['cefswitching', $entity, $afi, $index]; - $rrd_def = RrdDefinition::make() - ->addDataset('drop', 'DERIVE', 0, 1000000) - ->addDataset('punt', 'DERIVE', 0, 1000000) - ->addDataset('hostpunt', 'DERIVE', 0, 1000000); - - // Copy HC to non-HC if they exist - if (is_numeric($cef_stat['cefSwitchingHCDrop'])) { - $cef_stat['cefSwitchingDrop'] = $cef_stat['cefSwitchingHCDrop']; - } - - if (is_numeric($cef_stat['cefSwitchingHCPunt'])) { - $cef_stat['cefSwitchingPunt'] = $cef_stat['cefSwitchingHCPunt']; - } - - if (is_numeric($cef_stat['cefSwitchingHCPunt2Host'])) { - $cef_stat['cefSwitchingPunt2Host'] = $cef_stat['cefSwitchingHCPunt2Host']; - } - - // FIXME -- memcached - $cef_stat['update']['drop'] = $cef_stat['cefSwitchingDrop']; - $cef_stat['update']['punt'] = $cef_stat['cefSwitchingPunt']; - $cef_stat['update']['punt2host'] = $cef_stat['cefSwitchingPunt2Host']; - $cef_stat['update']['drop_prev'] = $cef_entry['drop']; - $cef_stat['update']['punt_prev'] = $cef_entry['punt']; - $cef_stat['update']['punt2host_prev'] = $cef_entry['punt2host']; - $cef_stat['update']['updated'] = $polled; - $cef_stat['update']['updated_prev'] = $cef_entry['updated']; - - dbUpdate($cef_stat['update'], 'cef_switching', '`device_id` = ? AND `entPhysicalIndex` = ? AND `afi` = ? AND `cef_index` = ?', [$device['device_id'], $entity, $afi, $index]); - - $fields = [ - 'drop' => $cef_stat['cefSwitchingDrop'], - 'punt' => $cef_stat['cefSwitchingPunt'], - 'hostpunt' => $cef_stat['cefSwitchingPunt2Host'], - ]; - - $tags = ['entity' => $entity, 'afi' => $afi, 'index' => $index, 'rrd_name' => $rrd_name, 'rrd_def' => $rrd_def]; - app('Datastore')->put($device, 'cefswitching', $tags, $fields); - - Log::info(''); - }//end foreach - }//end foreach - }//end foreach - }//end if - - // FIXME - need to delete old ones. FIXME REALLY. - if (! empty($cefs_db)) { - Log::debug(print_r($cefs_db, true)); - - foreach ((array) $cefs_db as $cef_switching_id) { - \App\Models\CefSwitching::where('cef_switching_id', $cef_switching_id)->delete(); - Log::info('-', ['nlb' => true]); - } - } - - Log::info(''); -} //end if - -unset( - $cefs, - $polled, - $cefs_query, - $entity_array -); diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php index 9caf2693a83..02a63344f92 100644 --- a/includes/polling/functions.inc.php +++ b/includes/polling/functions.inc.php @@ -145,7 +145,7 @@ function record_sensor_data($device, $all_sensors) if (is_callable($sensor['user_func'])) { $sensor_value = $sensor['user_func']($sensor_value); } else { - $sensor_value = (new UserFuncHelper($sensor_value, $sensor['new_value'], $sensor))->{$sensor['user_func']}(); + $sensor_value = new UserFuncHelper($sensor_value, $sensor['new_value'], $sensor)->{$sensor['user_func']}(); } } @@ -458,37 +458,3 @@ function json_app_get($device, $extend, $min_version = 1) return $parsed_json; } - -/** - * Some data arrays returned with json_app_get are deeper than - * update_application likes. This recurses through the array - * and flattens it out so it can nicely be inserted into the - * database. - * - * One argument is taken and that is the array to flatten. - * - * @param array $array - * @param string $prefix What to prefix to the name. Defaults to '', nothing. - * @param string $joiner The string to join the prefix, if set to something other - * than '', and array keys with. - * @return array The flattened array. - */ -function data_flatten($array, $prefix = '', $joiner = '_') -{ - $return = []; - foreach ($array as $key => $value) { - if (is_array($value)) { - if (strcmp($prefix, '')) { - $key = $prefix . $joiner . $key; - } - $return = array_merge($return, data_flatten($value, $key, $joiner)); - } else { - if (strcmp($prefix, '')) { - $key = $prefix . $joiner . $key; - } - $return[$key] = $value; - } - } - - return $return; -} diff --git a/includes/polling/junose-atm-vp.inc.php b/includes/polling/junose-atm-vp.inc.php deleted file mode 100644 index 0be50243431..00000000000 --- a/includes/polling/junose-atm-vp.inc.php +++ /dev/null @@ -1,66 +0,0 @@ -addDataset('incells', 'DERIVE', 0, 125000000000) - ->addDataset('outcells', 'DERIVE', 0, 125000000000) - ->addDataset('inpackets', 'DERIVE', 0, 125000000000) - ->addDataset('outpackets', 'DERIVE', 0, 125000000000) - ->addDataset('inpacketoctets', 'DERIVE', 0, 125000000000) - ->addDataset('outpacketoctets', 'DERIVE', 0, 125000000000) - ->addDataset('inpacketerrors', 'DERIVE', 0, 125000000000) - ->addDataset('outpacketerrors', 'DERIVE', 0, 125000000000); - - $progress = ProgressList::start('ATM VPs'); - foreach ($vp_rows as $vp) { - $progress->mark('.'); - - $ifIndex = $vp['ifIndex']; - $vp_id = $vp['vp_id']; - $oid = $ifIndex . '.' . $vp_id; - - d_echo("$oid "); - - $t_vp = $vp_cache[$oid]; - - $vp_update = $t_vp['juniAtmVpStatsInCells'] . ':' . $t_vp['juniAtmVpStatsOutCells']; - $vp_update .= ':' . $t_vp['juniAtmVpStatsInPackets'] . ':' . $t_vp['juniAtmVpStatsOutPackets']; - $vp_update .= ':' . $t_vp['juniAtmVpStatsInPacketOctets'] . ':' . $t_vp['juniAtmVpStatsOutPacketOctets']; - $vp_update .= ':' . $t_vp['juniAtmVpStatsInPacketErrors'] . ':' . $t_vp['juniAtmVpStatsOutPacketErrors']; - - $rrd_name = ['vp', $ifIndex, $vp_id]; - - $fields = [ - 'incells' => $t_vp['juniAtmVpStatsInCells'], - 'outcells' => $t_vp['juniAtmVpStatsOutCells'], - 'inpackets' => $t_vp['juniAtmVpStatsInPackets'], - 'outpackets' => $t_vp['juniAtmVpStatsOutPackets'], - 'inpacketoctets' => $t_vp['juniAtmVpStatsInPacketOctets'], - 'outpacketoctets' => $t_vp['juniAtmVpStatsOutPacketOctets'], - 'inpacketerrors' => $t_vp['juniAtmVpStatsInPacketErrors'], - 'outpacketerrors' => $t_vp['juniAtmVpStatsOutPacketErrors'], - ]; - - $tags = ['ifIndex' => $ifIndex, 'vp_id' => $vp_id, 'rrd_name' => $rrd_name, 'rrd_def' => $rrd_def]; - app('Datastore')->put($device, 'atm-vp', $tags, $fields); - }//end foreach - - $progress->end(); - - unset($vp_cache, $rrd_def); -}//end if diff --git a/includes/polling/mef.inc.php b/includes/polling/mef.inc.php deleted file mode 100644 index b3a23fa4a95..00000000000 --- a/includes/polling/mef.inc.php +++ /dev/null @@ -1,56 +0,0 @@ - $value) { - /* - * Check the property for any modifications. - */ - if ($mef_info[$property] != $db_info[$property]) { - // FIXME - this should loop building a query and then run the query after the loop (bad geert!) - dbUpdate([$property => $mef_info[$property]], 'mefinfo', '`id` = ?', [$db_info['id']]); - if ($db_info['mefIdent'] != null) { - Eventlog::log('MEF Link : ' . $db_info['mefIdent'] . ' (' . preg_replace('/^mef/', '', (string) $db_info[$property]) . ') -> ' . $mef_info[$property], $device['device_id']); - } - } - } - }//end foreach -} -/* - * Finished discovering MEF Links information. - */ - -unset($db_info_list, $current_mefinfo); -$progress->end(); diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php index 62390a2399a..ff79dab36b0 100644 --- a/includes/polling/ports.inc.php +++ b/includes/polling/ports.inc.php @@ -902,7 +902,7 @@ $fields['ifOutBits_rate'] = $current_port_stats['ifOutBits_rate']; if ($tune_port === true) { - Rrd::tune('port', $rrdfile, $this_port['ifSpeed']); + Rrd::tune($rrdfile, \LibreNMS\RRD\PortRrd::tuneLimits((int) $this_port['ifSpeed'])); } $tags = [ diff --git a/includes/polling/ports/os/ecosdn.inc.php b/includes/polling/ports/os/ecosdn.inc.php new file mode 100644 index 00000000000..2a901bea0b2 --- /dev/null +++ b/includes/polling/ports/os/ecosdn.inc.php @@ -0,0 +1,29 @@ +values() as $oid => $descr) { + $descriptions[\Illuminate\Support\Str::afterLast($oid, '.')] = $descr; +} +$stored = array_column($ports, 'ifAlias', 'ifIndex'); + +// Only touch ports that were polled: an entry with just ifAlias gets the port +// marked deleted (selected port polling). A port missing from the vendor table, +// for example after a partial walk, keeps its stored description. +foreach ($port_stats as $index => $stats) { + if (array_key_exists($index, $descriptions)) { + $port_stats[$index]['ifAlias'] = $descriptions[$index]; + } elseif (isset($stored[$index])) { + $port_stats[$index]['ifAlias'] = $stored[$index]; + } +} diff --git a/includes/polling/ports/os/nokia-isam.inc.php b/includes/polling/ports/os/nokia-isam.inc.php index 800d1b01ea3..d16fc4ff9f6 100644 --- a/includes/polling/ports/os/nokia-isam.inc.php +++ b/includes/polling/ports/os/nokia-isam.inc.php @@ -24,6 +24,8 @@ * @author Rinse Kloek */ +use LibreNMS\Util\StringHelpers; + // Use proprietary asamIfExtCustomerId as ifAlias for Nokia ISAM Plattform. The default IF-MIB fields are here quite meaningless $isam_port_stats = snmpwalk_cache_oid($device, 'asamIfExtCustomerId', [], 'ITF-MIB-EXT', 'nokia-isam'); foreach ($isam_port_stats as $index => $value) { @@ -46,11 +48,22 @@ } } -// Fix ifMtu to prevent SQL errors (must be integer). Fallback to defined null. +// The ISAM returns ifHC* as 8-byte OCTET STRINGs (hex); convert them so the HC counters are used. foreach ($port_stats as &$p) { + foreach (array_keys($hc_mappings) as $hc_oid) { + $value = (string) ($p[$hc_oid] ?? ''); + if (! is_numeric($value) && StringHelpers::isHex($value, ' ')) { + $value = hexdec(str_replace(' ', '', $value)); + if (is_int($value)) { + $p[$hc_oid] = $value; + } + } + } + + // Fix ifMtu to prevent SQL errors (must be integer). Fallback to defined null. if (($p['ifMtu'] ?? '') === 'NULL') { $p['ifMtu'] = null; } } -unset($isam_port_stats, $p); +unset($isam_port_stats, $p, $hc_oid, $value); diff --git a/includes/polling/processors.inc.php b/includes/polling/processors.inc.php deleted file mode 100644 index ea1c5905416..00000000000 --- a/includes/polling/processors.inc.php +++ /dev/null @@ -1,6 +0,0 @@ -values(); - $sensor_value = array_sum($apLicenses); + $apLicenseTotal = array_sum($apLicenses); + + if ($sensor['sensor_index'] === 'licenses.total') { + $sensor_value = $apLicenseTotal; + } elseif (is_numeric($sensor_value)) { + // remaining is polled from the consumed oid + $sensor_value = $apLicenseTotal - $sensor_value; + } } -unset($apLicenses); +unset($apLicenses, $apLicenseTotal); diff --git a/includes/rewrites.php b/includes/rewrites.php index 97938411d28..18f76209072 100644 --- a/includes/rewrites.php +++ b/includes/rewrites.php @@ -160,20 +160,6 @@ function ipmiSensorName($hardwareId, $sensorIpmi) return $sensorIpmi; } -/** - * @param $descr - * @return int - */ -function get_nagios_state($descr) -{ - return match ($descr) { - 'On', 'Okay', 'Ok' => 0, - 'Standby', 'Idle', 'Maintenance' => 1, - 'Under', 'Over' => 2, - default => 3, - }; -} - /** * @param $state * @return int|void diff --git a/includes/services.inc.php b/includes/services.inc.php index b2d1cf0607a..d0357393a2c 100644 --- a/includes/services.inc.php +++ b/includes/services.inc.php @@ -9,46 +9,6 @@ use LibreNMS\Util\Clean; use LibreNMS\Util\IP; -function add_service($device, $type, $desc, $ip = '', $param = '', $ignore = 0, $disabled = 0, $template_id = '', $name = '') -{ - // keep legacy signature, delegate to modern implementation - return \LibreNMS\Services::addService($device, $type, $desc, $ip, $param, $ignore, $disabled, $template_id, $name); -} - -function service_get($device = null, $service = null) -{ - if (! is_null($service)) { - // Add a service filter to the SQL query. - $services = Service::query()->where('service_id', $service)->get(); - } elseif (! is_null($device)) { - $services = Service::query()->where('device_id', $device)->get(); - } else { - $services = Service::query()->get(); - } - - d_echo('Service Array: ' . print_r($services, true) . "\n"); - - return $services->toArray(); -} - -function edit_service($update = [], $service = null) -{ - if (! is_numeric($service)) { - return false; - } - - return Service::query()->where('service_id', $service)->update($update); -} - -function delete_service($service = null) -{ - if (! is_numeric($service)) { - return false; - } - - return Service::query()->where('service_id', $service)->delete(); -} - function poll_service($service) { $update = []; @@ -147,7 +107,7 @@ function poll_service($service) } if (count($update) > 0) { - edit_service($update, $service['service_id']); + Service::query()->where('service_id', $service['service_id'])->update($update); } return true; @@ -184,13 +144,3 @@ function check_service($command, ?callable $parser = null) return [$status, $response, $metrics]; } - -/** - * List all available services from nagios plugins directory - * - * @return array - */ -function list_available_services() -{ - return \LibreNMS\Services::list(); -} diff --git a/includes/snmp.inc.php b/includes/snmp.inc.php index cc8e3b20ea8..538280feb95 100644 --- a/includes/snmp.inc.php +++ b/includes/snmp.inc.php @@ -384,40 +384,6 @@ function snmpwalk_group($device, $oid, $mib = '', $depth = 1, $array = [], $mibd return $array; } -/** - * @deprecated Please use SnmpQuery instead - */ -function snmpwalk_cache_twopart_oid($device, $oid, $array = [], $mib = 0, $mibdir = null, $snmpflags = '-OQUs') -{ - $data = trim(snmp_exec('snmpwalk', $oid, $snmpflags, $device, $mib, $mibdir)); - - if (empty($data)) { - return $array; - } - - foreach (explode("\n", $data) as $entry) { - if (! Str::contains($entry, ' =')) { - if (! empty($entry) && isset($first, $second, $oid)) { - $array[$first][$second][$oid] .= "\n$entry"; // multi-line value, append to previous entry - } - - continue; - } - - [$oid,$value] = explode('=', $entry, 2); - $oid = trim($oid); - $value = trim($value); - $value = str_replace('"', '', $value); - $parts = explode('.', $oid); - if (! strstr($value, 'at this OID') && count($parts) >= 3) { - [$oid, $first, $second] = $parts; - $array[$first][$second][$oid] = $value; - } - } - - return $array; -}//end snmpwalk_cache_twopart_oid() - /** * SNMPWalk_array_num - performs a numeric SNMPWalk and returns an array containing $count indexes * One Index: diff --git a/lang/de.json b/lang/de.json index df4219d89d8..eeecd02716c 100644 --- a/lang/de.json +++ b/lang/de.json @@ -122,9 +122,8 @@ "Errored": "Fehlerhaft", "Errored :port_count": "Fehlerhaft :port_count", "Error Rate": "Fehlerrate", - "Event Log": "Ereignisprotokoll", "Event type": "Ereignistyp", - "Eventlog": "Ereignisanzeige", + "Eventlog": "Ereignisprotokoll", "Eventlog Entries": "Eventlog-Einträge", "Existing password did not match": "Existierendes Passwort stimmt nicht überein", "FDB Tables": "FDB-Tabellen", diff --git a/lang/en/commands.php b/lang/en/commands.php index b1841befc60..7889517eb8e 100644 --- a/lang/en/commands.php +++ b/lang/en/commands.php @@ -101,51 +101,61 @@ ], 'dev:collect-snmprec' => [ 'description' => 'Collect SNMP data from a device for snmpsim test files', - 'help' => "Collect the OIDs used by discovery and polling into an snmprec fixture.\n\n" . - "Example:\n lnms dev:collect-snmprec 123 --variant=crs317 --modules=ports,sensors\n\n" . + 'help' => "Collect the OIDs used by discovery and polling into tests/snmpsim/_.snmprec. The device must be detected as its own OS, not generic.\n\n" . + "Example:\n lnms dev:collect-snmprec 123 -M wrt54g\n\n" . 'Use -v to show captured OIDs, -vv for LibreNMS debug output, or -vvv for full verbose debug and SNMP output.', 'arguments' => [ - 'device' => 'ID, IP, or hostname of the device to collect data from', + 'device' => 'ID, IP, or hostname of the device to collect data from (asked for if omitted)', ], 'options' => [ - 'variant' => 'Required fixture variant, usually the device model; use an empty value to explicitly select the base fixture', + 'model' => 'Device model for the file name, for example WRT54G saves _wrt54g.snmprec (asked for if omitted)', 'modules' => 'Comma-delimited discovery/poller modules to collect data for', - 'prefer-collected' => 'Use newly collected values when an OID already exists (other existing OIDs are preserved)', - 'os' => 'Name of the OS to save test data for (only used if device is generic)', - 'output' => 'Write to this snmprec file instead of the standard fixture path', - 'full' => 'Walk the whole device instead of running discovery and polling modules', + 'output' => 'Write to this snmprec file instead of the standard fixture path (--model is not used)', + 'full' => 'Walk the whole device instead of running discovery and polling modules (requires --output; --model is not used)', ], 'device_not_found' => 'Device \':device\' not found.', - 'variant_required' => 'The --variant (-r) option is required to avoid accidentally updating the base fixture; use --variant= to select it explicitly.', - 'variant_underscore' => 'Variant name cannot contain an underscore (_).', - 'variant_single' => 'Only one variant can be collected at a time.', - 'os_required' => 'OS (-o, --os) is required because device is generic.', + 'device_required' => 'Specify the device, for example lnms dev:collect-snmprec 42.', + 'no_devices' => 'There are no devices to collect data from. Add one with lnms device:add.', + 'ask_device' => 'Which device do you want to collect data from?', + 'model_required' => 'Specify the device model, for example -M wrt54g.', + 'model_invalid' => 'Model name can only contain letters, numbers, dots (.), plus (+), and dashes (-).', + 'invalid_module' => 'Invalid module name: :module', + 'generic_device' => 'The device is detected as generic. Add detection for its OS first, then collect the test data. To get a full walk to work from, use --full --output=.', + 'walk_failed' => 'SNMP walk failed: :error', + 'full_requires_output' => '--full requires --output, because a full walk is not saved as a test fixture.', + 'existing_fixtures' => 'These test data files for \':os\' exist. Pick one to replace it, or type a new model to create a new file:', + 'ask_model' => 'Which model is this device?', + 'ask_model_hint' => 'Type the device model (for example WRT54G) to create :os_.snmprec, or pick existing test data to replace it.', + 'saving_as' => 'Saving as :file', + 'file_new' => '(new)', + 'file_replaced' => '(replaces the existing file)', 'capturing_data' => 'Capturing SNMP data...', - 'saved_snmprec' => 'Saved snmprec data :file', - 'no_data' => 'No data for :file', + 'saved_snmprec' => 'Saved :file', + 'save_failed' => 'Could not write :file.', + 'no_data' => 'No SNMP data was collected, so nothing was saved. Use -v to see the SNMP queries.', + 'next_step' => 'Next, generate the JSON test data: lnms dev:generate-test-data :fixture', + 'modules' => 'Modules: :modules', + 'default_modules' => 'configured defaults', 'verify_private_data' => 'Before you share these files, check that they contain no private data.', ], 'dev:generate-test-data' => [ 'description' => 'Generate JSON test data from snmpsim recordings', - 'help' => "Regenerate existing JSON fixtures, or explicitly recreate fixtures with --variant.\n\n" . - "Examples:\n lnms dev:generate-test-data routeros\n lnms dev:generate-test-data all\n lnms dev:generate-test-data routeros --variant=crs317,wifi --modules=ports,sensors\n\n" . + 'help' => "Regenerate existing JSON fixtures whose file name starts with the given prefix.\n\n" . + "Examples:\n lnms dev:generate-test-data routeros\n lnms dev:generate-test-data all\n lnms dev:generate-test-data ios_ --modules=ports,sensors\n\n" . 'Use -v to show discovery and poller output, -vv for LibreNMS debug output, or -vvv for full verbose debug and SNMP output.', 'arguments' => [ - 'os' => 'Process existing JSON fixtures for this OS, including their variants, or specify "all" for all OS fixtures', + 'prefix' => 'Process existing JSON fixtures starting with this prefix (ios matches iosxe and ios_*, ios_ only matches ios variants), or specify "all"', ], 'options' => [ - 'variant' => 'Comma-delimited OS variants to process or recreate (requires an OS; use an empty value for the base fixture)', - 'modules' => 'Comma-delimited modules to regenerate (default: existing fixture modules, or configured defaults with --variant)', + 'modules' => 'Comma-delimited modules to regenerate (default: existing fixture modules)', 'output' => 'Write one fixture to this file, or use - for standard output', ], 'scope_required' => 'Specify an OS (or all).', - 'variant_requires_os' => '--variant requires an OS.', 'invalid_module' => 'Invalid module name: :module', 'no_fixtures' => 'No matching JSON test fixtures found.', - 'no_fixtures_for_os' => 'No matching JSON test fixtures found for OS ":os".', - 'fixture_selection_note' => 'OS-wide selection is based on existing tests/data/*.json files so detection-only snmprec files are not included.', - 'recreate_hint' => 'To recreate a deleted fixture, specify its variant explicitly with --variant (use --variant= for the base OS fixture).', - 'output_single' => '--output can only be used with one OS/variant combination.', + 'no_fixtures_for_prefix' => 'No matching JSON test fixtures found for prefix ":prefix".', + 'fixture_selection_note' => 'Prefix selection is based on existing tests/data/*.json files. To create a new fixture, give the exact name of an existing tests/snmpsim/*.snmprec file.', + 'output_single' => '--output can only be used with one fixture.', 'combinations_found' => 'Multiple combinations (:count) found.', 'labels' => [ 'os' => 'OS: :os', diff --git a/lang/en/config_backups.php b/lang/en/config_backups.php index b9b84b70684..7f6120aa3b3 100644 --- a/lang/en/config_backups.php +++ b/lang/en/config_backups.php @@ -5,6 +5,7 @@ 'backups' => 'Backups', 'latest' => 'Latest', 'configuration' => 'Configuration', + 'author' => 'Author', 'diff' => 'Diff', 'compare' => 'Compare', 'exit_diff' => 'Exit Diff', diff --git a/lang/en/device.php b/lang/en/device.php index dca85108d87..3bafbda2b2f 100644 --- a/lang/en/device.php +++ b/lang/en/device.php @@ -39,6 +39,27 @@ 'status_up' => 'Up', 'status_down' => 'Down', 'device_type' => 'Device Type', + 'types' => [ + 'audiovisual' => 'Audiovisual', + 'collaboration' => 'Collaboration', + 'environment' => 'Environment', + 'firewall' => 'Firewall', + 'iot' => 'IoT', + 'loadbalancer' => 'Load Balancer', + 'management' => 'Management', + 'network' => 'Network', + 'optical' => 'Optical', + 'power' => 'Power', + 'printer' => 'Printer', + 'security' => 'Security', + 'server' => 'Server', + 'storage' => 'Storage', + 'surveillance' => 'Surveillance', + 'timing' => 'Timing', + 'voice' => 'Voice', + 'wireless' => 'Wireless', + 'workstation' => 'Workstation', + ], 'alerts_disabled' => 'Alerts Disabled', 'no_availability' => 'Warning: No availability sources are enabled for this device. At least one polling method must be enabled and set to affect availability, otherwise the device will ALWAYS show as up', diff --git a/lang/en/first_run.php b/lang/en/first_run.php new file mode 100644 index 00000000000..90df4ea409b --- /dev/null +++ b/lang/en/first_run.php @@ -0,0 +1,95 @@ + 'Welcome to LibreNMS', + 'panel_title' => 'Getting started', + 'skip' => 'Skip setup', + 'add_manually' => 'Add a device manually', + 'back' => 'Back', + 'next' => 'Next', + 'step_of' => 'Step :step of :total', + 'snmp_docs' => 'SNMP configuration examples', + 'steps' => [ + 'welcome' => 'Welcome', + 'credentials' => 'Credentials', + 'networks' => 'Networks', + 'scan' => 'Discover', + ], + 'welcome' => [ + 'heading' => 'Let\'s find your devices', + 'intro' => 'Tell LibreNMS how to reach your devices, then scan your network to add them.', + 'start' => 'Get started', + ], + 'credentials' => [ + 'heading' => 'SNMP credentials', + 'intro' => 'Tried in order on each device, and saved as your defaults.', + 'docs' => 'Need to turn on SNMP? See the :link.', + 'empty' => 'No credentials yet.', + 'add' => 'Add credential', + 'version' => 'SNMP version', + 'community' => 'Community', + 'save' => 'Add', + 'cancel' => 'Cancel', + 'reorder' => 'Drag to reorder', + 'remove' => 'Remove', + 'community_required' => 'Enter a community.', + 'community_exists' => 'That community is already in the list.', + 'v3_authname_required' => 'Enter the Auth Name.', + 'v3_authpass_required' => 'Enter an Auth Password of at least 8 characters.', + 'v3_cryptopass_required' => 'Enter a Crypto Password of at least 8 characters.', + 'required' => 'Add at least one credential.', + 'saved' => 'Saved the default SNMP credentials.', + 'community_description' => 'Default SNMP community', + 'v3_description' => 'Default SNMPv3 :name', + ], + 'networks' => [ + 'heading' => 'Networks to scan', + 'intro' => 'Every address in these networks is checked, and devices that reply to SNMP are added.', + 'suggested' => 'We\'ve added the networks this server is on.', + 'placeholder' => 'Add a network, like 192.168.1.0/24', + 'help' => 'CIDR notation, like 10.0.0.0/24. Press Enter after each one.', + 'addresses' => ':count address|:count addresses', + 'too_large' => 'That\'s :count addresses, the limit here is :max. Scan larger networks with lnms scan:network.', + 'invalid' => ':network isn\'t in CIDR notation, like 192.168.1.0/24.', + 'start' => 'Scan', + 'saved' => 'Saved the networks.', + 'required' => 'Add a network to scan.', + ], + 'scan' => [ + 'heading_running' => 'Scanning…', + 'heading_done' => 'Scan complete', + 'heading_stopped' => 'Scan stopped', + 'progress' => ':done of :total addresses', + 'added' => 'Added', + 'known' => 'Already monitored', + 'error' => 'Error', + 'added_count' => ':count added|:count added', + 'known_count' => ':count already monitored|:count already monitored', + 'errors_count' => ':count error|:count errors', + 'waiting' => 'Devices appear here as they\'re found.', + 'none_found' => 'No devices found.', + 'none_found_help' => 'Check that this server can reach these networks and that SNMP is enabled on your devices.', + 'docs' => 'See the :link.', + 'summary' => 'Added :count device in :duration.|Added :count devices in :duration.', + 'no_new' => 'No new devices found in :duration.', + 'discovering' => 'Ports, sensors and graphs will appear over the next few minutes.', + 'ping_only_found' => ':count host replied to ping but not SNMP.|:count hosts replied to ping but not SNMP.', + 'ping_only_help' => 'Check that SNMP is enabled and the credentials match, or add them as ping only.', + 'check_credentials' => 'Check credentials', + 'add_ping_only' => 'Add as ping only', + 'stop' => 'Stop', + 'stopped' => 'Devices found before the scan stopped were added.', + 'failed' => 'The scan stopped unexpectedly.', + 'change_networks' => 'Change networks', + 'view_devices' => 'View devices', + 'dashboard' => 'Go to the dashboard', + 'missing_binary' => ':binary isn\'t installed. Install it, then try again.', + 'seconds' => 'less than a second|:count second|:count seconds', + 'minutes' => ':count minute|:count minutes', + ], + 'next_steps' => [ + 'heading' => 'What\'s next', + 'alerts' => 'Set up alerts', + 'validate' => 'Check your install', + ], +]; diff --git a/lang/en/modules.php b/lang/en/modules.php index 62258f54ecd..a06bc0bc966 100644 --- a/lang/en/modules.php +++ b/lang/en/modules.php @@ -15,6 +15,8 @@ 'http' => 'HTTP', 'HttpGet' => 'HTTP Get', 'HttpGetMetadata' => 'HTTP Get Metadata', + 'icmpAppl' => 'ICMP Application', + 'icmpEcho' => 'ICMP Echo', 'IcmpEcho' => 'ICMP Echo', 'icmpjitter' => 'ICMP Jitter', 'IcmpTimeStamp' => 'ICMP TimeStamp', @@ -28,6 +30,7 @@ 'rtp' => 'RTP', 'script' => 'Script', 'tcpConnect' => 'TCP Connect', + 'twamp' => 'TWAMP', 'udpEcho' => 'UDP Ping', 'UdpTimestamp' => 'UDP Timestamp', 'voip' => 'VoIP', diff --git a/lang/en/permissions.php b/lang/en/permissions.php index 9b460c39c15..f3c722924b6 100644 --- a/lang/en/permissions.php +++ b/lang/en/permissions.php @@ -367,6 +367,13 @@ 'delete' => ['label' => 'Delete wireless sensors', 'description' => 'Remove wireless sensors.'], ], + 'worker' => [ + 'title' => 'Queue Workers', + 'view' => ['label' => 'View queues', 'description' => 'See queues, workers, and failed poll and discovery jobs.'], + 'update' => ['label' => 'Manage queue jobs', 'description' => 'Retry or delete failed jobs and record the jobs of a device.'], + 'horizon' => ['label' => 'Use Horizon', 'description' => 'Open the Horizon dashboard to see and manage all queue jobs.'], + ], + 'rbac' => [ 'title' => 'Roles & Permissions', 'beta_warning_title' => 'Beta Feature', diff --git a/lang/en/poller.php b/lang/en/poller.php index caf0661548c..73dc97e6fe0 100644 --- a/lang/en/poller.php +++ b/lang/en/poller.php @@ -6,7 +6,9 @@ 'snmp' => 'SNMP', 'icmp' => 'ICMP', 'ipmi' => 'IPMI', + 'proxmox-api' => 'Proxmox API', 'unix-agent' => 'Unix Agent', + 'unknown' => 'Unknown', ], 'method_settings' => [ 'icmp' => [ @@ -19,7 +21,14 @@ 'timeout' => 'Timeout', 'type' => 'Interface', ], + 'proxmox-api' => [ + 'hostname' => 'Hostname', + 'port' => 'Port', + 'timeout' => 'Timeout', + 'verify_ssl' => 'Verify TLS Certificate', + ], 'snmp' => [ + 'version' => 'SNMP version', 'transport' => 'SNMP transport', 'port' => 'SNMP port number', 'retries' => 'SNMP retries', @@ -35,12 +44,23 @@ 'timeout' => 'Unix Agent Timeout', ], ], + 'secret_types' => [ + 'snmp-community' => 'SNMP v1/v2c Community', + 'snmp-v3' => 'SNMP v3', + 'ipmi' => 'IPMI', + 'proxmox-api' => 'Proxmox API', + 'unknown' => 'Unknown', + ], + 'unknown_type' => 'Unknown (:type)', + 'unknown_secret_type' => 'This version of LibreNMS does not know the :type secret type, only the description can be edited.', + 'unknown_methods' => 'Unknown polling methods', + 'unknown_methods_help' => 'This version of LibreNMS does not know these polling methods, they are not used.', 'method_added' => 'Polling method added.', 'method_updated' => 'Polling method updated.', 'method_removed' => 'Polling method removed.', 'method_exists' => 'This polling method is already configured for this device.', 'select_credential' => 'Select an existing credential', - 'credential_type_mismatch' => 'Selected credential does not match polling method type.', + 'credential_type_mismatch' => 'This type of secret can not be used with this polling method and settings, for example a community with SNMP v3.', 'reachability_failed' => 'Could not connect to :hostname using :method.', 'reachability_check_failed' => 'Reachability Check Failed', 'validation_failed' => 'Validation Failed', diff --git a/lang/en/search.php b/lang/en/search.php index 5960673c85a..0ba1276fc1e 100644 --- a/lang/en/search.php +++ b/lang/en/search.php @@ -17,9 +17,6 @@ 'fdb' => 'FDB', 'arp' => 'ARP', 'ndp' => 'NDP', - 'ipv4' => 'IPv4 Address', - 'ipv6' => 'IPv6 Address', - 'mac' => 'MAC Address', 'arp_tables' => 'ARP Tables', 'fdb_tables' => 'FDB Tables', 'ndp_tables' => 'NDP Tables', @@ -27,4 +24,102 @@ 'fdb_trunk' => 'trunk', 'arp_summary' => 'Seen on :devices device(s) / :ports port(s)', 'packages' => 'Packages', + 'title' => 'Network Search', + 'page_placeholder' => 'IP, network (10.0.0.0/24), MAC, vendor, hostname...', + 'search' => 'Search', + 'per_page' => 'Per page', + 'error' => 'Search failed', + 'recent' => 'Recent', + 'clear' => 'Clear', + 'copy' => 'Copy', + 'mac_format' => 'Show MACs as', + 'clear_input' => 'Clear search', + 'mac_format_keys' => 'Keyboard: m (or Shift+m) to cycle, 1-4 to pick a format, when not typing in a field', + 'view_all' => 'View all', + 'keyboard_help' => 'Enter: search, Esc: clear, Up/Down: recent searches. Paste several addresses to look them all up.', + 'filter' => [ + 'source' => 'Source', + 'device' => 'Device', + 'port' => 'Port', + 'port_description' => 'Port description', + 'vlan' => 'VLAN', + 'interface_type' => 'Interface type', + ], + 'source' => [ + 'neighbor' => 'Neighbor tables (ARP, ND)', + 'fdb' => 'Forwarding tables (FDB)', + 'interface' => 'Interface addresses', + 'device' => 'Devices', + ], + 'host' => [ + 'monitored' => 'This address belongs to a device monitored by LibreNMS.', + 'add_device' => 'Add device', + 'dns_loading' => 'Checking reverse and forward DNS…', + 'dns_failed' => 'DNS lookup failed.', + 'dns_match_help' => 'Forward and reverse DNS agree: :ip resolves to :name and back.', + 'dns_mismatch_help' => ':name does not resolve back to :ip.', + 'no_reverse_dns' => 'No reverse DNS', + 'switch_port' => 'Switch port', + 'seen_on' => 'Seen on', + 'interface' => 'Interface', + 'device' => 'Device', + 'mac' => 'MAC', + 'macs' => 'MACs', + 'ip' => 'IP', + 'ips' => 'IPs', + 'same_subnet' => 'Same subnet', + 'gateway' => 'Gateway', + 'gateway_help' => 'The default route of :count device on this subnet|The default route of :count devices on this subnet', + 'gateway_router_help' => 'A router on this subnet: it has the subnet directly connected and routes to other networks', + 'also_learned' => 'Also learned on', + 'neighbor_of' => 'Neighbor of', + 'neighbor_of_help' => 'These device interfaces have this address in their ARP or IPv6 neighbor table', + 'neighbor_table' => 'Found in this interface\'s :table table', + 'not_seen' => 'Not seen', + 'no_forwarding_entry' => 'Not in any forwarding table', + 'several_macs_help' => 'Devices report different MACs for this address. Each device only keeps the latest, so the address may have moved or be reused on a separate network.', + 'uplink' => 'Link to another network device', + 'more' => '+:count more', + 'back_to_summary' => 'Back to summary', + ], + 'not_found' => [ + 'title' => 'Not seen', + 'empty_search' => 'No results', + 'checked' => 'Not in any ARP, IPv6 neighbor or forwarding table, interface or device.', + 'filtered' => 'Nothing matches with the current filters.', + 'still_possible' => 'A host that is off, or that connected since the last discovery, won\'t appear here.', + 'resolves_to' => 'Resolves to', + 'vendor' => 'Vendor', + 'search_network' => 'Search :network', + 'search_vendor_prefix' => 'Search :prefix', + 'without_filters' => 'Search without filters', + ], + 'export' => [ + 'ip' => 'IP', + 'mac' => 'MAC', + 'vendor' => 'Vendor', + 'interface' => 'Monitored interface', + 'switch' => 'Switch', + 'port' => 'Port', + 'port_description' => 'Port description', + 'vlan' => 'VLAN', + 'macs_on_port' => 'MACs on port', + 'seen_via' => 'Seen via', + 'last_seen' => 'Last seen', + ], + 'list' => [ + 'host' => 'Host', + 'mac' => 'MAC', + 'switch_port' => 'Switch port', + 'vlan' => 'VLAN', + 'via' => 'via', + 'via_help' => 'In this interface\'s ARP or ND table, but in no forwarding table', + 'macs_on_port' => 'MACs seen on this port', + 'last_seen' => 'Last seen', + 'hosts' => ':count host|:count hosts', + 'network_seen' => ':count of :size addresses seen', + 'not_seen' => ':count not seen', + 'terms_ignored' => 'only the first :count of :total were searched', + ], + 'macs_count' => ':count MAC|:count MACs', ]; diff --git a/lang/en/sensors.php b/lang/en/sensors.php index 061251cba2d..a0801255f50 100644 --- a/lang/en/sensors.php +++ b/lang/en/sensors.php @@ -13,7 +13,10 @@ 'title' => 'Sensors', 'category' => [ - 'stack' => 'Stack', + 'access-point' => 'Access Point|Access Points', + 'cluster' => 'Cluster|Clusters', + 'license' => 'License|Licenses', + 'stack' => 'Stack|Stacks', ], 'airflow' => [ 'short' => 'Airflow', diff --git a/lang/en/settings.php b/lang/en/settings.php index cfe2095c522..b75c9648963 100644 --- a/lang/en/settings.php +++ b/lang/en/settings.php @@ -67,7 +67,7 @@ 'peeringdb' => ['name' => 'PeeringDB Integration'], 'nfsen' => ['name' => 'NfSen Integration'], 'unix-agent' => ['name' => 'Unix-Agent Integration'], - 'smokeping' => ['name' => 'Smokeping Integration'], + 'smokeping' => ['name' => 'SmokePing Integration'], 'snmptrapd' => ['name' => 'SNMP Traps Integration'], 'rancid' => ['name' => 'RANCID Integration'], 'unimus' => ['name' => 'Unimus Integration'], @@ -583,6 +583,10 @@ 'sso' => 'Single Sign On', ], ], + 'auth_fallback_local' => [ + 'description' => 'Allow local users to log in if the configured authentication does not know them', + 'help' => 'Users created in LibreNMS (auth type mysql) can log in with their LibreNMS password when the configured authentication (LDAP, Active Directory, RADIUS, ...) does not know them or cannot be reached.', + ], 'auth_remember' => [ 'description' => 'Remember me duration', 'help' => 'Number of days to keep a user logged in when the user selects the remember me checkbox.', @@ -658,6 +662,10 @@ 'help' => 'Initial map zoom for background geo map', ], ], + 'edge_font_align' => [ + 'description' => 'Edge Text Alignment', + 'help' => 'Default text alignment for edge labels', + ], 'edge_font_color' => [ 'description' => 'Edge Text Color', 'help' => 'Default font color for edge labels', @@ -763,9 +771,6 @@ 'cisco-pw' => [ 'description' => 'Cisco PW', ], - 'cisco-vrf-lite' => [ - 'description' => 'Cisco VRF Lite', - ], 'discovery-arp' => [ 'description' => 'Discovery ARP', ], @@ -985,10 +990,6 @@ 'description' => 'Enable Libvirt', 'help' => 'Enables the libvirt page, which shows the virtual machines of devices.', ], - 'enable_proxmox' => [ - 'description' => 'Enable Proxmox', - 'help' => 'Enables the Proxmox page, which shows the virtual machines of devices.', - ], 'enable_pseudowires' => [ 'description' => 'Enable Pseudowires', 'help' => 'Enables the pseudowires page, which shows the pseudowires of devices.', @@ -1014,13 +1015,15 @@ 'help' => 'Number of devices to show in the down box on the front page', ], 'front_page_settings' => [ - 'top_devices' => [ - 'description' => 'Top Devices', - 'help' => 'Number of top devices to show on the front page', - ], - 'top_ports' => [ - 'description' => 'Top Ports', - 'help' => 'Number of top ports to show on the front page', + 'top' => [ + 'devices' => [ + 'description' => 'Top Devices', + 'help' => 'Number of top devices to show on the front page', + ], + 'ports' => [ + 'description' => 'Top Ports', + 'help' => 'Number of top ports to show on the front page', + ], ], ], 'fping_options' => [ @@ -1098,6 +1101,10 @@ 'help' => 'Does not create outages or decrease availability for devices in maintenance mode.', ], ], + 'graph_stat_percentile_disable' => [ + 'description' => 'Disable Percentile for stats graphs globally', + 'help' => 'Hides the percentile values and lines on graphs that show them', + ], 'graphs' => [ 'row' => [ 'normal' => [ @@ -1197,6 +1204,14 @@ 'description' => 'ICMP Check', 'help' => 'Add the ICMP polling method to new devices. Devices are pinged to check if they are up or down. Existing devices are not changed, edit ICMP on the Polling page of each device. If you disable this, polling can fail to complete in time.', ], + 'ignore_bsd_os_drives' => [ + 'description' => 'FreeBSD Drives to be ignored', + 'help' => 'Hide storage on FreeBSD devices whose description matches at least one of these regular expressions', + ], + 'ignore_junos_os_drives' => [ + 'description' => 'JunOS Drives to be ignored', + 'help' => 'Hide storage on JunOS devices whose description matches at least one of these regular expressions', + ], 'ignore_mount' => [ 'description' => 'Mountpoints to be ignored', 'help' => 'Do not monitor disk usage of these mountpoints', @@ -1221,6 +1236,10 @@ 'description' => 'Mountpoints containing String to be ignored', 'help' => 'Do not monitor disk usage of mountpoints that contain at least one of these strings', ], + 'ignore_mount_type' => [ + 'description' => 'Mountpoint Types to be ignored', + 'help' => 'Do not monitor disk usage of mountpoints with one of these storage types, for example hrStorageNetworkDisk', + ], 'influxdb' => [ 'db' => [ 'description' => 'Database', @@ -1478,9 +1497,11 @@ 'description' => 'Enable L2TP Ports menu', 'help' => 'Enable L2TP ports menu in the web interface', ], - 'ipmi.type' => [ - 'description' => 'IPMI Type', - 'help' => 'Type of IPMI to use, can be `lan`, `lanplus`, `open`, `sol`, `raw` or `shell`', + 'ipmi' => [ + 'type' => [ + 'description' => 'IPMI Type', + 'help' => 'Type of IPMI to use, can be `lan`, `lanplus`, `open`, `sol`, `raw` or `shell`', + ], ], 'ipmi_unit' => [ 'description' => 'IPMI Unit', @@ -1706,6 +1727,10 @@ 'description' => 'Bad Interface ifAlias Regex', 'help' => 'Network interface IF-MIB:!:ifAlias to ignore, as regular expressions', ], + 'good_if' => [ + 'description' => 'Good Interface ifDescr', + 'help' => 'Network interface IF-MIB:!:ifDescr to never ignore, even when a bad interface setting matches it', + ], 'bad_ifname_regexp' => [ 'description' => 'Bad Interface ifName Regex', 'help' => 'Network interface IF-MIB:!:ifName to ignore, as regular expressions', @@ -1749,6 +1774,9 @@ 'netstats' => [ 'description' => 'Netstats', ], + 'fdb-table' => [ + 'description' => 'FDB Tables', + ], 'hr-mib' => [ 'description' => 'HR Mib', ], @@ -1848,6 +1876,9 @@ 'vminfo' => [ 'description' => 'Hypervisor VM Info', ], + 'vrf' => [ + 'description' => 'VRF', + ], 'ntp' => [ 'description' => 'NTP', ], @@ -1882,9 +1913,11 @@ 'description' => 'Transceivers', ], ], - 'polling.selected_ports' => [ - 'description' => 'Selected Port Polling', - 'help' => 'Poll only the ports that are up and enabled', + 'polling' => [ + 'selected_ports' => [ + 'description' => 'Selected Port Polling', + 'help' => 'Poll only the ports that are up and enabled', + ], ], 'ports_fdb_purge' => [ 'description' => 'Port FDB entries older than', @@ -1906,9 +1939,15 @@ 'description' => 'Purge ports deleted', 'help' => 'Cleanup done by daily.sh', ], - 'processor.default_perc_warn' => [ - 'description' => 'Default Processor Percentage Warning', - 'help' => 'Default percentage of processor use before a warning is raised.', + 'networks_purge' => [ + 'description' => 'Purge unused networks', + 'help' => 'Remove networks that no longer have any IP addresses', + ], + 'processor' => [ + 'default_perc_warn' => [ + 'description' => 'Default Processor Percentage Warning', + 'help' => 'Default percentage of processor use before a warning is raised.', + ], ], 'prometheus' => [ 'enable' => [ @@ -1919,7 +1958,7 @@ 'description' => 'URL', 'help' => 'The URL of the Prometheus Push Gateway to send data to', ], - 'Job' => [ + 'job' => [ 'description' => 'Job', 'help' => 'Job label for exported metrics', ], @@ -1931,6 +1970,14 @@ 'description' => 'Prefix', 'help' => 'Optional text to prepend to exported metric names', ], + 'user' => [ + 'description' => 'Username', + 'help' => 'Username for basic authentication to the Prometheus Push Gateway. Used only when a password is also set.', + ], + 'password' => [ + 'description' => 'Password', + 'help' => 'Password for basic authentication to the Prometheus Push Gateway. Used only when a username is also set.', + ], ], 'public_status' => [ 'description' => 'Show status publicly', @@ -2022,19 +2069,27 @@ 'help' => 'Dumps errors that are normally hidden, so that a developer can find and fix the problems.', ], 'throttle' => [ - 'description' => 'Throttle Error Reports', - 'help' => 'Reports are sent only once in this number of seconds. Without this limit, an error in common code can produce many reports. Set to 0 to disable the throttle.', + 'description' => 'Exception Log Limit', + 'help' => 'Maximum number of times the same exception type is logged per minute. Without this limit, an error in common code can flood the log. Set to 0 to disable the limit.', ], ], 'rewrite_if' => [ 'description' => 'Rewrite ifDescr', 'help' => 'Rewrite ifDescr to remove the interface type and number. For example, GigabitEthernet0/1 becomes GigabitEthernet.', ], + 'rewrite_if_regexp' => [ + 'description' => 'Rewrite ifDescr Regex', + 'help' => 'Replace the parts of ifDescr that match these regular expressions with the given text. The match ignores case.', + ], 'route_purge' => [ 'description' => 'Route entries older than', 'help' => 'Cleanup done by daily.sh', ], 'rrd' => [ + 'backend' => [ + 'description' => 'RRD storage backend', + 'help' => 'rrdtool runs rrdtool commands. php-rrd writes and draws graphs with the php-rrd extension, which is faster, and uses rrdtool to list files and check if they exist when rrdcached is set. Both send commands to rrdcached when it is set.', + ], 'heartbeat' => [ 'description' => 'Change the rrd heartbeat value (default 600)', ], @@ -2093,7 +2148,7 @@ 'legacy' => 'Legacy (Unrestricted)', 'cron' => 'Cron (lnms device:discover)', 'dispatcher' => 'Dispatcher Service', - 'scheduler' => 'Scheduler (queue workers, experimental)', + 'worker' => 'Queue Workers (experimental)', ], ], 'ping' => [ @@ -2113,7 +2168,7 @@ 'legacy' => 'Legacy (Unrestricted)', 'cron' => 'Cron (poller.php)', 'dispatcher' => 'Dispatcher Service', - 'scheduler' => 'Scheduler (queue workers, experimental)', + 'worker' => 'Queue Workers (experimental)', ], ], 'services' => [ @@ -2491,29 +2546,31 @@ 'description' => 'Set the max search result limit', 'help' => 'Global search results limit', ], - 'global_search.arp' => [ - 'description' => 'Global search ARP', - 'help' => 'Search the ARP caches of your devices to find where devices are connected', - ], - 'global_search.fdb' => [ - 'description' => 'Global search FDB entries', - 'help' => 'Search the bridge forwarding tables of your devices to find where devices are connected', - ], - 'global_search.eventlogs' => [ - 'description' => 'Global search event logs', - 'help' => 'Find matching event logs in the global search results', - ], - 'global_search.health' => [ - 'description' => 'Global search health', - 'help' => 'Find matching health sensors in the global search results', - ], - 'global_search.ports' => [ - 'description' => 'Global search ports', - 'help' => 'Find matching ports in the global search results', - ], - 'global_search.routing' => [ - 'description' => 'Global search route peers', - 'help' => 'Find matching routing peers in the global search results', + 'global_search' => [ + 'arp' => [ + 'description' => 'Global search ARP', + 'help' => 'Search the ARP caches of your devices to find where devices are connected', + ], + 'fdb' => [ + 'description' => 'Global search FDB entries', + 'help' => 'Search the bridge forwarding tables of your devices to find where devices are connected', + ], + 'eventlogs' => [ + 'description' => 'Global search event logs', + 'help' => 'Find matching event logs in the global search results', + ], + 'health' => [ + 'description' => 'Global search health', + 'help' => 'Find matching health sensors in the global search results', + ], + 'ports' => [ + 'description' => 'Global search ports', + 'help' => 'Find matching ports in the global search results', + ], + 'routing' => [ + 'description' => 'Global search route peers', + 'help' => 'Find matching routing peers in the global search results', + ], ], 'graph_stacked' => [ 'description' => 'Use stacked graphs', @@ -2531,10 +2588,6 @@ 'description' => 'Set the minimum graph height', 'help' => 'Minimum Graph Height (default: 300)', ], - 'graph_stat_percentile_disable' => [ - 'description' => 'Disable Percentile for stats graphs globally', - 'help' => 'Hides the percentile values and lines on graphs that show them', - ], ], 'device_display_default' => [ 'description' => 'Default device display name template', @@ -2562,21 +2615,23 @@ 'description' => 'Averaging factor', 'help' => 'A moving average is calculated with an exponential weighted moving average function. This factor controls how much the current value affects the average. Values closer to 1 make the average change more quickly.', ], - 'smokeping.integration' => [ - 'description' => 'Enable', - 'help' => 'Enable smokeping integration', - ], - 'smokeping.dir' => [ - 'description' => 'Path to rrds', - 'help' => 'Full path to Smokeping RRDs', - ], - 'smokeping.pings' => [ - 'description' => 'Pings', - 'help' => 'Number of pings configured in Smokeping', - ], - 'smokeping.url' => [ - 'description' => 'URL to smokeping', - 'help' => 'Full URL to the smokeping gui', + 'smokeping' => [ + 'integration' => [ + 'description' => 'Enable', + 'help' => 'Enable SmokePing integration', + ], + 'dir' => [ + 'description' => 'Path to RRDs', + 'help' => 'Full path to SmokePing RRDs', + ], + 'pings' => [ + 'description' => 'Pings', + 'help' => 'Number of pings configured in SmokePing', + ], + 'url' => [ + 'description' => 'URL to SmokePing', + 'help' => 'Full URL to the SmokePing GUI', + ], ], ], 'twofactor' => [ diff --git a/lang/en/validation.php b/lang/en/validation.php index 2214a2b0212..b9bfbce82bb 100644 --- a/lang/en/validation.php +++ b/lang/en/validation.php @@ -78,6 +78,7 @@ 'python' => 'Python', 'rrd' => 'RRD', 'scheduler' => 'Scheduler', + 'smokeping' => 'SmokePing', 'snmp' => 'SNMP', 'system' => 'System', 'updates' => 'Updates', @@ -91,6 +92,11 @@ 'fix' => 'Either comment out or delete $config[\'rrdtool_version\'] = \':version\'; from your config.php file', 'ok' => 'rrdtool version ok', ], + 'CheckRrdBackend' => [ + 'fail_extension' => 'The rrd.backend setting is php-rrd, but the php-rrd extension is not loaded.', + 'fix_backend' => 'lnms config:set rrd.backend rrdtool', + 'ok' => 'RRD backend configuration ok', + ], 'CheckRrdcachedConnectivity' => [ 'fail_socket' => ':socket does not exist. The rrdcached connectivity test failed.', 'fail_port' => 'Cannot connect to rrdcached server :server on port :port', @@ -201,6 +207,22 @@ 'nodes_down' => 'Some poller nodes did not check in recently', 'not_detected' => 'Python wrapper cron entry is not present', ], + 'CheckQueuePolling' => [ + 'dispatch_stopped' => 'Polling work was last dispatched :time, check that the scheduler and the queue workers are running', + 'not_dispatched' => 'Polling work has not been dispatched in the last hour, check that the scheduler and the queue workers are running', + 'ok' => 'Polling work is being dispatched to the queue workers', + 'overdue' => 'Some devices have not been polled in over twice the polling interval', + 'overdue_fix' => 'Check Overdue Devices on the Pollers > Queues page, it shows whether a poll job is holding up each device', + ], + 'CheckQueueWorkers' => [ + 'behind' => 'Some queues are not keeping up, add workers or worker nodes for them', + 'nodes_down' => 'Some queue worker nodes did not check in recently', + 'not_running' => 'Queue workers are not running on any node, polling work is not being processed', + 'ok' => 'Queue workers are working all polling queues', + 'queue_driver' => 'Queue workers need a queue, the :driver queue driver runs jobs right away', + 'unavailable' => 'Could not read the queue worker status: :message', + 'unworked' => 'No queue workers for some queues, check the poller groups of each worker node', + ], 'CheckRedis' => [ 'bad_driver' => ':driver is in use for locking. Set CACHE_STORE=redis.', 'ok' => 'Redis is functional', diff --git a/lang/es/settings.php b/lang/es/settings.php index 089e9bdf4aa..9285b57449a 100644 --- a/lang/es/settings.php +++ b/lang/es/settings.php @@ -1111,10 +1111,6 @@ 'description' => 'Enable Libvirt', 'help' => 'Enables the libvirt page, which shows the virtual machines of devices.', ], - 'enable_proxmox' => [ - 'description' => 'Enable Proxmox', - 'help' => 'Enables the Proxmox page, which shows the virtual machines of devices.', - ], 'enable_pseudowires' => [ 'description' => 'Enable Pseudowires', 'help' => 'Enables the pseudowires page, which shows the pseudowires of devices.', @@ -1140,13 +1136,15 @@ 'help' => 'Number of devices to show in the down box on the front page', ], 'front_page_settings' => [ - 'top_devices' => [ - 'description' => 'Top Devices', - 'help' => 'Number of top devices to show on the front page', - ], - 'top_ports' => [ - 'description' => 'Top Ports', - 'help' => 'Number of top ports to show on the front page', + 'top' => [ + 'devices' => [ + 'description' => 'Top Devices', + 'help' => 'Number of top devices to show on the front page', + ], + 'ports' => [ + 'description' => 'Top Ports', + 'help' => 'Number of top ports to show on the front page', + ], ], ], 'fping' => [ @@ -1230,6 +1228,10 @@ 'help' => 'Disables the creation of outages and decreasing of availability for devices which are in maintenance mode.', ], ], + 'graph_stat_percentile_disable' => [ + 'description' => 'Disable Percentile for stats graphs globally', + 'help' => 'Disables display of the percentile values and lines for graphs that display those', + ], 'graphs' => [ 'port_speed_zoom' => [ 'description' => 'Zoom port graphs to port speed', @@ -1590,9 +1592,11 @@ 'ipmitool' => [ 'description' => 'Path to ipmtool', ], - 'ipmi.type' => [ - 'description' => 'IPMI Type', - 'help' => 'Type of IPMI to use, can be `lan`, `lanplus`, `open`, `sol`, `raw` or `shell`', + 'ipmi' => [ + 'type' => [ + 'description' => 'IPMI Type', + 'help' => 'Type of IPMI to use, can be `lan`, `lanplus`, `open`, `sol`, `raw` or `shell`', + ], ], 'ipmi_unit' => [ 'description' => 'IPMI Unit', @@ -1976,9 +1980,11 @@ 'description' => 'Port Security', ], ], - 'polling.selected_ports' => [ - 'description' => 'Selected Port Polling', - 'help' => 'Enable selected port polling to only poll ports that are up and enabled', + 'polling' => [ + 'selected_ports' => [ + 'description' => 'Selected Port Polling', + 'help' => 'Enable selected port polling to only poll ports that are up and enabled', + ], ], 'ports_fdb_purge' => [ 'description' => 'Port FDB entries older than', @@ -2000,9 +2006,11 @@ 'description' => 'Purge ports deleted', 'help' => 'Cleanup done by daily.sh', ], - 'processor.default_perc_warn' => [ - 'description' => 'Default Processor Percentage Warning', - 'help' => 'Default Percentage of processor used before a warning is raised.', + 'processor' => [ + 'default_perc_warn' => [ + 'description' => 'Default Processor Percentage Warning', + 'help' => 'Default Percentage of processor used before a warning is raised.', + ], ], 'prometheus' => [ 'enable' => [ @@ -2013,7 +2021,7 @@ 'description' => 'URL', 'help' => 'The URL of the Prometheus Push Gateway to send data to', ], - 'Job' => [ + 'job' => [ 'description' => 'Job', 'help' => 'Job label for exported metrics', ], @@ -2103,10 +2111,6 @@ 'help' => 'Ignore comments when comparing RANCID configs, used to display config diffs on device pages', ], 'reporting' => [ - 'error' => [ - 'description' => 'Send Error Reports', - 'help' => 'Sends some errors to LibreNMS for analysis and fixing', - ], 'usage' => [ 'description' => 'Send Usage Reports', 'help' => 'Reports usage and versions to LibreNMS. To delete anonymous stats, visit the about page. You can view stats at https://stats.librenms.org', @@ -2115,10 +2119,6 @@ 'description' => 'Dump debug errors (Will break your install)', 'help' => 'Dump out errors that are normally hidden so you as a developer can find and fix the possible issues.', ], - 'throttle' => [ - 'description' => 'Throttle Error Reports', - 'help' => 'Reports will only be sent every specified amount of seconds. Without this if you have an error in common code reporting can get out of hand. Set to 0 to disable throttling.', - ], ], 'rewrite_if' => [ 'description' => 'Rewrite ifDescr', @@ -2616,10 +2616,6 @@ 'description' => 'Set the minimum graph height', 'help' => 'Minimum Graph Height (default: 300)', ], - 'graph_stat_percentile_disable' => [ - 'description' => 'Disable Percentile for stats graphs globally', - 'help' => 'Disables display of the percentile values and lines for graphs that display those', - ], ], 'device_display_default' => [ 'description' => 'Default device display name template', @@ -2647,21 +2643,23 @@ 'description' => 'Averaging factor', 'help' => 'We calculate a moving average using an exponential weighted moving average function. This is the factor used by the function to control how much the current value affects the average. Values closer to 1 will make the average change quicker.', ], - 'smokeping.integration' => [ - 'description' => 'Enable', - 'help' => 'Enable smokeping integration', - ], - 'smokeping.dir' => [ - 'description' => 'Path to rrds', - 'help' => 'Full path to Smokeping RRDs', - ], - 'smokeping.pings' => [ - 'description' => 'Pings', - 'help' => 'Number of pings configured in Smokeping', - ], - 'smokeping.url' => [ - 'description' => 'URL to smokeping', - 'help' => 'Full URL to the smokeping gui', + 'smokeping' => [ + 'integration' => [ + 'description' => 'Enable', + 'help' => 'Enable smokeping integration', + ], + 'dir' => [ + 'description' => 'Path to rrds', + 'help' => 'Full path to Smokeping RRDs', + ], + 'pings' => [ + 'description' => 'Pings', + 'help' => 'Number of pings configured in Smokeping', + ], + 'url' => [ + 'description' => 'URL to smokeping', + 'help' => 'Full URL to the smokeping gui', + ], ], ], 'twofactor' => [ diff --git a/lang/it/settings.php b/lang/it/settings.php index b796c73d7e2..88cc5b063ea 100644 --- a/lang/it/settings.php +++ b/lang/it/settings.php @@ -739,6 +739,10 @@ 'help' => 'Disables the creation of outages and decreasing of availability for devices which are in maintenance mode.', ], ], + 'graph_stat_percentile_disable' => [ + 'description' => 'Disable Percentile for stats graphs globally', + 'help' => 'Disables display of the percentile values and lines for graphs that display those', + ], 'graphs' => [ 'port_speed_zoom' => [ 'description' => 'Zoom port graphs to port speed', @@ -1187,7 +1191,7 @@ 'description' => 'URL', 'help' => 'The URL of the Prometheus Push Gateway to send data to', ], - 'Job' => [ + 'job' => [ 'description' => 'Job', 'help' => 'Job label for exported metrics', ], @@ -1515,10 +1519,6 @@ 'description' => 'Set the minimum graph height', 'help' => 'Minimum Graph Height (default: 300)', ], - 'graph_stat_percentile_disable' => [ - 'description' => 'Disable Percentile for stats graphs globally', - 'help' => 'Disables display of the percentile values and lines for graphs that display those', - ], ], 'device_display_default' => [ 'description' => 'Default device display name template', @@ -1534,21 +1534,23 @@ 'description' => 'Location Map open', 'help' => 'Location Map is shown by default', ], - 'smokeping.integration' => [ - 'description' => 'Enable', - 'help' => 'Enable smokeping integration', - ], - 'smokeping.dir' => [ - 'description' => 'Path to rrds', - 'help' => 'Full path to Smokeping RRDs', - ], - 'smokeping.pings' => [ - 'description' => 'Pings', - 'help' => 'Number of pings configured in Smokeping', - ], - 'smokeping.url' => [ - 'description' => 'URL to smokeping', - 'help' => 'Full URL to the smokeping gui', + 'smokeping' => [ + 'integration' => [ + 'description' => 'Enable', + 'help' => 'Enable smokeping integration', + ], + 'dir' => [ + 'description' => 'Path to rrds', + 'help' => 'Full path to Smokeping RRDs', + ], + 'pings' => [ + 'description' => 'Pings', + 'help' => 'Number of pings configured in Smokeping', + ], + 'url' => [ + 'description' => 'URL to smokeping', + 'help' => 'Full URL to the smokeping gui', + ], ], ], 'twofactor' => [ diff --git a/lang/ka/settings.php b/lang/ka/settings.php index 370fce11092..abe623198e7 100644 --- a/lang/ka/settings.php +++ b/lang/ka/settings.php @@ -914,6 +914,10 @@ 'help' => 'გამორთავს გათიშვას და დაწევს ხელმისაწვდომობას მოწყობილობებისთვის, რომლებიც რემონტის რეჟიმშია.', ], ], + 'graph_stat_percentile_disable' => [ + 'description' => 'სტატისტიკის გრაფიკებისთვის პროცენტულობის გლობალურად გამორთვა', + 'help' => 'გამორთავს პროცენტული მნიშვნელობებისა და ხაზების ჩვენება გრაფიკებისთვის, რომლებსაც ესენი გააჩნია', + ], 'graphs' => [ 'port_speed_zoom' => [ 'description' => 'პორტის გრაფიკების გადიდება პორტის სიჩქარემდე', @@ -1488,7 +1492,7 @@ 'description' => 'URL', 'help' => 'Prometheus Push Gateway-ის URL მონაცემების გასაგზავნად', ], - 'Job' => [ + 'job' => [ 'description' => 'დავალება', 'help' => 'დავალების ჭდე გატანილი მეტრიკებისთვის', ], @@ -1566,10 +1570,6 @@ ], ], 'reporting' => [ - 'error' => [ - 'description' => 'შეცდომის ანგარიშების გაგზავნა', - 'help' => 'ზოგიერთი შეცდომის გაგზავნა LibreNMS-სთვის ანალიზისა და გასწორებისთვის', - ], 'usage' => [ 'description' => 'გამოყენების ანგარიშების გაგზავნა', 'help' => 'გამოყენების და ვერსიების გაგზავნა LibreNMS-სთვის. ანონიმური სტატისტიკის წასაშლელად ეწვიეთ გვერდს "შესახებ". სტატისტიკის ნახვა შეგიძლიათ მისამართზე https://stats.librenms.org', @@ -1578,10 +1578,6 @@ 'description' => 'გამართვის შეცდომების ჩამოყრა (შეუძლია პროგრამის თქვენი ვერსიის გაფუჭება)', 'help' => 'ჩამოყრის შეცდომებს, რომლებიც ჩვეულებრივ დამალულია, რომ თქვენ, როგორც პროგრამისტმა, შეძლოთ და იპოვოთ შესაძლო პრობლემები.', ], - 'throttle' => [ - 'description' => 'შეცდომის ანგარიშების შეზღუდვა', - 'help' => 'ანგარიშების გაგზავნა, მხოლოდ, ყოველ მითითებული რაოდენობის წამის შემდეგ მოხდება. ამის გარეშე, თუ გაქვთ შეცდომა საერთო კოდში, ანგარიშების გაგზავნა, შეიძლება, ხელიდან წავიდეს. 0 გამორთავს შეზღუდვას.', - ], ], 'route_purge' => [ 'description' => 'რაუტების ჩანაწერები, რომლებიც ძველია, ვიდრე', @@ -1944,10 +1940,6 @@ 'description' => 'მინიმალური გრაფიკის სიმაღლის დაყენება', 'help' => 'მინიმალური გრაფიკის სიმაღლე (ნაგულისხმევი: 300)', ], - 'graph_stat_percentile_disable' => [ - 'description' => 'სტატისტიკის გრაფიკებისთვის პროცენტულობის გლობალურად გამორთვა', - 'help' => 'გამორთავს პროცენტული მნიშვნელობებისა და ხაზების ჩვენება გრაფიკებისთვის, რომლებსაც ესენი გააჩნია', - ], ], 'device_display_default' => [ 'description' => 'ნაგულისხმევი მოწყობილობის საჩვენებელი სახელის შაბლონი', @@ -1971,21 +1963,23 @@ 'description' => 'მოწყობილობის დამოკიდებულებების ჩვენება მდებარეობის რუკაზე', 'help' => 'მოწყობილობებს შორის ბმულების ჩვენება მდებარეობის რუკაზე მშობელი დამოკიდებულებების მიხედვით', ], - 'smokeping.integration' => [ - 'description' => 'ჩართვა', - 'help' => 'smokeping-ის ინტეგრაციის ჩართვა', - ], - 'smokeping.dir' => [ - 'description' => 'ბილიკი rrd ფაილებამდე', - 'help' => 'სრული ბილიკი Smokeping-ის RRD-აბამდე', - ], - 'smokeping.pings' => [ - 'description' => 'პინგები', - 'help' => 'Smokeping-ში მორგებული პინგების რაოდენობა', - ], - 'smokeping.url' => [ - 'description' => 'smokeping-ის URL', - 'help' => 'სრული URL smokeping-ის ინტერფეისამდე', + 'smokeping' => [ + 'integration' => [ + 'description' => 'ჩართვა', + 'help' => 'smokeping-ის ინტეგრაციის ჩართვა', + ], + 'dir' => [ + 'description' => 'ბილიკი rrd ფაილებამდე', + 'help' => 'სრული ბილიკი Smokeping-ის RRD-აბამდე', + ], + 'pings' => [ + 'description' => 'პინგები', + 'help' => 'Smokeping-ში მორგებული პინგების რაოდენობა', + ], + 'url' => [ + 'description' => 'smokeping-ის URL', + 'help' => 'სრული URL smokeping-ის ინტერფეისამდე', + ], ], ], 'twofactor' => [ diff --git a/lang/ko.json b/lang/ko.json index 3a9df62fd60..3f63ab6345a 100644 --- a/lang/ko.json +++ b/lang/ko.json @@ -322,11 +322,9 @@ "End": "종료", "Error": "오류", "Error Rate": "오류율", - "Error reporting:": "오류 보고:", "Errored": "오류 발생", "Errored :port_count": "오류 :port_count", "Errors": "오류", - "Event Log": "이벤트 로그", "Event type": "이벤트 유형", "Eventlog": "이벤트 로그", "Eventlog Entries": "이벤트 로그 항목", @@ -622,7 +620,6 @@ "Please enter a device match regex (hostname or sysName).": "장치 일치 정규식(hostname 또는 sysName)을 입력하십시오.", "Please enter auth token": "인증 토큰을 입력하십시오", "Please feel free to join us and contribute code, documentation, and bug reports:": "누구든 참여하여 코드, 문서, 버그 리포트로 기여할 수 있습니다:", - "Please include this Error-ID when reporting problems:": "문제를 보고할 때 이 오류 ID를 포함하십시오:", "Please select a device group.": "장치 그룹을 선택하십시오.", "Plugin Admin": "플러그인 관리", "Plugins": "플러그인", diff --git a/lang/ko/settings.php b/lang/ko/settings.php index 08550fac10b..f44316e5a5c 100644 --- a/lang/ko/settings.php +++ b/lang/ko/settings.php @@ -876,10 +876,6 @@ 'description' => 'Libvirt 활성화', 'help' => '장비의 가상 머신을 보여주는 libvirt 페이지를 활성화합니다.', ], - 'enable_proxmox' => [ - 'description' => 'Proxmox 활성화', - 'help' => '장비의 가상 머신을 보여주는 Proxmox 페이지를 활성화합니다.', - ], 'enable_pseudowires' => [ 'description' => '수도 회선 활성화', 'help' => '장비의 수도 회선을 보여주는 페이지를 활성화합니다.', @@ -905,13 +901,15 @@ 'help' => '첫 페이지의 다운 박스에 표시할 장비 수', ], 'front_page_settings' => [ - 'top_devices' => [ - 'description' => '상위 장비', - 'help' => '첫 페이지에 표시할 상위 장비 수', - ], - 'top_ports' => [ - 'description' => '상위 포트', - 'help' => '첫 페이지에 표시할 상위 포트 수', + 'top' => [ + 'devices' => [ + 'description' => '상위 장비', + 'help' => '첫 페이지에 표시할 상위 장비 수', + ], + 'ports' => [ + 'description' => '상위 포트', + 'help' => '첫 페이지에 표시할 상위 포트 수', + ], ], ], 'fping' => [ @@ -995,6 +993,10 @@ 'help' => '유지보수 모드에 있는 장비에 대해 장애 생성 및 가용성 감소를 비활성화합니다.', ], ], + 'graph_stat_percentile_disable' => [ + 'description' => '통계 그래프에서 퍼센타일 전역 비활성화', + 'help' => '퍼센타일 값과 선을 표시하는 그래프에서 표시를 비활성화합니다', + ], 'graphs' => [ 'port_speed_zoom' => [ 'description' => '포트 그래프를 포트 속도에 맞게 확대', @@ -1359,9 +1361,11 @@ 'ipmitool' => [ 'description' => 'ipmitool 경로', ], - 'ipmi.type' => [ - 'description' => 'IPMI 유형', - 'help' => '사용할 IPMI 유형입니다. `lan`, `lanplus`, `open`, `sol`, `raw` 또는 `shell`일 수 있습니다', + 'ipmi' => [ + 'type' => [ + 'description' => 'IPMI 유형', + 'help' => '사용할 IPMI 유형입니다. `lan`, `lanplus`, `open`, `sol`, `raw` 또는 `shell`일 수 있습니다', + ], ], 'ipmi_unit' => [ 'description' => 'IPMI 단위', @@ -1649,9 +1653,11 @@ 'printer-supplies' => ['description' => '프린터 소모품'], 'port-security' => ['description' => '포트 보안'], ], - 'polling.selected_ports' => [ - 'description' => '선택적 포트 폴링', - 'help' => '활성화되고 활성화된 포트만 폴링하는 선택적 포트 폴링을 활성화합니다', + 'polling' => [ + 'selected_ports' => [ + 'description' => '선택적 포트 폴링', + 'help' => '활성화되고 활성화된 포트만 폴링하는 선택적 포트 폴링을 활성화합니다', + ], ], 'ports_fdb_purge' => [ 'description' => '이 기간보다 오래된 포트 FDB 항목 삭제', @@ -1673,9 +1679,11 @@ 'description' => '삭제된 포트 제거', 'help' => 'daily.sh에 의해 정리됩니다', ], - 'processor.default_perc_warn' => [ - 'description' => '기본 프로세서 사용률 경고 임계값', - 'help' => '경고가 발생하기 전 프로세서 사용률의 기본 임계값', + 'processor' => [ + 'default_perc_warn' => [ + 'description' => '기본 프로세서 사용률 경고 임계값', + 'help' => '경고가 발생하기 전 프로세서 사용률의 기본 임계값', + ], ], 'prometheus' => [ 'enable' => [ @@ -1686,7 +1694,7 @@ 'description' => 'URL', 'help' => '데이터를 전송할 Prometheus Push Gateway의 URL', ], - 'Job' => [ + 'job' => [ 'description' => '작업', 'help' => '내보낸 메트릭의 작업 레이블', ], @@ -1776,10 +1784,6 @@ 'help' => 'RANCID 설정 비교 시 주석을 무시합니다. 장비 페이지에서 설정 차이를 표시하는 데 사용됩니다', ], 'reporting' => [ - 'error' => [ - 'description' => '오류 보고서 전송', - 'help' => '분석 및 수정을 위해 LibreNMS에 일부 오류를 전송합니다', - ], 'usage' => [ 'description' => '사용량 보고서 전송', 'help' => 'LibreNMS에 사용량 및 버전을 보고합니다. 익명 통계를 삭제하려면 정보 페이지를 방문하십시오.', @@ -1788,10 +1792,6 @@ 'description' => '디버그 오류 덤프 (설치가 손상될 수 있음)', 'help' => '일반적으로 숨겨진 오류를 출력하여 개발자가 문제를 찾고 수정할 수 있게 합니다.', ], - 'throttle' => [ - 'description' => '오류 보고 제한', - 'help' => '지정한 초 간격으로만 보고서가 전송됩니다. 0으로 설정하면 제한을 비활성화합니다.', - ], ], 'rewrite_if' => [ 'description' => 'ifDescr 다시 쓰기', @@ -2314,10 +2314,6 @@ 'description' => '최소 그래프 높이 설정', 'help' => '최소 그래프 높이 (기본값: 300)', ], - 'graph_stat_percentile_disable' => [ - 'description' => '통계 그래프에서 퍼센타일 전역 비활성화', - 'help' => '퍼센타일 값과 선을 표시하는 그래프에서 표시를 비활성화합니다', - ], ], 'device_display_default' => [ 'description' => '기본 장비 표시 이름 템플릿', @@ -2345,21 +2341,23 @@ 'description' => '평균 인수', 'help' => '지수 가중 이동 평균 함수를 사용하여 이동 평균을 계산합니다. 현재 값이 평균에 영향을 주는 정도를 제어하는 인수입니다. 1에 가까울수록 평균이 더 빠르게 변합니다.', ], - 'smokeping.integration' => [ - 'description' => '활성화', - 'help' => 'Smokeping 연동을 활성화합니다', - ], - 'smokeping.dir' => [ - 'description' => 'RRD 경로', - 'help' => 'Smokeping RRD의 전체 경로', - ], - 'smokeping.pings' => [ - 'description' => '핑 수', - 'help' => 'Smokeping에 설정된 핑 수', - ], - 'smokeping.url' => [ - 'description' => 'Smokeping URL', - 'help' => 'Smokeping GUI의 전체 URL', + 'smokeping' => [ + 'integration' => [ + 'description' => '활성화', + 'help' => 'Smokeping 연동을 활성화합니다', + ], + 'dir' => [ + 'description' => 'RRD 경로', + 'help' => 'Smokeping RRD의 전체 경로', + ], + 'pings' => [ + 'description' => '핑 수', + 'help' => 'Smokeping에 설정된 핑 수', + ], + 'url' => [ + 'description' => 'Smokeping URL', + 'help' => 'Smokeping GUI의 전체 URL', + ], ], ], 'twofactor' => [ diff --git a/lang/pt-BR.json b/lang/pt-BR.json index 1800230a9c9..eeaef4ca974 100644 --- a/lang/pt-BR.json +++ b/lang/pt-BR.json @@ -221,7 +221,6 @@ "Enabled": "Habilitado", "End": "Fim", "Error Rate": "Taxa de Erros", - "Error reporting:": "Relatórios de Erros:", "ERROR: Could not update": "ERRO: Não foi possível atualizar", "ERROR: You need to be admin": "ERRO: Você precisa ser administrador", "ERROR: You have no write-access to this dashboard": "ERRO: Você não tem permissão de escrita neste painel", diff --git a/lang/pt-BR/settings.php b/lang/pt-BR/settings.php index d49ce2e7186..9eae669d040 100644 --- a/lang/pt-BR/settings.php +++ b/lang/pt-BR/settings.php @@ -896,6 +896,10 @@ 'help' => 'Desativa a criação de interrupções e a diminuição da disponibilidade para dispositivos em modo de manutenção.', ], ], + 'graph_stat_percentile_disable' => [ + 'description' => 'Desativar percentual para gráficos de estatísticas globalmente', + 'help' => 'Desativa a exibição dos valores e linhas percentuais para gráficos que exibem esses', + ], 'graphs' => [ 'port_speed_zoom' => [ 'description' => 'Ampliar gráficos de porta para a velocidade da porta', @@ -1578,7 +1582,7 @@ 'description' => 'URL', 'help' => 'A URL do Prometheus Push Gateway para enviar dados', ], - 'Job' => [ + 'job' => [ 'description' => 'Tarefa', 'help' => 'Etiqueta de tarefa para métricas exportadas', ], @@ -1624,10 +1628,6 @@ ], ], 'reporting' => [ - 'error' => [ - 'description' => 'Enviar Relatórios de Erros', - 'help' => 'Envia determinados erros para o LibreNMS para análise e correção', - ], 'usage' => [ 'description' => 'Enviar Relatórios de Uso', 'help' => 'Envia relatório de uso e versão para o LibreNMS. Para excluir estatísticas anônimas, visite a página Sobre. Você pode visualizar estatísticas em https://stats.librenms.org', @@ -1636,10 +1636,6 @@ 'description' => 'Despejar erros de depuração (Poderá corromper sua instalação)', 'help' => 'Despejar erros que normalmente são ocultados para que você, como desenvolvedor, possa encontrar e corrigir possíveis problemas.', ], - 'throttle' => [ - 'description' => 'Limitar Relatórios de Erros', - 'help' => 'Relatórios serão enviados apenas a determinado quantidade de segundos. Sem isso, se você tiver um erro em um código comum, os relatórios podem sair fora do controle. Defina como 0 para desativar a limitação.', - ], ], 'route_purge' => [ 'description' => 'Entradas de Rota mais antigas que', @@ -1998,10 +1994,6 @@ 'description' => 'Definir a altura mínima do gráfico', 'help' => 'Altura mínima do gráfico (padrão: 300)', ], - 'graph_stat_percentile_disable' => [ - 'description' => 'Desativar percentual para gráficos de estatísticas globalmente', - 'help' => 'Desativa a exibição dos valores e linhas percentuais para gráficos que exibem esses', - ], ], 'device_display_default' => [ 'description' => 'Nome de Exibição do Dispositivo', @@ -2025,21 +2017,23 @@ 'description' => 'Exibir dependências dos dispositivos no mapa de localização', 'help' => 'Exibir links entre dispositivos no mapa de localização com base nas dependências dos pais', ], - 'smokeping.integration' => [ - 'description' => 'Habilitar', - 'help' => 'Habilitar integração com Smokeping', - ], - 'smokeping.dir' => [ - 'description' => 'Caminho para rrds', - 'help' => 'Caminho completo para os RRDs do Smokeping', - ], - 'smokeping.pings' => [ - 'description' => 'Pings', - 'help' => 'Número de pings configurados no Smokeping', - ], - 'smokeping.url' => [ - 'description' => 'URL para smokeping', - 'help' => 'URL completa para a GUI do smokeping', + 'smokeping' => [ + 'integration' => [ + 'description' => 'Habilitar', + 'help' => 'Habilitar integração com Smokeping', + ], + 'dir' => [ + 'description' => 'Caminho para rrds', + 'help' => 'Caminho completo para os RRDs do Smokeping', + ], + 'pings' => [ + 'description' => 'Pings', + 'help' => 'Número de pings configurados no Smokeping', + ], + 'url' => [ + 'description' => 'URL para smokeping', + 'help' => 'URL completa para a GUI do smokeping', + ], ], ], 'twofactor' => [ diff --git a/lang/ru/settings.php b/lang/ru/settings.php index 6b54d824c41..034f35eb96d 100644 --- a/lang/ru/settings.php +++ b/lang/ru/settings.php @@ -889,6 +889,10 @@ 'help' => 'Отключает создание сбоев и снижение доступности для устройств, находящихся в режиме обслуживания.', ], ], + 'graph_stat_percentile_disable' => [ + 'description' => 'Отключить процентиль для статистических графиков глобально', + 'help' => 'Отключает отображение значений и линий процентиля для графиков, которые их отображают', + ], 'graphs' => [ 'port_speed_zoom' => [ 'description' => 'Увеличить графики портов до скорости порта', @@ -1431,7 +1435,7 @@ 'description' => 'URL', 'help' => 'URL Prometheus Push Gateway для отправки данных', ], - 'Job' => [ + 'job' => [ 'description' => 'Работа', 'help' => 'Метка работы для экспортируемых метрик', ], @@ -1477,10 +1481,6 @@ ], ], 'reporting' => [ - 'error' => [ - 'description' => 'Отправить отчеты об ошибках', - 'help' => 'Отправляет некоторые ошибки в LibreNMS для анализа и исправления', - ], 'usage' => [ 'description' => 'Отправить отчеты об использовании', 'help' => 'Отправляет отчеты о использовании и версиях в LibreNMS. Чтобы удалить анонимную статистику, посетите страницу "О программе". Вы можете просмотреть статистику на https://stats.librenms.org', @@ -1489,10 +1489,6 @@ 'description' => 'Сбросить отладочные ошибки (может сломать вашу установку)', 'help' => 'Сбрасывает ошибки, которые обычно скрыты, чтобы вы как разработчик могли найти и исправить возможные проблемы.', ], - 'throttle' => [ - 'description' => 'Ограничить отчеты об ошибках', - 'help' => 'Отчеты будут отправляться только каждые указанные секунды. Без этого, если у вас есть ошибка в общем коде, отчеты могут стать неуправляемыми. Установите 0, чтобы отключить ограничение.', - ], ], 'route_purge' => [ 'description' => 'Записи маршрутов старше', @@ -1851,10 +1847,6 @@ 'description' => 'Установить минимальную высоту графика', 'help' => 'Минимальная высота графика (по умолчанию: 300)', ], - 'graph_stat_percentile_disable' => [ - 'description' => 'Отключить процентиль для статистических графиков глобально', - 'help' => 'Отключает отображение значений и линий процентиля для графиков, которые их отображают', - ], ], 'device_display_default' => [ 'description' => 'Шаблон имени устройства по умолчанию', @@ -1878,21 +1870,23 @@ 'description' => 'Показать зависимости устройств на карте местоположения', 'help' => 'Показать связи между устройствами на карте местоположения на основе родительских зависимостей', ], - 'smokeping.integration' => [ - 'description' => 'Включить', - 'help' => 'Включить интеграцию smokeping', - ], - 'smokeping.dir' => [ - 'description' => 'Путь к rrds', - 'help' => 'Полный путь к RRD Smokeping', - ], - 'smokeping.pings' => [ - 'description' => 'Пинги', - 'help' => 'Количество пингов, настроенных в Smokeping', - ], - 'smokeping.url' => [ - 'description' => 'URL для smokeping', - 'help' => 'Полный URL для графического интерфейса smokeping', + 'smokeping' => [ + 'integration' => [ + 'description' => 'Включить', + 'help' => 'Включить интеграцию smokeping', + ], + 'dir' => [ + 'description' => 'Путь к rrds', + 'help' => 'Полный путь к RRD Smokeping', + ], + 'pings' => [ + 'description' => 'Пинги', + 'help' => 'Количество пингов, настроенных в Smokeping', + ], + 'url' => [ + 'description' => 'URL для smokeping', + 'help' => 'Полный URL для графического интерфейса smokeping', + ], ], ], 'twofactor' => [ diff --git a/lang/sv/config_backups.php b/lang/sv/config_backups.php index 294a54e0d42..93dc02ef39a 100644 --- a/lang/sv/config_backups.php +++ b/lang/sv/config_backups.php @@ -4,6 +4,7 @@ 'title' => 'Konfig', 'backups' => 'Säkerhetskopieringar', 'configuration' => 'Konfiguration', + 'author' => 'Författare', 'diff' => 'Diff', 'show_diff' => 'Visa Diff', 'show_config' => 'Visa Config', diff --git a/lang/sv/settings.php b/lang/sv/settings.php index 3ac0522ae35..3ed6cbf5641 100644 --- a/lang/sv/settings.php +++ b/lang/sv/settings.php @@ -1121,10 +1121,6 @@ 'description' => 'Aktivera Libvirt', 'help' => 'Aktiverar sidan libvirt, som visar enheters virtuella maskiner.', ], - 'enable_proxmox' => [ - 'description' => 'Aktivera Proxmox', - 'help' => 'Aktiverar Proxmox-sidan, som visar enheters virtuella maskiner.', - ], 'enable_pseudowires' => [ 'description' => 'Aktivera Pseudowires', 'help' => 'Aktiverar sidan pseudotrådar, som visar enheters pseudotrådar.', @@ -1150,13 +1146,15 @@ 'help' => 'Antal enheter att visa i nedrutan på framsidan', ], 'front_page_settings' => [ - 'top_devices' => [ - 'description' => 'Toppenheter', - 'help' => 'Antal toppenheter att visa på förstasidan', - ], - 'top_ports' => [ - 'description' => 'Bästa hamnar', - 'help' => 'Antal toppportar att visa på framsidan', + 'top' => [ + 'devices' => [ + 'description' => 'Toppenheter', + 'help' => 'Antal toppenheter att visa på förstasidan', + ], + 'ports' => [ + 'description' => 'Bästa hamnar', + 'help' => 'Antal toppportar att visa på framsidan', + ], ], ], 'fping' => [ @@ -1240,6 +1238,10 @@ 'help' => 'Inaktiverar skapandet av avbrott och minskad tillgänglighet för enheter som är i underhållsläge.', ], ], + 'graph_stat_percentile_disable' => [ + 'description' => 'Inaktivera Percentil för statistikgrafer globalt', + 'help' => 'Inaktiverar visning av percentilvärden och linjer för grafer som visar dessa', + ], 'graphs' => [ 'row' => [ 'normal' => [ @@ -1619,9 +1621,11 @@ 'ipmitool' => [ 'description' => 'Sökväg till ipmtool', ], - 'ipmi.type' => [ - 'description' => 'IPMI typ', - 'help' => 'Typ av IPMI att använda, kan vara "lan", "lanplus", "öppen", "sol", "rå" eller "skal".', + 'ipmi' => [ + 'type' => [ + 'description' => 'IPMI typ', + 'help' => 'Typ av IPMI att använda, kan vara "lan", "lanplus", "öppen", "sol", "rå" eller "skal".', + ], ], 'ipmi_unit' => [ 'description' => 'IPMI-enhet', @@ -2007,9 +2011,11 @@ 'description' => 'Portsäkerhet', ], ], - 'polling.selected_ports' => [ - 'description' => 'Vald portavsökning', - 'help' => 'Aktivera vald portpolling för att endast pollingportar som är uppe och aktiverade', + 'polling' => [ + 'selected_ports' => [ + 'description' => 'Vald portavsökning', + 'help' => 'Aktivera vald portpolling för att endast pollingportar som är uppe och aktiverade', + ], ], 'ports_fdb_purge' => [ 'description' => 'Port FDB-poster äldre än', @@ -2031,9 +2037,11 @@ 'description' => 'Rensa portar raderade', 'help' => 'Städning utförd av daily.sh', ], - 'processor.default_perc_warn' => [ - 'description' => 'Varning för standardprocessorprocent', - 'help' => 'Standard Procentandel av processor som används innan en varning visas.', + 'processor' => [ + 'default_perc_warn' => [ + 'description' => 'Varning för standardprocessorprocent', + 'help' => 'Standard Procentandel av processor som används innan en varning visas.', + ], ], 'prometheus' => [ 'enable' => [ @@ -2044,7 +2052,7 @@ 'description' => 'URL', 'help' => 'URL-adressen till Prometheus Push Gateway som data ska skickas till', ], - 'Job' => [ + 'job' => [ 'description' => 'Jobb', 'help' => 'Jobbetikett för exporterade mätvärden', ], @@ -2146,10 +2154,6 @@ 'description' => 'Dumpa felsökningsfel (kommer att bryta din installation)', 'help' => 'Dumpa bort fel som normalt är dolda så att du som utvecklare kan hitta och åtgärda eventuella problem.', ], - 'throttle' => [ - 'description' => 'Gasspjällsfelrapporter', - 'help' => 'Rapporter kommer endast att skickas varje angivet antal sekunder. Utan detta kan om du har ett fel i vanlig kodrapportering gå över styr. Ställ in på 0 för att inaktivera gasreglaget.', - ], ], 'rewrite_if' => [ 'description' => 'Skriv om ifDescr', @@ -2672,10 +2676,6 @@ 'description' => 'Ställ in den lägsta grafhöjden', 'help' => 'Minsta grafhöjd (standard: 300)', ], - 'graph_stat_percentile_disable' => [ - 'description' => 'Inaktivera Percentil för statistikgrafer globalt', - 'help' => 'Inaktiverar visning av percentilvärden och linjer för grafer som visar dessa', - ], ], 'device_display_default' => [ 'description' => 'Standardmall för enhetsvisningsnamn', @@ -2703,21 +2703,23 @@ 'description' => 'Medelvärdesfaktor', 'help' => 'Vi beräknar ett glidande medelvärde med hjälp av en exponentiellt vägd glidande medelvärdefunktion. Detta är den faktor som används av funktionen för att styra hur mycket det aktuella värdet påverkar medelvärdet. Värden närmare 1 kommer att göra den genomsnittliga förändringen snabbare.', ], - 'smokeping.integration' => [ - 'description' => 'Aktivera', - 'help' => 'Aktivera integrering av rökning', - ], - 'smokeping.dir' => [ - 'description' => 'Vägen till rrds', - 'help' => 'Hela vägen till Smoking RRDs', - ], - 'smokeping.pings' => [ - 'description' => 'Pingar', - 'help' => 'Antal pingar konfigurerade i Smokeping', - ], - 'smokeping.url' => [ - 'description' => 'URL till rökning', - 'help' => 'Fullständig URL till rökningsguiden', + 'smokeping' => [ + 'integration' => [ + 'description' => 'Aktivera', + 'help' => 'Aktivera integrering av rökning', + ], + 'dir' => [ + 'description' => 'Vägen till rrds', + 'help' => 'Hela vägen till Smoking RRDs', + ], + 'pings' => [ + 'description' => 'Pingar', + 'help' => 'Antal pingar konfigurerade i Smokeping', + ], + 'url' => [ + 'description' => 'URL till rökning', + 'help' => 'Fullständig URL till rökningsguiden', + ], ], ], 'twofactor' => [ diff --git a/lang/uk/settings.php b/lang/uk/settings.php index 5814f397502..08b2e3d2278 100644 --- a/lang/uk/settings.php +++ b/lang/uk/settings.php @@ -1174,7 +1174,7 @@ 'description' => 'URL', 'help' => 'URL Prometheus Push Gateway до якого надсилати дані', ], - 'Job' => [ + 'job' => [ 'description' => 'Job', 'help' => 'Мітка Job для експортованих метрик', ], @@ -1512,21 +1512,23 @@ 'description' => 'Відкрита мапа місцезнаходження', 'help' => 'Мапа місцезнаходження показана за замовчуванням', ], - 'smokeping.integration' => [ - 'description' => 'Увімкнути', - 'help' => 'Увімкнути інтеграцію зі smokeping', - ], - 'smokeping.dir' => [ - 'description' => 'Шлях до файлів RRD', - 'help' => 'Повний шлях до файлів Smokeping RRD', - ], - 'smokeping.pings' => [ - 'description' => 'Кількість ping', - 'help' => 'Кількість запитів ping налаштована у Smokeping', - ], - 'smokeping.url' => [ - 'description' => 'URL до smokeping', - 'help' => 'Повний URL до GUI smokeping', + 'smokeping' => [ + 'integration' => [ + 'description' => 'Увімкнути', + 'help' => 'Увімкнути інтеграцію зі smokeping', + ], + 'dir' => [ + 'description' => 'Шлях до файлів RRD', + 'help' => 'Повний шлях до файлів Smokeping RRD', + ], + 'pings' => [ + 'description' => 'Кількість ping', + 'help' => 'Кількість запитів ping налаштована у Smokeping', + ], + 'url' => [ + 'description' => 'URL до smokeping', + 'help' => 'Повний URL до GUI smokeping', + ], ], ], 'twofactor' => [ diff --git a/lang/zh-TW.json b/lang/zh-TW.json index 5eb7942f46f..fd203bcef30 100644 --- a/lang/zh-TW.json +++ b/lang/zh-TW.json @@ -219,7 +219,6 @@ "Enabled": "啟用", "End": "結束", "Error Rate": "錯誤率", - "Error reporting:": "錯誤回報:", "ERROR: Could not update": "錯誤: 無法更新", "ERROR: You have no write-access to this dashboard": "錯誤: 您沒有此資訊看板的寫入權限", "ERROR: You need to be admin": "錯誤: 您需要管理員權限", @@ -733,7 +732,6 @@ "Misc": "其他", "Components": "元件", "Custom OID": "自訂 OID", - "Event Log": "事件記錄", "About": "關於", "Merch Shop": "周邊商店", "See the list of contributors on GitHub.": "在 GitHub 上檢視貢獻者清單。", @@ -830,7 +828,6 @@ "VLAN Number": "VLAN 編號", "VLAN Name": "VLAN 名稱", "VM Name": "VM 名稱", - "Please include this Error-ID when reporting problems:": "回報問題時請附上此 Error-ID:", "SSL Certificates": "SSL 憑證", "No Devices": "沒有裝置", "Custom Map Groups": "自訂地圖群組", diff --git a/lang/zh-TW/settings.php b/lang/zh-TW/settings.php index 334fd98bb43..392e619539c 100644 --- a/lang/zh-TW/settings.php +++ b/lang/zh-TW/settings.php @@ -1110,10 +1110,6 @@ 'description' => '啟用 Libvirt', 'help' => '啟用 libvirt 頁面,顯示裝置的虛擬機器。', ], - 'enable_proxmox' => [ - 'description' => '啟用 Proxmox', - 'help' => '啟用 Proxmox 頁面,顯示裝置的虛擬機器。', - ], 'enable_pseudowires' => [ 'description' => '啟用 Pseudowires', 'help' => '啟用 pseudowires 頁面,顯示裝置的 pseudowires。', @@ -1139,13 +1135,15 @@ 'help' => '首頁離線方塊中要顯示的裝置數量', ], 'front_page_settings' => [ - 'top_devices' => [ - 'description' => '前段裝置', - 'help' => '首頁要顯示的前段裝置數量', - ], - 'top_ports' => [ - 'description' => '前段連接埠', - 'help' => '首頁要顯示的前段連接埠數量', + 'top' => [ + 'devices' => [ + 'description' => '前段裝置', + 'help' => '首頁要顯示的前段裝置數量', + ], + 'ports' => [ + 'description' => '前段連接埠', + 'help' => '首頁要顯示的前段連接埠數量', + ], ], ], 'fping' => [ @@ -1230,6 +1228,10 @@ 'help' => '停用為處於維護模式的裝置建立中斷記錄及降低可用性。', ], ], + 'graph_stat_percentile_disable' => [ + 'description' => '全域停用統計圖表的百分位', + 'help' => '停用顯示百分位值與線條(適用於會顯示這些內容的圖表)', + ], 'graphs' => [ 'row' => [ 'normal' => [ @@ -1609,9 +1611,11 @@ 'ipmitool' => [ 'description' => 'ipmtool 路徑', ], - 'ipmi.type' => [ - 'description' => 'IPMI 類型', - 'help' => '要使用的 IPMI 類型,可為 `lan`、`lanplus`、`open`、`sol`、`raw` 或 `shell`', + 'ipmi' => [ + 'type' => [ + 'description' => 'IPMI 類型', + 'help' => '要使用的 IPMI 類型,可為 `lan`、`lanplus`、`open`、`sol`、`raw` 或 `shell`', + ], ], 'ipmi_unit' => [ 'description' => 'IPMI 單位', @@ -1997,9 +2001,11 @@ 'description' => '連接埠安全性', ], ], - 'polling.selected_ports' => [ - 'description' => '選取的連接埠輪詢', - 'help' => '啟用選取的連接埠輪詢,僅輪詢已上線且已啟用的連接埠', + 'polling' => [ + 'selected_ports' => [ + 'description' => '選取的連接埠輪詢', + 'help' => '啟用選取的連接埠輪詢,僅輪詢已上線且已啟用的連接埠', + ], ], 'ports_fdb_purge' => [ 'description' => '連接埠 FDB 項目大於', @@ -2021,9 +2027,11 @@ 'description' => '清除已刪除的連接埠', 'help' => '由 daily.sh 執行清除', ], - 'processor.default_perc_warn' => [ - 'description' => '處理器預設百分比警告', - 'help' => '觸發警告前處理器使用率的預設百分比。', + 'processor' => [ + 'default_perc_warn' => [ + 'description' => '處理器預設百分比警告', + 'help' => '觸發警告前處理器使用率的預設百分比。', + ], ], 'prometheus' => [ 'enable' => [ @@ -2034,7 +2042,7 @@ 'description' => '網址', 'help' => '要傳送資料至 Prometheus Push Gateway 的主機網址。', ], - 'Job' => [ + 'job' => [ 'description' => 'Job', 'help' => '匯出指標的 Job 標籤', ], @@ -2124,10 +2132,6 @@ 'help' => '比較 RANCID 組態時忽略註解,用於在裝置頁面顯示組態差異', ], 'reporting' => [ - 'error' => [ - 'description' => '發送錯誤報告', - 'help' => '將部分錯誤發送給 LibreNMS 以供分析與修正', - ], 'usage' => [ 'description' => '發送使用情況報告', 'help' => '向 LibreNMS 回報使用情況與版本。若要刪除匿名統計,請造訪 about 頁面。您可於 https://stats.librenms.org 檢視統計', @@ -2136,10 +2140,6 @@ 'description' => '傾印除錯錯誤(將破壞您的安裝)', 'help' => '傾印通常隱藏的錯誤,讓您身為開發人員能找出並修正可能的問題。', ], - 'throttle' => [ - 'description' => '限制錯誤報告頻率', - 'help' => '報告僅會每隔指定秒數發送一次。若無此項,當常用程式碼出現錯誤時,回報可能會失控。設為 0 以停用節流。', - ], ], 'rewrite_if' => [ 'description' => '重寫 ifDescr', @@ -2662,10 +2662,6 @@ 'description' => '設定圖表最小高度', 'help' => '圖表最小高度 (預設: 300)', ], - 'graph_stat_percentile_disable' => [ - 'description' => '全域停用統計圖表的百分位', - 'help' => '停用顯示百分位值與線條(適用於會顯示這些內容的圖表)', - ], ], 'device_display_default' => [ 'description' => '預設裝置顯示名稱範本', @@ -2693,21 +2689,23 @@ 'description' => '平均因子', 'help' => '我們使用指數加權移動平均函式計算移動平均。此為該函式所用的因子,用以控制目前值對平均的影響程度。值越接近 1,平均變化越快。', ], - 'smokeping.integration' => [ - 'description' => '啟用', - 'help' => '啟用 Smokeping 整合', - ], - 'smokeping.dir' => [ - 'description' => 'RRD 存放路徑', - 'help' => 'Smokeping RRD 的完整路徑', - ], - 'smokeping.pings' => [ - 'description' => 'Ping 數量', - 'help' => 'Smokeping 中設定的 ping 次數', - ], - 'smokeping.url' => [ - 'description' => 'Smokeping URL 位址', - 'help' => 'Smokeping GUI 的完整 URL', + 'smokeping' => [ + 'integration' => [ + 'description' => '啟用', + 'help' => '啟用 Smokeping 整合', + ], + 'dir' => [ + 'description' => 'RRD 存放路徑', + 'help' => 'Smokeping RRD 的完整路徑', + ], + 'pings' => [ + 'description' => 'Ping 數量', + 'help' => 'Smokeping 中設定的 ping 次數', + ], + 'url' => [ + 'description' => 'Smokeping URL 位址', + 'help' => 'Smokeping GUI 的完整 URL', + ], ], ], 'twofactor' => [ diff --git a/mibs/arris/DOCS-BPI2-MIB b/mibs/DOCS-BPI2-MIB similarity index 100% rename from mibs/arris/DOCS-BPI2-MIB rename to mibs/DOCS-BPI2-MIB diff --git a/mibs/DOCS-CABLE-DEVICE-MIB b/mibs/DOCS-CABLE-DEVICE-MIB index 0862b4d276f..71e819421c6 100644 --- a/mibs/DOCS-CABLE-DEVICE-MIB +++ b/mibs/DOCS-CABLE-DEVICE-MIB @@ -3,59 +3,206 @@ DOCS-CABLE-DEVICE-MIB DEFINITIONS ::= BEGIN IMPORTS MODULE-IDENTITY, OBJECT-TYPE, --- do not import BITS, IpAddress, Unsigned32, Counter32, Integer32, zeroDotZero, mib-2 - FROM SNMPv2-SMI + FROM SNMPv2-SMI -- RFC 2578 RowStatus, RowPointer, DateAndTime, - TruthValue - FROM SNMPv2-TC + TruthValue, + StorageType + FROM SNMPv2-TC -- RFC 2579 + InetAddressType, + InetAddress + FROM INET-ADDRESS-MIB -- RFC 4001 OBJECT-GROUP, MODULE-COMPLIANCE - FROM SNMPv2-CONF + FROM SNMPv2-CONF -- RFC 2580 SnmpAdminString - FROM SNMP-FRAMEWORK-MIB + FROM SNMP-FRAMEWORK-MIB -- RFC 3411 InterfaceIndexOrZero - FROM IF-MIB; -- RFC2233 + FROM IF-MIB -- RFC 2863 + ZeroBasedCounter32 + FROM RMON2-MIB -- RFC 4502 + diffServMIBDataPathGroup, + diffServMIBClfrGroup, + diffServMIBClfrElementGroup, + diffServMIBMultiFieldClfrGroup, + diffServMIBActionGroup, + diffServMIBDscpMarkActGroup, + diffServMIBCounterGroup, + diffServMIBAlgDropGroup, + + diffServDataPathStatus, + diffServClfrStatus, + diffServClfrElementStatus, + diffServMultiFieldClfrAddrType, + diffServMultiFieldClfrSrcAddr, + diffServMultiFieldClfrDstAddr, + diffServAlgDropStatus, + diffServDataPathStorage, + diffServClfrStorage, + diffServClfrElementStorage, + diffServMultiFieldClfrStorage, + diffServActionStorage, + diffServCountActStorage, + diffServAlgDropStorage, + diffServAlgDropType + FROM DIFFSERV-MIB; -- RFC 3289 docsDev MODULE-IDENTITY - LAST-UPDATED "9908190000Z" -- August 19, 1999 - ORGANIZATION "IETF IPCDN Working Group" + LAST-UPDATED "200612200000Z" -- December 20, 2006 + ORGANIZATION "IETF IP over Cable Data Network + Working Group" CONTACT-INFO - " Michael StJohns - Postal: @Home Network - 425 Broadway - Redwood City, CA 94063 - U.S.A. - Phone: +1 650 569 5368 - E-mail: stjohns@corp.home.net" + " Rich Woundy + Postal: Comcast Cable + 27 Industrial Avenue + Chelmsford, MA 01824 U.S.A. + Phone: +1 978 244 4010 + E-mail: richard_woundy@cable.comcast.com + + Kevin Marez + Postal: Motorola Corporation + 6450 Sequence Drive + San Diego, CA 92121 U.S.A. + Phone: +1 858 404 3785 + E-mail: kevin.marez@motorola.com + + IETF IPCDN Working Group + General Discussion: ipcdn@ietf.org + Subscribe: http://www.ietf.org/mailman/listinfo/ipcdn + Archive: ftp://ftp.ietf.org/ietf-mail-archive/ipcdn + Co-chairs: Richard Woundy, + richard_woundy@cable.comcast.com + Jean-Francois Mule, + jf.mule@cablelabs.com" + + DESCRIPTION + "This is the MIB Module for DOCSIS-compliant cable modems + + and cable-modem termination systems. + + Copyright (C) The IETF Trust (2006). This version + of this MIB module was published in RFC 4639; for full + legal notices see the RFC itself." + + REVISION "200612200000Z" -- December 20, 2006 + DESCRIPTION + "Second version, published as RFC 4639. + + Modifications to this MIB module since RFC 2669 include: + - Deprecation of the docsDevFilter group in favor of the + DiffServ MIB groups, to enable support for IPv6 + filtering and DiffServ Code Point (DSCP) marking. + - Deprecation of the docsDevCpeGroup in favor of the + docsDevCpeInetGroup, to enable support of IPv6. + - Addition of various InetAddress objects to enable + support of IPv6. + - Deprecation of docsDevNmAccessTable in favor of SNMP + Coexistence and SNMPv3 -- yet adding + docsDevNmAccessTrapVersion and clarifying + docsDevNmAccessIp for current use of this table, + - Addition of docsDevIgmpModeControl for management and + control of the IGMP mode of operation, + - Addition of docsDevMaxCpe for management of the + maxmium number of CPEs permitted access through a + cable modem, + - Addition of docsDevSwServerTransportProtocol, and + modifications to docsDevSoftware object DESCRIPTIONS, + to enable software downloads via either TFTP or HTTP, + - Replacement of docsDevEvThrottleInhibited with + docsDevEvThrottleThresholdExceeded to simplify + event threshold management, + - Modification of docsDevEvReporting to enable local + logging to the internal volatile log, and not to the + internal non-volatile log, + - Modification of the compliance statement to make the + docsDevCpe objects optional + - Created placeholders for two OIDs in the + docsDevFilterPolicyTable that were never used + - Modified the DESCRIPTION of + docsDevSwServerTransportProtocol and + docsDevSwServerAddressType to address the + dependence between each object + - Added a reference to docsDevServerConfigTftpAddress + - Clarified the scope of notifications that are covered + by docsDevEvThrottleThreshold + - Clarified an error condition that could occur when + + doing a SET to docsDevEvReporting + - Defined each of the enumerated types for both + docsDevEvLevel and docsDevEvPriority + - Added UNITS clause to docsDevFilterLLCMatches, + docsDevFilterIpMatches, docsDevMaxCpe, + docsDevEvThrottleThreshold and docsDevEvCounts. + - Added REFERENCE clause to docsDevFilterIpProtocol + - Modified DESCRIPTION of docsDevCpeInetAddr to be + more protocol-neutral + - Removed the enumerated value (1) from both + docsDevCpeInetSource and docsDevCpeSource + - Covered additional read-write and read-create objects + in the Security Considerations section + - Modified the default value of docsDevNmAccessIpMask + to be consistent with OSSI specification + - Modified the SYNTAX of docsDevNmAccessCommunity and + docsDevNmAccessInterfaces in the Conformance + Statement section + - Added SYNTAX clause to docsDevEvReporting in the + Conformance Statement section + - Modified SYNTAX clause of docsDevEvReporting to + move new enumerated type to byte boundary + - Added references to DOCSIS 2.0 specifications to + multiple objects + - Clarified non-persistency across reboots for + all tables + - Clarified functionality of docsDevSw objects as + they relate to docsDevSwOperStatus + - Clarified enumerated types (9) and (10) for + docsDevServerBootState + - Defined the state of unknown(0) for the following + objects: docsDevServerDhcpAddressType, + docsDevServerTimeAddressType, + docsDevServerConfigTftpAddressType and + docsDevServerConfigTftpAddressType + - Modified the value in docsDevFilterIpDaddr to be + consistent with the SYNTAX + - Specified which rows could be modified in an + active row for docsDevFilterPolicyStatus + - Defined the term 'manually' in docsDevCpeEnroll + - Clarified the description for + docsDevFilterTosOrMask + - Covered the case of a non-existent row for + docsDevFilterPolicyPtr + - Added DEFVAL clauses for multiple objects + - Replaced docsDevNotification OBJECT IDENTIFIER + with docsDevNotifications to address possible + compatibility issues + + - Added support for the usage of RFC 3413 and RFC 3014 + as event notification mechanisms + - Removed docsDevFilterPolicyObsoleteGroup + - Added stdInterface(9) type to docsDevEvReporting to + support the usage of RFC3413 and RFC3014 + - Modified DESCRIPTION for docsDevMaxCpe" + + REVISION "199908190000Z" + DESCRIPTION + "Initial version, published as RFC 2669." - - - - - DESCRIPTION - "This is the MIB Module for MCNS-compliant cable modems and - cable-modem termination systems." - REVISION "9908190000Z" - DESCRIPTION - "Initial Version, published as RFC 2669. - Modified by Mike StJohns to add/revise filtering, TOS - support, software version information objects." ::= { mib-2 69 } docsDevMIBObjects OBJECT IDENTIFIER ::= { docsDev 1 } + docsDevBase OBJECT IDENTIFIER ::= { docsDevMIBObjects 1 } -- -- For the following object, there is no concept in the --- RFI specification corresponding to a backup CMTS. The +-- RFI specification corresponding to a backup CMTS. The -- enumeration is provided here in case someone is able -- to define such a role or device. -- @@ -69,18 +216,18 @@ docsDevRole OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "Defines the current role of this device. cm (1) is - a Cable Modem, cmtsActive(2) is a Cable Modem Termination - System which is controlling the system of cable modems, - and cmtsBackup(3) is a CMTS which is currently connected, - but not controlling the system (not currently used). + "Defines the current role of this device. cm(1) is a + Cable Modem, cmtsActive(2) is a Cable Modem Termination + System that is controlling the system of cable modems, + and cmtsBackup(3) is a CMTS that is currently connected + but is not controlling the system (not currently used). In general, if this device is a 'cm', its role will not change during operation or between reboots. If the device is a 'cmts' it may change between cmtsActive and cmtsBackup and back again during normal operation. NB: At this time, the DOCSIS standards do not support the - concept of a backup CMTS, cmtsBackup is included for + concept of a backup CMTS, but cmtsBackup is included for completeness." ::= { docsDevBase 1 } @@ -88,14 +235,17 @@ docsDevDateTime OBJECT-TYPE SYNTAX DateAndTime MAX-ACCESS read-write STATUS current - - - - - DESCRIPTION - "The date and time, with optional timezone - information." + "The current date and time, with time zone information + (if known). + + If the real data and time cannot be determined, this + shall represent elapsed time from boot relative to + the standard epoch '1970-1-1,0:0:0.0'. In other + words, if this agent has been up for 3 minutes and + not been able to determine what the actual date and + time are, this object will return the value + '1970-1-1,0:03:0.0'." ::= { docsDevBase 2 } docsDevResetNow OBJECT-TYPE @@ -103,8 +253,8 @@ docsDevResetNow OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "Setting this object to true(1) causes the device to reset. - Reading this object always returns false(2)." + "Setting this object to true(1) causes the device to + reset. Reading this object always returns false(2)." ::= { docsDevBase 3 } docsDevSerialNumber OBJECT-TYPE @@ -126,56 +276,110 @@ docsDevSTPControl OBJECT-TYPE DESCRIPTION "This object controls operation of the spanning tree protocol (as distinguished from transparent bridging). - If set to stEnabled(1) then the spanning tree protocol - is enabled, subject to bridging constraints. If - noStFilterBpdu(2), then spanning tree is not active, + + If set to stEnabled(1), then the spanning tree protocol + is enabled, subject to bridging constraints. + + If noStFilterBpdu(2), then spanning tree is not active, and Bridge PDUs received are discarded. - If noStPassBpdu(3) then spanning tree is not active - and Bridge PDUs are transparently forwarded. Note that - a device need not implement all of these options, - but that noStFilterBpdu(2) is required." + + If noStPassBpdu(3), then spanning tree is not active, + and Bridge PDUs are transparently forwarded. + + Note that a device need not implement all of these + options, but that noStFilterBpdu(2) is required." + DEFVAL { noStFilterBpdu } ::= { docsDevBase 5 } +docsDevIgmpModeControl OBJECT-TYPE + SYNTAX INTEGER { + passive(1), + active(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This object controls the IGMP mode of operation for + the CM or CMTS. In passive mode, the device forwards + IGMP between interfaces as based on knowledge of + Multicast Session activity on the subscriber side + interface and the rules defined in the DOCSIS RFI + specification. In active mode, the device terminates + at and initiates IGMP through its interfaces as based + on the knowledge of Multicast Session activity on the + subscriber side interface." + REFERENCE + "DOCSIS RFI 1.1 Specification, Section 3.3.1. and + DOCSIS RFI 2.0 Specification, Section 5.3.1." + DEFVAL { passive } + ::= { docsDevBase 6 } + +docsDevMaxCpe OBJECT-TYPE + SYNTAX Unsigned32 (0..255) + UNITS "CPEs" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The maximum number of CPEs that can be granted access + through a CM during a CM epoch. This value can be + obtained from the CM configuration file; however, + it may be adjusted by the CM according to hardware or + software limitations that have been imposed on the + implementation." + REFERENCE + "DOCSIS RFI 1.0 Specification, Appendix C.7.20., and + + DOCSIS RFI 1.1 Specification, Appendix C.1.1.7. and + DOCSIS RFI 2.0 Specification, Appendix C.1.1.7." + ::= { docsDevBase 7 } + -- -- The following table provides one level of security for access -- to the device by network management stations. -- Note that access is also constrained by the -- community strings and any vendor-specific security. - - - - - -- docsDevNmAccessTable OBJECT-TYPE SYNTAX SEQUENCE OF DocsDevNmAccessEntry MAX-ACCESS not-accessible - STATUS current + STATUS deprecated DESCRIPTION "This table controls access to SNMP objects by network - management stations. If the table is empty, access - to SNMP objects is unrestricted. This table exists only - on SNMPv1 or v2c agents and does not exist on SNMPv3 - agents. See the conformance section for details. - Specifically, for v3 agents, the appropriate MIBs and - security models apply in lieu of this table." + management stations. If the table is empty, access to + SNMP objects is unrestricted. The objects in this table + MUST NOT persist across reboots. The objects in this + table are only accessible from cable devices that are + not capable of operating in SNMP Coexistence mode + (RFC 3584) or in SNMPv3 mode (RFC 3410). + See the conformance section for + details. Note that some devices are required by other + specifications (e.g., the DOCSIS OSSIv1.1 specification) + to support the legacy SNMPv1/v2c docsDevNmAccess mode + for backward compatibility. + + This table is deprecated. Instead, use the SNMP + coexistence MIBs from RFC 3584, the TARGET and + NOTIFICATION MIBs from RFC 3413, and + the View-Based Access Control Model (VACM) MIBs for + all SNMP protocol versions from RFC 3415." ::= { docsDevMIBObjects 2 } docsDevNmAccessEntry OBJECT-TYPE SYNTAX DocsDevNmAccessEntry MAX-ACCESS not-accessible - STATUS current + STATUS deprecated DESCRIPTION - "An entry describing access to SNMP objects by a - particular network management station. An entry in + "An entry describing access to SNMP objects by a + particular network management station. An entry in this table is not readable unless the management station has read-write permission (either implicit if the table - is empty, or explicit through an entry in this table. + is empty, or explicit through an entry in this table). Entries are ordered by docsDevNmAccessIndex. The first - matching entry (e.g. matching IP address and community + + matching entry (e.g., matching IP address and community string) is used to derive access." - INDEX { docsDevNmAccessIndex } + INDEX { docsDevNmAccessIndex } ::= { docsDevNmAccessTable 1 } DocsDevNmAccessEntry ::= SEQUENCE { @@ -185,55 +389,55 @@ DocsDevNmAccessEntry ::= SEQUENCE { docsDevNmAccessCommunity OCTET STRING, docsDevNmAccessControl INTEGER, docsDevNmAccessInterfaces OCTET STRING, - docsDevNmAccessStatus RowStatus + docsDevNmAccessStatus RowStatus, + docsDevNmAccessTrapVersion INTEGER } docsDevNmAccessIndex OBJECT-TYPE SYNTAX Integer32 (1..2147483647) MAX-ACCESS not-accessible - STATUS current + STATUS deprecated DESCRIPTION "Index used to order the application of access - - - - - entries." ::= { docsDevNmAccessEntry 1 } docsDevNmAccessIp OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION "The IP address (or subnet) of the network management - station. The address 255.255.255.255 is defined to mean - any NMS. If traps are enabled for this entry, then the - value must be the address of a specific device." - DEFVAL { 'ffffffff'h } + station. The address 0.0.0.0 is defined to mean + any Network Management Station (NMS). If traps are + enabled for this entry, then the value must be the + address of a specific device. Implementations MAY + recognize 255.255.255.255 as equivalent to 0.0.0.0." + DEFVAL { '00000000'h } ::= { docsDevNmAccessEntry 2 } docsDevNmAccessIpMask OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION "The IP subnet mask of the network management stations. If traps are enabled for this entry, then the value must - be 255.255.255.255." - DEFVAL { 'ffffffff'h } + be 0.0.0.0. Implementations MAY recognize + 255.255.255.255 as equivalent to 0.0.0.0." + + DEFVAL { '00000000'h } ::= { docsDevNmAccessEntry 3 } docsDevNmAccessCommunity OBJECT-TYPE SYNTAX OCTET STRING MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION "The community string to be matched for access by this - entry. If set to a zero length string then any community - string will match. When read, this object SHOULD return - a zero length string." + entry. If set to a zero-length string, then any + community string will match. When read, this object + SHOULD return a zero-length string." DEFVAL { "public" } ::= { docsDevNmAccessEntry 4 } @@ -247,69 +451,97 @@ docsDevNmAccessControl OBJECT-TYPE trapsOnly(6) } MAX-ACCESS read-create - - - - - - STATUS current + STATUS deprecated DESCRIPTION - "Specifies the type of access allowed to this NMS. Setting - this object to none(1) causes the table entry to be - destroyed. Read(2) allows access by 'get' and 'get-next' - PDUs. ReadWrite(3) allows access by 'set' as well. - RoWithtraps(4), rwWithTraps(5), and trapsOnly(6) + "Specifies the type of access allowed to this NMS. + Setting this object to none(1) causes the table entry + to be destroyed. Read(2) allows access by 'get' and + 'get-next' PDUs. ReadWrite(3) allows access by 'set' as + well. RoWithtraps(4), rwWithTraps(5), and trapsOnly(6) control distribution of Trap PDUs transmitted by this device." DEFVAL { read } ::= { docsDevNmAccessEntry 5 } --- The syntax of the following object was copied from RFC1493, +-- The syntax of the following object was copied from RFC 1493, -- dot1dStaticAllowedToGoTo. docsDevNmAccessInterfaces OBJECT-TYPE - SYNTAX OCTET STRING + SYNTAX OCTET STRING (SIZE (1..32)) MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION "Specifies the set of interfaces from which requests from - this NMS will be accepted. - Each octet within the value of this object specifies a set - of eight interfaces, with the first octet specifying ports - 1 through 8, the second octet specifying interfaces 9 - through 16, etc. Within each octet, the most significant - bit represents the lowest numbered interface, and the least - significant bit represents the highest numbered interface. - Thus, each interface is represented by a single bit within - the value of this object. If that bit has a value of '1' - then that interface is included in the set. + this NMS will be accepted. Each octet within + the value of this object specifies a set of eight + + interfaces, the first octet specifying ports 1 + through 8, the second octet specifying interfaces 9 + through 16, etc. Within each octet, the most + significant bit represents the lowest numbered + interface, and the least significant bit represents the + highest numbered interface. Thus, each interface is + represented by a single bit within the value of this + object. If that bit has a value of '1' then that + interface is included in the set. Note that entries in this table apply only to link-layer - interfaces (e.g., Ethernet and CATV MAC). Upstream and - downstream channel interfaces must not be specified." --- DEFVAL is the bitmask corresponding to all interfaces + interfaces (e.g., Ethernet and CATV MAC). Bits + representing upstream and downstream channel interfaces + MUST NOT be set to '1'. + + Note that if bits corresponding to non-existing + interfaces are set, the result is implementation + specific. + + Note that according to the DOCSIS OSSIv1.1 + specification, when ifIndex '1' is included in the + set, then this row applies to all CPE + (customer-facing) interfaces. + + The size of this object is the minimum required to + represent all configured interfaces for this device." ::= { docsDevNmAccessEntry 6 } docsDevNmAccessStatus OBJECT-TYPE SYNTAX RowStatus MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION "Controls and reflects the status of rows in this - table. Rows in this table may be created by either the - create-and-go or create-and-wait paradigms. There is no - restriction on changing values in a row of this table while - the row is active." - - - + table. Rows in this table may be created by either the + create-and-go or create-and-wait paradigm. There is no + restriction on changing values in a row of this table + while the row is active. + + The following objects MUST have valid values before this + object can be set to active: docsDevNmAccessIp, + docsDevNmAccessStatus, docsDevNmAccessIpMask, + docsDevNmAccessCommunity, docsDevNmAccessControl, and + docsDevNmAccessInterfaces." + ::= { docsDevNmAccessEntry 7 } +docsDevNmAccessTrapVersion OBJECT-TYPE + SYNTAX INTEGER { - ::= { docsDevNmAccessEntry 7 } + disableSNMPv2trap(1), + enableSNMPv2trap(2) + } + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "Specifies the TRAP version that is sent to this NMS. + Setting this object to disableSNMPv2trap (1) causes the + trap in SNMPv1 format to be sent to a particular NMS. + Setting this object to enableSNMPv2trap (2) causes the + trap in SNMPv2 format be sent to a particular NMS." + DEFVAL { disableSNMPv2trap } + ::= { docsDevNmAccessEntry 8 } -- --- Procedures for using the following group are described in section --- 3.2.1 of the DOCSIS Radio Frequence Interface Specification +-- The following group describes control objects used for downloading +-- firmware to a cable device. Procedures for software download are +-- described in Section 3.2.1 of the RFC containing this MIB module. -- docsDevSoftware OBJECT IDENTIFIER ::= { docsDevMIBObjects 3 } @@ -317,10 +549,15 @@ docsDevSoftware OBJECT IDENTIFIER ::= { docsDevMIBObjects 3 } docsDevSwServer OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-write - STATUS current + STATUS deprecated DESCRIPTION - "The address of the TFTP server used for software upgrades. - If the TFTP server is unknown, return 0.0.0.0." + "The address of the TFTP server used for software + upgrades. If the TFTP server is unknown or is a + non-IPv4 address, return 0.0.0.0. + + This object is deprecated. See docsDevSwServerAddress + for its replacement. This object will have its value + modified, given a valid SET to docsDevSwServerAddress." ::= { docsDevSoftware 1 } docsDevSwFilename OBJECT-TYPE @@ -328,11 +565,18 @@ docsDevSwFilename OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "The file name of the software image to be loaded into this - device. Unless set via SNMP, this is the file name - specified by the provisioning server that corresponds to - the software version that is desired for this device. - If unknown, the string '(unknown)' is returned." + "The filename of the software image to be downloaded via + TFTP, or the abs_path (as defined in RFC 2616) of the + software image to be downloaded via HTTP. + + Unless set via SNMP, this is the filename or abs_path + specified by the provisioning server during the boot + process that corresponds to the software version that + + is desired for this device. + + If unknown, the value of this object is the zero-length + string." ::= { docsDevSoftware 2 } docsDevSwAdminStatus OBJECT-TYPE @@ -345,18 +589,13 @@ docsDevSwAdminStatus OBJECT-TYPE STATUS current DESCRIPTION "If set to upgradeFromMgt(1), the device will initiate a - TFTP software image download using docsDevSwFilename. - After successfully receiving an image, the device will - set its state to ignoreProvisioningUpgrade(3) and reboot. - If the download process is interrupted by a reset or - power failure, the device will load the previous image - and, after re-initialization, continue to attempt loading - the image specified in docsDevSwFilename. - - - - - + TFTP or HTTP software image download. After + successfully receiving an image, the device will set + its state to ignoreProvisioningUpgrade(3) and reboot. + If the download process is interrupted (e.g., by a reset + or power failure), the device will load the previous + image and, after re-initialization, continue to attempt + loading the image specified in docsDevSwFilename. If set to allowProvisioningUpgrade(2), the device will use the software version information supplied by the @@ -364,16 +603,14 @@ docsDevSwAdminStatus OBJECT-TYPE cause a reboot). When set to ignoreProvisioningUpgrade(3), the device - will disregard software image upgrade information from the - provisioning server. - - Note that reading this object can return upgradeFromMgt(1). - This indicates that a software download is currently in - progress, and that the device will reboot after - successfully receiving an image. - - At initial startup, this object has the default value of - allowProvisioningUpgrade(2)." + will disregard software image upgrade information + from the provisioning server. + + Note that reading this object can return + upgradeFromMgt(1). This indicates that a software + download is currently in progress, and that the device + will reboot after successfully receiving an image." + DEFVAL { allowProvisioningUpgrade } ::= { docsDevSoftware 3 } docsDevSwOperStatus OBJECT-TYPE @@ -384,49 +621,116 @@ docsDevSwOperStatus OBJECT-TYPE failed(4), other(5) } + MAX-ACCESS read-only STATUS current DESCRIPTION - "InProgress(1) indicates that a TFTP download is underway, - either as a result of a version mismatch at provisioning - or as a result of a upgradeFromMgt request. + "InProgress(1) indicates that a TFTP or HTTP download is + underway, either as a result of a version mismatch at + provisioning or as a result of a upgradeFromMgt request. + No other docsDevSw* objects can be modified in + this state. + CompleteFromProvisioning(2) indicates that the last software upgrade was a result of version mismatch at - provisioning. CompleteFromMgt(3) indicates that the last - software upgrade was a result of setting - docsDevSwAdminStatus to upgradeFromMgt. + provisioning. + + CompleteFromMgt(3) indicates that the last software + upgrade was a result of setting docsDevSwAdminStatus to + upgradeFromMgt. + Failed(4) indicates that the last attempted download - failed, ordinarily due to TFTP timeout." + failed, ordinarily due to TFTP or HTTP timeout." REFERENCE - "DOCSIS Radio Frequency Interface Specification, Section - 8.2, Downloading Cable Modem Operating Software." + "DOCSIS RFI 1.0 Specification, Section 8.2., and + DOCSIS RFI 1.1 Specification, Section 10.1. and + DOCSIS RFI 2.0 Specification, Section 12.1." ::= { docsDevSoftware 4 } docsDevSwCurrentVers OBJECT-TYPE - SYNTAX SnmpAdminString - MAX-ACCESS read-only - STATUS current + SYNTAX SnmpAdminString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The software version currently operating in this device. + This string's syntax is that used by the + individual vendor to identify software versions. + For a CM, this string will describe the current + software load. For a CMTS, this object SHOULD contain + a human-readable representation either of the vendor + specific designation of the software for the chassis, + or of the software for the control processor. If + neither of these is applicable, the value MUST be a + zero-length string." + ::= { docsDevSoftware 5 } + +docsDevSwServerAddressType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The type of address of the TFTP or HTTP server used for + + software upgrades. + + If docsDevSwServerTransportProtocol is currently set to + tftp(1), attempting to set this object to dns(16) MUST + result in an error." + ::= { docsDevSoftware 6 } +docsDevSwServerAddress OBJECT-TYPE + SYNTAX InetAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The address of the TFTP or HTTP server used for software + upgrades. + + If the TFTP/HTTP server is unknown, return the zero- + length address string (see the TextualConvention). + If docsDevSwServer is also implemented in this agent, + this object is tied to it. A set of this object to an + IPv4 address will result in also setting the value of + docsDevSwServer to that address. If this object is set + to an IPv6 address, docsDevSwServer is set to 0.0.0.0. + If docsDevSwServer is set, this object is also set to + that value. Note that if both are set in the same + action, the order of which one sets the other is + undefined." + ::= { docsDevSoftware 7 } + +docsDevSwServerTransportProtocol OBJECT-TYPE + SYNTAX INTEGER { + tftp(1), + http(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This object specifies the transport protocol (TFTP or + HTTP) to be used for software upgrades. + If the value of this object is tftp(1), then the cable + device uses TFTP (RFC 1350) read request packets to + download the docsDevSwFilename from the + docsDevSwServerAddress in octet mode. + If the value of this object is http(2), then the cable + device uses HTTP 1.0 (RFC 1945) or HTTP 1.1 (RFC 2616) + GET requests sent to host docsDevSwServerAddress to - DESCRIPTION - "The software version currently operating in this device. - This object should be in the syntax used by the individual - vendor to identify software versions. Any CM MUST return a - string descriptive of the current software load. For a - CMTS, this object SHOULD contain either a human readable - representation of the vendor specific designation of the - software for the chassis, or of the software for the - control processor. If neither of these is applicable, - this MUST contain an empty string." - ::= { docsDevSoftware 5 } + download the software image from path docsDevSwFilename. + If docsDevSwServerAddressType is currently set to + dns(16), attempting to set this object to tftp(1) MUST + result in an error." + DEFVAL { tftp } + ::= { docsDevSoftware 8 } -- --- The following group describes server access and parameters used for --- initial provisioning and bootstrapping. +-- The following group describes server access and parameters used +-- for initial provisioning and bootstrapping. -- docsDevServer OBJECT IDENTIFIER ::= { docsDevMIBObjects 4 } @@ -448,62 +752,87 @@ docsDevServerBootState OBJECT-TYPE STATUS current DESCRIPTION "If operational(1), the device has completed loading and - processing of configuration parameters and the CMTS has + processing of configuration parameters, and the CMTS has completed the Registration exchange. - If disabled(2) then the device was administratively - disabled, possibly by being refused network access in the - configuration file. - If waitingForDhcpOffer(3) then a DHCP Discover has been - transmitted and no offer has yet been received. - If waitingForDhcpResponse(4) then a DHCP Request has been - transmitted and no response has yet been received. - If waitingForTimeServer(5) then a Time Request has been - transmitted and no response has yet been received. + If disabled(2), then the device was administratively + disabled, possibly by being refused network access in + the configuration file. + + If waitingForDhcpOffer(3), then a Dynamic Host + Configuration Protocol (DHCP) Discover has been + transmitted, and no offer has yet been received. + If waitingForDhcpResponse(4), then a DHCP Request has + been transmitted, and no response has yet been received. + If waitingForTimeServer(5), then a Time Request has been + transmitted, and no response has yet been received. + If waitingForTftp(6), then a request to the TFTP + parameter server has been made, and no response + received. - If waitingForTftp(6) then a request to the TFTP parameter - server has been made and no response received. - If refusedByCmts(7) then the Registration Request/Response - exchange with the CMTS failed. - If forwardingDenied(8) then the registration process - completed, but the network access option in the received - configuration file prohibits forwarding. " + If refusedByCmts(7), then the Registration + Request/Response exchange with the CMTS failed. + + If forwardingDenied(8), then the registration process + was completed, but the network access option in the + received configuration file prohibits forwarding. + + If other(9), then the registration process reached a + point that does not fall into one of the above + categories. + + If unknown(10), then the device has not yet begun the + registration process or is in some other indeterminate + state." REFERENCE - "DOCSIS Radio Frequency Interface Specification, Figure - 7-1, CM Initialization Overview." + "DOCSIS RFI 1.0 Specification, Figure 7-1, and + DOCSIS RFI 1.1 Specification, Figure 9-1 and + DOCSIS RFI 2.0 Specification, Figure 11-1." ::= { docsDevServer 1 } docsDevServerDhcp OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-only - STATUS current + STATUS deprecated DESCRIPTION "The IP address of the DHCP server that assigned an IP - address to this device. Returns 0.0.0.0 if DHCP was not - used for IP address assignment." + address to this device. Returns 0.0.0.0 if DHCP is not + used for IP address assignment, or if this agent is + not assigned an IPv4 address. + + This object is deprecated and is replaced by + docsDevServerDhcpAddress." ::= { docsDevServer 2 } docsDevServerTime OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-only - STATUS current + STATUS deprecated DESCRIPTION - "The IP address of the Time server (RFC-868). Returns - 0.0.0.0 if the time server IP address is unknown." + "The IP address of the Time server (RFC 0868). Returns + 0.0.0.0 if the time server IP address is unknown, or if + the time server is not an IPv4 server. + + This object is deprecated and is replaced by + + docsDevServerTimeAddress." ::= { docsDevServer 3 } docsDevServerTftp OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-only - STATUS current + STATUS deprecated DESCRIPTION "The IP address of the TFTP server responsible for downloading provisioning and configuration parameters - to this device. Returns 0.0.0.0 if the TFTP server - address is unknown." + to this device. Returns 0.0.0.0 if the TFTP server + address is unknown or is not an IPv4 address. + + This object is deprecated and is replaced by + docsDevServerConfigTftpAddress." ::= { docsDevServer 4 } docsDevServerConfigFile OBJECT-TYPE @@ -511,18 +840,95 @@ docsDevServerConfigFile OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "The name of the device configuration file read from the + "The name of the device configuration file read from + the TFTP server. Returns a zero-length string if + the configuration file name is unknown." + ::= { docsDevServer 5 } + +docsDevServerDhcpAddressType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The type of address of docsDevServerDhcpAddress. If + DHCP was not used, this value should return + unknown(0)." + ::= { docsDevServer 6 } + +docsDevServerDhcpAddress OBJECT-TYPE + SYNTAX InetAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The internet address of the DHCP server that assigned + an IP address to this device. Returns the zero length + octet string if DHCP was not used for IP address + assignment." + ::= { docsDevServer 7 } + +docsDevServerTimeAddressType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The type of address of docsDevServerTimeAddress. If + no time server exists, this value should return + unknown(0)." + ::= { docsDevServer 8 } + +docsDevServerTimeAddress OBJECT-TYPE + SYNTAX InetAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Internet address of the RFC 868 Time server, + as provided by DHCP option 4. + Note that if multiple values are provided to the + CM in DHCP option 4, the value of this MIB object + MUST be the Time server address from which the Time + of Day reference was acquired as based on the DOCSIS + RFI specification. During the period of time where + the Time of Day have not been acquired, the Time + server address reported by the CM may report the + first address value in the DHCP option value or the + last server address the CM attempted to get the Time + of day value. + Returns the zero-length octet string if the time server + IP address is not provisioned." + REFERENCE + "DOCSIS RFI 1.1 Specification, Section 9.2.7. and + DOCSIS RFI 2.0 Specification, Section 11.2.7." + ::= { docsDevServer 9 } +docsDevServerConfigTftpAddressType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The type of address of docsDevServerConfigTftpAddress. + If no TFTP server exists, this value should return + unknown(0)." + ::= { docsDevServer 10 } +docsDevServerConfigTftpAddress OBJECT-TYPE + SYNTAX InetAddress - TFTP server. Returns an empty string if the configuration - file name is unknown." - ::= { docsDevServer 5 } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The internet address of the TFTP server responsible for + downloading provisioning and configuration parameters + to this device. Returns the zero-length octet string if + the config server address is unknown. There are certain + security risks that are involved with using TFTP." + REFERENCE + "RFC 3617, Section 5" + ::= { docsDevServer 11 } -- --- Event Reporting +-- Event Reporting -- docsDevEvent OBJECT IDENTIFIER ::= { docsDevMIBObjects 5 } @@ -535,23 +941,28 @@ docsDevEvControl OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "Setting this object to resetLog(1) empties the event log. - All data is deleted. Setting it to useDefaultReporting(2) - returns all event priorities to their factory-default - reporting. Reading this object always returns - useDefaultReporting(2)." + "Setting this object to resetLog(1) empties the event + log. All data is deleted. Setting it to + useDefaultReporting(2) returns all event priorities to + their factory-default reporting. Reading this object + always returns useDefaultReporting(2)." ::= { docsDevEvent 1 } docsDevEvSyslog OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-write - STATUS current + STATUS deprecated DESCRIPTION - "The IP address of the Syslog server. If 0.0.0.0, syslog - transmission is inhibited." + "The IP address of the Syslog server. If 0.0.0.0, either + syslog transmission is inhibited, or the Syslog server + address is not an IPv4 address. + + This object is deprecated and is replaced by + docsDevEvSyslogAddress." ::= { docsDevEvent 2 } docsDevEvThrottleAdminStatus OBJECT-TYPE + SYNTAX INTEGER { unconstrained(1), maintainBelowThreshold(2), @@ -563,78 +974,83 @@ docsDevEvThrottleAdminStatus OBJECT-TYPE DESCRIPTION "Controls the transmission of traps and syslog messages with respect to the trap pacing threshold. + unconstrained(1) causes traps and syslog messages to be transmitted without regard to the threshold settings. - - - - maintainBelowThreshold(2) causes trap transmission and syslog messages to be suppressed if the number of traps would otherwise exceed the threshold. - stopAtThreshold(3) causes trap transmission to cease - at the threshold, and not resume until directed to do so. + + stopAtThreshold(3) causes trap transmission to cease at + the threshold and not to resume until directed to do so. + inhibited(4) causes all trap transmission and syslog messages to be suppressed. A single event is always treated as a single event for - threshold counting. That is, an event causing both a trap - and a syslog message is still treated as a single event. - - Writing to this object resets the thresholding state. + threshold counting. That is, an event causing both a + trap and a syslog message is still treated as a single + event. - At initial startup, this object has a default value of - unconstrained(1)." + Writing to this object resets the thresholding state." + DEFVAL { unconstrained } ::= { docsDevEvent 3 } docsDevEvThrottleInhibited OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-only - STATUS current + STATUS deprecated DESCRIPTION "If true(1), trap and syslog transmission is currently - inhibited due to thresholds and/or the current setting of - docsDevEvThrottleAdminStatus. In addition, this is set to - true(1) if transmission is inhibited due to no + inhibited due to thresholds and/or the current setting + of docsDevEvThrottleAdminStatus. In addition, this is + true(1) when transmission is inhibited because no syslog (docsDevEvSyslog) or trap (docsDevNmAccessEntry) - destinations having been set." + destinations have been set. + + This object is deprecated and is replaced by + docsDevEvThrottleThresholdExceeded." + ::= { docsDevEvent 4 } docsDevEvThrottleThreshold OBJECT-TYPE SYNTAX Unsigned32 + UNITS "events" MAX-ACCESS read-write STATUS current DESCRIPTION - "Number of trap/syslog events per docsDevEvThrottleInterval - to be transmitted before throttling. + "Number of events per docsDevEvThrottleInterval permitted + before throttling is to occur. - A single event is always treated as a single event for - threshold counting. That is, an event causing both a trap - and a syslog message is still treated as a single event. + A single event, whether the notification could result in + messages transmitted using syslog, SNMP, or both + protocols, and regardless of the number of destinations, + (including zero) is always treated as a single event for + threshold counting. For example, an event causing both + a trap and a syslog message is still treated as a single + event. - At initial startup, this object returns 0." + All system notifications that occur within the device + should be taken into consideration when calculating + and monitoring the threshold." + DEFVAL { 0 } ::= { docsDevEvent 5 } docsDevEvThrottleInterval OBJECT-TYPE SYNTAX Integer32 (1..2147483647) - - - - - UNITS "seconds" MAX-ACCESS read-write STATUS current DESCRIPTION - "The interval over which the trap threshold applies. - At initial startup, this object has a value of 1." - + "The interval over which docsDevEvThrottleThreshold + applies." + DEFVAL { 1 } ::= { docsDevEvent 6 } -- --- The following table controls the reporting of the various classes of --- events. +-- The following table controls the reporting of the various classes +-- of events. -- docsDevEvControlTable OBJECT-TYPE @@ -642,14 +1058,17 @@ docsDevEvControlTable OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - "This table allows control of the reporting of event classes. - For each event priority, a combination of logging and - reporting mechanisms may be chosen. The mapping of event types - to priorities is vendor-dependent. Vendors may also choose to - allow the user to control that mapping through proprietary - means." - ::= { docsDevEvent 7 } + "This table allows control of the reporting of event + classes. For each event priority, a combination of + logging and reporting mechanisms may be chosen. The + mapping of event types to priorities is + vendor dependent. Vendors may also choose to allow + the user to control that mapping through proprietary + means. Table entries MUST persist across reboots for + CMTS devices and MUST NOT persist across reboots for CM + devices." + ::= { docsDevEvent 7 } docsDevEvControlEntry OBJECT-TYPE SYNTAX DocsDevEvControlEntry @@ -671,11 +1090,6 @@ docsDevEvPriority OBJECT-TYPE emergency(1), alert(2), critical(3), - - - - - error(4), warning(5), notice(6), @@ -686,14 +1100,40 @@ docsDevEvPriority OBJECT-TYPE STATUS current DESCRIPTION "The priority level that is controlled by this - entry. These are ordered from most (emergency) to least + entry. These are ordered from most (emergency) to least (debug) critical. Each event with a CM or CMTS has a particular priority level associated with it (as defined - by the vendor). During normal operation no event more - critical than notice(6) should be generated. Events between - warning and emergency should be generated at appropriate - levels of problems (e.g. emergency when the box is about to - crash)." + by the vendor). + + emergency(1) events indicate vendor-specific fatal + hardware or software errors that prevent normal system + operation. + + alert(2) events indicate a serious failure that causes + the reporting system to reboot but is not caused by + hardware or software malfunctioning. + + critical(3) events indicate a serious failure that + requires attention and prevents the device from + transmitting data but that could be recovered without + rebooting the system. + + error(4) and warning(5) events indicate that a failure + occurred that could interrupt the normal data flow but + that does not cause the device to re-register. + + notice(6) and information(7) events indicate a + milestone or checkpoint in normal operation that could + be of particular importance for troubleshooting. + + debug(8) events are reserved for vendor-specific + events. + + During normal operation, no event more + critical than notice(6) should be generated. Events + between warning and emergency should be generated at + appropriate levels of problems (e.g., emergency when the + box is about to crash)." ::= { docsDevEvControlEntry 1 } docsDevEvReporting OBJECT-TYPE @@ -701,19 +1141,36 @@ docsDevEvReporting OBJECT-TYPE local(0), traps(1), syslog(2), - local-vol(3) + -- The following are extensions to the original set of + -- labels. The extensions start at an octet boundary. + -- So for bits 3 - 7, one MUST set them to zero on send + -- and one MUST ignore them on receipt. + localVolatile(8), + stdInterface(9) } MAX-ACCESS read-write STATUS current DESCRIPTION "Defines the action to be taken on occurrence of this - event class. Implementations may not necessarily support - all options for all event classes, but at minimum must - allow traps and syslogging to be disabled. If the - local(0) bit is set, then log to the internal log, if the - traps(1) bit is set, then generate a trap, if the - syslog(2) bit is set, then send a syslog message - (assuming the syslog address is set)." + event class. Implementations may not necessarily + support all options for all event classes but at + minimum must allow traps and syslogging to be + disabled. + + If the local(0) bit is set, then log to the internal + log and update non-volatile store, for backward + compatibility with the original RFC 2669 definition. + If the traps(1) bit is set, then generate + an SNMP trap; if the syslog(2) bit is set, then + send a syslog message (assuming that the syslog address + is set). If the localVolatile(8) bit is set, then + log to the internal log without updating non-volatile + store. If the stdInterface(9) bit is set, then the + agent ignores all other bits except the local(0), + syslog(2), and localVolatile(8) bits. Setting the + stdInterface(9) bit indicates that RFC3413 and + RFC3014 are being used to control event reporting + mechanisms." ::= { docsDevEvControlEntry 2 } docsDevEventTable OBJECT-TYPE @@ -722,36 +1179,33 @@ docsDevEventTable OBJECT-TYPE STATUS current DESCRIPTION "Contains a log of network and device events that may be - of interest in fault isolation and troubleshooting." + of interest in fault isolation and troubleshooting. + If the local(0) bit is set in docsDevEvReporting, + entries in this table MUST persist across reboots." ::= { docsDevEvent 8 } - - - - - docsDevEventEntry OBJECT-TYPE SYNTAX DocsDevEventEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION "Describes a network or device event that may be of - interest in fault isolation and troubleshooting. Multiple - sequential identical events are represented by + interest in fault isolation and troubleshooting. + Multiple sequential identical events are represented by incrementing docsDevEvCounts and setting - docsDevEvLastTime to the current time rather than creating - multiple rows. + docsDevEvLastTime to the current time rather than + creating multiple rows. - Entries are created with the first occurrance of an event. - docsDevEvControl can be used to clear the table. - Individual events can not be deleted." + Entries are created with the first occurrence of an + event. docsDevEvControl can be used to clear the + table. Individual events cannot be deleted." INDEX { docsDevEvIndex } - ::= { docsDevEventTable 1 } DocsDevEventEntry ::= SEQUENCE { docsDevEvIndex Integer32, docsDevEvFirstTime DateAndTime, + docsDevEvLastTime DateAndTime, docsDevEvCounts Counter32, docsDevEvLevel INTEGER, @@ -765,11 +1219,12 @@ docsDevEvIndex OBJECT-TYPE STATUS current DESCRIPTION "Provides relative ordering of the objects in the event - log. This object will always increase except when + log. This object will always increase except when (a) the log is reset via docsDevEvControl, - (b) the device reboots and does not implement non-volatile - storage for this log, or (c) it reaches the value 2^31. - The next entry for all the above cases is 1." + (b) the device reboots and does not implement + non-volatile storage for this log, or (c) it reaches + the value 2^31. The next entry for all the above + cases is 1." ::= { docsDevEventEntry 1 } docsDevEvFirstTime OBJECT-TYPE @@ -777,12 +1232,8 @@ docsDevEvFirstTime OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "The time that this entry was created." - - - - - + "The value of docsDevDateTime at the time this entry was + created." ::= { docsDevEventEntry 2 } docsDevEvLastTime OBJECT-TYPE @@ -790,16 +1241,20 @@ docsDevEvLastTime OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "If multiple events are reported via the same entry, the - time that the last event for this entry occurred, - otherwise this should have the same value as - docsDevEvFirstTime. " + "When an entry reports only one event, this object will + have the same value as the corresponding instance of + docsDevEvFirstTime. When an entry reports multiple + events, this object will record the value that + docsDevDateTime had when the most recent event for this + entry occurred." ::= { docsDevEventEntry 3 } -- This object was renamed from docsDevEvCount to meet naming -- requirements for Counter32 docsDevEvCounts OBJECT-TYPE SYNTAX Counter32 + UNITS "events" + MAX-ACCESS read-only STATUS current DESCRIPTION @@ -808,7 +1263,6 @@ docsDevEvCounts OBJECT-TYPE row and increments by 1 for each subsequent duplicate event." ::= { docsDevEventEntry 4 } - docsDevEvLevel OBJECT-TYPE SYNTAX INTEGER { emergency(1), @@ -823,20 +1277,46 @@ docsDevEvLevel OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "The priority level of this event as defined by the + "The priority level of this event, as defined by the vendor. These are ordered from most serious (emergency) - to least serious (debug)." - ::= { docsDevEventEntry 5 } + to least serious (debug). --- --- Vendors will provide their own enumerations for the following. --- The interpretation of the enumeration is unambiguous for a + emergency(1) events indicate vendor-specific fatal + hardware or software errors that prevent normal system + operation. + + alert(2) events indicate a serious failure that causes + the reporting system to reboot but that is not caused by + hardware or software malfunctioning. + + critical(3) events indicate a serious failure that + requires attention and prevents the device from + transmitting data but that could be recovered without + rebooting the system. + + error(4) and warning(5) events indicate that a failure + occurred that could interrupt the normal data flow but + that does not cause the device to re-register. + notice(6) and information(7) events indicate a + milestone or checkpoint in normal operation that could + be of particular importance for troubleshooting. + debug(8) events are reserved for vendor-specific + events. + During normal operation, no event more + critical than notice(6) should be generated. Events + between warning and emergency should be generated at + appropriate levels of problems (e.g., emergency when the + box is about to crash)." + ::= { docsDevEventEntry 5 } --- particular value of the vendor's enterprise number in sysObjectID. +-- +-- It is strongly recommended that implementors follow the CableLabs +-- enumerations for docsDevEvId, per the DOCSIS OSSIv1.1 spec +-- and follow-on specifications. -- docsDevEvId OBJECT-TYPE @@ -846,6 +1326,9 @@ docsDevEvId OBJECT-TYPE DESCRIPTION "For this product, uniquely identifies the type of event that is reported by this entry." + REFERENCE + "DOCSIS OSSI 1.1 Specification, Appendix H and + DOCSIS OSSI 2.0 Specification, Annex D." ::= { docsDevEventEntry 6 } docsDevEvText OBJECT-TYPE @@ -858,14 +1341,51 @@ docsDevEvText OBJECT-TYPE etc.)." ::= { docsDevEventEntry 7 } -docsDevFilter OBJECT IDENTIFIER ::= { docsDevMIBObjects 6 } +docsDevEvSyslogAddressType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The type of address of docsDevEvSyslogAddress. If + no syslog server exists, this value should return + unknown(0)." + DEFVAL { unknown } + ::= { docsDevEvent 9 } + +docsDevEvSyslogAddress OBJECT-TYPE + SYNTAX InetAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Internet address of the Syslog server, as provided + by DHCP option 7 or set via SNMP management. If the + address of the server is set to the zero-length + string, the 0.0.0.0 IPv4 address, or the 0: IPv6 + address, Syslog transmission is inhibited. + + Note that if multiple values are provided to the CM in + DHCP option 7, the value of this MIB object MUST be the + first Syslog server address received. + By default at agent boot, this object returns the zero + length string." + ::= { docsDevEvent 10 } + +docsDevEvThrottleThresholdExceeded OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "If true(1), trap and syslog transmission is currently + inhibited due to exceeding the trap/syslog event + threshold in the current interval." + ::= { docsDevEvent 11 } -- -- Link Level Control Filtering -- --- docsDevFilterLLCDefault renamed to docsDevFilterLLCUnmatchedAction +docsDevFilter OBJECT IDENTIFIER ::= { docsDevMIBObjects 6 } docsDevFilterLLCUnmatchedAction OBJECT-TYPE SYNTAX INTEGER { @@ -880,20 +1400,20 @@ docsDevFilterLLCUnmatchedAction OBJECT-TYPE forward only packets matching a set of layer three protocols, or to drop packets matching a set of layer three protocols. Typical use of these filters is to - filter out possibly harmful (given the context of a large - metropolitan LAN) protocols. - If set to discard(1), any L2 packet which does not match at - - - - - - least one filter in the docsDevFilterLLCTable will be - discarded. If set to accept(2), any L2 packet which does not - match at least one filter in the docsDevFilterLLCTable - will be accepted for further processing (e.g., bridging). - At initial system startup, this object returns accept(2)." + filter out possibly harmful (given the context of a + large metropolitan LAN) protocols. + + If set to discard(1), any L2 packet that does not match + at least one filter in the docsDevFilterLLCTable will be + discarded. If set to accept(2), any L2 packet that + does not match at least one filter in the + docsDevFilterLLCTable will be accepted for further + processing (e.g., bridging). In other words, if the + packet does not match an entry in the table, it takes + this action; if it does match an entry in the table, it + takes the opposite of this action." + DEFVAL { accept } ::= { docsDevFilter 1 } docsDevFilterLLCTable OBJECT-TYPE @@ -902,12 +1422,13 @@ docsDevFilterLLCTable OBJECT-TYPE STATUS current DESCRIPTION "A list of filters to apply to (bridged) LLC - traffic. The filters in this table are applied to + traffic. The filters in this table are applied to incoming traffic on the appropriate interface(s) prior - to any further processing (e.g. before handing the packet - off for level 3 processing, or for bridging). The - specific action taken when no filter is matched is - controlled by docsDevFilterLLCUnmatchedAction." + to any further processing (e.g., before the packet + is handed off for level 3 processing, or for bridging). + The specific action taken when no filter is matched is + controlled by docsDevFilterLLCUnmatchedAction. Table + entries MUST NOT persist across reboots for any device." ::= { docsDevFilter 2 } docsDevFilterLLCEntry OBJECT-TYPE @@ -915,8 +1436,8 @@ docsDevFilterLLCEntry OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - "Describes a single filter to apply to (bridged) LLC traffic - received on a specified interface. " + "Describes a single filter to apply to (bridged) LLC + traffic received on a specified interface. " INDEX { docsDevFilterLLCIndex } ::= { docsDevFilterLLCTable 1 } @@ -934,24 +1455,25 @@ docsDevFilterLLCIndex OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - "Index used for the identification of filters (note that LLC - filter order is irrelevant)." + "Index used for the identification of filters (note that + LLC filter order is irrelevant)." ::= { docsDevFilterLLCEntry 1 } - - - - - docsDevFilterLLCStatus OBJECT-TYPE SYNTAX RowStatus MAX-ACCESS read-create STATUS current DESCRIPTION "Controls and reflects the status of rows in this - table. There is no restriction on changing any of the + table. There is no restriction on changing any of the associated columns for this row while this object is set - to active." - + to active. + + Specifying only this object (with the + appropriate index) on a CM is sufficient to create a + filter row that matches all inbound packets on the + ethernet interface and results in the packets being + discarded. docsDevFilterLLCIfIndex (at least) must be + specified on a CMTS to create a row." ::= { docsDevFilterLLCEntry 2} docsDevFilterLLCIfIndex OBJECT-TYPE @@ -959,13 +1481,21 @@ docsDevFilterLLCIfIndex OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "The entry interface to which this filter applies. - The value corresponds to ifIndex for either a CATV MAC - or another network interface. If the value is zero, the - filter applies to all interfaces. In Cable Modems, the - default value is the customer side interface. In Cable - Modem Termination Systems, this object has to be - specified to create a row in this table." + "The entry interface to which this filter applies. The + value corresponds to ifIndex for either a CATV MAC or + another network interface. If the value is zero, the + filter applies to all interfaces. In Cable Modems, the + default value is the customer side interface(s). In + CMTSs, this object has to be specified to + create a row in this table. + + Note that according to the DOCSIS OSSIv1.1 + specification, ifIndex '1' in the CM means that this + row applies to all Cable Modem-to-CPE Interfaces + (CMCI)." + REFERENCE + "DOCSIS OSSI 1.1 Specification, Section 3.3.4.1. and + DOCSIS OSSI 2.0 Specification, Section 6.3.4.1." ::= { docsDevFilterLLCEntry 3 } docsDevFilterLLCProtocolType OBJECT-TYPE @@ -978,8 +1508,9 @@ docsDevFilterLLCProtocolType OBJECT-TYPE DESCRIPTION "The format of the value in docsDevFilterLLCProtocol: either a two-byte Ethernet Ethertype, or a one-byte - 802.2 SAP value. EtherType(1) also applies to SNAP- - encapsulated frames." + 802.2 Service Access Point (SAP) value. ethertype(1) + also applies to Standard Network Access Protocol + (SNAP) encapsulated frames." DEFVAL { ethertype } ::= { docsDevFilterLLCEntry 4 } @@ -988,29 +1519,26 @@ docsDevFilterLLCProtocol OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "The layer three protocol for which this filter applies. + "The layer-three protocol for which this filter applies. The protocol value format depends on - - - - - - docsDevFilterLLCProtocolType. Note that for SNAP frames, - etherType filtering is performed rather than DSAP=0xAA." + docsDevFilterLLCProtocolType. Note that for SNAP + frames, ethertype filtering is performed rather than + Destination Service Access Point (DSAP) =0xAA." DEFVAL { 0 } ::= { docsDevFilterLLCEntry 5 } docsDevFilterLLCMatches OBJECT-TYPE SYNTAX Counter32 + UNITS "matches" MAX-ACCESS read-only STATUS current DESCRIPTION "Counts the number of times this filter was matched." ::= { docsDevFilterLLCEntry 6 } --- The default behavior for (bridged) packets that do not match IP --- filters is defined by --- docsDevFilterIpDefault. +-- +-- IPv4 Filtering +-- docsDevFilterIpDefault OBJECT-TYPE SYNTAX INTEGER { @@ -1018,76 +1546,94 @@ docsDevFilterIpDefault OBJECT-TYPE accept(2) } MAX-ACCESS read-write - STATUS current + + STATUS deprecated DESCRIPTION - "If set to discard(1), all packets not matching an IP filter - will be discarded. If set to accept(2), all packets not - matching an IP filter will be accepted for further - processing (e.g., bridging). - At initial system startup, this object returns accept(2)." + "The default behavior for (bridged) packets that do not + match IP filters (or Internet filters, if implemented) + is defined by docsDevFilterIpDefault. + + If set to discard(1), all packets not matching an IP + filter in docsDevFilterIpTable will be discarded. If + set to accept(2), all packets not matching an IP filter + or an Internet filter will be accepted for further + processing (e.g., bridging)." + DEFVAL { accept } ::= { docsDevFilter 3 } docsDevFilterIpTable OBJECT-TYPE SYNTAX SEQUENCE OF DocsDevFilterIpEntry MAX-ACCESS not-accessible - STATUS current + STATUS deprecated DESCRIPTION "An ordered list of filters or classifiers to apply to - IP traffic. Filter application is ordered by the filter - index, rather than by a best match algorithm (Note that + IP traffic. Filter application is ordered by the filter + index, rather than by a best match algorithm (note that this implies that the filter table may have gaps in the - index values). Packets which match no filters will have - policy 0 in the docsDevFilterPolicyTable applied to them if - it exists. Otherwise, Packets which match no filters - are discarded or forwarded according to the setting of - docsDevFilterIpDefault. + index values). Packets that match no filters will have + policy 0 in the docsDevFilterPolicyTable applied to + them, if it exists. Otherwise, Packets that match no + filters are discarded or forwarded according to the + setting of docsDevFilterIpDefault. Any IP packet can theoretically match multiple rows of - - - - - this table. When considering a packet, the table is - scanned in row index order (e.g. filter 10 is checked + scanned in row index order (e.g., filter 10 is checked before filter 20). If the packet matches that filter (which means that it matches ALL criteria for that row), actions appropriate to docsDevFilterIpControl and docsDevFilterPolicyId are taken. If the packet was discarded processing is complete. If docsDevFilterIpContinue is set to true, the filter - comparison continues with the next row in the table + comparison continues with the next row in the table, looking for additional matches. If the packet matches no filter in the table, the packet - is accepted or dropped for further processing based on - the setting of docsDevFilterIpDefault. If the packet is - accepted, the actions specified by policy group 0 - (e.g. the rows in docsDevFilterPolicyTable which have a - value of 0 for docsDevFilterPolicyId) are taken if that - policy group exists. + is accepted or dropped for further processing + according to the setting of docsDevFilterIpDefault. + If the packet is accepted, the actions specified by + policy group 0 (e.g., the rows in + docsDevFilterPolicyTable that have a value of 0 for + docsDevFilterPolicyId) are taken, if that policy + + group exists. Logically, this table is consulted twice during the - processing of any IP packet - once upon its acceptance - from the L2 entity, and once upon its transmission to the - L2 entity. In actuality, for cable modems, IP filtering - is generally the only IP processing done for transit - traffic. This means that inbound and outbound filtering - can generally be done at the same time with one pass - through the filter table." + processing of any IP packet: once upon its acceptance + from the L2 entity, and once upon its transmission to + the L2 entity. In actuality, for cable modems, IP + filtering is generally the only IP processing done for + transit traffic. This means that inbound and outbound + filtering can generally be done at the same time with + one pass through the filter table. + + The objects in this table are only accessible from cable + devices that are not operating in DiffServ MIB mode + (RFC 3289). See the conformance section for details. + + Note that some devices are required by other + specifications (e.g., the DOCSIS OSSIv1.1 specification) + to support the legacy SNMPv1/v2c docsDevFilter mode + for backward compatibility. + + Table entries MUST NOT persist across reboots for any + device. + + This table is deprecated. Instead, use the DiffServ MIB + from RFC 3289." ::= { docsDevFilter 4 } docsDevFilterIpEntry OBJECT-TYPE SYNTAX DocsDevFilterIpEntry MAX-ACCESS not-accessible - STATUS current + STATUS deprecated DESCRIPTION "Describes a filter to apply to IP traffic received on a specified interface. All identity objects in this table - (e.g. source and destination address/mask, protocol, - source/dest port, TOS/mask, interface and direction) must - match their respective fields in the packet for any given - filter to match. + (e.g., source and destination address/mask, protocol, + source/dest port, TOS/mask, interface and direction) + must match their respective fields in the packet for + any given filter to match. To create an entry in this table, docsDevFilterIpIfIndex must be specified." @@ -1096,13 +1642,9 @@ docsDevFilterIpEntry OBJECT-TYPE DocsDevFilterIpEntry ::= SEQUENCE { docsDevFilterIpIndex Integer32, - - - - - docsDevFilterIpStatus RowStatus, docsDevFilterIpControl INTEGER, + docsDevFilterIpIfIndex InterfaceIndexOrZero, docsDevFilterIpDirection INTEGER, docsDevFilterIpBroadcast TruthValue, @@ -1115,7 +1657,7 @@ DocsDevFilterIpEntry ::= SEQUENCE { docsDevFilterIpSourcePortHigh Integer32, docsDevFilterIpDestPortLow Integer32, docsDevFilterIpDestPortHigh Integer32, - docsDevFilterIpMatches Counter32, + docsDevFilterIpMatches ZeroBasedCounter32, docsDevFilterIpTos OCTET STRING, docsDevFilterIpTosMask OCTET STRING, docsDevFilterIpContinue TruthValue, @@ -1125,7 +1667,7 @@ DocsDevFilterIpEntry ::= SEQUENCE { docsDevFilterIpIndex OBJECT-TYPE SYNTAX Integer32 (1..2147483647) MAX-ACCESS not-accessible - STATUS current + STATUS deprecated DESCRIPTION "Index used to order the application of filters. The filter with the lowest index is always applied @@ -1135,26 +1677,21 @@ docsDevFilterIpIndex OBJECT-TYPE docsDevFilterIpStatus OBJECT-TYPE SYNTAX RowStatus MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION "Controls and reflects the status of rows in this - table. Specifying only this object (with the appropriate - index) on a CM is sufficient to create a filter row which - matches all inbound packets on the ethernet interface, - and results in the packets being - discarded. docsDevFilterIpIfIndex (at least) must be + table. Specifying only this object (with the + appropriate index) on a CM is sufficient to create a + filter row that matches all inbound packets on the + ethernet interface and results in the packets being + discarded. docsDevFilterIpIfIndex (at least) must be specified on a CMTS to create a row. Creation of the rows may be done via either create-and-wait or create-and-go, but the filter is not applied until this - object is set to (or changes to) active. There is no + object is set to (or changes to) active. There is no restriction in changing any object in a row while this object is set to active." - - - - - - ::= { docsDevFilterIpEntry 2 } + ::= { docsDevFilterIpEntry 2 } docsDevFilterIpControl OBJECT-TYPE SYNTAX INTEGER { @@ -1163,50 +1700,55 @@ docsDevFilterIpControl OBJECT-TYPE policy(3) } MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION "If set to discard(1), all packets matching this filter - will be discarded and scanning of the remainder of the - filter list will be aborted. If set to accept(2), all - packets matching this filter will be accepted for further - processing (e.g., bridging). If docsDevFilterIpContinue - is set to true, see if there are other matches, otherwise - done. If set to policy (3), execute the policy entries - matched by docsDevIpFilterPolicyId in - docsDevIpFilterPolicyTable. - - If is docsDevFilterIpContinue is set to true, continue - scanning the table for other matches, otherwise done." + will be discarded, and scanning of the remainder of the + filter list will be aborted. If set to accept(2), all + packets matching this filter will be accepted for + further processing (e.g., bridging). If + docsDevFilterIpContinue is set to true, see if there + are other matches; otherwise, done. If set to + policy (3), execute the policy entries + matched by docsDevFilterIpPolicyId in + docsDevFilterPolicyTable. + + If docsDevFilterIpContinue is set to true, continue + scanning the table for other matches; otherwise, done." DEFVAL { discard } ::= { docsDevFilterIpEntry 3 } docsDevFilterIpIfIndex OBJECT-TYPE SYNTAX InterfaceIndexOrZero MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION - "The entry interface to which this filter applies. The + "The entry interface to which this filter applies. The value corresponds to ifIndex for either a CATV MAC or - another network interface. If the value is zero, the - filter applies to all interfaces. Default value in Cable - Modems is the index of the customer-side (e.g. ethernet) - interface. In Cable Modem Termination Systems, this - object MUST be specified to create a row in this table." + another interface. If the value is zero, the + filter applies to all interfaces. Default value in CMs + is the index of the customer-side (e.g., ethernet) + interface(s). In CMTSes, this object MUST be + specified to create a row in this table. + + Note that according to the DOCSIS OSSIv1.1 + specification, ifIndex '1' in the Cable Modem means + that this row applies to all CMCI (customer-facing) + interfaces." + REFERENCE + "DOCSIS OSSI 1.1 Specification, Section 3.3.4.1. and + DOCSIS OSSI 2.0 Specification, Section 6.3.4.1." ::= { docsDevFilterIpEntry 4 } docsDevFilterIpDirection OBJECT-TYPE + SYNTAX INTEGER { inbound(1), outbound(2), both(3) } MAX-ACCESS read-create - STATUS current - - - - - + STATUS deprecated DESCRIPTION "Determines whether the filter is applied to inbound(1) traffic, outbound(2) traffic, or traffic in both(3) @@ -1217,10 +1759,10 @@ docsDevFilterIpDirection OBJECT-TYPE docsDevFilterIpBroadcast OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION "If set to true(1), the filter only applies to multicast - and broadcast traffic. If set to false(2), the filter + and broadcast traffic. If set to false(2), the filter applies to all traffic." DEFVAL { false } ::= { docsDevFilterIpEntry 6 } @@ -1228,54 +1770,51 @@ docsDevFilterIpBroadcast OBJECT-TYPE docsDevFilterIpSaddr OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION "The source IP address, or portion thereof, that is to be matched for this filter. The source address is first - masked (and'ed) against docsDevFilterIpSmask before being - compared to this value. A value of 0 for this object - and 0 for the mask matches all IP addresses." + masked (ANDed) against docsDevFilterIpSmask before + being compared to this value. A value of 0 for this + object and 0 for the mask matches all IP addresses." DEFVAL { '00000000'h } ::= { docsDevFilterIpEntry 7 } docsDevFilterIpSmask OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION "A bit mask that is to be applied to the source address - prior to matching. This mask is not necessarily the same - as a subnet mask, but 1's bits must be leftmost and + prior to matching. This mask is not necessarily the + same as a subnet mask, but 1s bits must be leftmost and contiguous." DEFVAL { '00000000'h } + ::= { docsDevFilterIpEntry 8 } docsDevFilterIpDaddr OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION - - - - - "The destination IP address, or portion thereof, that is - to be matched for this filter. The destination address is - first masked (and'ed) against docsDevFilterIpDmask before - being compared to this value. A value of 0 for this - object and 0 for the mask matches all IP addresses." + to be matched for this filter. The destination address + is first masked (ANDed) against docsDevFilterIpDmask + before being compared to this value. A value of + 00000000 for this object and 00000000 for the mask + matches all IP addresses." DEFVAL { '00000000'h } ::= { docsDevFilterIpEntry 9 } docsDevFilterIpDmask OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION "A bit mask that is to be applied to the destination - address prior to matching. This mask is not necessarily - the same as a subnet mask, but 1's bits must be leftmost + address prior to matching. This mask is not necessarily + the same as a subnet mask, but 1s bits MUST be leftmost and contiguous." DEFVAL { '00000000'h } ::= { docsDevFilterIpEntry 10 } @@ -1283,71 +1822,74 @@ docsDevFilterIpDmask OBJECT-TYPE docsDevFilterIpProtocol OBJECT-TYPE SYNTAX Integer32 (0..256) MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION - "The IP protocol value that is to be matched. For example: - icmp is 1, tcp is 6, udp is 17. A value of 256 matches - ANY protocol." + "The IP protocol value that is to be matched. For + example, icmp is 1, tcp is 6, and udp is 17. A value of + 256 matches ANY protocol." + REFERENCE "www.iana.org/assignments/protocol-numbers" DEFVAL { 256 } ::= { docsDevFilterIpEntry 11 } docsDevFilterIpSourcePortLow OBJECT-TYPE SYNTAX Integer32 (0..65535) MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION - "If docsDevFilterIpProtocol is udp or tcp, this is the - inclusive lower bound of the transport-layer source port - range that is to be matched, otherwise it is ignored - during matching." + "This is the inclusive lower bound of the transport-layer + source port range that is to be matched. If the IP + protocol of the packet is neither UDP nor TCP, this + + object is ignored during matching." + REFERENCE "www.iana.org/assignments/port-numbers" DEFVAL { 0 } ::= { docsDevFilterIpEntry 12 } docsDevFilterIpSourcePortHigh OBJECT-TYPE SYNTAX Integer32 (0..65535) MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION - - - - - - "If docsDevFilterIpProtocol is udp or tcp, this is the - inclusive upper bound of the transport-layer source port - range that is to be matched, otherwise it is ignored - during matching." + "This is the inclusive upper bound of the transport-layer + source port range that is to be matched. If the IP + protocol of the packet is neither UDP nor TCP, this + object is ignored during matching." + REFERENCE "www.iana.org/assignments/port-numbers" DEFVAL { 65535 } ::= { docsDevFilterIpEntry 13 } docsDevFilterIpDestPortLow OBJECT-TYPE SYNTAX Integer32 (0..65535) MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION - "If docsDevFilterIpProtocol is udp or tcp, this is the - inclusive lower bound of the transport-layer destination - port range that is to be matched, otherwise it is ignored - during matching." + "This is the inclusive lower bound of the transport-layer + destination port range that is to be matched. If the IP + protocol of the packet is neither UDP nor TCP, this + object is ignored during matching." + REFERENCE "www.iana.org/assignments/port-numbers" DEFVAL { 0 } ::= { docsDevFilterIpEntry 14 } docsDevFilterIpDestPortHigh OBJECT-TYPE SYNTAX Integer32 (0..65535) MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION - "If docsDevFilterIpProtocol is udp or tcp, this is the - inclusive upper bound of the transport-layer destination - port range that is to be matched, otherwise it is ignored - during matching." + "This is the inclusive upper bound of the transport-layer + destination port range that is to be matched. If the IP + protocol of the packet is neither UDP nor TCP, this + object is ignored during matching." + REFERENCE "www.iana.org/assignments/port-numbers" DEFVAL { 65535 } ::= { docsDevFilterIpEntry 15 } docsDevFilterIpMatches OBJECT-TYPE - SYNTAX Counter32 + SYNTAX ZeroBasedCounter32 + UNITS "matches" MAX-ACCESS read-only - STATUS current + + STATUS deprecated DESCRIPTION "Counts the number of times this filter was matched. This object is initialized to 0 at boot, or at row @@ -1355,26 +1897,21 @@ docsDevFilterIpMatches OBJECT-TYPE ::= { docsDevFilterIpEntry 16 } docsDevFilterIpTos OBJECT-TYPE - SYNTAX OCTET STRING ( SIZE (1)) + SYNTAX OCTET STRING (SIZE (1)) MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION "This is the value to be matched to the packet's TOS (Type of Service) value (after the TOS value - - - - - - is AND'd with docsDevFilterIpTosMask). A value for this + is ANDed with docsDevFilterIpTosMask). A value for this object of 0 and a mask of 0 matches all TOS values." DEFVAL { '00'h } ::= { docsDevFilterIpEntry 17 } docsDevFilterIpTosMask OBJECT-TYPE - SYNTAX OCTET STRING ( SIZE (1) ) + SYNTAX OCTET STRING (SIZE (1)) MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION "The mask to be applied to the packet's TOS value before matching." @@ -1384,150 +1921,155 @@ docsDevFilterIpTosMask OBJECT-TYPE docsDevFilterIpContinue OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION - "If this value is set to true, and docsDevFilterIpControl + "If this value is set to true and docsDevFilterIpControl is anything but discard (1), continue scanning and - applying policies." + applying policies. See Section 3.3.3 for more + details." DEFVAL { false } ::= { docsDevFilterIpEntry 19 } docsDevFilterIpPolicyId OBJECT-TYPE SYNTAX Integer32 (0..2147483647) MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION - "This object points to an entry in docsDevFilterPolicyTable. - If docsDevFilterIpControl is set to policy (3), execute - all matching policies in docsDevFilterPolicyTable. - If no matching policy exists, treat as if - docsDevFilterIpControl were set to accept (1). - If this object is set to the value of 0, there is no - matching policy, and docsDevFilterPolicyTable MUST NOT be - consulted." + "This object points to an entry in + docsDevFilterPolicyTable. If docsDevFilterIpControl + + is set to policy (3), execute all matching policies + in docsDevFilterPolicyTable. If no matching policy + exists, treat as if docsDevFilterIpControl were set + to accept (1). If this object is set to the value of + 0, there is no matching policy, and + docsDevFilterPolicyTable MUST NOT be consulted." DEFVAL { 0 } ::= { docsDevFilterIpEntry 20 } -- +-- Policy Mapping Table -- docsDevFilterPolicyTable OBJECT-TYPE SYNTAX SEQUENCE OF DocsDevFilterPolicyEntry MAX-ACCESS not-accessible - - - - - - STATUS current - DESCRIPTION - "A Table which maps between a policy group ID and a set of - policies to be applied. All rows with the same - docsDevFilterPolicyId are part of the same policy group - and are applied in the order in which they are in this - table. - - docsDevFilterPolicyTable exists to allow multiple policy - actions to be applied to any given classified packet. The - policy actions are applied in index order For example: + STATUS deprecated + DESCRIPTION + "A Table that maps between a policy group ID and a set + of pointers to policies to be applied. All rows with + the same docsDevFilterPolicyId are part of the same + group of policy pointers and are applied in the order + in this table. docsDevFilterPolicyTable exists to + allow multiple policy actions (referenced by policy + pointers) to be applied to any given classified packet. + The policy actions are applied in index order. + For example: Index ID Type Action 1 1 TOS 1 9 5 TOS 1 12 1 IPSEC 3 - This says that a packet which matches a filter with - policy id 1, first has TOS policy 1 applied (which might - set the TOS bits to enable a higher priority), and next + This says that a packet that matches a filter with + policy id 1 first has TOS policy 1 applied (which might + set the TOS bits to enable a higher priority) and next has the IPSEC policy 3 applied (which may result in the - packet being dumped into a secure VPN to a remote + packets being dumped into a secure VPN to a remote encryptor). Policy ID 0 is reserved for default actions and is - applied only to packets which match no filters in - docsDevIpFilterTable." + applied only to packets that match no filters in + docsDevFilterIpTable. + + Table entries MUST NOT persist across reboots for any + device. + + This table is deprecated. Instead, use the DiffServ MIB + + from RFC 3289." ::= { docsDevFilter 5 } docsDevFilterPolicyEntry OBJECT-TYPE SYNTAX DocsDevFilterPolicyEntry MAX-ACCESS not-accessible - STATUS current + STATUS deprecated DESCRIPTION - "An entry in the docsDevFilterPolicyTable. Entries are - created by Network Management. To create an entry, - docsDevFilterPolicyId and docsDevFilterPolicyAction - must be specified." + "An entry in the docsDevFilterPolicyTable. Entries are + created by Network Management. To create an entry, + docsDevFilterPolicyId MUST be specified." INDEX { docsDevFilterPolicyIndex } ::= { docsDevFilterPolicyTable 1 } DocsDevFilterPolicyEntry ::= SEQUENCE { docsDevFilterPolicyIndex Integer32, docsDevFilterPolicyId Integer32, --- docsDevFilterPolicyType INTEGER, --- docsDevFilterPolicyAction Integer32, +-- docsDevFilterPolicyType INTEGER, +-- docsDevFilterPolicyAction Integer32, docsDevFilterPolicyStatus RowStatus, docsDevFilterPolicyPtr RowPointer - - - - - } docsDevFilterPolicyIndex OBJECT-TYPE SYNTAX Integer32 (1..2147483647) MAX-ACCESS not-accessible - STATUS current + STATUS deprecated DESCRIPTION "Index value for the table." ::= { docsDevFilterPolicyEntry 1 } docsDevFilterPolicyId OBJECT-TYPE SYNTAX Integer32 (0..2147483647) MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Policy ID for this entry. A policy ID can apply to - multiple rows of this table, all relevant policies are - executed. Policy 0 (if populated) is applied to all - packets which do not match any of the filters. N.B. If - docsDevFilterIpPolicyId is set to 0, it DOES NOT match - policy 0 of this table. " + STATUS deprecated + DESCRIPTION + "Policy ID for this entry. If a policy ID can apply to + multiple rows of this table, all relevant policies are + executed. Policy 0 (if populated) is applied to all + packets that do not match any of the filters. N.B. If + docsDevFilterIpPolicyId is set to 0, it DOES NOT match + policy 0 of this table." ::= { docsDevFilterPolicyEntry 2 } --- docsDevFilterPolicyType ::= { docsDevFilterPolicyEntry 3} Removed --- docsDevFilterPolicyAction ::= { docsDevFilterPolicyEntry 4 } removed +-- The following two objects were removed and never used; however, +-- to preserve OID numbering, they are simply commented out to +-- to ensure that they are not used again. +-- docsDevFilterPolicyType ::= { docsDevFilterPolicyEntry 3 } +-- docsDevFilterPolicyAction ::= { docsDevFilterPolicyEntry 4 } docsDevFilterPolicyStatus OBJECT-TYPE SYNTAX RowStatus MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION - "Object used to create an entry in this table." + "Object used to create an entry in this table. There is + no restriction in changing any object in a row while + this object is set to active. + The following object MUST have a valid value before this + object can be set to active: docsDevFilterPolicyPtr." ::= { docsDevFilterPolicyEntry 5 } - docsDevFilterPolicyPtr OBJECT-TYPE SYNTAX RowPointer MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION - "This object points to a row in an applicable filter policy - table. Currently, the only standard policy table is - docsDevFilterTosTable. Per the textual convention, this - object points to the first accessible object in the row. - E.g. to point to a row in docsDevFilterTosTable with an - index of 21, the value of this object would be the object - identifier docsDevTosStatus.21. - - Vendors must adhere to the same convention when adding - + "This object points to a row in an applicable filter + policy table. Currently, the only standard policy + table is docsDevFilterTosTable. + Per the textual convention, this object points to the + first accessible object in the row; e.g., to point to a + row in docsDevFilterTosTable with an index of 21, the + value of this object would be the object identifier + docsDevTosStatus.21. + Vendors are recommended to adhere to the same convention + when adding vendor-specific policy table extensions. + If this pointer references an empty or non-existent + row, then no policy action is taken. - vendor specific policy table extensions. - - The default upon row creation is a null pointer which + The default upon row creation is a null pointer that results in no policy action being taken." DEFVAL { zeroDotZero } ::= { docsDevFilterPolicyEntry 6 } @@ -1539,120 +2081,122 @@ docsDevFilterPolicyPtr OBJECT-TYPE docsDevFilterTosTable OBJECT-TYPE SYNTAX SEQUENCE OF DocsDevFilterTosEntry MAX-ACCESS not-accessible - STATUS current + STATUS deprecated DESCRIPTION - "Table used to describe Type of Service (TOS) bits + "Table used to describe Type of Service (TOS) bits + processing. - This table is an adjunct to the docsDevFilterIpTable, and - the docsDevFilterPolicy table. Entries in the latter - table can point to specific rows in this (and other) - tables and cause specific actions to be taken. This table - permits the manipulation of the value of the Type of - Service bits in the IP header of the matched packet as - follows: + This table is an adjunct to the docsDevFilterIpTable + and the docsDevFilterPolicy table. Entries in the + latter table can point to specific rows in this (and + other) tables and cause specific actions to be taken. + This table permits the manipulation of the value of the + Type of Service bits in the IP header of the matched + packet as follows: + Set the tosBits of the packet to (tosBits & docsDevFilterTosAndMask) | - docsDevFilterTosOrMask + docsDevFilterTosOrMask This construct allows you to do a clear and set of all - the TOS bits in a flexible manner." + the TOS bits in a flexible manner. + + Table entries MUST NOT persist across reboots for any + device. + + This table is deprecated. Instead, use the DiffServ MIB + from RFC 3289." ::= { docsDevFilter 6 } docsDevFilterTosEntry OBJECT-TYPE SYNTAX DocsDevFilterTosEntry MAX-ACCESS not-accessible - STATUS current + STATUS deprecated DESCRIPTION - "A TOS policy entry." + "A TOS policy entry." INDEX { docsDevFilterTosIndex } ::= { docsDevFilterTosTable 1 } DocsDevFilterTosEntry ::= SEQUENCE { docsDevFilterTosIndex Integer32, docsDevFilterTosStatus RowStatus, - docsDevFilterTosAndMask OCTET STRING (SIZE (1)), - docsDevFilterTosOrMask OCTET STRING (SIZE (1)) - - - - - + docsDevFilterTosAndMask OCTET STRING, + docsDevFilterTosOrMask OCTET STRING } docsDevFilterTosIndex OBJECT-TYPE SYNTAX Integer32 (1..2147483647) MAX-ACCESS not-accessible - STATUS current + STATUS deprecated DESCRIPTION "The unique index for this row. There are no ordering - requirements for this table and any valid index may be + requirements for this table, and any valid index may be specified." + ::= { docsDevFilterTosEntry 1 } docsDevFilterTosStatus OBJECT-TYPE SYNTAX RowStatus MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION "The object used to create and delete entries in this - table. A row created by specifying just this object - results in a row which specifies no change to the TOS - bits. A row may be created using either the create-and-go - or create-and-wait paradigms. There is no restriction on - the ability to change values in this row while the row is - active." + table. A row created by specifying just this object + results in a row that specifies no change to the TOS + bits. A row may be created using either the + create-and-go or create-and-wait paradigms. There is + no restriction on the ability to change values in this + row while the row is active." ::= { docsDevFilterTosEntry 2 } docsDevFilterTosAndMask OBJECT-TYPE SYNTAX OCTET STRING (SIZE (1)) MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION - - "This value is bitwise AND'd with the matched packet's - TOS bits." + "This value is bitwise ANDed with the matched packet's + TOS bits." DEFVAL { 'ff'h } ::= { docsDevFilterTosEntry 3 } docsDevFilterTosOrMask OBJECT-TYPE SYNTAX OCTET STRING (SIZE (1)) MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION - "After bitwise AND'ing with the above bits, the packet's - TOS bits are bitwise OR'd with these bits." + "This value is bitwise ORed with the result from the + AND procedure (tosBits & docsDevFilterTosAndMask). + The result then replaces the packet's TOS bits." DEFVAL { '00'h } ::= { docsDevFilterTosEntry 4 } - - - - - - -- --- CPE IP Management and anti spoofing group. Only implemented on +-- CPE IP Management and anti-spoofing group. Only implemented on -- Cable Modems. -- -docsDevCpe OBJECT IDENTIFIER ::= { docsDevMIBObjects 7} +docsDevCpe OBJECT IDENTIFIER ::= { docsDevMIBObjects 7 } docsDevCpeEnroll OBJECT-TYPE SYNTAX INTEGER { none(1), any(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION - "This object controls the population of docsDevFilterCpeTable. - If set to none, the filters must be set manually. + "This object controls the population of + docsDevFilterCpeTable. + If set to none, the filters must be set manually + by a network management action (either configuration + or SNMP set). If set to any, the CM wiretaps the packets originating from the ethernet and enrolls up to docsDevCpeIpMax - addresses based on the source IP addresses of those - packets. At initial system startup, default value for this - object is any(2)." + addresses as based on the source IPv4 or v6 addresses of + those packets." + DEFVAL { any } ::= { docsDevCpe 1 } docsDevCpeIpMax OBJECT-TYPE @@ -1660,54 +2204,63 @@ docsDevCpeIpMax OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "This object controls the maximum number of CPEs allowed to - connect behind this device. If set to zero, any number of - CPEs may connect up to the maximum permitted for the device. - If set to -1, no filtering is done on CPE source addresses, - and no entries are made in the docsDevFilterCpeTable. If an - attempt is made to set this to a number greater than that - permitted for the device, it is set to that maximum. - At iniitial system startup, default value for this object - is 1." + "This object controls the maximum number of CPEs allowed + to be learned behind this device. If set to zero, any + number of CPEs may connect up to the maximum permitted + for the device. + If set to -1, no filtering is done on CPE source + addresses, and no entries are made in the + docsDevFilterCpeTable via learning. If an attempt is + made to set this to a number greater than that + permitted for the device, it is set to that maximum." + DEFVAL { -1 } ::= { docsDevCpe 2 } docsDevCpeTable OBJECT-TYPE SYNTAX SEQUENCE OF DocsDevCpeEntry MAX-ACCESS not-accessible - STATUS current + STATUS deprecated DESCRIPTION - "This table lists the IP addresses seen (or permitted) as - source addresses in packets originating from the customer - interface on this device. In addition, this table can be - - + "This table lists the IPv4 addresses seen (or permitted) + as source addresses in packets originating from the + customer interface on this device. In addition, this + table can be provisioned with the specific addresses + permitted for the CPEs via the normal row creation + mechanisms. Table entries MUST NOT persist across + reboots for any device. + N.B. Management action can add entries in this table + and in docsDevCpeIpTable past the value of + docsDevCpeIpMax. docsDevCpeIpMax ONLY restricts the + ability of the CM to add learned addresses + automatically. - provisioned with the specific addresses permitted for the - CPEs via the normal row creation mechanisms." + This table is deprecated and is replaced by + docsDevCpeInetTable." ::= { docsDevCpe 3 } docsDevCpeEntry OBJECT-TYPE SYNTAX DocsDevCpeEntry MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "An entry in the docsDevFilterCpeTable. There is one entry - for each IP CPE seen or provisioned. If docsDevCpeIpMax - is set to -1, this table is ignored, otherwise: Upon receipt - of an IP packet from the customer interface of the CM, the - source IP address is checked against this table. If the - address is in the table, packet processing continues. - If the address is not in the table, but docsDevCpeEnroll - is set to any and the table size is less than - docsDevCpeIpMax, the address is added to the table and - packet processing continues. Otherwise, the packet is - dropped. - - The filtering actions specified by this table occur after - any LLC filtering (docsDevFilterLLCTable), but prior - to any IP filtering (docsDevFilterIpTable, + STATUS deprecated + DESCRIPTION + "An entry in the docsDevFilterCpeTable. There is one + entry for each IPv4 CPE seen or provisioned. If + docsDevCpeIpMax is set to -1, this table is ignored; + otherwise, upon receipt of an IP packet from the + customer interface of the CM, the source IP address is + checked against this table. If the address is in the + table, packet processing continues. If the address is + not in the table but docsDevCpeEnroll is set to any + and the sum of the table sizes of docsDevCpeTable and + docsDevCpeInetTable is less than docsDevCpeIpMax, the + address is added to the table, and packet processing + continues. Otherwise, the packet is dropped. + + The filtering actions specified by this table occur + after any LLC filtering (docsDevFilterLLCTable), but + prior to any IP filtering (docsDevFilterIpTable, docsDevNmAccessTable)." INDEX { docsDevCpeIp } ::= {docsDevCpeTable 1 } @@ -1721,9 +2274,13 @@ DocsDevCpeEntry ::= SEQUENCE { docsDevCpeIp OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS not-accessible - STATUS current + STATUS deprecated DESCRIPTION - "The IP address to which this entry applies." + "The IPv4 address to which this entry applies. + + N.B. Attempts to set all zeros or all ones address + values MUST be rejected." + ::= { docsDevCpeEntry 1 } docsDevCpeSource OBJECT-TYPE @@ -1733,49 +2290,168 @@ docsDevCpeSource OBJECT-TYPE learned(3) } + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "This object describes how this entry was created. If + the value is manual(2), this row was created by a + network management action (either configuration or + SNMP set). If set to learned(3), then it was found via + looking at the source IPv4 address of a received packet. + The value other(1) is used for any entries that do not + meet manual(2) or learned(3) criteria." + ::= { docsDevCpeEntry 2 } + +docsDevCpeStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "Standard object to manipulate rows. To create a row in + this table, one only needs to specify this object. + Management stations SHOULD use the create-and-go + mechanism for creating rows in this table." + ::= { docsDevCpeEntry 3 } +-- +-- Internet CPE Management and anti spoofing group, for support of +-- non-IPv4 CPEs. +-- + +docsDevCpeInetTable OBJECT-TYPE + SYNTAX SEQUENCE OF DocsDevCpeInetEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "This table lists the IP addresses seen (or permitted) as + source addresses in packets originating from the + customer interface on this device. In addition, this + table can be provisioned with the specific addresses + permitted for the CPEs via the normal row creation + mechanisms. + N.B. Management action can add entries in this table + and in docsDevCpeIpTable past the value of + docsDevCpeIpMax. docsDevCpeIpMax ONLY restricts the + ability of the CM to add learned addresses + automatically. + Table entries MUST NOT persist across reboots for any + device. + This table exactly mirrors docsDevCpeTable and applies + to IPv4 and IPv6 addresses." + ::= { docsDevCpe 4 } + +docsDevCpeInetEntry OBJECT-TYPE + SYNTAX DocsDevCpeInetEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry in the docsDevFilterCpeInetTable. There is one + entry for each IP CPE seen or provisioned. If + docsDevCpeIpMax is set to -1, this table is ignored; + otherwise, upon receipt of an IP packet from the + customer interface of the CM, the source IP address is + checked against this table. If the address is in the + table, packet processing continues. If the address is + not in the table but docsDevCpeEnroll is set to any and + the sum of the table sizes for docsDevCpeTable and + docsDevCpeInetTable is less than docsDevCpeIpMax, the + address is added to the table, and packet processing + continues. Otherwise, the packet is dropped. + + The filtering actions specified by this table occur + after any LLC filtering (docsDevFilterLLCTable), but + prior to any IP filtering (docsDevFilterIpTable, + docsDevNmAccessTable). + + When an agent (cable modem) restarts, then all + dynamically created rows are lost." + INDEX { docsDevCpeInetType, docsDevCpeInetAddr } + ::= { docsDevCpeInetTable 1 } + +DocsDevCpeInetEntry ::= SEQUENCE { + docsDevCpeInetType InetAddressType, + docsDevCpeInetAddr InetAddress, + docsDevCpeInetSource INTEGER, + docsDevCpeInetRowStatus RowStatus + } + +docsDevCpeInetType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The type of internet address of docsDevCpeInetAddr." + ::= { docsDevCpeInetEntry 1 } + +docsDevCpeInetAddr OBJECT-TYPE + SYNTAX InetAddress + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The Internet address to which this entry applies. + + Implementors need to be aware that if the size of + docsDevCpeInetAddr exceeds 114 octets OIDs of + instances of columns in this row will have more + than 128 sub-identifiers and cannot be accessed + using SNMPv1, SNMPv2c, or SNMPv3. Only unicast + address are allowed for this object." + ::= { docsDevCpeInetEntry 2 } + +docsDevCpeInetSource OBJECT-TYPE + SYNTAX INTEGER { + manual(2), + learned(3) + } MAX-ACCESS read-only STATUS current DESCRIPTION - "This object describes how this entry was created. If the - value is manual(2), this row was created by a network - management action (either configuration, or SNMP set). - If set to learned(3), then it was found via - looking at the source IP address of a received packet." - ::= { docsDevCpeEntry 2 } + "This object describes how this entry was created. If + the value is manual(2), this row was created by a + network management action (either configuration or + SNMP set). If set to learned(3), then it was found + via looking at the source IP address of a received + packet." + ::= { docsDevCpeInetEntry 3 } -docsDevCpeStatus OBJECT-TYPE +docsDevCpeInetRowStatus OBJECT-TYPE SYNTAX RowStatus MAX-ACCESS read-create STATUS current DESCRIPTION - "Standard object to manipulate rows. To create a row in this - table, you only need to specify this object. Management - stations SHOULD use the create-and-go mechanism for - creating rows in this table." - ::= { docsDevCpeEntry 3 } + "Standard object to manipulate rows. To create a row in + this table, one only needs to specify this object. + Management stations SHOULD use the create-and-go + mechanism for creating rows in this table." + + ::= { docsDevCpeInetEntry 4 } -- -- Placeholder for notifications/traps. -- + +-- erroneous, DO NOT USE docsDevNotification docsDevNotification OBJECT IDENTIFIER ::= { docsDev 2 } +-- erroneous, DO NOT USE docsDevNotification +docsDevNotifications OBJECT IDENTIFIER ::= { docsDev 0 } -- --- Conformance definitions +-- RFC 2669 Conformance definitions -- + docsDevConformance OBJECT IDENTIFIER ::= { docsDev 3 } docsDevGroups OBJECT IDENTIFIER ::= { docsDevConformance 1 } docsDevCompliances OBJECT IDENTIFIER ::= { docsDevConformance 2 } docsDevBasicCompliance MODULE-COMPLIANCE - STATUS current + STATUS deprecated DESCRIPTION - "The compliance statement for MCNS Cable Modems and - Cable Modem Termination Systems." + "The RFC 2669 compliance statement for MCNS/DOCSIS + Cable Modems and Cable Modem Termination Systems." MODULE -- docsDev @@ -1786,10 +2462,6 @@ GROUP docsDevBaseGroup "Mandatory in Cable Modems, optional in Cable Modem Termination Systems." - - - - GROUP docsDevEventGroup DESCRIPTION "Mandatory in Cable Modems, optional in Cable Modem @@ -1801,31 +2473,30 @@ GROUP docsDevFilterGroup Termination Systems." GROUP docsDevNmAccessGroup + DESCRIPTION - "This group is only implemented in devices which do not - implement SNMPv3 User Security Model. It SHOULD NOT be - implemented by SNMPv3 conformant devices. + "This group is only implemented in devices that do not + implement the SNMPv3 User Security Model. It SHOULD NOT + be implemented by devices that conform to SNMPv3. - For devices which do not implement SNMPv3 or later, this + For devices that do not implement SNMPv3 or later, this group is Mandatory in Cable Modems and is optional in Cable Modem Termination Systems." GROUP docsDevServerGroup DESCRIPTION - "This group is implemented only in Cable Modems and is + "This group is implemented only in Cable Modems, and is not implemented in Cable Modem Termination Systems." GROUP docsDevSoftwareGroup DESCRIPTION - "This group is Mandatory in Cable Modems and optional in + "This group is Mandatory in Cable Modems and optional in Cable Modem Termination Systems." GROUP docsDevCpeGroup DESCRIPTION "This group is Mandatory in Cable Modems, and is - not implemented in Cable Modem Termination Systems. A - similar capability for CMTS devices may be proposed later - after study." + not implemented in Cable Modem Termination Systems." OBJECT docsDevSTPControl MIN-ACCESS read-only @@ -1833,22 +2504,25 @@ OBJECT docsDevSTPControl "It is compliant to implement this object as read-only. Devices need only support noStFilterBpdu(2)." +OBJECT docsDevNmAccessIp + DESCRIPTION + "It is compliant to recognize the IP address + 255.255.255.255 as referring to any NMS." + OBJECT docsDevEvReporting MIN-ACCESS read-only DESCRIPTION "It is compliant to implement this object as read-only. - Devices need only support local(0)." - - - - - + Devices need only support local(0). An agent need not + enforce that trap or syslog logging be accompanied + by local(0) or localVolatile(3) logging." ::= { docsDevCompliances 1 } docsDevBaseGroup OBJECT-GROUP OBJECTS { docsDevRole, docsDevDateTime, + docsDevResetNow, docsDevSerialNumber, docsDevSTPControl @@ -1868,10 +2542,14 @@ docsDevNmAccessGroup OBJECT-GROUP docsDevNmAccessInterfaces, docsDevNmAccessStatus } - STATUS current + STATUS deprecated DESCRIPTION "A collection of objects for controlling access to SNMP - objects." + objects on cable devices. + + This group has been deprecated because all the + objects have been deprecated in favor of SNMPv3 and + Coexistence MIBs." ::= { docsDevGroups 2 } docsDevSoftwareGroup OBJECT-GROUP @@ -1882,29 +2560,41 @@ docsDevSoftwareGroup OBJECT-GROUP docsDevSwOperStatus, docsDevSwCurrentVers } - STATUS current + STATUS deprecated DESCRIPTION "A collection of objects for controlling software - downloads." + downloads. + + This group has been deprecated and replaced by + docsDevSoftwareGroupV2. Object docsDevSwServer + has been replaced by docsDevSwServerAddressType + and docsDevSwServerAddress, and + docsDevSwServerTransportProtocol has been added to + support TFTP and HTTP firmware downloads." + ::= { docsDevGroups 3 } docsDevServerGroup OBJECT-GROUP OBJECTS { docsDevServerBootState, - - - - - docsDevServerDhcp, docsDevServerTime, docsDevServerTftp, docsDevServerConfigFile } - STATUS current + STATUS deprecated DESCRIPTION "A collection of objects providing status about server - provisioning." + provisioning. + + This group has been deprecated and replaced by + docsDevServerGroupV2. The objects docsDevServerDhcp, + docsDevServerTime, and docsDevServerTftp have + been replaced by docsDevServerDhcpAddressType, + docsDevServerDhcpAddress, docsDevServerTimeAddressType, + docsDevServerTimeAddress, + docsDevServerConfigTftpAddressType, and + docsDevServerConfigTftpAddress." ::= { docsDevGroups 4 } docsDevEventGroup OBJECT-GROUP @@ -1923,10 +2613,18 @@ docsDevEventGroup OBJECT-GROUP docsDevEvId, docsDevEvText } - STATUS current + STATUS deprecated DESCRIPTION "A collection of objects used to control and monitor - events." + events. + + This group has been deprecated and replaced by + docsDevEventGroupV2. The object docsDevEvSyslog has + + been replaced by docsDevEvSyslogAddressType and + docsDevEvSyslogAddress, and docsDevEvThrottleInhibited + has been replaced by + docsDevEvThrottleThresholdExceeded." ::= { docsDevGroups 5 } docsDevFilterGroup OBJECT-GROUP @@ -1944,11 +2642,6 @@ docsDevFilterGroup OBJECT-GROUP docsDevFilterIpDirection, docsDevFilterIpBroadcast, docsDevFilterIpSaddr, - - - - - docsDevFilterIpSmask, docsDevFilterIpDaddr, docsDevFilterIpDmask, @@ -1969,10 +2662,14 @@ docsDevFilterGroup OBJECT-GROUP docsDevFilterTosAndMask, docsDevFilterTosOrMask } - STATUS current + STATUS deprecated DESCRIPTION - "A collection of objects to specify filters at link layer - and IP layer." + "A collection of objects to specify filters at the link + layer and IPv4 layer. + + This group has been deprecated and replaced by various + groups from the DiffServ MIB." + ::= { docsDevGroups 6 } docsDevCpeGroup OBJECT-GROUP @@ -1982,11 +2679,490 @@ docsDevCpeGroup OBJECT-GROUP docsDevCpeSource, docsDevCpeStatus } - STATUS current + STATUS deprecated DESCRIPTION "A collection of objects used to control the number - and specific values of IP addresses allowed for - associated Customer Premises Equipment (CPE)." + and specific values of IPv4 addresses allowed for + associated Customer Premises Equipment (CPE). + + This group has been deprecated and replaced by + docsDevInetCpeGroup. The object docsDevCpeSource has + been replaced by docsDevCpeInetSource, and + docsDevCpeStatus has been replaced by + docsDevCpeInetRowStatus." ::= { docsDevGroups 7 } +-- +-- RFC 4639 Conformance definitions +-- + +docsDevGroupsV2 OBJECT IDENTIFIER ::= { docsDevConformance 3 } +docsDevCompliancesV2 OBJECT IDENTIFIER ::= { docsDevConformance 4 } + +docsDevCmCompliance MODULE-COMPLIANCE + STATUS current + DESCRIPTION + "The compliance statement for DOCSIS Cable Modems. + + This compliance statement applies to implementations + of DOCSIS versions that are not IPv6 capable." + +MODULE DIFFSERV-MIB -- RFC 3289 + +MANDATORY-GROUPS { + diffServMIBDataPathGroup, + diffServMIBClfrGroup, + diffServMIBClfrElementGroup, + diffServMIBMultiFieldClfrGroup, + diffServMIBActionGroup, + diffServMIBDscpMarkActGroup, + diffServMIBCounterGroup, + diffServMIBAlgDropGroup + + } + +OBJECT diffServDataPathStatus -- same as RFC 3289 + SYNTAX RowStatus { active(1) } + WRITE-SYNTAX RowStatus { createAndGo(4), destroy(6) } + DESCRIPTION + "Support for createAndWait and notInService is not + required." + +OBJECT diffServClfrStatus -- same as RFC 3289 + SYNTAX RowStatus { active(1) } + WRITE-SYNTAX RowStatus { createAndGo(4), destroy(6) } + DESCRIPTION + "Support for createAndWait and notInService is not + required." + +OBJECT diffServClfrElementStatus -- same as RFC 3289 + SYNTAX RowStatus { active(1) } + WRITE-SYNTAX RowStatus { createAndGo(4), destroy(6) } + DESCRIPTION + "Support for createAndWait and notInService is not + required." + +OBJECT diffServMultiFieldClfrAddrType + SYNTAX InetAddressType { ipv4(1) } + DESCRIPTION + "An implementation is only required to support IPv4 + addresses." + +OBJECT diffServMultiFieldClfrSrcAddr + SYNTAX InetAddress (SIZE(4)) + DESCRIPTION + "An implementation is only required to support IPv4 + addresses." + +OBJECT diffServMultiFieldClfrDstAddr + SYNTAX InetAddress (SIZE(4)) + DESCRIPTION + "An implementation is only required to support IPv4 + addresses." + +OBJECT diffServAlgDropStatus -- same as RFC 3289 + SYNTAX RowStatus { active(1) } + WRITE-SYNTAX RowStatus { createAndGo(4), destroy(6) } + DESCRIPTION + "Support for createAndWait and notInService is not + required." + +OBJECT diffServDataPathStorage + SYNTAX StorageType { volatile(2) } + DESCRIPTION + "An implementation is only required to support + volatile storage." + +OBJECT diffServClfrStorage + SYNTAX StorageType { volatile(2) } + DESCRIPTION + "An implementation is only required to support + volatile storage." + +OBJECT diffServClfrElementStorage + SYNTAX StorageType { volatile(2) } + DESCRIPTION + "An implementation is only required to support + volatile storage." + +OBJECT diffServMultiFieldClfrStorage + SYNTAX StorageType { volatile(2) } + DESCRIPTION + "An implementation is only required to support + volatile storage." + +OBJECT diffServActionStorage + SYNTAX StorageType { volatile(2) } + DESCRIPTION + "An implementation is only required to support + volatile storage." + +OBJECT diffServCountActStorage + SYNTAX StorageType { volatile(2) } + DESCRIPTION + "An implementation is only required to support + volatile storage." + +OBJECT diffServAlgDropStorage + SYNTAX StorageType { volatile(2) } + DESCRIPTION + "An implementation is only required to support + volatile storage." + +OBJECT diffServAlgDropType + SYNTAX INTEGER { alwaysDrop(5) } + DESCRIPTION + "This object is only used to provide packet + filtering. Implementations need not support other + values of this enumeration." + +MODULE -- docsDev + +MANDATORY-GROUPS { + docsDevBaseGroup, + docsDevBaseIgmpGroup, + docsDevBaseMaxCpeGroup, + docsDevSoftwareGroupV2, + docsDevServerGroupV2, + docsDevEventGroupV2, + docsDevFilterLLCGroup + } + +-- conditionally mandatory groups + +GROUP docsDevInetCpeGroup + DESCRIPTION + "This group is optional in Cable Modems." + +OBJECT docsDevDateTime + MIN-ACCESS read-only + DESCRIPTION + "It is compliant to implement this object as read-only." + +OBJECT docsDevSTPControl + SYNTAX INTEGER { noStFilterBpdu(2) } + MIN-ACCESS read-only + DESCRIPTION + "It is compliant to implement this object as read-only. + Devices need only support noStFilterBpdu(2)." + +OBJECT docsDevIgmpModeControl + SYNTAX INTEGER { passive(1) } + MIN-ACCESS read-only + DESCRIPTION + "It is compliant to implement this object as read-only. + Devices need only support passive(1)." + +OBJECT docsDevSwServerAddressType + SYNTAX InetAddressType { ipv4(1) } + DESCRIPTION + "An implementation is only required to support IPv4 + addresses." + +OBJECT docsDevSwServerAddress + SYNTAX InetAddress (SIZE(4)) + DESCRIPTION + "An implementation is only required to support IPv4 + addresses." + +OBJECT docsDevServerDhcpAddressType + SYNTAX InetAddressType { ipv4(1) } + DESCRIPTION + "An implementation is only required to support IPv4 + addresses." + +OBJECT docsDevServerDhcpAddress + SYNTAX InetAddress (SIZE(4)) + DESCRIPTION + "An implementation is only required to support IPv4 + addresses." + +OBJECT docsDevServerTimeAddressType + SYNTAX InetAddressType { ipv4(1) } + DESCRIPTION + "An implementation is only required to support IPv4 + addresses." + +OBJECT docsDevServerTimeAddress + SYNTAX InetAddress (SIZE(4)) + DESCRIPTION + "An implementation is only required to support IPv4 + addresses." + +OBJECT docsDevServerConfigTftpAddressType + SYNTAX InetAddressType { ipv4(1) } + DESCRIPTION + "An implementation is only required to support IPv4 + addresses." + +OBJECT docsDevServerConfigTftpAddress + SYNTAX InetAddress (SIZE(4)) + DESCRIPTION + "An implementation is only required to support IPv4 + addresses." + +OBJECT docsDevEvReporting + MIN-ACCESS read-only + DESCRIPTION + "It is compliant to implement this object as read-only. + Devices need only support local(0)." + +OBJECT docsDevEvSyslogAddressType + SYNTAX InetAddressType { ipv4(1) } + DESCRIPTION + "An implementation is only required to support IPv4 + addresses." + +OBJECT docsDevEvSyslogAddress + SYNTAX InetAddress (SIZE(4)) + DESCRIPTION + "An implementation is only required to support IPv4 + addresses." + +OBJECT docsDevSwServerTransportProtocol + SYNTAX INTEGER { tftp(1) } + DESCRIPTION + "An implementation is only required to support TFTP + software image downloads." + + ::= { docsDevCompliancesV2 1 } + +docsDevCmtsCompliance MODULE-COMPLIANCE + STATUS current + DESCRIPTION + "The compliance statement for DOCSIS Cable Modem + Termination Systems. + + This compliance statement applies to implementations + of DOCSIS versions that are not IPv6 capable." + +MODULE -- docsDev + +-- conditionally mandatory groups + +GROUP docsDevBaseGroup + DESCRIPTION + "Optional in Cable Modem Termination Systems." + +GROUP docsDevBaseIgmpGroup + DESCRIPTION + "Optional in Cable Modem Termination Systems." + +GROUP docsDevBaseMaxCpeGroup + DESCRIPTION + "This group MUST NOT be implemented in Cable Modem + Termination Systems." + +GROUP docsDevSoftwareGroupV2 + DESCRIPTION + "Optional in Cable Modem Termination Systems." + +GROUP docsDevServerGroupV2 + DESCRIPTION + "This group MUST NOT be implemented in Cable Modem + Termination Systems." + +GROUP docsDevEventGroupV2 + DESCRIPTION + "Optional in Cable Modem Termination Systems." + +GROUP docsDevFilterLLCGroup + DESCRIPTION + "This group MUST NOT be implemented in Cable Modem + Termination Systems. See the Subscriber Management + MIB for similar CMTS capability." + +GROUP docsDevInetCpeGroup + DESCRIPTION + "This group MUST NOT be implemented in Cable Modem + Termination Systems. See the Subscriber Management + MIB for similar CMTS capability." + +OBJECT docsDevDateTime + MIN-ACCESS read-only + DESCRIPTION + "It is compliant to implement this object as read-only." + +OBJECT docsDevSTPControl + SYNTAX INTEGER { noStFilterBpdu(2) } + MIN-ACCESS read-only + DESCRIPTION + "It is compliant to implement this object as read-only. + Devices need only support noStFilterBpdu(2)." + +OBJECT docsDevIgmpModeControl + SYNTAX INTEGER { passive(1) } + MIN-ACCESS read-only + DESCRIPTION + "It is compliant to implement this object as read-only. + Devices need only support passive(1)." + +OBJECT docsDevSwServerAddressType + SYNTAX InetAddressType { ipv4(1) } + DESCRIPTION + "An implementation is only required to support IPv4 + addresses." + +OBJECT docsDevSwServerAddress + SYNTAX InetAddress (SIZE(4)) + DESCRIPTION + "An implementation is only required to support IPv4 + addresses." + +OBJECT docsDevEvReporting + + MIN-ACCESS read-only + DESCRIPTION + "It is compliant to implement this object as read-only. + Devices need only support local(0)." + +OBJECT docsDevEvSyslogAddressType + SYNTAX InetAddressType { ipv4(1) } + DESCRIPTION + "An implementation is only required to support IPv4 + addresses." + +OBJECT docsDevEvSyslogAddress + SYNTAX InetAddress (SIZE(4)) + DESCRIPTION + "An implementation is only required to support IPv4 + addresses." + +OBJECT docsDevSwServerTransportProtocol + SYNTAX INTEGER { tftp(1) } + DESCRIPTION + "An implementation is only required to support TFTP + software image downloads." + + ::= { docsDevCompliancesV2 2 } + +docsDevBaseIgmpGroup OBJECT-GROUP + OBJECTS { + docsDevIgmpModeControl + } + STATUS current + DESCRIPTION + "An object providing cable device IGMP status and + control." + ::= { docsDevGroupsV2 1 } + +docsDevBaseMaxCpeGroup OBJECT-GROUP + OBJECTS { + docsDevMaxCpe + } + STATUS current + DESCRIPTION + "An object providing management of the maximum number of + CPEs permitted access through a cable modem." + ::= { docsDevGroupsV2 2 } + +docsDevNmAccessExtGroup OBJECT-GROUP + OBJECTS { + docsDevNmAccessTrapVersion + + } + STATUS deprecated + DESCRIPTION + "An object, in addition to the objects in + docsDevNmAccessGroup, for controlling access to + SNMP objects on cable devices. + + This group is included in this MIB due to existing + implementations of docsDevNmAccessTrapVersion in + DOCSIS cable modems. + + This group has been deprecated because the object has + been deprecated in favor of SNMPv3 and Coexistence + MIBs." + ::= { docsDevGroupsV2 3 } + +docsDevSoftwareGroupV2 OBJECT-GROUP + OBJECTS { + docsDevSwFilename, + docsDevSwAdminStatus, + docsDevSwOperStatus, + docsDevSwCurrentVers, + docsDevSwServerAddressType, + docsDevSwServerAddress, + docsDevSwServerTransportProtocol + } + STATUS current + DESCRIPTION + "A collection of objects for controlling software + downloads. This group replaces docsDevSoftwareGroup." + ::= { docsDevGroupsV2 4 } + +docsDevServerGroupV2 OBJECT-GROUP + OBJECTS { + docsDevServerBootState, + docsDevServerDhcpAddressType, + docsDevServerDhcpAddress, + docsDevServerTimeAddressType, + docsDevServerTimeAddress, + docsDevServerConfigTftpAddressType, + docsDevServerConfigTftpAddress, + docsDevServerConfigFile + } + STATUS current + DESCRIPTION + "A collection of objects providing status about server + provisioning. This group replaces docsDevServerGroup." + ::= { docsDevGroupsV2 5 } + +docsDevEventGroupV2 OBJECT-GROUP + OBJECTS { + docsDevEvControl, + docsDevEvThrottleAdminStatus, + docsDevEvThrottleThreshold, + docsDevEvThrottleInterval, + docsDevEvReporting, + docsDevEvFirstTime, + docsDevEvLastTime, + docsDevEvCounts, + docsDevEvLevel, + docsDevEvId, + docsDevEvText, + docsDevEvSyslogAddressType, + docsDevEvSyslogAddress, + docsDevEvThrottleThresholdExceeded + } + STATUS current + DESCRIPTION + "A collection of objects used to control and monitor + events. This group replaces docsDevEventGroup. + The event reporting mechanism, and more specifically + docsDevEvReporting, can be used to take advantage of + the event reporting features of RFC3413 and RFC3014." + ::= { docsDevGroupsV2 6 } + +docsDevFilterLLCGroup OBJECT-GROUP + OBJECTS { + docsDevFilterLLCUnmatchedAction, + docsDevFilterLLCStatus, + docsDevFilterLLCIfIndex, + docsDevFilterLLCProtocolType, + docsDevFilterLLCProtocol, + docsDevFilterLLCMatches + } + STATUS current + DESCRIPTION + "A collection of objects to specify link layer filters." + ::= { docsDevGroupsV2 7 } + +docsDevInetCpeGroup OBJECT-GROUP + OBJECTS { + docsDevCpeEnroll, + docsDevCpeIpMax, + docsDevCpeInetSource, + docsDevCpeInetRowStatus + } + STATUS current + + DESCRIPTION + "A collection of objects used to control the number + and specific values of Internet (e.g., IPv4 and IPv6) + addresses allowed for associated Customer Premises + Equipment (CPE)." + ::= { docsDevGroupsV2 8 } + END diff --git a/mibs/arris/DOCS-QOS-MIB b/mibs/DOCS-QOS-MIB similarity index 100% rename from mibs/arris/DOCS-QOS-MIB rename to mibs/DOCS-QOS-MIB diff --git a/mibs/arris/DOCS-SUBMGT-MIB b/mibs/DOCS-SUBMGT-MIB similarity index 100% rename from mibs/arris/DOCS-SUBMGT-MIB rename to mibs/DOCS-SUBMGT-MIB diff --git a/mibs/brocade/FIBRE-CHANNEL-FE-MIB b/mibs/FIBRE-CHANNEL-FE-MIB similarity index 100% rename from mibs/brocade/FIBRE-CHANNEL-FE-MIB rename to mibs/FIBRE-CHANNEL-FE-MIB diff --git a/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB b/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB index 2f646cd79cd..9e30f8572a0 100644 --- a/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB +++ b/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB @@ -1,175 +1,206 @@ -IANA-ADDRESS-FAMILY-NUMBERS-MIB DEFINITIONS ::= BEGIN - -IMPORTS - MODULE-IDENTITY, - mib-2 FROM SNMPv2-SMI - TEXTUAL-CONVENTION FROM SNMPv2-TC; - -ianaAddressFamilyNumbers MODULE-IDENTITY - LAST-UPDATED "201911040000Z" -- November 4, 2019 - ORGANIZATION "IANA" - CONTACT-INFO - "Postal: Internet Assigned Numbers Authority - Internet Corporation for Assigned Names and Numbers - 12025 Waterfront Drive, Suite 300 - Los Angeles, CA 90094-2536 - USA - - Tel: +1 310-301-5800 - E-Mail: iana&iana.org" - DESCRIPTION - "The MIB module defines the AddressFamilyNumbers - textual convention." - - -- revision history - - REVISION "201911040000Z" -- November 4, 2019 - DESCRIPTION "Assigned value 16397." - - REVISION "201409020000Z" -- September 2, 2014 - DESCRIPTION "Assigned value 16396." - - REVISION "201309250000Z" -- September 25, 2013 - DESCRIPTION "Assigned values 16391-16395." - - REVISION "201307160000Z" -- July 16, 2013 - DESCRIPTION "Fixed labels for 16389-16390." - - REVISION "201306260000Z" -- June 26, 2013 - DESCRIPTION "Added assignments 26-28." - - REVISION "201306180000Z" -- June 18, 2013 - DESCRIPTION "Added assignments 16384-16390. Assignment - 25 added in 2007 revision." - - REVISION "200203140000Z" -- March 14, 2002 - DESCRIPTION "AddressFamilyNumbers assignment 22 to - fibreChannelWWPN. AddressFamilyNumbers - assignment 23 to fibreChannelWWNN. - AddressFamilyNumers assignment 24 to gwid." - - REVISION "200009080000Z" -- September 8, 2000 - DESCRIPTION "AddressFamilyNumbers assignment 19 to xtpOverIpv4. - AddressFamilyNumbers assignment 20 to xtpOverIpv6. - AddressFamilyNumbers assignment 21 to xtpNativeModeXTP." - - REVISION "200003010000Z" -- March 1, 2000 - DESCRIPTION "AddressFamilyNumbers assignment 17 to distinguishedName. - AddressFamilyNumbers assignment 18 to asNumber." - - REVISION "200002040000Z" -- February 4, 2000 - DESCRIPTION "AddressFamilyNumbers assignment 16 to dns." - - REVISION "9908260000Z" -- August 26, 1999 - DESCRIPTION "Initial version, published as RFC 2677." - ::= { mib-2 72 } - -AddressFamilyNumbers ::= TEXTUAL-CONVENTION - STATUS current - DESCRIPTION - "The definition of this textual convention with the - addition of newly assigned values is published - periodically by the IANA, in either the Assigned - Numbers RFC, or some derivative of it specific to - Internet Network Management number assignments. - (The latest arrangements can be obtained by - contacting the IANA.) - - The enumerations are described as: - - other(0), -- none of the following - ipV4(1), -- IP Version 4 - ipV6(2), -- IP Version 6 - nsap(3), -- NSAP - hdlc(4), -- (8-bit multidrop) - bbn1822(5), - all802(6), -- (includes all 802 media - -- plus Ethernet 'canonical format') - e163(7), - e164(8), -- (SMDS, Frame Relay, ATM) - f69(9), -- (Telex) - x121(10), -- (X.25, Frame Relay) - ipx(11), -- IPX (Internet Protocol Exchange) - appleTalk(12), -- Apple Talk - decnetIV(13), -- DEC Net Phase IV - banyanVines(14), -- Banyan Vines - e164withNsap(15), - -- (E.164 with NSAP format subaddress) - dns(16), -- (Domain Name System) - distinguishedName(17), -- (Distinguished Name, per X.500) - asNumber(18), -- (16-bit quantity, per the AS number space) - xtpOverIpv4(19), -- XTP over IP version 4 - xtpOverIpv6(20), -- XTP over IP version 6 - xtpNativeModeXTP(21), -- XTP native mode XTP - fibreChannelWWPN(22), -- Fibre Channel World-Wide Port Name - fibreChannelWWNN(23), -- Fibre Channel World-Wide Node Name - gwid(24), -- Gateway Identifier - afi(25), -- AFI for L2VPN information - mplsTpSectionEndpointIdentifier(26), -- MPLS-TP Section Endpoint Identifier - mplsTpLspEndpointIdentifier(27), -- MPLS-TP LSP Endpoint Identifier - mplsTpPseudowireEndpointIdentifier(28), -- MPLS-TP Pseudowire Endpoint Identifier - eigrpCommonServiceFamily(16384), -- EIGRP Common Service Family - eigrpIpv4ServiceFamily(16385), -- EIGRP IPv4 Service Family - eigrpIpv6ServiceFamily(16386), -- EIGRP IPv6 Service Family - lispCanonicalAddressFormat(16387), -- LISP Canonical Address Format (LCAF) - bgpLs(16388), -- BGP-LS - fortyeightBitMacBitMac(16389), -- 48-bit MAC - sixtyfourBitMac(16390), -- 64-bit MAC - oui(16391), -- OUI - mac24(16392), -- MAC/24 - mac40(16393), -- MAC/40 - ipv664(16394), -- IPv6/64 - rBridgePortID(16395), -- RBridge Port ID - trillNickname(16396), -- TRILL Nickname - universallyUniqueIdentifier(16397), -- Universally Unique Identifier (UUID) - reserved(65535) - - Requests for new values should be made to IANA via - email (iana&iana.org)." - SYNTAX INTEGER { - other(0), - ipV4(1), - ipV6(2), - nsap(3), - hdlc(4), - bbn1822(5), - all802(6), - e163(7), - e164(8), - f69(9), - x121(10), - ipx(11), - appleTalk(12), - decnetIV(13), - banyanVines(14), - e164withNsap(15), - dns(16), - distinguishedName(17), -- (Distinguished Name, per X.500) - asNumber(18), -- (16-bit quantity, per the AS number space) - xtpOverIpv4(19), - xtpOverIpv6(20), - xtpNativeModeXTP(21), - fibreChannelWWPN(22), - fibreChannelWWNN(23), - gwid(24), - afi(25), - mplsTpSectionEndpointIdentifier(26), - mplsTpLspEndpointIdentifier(27), - mplsTpPseudowireEndpointIdentifier(28), - eigrpCommonServiceFamily(16384), - eigrpIpv4ServiceFamily(16385), - eigrpIpv6ServiceFamily(16386), - lispCanonicalAddressFormat(16387), - bgpLs(16388), - fortyeightBitMac(16389), - sixtyfourBitMac(16390), - oui(16391), - mac24(16392), - mac40(16393), - ipv664(16394), - rBridgePortID(16395), - trillNickname(16396), - universallyUniqueIdentifier(16397), - reserved(65535) - } - END + IANA-ADDRESS-FAMILY-NUMBERS-MIB DEFINITIONS ::= BEGIN + + IMPORTS + MODULE-IDENTITY, + mib-2 FROM SNMPv2-SMI + TEXTUAL-CONVENTION FROM SNMPv2-TC; + + ianaAddressFamilyNumbers MODULE-IDENTITY + LAST-UPDATED "202110190000Z" -- October 19, 2021 + ORGANIZATION "IANA" + CONTACT-INFO + "Postal: Internet Assigned Numbers Authority + Internet Corporation for Assigned Names and Numbers + 12025 Waterfront Drive, Suite 300 + Los Angeles, CA 90094-2536 + USA + + Tel: +1 310-301-5800 + E-Mail: iana&iana.org" + DESCRIPTION + "The MIB module defines the AddressFamilyNumbers + textual convention." + + -- revision history + + REVISION "202110190000Z" -- October 19, 2021 + DESCRIPTION "Assigned value 16399." + + REVISION "202105180000Z" -- May 18, 2021 + DESCRIPTION "Assigned value 31." + + REVISION "202009140000Z" -- September 14, 2020 + DESCRIPTION "Added missing value 16398." + + REVISION "202009020000Z" -- September 2, 2020 + DESCRIPTION "Added assignments 29-30." + + REVISION "202005120000Z" -- May 12, 2020 + DESCRIPTION "Assigned value 16398." + + REVISION "201911040000Z" -- November 4, 2019 + DESCRIPTION "Assigned value 16397." + + REVISION "201409020000Z" -- September 2, 2014 + DESCRIPTION "Assigned value 16396." + + REVISION "201309250000Z" -- September 25, 2013 + DESCRIPTION "Assigned values 16391-16395." + + REVISION "201307160000Z" -- July 16, 2013 + DESCRIPTION "Fixed labels for 16389-16390." + + REVISION "201306260000Z" -- June 26, 2013 + DESCRIPTION "Added assignments 26-28." + + REVISION "201306180000Z" -- June 18, 2013 + DESCRIPTION "Added assignments 16384-16390. Assignment + 25 added in 2007 revision." + + REVISION "200203140000Z" -- March 14, 2002 + DESCRIPTION "AddressFamilyNumbers assignment 22 to + fibreChannelWWPN. AddressFamilyNumbers + assignment 23 to fibreChannelWWNN. + AddressFamilyNumers assignment 24 to gwid." + + REVISION "200009080000Z" -- September 8, 2000 + DESCRIPTION "AddressFamilyNumbers assignment 19 to xtpOverIpv4. + AddressFamilyNumbers assignment 20 to xtpOverIpv6. + AddressFamilyNumbers assignment 21 to xtpNativeModeXTP." + + REVISION "200003010000Z" -- March 1, 2000 + DESCRIPTION "AddressFamilyNumbers assignment 17 to distinguishedName. + AddressFamilyNumbers assignment 18 to asNumber." + + REVISION "200002040000Z" -- February 4, 2000 + DESCRIPTION "AddressFamilyNumbers assignment 16 to dns." + + REVISION "9908260000Z" -- August 26, 1999 + DESCRIPTION "Initial version, published as RFC 2677." + + ::= { mib-2 72 } + + + AddressFamilyNumbers ::= TEXTUAL-CONVENTION + + STATUS current + DESCRIPTION + "The definition of this textual convention with the + addition of newly assigned values is published + periodically by the IANA, in either the Assigned + Numbers RFC, or some derivative of it specific to + Internet Network Management number assignments. + (The latest arrangements can be obtained by + contacting the IANA.) + + The enumerations are described as: + + other(0), -- none of the following + ipV4(1), -- IP Version 4 + ipV6(2), -- IP Version 6 + nsap(3), -- NSAP + hdlc(4), -- (8-bit multidrop) + bbn1822(5), + all802(6), -- (includes all 802 media + -- plus Ethernet 'canonical format') + e163(7), + e164(8), -- (SMDS, Frame Relay, ATM) + f69(9), -- (Telex) + x121(10), -- (X.25, Frame Relay) + ipx(11), -- IPX (Internet Protocol Exchange) + appleTalk(12), -- Apple Talk + decnetIV(13), -- DEC Net Phase IV + banyanVines(14), -- Banyan Vines + e164withNsap(15), + -- (E.164 with NSAP format subaddress) + dns(16), -- (Domain Name System) + distinguishedName(17), -- (Distinguished Name, per X.500) + asNumber(18), -- (16-bit quantity, per the AS number space) + xtpOverIpv4(19), -- XTP over IP version 4 + xtpOverIpv6(20), -- XTP over IP version 6 + xtpNativeModeXTP(21), -- XTP native mode XTP + fibreChannelWWPN(22), -- Fibre Channel World-Wide Port Name + fibreChannelWWNN(23), -- Fibre Channel World-Wide Node Name + gwid(24), -- Gateway Identifier + afi(25), -- AFI for L2VPN information + mplsTpSectionEndpointIdentifier(26), -- MPLS-TP Section Endpoint Identifier + mplsTpLspEndpointIdentifier(27), -- MPLS-TP LSP Endpoint Identifier + mplsTpPseudowireEndpointIdentifier(28), -- MPLS-TP Pseudowire Endpoint Identifier + mtIpMultiTopologyIpVersion4 (29), -- MT IP: Multi-Topology IP version 4 + mtIpv6MultiTopologyIpVersion6 (30), -- MT IPv6: Multi-Topology IP version 6 + bgpSfc (31), -- BGP SFC + eigrpCommonServiceFamily(16384), -- EIGRP Common Service Family + eigrpIpv4ServiceFamily(16385), -- EIGRP IPv4 Service Family + eigrpIpv6ServiceFamily(16386), -- EIGRP IPv6 Service Family + lispCanonicalAddressFormat(16387), -- LISP Canonical Address Format (LCAF) + bgpLs(16388), -- BGP-LS + fortyeightBitMacBitMac(16389), -- 48-bit MAC + sixtyfourBitMac(16390), -- 64-bit MAC + oui(16391), -- OUI + mac24(16392), -- MAC/24 + mac40(16393), -- MAC/40 + ipv664(16394), -- IPv6/64 + rBridgePortID(16395), -- RBridge Port ID + trillNickname(16396), -- TRILL Nickname + universallyUniqueIdentifier(16397), -- Universally Unique Identifier (UUID) + routingPolicyAfi(16398), -- Routing Policy AFI + mplsNamespaces(16399), -- MPLS Namespaces + reserved(65535) + + + + Requests for new values should be made to IANA via + email (iana&iana.org)." + + SYNTAX INTEGER { + other(0), + ipV4(1), + ipV6(2), + nsap(3), + hdlc(4), + bbn1822(5), + all802(6), + e163(7), + e164(8), + f69(9), + x121(10), + ipx(11), + appleTalk(12), + decnetIV(13), + banyanVines(14), + e164withNsap(15), + dns(16), + distinguishedName(17), -- (Distinguished Name, per X.500) + asNumber(18), -- (16-bit quantity, per the AS number space) + xtpOverIpv4(19), + xtpOverIpv6(20), + xtpNativeModeXTP(21), + fibreChannelWWPN(22), + fibreChannelWWNN(23), + gwid(24), + afi(25), + mplsTpSectionEndpointIdentifier(26), + mplsTpLspEndpointIdentifier(27), + mplsTpPseudowireEndpointIdentifier(28), + mtipmultitopologyipversion4 (29), + mtipv6multitopologyipversion6 (30), + bgpSfc (31), + eigrpCommonServiceFamily(16384), + eigrpIpv4ServiceFamily(16385), + eigrpIpv6ServiceFamily(16386), + lispCanonicalAddressFormat(16387), + bgpLs(16388), + fortyeightBitMac(16389), + sixtyfourBitMac(16390), + oui(16391), + mac24(16392), + mac40(16393), + ipv664(16394), + rBridgePortID(16395), + trillNickname(16396), + universallyUniqueIdentifier(16397), + routingPolicyAfi(16398), + mplsNamespaces(16399), + reserved(65535) + } + END diff --git a/mibs/IANA-CHARSET-MIB b/mibs/IANA-CHARSET-MIB index 804e6dcc73e..11c9276ec0f 100644 --- a/mibs/IANA-CHARSET-MIB +++ b/mibs/IANA-CHARSET-MIB @@ -9,7 +9,7 @@ IMPORTS FROM SNMPv2-TC; -- [RFC2579] ianaCharsetMIB MODULE-IDENTITY - LAST-UPDATED "201405220000Z" + LAST-UPDATED "202101040000Z" ORGANIZATION "IANA" CONTACT-INFO " Internet Assigned Numbers Authority @@ -19,6 +19,7 @@ ianaCharsetMIB MODULE-IDENTITY Tel: +1 310-301-5800 E-Mail: iana&iana.org" + DESCRIPTION "This MIB module defines the IANACharset TEXTUAL-CONVENTION. The IANACharset TC is used to specify the encoding of string objects defined in @@ -46,6 +47,9 @@ ianaCharsetMIB MODULE-IDENTITY -- revision history + REVISION "202101040000Z" + DESCRIPTION "Registration of new charset 1021." + REVISION "201405220000Z" DESCRIPTION "Updated contact info." @@ -60,7 +64,7 @@ ianaCharsetMIB MODULE-IDENTITY REVISION "201009150000Z" DESCRIPTION "Registration of new charset 2108." - + REVISION "200705140000Z" DESCRIPTION "Registration of new charset 2107." @@ -72,6 +76,7 @@ ianaCharsetMIB MODULE-IDENTITY DESCRIPTION "Original version transferred from Printer MIB, generated from the IANA maintained assignments http://www.iana.org/assignments/character-sets." + ::= { mib-2 106 } IANACharset ::= TEXTUAL-CONVENTION @@ -235,6 +240,7 @@ IANACharset ::= TEXTUAL-CONVENTION csUTF32BE(1018), csUTF32LE(1019), csBOCU1(1020), + csUTF7IMAP(1021), csWindows30Latin1(2000), csWindows31Latin1(2001), csWindows31Latin2(2002), @@ -359,3 +365,4 @@ IANACharset ::= TEXTUAL-CONVENTION reserved(3000) } END + diff --git a/mibs/IANA-MAU-MIB b/mibs/IANA-MAU-MIB index 54f2804ac66..57e2d1e9027 100644 --- a/mibs/IANA-MAU-MIB +++ b/mibs/IANA-MAU-MIB @@ -8,7 +8,7 @@ IANA-MAU-MIB DEFINITIONS ::= BEGIN ; ianaMauMIB MODULE-IDENTITY - LAST-UPDATED "201704100000Z" -- April 10, 2017 + LAST-UPDATED "202607150000Z" -- July 15, 2026 ORGANIZATION "IANA" CONTACT-INFO " Internet Assigned Numbers Authority @@ -18,6 +18,7 @@ IANA-MAU-MIB DEFINITIONS ::= BEGIN Tel: +1-310-301-5800 EMail: iana&iana.org" + DESCRIPTION "This MIB module defines dot3MauType OBJECT-IDENTITIES and IANAifMauListBits, IANAifMauMediaAvailable, @@ -39,14 +40,8 @@ IANA-MAU-MIB DEFINITIONS ::= BEGIN The following reference is used throughout this MIB module: - [IEEE802.3] refers to: - IEEE Std 802.3, 2005 Edition: 'IEEE Standard for - Information technology - Telecommunications and information - exchange between systems - Local and metropolitan area - networks - Specific requirements - - Part 3: Carrier sense multiple access with collision - detection (CSMA/CD) access method and physical layer - specifications'. + [IEEE802.3] refers to IEEE Std 802.3-2022: + 'IEEE Standard for Ethernet'. This reference should be updated as appropriate when new MAU types, Media Availability states, Auto Negotiation @@ -58,14 +53,58 @@ IANA-MAU-MIB DEFINITIONS ::= BEGIN Supplementary information may be available at: http://www.ietf.org/copyrights/ianamib.html" + REVISION "202607150000Z" -- July 15, 2026 + DESCRIPTION "Added coverage for IEEE Std 802.3cs-2022 (Super-PON 10GBASE-SP1 + and 10/2.5GBASE-SP1 PHYs), IEEE Std 802.3db-2022 (100GBASE-SR1, + 100GBASE-VR1, 200GBASE-SR2, 200GBASE-VR2, 400GBASE-SR4, and + 400GBASE-VR4 PHYs), IEEE Std 802.3ck-2022 (100GBASE-CR1/KR1, + 200GBASE-CR2/KR2, and 400GBASE-CR4/KR4 PHYs and associated + Auto-Negotiation capabilities), IEEE Std 802.3da-2026 (10BASE-T1M + PHY), IEEE Std 802.3dk-2026 (100GBASE-BR10, 100GBASE-BR20, and + 100GBASE-BR40 PHYs), and IEEE Std 802.3dg-2026 (100BASE-T1L PHY and + associated Auto-Negotiation capability)." + + REVISION "202404020000Z" -- April 2, 2024 + DESCRIPTION "Added support for IEEE Std 802.3df-2024 (400GBASE-DR4-2, + 800GBASE-CR8, 800GBASE-DR8, 800GBASE-DR8-2, 800GBASE-KR8, + 800GBASE-R, 800GBASE-SR8, and 800GBASE-VR8PHYs)." + + REVISION "202309070000Z" -- September 7, 2023 + DESCRIPTION "Added support for IEEE Std 802.3cy-2023 (25GBASE-T1 PHYs)." + + REVISION "202306140000Z" -- June 14, 2023 + DESCRIPTION "Added coverage for IEEE Std 802.3cz-2023 (entries for + 2.5GBASE-AU, 5GBASE-AU, 10GBASE-AU, 25GBASE-AU, and + 50GBASE-AU)." + + REVISION "202302060000Z" -- February 6, 2023 + DESCRIPTION "Added MAU types specified in the IEEE Std 802.3cm-2020, + IEEE Std 802.3ch-2020, IEEE Std 802.3ca-2020, IEEE Std + 802.3ct-2021, IEEE Std 802.3cp-2021, and aligned with + IEEE Std 802.3-2022." + + REVISION "202208100000Z" -- August 10, 2022 + DESCRIPTION "Added MAU types specified in IEEE Std 802.3cu-2021" + + REVISION "202001300000Z" -- January 30, 2020 + DESCRIPTION "Added MAU types and associated AutoNeg + capability bits specified in the IEEE Std 802.3-2018, + as well as IEEE Std 802.3cb-2018, IEEE Std 802.3bt-2018, + IEEE Std 802.3cd-2018, IEEE Std 802.3cn-2019, and + IEEE Std 802.3cg-2019" + + REVISION "201907110000Z" -- July 11, 2019 + DESCRIPTION "Added support for 2.5GBase-T and 5GBase-T media + types." + REVISION "201704100000Z" -- April 10, 2017 - DESCRIPTION "Added new MAU types and associated AutoNeg - capability bits specified in the IEEE 802.3 - amendments IEEE Std 802.3bk-2013, IEEE Std - 802.3bj-2014 and IEEE Std 802.3bm-2015, which - are now published in IEEE Std 802.3-2015, as - well as IEEE Std 802.3bw-2015, IEEE Std - 802.3by-2016, IEEE Std 802.3bq-2016 and IEEE + DESCRIPTION "Added new MAU types and associated AutoNeg + capability bits specified in the IEEE 802.3 + amendments IEEE Std 802.3bk-2013, IEEE Std + 802.3bj-2014 and IEEE Std 802.3bm-2015, which + are now published in IEEE Std 802.3-2015, as + well as IEEE Std 802.3bw-2015, IEEE Std + 802.3by-2016, IEEE Std 802.3bq-2016 and IEEE Std 802.3bp-2016." REVISION "201408010000Z" -- August 1, 2014 @@ -75,18 +114,19 @@ IANA-MAU-MIB DEFINITIONS ::= BEGIN DESCRIPTION "Updated contact info." REVISION "201108120000Z" -- August 12, 2011 - DESCRIPTION "Added MAU types and associated AutoNeg capability - bits specified in amendments to IEEE Std - 802.3-2008: IEEE Std 802.3ba-2010 and IEEE Std + DESCRIPTION "Added MAU types and associated AutoNeg capability + bits specified in amendments to IEEE Std + 802.3-2008: IEEE Std 802.3ba-2010 and IEEE Std 802.3bg-2011." REVISION "201002230000Z" -- February 23, 2010 - DESCRIPTION "Added assignments that will be included in + DESCRIPTION "Added assignments that will be included in Clause 14 of IEEE P802.3.1." - + REVISION "200704210000Z" -- April 21, 2007 DESCRIPTION "Initial version of this MIB as published in RFC 4836." + ::= { mib-2 154 } -- Textual Conventions @@ -193,30 +233,178 @@ IANA-MAU-MIB DEFINITIONS ::= BEGIN b100GbaseSR10(76), -- 100GBASE-SR10 b100GbaseLR4(77), -- 100GBASE-LR4 b100GbaseER4(78), -- 100GBASE-ER4 - b1000baseT1(79), -- 1000BASE-T1 - b1000basePX30D(80), -- 1000BASE-PX30D - b1000basePX30U(81), -- 1000BASE-PX30U - b1000basePX40D(82), -- 1000BASE-PX40D - b1000basePX40U(83), -- 1000BASE-PX40U - b10G1GbasePRXD4(84), -- 10/1GBASE-PRX-D4 - b10G1GbasePRXU4(85), -- 10/1GBASE-PRX-U4 - b10GbasePRD4(86), -- 10GBASE-PRD4 - b10GbasePRU4(87), -- 10GBASE-PRU4 - b25GbaseCR(88), -- 25GBASE-CR - b25GbaseCRS(89), -- 25GBASE-CR-S - b25GbaseKR(90), -- 25GBASE-KR - b25GbaseKRS(91), -- 25GBASE-KR-S - b25GbaseR(92), -- 25GBASE-R - b25GbaseSR(93), -- 25GBASE-SR - b25GbaseT(94), -- 25GBASE-T - b40GbaseER4(95), -- 40GBASE-ER4 - b40GbaseR(96), -- 40GBASE-R - b40GbaseT(97), -- 40GBASE-T - b100GbaseCR4(98), -- 100GBASE-CR4 - b100GbaseKR4(99), -- 100GBASE-KR4 - b100GbaseKP4(100), -- 100GBASE-KP4 - b100GbaseR(101), -- 100GBASE-R - b100GbaseSR4(102) -- 100GBASE-SR4 + b1000baseT1(79), -- 1000BASE-T1 + b1000basePX30D(80), -- 1000BASE-PX30D + b1000basePX30U(81), -- 1000BASE-PX30U + b1000basePX40D(82), -- 1000BASE-PX40D + b1000basePX40U(83), -- 1000BASE-PX40U + b10G1GbasePRXD4(84), -- 10/1GBASE-PRX-D4 + b10G1GbasePRXU4(85), -- 10/1GBASE-PRX-U4 + b10GbasePRD4(86), -- 10GBASE-PRD4 + b10GbasePRU4(87), -- 10GBASE-PRU4 + b25GbaseCR(88), -- 25GBASE-CR + b25GbaseCRS(89), -- 25GBASE-CR-S + b25GbaseKR(90), -- 25GBASE-KR + b25GbaseKRS(91), -- 25GBASE-KR-S + b25GbaseR(92), -- 25GBASE-R + b25GbaseSR(93), -- 25GBASE-SR + b25GbaseT(94), -- 25GBASE-T + b40GbaseER4(95), -- 40GBASE-ER4 + b40GbaseR(96), -- 40GBASE-R + b40GbaseT(97), -- 40GBASE-T + b100GbaseCR4(98), -- 100GBASE-CR4 + b100GbaseKR4(99), -- 100GBASE-KR4 + b100GbaseKP4(100), -- 100GBASE-KP4 + b100GbaseR(101), -- 100GBASE-R + b100GbaseSR4(102), -- 100GBASE-SR4 + b2p5GbaseT(103), -- 2.5GBASE-T + b5GbaseT(104), -- 5GBASE-T + b100baseT1(105), -- 100BASE-T1 + b1000baseRHA(106), -- 1000BASE-RHA + b1000baseRHB(107), -- 1000BASE-RHB + b1000baseRHC(108), -- 1000BASE-RHC + b2p5GbaseKX(109), -- 2.5GBASE-KX + b2p5GbaseX(110), -- 2.5GBASE-X + b5GbaseKR(111), -- 5GBASE-KR + b5GbaseR(112), -- 5GBASE-R + b10GpassXR(113), -- 10GPASS-XR + b25GbaseLR(114), -- 25GBASE-LR + b25GbaseER(115), -- 25GBASE-ER + b50GbaseR(116), -- 50GBASE-R + b50GbaseCR(117), -- 50GBASE-CR + b50GbaseKR(118), -- 50GBASE-KR + b50GbaseSR(119), -- 50GBASE-SR + b50GbaseFR(120), -- 50GBASE-FR + b50GbaseLR(121), -- 50GBASE-LR + b50GbaseER(122), -- 50GBASE-ER + b100GbaseCR2(123), -- 100GBASE-CR2 + b100GbaseKR2(124), -- 100GBASE-KR2 + b100GbaseSR2(125), -- 100GBASE-SR2 + b100GbaseDR(126), -- 100GBASE-DR + b200GbaseR(127), -- 200GBASE-R + b200GbaseDR4(128), -- 200GBASE-DR4 + b200GbaseFR4(129), -- 200GBASE-FR4 + b200GbaseLR4(130), -- 200GBASE-LR4 + b200GbaseCR4(131), -- 200GBASE-CR4 + b200GbaseKR4(132), -- 200GBASE-KR4 + b200GbaseSR4(133), -- 200GBASE-SR4 + b200GbaseER4(134), -- 200GBASE-ER4 + b400GbaseR(135), -- 400GBASE-R + b400GbaseSR16(136), -- 400GBASE-SR16 + b400GbaseDR4(137), -- 400GBASE-DR4 + b400GbaseFR8(138), -- 400GBASE-FR8 + b400GbaseLR8(139), -- 400GBASE-LR8 + b400GbaseER8(140), -- 400GBASE-ER8 + b10baseT1L(141), -- 10BASE-T1L + b10baseT1SHD(142), -- 10BASE-T1S half duplex mode + b10baseT1SMD(143), -- 10BASE-T1S multidrop mode + b10baseT1SFD(144), -- 10BASE-T1S full duplex mode + b100GbaseFR1(145), -- 100GBASE-FR1 + b100GbaseLR1(146), -- 100GBASE-LR1 + b400GbaseFR4(147), -- 400GBASE-FR4 + b400GbaseLR46(148), -- 400GBASE-LR4-6 + b400GbaseSR8(149), -- 400GBASE-SR8 + b400GbaseSR4p2(150), -- 400GBASE-LR4.2 + b2p5GbaseT1(151), -- 2.5GBASE-T1 + b5GbaseT1(152), -- 5GBASE-T1 + b10GbaseT1(153), -- 10GBASE-T1 + b25G10GbasePQGD2(154), -- 25/10GBASE-PQG-D2 + b25G10GbasePQGD3(155), -- 25/10GBASE-PQG-D3 + b25G10GbasePQGU2(156), -- 25/10GBASE-PQG-U2 + b25G10GbasePQGU3(157), -- 25/10GBASE-PQG-U3 + b25G10GbasePQXD2(158), -- 25/10GBASE-PQX-D2 + b25G10GbasePQXD3(159), -- 25/10GBASE-PQX-D3 + b25G10GbasePQXU2(160), -- 25/10GBASE-PQX-U2 + b25G10GbasePQXU3(161), -- 25/10GBASE-PQX-U3 + b25GbasePQGD2(162), -- 25GBASE-PQG-D2 + b25GbasePQGD3(163), -- 25GBASE-PQG-D3 + b25GbasePQGU2(164), -- 25GBASE-PQG-U2 + b25GbasePQGU3(165), -- 25GBASE-PQG-U3 + b25GbasePQXD2(166), -- 25GBASE-PQX-D2 + b25GbasePQXD3(167), -- 25GBASE-PQX-D3 + b25GbasePQXU2(168), -- 25GBASE-PQX-U2 + b25GbasePQXU3(169), -- 25GBASE-PQX-U3 + b50G10GbasePQGD2(170), -- 50/10GBASE-PQG-D2 + b50G10GbasePQGD3(171), -- 50/10GBASE-PQG-D3 + b50G10GbasePQGU2(172), -- 50/10GBASE-PQG-U2 + b50G10GbasePQGU3(173), -- 50/10GBASE-PQG-U3 + b50G10GbasePQXD2(174), -- 50/10GBASE-PQX-D2 + b50G10GbasePQXD3(175), -- 50/10GBASE-PQX-D3 + b50G10GbasePQXU2(176), -- 50/10GBASE-PQX-U2 + b50G10GbasePQXU3(177), -- 50/10GBASE-PQX-U3 + b50G25GbasePQGD2(178), -- 50/25GBASE-PQG-D2 + b50G25GbasePQGD3(179), -- 50/25GBASE-PQG-D3 + b50G25GbasePQGU2(180), -- 50/25GBASE-PQG-U2 + b50G25GbasePQGU3(181), -- 50/25GBASE-PQG-U3 + b50G25GbasePQXD2(182), -- 50/25GBASE-PQX-D2 + b50G25GbasePQXD3(183), -- 50/25GBASE-PQX-D3 + b50G25GbasePQXU2(184), -- 50/25GBASE-PQX-U2 + b50G25GbasePQXU3(185), -- 50/25GBASE-PQX-U3 + b50GbasePQGD2(186), -- 50GBASE-PQG-D2 + b50GbasePQGD3(187), -- 50GBASE-PQG-D3 + b50GbasePQGU2(188), -- 50GBASE-PQG-U2 + b50GbasePQGU3(189), -- 50GBASE-PQG-U3 + b50GbasePQXD2(190), -- 50GBASE-PQX-D2 + b50GbasePQXD3(191), -- 50GBASE-PQX-D3 + b50GbasePQXU2(192), -- 50GBASE-PQX-U2 + b50GbasePQXU3(193), -- 50GBASE-PQX-U3 + b100GbaseZR(194), -- 100GBASE-ZR + b10GbaseBR10D(195), -- 10GBASE-BR10-D + b10GbaseBR10U(196), -- 10GBASE-BR10-U + b10GbaseBR20D(197), -- 10GBASE-BR20-D + b10GbaseBR20U(198), -- 10GBASE-BR20-U + b10GbaseBR40D(199), -- 10GBASE-BR40-D + b10GbaseBR40U(200), -- 10GBASE-BR40-U + b25GbaseBR10D(201), -- 25GBASE-BR10-D + b25GbaseBR10U(202), -- 25GBASE-BR10-U + b25GbaseBR20D(203), -- 25GBASE-BR20-D + b25GbaseBR20U(204), -- 25GBASE-BR20-U + b25GbaseBR40D(205), -- 25GBASE-BR40-D + b25GbaseBR40U(206), -- 25GBASE-BR40-U + b50GbaseBR10D(207), -- 50GBASE-BR10-D + b50GbaseBR10U(208), -- 50GBASE-BR10-U + b50GbaseBR20D(209), -- 50GBASE-BR20-D + b50GbaseBR20U(210), -- 50GBASE-BR20-U + b50GbaseBR40D(211), -- 50GBASE-BR40-D + b50GbaseBR40U(212), -- 50GBASE-BR40-U + b2p5GbaseAU(213), -- 2.5GBASE-AU + b5GbaseAU(214), -- 5GBASE-AU + b10GbaseAU(215), -- 10GBASE-AU + b25GbaseAU(216), -- 25GBASE-AU + b50GbaseAU(217), -- 50GBASE-AU + b25GbaseT1(218), -- 25GBASE-T1 + b400GbaseDR42(219), -- 400GBASE-DR4-2 + b800GbaseCR8(220), -- 800GBASE-CR8 + b800GbaseDR8(221), -- 800GBASE-DR8 + b800GbaseDR82(222), -- 800GBASE-DR8-2 + b800GbaseKR8(223), -- 800GBASE-KR8 + b800GbaseR(224), -- 800GBASE-R + b800GbaseSR8(225), -- 800GBASE-SR8 + b800GbaseVR8(226), -- 800GBASE-VR8 + b10GbaseSP1D(227), -- 10GBASE-SP1-D + b10GbaseSP1U(228), -- 10GBASE-SP1-U + b10G2p5GbaseSP1D(229), -- 10/2.5GBASE-SP1-D + b10G2p5GbaseSP1U(230), -- 10/2.5GBASE-SP1-U + b100GbaseSR1(231), -- 100GBASE-SR1 + b100GbaseVR1(232), -- 100GBASE-VR1 + b200GbaseSR2(233), -- 200GBASE-SR2 + b200GbaseVR2(234), -- 200GBASE-VR2 + b400GbaseSR4(235), -- 400GBASE-SR4 + b400GbaseVR4(236), -- 400GBASE-VR4 + b100GbaseCR1(237), -- 100GBASE-CR1 + b100GbaseKR1(238), -- 100GBASE-KR1 + b200GbaseCR2(239), -- 200GBASE-CR2 + b200GbaseKR2(240), -- 200GBASE-KR2 + b400GbaseCR4(241), -- 400GBASE-CR4 + b400GbaseKR4(242), -- 400GBASE-KR4 + b10baseT1M(243), -- 10BASE-T1M + b100GbaseBR10D(244), -- 100GBASE-BR10-D + b100GbaseBR10U(245), -- 100GBASE-BR10-U + b100GbaseBR20D(246), -- 100GBASE-BR20-D + b100GbaseBR20U(247), -- 100GBASE-BR20-U + b100GbaseBR40D(248), -- 100GBASE-BR40-D + b100GbaseBR40U(249), -- 100GBASE-BR40-U + b100baseT1L(250) -- 100BASE-T1L } IANAifMauMediaAvailable ::= TEXTUAL-CONVENTION @@ -390,6 +578,7 @@ IANA-MAU-MIB DEFINITIONS ::= BEGIN wisFrameLoss(13), wisSignalLoss(14), pcsLinkFault(15), + excessiveBER(16), dxsLinkFault(17), pxsLinkFault(18), @@ -441,21 +630,40 @@ IANA-MAU-MIB DEFINITIONS ::= BEGIN b40GbaseKR4(20), -- 40GBASE-KR4 b40GbaseCR4(21), -- 40GBASE-CR4 b100GbaseCR10(22), -- 100GBASE-CR10 - b1000baseT1(23), -- 1000BASE-T1 - b25GbaseRS(24), -- 25GBASE-CR-S or 25GBASE-KR-S - b25GbaseR(25), -- 25GBASE-CR or 25GBASE-KR - bRSFEC25Greq(26), -- 25Gb/s RS-FEC - bBaseFEC25Greq(27), -- 25Gb/s BASE-R FEC - b25GbaseT(28), -- 25GBASE-T - b40GbaseT(29), -- 40GBASE-T - b100GbaseCR4(30), -- 100GBASE-CR4 - b100GbaseKR4(31), -- 100GBASE-KR4 - b100GbaseKP4(32), -- 100GBASE-KP4 - bForceMS(33) -- 1000BASE-T1 Force MS + b1000baseT1(23), -- 1000BASE-T1 + b25GbaseRS(24), -- 25GBASE-CR-S or 25GBASE-KR-S + b25GbaseR(25), -- 25GBASE-CR or 25GBASE-KR + bRSFEC25Greq(26), -- 25Gb/s RS-FEC + bBaseFEC25Greq(27), -- 25Gb/s BASE-R FEC + b25GbaseT(28), -- 25GBASE-T + b40GbaseT(29), -- 40GBASE-T + b100GbaseCR4(30), -- 100GBASE-CR4 + b100GbaseKR4(31), -- 100GBASE-KR4 + b100GbaseKP4(32), -- 100GBASE-KP4 + bForceMS(33), -- 1000BASE-T1 Force MS + b2p5GbaseT(34), -- 2.5GBASE-T + b5GBaseT(35), -- 5GBASE-T + b2p5GbaseKX(36), -- 2.5GBASE-KX + b5GbaseKR(37), -- 5GBASE-KR + b50GbaseR(38), -- 50GBASE-CR or 50GBASE-KR + b100GbaseR2(39), -- 100GBASE-CR2 or 100GBASE-KR2 + b200GbaseR4(40), -- 200GBASE-CR4 or 200GBASE-KR4 + b10baseT1L(41), -- 10BASE-T1L + b10baseT1S(42), -- 10BASE-T1S + b2p5GbaseT1(43), -- 2.5GBASE-T1 + b5GbaseT1(44), -- 5GBASE-T1 + b10GbaseT1(45), -- 10GBASE-T1 + b25GbaseT1(46), -- 25GBASE-T1 + b800GR8(47), -- 800GBASE-CR8 or 800GBASE-KR8 + b100GbaseR1(48), -- 100GBASE-CR1 or 100GBASE-KR1 + b200GbaseR2(49), -- 200GBASE-CR2 or 200GBASE-KR2 + b400GbaseR4(50), -- 400GBASE-CR4 or 400GBASE-KR4 + b100baseT1L(51) -- 100BASE-T1L } IANAifJackType ::= TEXTUAL-CONVENTION STATUS current + DESCRIPTION "Common enumeration values for repeater and interface MAU jack types. This data type is used as the syntax of the @@ -603,6 +811,7 @@ IANA-MAU-MIB DEFINITIONS ::= BEGIN dot3MauType10BaseFLFD OBJECT-IDENTITY STATUS current DESCRIPTION "async fiber MAU, full duplex mode" + REFERENCE "[IEEE802.3], Section 18" ::= { dot3MauType 13 } @@ -651,6 +860,7 @@ IANA-MAU-MIB DEFINITIONS ::= BEGIN ------ new since RFC 2239: dot3MauType1000BaseXHD OBJECT-IDENTITY STATUS current + DESCRIPTION "PCS/PMA, unknown PMD, half duplex mode" REFERENCE "[IEEE802.3], Section 36" ::= { dot3MauType 21 } @@ -748,6 +958,7 @@ IANA-MAU-MIB DEFINITIONS ::= BEGIN ::= { dot3MauType 35 } dot3MauType10GigBaseSR OBJECT-IDENTITY + STATUS current DESCRIPTION "R fiber over 850 nm optics" REFERENCE "[IEEE802.3], Section 52" @@ -965,214 +1176,1030 @@ IANA-MAU-MIB DEFINITIONS ::= BEGIN dot3MauType40GbaseKR4 OBJECT-IDENTITY STATUS current - DESCRIPTION "40GBASE-R PCS/PMA over an electrical + DESCRIPTION "40GBASE-R PCS/PMA over an electrical backplane" REFERENCE "IEEE Std 802.3, Clause 84" ::= { dot3MauType 70 } dot3MauType40GbaseCR4 OBJECT-IDENTITY STATUS current - DESCRIPTION "40GBASE-R PCS/PMA over 4 lane shielded + DESCRIPTION "40GBASE-R PCS/PMA over 4 lane shielded copper balanced cable" REFERENCE "IEEE Std 802.3, Clause 85" ::= { dot3MauType 71 } dot3MauType40GbaseSR4 OBJECT-IDENTITY STATUS current - DESCRIPTION "40GBASE-R PCS/PMA over 4 lane multimode + DESCRIPTION "40GBASE-R PCS/PMA over 4 lane multimode fiber" REFERENCE "IEEE Std 802.3, Clause 86" ::= { dot3MauType 72 } dot3MauType40GbaseFR OBJECT-IDENTITY STATUS current - DESCRIPTION "40GBASE-R PCS/PMA over single mode + DESCRIPTION "40GBASE-R PCS/PMA over single mode fiber" REFERENCE "IEEE Std 802.3, Clause 89" ::= { dot3MauType 73 } dot3MauType40GbaseLR4 OBJECT-IDENTITY STATUS current - DESCRIPTION "40GBASE-R PCS/PMA over 4 WDM lane + DESCRIPTION "40GBASE-R PCS/PMA over 4 WDM lane single mode fiber" REFERENCE "IEEE Std 802.3, Clause 87" ::= { dot3MauType 74 } dot3MauType100GbaseCR10 OBJECT-IDENTITY STATUS current - DESCRIPTION "100GBASE-R PCS/PMA over 10 lane + DESCRIPTION "100GBASE-R PCS/PMA over 10 lane shielded copper balanced cable" REFERENCE "IEEE Std 802.3, Clause 85" ::= { dot3MauType 75 } dot3MauType100GbaseSR10 OBJECT-IDENTITY STATUS current - DESCRIPTION "100GBASE-R PCS/PMA over 10 lane + DESCRIPTION "100GBASE-R PCS/PMA over 10 lane multimode fiber" REFERENCE "IEEE Std 802.3, Clause 86" ::= { dot3MauType 76 } dot3MauType100GbaseLR4 OBJECT-IDENTITY STATUS current - DESCRIPTION "100GBASE-R PCS/PMA over 4 WDM lane + DESCRIPTION "100GBASE-R PCS/PMA over 4 WDM lane single mode fiber, long reach" REFERENCE "IEEE Std 802.3, Clause 88" ::= { dot3MauType 77 } dot3MauType100GbaseER4 OBJECT-IDENTITY STATUS current - DESCRIPTION "100GBASE-R PCS/PMA over 4 WDM lane + DESCRIPTION "100GBASE-R PCS/PMA over 4 WDM lane single mode fiber PMD, extended reach" REFERENCE "IEEE Std 802.3, Clause 88" ::= { dot3MauType 78 } - dot3MauType1000baseT1 OBJECT-IDENTITY - STATUS current - DESCRIPTION "1000BASE-T1 single balanced twisted-pair copper cabling PHY" + dot3MauType1000baseT1 OBJECT-IDENTITY + STATUS current + DESCRIPTION "1000BASE-T1 single balanced twisted-pair copper cabling PHY" + REFERENCE "IEEE Std 802.3, Clause 97" + ::= { dot3MauType 79 } + + dot3MauType1000basePX30D OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber EPON OLT, 20km, 1:32 split ratio" + REFERENCE "IEEE Std 802.3, Clause 60" + ::= { dot3MauType 80 } + + dot3MauType1000basePX30U OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber EPON ONU, 20km, 1:32 split ratio" + REFERENCE "IEEE Std 802.3, Clause 60" + ::= { dot3MauType 81 } + + dot3MauType1000basePX40D OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber EPON OLT, 20km, 1:64 split ratio" + REFERENCE "IEEE Std 802.3, Clause 60" + ::= { dot3MauType 82 } + + dot3MauType1000basePX40U OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber EPON ONU, 20km, 1:64 split ratio" + REFERENCE "IEEE Std 802.3, Clause 60" + ::= { dot3MauType 83 } + + dot3MauType10G1GbasePRXD4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber asymmetric-rate EPON OLT, supporting + extended power budget (PRX40)" + REFERENCE "IEEE Std 802.3, Clause 75" + ::= { dot3MauType 84 } + + dot3MauType10G1GbasePRXU4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber asymmetric-rate EPON ONU, supporting + extended power budget (PRX40)" + REFERENCE "IEEE Std 802.3, Clause 75" + ::= { dot3MauType 85 } + + dot3MauType10GbasePRD4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber symmetric-rate EPON OLT, supporting + extended power budget (PR40)" + REFERENCE "IEEE Std 802.3, Clause 75" + ::= { dot3MauType 86 } + + dot3MauType10GbasePRU4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber symmetric-rate EPON ONU, supporting + extended power budget (PR40)" + REFERENCE "IEEE Std 802.3, Clause 75" + ::= { dot3MauType 87 } + + dot3MauType25GbaseCR OBJECT-IDENTITY + STATUS current + DESCRIPTION "25GBASE-R PCS/PMA over shielded balanced copper cable" + REFERENCE "IEEE Std 802.3, Clause 110" + ::= { dot3MauType 88 } + + dot3MauType25GbaseCRS OBJECT-IDENTITY + STATUS current + DESCRIPTION "25GBASE-R PCS/PMA over shielded balanced copper cable + without RS-FEC" + REFERENCE "IEEE Std 802.3, Clause 110" + ::= { dot3MauType 89 } + + dot3MauType25GbaseKR OBJECT-IDENTITY + STATUS current + DESCRIPTION "25GBASE-R PCS/PMA over an electrical backplane" + REFERENCE "IEEE Std 802.3, Clause 111" + ::= { dot3MauType 90 } + + dot3MauType25GbaseKRS OBJECT-IDENTITY + STATUS current + DESCRIPTION "25GBASE-R PCS/PMA over an electrical backplane without RS-FEC" + REFERENCE "IEEE Std 802.3, Clause 111" + ::= { dot3MauType 91 } + + dot3MauType25GbaseR OBJECT-IDENTITY + STATUS current + DESCRIPTION "25GBASE-R PCS/PMA over undefined PMD" + REFERENCE "IEEE Std 802.3, Clause 107 and 109" + ::= { dot3MauType 92 } + + dot3MauType25GbaseSR OBJECT-IDENTITY + STATUS current + DESCRIPTION "25GBASE-R PCS/PMA over multimode fiber" + REFERENCE "IEEE Std 802.3, Clause 112" + ::= { dot3MauType 93 } + + dot3MauType25GbaseT OBJECT-IDENTITY + STATUS current + DESCRIPTION "Four-pair twisted-pair balanced copper cabling" + REFERENCE "IEEE Std 802.3, Clause 113" + ::= { dot3MauType 94 } + + dot3MauType40GbaseER4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "40GBASE-R PCS/PMA over 4 WDM lane single mode fiber" + REFERENCE "IEEE Std 802.3, Clause 82" + ::= { dot3MauType 95 } + + dot3MauType40GbaseR OBJECT-IDENTITY + STATUS current + DESCRIPTION "40GBASE-R PCS as over undefined PMA/PMD" + REFERENCE "IEEE Std 802.3, Clause 82" + ::= { dot3MauType 96 } + + dot3MauType40GbaseT OBJECT-IDENTITY + STATUS current + DESCRIPTION "Four-pair twisted-pair balanced copper cabling" + REFERENCE "IEEE Std 802.3, Clause 113" + ::= { dot3MauType 97 } + + dot3MauType100GbaseCR4 OBJECT-IDENTITY + STATUS current + DESCRIPTION " 100GBASE-R PCS/PMA over 4 lane shielded copper balanced cable" + REFERENCE "IEEE Std 802.3, Clause 92" + ::= { dot3MauType 98 } + + dot3MauType100GbaseKR4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "100GBASE-R PCS/PMA over an electrical backplane" + REFERENCE "IEEE Std 802.3, Clause 93" + ::= { dot3MauType 99 } + + dot3MauType100GbaseKP4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "100GBASE-P PCS/PMA over an electrical backplane PMD" + REFERENCE "IEEE Std 802.3, Clause 94" + ::= { dot3MauType 100 } + + dot3MauType100GbaseR OBJECT-IDENTITY + STATUS current + DESCRIPTION "100GBASE-R Multi-lane PCS over undefined PMA/PMD" + REFERENCE "IEEE Std 802.3, Clause 82" + ::= { dot3MauType 101 } + + dot3MauType100GbaseSR4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "100GBASE-R PCS/PMA over 4 lane multimode fiber" + REFERENCE "IEEE Std 802.3, Clause 95" + ::= { dot3MauType 102 } + + dot3MauType2p5GigT OBJECT-IDENTITY + STATUS current + DESCRIPTION "2.5GBASE-T Four-pair twisted-pair balanced copper cabling PHY" + REFERENCE "IEEE Std 802.3-2018, Clause 126" + ::= { dot3MauType 103 } + + dot3MauType5GigT OBJECT-IDENTITY + STATUS current + DESCRIPTION "5GBASE-T Four-pair twisted-pair balanced copper cabling PHY" + REFERENCE "IEEE Std 802.3-2018, Clause 126" + ::= { dot3MauType 104 } + + dot3MauType100baseT1 OBJECT-IDENTITY + STATUS current + DESCRIPTION "100BASE-T1 Single balanced twisted-pair copper cabling PHY" REFERENCE "IEEE Std 802.3, Clause 96" - ::= { dot3MauType 79 } + ::= { dot3MauType 105 } - dot3MauType1000basePX30D OBJECT-IDENTITY + dot3MauType1000baseRHA OBJECT-IDENTITY STATUS current - DESCRIPTION "One single-mode fiber EPON OLT, 20km, 1:32 split ratio" - REFERENCE "IEEE Std 802.3, Clause 60" - ::= { dot3MauType 80 } + DESCRIPTION "1000BASE-RHA Plastic optical fiber PHY" + REFERENCE "IEEE Std 802.3, Clause 115" + ::= { dot3MauType 106 } - dot3MauType1000basePX30U OBJECT-IDENTITY + dot3MauType1000baseRHB OBJECT-IDENTITY STATUS current - DESCRIPTION "One single-mode fiber EPON ONU, 20km, 1:32 split ratio" - REFERENCE "IEEE Std 802.3, Clause 60" - ::= { dot3MauType 81 } + DESCRIPTION "1000BASE-RHB Plastic optical fiber PHY" + REFERENCE "IEEE Std 802.3, Clause 115" + ::= { dot3MauType 107 } - dot3MauType1000basePX40D OBJECT-IDENTITY + dot3MauType1000baseRHC OBJECT-IDENTITY STATUS current - DESCRIPTION "One single-mode fiber EPON OLT, 20km, 1:64 split ratio" - REFERENCE "IEEE Std 802.3, Clause 60" - ::= { dot3MauType 82 } + DESCRIPTION "1000BASE-RHC Plastic optical fiber PHY" + REFERENCE "IEEE Std 802.3, Clause 115" + ::= { dot3MauType 108 } - dot3MauType1000basePX40U OBJECT-IDENTITY + dot3MauType2p5GbaseKX OBJECT-IDENTITY STATUS current - DESCRIPTION "One single-mode fiber EPON ONU, 20km, 1:64 split ratio" - REFERENCE "IEEE Std 802.3, Clause 60" - ::= { dot3MauType 83 } + DESCRIPTION "2.5GBASE-X PMD over an electrical backplane" + REFERENCE "IEEE Std 802.3, Clause 128" + ::= { dot3MauType 109 } - dot3MauType10G1GbasePRXD4 OBJECT-IDENTITY + dot3MauType2p5GbaseX OBJECT-IDENTITY STATUS current - DESCRIPTION "One single-mode fiber asymmetric-rate EPON OLT, supporting - extended power budget (PRX40)" - REFERENCE "IEEE Std 802.3, Clause 75" - ::= { dot3MauType 84 } + DESCRIPTION "2.5GBASE-X PCS/PMA over undefined PMD" + REFERENCE "IEEE Std 802.3, Clause 127" + ::= { dot3MauType 110 } - dot3MauType10G1GbasePRXU4 OBJECT-IDENTITY + dot3MauType5GbaseKR OBJECT-IDENTITY STATUS current - DESCRIPTION "One single-mode fiber asymmetric-rate EPON ONU, supporting - extended power budget (PRX40)" - REFERENCE "IEEE Std 802.3, Clause 75" - ::= { dot3MauType 85 } + DESCRIPTION "5GBASE-KR PMD over an electrical backplane" + REFERENCE "IEEE Std 802.3, Clause 130" + ::= { dot3MauType 111 } - dot3MauType10GbasePRD4 OBJECT-IDENTITY + dot3MauType5GbaseR OBJECT-IDENTITY STATUS current - DESCRIPTION "One single-mode fiber symmetric-rate EPON OLT, supporting - extended power budget (PR40)" - REFERENCE "IEEE Std 802.3, Clause 75" - ::= { dot3MauType 86 } + DESCRIPTION "5GBASE-R PCS/PMA over undefined PMD" + REFERENCE "IEEE Std 802.3, Clause 129" + ::= { dot3MauType 112 } - dot3MauType10GbasePRU4 OBJECT-IDENTITY + dot3MauType10GpassXR OBJECT-IDENTITY STATUS current - DESCRIPTION "One single-mode fiber symmetric-rate EPON ONU, supporting - extended power budget (PR40)" - REFERENCE "IEEE Std 802.3, Clause 75" - ::= { dot3MauType 87 } + DESCRIPTION "Coax cable distribution network PHY continuous downstream/burst mode upstream PHY" + REFERENCE "IEEE Std 802.3, Clause 100 and 101" + ::= { dot3MauType 113 } - dot3MauType25GbaseCR OBJECT-IDENTITY + dot3MauType25GbaseLR OBJECT-IDENTITY STATUS current - DESCRIPTION "25GBASE-R PCS/PMA over shielded balanced copper cable" - REFERENCE "IEEE Std 802.3, Clause 110" - ::= { dot3MauType 88 } + DESCRIPTION "25GBASE-R PCS/PMA over single-mode fiber PMD, with long reach" + REFERENCE "IEEE Std 802.3, Clause 114" + ::= { dot3MauType 114 } - dot3MauType25GbaseCRS OBJECT-IDENTITY + dot3MauType25GbaseER OBJECT-IDENTITY STATUS current - DESCRIPTION "25GBASE-R PCS/PMA over shielded balanced copper cable - without RS-FEC" - REFERENCE "IEEE Std 802.3, Clause 110" - ::= { dot3MauType 89 } + DESCRIPTION "25GBASE-R PCS/PMA over single-mode fiber PMD, with extended reach" + REFERENCE "IEEE Std 802.3, Clause 114" + ::= { dot3MauType 115 } - dot3MauType25GbaseKR OBJECT-IDENTITY + dot3MauType50GbaseR OBJECT-IDENTITY STATUS current - DESCRIPTION "25GBASE-R PCS/PMA over an electrical backplane" - REFERENCE "IEEE Std 802.3, Clause 111" - ::= { dot3MauType 90 } + DESCRIPTION "50GBASE-R Multi-lane PCS over undefined PMA/PMD" + REFERENCE "IEEE Std 802.3, Clause 133 and 135" + ::= { dot3MauType 116 } - dot3MauType25GbaseKRS OBJECT-IDENTITY + dot3MauType50GbaseCR OBJECT-IDENTITY STATUS current - DESCRIPTION "25GBASE-R PCS/PMA over an electrical backplane without RS-FEC" - REFERENCE "IEEE Std 802.3, Clause 111" - ::= { dot3MauType 91 } + DESCRIPTION "50GBASE-R PCS/PMA over shielded copper balanced cable PMD" + REFERENCE "IEEE Std 802.3, Clause 136" + ::= { dot3MauType 117 } - dot3MauType25GbaseR OBJECT-IDENTITY + dot3MauType50GbaseKR OBJECT-IDENTITY STATUS current - DESCRIPTION "25GBASE-R PCS/PMA over undefined PMD" - REFERENCE "IEEE Std 802.3, Clause 107 and 109" - ::= { dot3MauType 92 } + DESCRIPTION "50GBASE-R PCS/PMA over an electrical backplane PMD" + REFERENCE "IEEE Std 802.3, Clause 137" + ::= { dot3MauType 118 } - dot3MauType25GbaseSR OBJECT-IDENTITY + dot3MauType50GbaseSR OBJECT-IDENTITY STATUS current - DESCRIPTION "25GBASE-R PCS/PMA over multimode fiber" - REFERENCE "IEEE Std 802.3, Clause 112" - ::= { dot3MauType 93 } + DESCRIPTION "50GBASE-R PCS/PMA over multimode fiber PMD" + REFERENCE "IEEE Std 802.3, Clause 138" + ::= { dot3MauType 119 } - dot3MauType25GbaseT OBJECT-IDENTITY + dot3MauType50GbaseFR OBJECT-IDENTITY STATUS current - DESCRIPTION "Four-pair twisted-pair balanced copper cabling" - REFERENCE "IEEE Std 802.3, Clause 113" - ::= { dot3MauType 94 } + DESCRIPTION "50GBASE-R PCS/PMA over single mode fiber PMD with reach up to at least 2 km" + REFERENCE "IEEE Std 802.3, Clause 139" + ::= { dot3MauType 120 } - dot3MauType40GbaseER4 OBJECT-IDENTITY + dot3MauType50GbaseLR OBJECT-IDENTITY STATUS current - DESCRIPTION "40GBASE-R PCS/PMA over 4 WDM lane single mode fiber" - REFERENCE "IEEE Std 802.3, Clause 82" - ::= { dot3MauType 95 } + DESCRIPTION "50GBASE-R PCS/PMA over single mode fiber PMD with reach up to at least 10 km" + REFERENCE "IEEE Std 802.3, Clause 139" + ::= { dot3MauType 121 } - dot3MauType40GbaseR OBJECT-IDENTITY + dot3MauType50GbaseER OBJECT-IDENTITY STATUS current - DESCRIPTION "40GBASE-R PCS as over undefined PMA/PMD" - REFERENCE "IEEE Std 802.3, Clause 82" - ::= { dot3MauType 96 } + DESCRIPTION "50GBASE-R PCS/PMA over single-mode fiber PMD with reach up to at least 40 km" + REFERENCE "IEEE Std 802.3, Clause 139" + ::= { dot3MauType 122 } - dot3MauType40GbaseT OBJECT-IDENTITY + dot3MauType100GbaseCR2 OBJECT-IDENTITY STATUS current - DESCRIPTION "Four-pair twisted-pair balanced copper cabling" - REFERENCE "IEEE Std 802.3, Clause 113" - ::= { dot3MauType 97 } + DESCRIPTION "100GBASE-R PCS/PMA over 2 lane shielded copper balanced cable PMD" + REFERENCE "IEEE Std 802.3, Clause 136" + ::= { dot3MauType 123 } - dot3MauType100GbaseCR4 OBJECT-IDENTITY + dot3MauType100GbaseKR2 OBJECT-IDENTITY STATUS current - DESCRIPTION " 100GBASE-R PCS/PMA over 4 lane shielded copper balanced cable" - REFERENCE "IEEE Std 802.3, Clause 92" - ::= { dot3MauType 98 } + DESCRIPTION "100GBASE-R PCS/PMA over an electrical backplane PMD" + REFERENCE "IEEE Std 802.3, Clause 137" + ::= { dot3MauType 124 } - dot3MauType100GbaseKR4 OBJECT-IDENTITY + dot3MauType100GbaseSR2 OBJECT-IDENTITY STATUS current - DESCRIPTION "100GBASE-R PCS/PMA over an electrical backplane" - REFERENCE "IEEE Std 802.3, Clause 93" - ::= { dot3MauType 99 } + DESCRIPTION "100GBASE-R PCS/PMA over 2 lane multimode fiber PMD" + REFERENCE "IEEE Std 802.3, Clause 138" + ::= { dot3MauType 125 } - dot3MauType100GbaseKP4 OBJECT-IDENTITY + dot3MauType100GbaseDR OBJECT-IDENTITY STATUS current - DESCRIPTION "100GBASE-P PCS/PMA over an electrical backplane PMD" - REFERENCE "IEEE Std 802.3, Clause 94" - ::= { dot3MauType 100 } + DESCRIPTION "100GBASE-R PCS/PMA over single mode fiber PMD" + REFERENCE "IEEE Std 802.3, Clause 140" + ::= { dot3MauType 126 } - dot3MauType100GbaseR OBJECT-IDENTITY + dot3MauType200GbaseR OBJECT-IDENTITY STATUS current - DESCRIPTION "100GBASE-R Multi-lane PCS over undefined PMA/PMD" - REFERENCE "IEEE Std 802.3, Clause 82" - ::= { dot3MauType 101 } + DESCRIPTION "200GBASE-R Multi-lane PCS over undefined PMA/PMD" + REFERENCE "IEEE Std 802.3, Clause 119" + ::= { dot3MauType 127 } - dot3MauType100GbaseSR4 OBJECT-IDENTITY + dot3MauType200GbaseDR4 OBJECT-IDENTITY STATUS current - DESCRIPTION "100GBASE-R PCS/PMA over 4 lane multimode fiber" - REFERENCE "IEEE Std 802.3, Clause 95" - ::= { dot3MauType 102 } + DESCRIPTION "200GBASE-R PCS/PMA over 4-lane single-mode fiber PMD" + REFERENCE "IEEE Std 802.3, Clause 121" + ::= { dot3MauType 128 } + + dot3MauType200GbaseFR4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "200GBASE-R PCS/PMA over 4 WDM lane single-mode fiber PMD with reach up to at least 2 km" + REFERENCE "IEEE Std 802.3, Clause 122" + ::= { dot3MauType 129 } + + dot3MauType200GbaseLR4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "200GBASE-R PCS/PMA over 4 WDM lane single-mode fiber PMD with reach up to at least 10 km" + REFERENCE "IEEE Std 802.3, Clause 122" + ::= { dot3MauType 130 } + + dot3MauType200GbaseCR4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "200GBASE-R PCS/PMA over 4 lane shielded copper balanced cable PMD" + REFERENCE "IEEE Std 802.3, Clause 136" + ::= { dot3MauType 131 } + + dot3MauType200GbaseKR4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "200GBASE-R PCS/PMA over an electrical backplane PMD" + REFERENCE "IEEE Std 802.3, Clause 137" + ::= { dot3MauType 132 } + + dot3MauType200GbaseSR4 OBJECT-IDENTITY STATUS current + DESCRIPTION "200GBASE-R PCS/PMA over 4 lane multimode fiber PMD" + REFERENCE "IEEE Std 802.3, Clause 138" + ::= { dot3MauType 133 } + + dot3MauType200GbaseER4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "200GBASE-R PCS/PMA over 4 WDM lane single-mode fiber PMD with reach up to at least 40 km" + REFERENCE "IEEE Std 802.3, Clause 122" + ::= { dot3MauType 134 } + + dot3MauType400GbaseR OBJECT-IDENTITY + STATUS current + DESCRIPTION "400GBASE-R Multi-lane PCS over undefined PMA/PMD" + REFERENCE "IEEE Std 802.3, Clause 119" + ::= { dot3MauType 135 } + + dot3MauType400GbaseSR16 OBJECT-IDENTITY + STATUS current + DESCRIPTION "400GBASE-R PCS/PMA over 16-lane multimode fiber PMD" + REFERENCE "IEEE Std 802.3, Clause 123" + ::= { dot3MauType 136 } + + dot3MauType400GbaseDR4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "400GBASE-R PCS/PMA over 4-lane single-mode fiber PMD" + REFERENCE "IEEE Std 802.3, Clause 124" + ::= { dot3MauType 137 } + + dot3MauType400GbaseFR8 OBJECT-IDENTITY + STATUS current + DESCRIPTION "400GBASE-R PCS/PMA over 8 WDM lane single-mode fiber PMD with reach up to at least 2 km" + REFERENCE "IEEE Std 802.3, Clause 122" + ::= { dot3MauType 138 } + + dot3MauType400GbaseLR8 OBJECT-IDENTITY + STATUS current + DESCRIPTION "400GBASE-R PCS/PMA over 8 WDM lane single-mode fiber PMD with reach up to at least 10 km" + REFERENCE "IEEE Std 802.3, Clause 122" + ::= { dot3MauType 139 } + + dot3MauType400GbaseER8 OBJECT-IDENTITY + STATUS current + DESCRIPTION "400GBASE-R PCS/PMA over 8 WDM lane single-mode fiber PMD with reach up to at least 40 km" + REFERENCE "IEEE Std 802.3, Clause 122" + ::= { dot3MauType 140 } + + dot3MauType10baseT1L OBJECT-IDENTITY + STATUS current + DESCRIPTION "10BASE-T1L Single balanced pair PHY" + REFERENCE "IEEE Std 802.3, Clause 146" + ::= { dot3MauType 141 } + + dot3MauType10baseT1SHD OBJECT-IDENTITY + STATUS current + DESCRIPTION "10BASE-T1S Single balanced pair PHY, half duplex mode" + REFERENCE "IEEE Std 802.3, Clause 147" + ::= { dot3MauType 142 } + + dot3MauType10baseT1SMD OBJECT-IDENTITY + STATUS current + DESCRIPTION "10BASE-T1S Single balanced pair PHY, multidrop mode" + REFERENCE "IEEE Std 802.3, Clause 147" + ::= { dot3MauType 143 } + + dot3MauType10baseT1SFD OBJECT-IDENTITY + STATUS current + DESCRIPTION "10BASE-T1S Single balanced pair PHY, full duplex mode" + REFERENCE "IEEE Std 802.3, Clause 147" + ::= { dot3MauType 144 } + + dot3MauType100GbaseFR1 OBJECT-IDENTITY + STATUS current + DESCRIPTION "100GBASE-R PCS/PMA over single-mode fiber PMD with reach up to at least 2 km" + REFERENCE "IEEE Std 802.3, Clause 140" + ::= { dot3MauType 145 } + + dot3MauType100GbaseLR1 OBJECT-IDENTITY + STATUS current + DESCRIPTION "100GBASE-R PCS/PMA over single-mode fiber PMD with reach up to at least 10 km" + REFERENCE "IEEE Std 802.3, Clause 140" + ::= { dot3MauType 146 } + + dot3MauType400GbaseFR4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "400GBASE-R PCS/PMA over 4 WDM lane single-mode fiber PMD with reach up to at least 2 km" + REFERENCE "IEEE Std 802.3, Clause 151" + ::= { dot3MauType 147 } + + dot3MauType400GbaseLR46 OBJECT-IDENTITY + STATUS current + DESCRIPTION "400GBASE-R PCS/PMA over 4 WDM lane single-mode fiber PMD with reach up to at least 6 km" + REFERENCE "IEEE Std 802.3, Clause 151" + ::= { dot3MauType 148 } + + dot3MauType400GbaseSR8 OBJECT-IDENTITY + STATUS current + DESCRIPTION "400GBASE-R PCS/PMA over 8-lane multimode fiber PMD as specified in Clause 138" + ::= { dot3MauType 149 } + + dot3MauType400GbaseSR4p2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "400GBASE-R PCS/PMA over 8-lane multimode fiber PMD as specified in Clause 150" + ::= { dot3MauType 150 } + + dot3MauType2p5GbaseT1 OBJECT-IDENTITY + STATUS current + DESCRIPTION "Single balanced pair of conductors PHY as specified in Clause 149" + ::= { dot3MauType 151 } + + dot3MauType5GbaseT1 OBJECT-IDENTITY + STATUS current + DESCRIPTION "Single balanced pair of conductors PHY as specified in Clause 149" + ::= { dot3MauType 152 } + + dot3MauType10GbaseT1 OBJECT-IDENTITY + STATUS current + DESCRIPTION "Single balanced pair of conductors PHY as specified in Clause 149" + ::= { dot3MauType 153 } + + dot3MauType25G10GbasePQGD2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 1 x 25.78125 GBd continuous transmission / 1 x 10.3125 GBd burst mode reception, medium power class, as specified in Clause 141" + ::= { dot3MauType 154 } -END + dot3MauType25G10GbasePQGD3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 1 x 25.78125 GBd continuous transmission / 1 x 10.3125 GBd burst mode reception, high power class, as specified in Clause 141" + ::= { dot3MauType 155 } + + dot3MauType25G10GbasePQGU2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 1 x 25.78125 GBd continuous reception / 1 x 10.3125 GBd burst mode transmission, medium power class, as specified in Clause 141" + ::= { dot3MauType 156 } + + dot3MauType25G10GbasePQGU3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 1 x 25.78125 GBd continuous reception / 1 x 10.3125 GBd burst mode transmission, high power class, as specified in Clause 141" + ::= { dot3MauType 157 } + + dot3MauType25G10GbasePQXD2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 1 x 25.78125 GBd continuous transmission / 1 x 10.3125 GBd burst mode reception, medium power class, as specified in Clause 141" + ::= { dot3MauType 158 } + + dot3MauType25G10GbasePQXD3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 1 x 25.78125 GBd continuous transmission / 1 x 10.3125 GBd burst mode reception, high power class, as specified in Clause 141" + ::= { dot3MauType 159 } + + dot3MauType25G10GbasePQXU2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 1 x 25.78125 GBd continuous reception / 1 x 10.3125 GBd burst mode transmission, medium power class, as specified in Clause 141" + ::= { dot3MauType 160 } + + dot3MauType25G10GbasePQXU3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 1 x 25.78125 GBd continuous reception / 1 x 10.3125 GBd burst mode transmission, high power class, as specified in Clause 141" + ::= { dot3MauType 161 } + + dot3MauType25GbasePQGD2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 1 x 25.78125 GBd continuous transmission / 1 x 25.78125 GBd burst mode reception, medium power class, as specified in Clause 141" + ::= { dot3MauType 162 } + + dot3MauType25GbasePQGD3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 1 x 25.78125 GBd continuous transmission / 1 x 25.78125 GBd burst mode reception, high power class, as specified in Clause 141" + ::= { dot3MauType 163 } + + dot3MauType25GbasePQGU2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 1 x 25.78125 GBd continuous reception / 1 x 25.78125 GBd burst mode transmission, medium power class, as specified in Clause 141" + ::= { dot3MauType 164 } + + dot3MauType25GbasePQGU3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 1 x 25.78125 GBd continuous reception / 1 x 25.78125 GBd burst mode transmission, high power class, as specified in Clause 141" + ::= { dot3MauType 165 } + + dot3MauType25GbasePQXD2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 1 x 25.78125 GBd continuous transmission / 1 x 25.78125 GBd burst mode reception, medium power class, as specified in Clause 141" + ::= { dot3MauType 166 } + + dot3MauType25GbasePQXD3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 1 x 25.78125 GBd continuous transmission / 1 x 25.78125 GBd burst mode reception, high power class, as specified in Clause 141" + ::= { dot3MauType 167 } + + dot3MauType25GbasePQXU2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 1 x 25.78125 GBd continuous reception / 1 x 25.78125 GBd burst mode transmission, medium power class, as specified in Clause 141" + ::= { dot3MauType 168 } + + dot3MauType25GbasePQXU3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 1 x 25.78125 GBd continuous reception / 1 x 25.78125 GBd burst mode transmission, high power class, as specified in Clause 141" + ::= { dot3MauType 169 } + + dot3MauType50G10GbasePQGD2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous transmission / 1 x 10.3125 GBd burst mode reception, medium power class, as specified in Clause 141" + ::= { dot3MauType 170 } + + dot3MauType50G10GbasePQGD3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous transmission / 1 x 10.3125 GBd burst mode reception, high power class, as specified in Clause 141" + ::= { dot3MauType 171 } + + dot3MauType50G10GbasePQGU2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous reception / 1 x 10.3125 GBd burst mode transmission, medium power class, as specified in Clause 141" + ::= { dot3MauType 172 } + + dot3MauType50G10GbasePQGU3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous reception / 1 x 10.3125 GBd burst mode transmission, high power class, as specified in Clause 141" + ::= { dot3MauType 173 } + + dot3MauType50G10GbasePQXD2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous transmission / 1 x 10.3125 GBd burst mode reception, medium power class, as specified in Clause 141" + ::= { dot3MauType 174 } + + dot3MauType50G10GbasePQXD3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous transmission / 1 x 10.3125 GBd burst mode reception, high power class, as specified in Clause 141" + ::= { dot3MauType 175 } + + dot3MauType50G10GbasePQXU2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous reception / 1 x 10.3125 GBd burst mode transmission, medium power class, as specified in Clause 141" + ::= { dot3MauType 176 } + + dot3MauType50G10GbasePQXU3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous reception / 1 x 10.3125 GBd burst mode transmission, high power class, as specified in Clause 141" + ::= { dot3MauType 177 } + + dot3MauType50G25GbasePQGD2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous transmission / 1 x 25.78125 GBd burst mode reception, medium power class, as specified in Clause 141" + ::= { dot3MauType 178 } + + dot3MauType50G25GbasePQGD3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous transmission / 1 x 25.78125 GBd burst mode reception, high power class, as specified in Clause 141" + ::= { dot3MauType 179 } + + dot3MauType50G25GbasePQGU2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous reception / 1 x 25.78125 GBd burst mode transmission, medium power class, as specified in Clause 141" + ::= { dot3MauType 180 } + + dot3MauType50G25GbasePQGU3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous reception / 1 x 25.78125 GBd burst mode transmission, high power class, as specified in Clause 141" + ::= { dot3MauType 181 } + + dot3MauType50G25GbasePQXD2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous transmission / 1 x 25.78125 GBd burst mode reception, medium power class, as specified in Clause 141" + ::= { dot3MauType 182 } + + dot3MauType50G25GbasePQXD3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous transmission / 1 x 25.78125 GBd burst mode reception, high power class, as specified in Clause 141" + ::= { dot3MauType 183 } + + dot3MauType50G25GbasePQXU2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous reception / 1 x 25.78125 GBd burst mode transmission, medium power class, as specified in Clause 141" + ::= { dot3MauType 184 } + + dot3MauType50G25GbasePQXU3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous reception / 1 x 25.78125 GBd burst mode transmission, high power class, as specified in Clause 141" + ::= { dot3MauType 185 } + + dot3MauType50GbasePQGD2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous transmission / 2 x 25.78125 GBd burst mode reception, medium power class, as specified in Clause 141" + ::= { dot3MauType 186 } + + dot3MauType50GbasePQGD3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous transmission / 2 x 25.78125 GBd burst mode reception, high power class, as specified in Clause 141" + ::= { dot3MauType 187 } + + dot3MauType50GbasePQGU2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous reception / 2 x 25.78125 GBd burst mode transmission, medium power class, as specified in Clause 141" + ::= { dot3MauType 188 } + + dot3MauType50GbasePQGU3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous reception / 2 x 25.78125 GBd burst mode transmission, high power class, as specified in Clause 141" + ::= { dot3MauType 189 } + + dot3MauType50GbasePQXD2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous transmission / 2 x 25.78125 GBd burst mode reception, medium power class, as specified in Clause 141" + ::= { dot3MauType 190 } + + dot3MauType50GbasePQXD3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous transmission / 2 x 25.78125 GBd burst mode reception, high power class, as specified in Clause 141" + ::= { dot3MauType 191 } + + dot3MauType50GbasePQXU2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous reception / 2 x 25.78125 GBd burst mode transmission, medium power class, as specified in Clause 141" + ::= { dot3MauType 192 } + + dot3MauType50GbasePQXU3 OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single mode fiber, 2 x 25.78125 GBd continuous reception / 2 x 25.78125 GBd burst mode transmission, high power class, as specified in Clause 141" + ::= { dot3MauType 193 } + + dot3MauType100GbaseZR OBJECT-IDENTITY + STATUS current + DESCRIPTION "100GBASE-R PCS/100GBASE-ZR PMA over a PMD with reach up to at least 80 km as specified in Clause 154" + ::= { dot3MauType 194 } + + dot3MauType10GbaseBR10D OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber OLT PHY supporting a distance of at least 10 km as specified in Clause 158" + ::= { dot3MauType 195 } + + dot3MauType10GbaseBR10U OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber ONU PHY supporting a distance of at least 10 km as specified in Clause 158" + ::= { dot3MauType 196 } + + dot3MauType10GbaseBR20D OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber OLT PHY supporting a distance of at least 20 km as specified in Clause 158" + ::= { dot3MauType 197 } + + dot3MauType10GbaseBR20U OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber ONU PHY supporting a distance of at least 20 km as specified in Clause 158" + ::= { dot3MauType 198 } + + dot3MauType10GbaseBR40D OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber OLT PHY supporting a distance of at least 40 km as specified in Clause 158" + ::= { dot3MauType 199 } + + dot3MauType10GbaseBR40U OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber ONU PHY supporting a distance of at least 40 km as specified in Clause 158" + ::= { dot3MauType 200 } + + dot3MauType25GbaseBR10D OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber OLT PHY supporting a distance of at least 10 km as specified in Clause 159" + ::= { dot3MauType 201 } + + dot3MauType25GbaseBR10U OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber ONU PHY supporting a distance of at least 10 km as specified in Clause 159" + ::= { dot3MauType 202 } + + dot3MauType25GbaseBR20D OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber OLT PHY supporting a distance of at least 20 km as specified in Clause 159" + ::= { dot3MauType 203 } + + dot3MauType25GbaseBR20U OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber ONU PHY supporting a distance of at least 20 km as specified in Clause 159" + ::= { dot3MauType 204 } + + dot3MauType25GbaseBR40D OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber OLT PHY supporting a distance of at least 40 km as specified in Clause 159" + ::= { dot3MauType 205 } + + dot3MauType25GbaseBR40U OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber ONU PHY supporting a distance of at least 40 km as specified in Clause 159" + ::= { dot3MauType 206 } + + dot3MauType50GbaseBR10D OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber OLT PHY supporting a distance of at least 10 km as specified in Clause 160" + ::= { dot3MauType 207 } + + dot3MauType50GbaseBR10U OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber ONU PHY supporting a distance of at least 10 km as specified in Clause 160" + ::= { dot3MauType 208 } + + dot3MauType50GbaseBR20D OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber OLT PHY supporting a distance of at least 20 km as specified in Clause 160" + ::= { dot3MauType 209 } + + dot3MauType50GbaseBR20U OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber ONU PHY supporting a distance of at least 20 km as specified in Clause 160" + ::= { dot3MauType 210 } + + dot3MauType50GbaseBR40D OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber OLT PHY supporting a distance of at least 40 km as specified in Clause 160" + ::= { dot3MauType 211 } + + dot3MauType50GbaseBR40U OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber ONU PHY supporting a distance of at least 40 km as specified in Clause 160" + ::= { dot3MauType 212 } + + dot3MauType2p5GbaseAU OBJECT-IDENTITY + STATUS current + DESCRIPTION "Glass optical fiber PHY as specified in Clause 166" + ::= { dot3MauType 213 } + + dot3MauType5GbaseAU OBJECT-IDENTITY + STATUS current + DESCRIPTION "Glass optical fiber PHY as specified in Clause 166" + ::= { dot3MauType 214 } + + dot3MauType10GbaseAU OBJECT-IDENTITY + STATUS current + DESCRIPTION "Glass optical fiber PHY as specified in Clause 166" + ::= { dot3MauType 215 } + + dot3MauType25GbaseAU OBJECT-IDENTITY + STATUS current + DESCRIPTION "Glass optical fiber PHY as specified in Clause 166" + ::= { dot3MauType 216 } + + dot3MauType50GbaseAU OBJECT-IDENTITY + STATUS current + DESCRIPTION "Glass optical fiber PHY as specified in Clause 166" + ::= { dot3MauType 217 } + + dot3MauType25GbaseT1 OBJECT-IDENTITY + STATUS current + DESCRIPTION "Single balanced pair of conductors PHY as specified in Clause 165" + ::= { dot3MauType 218 } + + dot3MauType400GbaseDR42 OBJECT-IDENTITY + STATUS current + DESCRIPTION "400GBASE-R PCS/PMA over 4 single-mode fibers in each direction + PMD with reach up to at least 2 km as specified in Clause 124" + ::= { dot3MauType 219 } + + dot3MauType800GbaseCR8 OBJECT-IDENTITY + STATUS current + DESCRIPTION "800GBASE-R PCS/PMA over 8-lane shielded balanced copper cable + PMD as specified in Clause 162" + ::= { dot3MauType 220 } + + dot3MauType800GbaseDR8 OBJECT-IDENTITY + STATUS current + DESCRIPTION "800GBASE-R PCS/PMA over 8 single-mode fibers in each direction + PMD with reach up to at least 500 m as specified in Clause 124" + ::= { dot3MauType 221 } + + dot3MauType800GbaseDR82 OBJECT-IDENTITY + STATUS current + DESCRIPTION "800GBASE-R PCS/PMA over 8 single-mode fibers in each direction + PMD with reach up to at least 2 km as specified in Clause 124" + ::= { dot3MauType 222 } + + dot3MauType800GbaseKR8 OBJECT-IDENTITY + STATUS current + DESCRIPTION "800GBASE-R PCS/PMA over an electrical backplane PMD as specified + in Clause 163" + ::= { dot3MauType 223 } + + dot3MauType800GbaseR OBJECT-IDENTITY + STATUS current + DESCRIPTION "Multi-lane PCS as specified in Clause 172 over undefined PMA/PMD" + ::= { dot3MauType 224 } + + dot3MauType800GbaseSR8 OBJECT-IDENTITY + STATUS current + DESCRIPTION "800GBASE-R PCS/PMA over 8 multimode fibers in each direction + PMD with reach up to at least 100 m as specified in Clause 167" + ::= { dot3MauType 225 } + + dot3MauType800GbaseVR8 OBJECT-IDENTITY + STATUS current + DESCRIPTION "800GBASE-R PCS/PMA over 8 multimode fibers in each direction + PMD with reach up to at least 50 m as specified in Clause 167" + ::= { dot3MauType 226 } + + dot3MauType10GbaseSP1D OBJECT-IDENTITY + STATUS current + DESCRIPTION "Super-PON OLT PHY, 10 Gb/s downstream, over one single-mode fiber + supporting a distance of at least 50 km as specified in Clause 164" + ::= { dot3MauType 227 } + + dot3MauType10GbaseSP1U OBJECT-IDENTITY + STATUS current + DESCRIPTION "Super-PON ONU PHY, 10 Gb/s upstream, over one single-mode fiber + supporting a distance of at least 50 km as specified in Clause 164" + ::= { dot3MauType 228 } + + dot3MauType10G2p5GbaseSP1D OBJECT-IDENTITY + STATUS current + DESCRIPTION "Super-PON OLT PHY, 10 Gb/s downstream / 2.5 Gb/s upstream, over one + single-mode fiber supporting a distance of at least 50 km as + specified in Clause 164" + ::= { dot3MauType 229 } + + dot3MauType10G2p5GbaseSP1U OBJECT-IDENTITY + STATUS current + DESCRIPTION "Super-PON ONU PHY, 10 Gb/s downstream / 2.5 Gb/s upstream, over one + single-mode fiber supporting a distance of at least 50 km as + specified in Clause 164" + ::= { dot3MauType 230 } + + dot3MauType100GbaseSR1 OBJECT-IDENTITY + STATUS current + DESCRIPTION "100GBASE-R PCS/PMA over 1 multimode fiber in each direction + PMD with reach up to at least 100 m as specified in Clause 167" + ::= { dot3MauType 231 } + + dot3MauType100GbaseVR1 OBJECT-IDENTITY + STATUS current + DESCRIPTION "100GBASE-R PCS/PMA over 1 multimode fiber in each direction + PMD with reach up to at least 50 m as specified in Clause 167" + ::= { dot3MauType 232 } + + dot3MauType200GbaseSR2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "200GBASE-R PCS/PMA over 2 multimode fibers in each direction + PMD with reach up to at least 100 m as specified in Clause 167" + ::= { dot3MauType 233 } + + dot3MauType200GbaseVR2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "200GBASE-R PCS/PMA over 2 multimode fibers in each direction + PMD with reach up to at least 50 m as specified in Clause 167" + ::= { dot3MauType 234 } + + dot3MauType400GbaseSR4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "400GBASE-R PCS/PMA over 4 multimode fibers in each direction + PMD with reach up to at least 100 m as specified in Clause 167" + ::= { dot3MauType 235 } + + dot3MauType400GbaseVR4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "400GBASE-R PCS/PMA over 4 multimode fibers in each direction + PMD with reach up to at least 50 m as specified in Clause 167" + ::= { dot3MauType 236 } + + dot3MauType100GbaseCR1 OBJECT-IDENTITY + STATUS current + DESCRIPTION "100GBASE-R PCS/PMA over 1-lane shielded balanced copper cable + PMD as specified in Clause 162" + ::= { dot3MauType 237 } + + dot3MauType100GbaseKR1 OBJECT-IDENTITY + STATUS current + DESCRIPTION "100GBASE-R PCS/PMA over an electrical backplane PMD as specified + in Clause 163" + ::= { dot3MauType 238 } + + dot3MauType200GbaseCR2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "200GBASE-R PCS/PMA over 2-lane shielded balanced copper cable + PMD as specified in Clause 162" + ::= { dot3MauType 239 } + + dot3MauType200GbaseKR2 OBJECT-IDENTITY + STATUS current + DESCRIPTION "200GBASE-R PCS/PMA over an electrical backplane PMD as specified + in Clause 163" + ::= { dot3MauType 240 } + + dot3MauType400GbaseCR4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "400GBASE-R PCS/PMA over 4-lane shielded balanced copper cable + PMD as specified in Clause 162" + ::= { dot3MauType 241 } + + dot3MauType400GbaseKR4 OBJECT-IDENTITY + STATUS current + DESCRIPTION "400GBASE-R PCS/PMA over an electrical backplane PMD as specified + in Clause 163" + ::= { dot3MauType 242 } + + dot3MauType10baseT1M OBJECT-IDENTITY + STATUS current + DESCRIPTION "10BASE-T1M Single balanced pair multidrop PHY as specified in + Clause 188" + ::= { dot3MauType 243 } + + dot3MauType100GbaseBR10D OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber OLT PHY supporting a distance of at least + 10 km as specified in Clause 168" + ::= { dot3MauType 244 } + + dot3MauType100GbaseBR10U OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber ONU PHY supporting a distance of at least + 10 km as specified in Clause 168" + ::= { dot3MauType 245 } + + dot3MauType100GbaseBR20D OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber OLT PHY supporting a distance of at least + 20 km as specified in Clause 168" + ::= { dot3MauType 246 } + + dot3MauType100GbaseBR20U OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber ONU PHY supporting a distance of at least + 20 km as specified in Clause 168" + ::= { dot3MauType 247 } + + dot3MauType100GbaseBR40D OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber OLT PHY supporting a distance of at least + 40 km as specified in Clause 168" + ::= { dot3MauType 248 } + + dot3MauType100GbaseBR40U OBJECT-IDENTITY + STATUS current + DESCRIPTION "One single-mode fiber ONU PHY supporting a distance of at least + 40 km as specified in Clause 168" + ::= { dot3MauType 249 } + + dot3MauType100baseT1L OBJECT-IDENTITY + STATUS current + DESCRIPTION "100BASE-T1L Single balanced pair PHY as specified in Clause 190" + ::= { dot3MauType 250 } +END \ No newline at end of file diff --git a/mibs/IANA-PRINTER-MIB b/mibs/IANA-PRINTER-MIB index 7d25fde397e..c02abd35a76 100644 --- a/mibs/IANA-PRINTER-MIB +++ b/mibs/IANA-PRINTER-MIB @@ -9,7 +9,7 @@ IMPORTS FROM SNMPv2-TC; -- [RFC2579] ianaPrinterMIB MODULE-IDENTITY - LAST-UPDATED "201609140000Z" -- September 14, 2016 + LAST-UPDATED "202402060000Z" -- February 6, 2024 ORGANIZATION "IANA" CONTACT-INFO "Internet Assigned Numbers Authority @@ -19,6 +19,7 @@ ianaPrinterMIB MODULE-IDENTITY Tel: +1 310-301-5800 E-Mail: iana&iana.org" + DESCRIPTION "This MIB module defines a set of printing-related TEXTUAL-CONVENTIONs for use in Printer MIB (RFC 3805), Finisher MIB (RFC 3806), and other MIBs which need to @@ -37,6 +38,15 @@ ianaPrinterMIB MODULE-IDENTITY itself or see: http://www.ietf.org/copyrights/ianamib.html" + REVISION "202402060000Z" -- February 6, 2024 + DESCRIPTION "Updated PrtAlertCodeTC to cover new IPP marker state + reasons." + + REVISION "201907080000Z" -- July 8, 2019 + DESCRIPTION "Updated PrtAlertGroupTC and PrtAlertCodeTC to + cover groups and codes defined in Sections 5.1, + 5.2, and 5.3 of PWG MFD Alerts [PWG5107.3-2019]." + REVISION "201609140000Z" -- September 14, 2016 DESCRIPTION "Replaced references to RFC 2911 with references to RFC8011." @@ -78,7 +88,7 @@ ianaPrinterMIB MODULE-IDENTITY REVISION "200509140000Z" -- September 14, 2005 DESCRIPTION "Updates to include missing 'unknown' values - for PrtCoverStatusTC, PrtChannelTypeTC, + for PrtCoverStatusTC, PrtChannelTypeTC, PrtAlertGroupTC and removal of comment for for PrtAlertGroupTC." @@ -123,6 +133,7 @@ PrtGeneralResetTC ::= TEXTUAL-CONVENTION defined state that is preferably under control of the system administrator by some means outside the scope of the Printer MIB specification." + SYNTAX INTEGER { notResetting(3), powerCycleReset(4), -- Cold Start @@ -679,7 +690,6 @@ PrtInterpreterLangFamilyTC ::= TEXTUAL-CONVENTION -- documents as a collection of data -- objects (text, image, graphics, bar -- codes), resources (fonts, overlays) - -- and page, form and finishing -- instructions. -- IBM Corporation. @@ -1072,6 +1082,7 @@ PrtMarkerSuppliesTypeTC ::= TEXTUAL-CONVENTION SYNTAX INTEGER { other(1), unknown(2), + -- Values for Printer MIB toner(3), wasteToner(4), @@ -1171,6 +1182,7 @@ PrtConsoleDisableTC ::= TEXTUAL-CONVENTION PrtAlertTrainingLevelTC ::= TEXTUAL-CONVENTION -- This TC was extracted from prtAlertTrainingLevel in RFC 1759. + STATUS current DESCRIPTION "The level of training required to handle this alert, if @@ -1219,6 +1231,7 @@ PrtAlertGroupTC ::= TEXTUAL-CONVENTION -- Values of 30 and greater are for use in MIBs that augment -- the Printer MIB, such as the Finisher MIB. -- This TC extracted from prtAlertGroup in RFC 1759. + STATUS current DESCRIPTION "The type of subunit within the printer model that this alert @@ -1258,8 +1271,20 @@ PrtAlertGroupTC ::= TEXTUAL-CONVENTION finDevice(30), -- Not in RFC 1759 finSupply(31), -- Not in RFC 1759 finSupplyMediaInput(32), -- Not in RFC 1759 - finAttribute(33) -- Not in RFC 1759 + finAttribute(33), -- Not in RFC 1759 -- Values (30) to (39) reserved for Finisher MIB + -- Values for the ScanDevice + scanDevice(50), -- MFD Extension + scanner(51), -- MFD Extension + scanMediaPath(52), -- MFD Extension + -- Values (50) to (59) reserved for the ScanDevice + -- Values for the FaxDevice + faxDevice(60), -- MFD Extension + faxModem(61), -- MFD Extension + -- Values (60) to (69) reserved for the FaxDevice + -- Values for other common subunits + outputChannel(70) -- MFD Extension + -- Values (70) to (79) reserved for common subunits } PrtAlertCodeTC ::= TEXTUAL-CONVENTION @@ -1365,6 +1390,7 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION subunitRecoverableFailure(29), -- Not in RFC 1759 subunitUnrecoverableFailure(30), + -- Not in RFC 1759 subunitRecoverableStorageError(31), -- Not in RFC 1759 @@ -1413,7 +1439,6 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION -- description of the medium required to -- satisfy the request. inputManualInputRequest(810), -- Not in RFC 1759 - -- An interpreter has detected that manual -- input is required in this subunit. The -- prtAlertDescription may be used to convey @@ -1425,12 +1450,24 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION -- Not in RFC 1759 inputCannotFeedSizeSelected(813), -- Not in RFC 1759 + inputMediaTrayFeedError(814), + inputMediaTrayJam(815), + inputMediaTrayFailure(816), + inputMediaTrayPickRollerLifeWarn(817), + inputMediaTrayPickRollerLifeOver(818), + inputMediaTrayPickRollerFailure(819), + inputMediaTrayPickRollerMissing(820), + -- Output Group outputMediaTrayMissing(901), outputMediaTrayAlmostFull(902), outputMediaTrayFull(903), outputMailboxSelectFailure(904), -- Not in RFC 1759 + outputMediaTrayFeedError(905), + outputMediaTrayJam(906), + outputMediaTrayFailure(907), + -- Marker group markerFuserUnderTemperature(1001), markerFuserOverTemperature(1002), @@ -1440,6 +1477,56 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION -- Not in RFC 1759 markerAdjustingPrintQuality(1005), -- Not in RFC 1759 + markerAdded(1006), + -- HP20230601 + markerAtLimit(1007), + -- HP20230601 + markerCarrierFailure(1008), + -- HP20230601 + markerClosed(1009), + -- HP20230601 + markerLifeAlmostOver(1010), + -- HP20230601 + markerLifeOver(1011), + -- HP20230601 + markerMemoryExhausted(1012), + -- HP20230601 + markerMissing(1013), + -- HP20230601 + markerMotorFailure(1014), + -- HP20230601 + markerNearLimit(1015), + -- HP20230601 + markerOffline(1016), + -- HP20230601 + markerOpened(1017), + -- HP20230601 + markerOverTemperature(1018), + -- HP20230601 + markerPowerSaver(1019), + -- HP20230601 + markerRecoverableFailure(1020), + -- HP20230601 + markerRemoved(1021), + -- HP20230601 + markerResourceAdded(1022), + -- HP20230601 + markerResourceRemoved(1023), + -- HP20230601 + markerThermistorFailure(1024), + -- HP20230601 + markerTimingFailure(1025), + -- HP20230601 + markerTurnedOff(1026), + -- HP20230601 + markerTurnedOn(1027), + -- HP20230601 + markerUnderTemperature(1028), + -- HP20230601 + markerUnrecoverableFailure(1029), + -- HP20230601 + markerWarmingUp(1030), + -- HP20230601 -- Marker Supplies group markerTonerEmpty(1101), markerInkEmpty(1102), @@ -1457,12 +1544,43 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION markerDeveloperEmpty(1114), markerTonerCartridgeMissing(1115), -- Not in RFC 1759 + markerCleanerMissing(1116), + markerDeveloperMissing(1117), + markerFuserMissing(1118), + markerInkMissing(1119), + markerOpcMissing(1120), + markerPrintRibbonMissing(1121), + markerSupplyAlmostEmpty(1122), + markerSupplyEmpty(1123), + markerSupplyMissing(1124), + markerWasteAlmostFull(1125), + markerWasteFull(1126), + markerWasteMissing(1127), + markerWasteInkReceptacleMissing(1128), + markerWasteTonerReceptacleMissing(1129), + markerTonerMissing(1130), + markerSupplyFailure(1131), + -- HP20230601 + -- Media Path Device Group mediaPathMediaTrayMissing(1301), mediaPathMediaTrayAlmostFull(1302), mediaPathMediaTrayFull(1303), mediaPathCannotDuplexMediaSelected(1304), -- Not in RFC 1759 + mediaPathFailure(1305), + mediaPathJam(1306), + mediaPathInputRequest(1310), + mediaPathInputFeedError(1311), + mediaPathInputJam(1312), + mediaPathOutputFeedError(1321), + mediaPathOutputJam(1322), + mediaPathOutputFull(1323), + mediaPathPickRollerLifeWarn(1331), + mediaPathPickRollerLifeOver(1332), + mediaPathPickRollerFailure(1333), + mediaPathPickRollerMissing(1334), + -- Interpreter Group interpreterMemoryIncrease(1501), interpreterMemoryDecrease(1502), @@ -1476,6 +1594,50 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION -- The interpreter has encountered a page -- that is too complex for the resources that -- are available. + + -- Scanner Group + scannerLightLifeAlmostOver(5101), + scannerLightLifeOver(5102), + scannerLightFailure(5103), + scannerLightMissing(5104), + scannerSensorLifeAlmostOver(5111), + scannerSensorLifeOver(5112), + scannerSensorFailure(5113), + scannerSensorMissing(5114), + + -- Scan Media Path Group + scanMediaPathTrayMissing(5201), + scanMediaPathTrayAlmostFull(5202), + scanMediaPathTrayFull(5203), + scanMediaPathFailure(5205), + scanMediaPathJam(5206), + scanMediaPathInputRequest(5210), + scanMediaPathInputFeedError(5211), + scanMediaPathInputJam(5212), + scanMediaPathOutputFeedError(5221), + scanMediaPathOutputJam(5222), + scanMediaPathOutputFull(5223), + scanMediaPathPickRollerLifeWarn(5231), + scanMediaPathPickRollerLifeOver(5232), + scanMediaPathPickRollerFailure(5233), + scanMediaPathPickRollerMissing(5234), + + -- Fax Modem Group + faxModemMissing(6101), + faxModemLifeAlmostOver(6102), + faxModemLifeOver(6103), + faxModemTurnedOn(6104), + faxModemTurnedOff(6105), + faxModemInactivityTimeout(6110), -- DEPRECATED + faxModemProtocolAlert(6111), -- DEPRECATED + faxModemEquipmentFailure(6112), -- DEPRECATED + faxModemNoDialTone(6113), -- DEPRECATED + faxModemLineBusy(6114), -- DEPRECATED + faxModemNoAnswer(6115), -- DEPRECATED + faxModemVoiceDetected(6116), -- DEPRECATED + faxModemCarrierLost(6117), -- DEPRECATED + faxModemTrainingFailure(6118), -- DEPRECATED + -- Alert Group alertRemovalOfBinaryChangeEntry(1801), -- Not in RFC 1759 @@ -1521,6 +1683,7 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION staplerOverTemperature(30236), staplerTimingFailure(30237), staplerThermistorFailure(30238), + -- FinDeviceTypeTC = stitcher(3) -> stitcher -- FinStitchingTypeTC = saddleStitch(8) or edgeStitch(9) stitcherCoverOpen(30303), @@ -1559,6 +1722,7 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION stitcherOverTemperature(30336), stitcherTimingFailure(30337), stitcherThermistorFailure(30338), + -- FinDeviceTypeTC = folder(4) folderCoverOpen(30403), folderCoverClosed(30404), @@ -1596,6 +1760,7 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION folderOverTemperature(30436), folderTimingFailure(30437), folderThermistorFailure(30438), + -- FinDeviceTypeTC = binder(5) binderCoverOpen(30503), binderCoverClosed(30504), @@ -1633,6 +1798,7 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION binderOverTemperature(30536), binderTimingFailure(30537), binderThermistorFailure(30538), + -- FinDeviceTypeTC = trimmer(6) trimmerCoverOpen(30603), trimmerCoverClosed(30604), @@ -1670,6 +1836,7 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION trimmerOverTemperature(30636), trimmerTimingFailure(30637), trimmerThermistorFailure(30638), + -- FinDeviceTypeTC = dieCutter(7) dieCutterCoverOpen(30703), dieCutterCoverClosed(30704), @@ -1707,6 +1874,7 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION dieCutterOverTemperature(30736), dieCutterTimingFailure(30737), dieCutterThermistorFailure(30738), + -- FinDeviceTypeTC = puncher(8) puncherCoverOpen(30803), puncherCoverClosed(30804), @@ -1744,6 +1912,7 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION puncherOverTemperature(30836), puncherTimingFailure(30837), puncherThermistorFailure(30838), + -- FinDeviceTypeTC = perforater(9) perforaterCoverOpen(30903), perforaterCoverClosed(30904), @@ -1781,6 +1950,7 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION perforaterOverTemperature(30936), perforaterTimingFailure(30937), perforaterThermistorFailure(30938), + -- FinDeviceTypeTC = slitter(10) slitterCoverOpen(31003), slitterCoverClosed(31004), @@ -1818,6 +1988,7 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION slitterOverTemperature(31036), slitterTimingFailure(31037), slitterThermistorFailure(31038), + -- FinDeviceTypeTC = separationCutter(11) separationCutterCoverOpen(31103), separationCutterCoverClosed(31104), @@ -1855,6 +2026,7 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION separationCutterOverTemperature(31136), separationCutterTimingFailure(31137), separationCutterThermistorFailure(31138), + -- FinDeviceTypeTC = imprinter(12) imprinterCoverOpen(31203), imprinterCoverClosed(31204), @@ -1892,6 +2064,7 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION imprinterOverTemperature(31236), imprinterTimingFailure(31237), imprinterThermistorFailure(31238), + -- FinDeviceTypeTC = wrapper(13) wrapperCoverOpen(31303), wrapperCoverClosed(31304), @@ -1929,6 +2102,7 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION wrapperOverTemperature(31336), wrapperTimingFailure(31337), wrapperThermistorFailure(31338), + -- FinDeviceTypeTC = bander(14) banderCoverOpen(31403), banderCoverClosed(31404), @@ -1966,6 +2140,7 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION banderOverTemperature(31436), banderTimingFailure(31437), banderThermistorFailure(31438), + -- FinDeviceTypeTC = makeEnvelope(15) makeEnvelopeCoverOpen(31503), makeEnvelopeCoverClosed(31504), @@ -2003,6 +2178,7 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION makeEnvelopeOverTemperature(31536), makeEnvelopeTimingFailure(31537), makeEnvelopeThermistorFailure(31538), + -- FinDeviceTypeTC = stacker(16) stackerCoverOpen(31603), stackerCoverClosed(31604), @@ -2040,6 +2216,7 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION stackerOverTemperature(31636), stackerTimingFailure(31637), stackerThermistorFailure(31638), + -- FinDeviceTypeTC = sheetRotator(17) sheetRotatorCoverOpen(31703), sheetRotatorCoverClosed(31704), @@ -2077,6 +2254,7 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION sheetRotatorOverTemperature(31736), sheetRotatorTimingFailure(31737), sheetRotatorThermistorFailure(31738), + -- FinDeviceTypeTC = inserter(18) inserterCoverOpen(31803), inserterCoverClosed(31804), @@ -2116,3 +2294,4 @@ PrtAlertCodeTC ::= TEXTUAL-CONVENTION inserterThermistorFailure(31838) } END + diff --git a/mibs/IANAifType-MIB b/mibs/IANAifType-MIB index 65227a59f1d..d6101ef6161 100644 --- a/mibs/IANAifType-MIB +++ b/mibs/IANAifType-MIB @@ -5,7 +5,7 @@ TEXTUAL-CONVENTION FROM SNMPv2-TC; ianaifType MODULE-IDENTITY - LAST-UPDATED "202004020000Z" -- April 2, 2020 + LAST-UPDATED "202610230000Z" -- October 23, 2026 ORGANIZATION "IANA" CONTACT-INFO " Internet Assigned Numbers Authority @@ -14,11 +14,43 @@ Los Angeles, CA 90094-2536 Tel: +1 310-301-5800 - E-Mail: iana&iana.org" + E-Mail: iana@iana.org" + DESCRIPTION "This MIB module defines the IANAifType Textual Convention, and thus the enumerated values of the ifType object defined in MIB-II's ifTable." + REVISION "202610230000Z" -- October 23, 2026 + DESCRIPTION "Registration of new IANAifType 309." + + REVISION "202603170000Z" -- March 17, 2026 + DESCRIPTION "Registration of new IANAifTypes 307-308." + + REVISION "202602240000Z" -- February 24, 2026 + DESCRIPTION "Registration of new IANAifTypes 304-306." + + REVISION "202208170000Z" -- August 17, 2022 + DESCRIPTION "Changed gpon description to refer to G.984." + + REVISION "202105170000Z" -- May 17, 2021 + DESCRIPTION "Registration of new IANAifType 303." + + REVISION "202104230000Z" -- April 23, 2021 + DESCRIPTION "Registration of new tunnelType 19 and + combined 2018-06-28 revision statements" + + REVISION "202104220000Z" -- April 22, 2021 + DESCRIPTION "Registration of new IANAifType 302." + + REVISION "202102180000Z" -- February 18, 2021 + DESCRIPTION "Registration of new IANAifType 301." + + REVISION "202008270000Z" -- August 27, 2020 + DESCRIPTION "Updated Interface Types (ifType) registry name." + + REVISION "202007100000Z" -- July 10, 2020 + DESCRIPTION "Registration of new IANAifType 300." + REVISION "202004020000Z" -- April 2, 2020 DESCRIPTION "Added reference to ifType definitions registry." @@ -44,10 +76,7 @@ DESCRIPTION "Added missing commas for 291-293." REVISION "201806280000Z" -- June 28, 2018 - DESCRIPTION "Registration of new IANAifType 294." - - REVISION "201806280000Z" -- June 28, 2018 - DESCRIPTION "Registration of new IANAifType 293." + DESCRIPTION "Registration of new IANAifTypes 293-294." REVISION "201806220000Z" -- June 22, 2018 DESCRIPTION "Registration of new IANAifType 292." @@ -66,7 +95,7 @@ REVISION "201606160000Z" -- June 16, 2016 DESCRIPTION "Updated IANAtunnelType DESCRIPTION per RFC 7870" - + REVISION "201606090000Z" -- June 9, 2016 DESCRIPTION "Registration of new IANAifType 282." @@ -87,7 +116,7 @@ REVISION "201409190000Z" -- September 19, 2014 DESCRIPTION "Registration of new IANAifType 279." - + REVISION "201407030000Z" -- July 3, 2014 DESCRIPTION "Registration of new IANAifTypes 277-278." @@ -120,10 +149,10 @@ REVISION "201007210000Z" -- July 21, 2010 DESCRIPTION "Registration of new IANAifType 255." - + REVISION "201002110000Z" -- February 11, 2010 DESCRIPTION "Registration of new IANAifType 254." - + REVISION "201002080000Z" -- February 08, 2010 DESCRIPTION "Registration of new IANAifTypes 252 and 253." @@ -158,23 +187,23 @@ DESCRIPTION "Registration of new IANAifType 242." REVISION "200701230000Z" -- January 23, 2007 - DESCRIPTION "Registration of new IANAifTypes 239, 240, and 241." + DESCRIPTION "Registration of new IANAifTypes 239, 240, and 241." REVISION "200610170000Z" -- October 17, 2006 - DESCRIPTION "Deprecated/Obsoleted IANAifType 230. Registration of - IANAifType 238." + DESCRIPTION "Deprecated/Obsoleted IANAifType 230. Registration of + IANAifType 238." REVISION "200609250000Z" -- September 25, 2006 - DESCRIPTION "Changed the description for IANA ifType - 184 and added new IANA ifType 237." + DESCRIPTION "Changed the description for IANA ifType + 184 and added new IANA ifType 237." REVISION "200608170000Z" -- August 17, 2006 DESCRIPTION "Changed the descriptions for IANAifTypes - 20 and 21." + 20 and 21." REVISION "200608110000Z" -- August 11, 2006 DESCRIPTION "Changed the descriptions for IANAifTypes - 7, 11, 62, 69, and 117." + 7, 11, 62, 69, and 117." REVISION "200607250000Z" -- July 25, 2006 DESCRIPTION "Registration of new IANA ifType 236." @@ -184,13 +213,13 @@ REVISION "200603310000Z" -- March 31, 2006 DESCRIPTION "Registration of new IANA ifType 234." - + REVISION "200603300000Z" -- March 30, 2006 DESCRIPTION "Registration of new IANA ifType 233." - + REVISION "200512220000Z" -- December 22, 2005 DESCRIPTION "Registration of new IANA ifTypes 231 and 232." - + REVISION "200510100000Z" -- October 10, 2005 DESCRIPTION "Registration of new IANA ifType 230." @@ -202,7 +231,7 @@ REVISION "200503030000Z" -- March 3, 2005 DESCRIPTION "Added the IANAtunnelType TC and deprecated - IANAifType sixToFour (215) per RFC4087." + IANAifType sixToFour (215) per RFC4087." REVISION "200411220000Z" -- November 22, 2004 DESCRIPTION "Registration of new IANA ifType 227 per RFC4631." @@ -211,8 +240,8 @@ DESCRIPTION "Registration of new IANA ifType 226." REVISION "200405120000Z" -- May 12, 2004 - DESCRIPTION "Added description for IANAifType 6, and - changed the descriptions for IANAifTypes + DESCRIPTION "Added description for IANAifType 6, and + changed the descriptions for IANAifTypes 180, 181, and 182." REVISION "200405070000Z" -- May 7, 2004 @@ -242,7 +271,7 @@ REVISION "200210170000Z" -- Oct 17, 2002 DESCRIPTION "Registration of new IANAifType 219." - + REVISION "200207160000Z" -- Jul 16, 2002 DESCRIPTION "Registration of new IANAifTypes 217 and 218." @@ -254,7 +283,7 @@ REVISION "200206190000Z" -- Jun 19, 2002 DESCRIPTION "Registration of new IANAifType 214." - + REVISION "200201040000Z" -- Jan 4, 2002 DESCRIPTION "Registration of new IANAifTypes 211, 212 and 213." @@ -267,18 +296,22 @@ DESCRIPTION "Registration of new IANAifTypes 207 and 208." + REVISION "200111060000Z" -- Nov 6, 2001 DESCRIPTION "Registration of new IANAifType 206." + REVISION "200111020000Z" -- Nov 2, 2001 DESCRIPTION "Registration of new IANAifType 205." + REVISION "200110160000Z" -- Oct 16, 2001 DESCRIPTION "Registration of new IANAifTypes 199, 200, 201, 202, 203, and 204." + REVISION "200109190000Z" -- Sept 19, 2001 DESCRIPTION "Registration of new IANAifType 198." @@ -287,6 +320,7 @@ DESCRIPTION "Registration of new IANAifType 197." + REVISION "200101120000Z" -- Jan 12, 2001 DESCRIPTION "Registration of new IANAifTypes 195 and 196." @@ -305,17 +339,17 @@ REVISION "200010170000Z" -- Oct 17, 2000 DESCRIPTION "Registration of new IANAifTypes - 188 and 189." + 188 and 189." REVISION "200010020000Z" -- Oct 02, 2000 - DESCRIPTION "Registration of new IANAifType 187." + DESCRIPTION "Registration of new IANAifType 187." REVISION "200009010000Z" -- Sept 01, 2000 DESCRIPTION "Registration of new IANAifTypes - 184, 185, and 186." + 184, 185, and 186." REVISION "200008240000Z" -- Aug 24, 2000 - DESCRIPTION "Registration of new IANAifType 183." + DESCRIPTION "Registration of new IANAifType 183." REVISION "200008230000Z" -- Aug 23, 2000 DESCRIPTION "Registration of new IANAifTypes @@ -326,8 +360,8 @@ 171, 172 and 173." REVISION "200004250000Z" -- Apr 25, 2000 - DESCRIPTION "Registration of new IANAifTypes 168 and 169." - + DESCRIPTION "Registration of new IANAifTypes 168 and 169." + REVISION "200003060000Z" -- Mar 6, 2000 DESCRIPTION "Fixed a missing semi-colon in the IMPORT. Also cleaned up the REVISION log a bit. @@ -343,8 +377,10 @@ REVISION "199401310000Z" -- Jan 31, 1994 DESCRIPTION "Initial version of this MIB as published in RFC 1573." + ::= { mib-2 30 } + IANAifType ::= TEXTUAL-CONVENTION STATUS current DESCRIPTION @@ -360,9 +396,9 @@ latest arrangements can be obtained by contacting the IANA.) - Interface types must not be directly added to the + Interface types must not be directly added to the IANAifType-MIB MIB module. They must instead be added - to the 'ifType definitions' registry at + to the 'Interface Types (ifType)' registry at https://www.iana.org/assignments/smi-numbers. The relationship between the assignment of ifType @@ -405,21 +441,21 @@ propPointToPointSerial(22), -- proprietary serial ppp(23), softwareLoopback(24), - eon(25), -- CLNP over IP + eon(25), -- CLNP over IP ethernet3Mbit(26), nsip(27), -- XNS over IP slip(28), -- generic SLIP ultra(29), -- ULTRA technologies ds3(30), -- DS3-MIB sip(31), -- SMDS, coffee - frameRelay(32), -- DTE only. + frameRelay(32), -- DTE only. rs232(33), para(34), -- parallel-port arcnet(35), -- arcnet arcnetPlus(36), -- arcnet plus atm(37), -- ATM cells miox25(38), - sonet(39), -- SONET or SDH + sonet(39), -- SONET or SDH x25ple(40), iso88022llc(41), localTalk(42), @@ -437,25 +473,25 @@ propMultiplexor(54),-- proprietary multiplexing ieee80212(55), -- 100BaseVG fibreChannel(56), -- Fibre Channel - hippiInterface(57), -- HIPPI interfaces + hippiInterface(57), -- HIPPI interfaces frameRelayInterconnect(58), -- Obsolete, use either - -- frameRelay(32) or + -- frameRelay(32) or -- frameRelayService(44). aflane8023(59), -- ATM Emulated LAN for 802.3 aflane8025(60), -- ATM Emulated LAN for 802.5 - cctEmul(61), -- ATM Emulated circuit + cctEmul(61), -- ATM Emulated circuit fastEther(62), -- Obsoleted via RFC3635 -- ethernetCsmacd (6) should be used instead - isdn(63), -- ISDN and X.25 - v11(64), -- CCITT V.11/X.21 - v36(65), -- CCITT V.36 + isdn(63), -- ISDN and X.25 + v11(64), -- CCITT V.11/X.21 + v36(65), -- CCITT V.36 g703at64k(66), -- CCITT G703 at 64Kbps g703at2mb(67), -- Obsolete see DS1-MIB - qllc(68), -- SNA QLLC + qllc(68), -- SNA QLLC fastEtherFX(69), -- Obsoleted via RFC3635 -- ethernetCsmacd (6) should be used instead - channel(70), -- channel - ieee80211(71), -- radio spread spectrum + channel(70), -- channel + ieee80211(71), -- radio spread spectrum ibm370parChan(72), -- IBM System 360/370 OEMI Channel escon(73), -- IBM Enterprise Systems Connection dlsw(74), -- Data Link Switching @@ -491,7 +527,7 @@ voiceOverIp(104), -- voice over IP encapsulation atmDxi(105), -- ATM DXI atmFuni(106), -- ATM FUNI - atmIma (107), -- ATM IMA + atmIma (107), -- ATM IMA pppMultilinkBundle(108), -- PPP Multilink Bundle ipOverCdlc (109), -- IBM ipOverCdlc ipOverClaw (110), -- IBM Common Link Access to Workstn @@ -500,18 +536,18 @@ mpc (113), -- IBM multi-protocol channel support ipOverAtm (114), -- IBM ipOverAtm iso88025Fiber (115), -- ISO 802.5j Fiber Token Ring - tdlc (116), -- IBM twinaxial data link control + tdlc (116), -- IBM twinaxial data link control gigabitEthernet (117), -- Obsoleted via RFC3635 -- ethernetCsmacd (6) should be used instead hdlc (118), -- HDLC - lapf (119), -- LAP F - v37 (120), -- V.37 + lapf (119), -- LAP F + v37 (120), -- V.37 x25mlp (121), -- Multi-Link Protocol x25huntGroup (122), -- X25 Hunt Group transpHdlc (123), -- Transp HDLC interleave (124), -- Interleave channel fast (125), -- Fast channel - ip (126), -- IP (for APPN HPR in IP networks) + ip (126), -- IP (for APPN HPR in IP networks) docsCableMaclayer (127), -- CATV Mac Layer docsCableDownstream (128), -- CATV Downstream interface docsCableUpstream (129), -- CATV Upstream interface @@ -523,42 +559,42 @@ l2vlan (135), -- Layer 2 Virtual LAN using 802.1Q l3ipvlan (136), -- Layer 3 Virtual LAN using IP l3ipxvlan (137), -- Layer 3 Virtual LAN using IPX - digitalPowerline (138), -- IP over Power Lines + digitalPowerline (138), -- IP over Power Lines mediaMailOverIp (139), -- Multimedia Mail over IP dtm (140), -- Dynamic syncronous Transfer Mode dcn (141), -- Data Communications Network ipForward (142), -- IP Forwarding Interface msdsl (143), -- Multi-rate Symmetric DSL ieee1394 (144), -- IEEE1394 High Performance Serial Bus - if-gsn (145), -- HIPPI-6400 + if-gsn (145), -- HIPPI-6400 dvbRccMacLayer (146), -- DVB-RCC MAC Layer dvbRccDownstream (147), -- DVB-RCC Downstream Channel dvbRccUpstream (148), -- DVB-RCC Upstream Channel atmVirtual (149), -- ATM Virtual Interface mplsTunnel (150), -- MPLS Tunnel Virtual Interface - srp (151), -- Spatial Reuse Protocol + srp (151), -- Spatial Reuse Protocol voiceOverAtm (152), -- Voice Over ATM - voiceOverFrameRelay (153), -- Voice Over Frame Relay - idsl (154), -- Digital Subscriber Loop over ISDN + voiceOverFrameRelay (153), -- Voice Over Frame Relay + idsl (154), -- Digital Subscriber Loop over ISDN compositeLink (155), -- Avici Composite Link Interface - ss7SigLink (156), -- SS7 Signaling Link + ss7SigLink (156), -- SS7 Signaling Link propWirelessP2P (157), -- Prop. P2P wireless interface frForward (158), -- Frame Forward Interface - rfc1483 (159), -- Multiprotocol over ATM AAL5 - usb (160), -- USB Interface + rfc1483 (159), -- Multiprotocol over ATM AAL5 + usb (160), -- USB Interface ieee8023adLag (161), -- IEEE 802.3ad Link Aggregate bgppolicyaccounting (162), -- BGP Policy Accounting - frf16MfrBundle (163), -- FRF .16 Multilink Frame Relay + frf16MfrBundle (163), -- FRF .16 Multilink Frame Relay h323Gatekeeper (164), -- H323 Gatekeeper h323Proxy (165), -- H323 Voice and Video Proxy - mpls (166), -- MPLS + mpls (166), -- MPLS mfSigLink (167), -- Multi-frequency signaling link hdsl2 (168), -- High Bit-Rate DSL - 2nd generation shdsl (169), -- Multirate HDSL2 ds1FDL (170), -- Facility Data Link 4Kbps on a DS1 pos (171), -- Packet over SONET/SDH Interface dvbAsiIn (172), -- DVB-ASI Input - dvbAsiOut (173), -- DVB-ASI Output + dvbAsiOut (173), -- DVB-ASI Output plc (174), -- Power Line Communtications nfas (175), -- Non Facility Associated Signaling tr008 (176), -- TR008 @@ -577,7 +613,7 @@ digitalWrapperOverheadChannel (186), -- Digital Wrapper aal2 (187), -- ATM adaptation layer 2 radioMAC (188), -- MAC layer over radio links - atmRadio (189), -- ATM over radio links + atmRadio (189), -- ATM over radio links imt (190), -- Inter Machine Trunks mvl (191), -- Multiple Virtual Lines DSL reachDSL (192), -- Long Reach DSL @@ -585,20 +621,20 @@ atmVciEndPt (194), -- ATM VCI End Point opticalChannel (195), -- Optical Channel opticalTransport (196), -- Optical Transport - propAtm (197), -- Proprietary ATM + propAtm (197), -- Proprietary ATM voiceOverCable (198), -- Voice Over Cable Interface infiniband (199), -- Infiniband teLink (200), -- TE Link q2931 (201), -- Q.2931 virtualTg (202), -- Virtual Trunk Group sipTg (203), -- SIP Trunk Group - sipSig (204), -- SIP Signaling + sipSig (204), -- SIP Signaling docsCableUpstreamChannel (205), -- CATV Upstream Channel econet (206), -- Acorn Econet pon155 (207), -- FSAN 155Mb Symetrical PON interface pon622 (208), -- FSAN622Mb Symetrical PON interface bridge (209), -- Transparent bridge interface - linegroup (210), -- Interface common to multiple lines + linegroup (210), -- Interface common to multiple lines voiceEMFGD (211), -- voice E&M Feature Group D voiceFGDEANA (212), -- voice FGD Exchange Access North American voiceDID (213), -- voice Direct Inward Dialing @@ -611,16 +647,16 @@ homepna (220), -- HomePNA ITU-T G.989 gfp (221), -- Generic Framing Procedure (GFP) ciscoISLvlan (222), -- Layer 2 Virtual LAN using Cisco ISL - actelisMetaLOOP (223), -- Acteleis proprietary MetaLOOP High Speed Link - fcipLink (224), -- FCIP Link + actelisMetaLOOP (223), -- Acteleis proprietary MetaLOOP High Speed Link + fcipLink (224), -- FCIP Link rpr (225), -- Resilient Packet Ring Interface Type qam (226), -- RF Qam Interface lmp (227), -- Link Management Protocol cblVectaStar (228), -- Cambridge Broadband Networks Limited VectaStar docsCableMCmtsDownstream (229), -- CATV Modular CMTS Downstream Interface - adsl2 (230), -- Asymmetric Digital Subscriber Loop Version 2 + adsl2 (230), -- Asymmetric Digital Subscriber Loop Version 2 -- (DEPRECATED/OBSOLETED - please use adsl2plus 238 instead) - macSecControlledIF (231), -- MACSecControlled + macSecControlledIF (231), -- MACSecControlled macSecUncontrolledIF (232), -- MACSecUncontrolled aviciOpticalEther (233), -- Avici Optical Ethernet Aggregate atmbond (234), -- atmbond @@ -628,7 +664,7 @@ mocaVersion1 (236), -- MultiMedia over Coax Alliance (MoCA) Interface -- as documented in information provided privately to IANA ieee80216WMAN (237), -- IEEE 802.16 WMAN interface - adsl2plus (238), -- Asymmetric Digital Subscriber Loop Version 2, + adsl2plus (238), -- Asymmetric Digital Subscriber Loop Version 2, -- Version 2 Plus and all variants dvbRcsMacLayer (239), -- DVB-RCS MAC Layer dvbTdm (240), -- DVB Satellite TDM @@ -641,7 +677,7 @@ ilan (247), -- Internal LAN on a bridge per IEEE 802.1ap pip (248), -- Provider Instance Port on a bridge per IEEE 802.1ah PBB aluELP (249), -- Alcatel-Lucent Ethernet Link Protection - gpon (250), -- Gigabit-capable passive optical networks (G-PON) as per ITU-T G.948 + gpon (250), -- Gigabit-capable passive optical networks (G-PON) as per ITU-T G.984 vdsl2 (251), -- Very high speed digital subscriber line Version 2 (as per ITU-T Recommendation G.993.2) capwapDot11Profile (252), -- WLAN Profile Interface capwapDot11Bss (253), -- WLAN BSS Interface @@ -686,7 +722,17 @@ microwaveRadioLinkTerminal (296), -- radio link interface for one or several aggregated microwave carriers ieee8021axDrni (297), -- IEEE 802.1AX Distributed Resilient Network Interface ax25 (298), -- AX.25 network interfaces - ieee19061nanocom (299) -- Nanoscale and Molecular Communication + ieee19061nanocom (299), -- Nanoscale and Molecular Communication + cpri (300), -- Common Public Radio Interface + omni (301), -- Overlay Multilink Network Interface (OMNI) + roe (302), -- Radio over Ethernet Interface + p2pOverLan (303), -- Point to Point over LAN interface + docsCableScte25d1FwdOob (304), -- Cable SCTE 25-1 OOB Forward Channel + docsCableScte25d1RetOob (305), -- Cable SCTE 25-1 OOB Return Channel + docsCableScte25d2MacOob (306), -- Cable SCTE 25-2 OOB MAC + lora (307), -- LoRa + lorawan (308), -- LoRaWAN + waysideOsc (309) -- Wayside Communication over Optical Supervisory Channel } IANAtunnelType ::= TEXTUAL-CONVENTION @@ -713,13 +759,13 @@ IANAtunnelType ::= TEXTUAL-CONVENTION The remaining protocol-specific values indicate that a header of the protocol of that name is inserted between the outer header and the payload header. - - The IP Tunnel MIB [RFC4087] is designed to manage - tunnels of any type over IPv4 and IPv6 networks; - therefore, it already supports IP-in-IP tunnels. + + The IP Tunnel MIB [RFC4087] is designed to manage + tunnels of any type over IPv4 and IPv6 networks; + therefore, it already supports IP-in-IP tunnels. But in a DS-Lite scenario, the tunnel type is - point-to-multipoint IP-in-IP tunnels. The direct(2) - defined in the IP Tunnel MIB only supports point-to-point + point-to-multipoint IP-in-IP tunnels. The direct(2) + defined in the IP Tunnel MIB only supports point-to-point tunnels. So, it needs to define a new tunnel type for DS-Lite. @@ -727,24 +773,26 @@ IANAtunnelType ::= TEXTUAL-CONVENTION identical to the policy for assigning IANAifType values." SYNTAX INTEGER { - other(1), -- none of the following - direct(2), -- no intermediate header - gre(3), -- GRE encapsulation - minimal(4), -- Minimal encapsulation - l2tp(5), -- L2TP encapsulation - pptp(6), -- PPTP encapsulation - l2f(7), -- L2F encapsulation - udp(8), -- UDP encapsulation - atmp(9), -- ATMP encapsulation - msdp(10), -- MSDP encapsulation - sixToFour(11), -- 6to4 encapsulation - sixOverFour(12), -- 6over4 encapsulation - isatap(13), -- ISATAP encapsulation - teredo(14), -- Teredo encapsulation - ipHttps(15), -- IPHTTPS - softwireMesh(16), -- softwire mesh tunnel - dsLite(17), -- DS-Lite tunnel - aplusp(18) -- A+P encapsulation + other(1), -- none of the following + direct(2), -- no intermediate header + gre(3), -- GRE encapsulation + minimal(4), -- Minimal encapsulation + l2tp(5), -- L2TP encapsulation + pptp(6), -- PPTP encapsulation + l2f(7), -- L2F encapsulation + udp(8), -- UDP encapsulation + atmp(9), -- ATMP encapsulation + msdp(10), -- MSDP encapsulation + sixToFour(11), -- 6to4 encapsulation + sixOverFour(12), -- 6over4 encapsulation + isatap(13), -- ISATAP encapsulation + teredo(14), -- Teredo encapsulation + ipHttps(15), -- IPHTTPS + softwireMesh(16), -- softwire mesh tunnel + dsLite(17), -- DS-Lite tunnel + aplusp(18), -- A+P encapsulation + ipsectunnelmode(19) -- IpSec tunnel mode encapsulation } END + diff --git a/mibs/IEEE8021-BRIDGE-MIB b/mibs/IEEE8021-BRIDGE-MIB index 7e80577ff99..1d539605ff8 100644 --- a/mibs/IEEE8021-BRIDGE-MIB +++ b/mibs/IEEE8021-BRIDGE-MIB @@ -27,62 +27,64 @@ IMPORTS ; ieee8021BridgeMib MODULE-IDENTITY - LAST-UPDATED "201806280000Z" -- June 28, 2018 + LAST-UPDATED "202211080000Z" -- November 8, 2022 ORGANIZATION "IEEE 802.1 Working Group" CONTACT-INFO " WG-URL: http://www.ieee802.org/1/ - WG-EMail: stds-802-1-L@ieee.org - + WG-EMail: stds-802-1-l@ieee.org Contact: IEEE 802.1 Working Group Chair Postal: C/O IEEE 802.1 Working Group IEEE Standards Association 445 Hoes Lane - Piscataway - NJ 08854 + Piscataway, NJ 08854 USA - E-mail: STDS-802-1-L@IEEE.ORG" + E-mail: stds-802-1-chairs@ieee.org" DESCRIPTION "The Bridge MIB module for managing devices that support - IEEE Std 802.1Q. This MIB module is derived from the IETF - BRIDGE-MIB, RFC 4188. + IEEE Std 802.1Q. Unless otherwise indicated, the references in this MIB - module are to IEEE Std 802.1Q. + module are to IEEE Std 802.1Q-2022. - Copyright (C) IEEE (2014). + Copyright (C) IEEE (2022). This version of this MIB module is part of IEEE Std 802.1Q; - see the draft itself for full legal notices." - - REVISION "201806280000Z" -- June 28, 2018 + see that standard for full legal notices." + + REVISION "202211080000Z" -- November 8, 2022 + DESCRIPTION + "Published as part of IEEE Std 802.1Q-2022. + Cross references and contact information updated." + + REVISION "201807010000Z" -- July 1, 2018 DESCRIPTION - "Published as part of IEEE Std 802.1Q 2017 revision. + "Published as part of IEEE Std 802.1Q 2018 revision. Cross references updated and corrected." REVISION "201412150000Z" -- December 15, 2014 DESCRIPTION "Published as part of IEEE Std 802.1Q 2014 revision. Cross references updated and corrected." - + REVISION "201208100000Z" -- August 10, 2012 DESCRIPTION "Added an enumeration for tComponent in ieee8021BridgeBaseComponentType as part of IEEE Std 802.1Q Cor-2." - + REVISION "201202150000Z" -- February 15, 2012 - DESCRIPTION "Extended ieee8021BridgeBaseComponentType to - include erComponent and + DESCRIPTION "Extended ieee8021BridgeBaseComponentType to + include erComponent and ieee8021BridgeBasePortTypeCapabilities to include - stationFacingBridgePort, uplinkAccessPort and + stationFacingBridgePort, uplinkAccessPort and uplinkRelayPort. Added tables ieee8021BridgeBaseIfToPortTable and ieee8021BridgePortTable as part of IEEE Std 802.1Qbg." - + REVISION "201104060000Z" -- April 6, 2011 DESCRIPTION "Modifications to support Remote Customer Service Interfaces." REVISION "201102270000Z" -- February 27, 2011 - DESCRIPTION "Minor edits to contact information etc. as part of + DESCRIPTION "Minor edits to contact information etc. as part of 2011 revision of IEEE Std 802.1Q." REVISION "200810150000Z" -- October 15, 2008 @@ -228,11 +230,11 @@ ieee8021BridgeBaseComponentType OBJECT-TYPE following component types are possible: iComponent(1) - An S-VLAN component of a Backbone - Edge Bridge which performs encapsulation of customer + Edge Bridge that performs encapsulation of customer frames. bComponent(2) - An S-VLAN component of a Backbone - Edge Bridge which bundles backbone service instances + Edge Bridge that bundles backbone service instances into B-VLANs. cVlanComponent(3) - A C-VLAN component of an @@ -244,7 +246,7 @@ ieee8021BridgeBaseComponentType OBJECT-TYPE dBridgeComponent(5) - A VLAN unaware component of an IEEE 802.1Q Bridge. - + erComponent (6) - An Edge Relay component of an EVB Station. tComponent (7) - A TPMR component in a Backbone Edge Bridge. @@ -583,7 +585,7 @@ ieee8021BridgeBasePortTypeCapabilities OBJECT-TYPE virtualInstancePort(5) - Indicates the port can be a virtual S-TAG-aware port within a Backbone Edge - Bridge's I-component which is responsible for + Bridge's I-component that is responsible for handling S-tagged traffic for a specific backbone service instance. @@ -593,17 +595,17 @@ ieee8021BridgeBasePortTypeCapabilities OBJECT-TYPE remoteCustomerAccessPort(7) - Indicates the port can be an S-TAG-aware port of a Provider Bridge capable of providing Remote Customer Service Interfaces. - + stationFacingBridgePort(8) - Indicates the station-facing Bridge Port in a EVB Bridge. - + uplinkAccessPort(9) - Indicates the uplink access port in an EVB Bridge or EVB station. - + uplinkRelayPort (10) - Indicates the uplink relay port - in an EVB station." - - REFERENCE "40.4, 12.13.1.1, 12.13.1.2, 12.16, + in an EVB station." + + REFERENCE "40.4, 12.13.1.1, 12.13.1.2, 12.16, 12.16.2.1, 12.26" ::= { ieee8021BridgeBasePortEntry 7 } @@ -614,7 +616,7 @@ ieee8021BridgeBasePortType OBJECT-TYPE DESCRIPTION "The port type. This value MUST be persistent over power up restart/reboot." - REFERENCE "40.4, 12.13.1.1, 12.13.1.2, 12.16, + REFERENCE "40.4, 12.13.1.1, 12.13.1.2, 12.16, 12.16.2.1, 12.26" ::= { ieee8021BridgeBasePortEntry 8 } @@ -638,7 +640,7 @@ ieee8021BridgeBasePortAdminPointToPoint OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "For a port running spanning tree, this object represents the + "For a port running spanning tree, this object represents the administrative point-to-point status of the LAN segment attached to this port, using the enumeration values of IEEE Std 802.1AC. A value of forceTrue(1) indicates @@ -668,7 +670,7 @@ ieee8021BridgeBasePortAdminPointToPoint OBJECT-TYPE 6.10.1 (and described in 26.4.1). Whenever the parameter is set to forceFalse(2) or auto(3), the value for the Default Backbone Destination parameter is set to the - Backbone Service Instance Group Address for the VIP-ISID. + Backbone Service Instance Group Address for the VIP-ISID. The value of this object MUST be retained across reinitializations of the management system." @@ -712,7 +714,7 @@ ieee8021BridgeBasePortName OBJECT-TYPE locally determined significance." REFERENCE "12.4.2.1" ::= { ieee8021BridgeBasePortEntry 12 } - + -- ============================================================= -- The Generic Bridge ifIndex to Port Table -- ============================================================= @@ -744,7 +746,7 @@ Ieee8021BridgeBaseIfToPortEntry ::= ieee8021BridgeBaseIfIndexPort IEEE8021BridgePortNumber } - + ieee8021BridgeBaseIfIndexComponentId OBJECT-TYPE SYNTAX IEEE8021PbbComponentIdentifier MAX-ACCESS read-only @@ -752,15 +754,15 @@ Ieee8021BridgeBaseIfToPortEntry ::= DESCRIPTION "The component ID for this ifIndex." ::= { ieee8021BridgeBaseIfToPortEntry 1 } - - ieee8021BridgeBaseIfIndexPort OBJECT-TYPE + + ieee8021BridgeBaseIfIndexPort OBJECT-TYPE SYNTAX IEEE8021BridgePortNumber MAX-ACCESS read-only STATUS current DESCRIPTION "The port for this ifIndex." ::= { ieee8021BridgeBaseIfToPortEntry 2 } - + -- ============================================================= -- port number table section 12.5.1 @@ -771,7 +773,7 @@ ieee8021BridgePhyPortTable OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - "A table that contains ISS port number to Bridge + "A table that contains ISS port number to Bridge componentID and port number mapping." REFERENCE "12.5.1" ::= { ieee8021BridgeBase 6} @@ -788,19 +790,18 @@ ieee8021BridgePhyPortEntry OBJECT-TYPE Ieee8021BridgePhyPortEntry ::= SEQUENCE { - ieee8021BridgePhyPort + ieee8021BridgePhyPort IEEE8021BridgePortNumber, - ieee8021BridgePhyPortIfIndex + ieee8021BridgePhyPortIfIndex InterfaceIndexOrZero, - ieee8021BridgePhyMacAddress + ieee8021BridgePhyMacAddress MacAddress, - ieee8021BridgePhyPortToComponentId - IEEE8021PbbComponentIdentifierOrZero, - ieee8021BridgePhyPortToInternalPort + ieee8021BridgePhyPortToComponentId + IEEE8021PbbComponentIdentifierOrZero, + ieee8021BridgePhyPortToInternalPort IEEE8021BridgePortNumberOrZero } - ieee8021BridgePhyPort OBJECT-TYPE SYNTAX IEEE8021BridgePortNumber MAX-ACCESS not-accessible @@ -808,8 +809,8 @@ ieee8021BridgePhyPort OBJECT-TYPE DESCRIPTION "The ISS port." REFERENCE "12.26" - ::= { ieee8021BridgePhyPortEntry 1 } - + ::= { ieee8021BridgePhyPortEntry 1 } + ieee8021BridgePhyPortIfIndex OBJECT-TYPE SYNTAX InterfaceIndexOrZero @@ -821,8 +822,8 @@ ieee8021BridgePhyPortIfIndex OBJECT-TYPE to this port, or the value 0 if the port has not been bound to an underlying frame source and sink. - The underlying IfEntry indexed by this column MUST - be persistent across reinitializations of the + The underlying IfEntry indexed by this column MUST + be persistent across reinitializations of the management system." ::= { ieee8021BridgePhyPortEntry 2 } @@ -837,12 +838,11 @@ ieee8021BridgePhyPortToComponentId OBJECT-TYPE SYNTAX IEEE8021PbbComponentIdentifierOrZero MAX-ACCESS read-only STATUS current - DESCRIPTION + DESCRIPTION "The component ID that this ISS port belongs to." ::= { ieee8021BridgePhyPortEntry 4 } - ieee8021BridgePhyPortToInternalPort OBJECT-TYPE SYNTAX IEEE8021BridgePortNumberOrZero MAX-ACCESS read-only @@ -850,7 +850,7 @@ ieee8021BridgePhyPortToInternalPort OBJECT-TYPE DESCRIPTION "The port number to which this ISS port maps to." - ::= { ieee8021BridgePhyPortEntry 5 } + ::= { ieee8021BridgePhyPortEntry 5 } -- ============================================================= -- the ieee8021BridgeTp subtree @@ -1066,7 +1066,7 @@ ieee8021BridgePortPriorityCodePointSelection OBJECT-TYPE STATUS current DESCRIPTION " This object identifies the rows in the PCP encoding and - decoding tables that are used to remark frames on this + decoding tables that are used to remark frames on this port if this remarking is enabled." REFERENCE "12.6.2.6, 12.6.2.7" ::= { ieee8021BridgePortPriorityEntry 3 } @@ -1076,7 +1076,7 @@ ieee8021BridgePortUseDEI OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "If the Use_DEI is set to true(1) for the Port then the + "If the Use_DEI is set to true(1) for the Port then the drop_eligible parameter is encoded in the DEI of transmitted frames, and the drop_eligible parameter shall be true(1) for a received frame if the DEI is set in the VLAN tag or the Priority @@ -1093,7 +1093,7 @@ ieee8021BridgePortRequireDropEncoding OBJECT-TYPE STATUS current DESCRIPTION "If a Bridge supports encoding or decoding of drop_eligible - from the PCP field of a VLAN tag (6.7.3) on any of its Ports, + from the PCP field of a VLAN tag (6.9.3) on any of its Ports, then it shall implement a Boolean parameter Require Drop Encoding on each of its Ports with default value false(2). If Require Drop Encoding is True and the Bridge Port cannot @@ -1249,7 +1249,7 @@ ieee8021BridgePortOutboundAccessPriorityTable OBJECT-TYPE DESCRIPTION "A table mapping regenerated priority to Outbound Access Priority. This is a fixed mapping for all port - types, with three options for IEEE 802.17 RPR." + types." REFERENCE "IEEE Std 802.1AC" ::= { ieee8021BridgePriority 4 } @@ -1377,7 +1377,7 @@ ieee8021BridgePortDecodingDropEligible OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "The drop eligibility value in Table 6-3 (6.7.3)." + "The drop eligibility value in Table 6-3 (6.9.3)." REFERENCE "6.9.3, 12.6.2.8, 12.6.2.9" ::= { ieee8021BridgePortDecodingEntry 6 } @@ -1833,7 +1833,6 @@ ieee8021BridgeDot1dPortRowStatus OBJECT-TYPE table and the ieee8021BridgeBasePortTable." ::= { ieee8021BridgeDot1dPortEntry 1 } - -- ============================================================= -- IEEE 802.1Q Bridge MIB - Conformance Information -- ============================================================= @@ -2058,7 +2057,7 @@ ieee8021BridgeCreatableBaseBridgeGroup OBJECT-GROUP } STATUS current DESCRIPTION - "Controls the managment system directed creation of + "Controls the management system directed creation of Bridge Components." ::= { ieee8021BridgeGroups 18 } @@ -2075,8 +2074,8 @@ ieee8021BridgeDot1dDynamicPortCreationGroup OBJECT-GROUP "A collection of objects providing dynamic creation and deletion of MAC Bridge Ports." ::= { ieee8021BridgeGroups 19 } - - + + -- ============================================================= -- Bridge interface index to port table group -- ============================================================= @@ -2084,8 +2083,8 @@ ieee8021BridgeDot1dDynamicPortCreationGroup OBJECT-GROUP ieee8021BridgeBaseIfToPortGroup OBJECT-GROUP OBJECTS { ieee8021BridgeBaseIfIndexComponentId, - ieee8021BridgeBaseIfIndexPort - + ieee8021BridgeBaseIfIndexPort + } STATUS current DESCRIPTION @@ -2093,8 +2092,6 @@ ieee8021BridgeBaseIfToPortGroup OBJECT-GROUP index and component ID and Bridge Ports." ::= { ieee8021BridgeGroups 20 } - - -- ============================================================= -- Bridge interface index to component group -- ============================================================= @@ -2109,7 +2106,7 @@ ieee8021BridgePhyPortGroup OBJECT-GROUP DESCRIPTION "The collection of objects used to represent a ISS port management objects." ::= { ieee8021BridgeGroups 21 } - + -- ============================================================= -- compliance statements @@ -2119,7 +2116,7 @@ ieee8021BridgeCompliance1 MODULE-COMPLIANCE STATUS current DESCRIPTION "The compliance statement for devices supporting - VLAN-unaware bridging services as defined in + VLAN-unaware bridging services as defined in IEEE Std 802.1Q. Such devices support path cost values of 32-bits, and Bridge and port priority values are more restricted than in IEEE Std 802.1D-1995. @@ -2172,24 +2169,23 @@ ieee8021BridgeCompliance1 MODULE-COMPLIANCE "Implementation of this group is optional. It can be supported to provide the ability to dynamically create and delete MAC Bridge Ports." - + GROUP ieee8021BridgeBaseIfToPortGroup DESCRIPTION "A collection of objects providing a map between interface index and component ID and Bridge Ports." GROUP ieee8021BridgePhyPortGroup DESCRIPTION - "A colelction of objects providing a map between port numbers + "A collection of objects providing a map between port numbers to the component id, interface index." ::= { ieee8021BridgeCompliances 3 } - ieee8021BridgeCompliance MODULE-COMPLIANCE STATUS current DESCRIPTION "The compliance statement for devices supporting - VLAN-unaware bridging services as defined in + VLAN-unaware bridging services as defined in IEEE Std 802.1Q. Such devices support path cost values of 32-bits, and Bridge and port priority values are more restricted than in IEEE Std 802.1D-1995. @@ -2278,12 +2274,12 @@ ieee8021BridgePriorityAndMulticastFilteringCompliance MODULE-COMPLIANCE "This group is mandatory only for devices supporting the priority forwarding operations defined by IEEE Std 802.1Q and that have interface media types that support - native priority, e.g., IEEE Std 802.17." + native priority." GROUP ieee8021BridgePriorityGroup DESCRIPTION "This group is mandatory only for devices supporting - the priority forwarding operations defined by + the priority forwarding operations defined by IEEE Std 802.1Q." GROUP ieee8021BridgeAccessPriorityGroup @@ -2291,14 +2287,14 @@ ieee8021BridgePriorityAndMulticastFilteringCompliance MODULE-COMPLIANCE "This group is optional and is relevant only for devices supporting the priority forwarding operations defined by IEEE Std 802.1Q and that have interface media types that - support native Access Priority, e.g., IEEE 802.17." + support native Access Priority." GROUP ieee8021BridgePortMrpGroup DESCRIPTION "This group is mandatory for devices supporting any of the MRP applications: e.g., MMRP, defined by the extended filtering services; or MVRP. - Rrefer to the Q-BRIDGE-MIB for + Refer to the Q-BRIDGE-MIB for conformance statements for MVRP." GROUP ieee8021BridgePortMmrpGroup @@ -2339,4 +2335,4 @@ ieee8021BridgePriorityAndMulticastFilteringCompliance MODULE-COMPLIANCE ::= { ieee8021BridgeCompliances 2 } -END \ No newline at end of file +END diff --git a/mibs/IEEE8021-CFM-MIB b/mibs/IEEE8021-CFM-MIB index 6534d8d55c1..2a336e1770b 100644 --- a/mibs/IEEE8021-CFM-MIB +++ b/mibs/IEEE8021-CFM-MIB @@ -23,54 +23,51 @@ IMPORTS LldpChassisId, LldpChassisIdSubtype, LldpPortId, - LldpPortIdSubtype FROM LLDP-MIB -- [IEEE Std 802.1AB-2005] + LldpPortIdSubtype FROM LLDP-MIB -- [IEEE Std 802.1AB] VlanIdOrNone, VlanId FROM Q-BRIDGE-MIB -- [RFC4363] ieee802dot1mibs, IEEE8021VlanIndex FROM IEEE8021-TC-MIB ; ieee8021CfmMib MODULE-IDENTITY - LAST-UPDATED "201806280000Z" -- June 28, 2018 + LAST-UPDATED "202211080000Z" -- November 8, 2022 ORGANIZATION "IEEE 802.1 Working Group" CONTACT-INFO - "WG-URL: http://www.ieee802.org/1/ - WG-EMail: stds-802-1-L@ieee.org - - Contact: IEEE 802.1 Working Group Chair + " WG-URL: http://www.ieee802.org/1/ + WG-EMail: stds-802-1-l@ieee.org + Contact: IEEE 802.1 Working Group Chair Postal: C/O IEEE 802.1 Working Group IEEE Standards Association 445 Hoes Lane - Piscataway - NJ 08854 + Piscataway, NJ 08854 USA - E-mail: STDS-802-1-L@IEEE.ORG - " - DESCRIPTION + E-mail: stds-802-1-chairs@ieee.org" + DESCRIPTION "Connectivity Fault Management module. - Unless otherwise indicated, the references in this MIB - module are to IEEE Std 802.1Q. + Unless otherwise indicated, the references in this MIB + module are to IEEE Std 802.1Q-2022. - Copyright (C) IEEE (2018). - This version of this MIB module is part of IEEE Syd 802.1Q; - see the draft itself for full legal notices." + Copyright (C) IEEE (2022). + This version of this MIB module is part of IEEE Std 802.1Q-2022; + see that standard for full legal notices." - REVISION "201806280000Z" -- June 28, 2018 + REVISION "202211080000Z" -- November 8, 2022 DESCRIPTION - "Published as part of IEEE Std 802.1Q-2018. - Cross references updated and corrected." - + "Published as part of IEEE Std 802.1Q-2022. + Cross references and contact information updated." + REVISION "201412150000Z" -- December 15, 2014 - + DESCRIPTION "Published as part of IEEE Std 802.1Q 2014 revision. Cross references updated and corrected." - + REVISION "201102270000Z" -- February 27, 2011 DESCRIPTION "Addition of support for ICC format and minor edits as part of 2011 revision of IEEE Std 802.1Q." - + REVISION "200811180000Z" -- November 18, 2008 DESCRIPTION @@ -81,16 +78,16 @@ ieee8021CfmMib MODULE-IDENTITY needed for PBB-TE support." REVISION "200810150000Z" -- October 15, 2008 - DESCRIPTION - "The IEEE8021-CFM-MIB Module was originally included in IEEE - Std 802.1ag-2007. Some objects in this module are deprecated + DESCRIPTION + "The IEEE8021-CFM-MIB Module was originally included in IEEE + Std 802.1ag-2007. Some objects in this module are deprecated and replaced by objects in the IEEE8021-CFM-V2-MIB module defined in IEEE Std 802.1ap. This revision is included in IEEE Std 802.1ap." REVISION "200706100000Z" -- 06/10/2007 00:00GMT - DESCRIPTION + DESCRIPTION "Included in IEEE Std 802.1ag-2007." ::= { ieee802dot1mibs 8 } @@ -121,7 +118,6 @@ Dot1agCfmMaintDomainNameType ::= TEXTUAL-CONVENTION of a Dot1agCfmMaintDomainName. The value can be one of the following: - ieeeReserved(0) Reserved for definition by IEEE 802.1 recommend to not use zero unless absolutely needed. @@ -138,7 +134,7 @@ Dot1agCfmMaintDomainNameType ::= TEXTUAL-CONVENTION used. ieeeReserved(xx) Reserved for definition by IEEE 802.1 xx values can be [5..31] and [96..255] - ituReserved(xx) Reserved for definition by ITU-T Y.1731 + ituReserved(xx) Reserved for definition by ITU-T G.8013/Y.1731 xx values range from [32..63] ietfReserved(xx) Reserved for definition by IETF. xx values range from [64..95]. @@ -225,7 +221,7 @@ Dot1agCfmMaintAssocNameType ::= TEXTUAL-CONVENTION primaryVid(1) Primary VLAN ID. 12 bits represented in a 2-octet integer: - least significant 4 bits of the first - byte contains the most significant + byte contains the most significant 4 bits of the 12 bits primary VID - second byte contains the least significant 8 bits of the primary VID @@ -243,7 +239,7 @@ Dot1agCfmMaintAssocNameType ::= TEXTUAL-CONVENTION unsignedInt16 (3) 2-octet integer/big endian rfc2685VpnId(4) RFC 2685 VPN ID 3 octet VPN authority Organizationally - Unique Identifier (OUI) or Company Identifier (CID) + Unique Identifier (OUI) or Company ID (CID) followed by 4 octet VPN index identifying VPN according to the OUI or CID: @@ -266,8 +262,8 @@ Dot1agCfmMaintAssocNameType ::= TEXTUAL-CONVENTION ieeeReserved(xx) Reserved for definition by IEEE 802.1 xx values can be [5..31] and [96..255] - iccFormat(32) ICC-based format as specified in ITU-T Y.1731 - ituReserved(xx) Reserved for definition by ITU-T Y.1731 + iccFormat(32) ICC-based format as specified in ITU-T G.8013/Y.1731 + ituReserved(xx) Reserved for definition by ITU-T G.8013/Y.1731 xx values range from [33..63] ietfReserved(xx) Reserved for definition by IETF xx values range from [64..95] @@ -296,7 +292,7 @@ Dot1agCfmMaintAssocNameType ::= TEXTUAL-CONVENTION the Dot1agCfmMaintDomainName object plus the length of the Dot1agCfmMaintAssocName object, added together, MUST total less than or equal to 44 octets. - " + " REFERENCE "21.6.5.4, Table 21-19" SYNTAX INTEGER { @@ -311,7 +307,7 @@ Dot1agCfmMaintAssocName ::= TEXTUAL-CONVENTION STATUS current DESCRIPTION "Denotes a generic Maintenance Association Name. It is the - part of the Maintenance Association Identifier which is + part of the Maintenance Association Identifier that is unique within the Maintenance Domain Name and is appended to the Maintenance Domain Name to form the Maintenance Association Identifier (MAID). @@ -325,7 +321,7 @@ Dot1agCfmMaintAssocName ::= TEXTUAL-CONVENTION before the object(s) that use the Dot1agCfmMaintAssocName textual convention, if they appear in the same logical row. - The value of a Dot1agCfmMaintAssocName object MUST + The value of a Dot1agCfmMaintAssocName object MUST always be consistent with the value of the associated Dot1agCfmMaintAssocNameType object. Attempts to set an Dot1agCfmMaintAssocName object to a value inconsistent @@ -346,7 +342,6 @@ Dot1agCfmMaintAssocName ::= TEXTUAL-CONVENTION "21.6.5.4, 21.6.5.5, 21.6.5.6" SYNTAX OCTET STRING (SIZE(1..45)) - Dot1agCfmMDLevel ::= TEXTUAL-CONVENTION DISPLAY-HINT "d" STATUS current @@ -370,7 +365,7 @@ Dot1agCfmMDLevelOrNone ::= TEXTUAL-CONVENTION "Integer identifying the Maintenance Domain Level (MD Level). Higher numbers correspond to higher Maintenance Domains, those with the greatest physical reach, with the highest - values for customers' CFM packets. Lower numbers correspond + values for customers' CFM frames. Lower numbers correspond to lower Maintenance Domains, those with more limited physical reach, with the lowest values for CFM PDUs protecting single Bridges or physical links. @@ -403,11 +398,11 @@ Dot1agCfmMpDirection ::= TEXTUAL-CONVENTION Dot1agCfmPortStatus ::= TEXTUAL-CONVENTION STATUS current DESCRIPTION - "An enumerated value from he Port Status TLV from the last CCM + "An enumerated value from the Port Status TLV from the last CCM received from the last MEP. It indicates the ability of the Bridge Port on which the transmitting MEP resides to pass ordinary data, regardless of the status of the MAC - (Table 21-10). + (Table 21-9). psNoPortStateTLV(0) Indicates either that no CCM has been received or that no port status TLV was @@ -439,7 +434,7 @@ Dot1agCfmPortStatus ::= TEXTUAL-CONVENTION Dot1agCfmInterfaceStatus ::= TEXTUAL-CONVENTION STATUS current DESCRIPTION - "An enumerated value from the Interface Status TLV from the + "An enumerated value from the Interface Status TLV from the last CCM received from the last MEP. It indicates the status of the Interface within which the MEP transmitting the CCM is configured, or the next lower Interface in the Interface @@ -449,21 +444,21 @@ Dot1agCfmInterfaceStatus ::= TEXTUAL-CONVENTION received or that no interface status TLV was present in the last CCM received. - isUp(1) The interface is ready to pass packets. + isUp(1) The interface is ready to pass frames. - isDown(2) The interface cannot pass packets + isDown(2) The interface cannot pass frames. isTesting(3) The interface is in some test mode. - + isUnknown(4) The interface status cannot be determined for some reason. isDormant(5) The interface is not in a state to pass - packets but is in a pending state, waiting + frames but is in a pending state, waiting for some external event. - + isNotPresent(6) Some component of the interface is missing - + isLowerLayerDown(7) The interface is down due to state of the lower layer interfaces @@ -491,7 +486,7 @@ Dot1agCfmHighestDefectPri ::= TEXTUAL-CONVENTION "An enumerated value, equal to the contents of the variable highestDefect (20.35.9 and Table 20-1), indicating the highest-priority defect that has been present since the MEP - Fault Notification Generator State Machine was last in the + Fault Notification Generator State Machine was last in the FNG_RESET state, either: none(0) no defects since FNG_RESET @@ -554,7 +549,7 @@ Dot1agCfmMepId ::= TEXTUAL-CONVENTION identifying a specific MEP. " REFERENCE - "3.132, 19.2.1" + "3.133, 19.2.1" SYNTAX Unsigned32 (1..8191) Dot1agCfmMepIdOrZero ::= TEXTUAL-CONVENTION @@ -564,7 +559,7 @@ Dot1agCfmMepIdOrZero ::= TEXTUAL-CONVENTION "Maintenance association Endpoint Identifier (MEPID): A small integer, unique over a given Maintenance Association, identifying a specific MEP. - + The special value 0 is allowed to indicate special cases, for example that no MEPID is configured. @@ -670,7 +665,7 @@ Dot1agCfmCcmInterval ::= TEXTUAL-CONVENTION Dot1agCfmFngState ::= TEXTUAL-CONVENTION STATUS current DESCRIPTION - "Indicates the diferent states of the MEP Fault Notification + "Indicates the different states of the MEP Fault Notification Generator State Machine. fngReset(1) No defect has been present since the @@ -679,7 +674,7 @@ Dot1agCfmFngState ::= TEXTUAL-CONVENTION was last reset. fngDefect(2) A defect is present, but not for a - long enough time to be reported + long enough time to be reported (dot1agCfmMepFngAlarmTime). fngReportDefect(3) A momentary state during which the @@ -715,7 +710,7 @@ Dot1agCfmRelayActionFieldValue ::= TEXTUAL-CONVENTION rlyFdb (2), rlyMpdb (3) } - + Dot1agCfmIngressActionFieldValue ::= TEXTUAL-CONVENTION STATUS current DESCRIPTION @@ -840,7 +835,7 @@ Dot1agCfmMepDefects ::= TEXTUAL-CONVENTION Dot1agCfmConfigErrors ::= TEXTUAL-CONVENTION STATUS current DESCRIPTION - "While making the MIP creation evaluation described in + "While making the MIP creation evaluation described in 22.2.3, the management entity can encounter errors in the configuration. These are possible errors that can be encountered: @@ -885,7 +880,7 @@ Dot1agCfmPbbComponentIdentifier DESCRIPTION "A Provider Backbone Bridge (PBB) can comprise a number of components, each of which can be managed in a manner - essentially equivalent to an IEEE 802.1Q Bridge. In order to + essentially equivalent to an IEEE 802.1Q Bridge. In order to access these components easily, an index is used in a number of tables. If any two tables are indexed by Dot1agCfmPbbComponentIdentifier, then entries in those tables @@ -913,7 +908,7 @@ dot1agCfmStackTable OBJECT-TYPE "There is one CFM Stack table per Bridge. It permits the retrieval of information about the Maintenance Points configured on any given interface. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -926,7 +921,7 @@ dot1agCfmStackEntry OBJECT-TYPE STATUS deprecated DESCRIPTION "The Stack table entry - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " INDEX { dot1agCfmStackifIndex, dot1agCfmStackVlanIdOrNone, @@ -960,7 +955,7 @@ dot1agCfmStackifIndex OBJECT-TYPE indexed before the system restart. If no such entry exists, then the system SHALL delete all entries in the dot1agCfmStackTable with the interface index. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -973,7 +968,7 @@ dot1agCfmStackVlanIdOrNone OBJECT-TYPE STATUS deprecated DESCRIPTION "VLAN ID to which the MP is attached, or 0, if none. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -986,7 +981,7 @@ dot1agCfmStackMdLevel OBJECT-TYPE STATUS deprecated DESCRIPTION "MD Level of the Maintenance Point. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -999,7 +994,7 @@ dot1agCfmStackDirection OBJECT-TYPE STATUS deprecated DESCRIPTION "Direction in which the MP faces on the Bridge Port - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1026,7 +1021,7 @@ dot1agCfmStackMaIndex OBJECT-TYPE "The index of the MA in the dot1agCfmMaNetTable and dot1agCfmMaCompTable to which the MP is associated, or 0, if none. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1041,7 +1036,7 @@ dot1agCfmStackMepId OBJECT-TYPE "If an MEP is configured, the MEPID, else 0" REFERENCE "12.14.2.1.3:d - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " ::= { dot1agCfmStackEntry 7 } @@ -1052,7 +1047,7 @@ dot1agCfmStackMacAddress OBJECT-TYPE STATUS deprecated DESCRIPTION "MAC address of the MP. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1084,7 +1079,7 @@ dot1agCfmVlanTable OBJECT-TYPE The writable objects in this table need to be persistent upon reboot or restart of a device. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1098,7 +1093,7 @@ dot1agCfmVlanEntry OBJECT-TYPE STATUS deprecated DESCRIPTION "The VLAN table entry. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " INDEX { dot1agCfmVlanComponentId, dot1agCfmVlanVid } @@ -1120,7 +1115,7 @@ dot1agCfmVlanComponentId OBJECT-TYPE in this dot1agCfmVlanEntry applies. If the system is not a Bridge, or if only one component is present in the Bridge, then this variable (index) MUST be equal to 1. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1135,7 +1130,7 @@ dot1agCfmVlanVid OBJECT-TYPE "This is a VLAN ID belonging to a VLAN that is associated with more than one VLAN ID, and this is not the Primary VID of the VLAN. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " ::= { dot1agCfmVlanEntry 2 } @@ -1148,7 +1143,7 @@ dot1agCfmVlanPrimaryVid OBJECT-TYPE "This is the Primary VLAN ID of the VLAN with which this entry's dot1agCfmVlanVid is associated. This value MUST not equal the value of dot1agCfmVlanVid. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " ::= { dot1agCfmVlanEntry 3 } @@ -1163,7 +1158,7 @@ dot1agCfmVlanRowStatus OBJECT-TYPE The writable columns in a row cannot be changed if the row is active. All columns MUST have a valid value before a row can be activated. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " ::= { dot1agCfmVlanEntry 4 } @@ -1274,7 +1269,7 @@ dot1agCfmDefaultMdTable OBJECT-TYPE After this initialization, the writable objects in this table need to be persistent upon reboot or restart of a device. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1287,7 +1282,7 @@ dot1agCfmDefaultMdEntry OBJECT-TYPE STATUS deprecated DESCRIPTION "The Default MD Level table entry. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " INDEX { dot1agCfmDefaultMdComponentId, @@ -1312,7 +1307,7 @@ dot1agCfmDefaultMdComponentId OBJECT-TYPE in this dot1agCfmDefaultMdEntry applies. If the system is not a Bridge, or if only one component is present in the Bridge, then this variable (index) MUST be equal to 1. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1326,7 +1321,7 @@ dot1agCfmDefaultMdPrimaryVid OBJECT-TYPE DESCRIPTION "The Primary VID of the VLAN to which this entry's objects apply. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " ::= { dot1agCfmDefaultMdEntry 2 } @@ -1340,7 +1335,7 @@ dot1agCfmDefaultMdStatus OBJECT-TYPE no entry in the Maintenance Association table defining an MA for the same VLAN ID and MD Level as this table's entry, and on which MA an Up MEP is defined, else false. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1358,7 +1353,7 @@ dot1agCfmDefaultMdLevel OBJECT-TYPE apply. If this object has the value -1, the MD Level for MHF creation for this VLAN is controlled by dot1agCfmDefaultMdDefLevel. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1378,7 +1373,7 @@ dot1agCfmDefaultMdMhfCreation OBJECT-TYPE The value of this variable is meaningless if the values of dot1agCfmDefaultMdStatus is false. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1399,7 +1394,7 @@ dot1agCfmDefaultMdIdPermission OBJECT-TYPE The value of this variable is meaningless if the values of dot1agCfmDefaultMdStatus is false. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1424,7 +1419,7 @@ dot1agCfmConfigErrorListTable OBJECT-TYPE DESCRIPTION "The CFM Configuration Error List table provides a list of Interfaces and VIDs that are incorrectly configured. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1437,7 +1432,7 @@ dot1agCfmConfigErrorListEntry OBJECT-TYPE STATUS deprecated DESCRIPTION "The Config Error List Table entry - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " INDEX { dot1agCfmConfigErrorListVid, @@ -1451,14 +1446,13 @@ Dot1agCfmConfigErrorListEntry ::= SEQUENCE { dot1agCfmConfigErrorListErrorType Dot1agCfmConfigErrors } - dot1agCfmConfigErrorListVid OBJECT-TYPE SYNTAX VlanId MAX-ACCESS not-accessible STATUS deprecated DESCRIPTION "The VLAN ID of the VLAN with interfaces in error. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1479,7 +1473,7 @@ dot1agCfmConfigErrorListIfIndex OBJECT-TYPE entry exists, then the system SHALL delete any entries in dot1agCfmConfigErrorListTable indexed by that InterfaceIndex value. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1498,7 +1492,7 @@ dot1agCfmConfigErrorListErrorType OBJECT-TYPE 1) ConflictingVids; 2) ExcessiveLevels; 3) OverlappedLevels. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1506,7 +1500,7 @@ dot1agCfmConfigErrorListErrorType OBJECT-TYPE ::= { dot1agCfmConfigErrorListEntry 3 } -- ****************************************************************** --- The Maintenance Domain Managed Object. This group contains all +-- The Maintenance Domain Managed Object. This group contains all -- the MIB objects used to maintain Maintenance Domains. -- ****************************************************************** @@ -1532,14 +1526,14 @@ dot1agCfmMdTable OBJECT-TYPE "The Maintenance Domain table. Each row in the table represents a different Maintenance Domain. - A Maintenance Domain is described 3.135 as the + A Maintenance Domain is described 3.136 as the network or the part of the network for which faults in connectivity are to be managed. The boundary of a Maintenance Domain is defined by a set of DSAPs, each of which can become a point of connectivity to a service instance. " REFERENCE - "3.135, 18.1" + "3.136, 18.1" ::= { dot1agCfmMd 2 } dot1agCfmMdEntry OBJECT-TYPE @@ -1600,19 +1594,19 @@ dot1agCfmMdName OBJECT-TYPE DESCRIPTION "The Maintenance Domain name. The type/format of this object is determined by the value of the dot1agCfmMdNameType object. - + Each Maintenance Domain has unique name among all those used or available to a service provider or operator. It facilitates easy identification of administrative responsibility for each Maintenance Domain. - 3.140 defines a Maintenance Domain name as the + 3.141 defines a Maintenance Domain name as the identifier, unique over the domain for which CFM is to protect against accidental concatenation of Service Instances, of a particular Maintenance Domain. " REFERENCE - "3.140, 12.14.5, 21.6.5.3" + "3.141, 12.14.5, 21.6.5.3" DEFVAL { "DEFAULT" } ::= { dot1agCfmMdEntry 3 } @@ -1730,7 +1724,7 @@ dot1agCfmMaNetTable OBJECT-TYPE incorrect connectivity among Service Instances. A small integer, the Maintenance association Endpoint Identifier (MEPID), identifies each MEP among those configured on a - single MA (3.132, 18.2). + single MA (3.133, 18.2). This table uses two indices, first index is the index of the Maintenance Domain table. The second index is the same as the @@ -1853,7 +1847,7 @@ dot1agCfmMaCompTable OBJECT-TYPE The writable objects in this table need to be persistent upon reboot or restart of a device. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1866,7 +1860,7 @@ dot1agCfmMaCompEntry OBJECT-TYPE STATUS deprecated DESCRIPTION "The MA table entry. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " INDEX {dot1agCfmMaComponentId, @@ -1891,7 +1885,7 @@ dot1agCfmMaComponentId OBJECT-TYPE in this dot1agCfmMaCompEntry applies. If the system is not a Bridge, or if only one component is present in the Bridge, then this variable (index) MUST be equal to 1. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1907,7 +1901,7 @@ dot1agCfmMaCompPrimaryVlanId OBJECT-TYPE associated, or 0 if the MA is not attached to any VID. If the MA is associated with more than one VID, the dot1agCfmVlanTable lists them. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1921,7 +1915,7 @@ dot1agCfmMaCompMhfCreation OBJECT-TYPE DESCRIPTION "Indicates if the Management entity can create MHFs (MIP Half Function) for this MA. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1937,7 +1931,7 @@ dot1agCfmMaCompIdPermission OBJECT-TYPE "Enumerated value indicating what, if anything, is to be included in the Sender ID TLV (21.5.3) transmitted by MPs configured in this MA. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1951,7 +1945,7 @@ dot1agCfmMaCompNumberOfVids OBJECT-TYPE STATUS deprecated DESCRIPTION "The number of VIDs associated with the MA. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " REFERENCE @@ -1968,7 +1962,7 @@ dot1agCfmMaCompRowStatus OBJECT-TYPE The writable columns in a row cannot be changed if the row is active. All columns MUST have a valid value before a row can be activated. - **NOTE: this object is deprecated due to re-indexing of the + **NOTE: this object is deprecated due to re-indexing of the table. " ::= { dot1agCfmMaCompEntry 6 } @@ -1983,12 +1977,12 @@ dot1agCfmMaMepListTable OBJECT-TYPE STATUS current DESCRIPTION "List of MEPIDs that belong to this MA. - + 12.14.6.1.3 specifies that a list of MEPIDs in all Bridges in that MA, but since SNMP SMI does not allow to - state in a MIB that an object in a table is an array, the + state in a MIB that an object in a table is an array, the information has to be stored in another table with two - indices, being the first index, the index of the table that + indices, being the first index, the index of the table that contains the list or array. For all Bridges in which the same MAID {dot1agCfmMdFormat, @@ -2079,7 +2073,7 @@ dot1agCfmMepTable OBJECT-TYPE CFM PDUs and track any responses. It is an endpoint of a single Maintenance Association, and is an endpoint of a separate Maintenance Entity for each of the other MEPs in - the same Maintenance Association (3.132). + the same Maintenance Association (3.133). This table uses three indices. The first two indices are the indices of the Maintenance Domain and MA tables, the reason @@ -2230,12 +2224,12 @@ dot1agCfmMepIdentifier OBJECT-TYPE "Integer that is unique among all the MEPs in the same MA. Other definition is: a small integer, unique over a given Maintenance Association, identifying a specific Maintenance - association Endpoint (3.132). + association Endpoint (3.133). MEP Identifier is also known as the MEPID. " REFERENCE - "3.132, 19.2, 12.14.7" + "3.133, 19.2, 12.14.7" ::= { dot1agCfmMepEntry 1 } dot1agCfmMepIfIndex OBJECT-TYPE @@ -2329,8 +2323,8 @@ dot1agCfmMepCcmLtmPriority OBJECT-TYPE "The priority value for CCMs and LTMs transmitted by the MEP. Default Value is the highest priority value allowed to pass through the Bridge Port for any of this MEPs VIDs. - The management entity can obtain the default value for this - variable from the priority regeneration table by extracting the + The management entity can obtain the default value for this + variable from the priority regeneration table by extracting the highest priority value in this table on this MEPs Bridge Port. (1 is lowest, then 2, then 0, then 3-7). " @@ -2353,7 +2347,7 @@ dot1agCfmMepLowPrDef OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "An integer value specifying the lowest priority defect + "An integer value specifying the lowest priority defect that is allowed to generate fault alarm. " REFERENCE @@ -2386,7 +2380,7 @@ dot1agCfmMepFngResetTime OBJECT-TYPE "12.14.7.1.3:m, 20.35.4" DEFVAL { 1000 } ::= { dot1agCfmMepEntry 12 } - + dot1agCfmMepHighestPrDefect OBJECT-TYPE SYNTAX Dot1agCfmHighestDefectPri MAX-ACCESS read-only @@ -2397,7 +2391,7 @@ dot1agCfmMepHighestPrDefect OBJECT-TYPE the FNG_RESET state. " REFERENCE - "12.14.7.1.3:n, 20.35.9, Table 21-1" + "12.14.7.1.3:n, 20.35.9, Table 20-1" ::= { dot1agCfmMepEntry 13 } dot1agCfmMepDefects OBJECT-TYPE @@ -2691,7 +2685,7 @@ dot1agCfmMepTransmitLtmStatus OBJECT-TYPE STATUS current DESCRIPTION "A Boolean flag set to true by the Bridge Port to indicate - that another LTM may be transmitted. + that another LTM may be transmitted. Reset to false by the MEP Linktrace Initiator State Machine." DEFVAL { true } ::= { dot1agCfmMepEntry 36 } @@ -2825,7 +2819,7 @@ dot1agCfmMepTransmitLtmEgressIdentifier OBJECT-TYPE REFERENCE "12.14.7.4.3:b, 21.8.8" ::= { dot1agCfmMepEntry 44 } - + dot1agCfmMepRowStatus OBJECT-TYPE SYNTAX RowStatus MAX-ACCESS read-create @@ -2912,8 +2906,6 @@ dot1agCfmMepPbbTeMismatchSinceReset OBJECT-TYPE "12.14.7.1.3:aj" ::= { dot1agCfmMepEntry 51 } - - -- ****************************************************************** -- The Linktrace Reply Table -- ****************************************************************** @@ -3042,8 +3034,8 @@ dot1agCfmLtrLastEgressIdentifier OBJECT-TYPE DESCRIPTION "An octet field holding the Last Egress Identifier returned in the LTR Egress Identifier TLV of the LTR. - The Last Egress Identifier identifies the MEP Linktrace - Initiator that originated, or the Linktrace Responder that + The Last Egress Identifier identifies the MEP Linktrace + Initiator that originated, or the Linktrace Responder that forwarded, the LTM to which this LTR is the response. This is the same value as the Egress Identifier TLV of that LTM. " @@ -3117,7 +3109,6 @@ dot1agCfmLtrManAddressDomain OBJECT-TYPE Typical values will be one of (not all inclusive) list: - snmpUDPDomain (from SNMPv2-TM, RFC3417) snmpIeee802Domain (from SNMP-IEEE802-TM-MIB, RFC4789) @@ -3376,7 +3367,7 @@ dot1agCfmMepDbPortStatusTlv OBJECT-TYPE "12.14.7.6.3:f, 20.19.3" DEFVAL { psNoPortStateTLV } ::= { dot1agCfmMepDbEntry 6} - + dot1agCfmMepDbInterfaceStatusTlv OBJECT-TYPE SYNTAX Dot1agCfmInterfaceStatus MAX-ACCESS read-only @@ -3428,7 +3419,6 @@ dot1agCfmMepDbManAddressDomain OBJECT-TYPE Typical values will be one of (not all inclusive) list: - snmpUDPDomain (from SNMPv2-TM, RFC3417) snmpIeee802Domain (from SNMP-IEEE802-TM-MIB, RFC4789) @@ -3704,7 +3694,6 @@ dot1agCfmNotificationsGroup NOTIFICATION-GROUP "Objects for the Notifications group." ::= { dot1agCfmGroups 9 } - ieee8021CfmMaNetGroup OBJECT-GROUP OBJECTS { dot1agCfmMaNetFormat, @@ -3738,7 +3727,7 @@ ieee8021CfmPbbTeExtensionGroup OBJECT-GROUP STATUS current DESCRIPTION "Objects needed for systems that support PBB-TE CFM functionality." - ::= { dot1agCfmGroups 12 } + ::= { dot1agCfmGroups 12 } ieee8021CfmPbbTeTrafficBitGroup OBJECT-GROUP OBJECTS { @@ -3753,7 +3742,7 @@ ieee8021CfmPbbTeTrafficBitGroup OBJECT-GROUP DESCRIPTION "Objects needed for PBB-TE supporting systems that support the optional traffic bit." - ::= { dot1agCfmGroups 13 } + ::= { dot1agCfmGroups 13 } -- ****************************************************************** -- MIB Module Compliance statements @@ -3821,4 +3810,4 @@ dot1agCfmCompliance MODULE-COMPLIANCE DESCRIPTION "Support for createAndWait is not required." ::= { dot1agCfmCompliances 1 } -END \ No newline at end of file +END diff --git a/mibs/quanta/IEEE8021-PFC-MIB b/mibs/IEEE8021-PFC-MIB similarity index 56% rename from mibs/quanta/IEEE8021-PFC-MIB rename to mibs/IEEE8021-PFC-MIB index ddceb62a035..202f32e9daf 100644 --- a/mibs/quanta/IEEE8021-PFC-MIB +++ b/mibs/IEEE8021-PFC-MIB @@ -1,41 +1,70 @@ IEEE8021-PFC-MIB DEFINITIONS ::= BEGIN -- ****************************************************************** --- IEEE P802.1Qbb(TM) Priority-based Flow Control MIB +-- IEEE P802.1Q(TM) Priority-based Flow Control MIB -- ****************************************************************** IMPORTS MODULE-IDENTITY, OBJECT-TYPE, Counter32, - Unsigned32 FROM SNMPv2-SMI -- [RFC2578] + Unsigned32 FROM SNMPv2-SMI -- [RFC2578] + ieee802dot1mibs FROM IEEE8021-TC-MIB MODULE-COMPLIANCE, - OBJECT-GROUP FROM SNMPv2-CONF -- [RFC2580] + OBJECT-GROUP FROM SNMPv2-CONF -- [RFC2580] ifEntry, ifGeneralInformationGroup - FROM IF-MIB -- [RFC2863] - systemGroup FROM SNMPv2-MIB -- [RFC3418] + FROM IF-MIB -- [RFC2863] + systemGroup FROM SNMPv2-MIB -- [RFC3418] ; ieee8021PFCMib MODULE-IDENTITY - LAST-UPDATED "201002080000Z" -- 02/08/2010 00:00GMT - ORGANIZATION "Netgear Inc" - CONTACT-INFO "" + LAST-UPDATED "202103050000Z" -- March 5, 2021 + ORGANIZATION "IEEE 802.1 Working Group" + CONTACT-INFO + " WG-URL: http://www.ieee802.org/1/ + WG-EMail: stds-802-1-l@ieee.org + Contact: IEEE 802.1 Working Group Chair + Postal: C/O IEEE 802.1 Working Group + IEEE Standards Association + 445 Hoes Lane + Piscataway, NJ 08854 + USA + E-mail: stds-802-1-chairs@ieee.org" + DESCRIPTION + "Priority-based Flow Control module for IEEE Std 802.1Q. + + Unless otherwise indicated, the references in this MIB + module are to IEEE Std 802.1Q-2022. + + Copyright (C) IEEE (2022). + This version of this MIB module is part of IEEE Std 802.1Q; + see that standard for full legal notices." + + REVISION "202103050000Z" -- March 5, 2021 DESCRIPTION - "Priority-based Flow Control module for managing IEEE 802.1Qbb" - REVISION "201002080000Z" -- 02/08/2010 00:00GMT + "Published as part of IEEE Std 802.1Q-2022. + Cross references and contact information updated." + + REVISION "201807010000Z" -- July 1, 2018 DESCRIPTION - "Included in IEEE P802.1Qbb + "Published as part of IEEE Std 802.1Q 2018 revision. + Cross references updated and corrected." - Copyright (C) IEEE." - ::= { iso(1) org(3) ieee(111) - standards-association-numbers-series-standards (2) - lan-man-stds (802) ieee802dot1 (1) ieee802dot1mibs (1) 21 } + REVISION "201412150000Z" -- December 15, 2014 + DESCRIPTION + "Published as part of IEEE Std 802.1Q 2014 revision. + Cross references updated and corrected." + REVISION "201002080000Z" -- 02/08/2010 00:00GMT + DESCRIPTION + "Included in IEEE P802.1Qbb -ieee8021PfcMIBObjects OBJECT IDENTIFIER ::= { ieee8021PFCMib 1 } -ieee8021PfcConformance OBJECT IDENTIFIER ::= { ieee8021PFCMib 2 } + Copyright (C) IEEE." + ::= { ieee802dot1mibs 21 } +ieee8021PfcMIBObjects OBJECT IDENTIFIER ::= { ieee8021PFCMib 1 } +ieee8021PfcConformance OBJECT IDENTIFIER ::= { ieee8021PFCMib 2 } ieee8021PfcIfTable OBJECT-TYPE SYNTAX SEQUENCE OF Ieee8021PfcIfEntry @@ -44,7 +73,7 @@ ieee8021PfcIfTable OBJECT-TYPE DESCRIPTION "A table of PFC information for all interfaces of a system." REFERENCE - "802.1Qbb clause 12.18" + "12.22.6" ::= { ieee8021PfcMIBObjects 1 } ieee8021PfcIfEntry OBJECT-TYPE @@ -55,29 +84,29 @@ ieee8021PfcIfEntry OBJECT-TYPE "Each entry contains information about the PFC function on a single interface." REFERENCE - "802.1Qbb clause 12.18" + "12.22.6" AUGMENTS { ifEntry } ::= { ieee8021PfcIfTable 1 } Ieee8021PfcIfEntry ::= SEQUENCE { - ieee8021PfcLinkDelayAllowance Unsigned32, - ieee8021PfcRequests Counter32, - ieee8021PfcIndications Counter32 + ieee8021PfcLinkDelayAllowance Unsigned32, + ieee8021PfcRequests Counter32, + ieee8021PfcIndications Counter32 } -ieee8021PfcLinkDelayAllowance OBJECT-TYPE +ieee8021PfcLinkDelayAllowance OBJECT-TYPE SYNTAX Unsigned32 MAX-ACCESS read-write STATUS current DESCRIPTION "The allowance made for round-trip propagation delay - of the link in bits. + of the link in bits. - The value of this object MUST be retained across - reinitializations of the management system." + The value of this object MUST be retained across + reinitializations of the management system." ::= { ieee8021PfcIfEntry 1 } -ieee8021PfcRequests OBJECT-TYPE +ieee8021PfcRequests OBJECT-TYPE SYNTAX Counter32 UNITS "Requests" MAX-ACCESS read-only @@ -91,7 +120,7 @@ ieee8021PfcRequests OBJECT-TYPE ifCounterDiscontinuityTime." ::= { ieee8021PfcIfEntry 2 } -ieee8021PfcIndications OBJECT-TYPE +ieee8021PfcIndications OBJECT-TYPE SYNTAX Counter32 UNITS "Indications" MAX-ACCESS read-only @@ -109,10 +138,10 @@ ieee8021PfcIndications OBJECT-TYPE -- IEEE 802.1Qbb MIB Module - Conformance Information -- ****************************************************************** -ieee8021PfcCompliances - OBJECT IDENTIFIER ::= { ieee8021PfcConformance 1 } -ieee8021PfcGroups - OBJECT IDENTIFIER ::= { ieee8021PfcConformance 2 } + ieee8021PfcCompliances + OBJECT IDENTIFIER ::= { ieee8021PfcConformance 1 } + ieee8021PfcGroups + OBJECT IDENTIFIER ::= { ieee8021PfcConformance 2 } -- ****************************************************************** -- Units of conformance diff --git a/mibs/IEEE8021-Q-BRIDGE-MIB b/mibs/IEEE8021-Q-BRIDGE-MIB index 49098ac6812..473538d8808 100644 --- a/mibs/IEEE8021-Q-BRIDGE-MIB +++ b/mibs/IEEE8021-Q-BRIDGE-MIB @@ -28,41 +28,40 @@ IMPORTS FROM RMON2-MIB; ieee8021QBridgeMib MODULE-IDENTITY - LAST-UPDATED "201806280000Z" -- June 28, 2018 + LAST-UPDATED "202211080000Z" -- November 8, 2022 ORGANIZATION "IEEE 802.1 Working Group" CONTACT-INFO " WG-URL: http://www.ieee802.org/1/ - WG-EMail: stds-802-1-L@ieee.org - - Contact: IEEE 802.1 Working Group Chair + WG-EMail: stds-802-1-l@ieee.org + Contact: IEEE 802.1 Working Group Chair Postal: C/O IEEE 802.1 Working Group IEEE Standards Association 445 Hoes Lane - Piscataway - NJ 08854 + Piscataway, NJ 08854 USA - E-mail: STDS-802-1-L@IEEE.ORG" + E-mail: stds-802-1-chairs@ieee.org" DESCRIPTION "The VLAN Bridge MIB module for managing Virtual Bridged Local Area Networks, as defined by IEEE Std 802.1Q. - This MIB module is derived from the IETF Q-BRIDGE-MIB - from RFC 4363. - Unless otherwise indicated, the references in this MIB - module are to IEEE Std 802.1Q. + module are to IEEE Std 802.1Q-2022. - Copyright (C) IEEE (2018). + Copyright (C) IEEE (2022). This version of this MIB module is part of IEEE Std 802.1Q; - see the draft itself for full legal notices." + see that standard for full legal notices." - REVISION "201806280000Z" -- June 28, 2018 + REVISION "202211080000Z" -- November 8, 2022 DESCRIPTION - "Published as part of IEEE Std 802.1Q-2018. + "Published as part of IEEE Std 802.1Q-2022. + Cross references and contact information updated." + + REVISION "201807010000Z" -- July 1, 2018 + DESCRIPTION + "Published as part of IEEE Std 802.1Q 2018 revision. Cross references updated and corrected." - + REVISION "201412150000Z" -- December 15, 2014 - DESCRIPTION "Published as part of IEEE Std 802.1Q 2014 revision. Cross references updated and corrected. @@ -71,16 +70,16 @@ ieee8021QBridgeMib MODULE-IDENTITY ieee8021QbridgeEgressVidXTable properly reindexed; old version deprecated and new version named ieee8021QbridgeEgressVidXV2Table." - + REVISION "201112120000Z" -- December 12, 2011 DESCRIPTION "Addition of the VID Translation MIB Subtree for IEEE Std 802.1aq" REVISION "201102270000Z" -- February 27, 2011 DESCRIPTION - "Minor edits to contact information etc. as part of + "Minor edits to contact information etc. as part of 2011 revision of IEEE Std 802.1Q." - + REVISION "200810150000Z" -- October 15, 2008 DESCRIPTION "Initial version, derived from RFC 4363." @@ -252,7 +251,7 @@ ieee8021QBridgeCVlanPortComponentId OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - "The componentcontaining the customer VLAN port represented + "The component containing the customer VLAN port represented by this row." ::= { ieee8021QBridgeCVlanPortEntry 1 } @@ -793,15 +792,15 @@ ieee8021QBridgeStaticUnicastTable OBJECT-TYPE into the device by (local or network) management specifying the set of ports to which frames received from specific ports and containing specific unicast - destination addresses are allowed to be forwarded. + destination addresses are allowed to be forwarded. Entries are valid for unicast addresses only. Two modes of operation are supported by this table. When the receive port index is non-zero, this table is supporting an IEEE 802.1D filtering database as specified in 14.7.6.1 of IEEE Std 802.1D. If the receive port is zero, - the table is operating as specified in IEEE Std 802.1Q - 8.8.1 and 12.7.7. An agent must at least + the table is operating as specified in IEEE Std 802.1Q + 8.8.1 and 12.7.7. An agent must at least support the IEEE Std 802.1Q mode of operation." REFERENCE "8.8.1, 12.7.7; IEEE Std 802.1D 7.9.1, 14.7.6.1" @@ -904,7 +903,6 @@ ieee8021QBridgeStaticUnicastStaticEgressPorts OBJECT-TYPE DEFVAL { ''H } ::= { ieee8021QBridgeStaticUnicastEntry 5 } - ieee8021QBridgeStaticUnicastForbiddenEgressPorts OBJECT-TYPE SYNTAX PortList MAX-ACCESS read-create @@ -1124,7 +1122,7 @@ ieee8021QBridgeVlanCurrentEntry OBJECT-TYPE Ieee8021QBridgeVlanCurrentEntry ::= SEQUENCE { ieee8021QBridgeVlanTimeMark - TimeFilter, + TimeFilter, ieee8021QBridgeVlanCurrentComponentId IEEE8021PbbComponentIdentifier, ieee8021QBridgeVlanIndex @@ -1350,7 +1348,7 @@ ieee8021QBridgeVlanStaticUntaggedPorts OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "The set of ports that should transmit egress packets + "The set of ports that should transmit egress frames for this VLAN as untagged. The default value of this object for the default VLAN (ieee8021QBridgeVlanIndex = 1) is a string of appropriate length including all ports. There is no @@ -1532,7 +1530,7 @@ ieee8021QBridgePortIngressFiltering OBJECT-TYPE REFERENCE "12.10.1.4" DEFVAL { false } ::= { ieee8021QBridgePortVlanEntry 3 } - + ieee8021QBridgePortMvrpEnabledStatus OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-write @@ -1659,7 +1657,7 @@ ieee8021QBridgeTpVlanPortInFrames OBJECT-TYPE ieee8021QBridgeTpVlanPortOutFrames OBJECT-TYPE SYNTAX Counter64 UNITS "frames" - MAX-ACCESS read-only + MAX-ACCESS read-only STATUS current DESCRIPTION "The number of valid frames transmitted by this port to @@ -1894,7 +1892,7 @@ ieee8021QBridgeProtocolGroupEntry OBJECT-TYPE INDEX { ieee8021QBridgeProtocolGroupComponentId, ieee8021QBridgeProtocolTemplateFrameType, ieee8021QBridgeProtocolTemplateProtocolValue } - ::= { ieee8021QBridgeProtocolGroupTable 1 } + ::= { ieee8021QBridgeProtocolGroupTable 1 } Ieee8021QBridgeProtocolGroupEntry ::= SEQUENCE { @@ -2039,14 +2037,14 @@ ieee8021QBridgeProtocolPortRowStatus OBJECT-TYPE -- ============================================================= -- ieee8021QBridgeVIDX subtree --- +-- -- ============================================================= ieee8021QBridgeVIDXTable OBJECT-TYPE SYNTAX SEQUENCE OF Ieee8021QBridgeVIDXEntry MAX-ACCESS not-accessible STATUS current - DESCRIPTION + DESCRIPTION "This table is used to configure the VID Translation Table defined in 12.10.1.8 and 6.9. The Bridge VID Translation Table is used to implement a mapping between a @@ -2063,7 +2061,7 @@ ieee8021QBridgeVIDXEntry OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - "An entry for the S-VID translation table which includes + "An entry for the S-VID translation table, which includes both the Local and Relay S-VIDs." INDEX { ieee8021BridgeBasePortComponentId, @@ -2071,7 +2069,7 @@ ieee8021QBridgeVIDXEntry OBJECT-TYPE ieee8021QBridgeVIDXLocalVid } ::= { ieee8021QBridgeVIDXTable 1 } -Ieee8021QBridgeVIDXEntry ::= +Ieee8021QBridgeVIDXEntry ::= SEQUENCE { ieee8021QBridgeVIDXLocalVid VlanId, ieee8021QBridgeVIDXRelayVid VlanId, @@ -2102,9 +2100,9 @@ ieee8021QBridgeVIDXRowStatus OBJECT-TYPE STATUS current DESCRIPTION "This indicates the status of an entry in this table, - and is used to create/delete entries. It is an - implementation specific decision as to whether - any column in this table may be set while the + and is used to create/delete entries. It is an + implementation specific decision as to whether + any column in this table may be set while the corresponding instance of this object is valid(1)." REFERENCE "12.10.1.8.1, 12.10.1.8.2" ::= { ieee8021QBridgeVIDXEntry 3 } @@ -2134,16 +2132,16 @@ ieee8021QBridgeEgressVidXEntry OBJECT-TYPE MAX-ACCESS not-accessible STATUS deprecated DESCRIPTION - "An entry for the Egress VID translation table which includes + "An entry for the Egress VID translation table, which includes both the relay and local IDs between which the PNP or CNP translates." - + INDEX { ieee8021BridgeBasePortComponentId, ieee8021BridgeBasePort, ieee8021QBridgeEgressVidXRelayVid } ::= { ieee8021QBridgeEgressVidXTable 1 } -Ieee8021QBridgeEgressVidXEntry ::= +Ieee8021QBridgeEgressVidXEntry ::= SEQUENCE { ieee8021QBridgeEgressVidXRelayVid VlanId, ieee8021QBridgeEgressVidXLocalVid VlanId, @@ -2155,7 +2153,7 @@ ieee8021QBridgeEgressVidXRelayVid OBJECT-TYPE MAX-ACCESS not-accessible STATUS deprecated DESCRIPTION - "The Relay VID after translation transmitted to the + "The Relay VID after translation transmitted to the ISS or EISS." REFERENCE "12.10.1.9.1, 12.10.1.9.2" ::= { ieee8021QBridgeEgressVidXEntry 1 } @@ -2165,21 +2163,20 @@ ieee8021QBridgeEgressVidXLocalVid OBJECT-TYPE MAX-ACCESS read-create STATUS deprecated DESCRIPTION - "The Local VID before translation transmitted to the + "The Local VID before translation transmitted to the ISS or EISS." REFERENCE "12.10.1.9.1, 12.10.1.9.2" ::= { ieee8021QBridgeEgressVidXEntry 2 } - ieee8021QBridgeEgressVidXRowStatus OBJECT-TYPE SYNTAX RowStatus MAX-ACCESS read-create STATUS deprecated DESCRIPTION "This indicates the status of an entry in this table, - and is used to create/delete entries. It is an - implementation specific decision as to whether - any column in this table may be set while the + and is used to create/delete entries. It is an + implementation specific decision as to whether + any column in this table may be set while the corresponding instance of this object is valid(1)." REFERENCE "12.10.1.9.1, 12.10.1.9.2" ::= { ieee8021QBridgeEgressVidXEntry 3 } @@ -2209,16 +2206,16 @@ ieee8021QBridgeEgressVidXV2Entry OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - "An entry for the Egress VID translation table which includes + "An entry for the Egress VID translation table, which includes both the relay and local IDs between which the PNP or CNP translates." - + INDEX { ieee8021BridgeBasePortComponentId, ieee8021BridgeBasePort, ieee8021QBridgeEgressVidXV2RelayVid } ::= { ieee8021QBridgeEgressVidXV2Table 1 } -Ieee8021QBridgeEgressVidXV2Entry ::= +Ieee8021QBridgeEgressVidXV2Entry ::= SEQUENCE { ieee8021QBridgeEgressVidXV2RelayVid VlanId, ieee8021QBridgeEgressVidXV2LocalVid VlanId, @@ -2230,7 +2227,7 @@ ieee8021QBridgeEgressVidXV2RelayVid OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - "The Relay VID after translation transmitted to the + "The Relay VID after translation transmitted to the ISS or EISS." REFERENCE "12.10.1.9.1, 12.10.1.9.2" ::= { ieee8021QBridgeEgressVidXV2Entry 1 } @@ -2240,26 +2237,24 @@ ieee8021QBridgeEgressVidXV2LocalVid OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "The Local VID before translation transmitted to the + "The Local VID before translation transmitted to the ISS or EISS." REFERENCE "12.10.1.9.1, 12.10.1.9.2" ::= { ieee8021QBridgeEgressVidXV2Entry 2 } - ieee8021QBridgeEgressVidXV2RowStatus OBJECT-TYPE SYNTAX RowStatus MAX-ACCESS read-create STATUS current DESCRIPTION "This indicates the status of an entry in this table, - and is used to create/delete entries. It is an - implementation specific decision as to whether - any column in this table may be set while the + and is used to create/delete entries. It is an + implementation specific decision as to whether + any column in this table may be set while the corresponding instance of this object is valid(1)." REFERENCE "12.10.1.9.1, 12.10.1.9.2" ::= { ieee8021QBridgeEgressVidXV2Entry 3 } - -- ============================================================= -- IEEE 802.1Q MIB - Conformance Information -- ============================================================= @@ -2391,7 +2386,7 @@ ieee8021QBridgeVlanStatisticsGroup OBJECT-GROUP } STATUS current DESCRIPTION - "A collection of objects providing per-port packet + "A collection of objects providing per-port frame statistics for all VLANs currently configured on this device." ::= { ieee8021QBridgeGroups 8 } @@ -2471,7 +2466,7 @@ ieee8021QBridgeVIDXGroup OBJECT-GROUP } STATUS current DESCRIPTION - "Ingress or Ingress/Egress VID translation for + "Ingress or Ingress/Egress VID translation for individual ports." ::= { ieee8021QBridgeGroups 15 } @@ -2495,7 +2490,6 @@ ieee8021QBridgeEgressVIDXV2Group OBJECT-GROUP "Egress VID translation for individual ports." ::= { ieee8021QBridgeGroups 17 } - -- ============================================================= -- compliance statements -- ============================================================= @@ -2553,7 +2547,7 @@ ieee8021QBridgeCompliance MODULE-COMPLIANCE DESCRIPTION "This group is mandatory ONLY for devices supporting creation/deletion of customer VLAN ports." - + GROUP ieee8021QBridgeVIDXGroup DESCRIPTION "This group is mandatory ONLY for devices supporting @@ -2562,7 +2556,7 @@ ieee8021QBridgeCompliance MODULE-COMPLIANCE GROUP ieee8021QBridgeEgressVIDXGroup DESCRIPTION "This group is mandatory ONLY for devices supporting - separate Ingress and Egress VID translation of + separate Ingress and Egress VID translation of of customer and provider VLAN ports." OBJECT ieee8021QBridgePortAcceptableFrameTypes @@ -2656,7 +2650,7 @@ ieee8021QBridgeComplianceV2 MODULE-COMPLIANCE DESCRIPTION "This group is mandatory ONLY for devices supporting creation/deletion of customer VLAN ports." - + GROUP ieee8021QBridgeVIDXGroup DESCRIPTION "This group is mandatory ONLY for devices supporting @@ -2665,7 +2659,7 @@ ieee8021QBridgeComplianceV2 MODULE-COMPLIANCE GROUP ieee8021QBridgeEgressVIDXV2Group DESCRIPTION "This group is mandatory ONLY for devices supporting - separate Ingress and Egress VID translation of + separate Ingress and Egress VID translation of of customer and provider VLAN ports." OBJECT ieee8021QBridgePortAcceptableFrameTypes @@ -2694,4 +2688,4 @@ ieee8021QBridgeComplianceV2 MODULE-COMPLIANCE ::= { ieee8021QBridgeCompliances 2 } -END \ No newline at end of file +END diff --git a/mibs/IEEE8021-SECY-MIB b/mibs/IEEE8021-SECY-MIB index 1a00e72d54b..d4140b89667 100644 --- a/mibs/IEEE8021-SECY-MIB +++ b/mibs/IEEE8021-SECY-MIB @@ -1,18 +1,12 @@ --- ***************************************************************** --- IEEE8021-SECY-MIB --- --- Definitions of managed objects supporting IEEE 802.1AE MACsec. --- ***************************************************************** - IEEE8021-SECY-MIB DEFINITIONS ::= BEGIN --- ----------------------------------------------------------------- --- IEEEE802.1AE MIB --- ----------------------------------------------------------------- +-- ============================================================================= +-- IEEEE802.1AE MAC Security Entity (SecY) MIB +-- ============================================================================= IMPORTS - MODULE-IDENTITY, OBJECT-TYPE, Unsigned32, Integer32, Counter32, - Counter64 + MODULE-IDENTITY, OBJECT-TYPE, + Unsigned32, Integer32, Counter32,Counter64 FROM SNMPv2-SMI TEXTUAL-CONVENTION, RowPointer, TimeStamp, TruthValue, RowStatus FROM SNMPv2-TC @@ -25,32 +19,49 @@ IMPORTS ; ieee8021SecyMIB MODULE-IDENTITY - LAST-UPDATED "201605102049Z" - ORGANIZATION "IEEE 802.1 Working Group" - CONTACT-INFO "http:/grouper.ieee.org/groups/8021/index.html" +LAST-UPDATED "202206060000Z" -- June 6, 2022 + ORGANIZATION "IEEE 802.1 Working Group" + CONTACT-INFO + " WG-URL: http://www.ieee802.org/1/ + WG-EMail: stds-802-1-l@ieee.org + Contact: IEEE 802.1 Working Group Chair + Postal: C/O IEEE 802.1 Working Group + IEEE Standards Association + 445 Hoes Lane + Piscataway, NJ 08854 + USA + E-mail: stds-802-1-chairs@ieee.org" DESCRIPTION - "The MAC security entity (SecY) MIB module. A SecY is a protocol - shim providing MAC Security (MACsec) in an interface stack. + "The MAC security entity (SecY) MIB module. A SecY is a shim in an interface + stack that uses the MAC Security (MACsec) protocol. + + Copyright (C) IEEE (2021). + This version of this MIB module is part of IEEE Std 802.1AEdk-2022; + see that standard for full legal notices. + + Unless otherwise indicated, the references in this MIB module are to + IEEE Std 802.1AE-2018 as amended by IEEE Std 802.1AE-2018/Cor 1-2020 and + IEEE Std 802.1AEdk-2022. Each SecY transmits MACsec protected frames on one or more - Secure Channels (SCs) to each of the other SecYs attached to the + Secure Channels (SCs) to each of the other SecYs attached to the same LAN and participating in the same Secure Connectivity Association (CA). The CA is a security relationship, that is - established and maintained by key agreement protocols and supported + established and maintained by key agreement protocols and supported by MACsec to provide full connectivity between its participants. - Each SC provides unidirectional point to multipoint connectivity - from one participant to all the others and is supported by a - succession of similarly point to multipoint Secure Associations - (SAs). The Secure Association Key (SAK) used to protect frames is + Each SC provides unidirectional point to multipoint connectivity + from one participant to all the others and is supported by a + succession of similarly point to multipoint Secure Associations + (SAs). The Secure Association Key (SAK) used to protect frames is changed as an SA is replaced by its (overlapping) successor so fresh keys can be used without disrupting a long lived SC and CA. Two different upper interfaces, a Controlled Port (for frames protected by MACsec, providing an instance of the secure MAC - service) and an Uncontrolled Port (for frames not requiring - protection, like the key agreement frames used to establish the + service) and an Uncontrolled Port (for frames not requiring + protection, like the key agreement frames used to establish the CA and distribute keys) are associated with a SecY shim. For each - instance of a SecY two ifTable rows (one for each interface) run on + instance of a SecY two ifTable rows (one for each interface) run on top of an ifTable row representing the 'Common Port' interface, such as a row with ifType ='ethernetCsmacd(6)'. @@ -68,39 +79,40 @@ ieee8021SecyMIB MODULE-IDENTITY Example MACsec Interface Stack. i, j, k are ifIndexes each indicating a row in the ifTable. " + REVISION "202206060000Z" -- June 6, 2022 + DESCRIPTION + "Published as part of IEEE Std 802.1AEdk-2022. + Cross references, contact information, and descriptions updated." + + REVISION "201712071816Z" + DESCRIPTION + "Published as part of IEEE Std 802.1AE-2018. + Updated CONTACT-INFO." + REVISION "201605102049Z" DESCRIPTION "Updated by the IEEE Std 802.1AEcg amendment. Object DESCRIPTIONs and references aligned with text of the standard (including prior amendments). IEEE 802.1AEcg Annex G details changes. The initial version of this ieee8021SecyMIB used the object - name prefix 'secy' rather than 'ieee8021secy' (recommended by + name prefix 'secy' rather than 'ieee8021secy' (recommended by RFC 4181). The 'secy' prefix has been retained in this revision for - for backwards compatbility and internal consistency." + for backwards compatibility and internal consistency." REVISION "200601100000Z" DESCRIPTION "Initial version of this MIB in IEEE 802.1AE-2006" ::= { iso(1) std(0) iso8802(8802) ieee802dot1(1) ieee802dot1mibs(1) 3 } - -secyMIBNotifications OBJECT IDENTIFIER ::= { ieee8021SecyMIB 0 } - -secyMIBObjects OBJECT IDENTIFIER ::= { ieee8021SecyMIB 1 } - -secyMIBConformance OBJECT IDENTIFIER ::= { ieee8021SecyMIB 2 } - --- +-- ============================================================================= -- Textual Conventions --- SecySCI ::= TEXTUAL-CONVENTION STATUS current DESCRIPTION "Textual convention for a Secure Channel Identifier (SCI). - - Each SC is identified by an SCI comprising a 48-bit MAC Address, - allocated to the transmitting system and a 16-bit Port Identifier." - REFERENCE "IEEE 802.1AE Clause 7.1.2 and figure 7.7" + Each SC is identified by an SCI comprising a 48-bit MAC Address, + allocated to the transmitting system and a 16-bit Port Identifier." + REFERENCE "7.1.2, Figure 7-7" SYNTAX OCTET STRING (SIZE (8)) SecyAN ::= TEXTUAL-CONVENTION @@ -108,36 +120,54 @@ SecyAN ::= TEXTUAL-CONVENTION STATUS current DESCRIPTION "Textual convention for an Association Number (AN). - - Each SC is comprised of a succession of SAs, each with a different - SAK, identified by a Secure Association Identifier (SAI) comprising - an SCI concatenated with a two-bit AN. The SAI is unique for SAs - used by SecYs participating in a given CA at any instant." - REFERENCE "IEEE 802.1AE Clause 7.1.3, Figure 7.7" + Each SC is comprised of a succession of SAs, each with a different SAK, + identified by a Secure Association Identifier (SAI) comprising an SCI + concatenated with a two-bit AN. The SAI is unique for SAs used by SecYs + participating in a given CA at any instant." + REFERENCE "7.1.3, Figure 7-7" SYNTAX Unsigned32 (0..3) -secyMgmtMIBObjects OBJECT IDENTIFIER ::= { secyMIBObjects 1 } - -secyStatsMIBObjects OBJECT IDENTIFIER ::= { secyMIBObjects 2 } - --- --- SecY Interface Management Table --- - +-- ============================================================================= +-- subtrees in the SecY MIB + +secyMIBNotifications OBJECT IDENTIFIER ::= { ieee8021SecyMIB 0 } +secyMIBObjects OBJECT IDENTIFIER ::= { ieee8021SecyMIB 1 } + secyMgmtMIBObjects OBJECT IDENTIFIER ::= { secyMIBObjects 1 } + secyStatsMIBObjects OBJECT IDENTIFIER ::= { secyMIBObjects 2 } +secyMIBConformance OBJECT IDENTIFIER ::= { ieee8021SecyMIB 2 } + secyMIBCompliances OBJECT IDENTIFIER ::= { secyMIBConformance 1 } + secyMIBGroups OBJECT IDENTIFIER ::= { secyMIBConformance 2 } +-- ============================================================================= +--secyMgmtMIBObjects +-- secyIfTable +-- secyTSCTable -- +-- secyTSATable -- +-- secyIfTCTable -- +-- secyIfAPTable -- +-- secyRxSCTable +-- secyRxSATable +-- secyCipherSuiteTable +-- secyIfCipherTable +--The following are historic following approval of IEEE Std 802.1AEcg-2017, +--even if their STATUS remains 'current'. They do not include any objects +--that are part of a current conformance OBJECT-GROUP, and lack traffic +--class transmit SC and XPN support: +-- secyTxSCTable, secyTxSATable +-- ============================================================================= +-- secyIfTable secyIfTable OBJECT-TYPE SYNTAX SEQUENCE OF SecyIfEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION - "A table with an entry for each service interface in this system - with MAC Security capability, i.e. for each SecY. - - The configured value of writable objects in each table entry - shall be stored in persistent memory and remain unchanged across - a re-initialization of the system's management entity." - REFERENCE "IEEE 802.1AE Clause 10.7, Table 13-1" + "A table with an entry for each MAC Security protocol (MACsec) capable + interface in the system, i.e. for each SecY. Configured value of writable + objects in each table entry MUST be persistent and remain unchanged across + re-initialization of the system's management entity." + REFERENCE "10.7, Table 13-1" ::= { secyMgmtMIBObjects 1 } - + +--secyIfEntry secyIfEntry OBJECT-TYPE SYNTAX SecyIfEntry MAX-ACCESS not-accessible @@ -147,6 +177,7 @@ secyIfEntry OBJECT-TYPE INDEX { secyIfInterfaceIndex } ::= { secyIfTable 1 } +--SecyIfEntry SecyIfEntry ::= SEQUENCE { secyIfInterfaceIndex InterfaceIndex, secyIfMaxPeerSCs Unsigned32, @@ -162,29 +193,31 @@ SecyIfEntry ::= SEQUENCE { secyIfIncludeSCIEnable TruthValue, secyIfUseESEnable TruthValue, secyIfUseSCBEnable TruthValue, - secyIfSCI SecySCI, -- 802.1AEcg - secyIfIncludingSCI TruthValue, -- 802.1AEcg - secyIfMaxTSCs Unsigned32 -- 802.1AEcg + secyIfSCI SecySCI, + secyIfIncludingSCI TruthValue, + secyIfMaxTSCs Unsigned32 } - + +--secyIfInterfaceIndex secyIfInterfaceIndex OBJECT-TYPE SYNTAX InterfaceIndex MAX-ACCESS not-accessible STATUS current - DESCRIPTION "An interface index, aligned with ifIndex in the - ifTable, pointing to the SecY's Controlled Port." - REFERENCE "IEEE 802.1AE Clause 10.1" + DESCRIPTION "The Interface Index for this SecY's Controlled Port." + REFERENCE "10.1" ::= { secyIfEntry 1 } +--secyIfMaxPeerSCs secyIfMaxPeerSCs OBJECT-TYPE SYNTAX Unsigned32 UNITS "security connections" MAX-ACCESS read-only STATUS current DESCRIPTION "The maximum number of peer SCs for this SecY." - REFERENCE "IEEE 802.1AE Clause 10.7.7" + REFERENCE "10.7.7" ::= { secyIfEntry 2 } +--secyIfRxMaxKeys secyIfRxMaxKeys OBJECT-TYPE SYNTAX Unsigned32 UNITS "keys" @@ -192,9 +225,10 @@ secyIfRxMaxKeys OBJECT-TYPE STATUS current DESCRIPTION "The maximum number of keys in simultaneous use for reception for this SecY." - REFERENCE "IEEE 802.1AE Clause 10.7.7" + REFERENCE "10.7.7" ::= { secyIfEntry 3 } +--secyIfTxMaxKeys secyIfTxMaxKeys OBJECT-TYPE SYNTAX Unsigned32 UNITS "keys" @@ -202,19 +236,21 @@ secyIfTxMaxKeys OBJECT-TYPE STATUS current DESCRIPTION "The maximum number of keys in simultaneous use for transmission for this SecY." - REFERENCE "IEEE 802.1AE Clause 10.7.16" + REFERENCE "10.7.16" ::= { secyIfEntry 4 } +--secyIfProtectFramesEnable secyIfProtectFramesEnable OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-write STATUS current DESCRIPTION "Enables or disables protection of transmitted frames." - REFERENCE "IEEE 802.1AE Clause 10.7.17, Figure 10-3" + REFERENCE "10.7.17, Figure 10-3" DEFVAL { true } ::= { secyIfEntry 5 } +--secyIfValidateFrames secyIfValidateFrames OBJECT-TYPE SYNTAX INTEGER { disabled(1), @@ -226,45 +262,46 @@ secyIfValidateFrames OBJECT-TYPE STATUS current DESCRIPTION "Controls validation of received frames. - - disabled(1) : disable validation, remove SecTAGs and ICVs (if - present) from received frames. + disabled(1) : disable validation, remove SecTAGs and ICVs (if present. check(2) : enable validation, do not discard invalid frames. strict(3) : enable validation and discard invalid frames. null(4) : no processing, do not remove SecTAGs or ICVs." - REFERENCE "IEEE 802.1AE Clause 10.7.8, Figure 10-4" + REFERENCE "10.7.8, Figure 10-4" DEFVAL { strict } ::= { secyIfEntry 6 } +--secyIfReplayProtectEnable secyIfReplayProtectEnable OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-write STATUS current DESCRIPTION "Enables or disables replay protection." - REFERENCE "IEEE 802.1AE Clause 10.7.8, Figure 10-4" + REFERENCE "10.7.8, Figure 10-4" DEFVAL { true } ::= { secyIfEntry 7 } +--secyIfReplayProtectWindow secyIfReplayProtectWindow OBJECT-TYPE SYNTAX Unsigned32 UNITS "Packets" MAX-ACCESS read-write STATUS current DESCRIPTION "The replay protection window size." - REFERENCE "IEEE 802.1AE Clause 10.7.8, Figure 10-4" + REFERENCE "10.7.8, Figure 10-4" DEFVAL { 0 } ::= { secyIfEntry 8 } +--secyIfCurrentCipherSuite secyIfCurrentCipherSuite OBJECT-TYPE SYNTAX Unsigned32 MAX-ACCESS read-write STATUS current - DESCRIPTION "The Cipher Suite currently used by this SecY, - identified by the secyCipherSuiteTable entry index. - Should be read-only if secyIfCipherTable implemented." - REFERENCE "IEEE 802.1AE Clause 10.7.25" + DESCRIPTION "The secyCipherSuiteTableindex for this SecY's in use Cipher + Suite. Should be read-only if secyIfCipherTable implemented." + REFERENCE "10.7.25" ::= { secyIfEntry 9 } +--secyIfAdminPt2PtMAC secyIfAdminPt2PtMAC OBJECT-TYPE SYNTAX INTEGER { forceTrue(1), @@ -275,213 +312,120 @@ secyIfAdminPt2PtMAC OBJECT-TYPE STATUS current DESCRIPTION "Controls the value of operPointToPointMAC (secyOperPt2PtMAC) - reported to the user(s) of this SecY's Controlled Port. + reported to the user(s) of this SecY's Controlled Port: forceTrue(1) : operPointToPointMAC is True, regardless of the configuration and status of the SecY. forceFalse(2) : operPointToPointMAC is False, regardless of the configuration and status of the SecY. - auto(3) : OperPointMAC is True if secyIfvalidateFrames is + auto(3) : OperPointMAC is True if secyIfvalidateFrames is strict and reception is from at most one peer SecY, - or if secyIfvalidateFrames is not strict and + or if secyIfvalidateFrames is not strict and operPointToPointMAC is True for the Common Port, and is False otherwise." - REFERENCE "IEEE 802.1AE Clause 6.5, 10.7.4" + REFERENCE "6.5, 10.7.4" DEFVAL { auto } ::= { secyIfEntry 10 } +--secyIfOperPt2PtMAC secyIfOperPt2PtMAC OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-only STATUS current DESCRIPTION - "Reflects the current service connectivity to be assumed by the - user(s) of the SecY's Controlled Port. + "Reflects the current service connectivity to be assumed by the + user(s) of the SecY's Controlled Port: true(1) : connectivity is to at most one other system. false(2) : connectivity is to one or more other systems." - REFERENCE "IEEE 802.1AE Clause 6.5, 10.7.4" + REFERENCE "6.5, 10.7.4" ::= { secyIfEntry 11 } +--secyIfIncludeSCIEnable secyIfIncludeSCIEnable OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-write STATUS current DESCRIPTION "Mandates inclusion of an explicit SCI in the SecTAG when transmitting protected frames." - REFERENCE "IEEE 802.1AE Clause 10.5.3 alwaysIncludeSCI, 10.7.17" + REFERENCE "10.5.3 alwaysIncludeSCI, 10.7.17" DEFVAL { false } ::= { secyIfEntry 12 } +--secyIfUseESEnable secyIfUseESEnable OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-write STATUS current DESCRIPTION "Enables use of the ES bit in the SecTAG when transmitting protected frames." - REFERENCE "IEEE 802.1AE Clause 10.5.3 useES, 10.7.17" + REFERENCE "10.5.3 useES, 10.7.17" DEFVAL { false } ::= { secyIfEntry 13 } +--secyIfUseSCBEnable secyIfUseSCBEnable OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-write STATUS current DESCRIPTION "Enables use of the SCB bit in the SecTAG when transmitting protected frames." - REFERENCE "IEEE 802.1AE Clause 10.5.3 useSCB, 10.7.17" + REFERENCE "10.5.3 useSCB, 10.7.17" DEFVAL { false } ::= { secyIfEntry 14 } - + +--secyIfSCI secyIfSCI OBJECT-TYPE SYNTAX SecySCI MAX-ACCESS read-only STATUS current DESCRIPTION "The SCI for the SecY's default traffic class." - REFERENCE "IEEE 802.1AE Clause 7.1.2, 10.7.1" + REFERENCE "7.1.2, 10.7.1" ::= { secyIfEntry 15 } - + +--secyIfIncludingSCI secyIfIncludingSCI OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-only STATUS current DESCRIPTION "True if an explicit SCI is included in the SecTAG when transmitting protected frames." - REFERENCE "IEEE 802.1AE Clause 10.5.3 includingSCI, 10.7.17" + REFERENCE "10.5.3 includingSCI, 10.7.17" DEFVAL { false } ::= { secyIfEntry 16 } - + +--secyIfMaxTSCs secyIfMaxTSCs OBJECT-TYPE SYNTAX Unsigned32 UNITS "security connections" MAX-ACCESS read-only STATUS current DESCRIPTION "The maximum number of transmit SCs for this SecY." - REFERENCE "IEEE 802.1AE Clause 10.7.16" - ::= { secyIfEntry 17 } - --- --- Tx SC Management Table : systems not supporting traffic class SCs --- - -secyTxSCTable OBJECT-TYPE - SYNTAX SEQUENCE OF SecyTxSCEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION "A table with an entry for each SecY's transmit SC." - REFERENCE "IEEE 802.1AE Clause 10.7.17, 10.7.20, Table 13-2" - ::= { secyMgmtMIBObjects 2 } - -secyTxSCEntry OBJECT-TYPE - SYNTAX SecyTxSCEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION "An entry with transmit SC information for a SecY." - INDEX { secyIfInterfaceIndex } - ::= { secyTxSCTable 1 } - -SecyTxSCEntry ::= SEQUENCE { - secyTxSCI SecySCI, - secyTxSCState INTEGER, - secyTxSCEncodingSA RowPointer, - secyTxSCEncipheringSA RowPointer, -- deprecated - secyTxSCCreatedTime TimeStamp, - secyTxSCStartedTime TimeStamp, - secyTxSCStoppedTime TimeStamp -} - -secyTxSCI OBJECT-TYPE - SYNTAX SecySCI - MAX-ACCESS read-only - STATUS current - DESCRIPTION "The SCI for the SecY's transmit SC." - REFERENCE "IEEE 802.1AE Clause 7.1.2, 10.7.1" - ::= { secyTxSCEntry 1 } - -secyTxSCState OBJECT-TYPE - SYNTAX INTEGER { - inUse(1), - notInUse(2) - } - MAX-ACCESS read-only - STATUS current - DESCRIPTION "The transmitting state of the SecY's transmit SC. - inUse(1) : one or more SAs are in use. - notInUse(2) : no SAs are in use." - REFERENCE "IEEE 802.1AE Clause 10.7.21 transmitting, 10.7.23" - ::= { secyTxSCEntry 2 } + REFERENCE "10.7.16" + ::= { secyIfEntry 17 } -secyTxSCEncodingSA OBJECT-TYPE - SYNTAX RowPointer - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The SA currently used to encode the SecTAG for frames awaiting - transmission. The row pointer will point to an entry in the - secyTxSATable. If no such information is available, the value shall - be the OBJECT IDENTIFIER { 0 0 }." - REFERENCE "IEEE 802.1AE Clause 10.5.1, 10.7.21" - ::= { secyTxSCEntry 3 } - -secyTxSCEncipheringSA OBJECT-TYPE - SYNTAX RowPointer - MAX-ACCESS read-only - STATUS deprecated -- 802.1AEcg - DESCRIPTION - "The SA currently used to encipher frames for transmission. - The row pointer will point to an entry in the secyTxSATable. - If no such information is available, the value shall be the - OBJECT IDENTIFIER { 0 0 }." - REFERENCE "IEEE 802.1AE Clause 10.5.4" - ::= { secyTxSCEntry 4 } - -secyTxSCCreatedTime OBJECT-TYPE - SYNTAX TimeStamp - MAX-ACCESS read-only - STATUS current - DESCRIPTION "The system time when this transmitting SC was created." - REFERENCE "IEEE 802.1AE Clause 10.7.21" - ::= { secyTxSCEntry 5 } - -secyTxSCStartedTime OBJECT-TYPE - SYNTAX TimeStamp - MAX-ACCESS read-only - STATUS current - DESCRIPTION "The system time when this transmitting SC last started - transmitting MACsec frames." - REFERENCE "IEEE 802.1AE Clause 10.7.21" - ::= { secyTxSCEntry 6 } - -secyTxSCStoppedTime OBJECT-TYPE - SYNTAX TimeStamp - MAX-ACCESS read-only - STATUS current - DESCRIPTION "The system time when this transmitting SC last stopped - transmitting MACsec frames." - REFERENCE "IEEE 802.1AE Clause 10.7.21" - ::= { secyTxSCEntry 7 } - --- --- Traffic Class capable transmit SC Management Table : 802.1AEcg --- - -secyTSCTable OBJECT-TYPE +-- ============================================================================= +--secyTSCTable +secyTSCTable OBJECT-TYPE SYNTAX SEQUENCE OF SecyTSCEntry MAX-ACCESS not-accessible STATUS current - DESCRIPTION "A table of entries for each SecY's traffic class SCs." - REFERENCE "IEEE 802.1AE Clause 7.1.2, 10.7.17, 10.7.20" + DESCRIPTION "A transmit SC management table for systems with SecY's capable + of supporting traffic class SCs." + REFERENCE "7.1.2, 10.7.17, 10.7.20" ::= { secyMgmtMIBObjects 10 } -secyTSCEntry OBJECT-TYPE +--secyTSCEntry +secyTSCEntry OBJECT-TYPE SYNTAX SecyTSCEntry MAX-ACCESS not-accessible STATUS current - DESCRIPTION "An entry with transmit SC information for one of the - system's SecYs and one of its traffic classes." + DESCRIPTION "An entry with transmit SC information for one of the system's + SecYs and one of its traffic classes." INDEX { secyIfInterfaceIndex, secyTSCI } ::= { secyTSCTable 1 } +--SecyTSCEntry SecyTSCEntry ::= SEQUENCE { secyTSCI SecySCI, secyTSCState INTEGER, @@ -490,393 +434,278 @@ SecyTSCEntry ::= SEQUENCE { secyTSCStartedTime TimeStamp, secyTSCStoppedTime TimeStamp } - -secyTSCI OBJECT-TYPE +--secyTSCI +secyTSCI OBJECT-TYPE SYNTAX SecySCI MAX-ACCESS not-accessible STATUS current - DESCRIPTION "The SCI for the transmit SC for this SecY and - traffic class." - REFERENCE "IEEE 802.1AE Clause 7.1.2, 10.7.17, 10.7.20" + DESCRIPTION "The SCI for the transmit SC for this SecY and traffic class." + REFERENCE "7.1.2, 10.7.17, 10.7.20" ::= { secyTSCEntry 1 } -secyTSCState OBJECT-TYPE - SYNTAX INTEGER { - inUse(1), - notInUse(2) - } +--secyTSCState +secyTSCState OBJECT-TYPE + SYNTAX INTEGER { inUse(1), notInUse(2)} MAX-ACCESS read-only STATUS current - DESCRIPTION - "The state of the transmit SC for this SecY and traffic class. - - inUse(1) : one or more SAs for the traffic class SC are in use. - notInUse(2) : no SAs for the traffic class SC are in use." - REFERENCE "IEEE 802.1AE Clause 10.7.20" + DESCRIPTION "The state of the transmit SC for this SecY and traffic class: + inUse(1) : one or more SAs are in use. + notInUse(2) : no SAs are in use for this SC." + REFERENCE "10.7.20" ::= { secyTSCEntry 2 } +--secyTSCEncodingSA secyTSCEncodingSA OBJECT-TYPE SYNTAX RowPointer MAX-ACCESS read-only STATUS current DESCRIPTION - "The SA currently used to encode the SecTAG for frames awaiting - transmission. The row pointer will point to an entry in the - secyTxSATable. If no such information is available, the value shall - be the OBJECT IDENTIFIER { 0 0 }." - REFERENCE "IEEE 802.1AE Clause 10.5.1, 10.7.21" + "The SA currently used to encode the SecTAG. The row pointer points to an + entry in the secyTSATable. If no such information is available, the value + shall be the OBJECT IDENTIFIER { 0 0 }." + REFERENCE "10.5.1, 10.7.21" ::= { secyTSCEntry 3 } +--secyTSCCreatedTime secyTSCCreatedTime OBJECT-TYPE SYNTAX TimeStamp MAX-ACCESS read-only STATUS current DESCRIPTION "The system time when this transmitting SC was created." - REFERENCE "IEEE 802.1AE Clause 10.7.21" + REFERENCE "10.7.21" ::= { secyTSCEntry 4 } +--secyTSCStartedTime secyTSCStartedTime OBJECT-TYPE SYNTAX TimeStamp MAX-ACCESS read-only STATUS current - DESCRIPTION "The system time when this transmitting SC last started - transmitting MACsec frames." - REFERENCE "IEEE 802.1AE Clause 10.7.21" + DESCRIPTION "The system time when this SC last started transmitting." + REFERENCE "10.7.21" ::= { secyTSCEntry 5 } +--secyTSCStoppedTime secyTSCStoppedTime OBJECT-TYPE SYNTAX TimeStamp MAX-ACCESS read-only STATUS current - DESCRIPTION "The system time when this transmitting SC last stopped - transmitting MACsec frames." - REFERENCE "IEEE 802.1AE Clause 10.7.21" + DESCRIPTION "The system time when this SC last stopped transmitting." + REFERENCE "10.7.21" ::= { secyTSCEntry 6 } --- --- Tx SA Management Table : systems not supporting traffic class SCs --- - -secyTxSATable OBJECT-TYPE - SYNTAX SEQUENCE OF SecyTxSAEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION "A table with an entry for each transmit SA for each of - the system's SecYs." - REFERENCE "IEEE 802.1AE Clause 10.7.22, Table 13-2" - ::= { secyMgmtMIBObjects 3 } - -secyTxSAEntry OBJECT-TYPE - SYNTAX SecyTxSAEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION "An entry for a transmit SA." - INDEX { secyIfInterfaceIndex, secyTxSA } - ::= { secyTxSATable 1 } - -SecyTxSAEntry ::= SEQUENCE { - secyTxSA SecyAN, - secyTxSAState INTEGER, - secyTxSANextPN Unsigned32, - secyTxSAConfidentiality TruthValue, - secyTxSASAKUnchanged TruthValue, -- deprecated - secyTxSACreatedTime TimeStamp, - secyTxSAStartedTime TimeStamp, - secyTxSAStoppedTime TimeStamp -} - -secyTxSA OBJECT-TYPE - SYNTAX SecyAN - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION "The association number (AN) for this transmit SA." - REFERENCE "IEEE 802.1AE Clause 10.7.22" - ::= { secyTxSAEntry 1 } - -secyTxSAState OBJECT-TYPE - SYNTAX INTEGER { - inUse(1), - notInUse(2) - } - MAX-ACCESS read-only - STATUS current - DESCRIPTION "The current status of the transmitting SA. - - inUse(1) : this SA is in use. - notInUse(2) : this SA is not in use." - REFERENCE "IEEE 802.1AE Clause 10.7.22" - ::= { secyTxSAEntry 2 } - -secyTxSANextPN OBJECT-TYPE - SYNTAX Unsigned32 - MAX-ACCESS read-only - STATUS current - DESCRIPTION "The next packet number (PN) for this SA." - REFERENCE "IEEE 802.1AE Clause 10.5, 10.7.23" - ::= { secyTxSAEntry 3 } - -secyTxSAConfidentiality OBJECT-TYPE - SYNTAX TruthValue - MAX-ACCESS read-only - STATUS current - DESCRIPTION "True if the SA provides confidentiality as well as - integrity for transmitted frames." - REFERENCE "IEEE 802.1AE Clause 10.7.23" - ::= { secyTxSAEntry 4 } - -secyTxSASAKUnchanged OBJECT-TYPE - SYNTAX TruthValue - MAX-ACCESS read-only - STATUS deprecated -- 802.1AEcg - DESCRIPTION "A reference to an SAK that is unchanged for the life - of the transmitting SA." - REFERENCE "IEEE 802.1AE Clause 10.7.22" - ::= { secyTxSAEntry 5 } - -secyTxSACreatedTime OBJECT-TYPE - SYNTAX TimeStamp - MAX-ACCESS read-only - STATUS current - DESCRIPTION "The system time when this transmit SA was created." - REFERENCE "IEEE 802.1AE Clause 10.7.23" - ::= { secyTxSAEntry 6 } - -secyTxSAStartedTime OBJECT-TYPE - SYNTAX TimeStamp - MAX-ACCESS read-only - STATUS current - DESCRIPTION "The system time when this transmit SA last started - transmitting MACsec frames." - REFERENCE "IEEE 802.1AE Clause 10.7.23" - ::= { secyTxSAEntry 7 } - -secyTxSAStoppedTime OBJECT-TYPE - SYNTAX TimeStamp - MAX-ACCESS read-only - STATUS current - DESCRIPTION "The system time when this transmit SA last stopped - transmitting MACsec frames." - REFERENCE "IEEE 802.1AE Clause 10.7.23" - ::= { secyTxSAEntry 8 } - --- --- Trafffic Class capable transmit SA Management Table : 802.1AEcg --- - +-- ============================================================================= +--secyTSATable secyTSATable OBJECT-TYPE SYNTAX SEQUENCE OF SecyTSAEntry MAX-ACCESS not-accessible STATUS current - DESCRIPTION "A table with an entry for each transmit SA for each of - the system's SecYs." - REFERENCE "IEEE 802.1AE Clause 10.7.22, Table 13-2" + DESCRIPTION "A transmit SA management table for systems with SecY's capable + of supporting traffic class SC's." + REFERENCE "10.7.22, Table 13-2" ::= { secyMgmtMIBObjects 11 } +--secyTSAEntry secyTSAEntry OBJECT-TYPE SYNTAX SecyTSAEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION "An entry for a transmit SA." - INDEX { secyIfInterfaceIndex, secyTSCI, secyTSA } + INDEX { secyIfInterfaceIndex, secyTSCI, secyTSA } ::= { secyTSATable 1 } +--SecyTSAEntry SecyTSAEntry ::= SEQUENCE { secyTSA SecyAN, secyTSAState INTEGER, secyTSANextXPN Counter64, secyTSAConfidentiality TruthValue, secyTSAKeyIdentifier SnmpAdminString, - secyTSASSCI Integer32, + secyTSASSCI Integer32, secyTSACreatedTime TimeStamp, secyTSAStartedTime TimeStamp, secyTSAStoppedTime TimeStamp } - +--secyTSA secyTSA OBJECT-TYPE SYNTAX SecyAN MAX-ACCESS not-accessible STATUS current DESCRIPTION "The association number (AN) for this transmit SA." - REFERENCE "IEEE 802.1AE Clause 10.7.22" + REFERENCE "10.7.22" ::= { secyTSAEntry 1 } +--secyTSAState secyTSAState OBJECT-TYPE - SYNTAX INTEGER { - inUse(1), - notInUse(2) - } + SYNTAX INTEGER { inUse(1), notInUse(2)} MAX-ACCESS read-only STATUS current - DESCRIPTION "The current status of the transmit SA. - - inUse(1) : this SA is in use. - notInUse(2) : this SA is not in use." - REFERENCE "IEEE 802.1AE Clause 10.7.23" + DESCRIPTION "The transmit SA current status: inUse(1) , notInUse(2)." + REFERENCE "10.7.23" ::= { secyTSAEntry 2 } +--secyTSANextXPN secyTSANextXPN OBJECT-TYPE SYNTAX Counter64 MAX-ACCESS read-only STATUS current DESCRIPTION "The next packet number (PN) for this SA." - REFERENCE "IEEE 802.1AE Clause 10.5, 10.7.23" + REFERENCE "10.5, 10.7.23" ::= { secyTSAEntry 3 } +--secyTSAConfidentiality secyTSAConfidentiality OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-only STATUS current - DESCRIPTION "True if the SA provides confidentiality as well as - integrity for transmitted frames." - REFERENCE "IEEE 802.1AE Clause 10.7.23" + DESCRIPTION "True if the SA provides confidentiality." + REFERENCE "10.7.23" ::= { secyTSAEntry 4 } +--secyTSAKeyIdentifier secyTSAKeyIdentifier OBJECT-TYPE SYNTAX SnmpAdminString (SIZE (1..32)) MAX-ACCESS read-only STATUS current DESCRIPTION "The Key Identifier (KI) for the SAK for this SA." - REFERENCE "IEEE 802.1X, IEEE 802.1AE Clause 10.7.23" + REFERENCE "IEEE 802.1X, 10.7.23" ::= { secyTSAEntry 5 } +--secyTSASSCI secyTSASSCI OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-only STATUS current - DESCRIPTION "The SSCI for this SA, 0 if an XPN Cipher Suite is not - being used." - REFERENCE "IEEE 802.1X, IEEE 802.1AE Clause 10.7.23" + DESCRIPTION "The SSCI for this SA, 0 if not using an XPN Cipher Suite." + REFERENCE "IEEE 802.1X, 10.7.23" ::= { secyTSAEntry 6 } +--secyTSACreatedTime secyTSACreatedTime OBJECT-TYPE SYNTAX TimeStamp MAX-ACCESS read-only STATUS current DESCRIPTION "The system time when this transmit SA was created." - REFERENCE "IEEE 802.1AE Clause 10.7.23" + REFERENCE "10.7.23" ::= { secyTSAEntry 7 } +--secyTSAStartedTime secyTSAStartedTime OBJECT-TYPE SYNTAX TimeStamp MAX-ACCESS read-only STATUS current - DESCRIPTION "The system time when this transmit SA last started - transmitting MACsec frames." - REFERENCE "IEEE 802.1AE Clause 10.7.23" + DESCRIPTION "The system time when this SA last started transmitting." + REFERENCE "10.7.23" ::= { secyTSAEntry 8 } +--secyTSAStoppedTime secyTSAStoppedTime OBJECT-TYPE SYNTAX TimeStamp MAX-ACCESS read-only STATUS current - DESCRIPTION "The system time when this transmit SA last stopped - transmitting MACsec frames." - REFERENCE "IEEE 802.1AE Clause 10.7.23" + DESCRIPTION "The system time when this SA last stopped transmitting." + REFERENCE "10.7.23" ::= { secyTSAEntry 9 } --- --- Rx SC Management Table --- - +-- ============================================================================= +--secyRxSCTable secyRxSCTable OBJECT-TYPE SYNTAX SEQUENCE OF SecyRxSCEntry MAX-ACCESS not-accessible STATUS current - DESCRIPTION "A table for the system's SecY's receive SCs." - REFERENCE "IEEE 802.1AE Clause 10.7.11, Table 13-2" + DESCRIPTION "A table of receive SCs for the system." + REFERENCE "10.7.11, Table 13-2" ::= { secyMgmtMIBObjects 4 } +--secyRxSCEntry secyRxSCEntry OBJECT-TYPE - SYNTAX SecyRxSCEntry + SYNTAX SecyRxSCEntry MAX-ACCESS not-accessible STATUS current - DESCRIPTION "An entry for one of the SCs used by one of the system's - SecY's to receive protected frames." - INDEX { secyIfInterfaceIndex, secyRxSCI } + DESCRIPTION "A table entry for a receive SC." + INDEX { secyIfInterfaceIndex, secyRxSCI } ::= { secyRxSCTable 1 } +--SecyRxSCEntry SecyRxSCEntry ::= SEQUENCE { secyRxSCI SecySCI, secyRxSCState INTEGER, - secyRxSCCurrentSA RowPointer, - secyRxSCCreatedTime TimeStamp, - secyRxSCStartedTime TimeStamp, + secyRxSCCurrentSA RowPointer, -- deprecated + secyRxSCCreatedTime TimeStamp, + secyRxSCStartedTime TimeStamp, secyRxSCStoppedTime TimeStamp } +--secyRxSCI secyRxSCI OBJECT-TYPE SYNTAX SecySCI MAX-ACCESS not-accessible STATUS current DESCRIPTION "The SCI for the receive SC." - REFERENCE "IEEE 802.1AE Clause 10.7.11" + REFERENCE "10.7.11" ::= { secyRxSCEntry 1 } +--secyRxSCState secyRxSCState OBJECT-TYPE - SYNTAX INTEGER { - inUse(1), - notInUse(2) - } + SYNTAX INTEGER {inUse(1), notInUse(2)} MAX-ACCESS read-only STATUS current - DESCRIPTION "The state of the receive SC. - + DESCRIPTION "The receive SCs current state: inUse(1) : one or more SAs for this SC are in use. notInUse(2) : no SAs for this SC is in use." - REFERENCE "IEEE 802.1AE Clause 10.7.12 receiving, - 10.7.14 inUse, 10.7.15" + REFERENCE "10.7.12 receiving, 10.7.14 inUse, 10.7.15" ::= { secyRxSCEntry 2 } +--secyRxSCCurrentSA secyRxSCCurrentSA OBJECT-TYPE SYNTAX RowPointer MAX-ACCESS read-only STATUS deprecated -- 802.1AEcg DESCRIPTION - "The current receiving association number of the SC in use. - The row pointer will point to an entry in the secyRxSATable. If no - such information can be identified, the value of this object shall + "The current receiving association number for the SC in use. + The row pointer points to an entry in the secyRxSATable. If no + such information can be identified, the value of this object shall be the OBJECT IDENTIFIER { 0 0 }." - REFERENCE "IEEE 802.1AE Clause 10.6.1, 10.7.13" + REFERENCE "10.7.15, 10.7.13" ::= { secyRxSCEntry 3 } +--secyRxSCCreatedTime secyRxSCCreatedTime OBJECT-TYPE SYNTAX TimeStamp MAX-ACCESS read-only STATUS current DESCRIPTION "The system time when this receiving SC was created." - REFERENCE "IEEE 802.1AE Clause 10.7.12" + REFERENCE "10.7.12" ::= { secyRxSCEntry 4 } +--secyRxSCStartedTime secyRxSCStartedTime OBJECT-TYPE SYNTAX TimeStamp MAX-ACCESS read-only STATUS current - DESCRIPTION "The system time when this receiving SC last started - receiving MACsec frames." - REFERENCE "IEEE 802.1AE Clause 10.7.12" + DESCRIPTION "The system time when this SC last started receiving." + REFERENCE "10.7.12" ::= { secyRxSCEntry 5 } +--secyRxSCStoppedTime secyRxSCStoppedTime OBJECT-TYPE SYNTAX TimeStamp MAX-ACCESS read-only STATUS current - DESCRIPTION "The system time when this receiving SC last stopped - receiving MACsec frames." - REFERENCE "IEEE 802.1AE Clause 10.7.12" + DESCRIPTION "The system time when this SC last stopped receiving." + REFERENCE "10.7.12" ::= { secyRxSCEntry 6 } --- --- Rx SA Management Table --- - +-- ============================================================================= +--secyRxSATable secyRxSATable OBJECT-TYPE SYNTAX SEQUENCE OF SecyRxSAEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION "A table with entries for the system's receive SAs." - REFERENCE "IEEE 802.1AE Clause 10.7.13" + REFERENCE "10.7.13" ::= { secyMgmtMIBObjects 5 } +--secyRxSAEntry secyRxSAEntry OBJECT-TYPE SYNTAX SecyRxSAEntry MAX-ACCESS not-accessible @@ -886,144 +715,143 @@ secyRxSAEntry OBJECT-TYPE INDEX { secyIfInterfaceIndex, secyRxSCI, secyRxSA } ::= { secyRxSATable 1 } +--SecyRxSAEntry SecyRxSAEntry ::= SEQUENCE { secyRxSA SecyAN, secyRxSAState INTEGER, - secyRxSANextPN Unsigned32, - secyRxSASAKUnchanged TruthValue, + secyRxSANextPN Unsigned32, -- deprecated + secyRxSASAKUnchanged TruthValue, -- deprecated secyRxSACreatedTime TimeStamp, secyRxSAStartedTime TimeStamp, secyRxSAStoppedTime TimeStamp, - secyRxSANextXPN Counter64, -- 802.1AEcg - secyRxSALowestXPN Counter64, -- 802.1AEcg - secyRxSAKeyIdentifier SnmpAdminString, -- 802.1AEcg - secyRxSASSCI Integer32 -- 802.1AEcg + secyRxSANextXPN Counter64, + secyRxSALowestXPN Counter64, + secyRxSAKeyIdentifier SnmpAdminString, + secyRxSASSCI Integer32 } +--secyRxSA secyRxSA OBJECT-TYPE SYNTAX SecyAN MAX-ACCESS not-accessible STATUS current - DESCRIPTION "The association number (AN) for this receive SA." - REFERENCE "IEEE 802.1AE Clause 10.7.13" + DESCRIPTION "This receive SA's association number (AN)." + REFERENCE "10.7.13" ::= { secyRxSAEntry 1 } -secyRxSAState OBJECT-TYPE - SYNTAX INTEGER { - inUse(1), - notInUse(2) - } +--secyRxSAState +secyRxSAState OBJECT-TYPE + SYNTAX INTEGER { inUse(1), notInUse(2)} MAX-ACCESS read-only STATUS current - DESCRIPTION "The current state for this receive SA." - REFERENCE "IEEE 802.1AE Clause 10.7.14" + DESCRIPTION "This receive SA's current state." + REFERENCE "10.7.14" ::= { secyRxSAEntry 2 } -secyRxSANextPN OBJECT-TYPE +--secyRxSANextPN +secyRxSANextPN OBJECT-TYPE SYNTAX Unsigned32 MAX-ACCESS read-write - STATUS deprecated -- 802.1AEcg - DESCRIPTION - "One more than the highest PN conveyed in the SecTAG of a frame - received on this SA that has been successfully validated (if - validateFrames has not been disabled). Deprecated: use - secyRxSANextXPN for both 32-bit PN and 64-bit XPN PN values. If - this object is implemented and an XPN Cipher Suite is used, it - contains the lowest 32-bits of the XPN." - REFERENCE "IEEE 802.1AE Clause 10.6.5, 10.7.14, Figure 10-4" + STATUS deprecated + DESCRIPTION "Use secyRxSANextXPN for both 32-bit PN and 64-bit XPN values. + If implemented, this object contains the lower 32 bits." + REFERENCE "10.6.5, 10.7.14, Figure 10-4" ::= { secyRxSAEntry 3 } -secyRxSASAKUnchanged OBJECT-TYPE +--secyRxSASAKUnchanged +secyRxSASAKUnchanged OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-only STATUS deprecated -- 802.1AEcg - DESCRIPTION "A reference to an SAK that is unchanged for the life - of the receiving SA." - REFERENCE "IEEE 802.1AE Clause 10.7.13" + DESCRIPTION "An SAK reference, unchanged for the receiving SA's life." + REFERENCE "10.7.13" ::= { secyRxSAEntry 4 } +--secyRxSACreatedTime secyRxSACreatedTime OBJECT-TYPE SYNTAX TimeStamp MAX-ACCESS read-only STATUS current DESCRIPTION "The system time when this receiving SA was created." - REFERENCE "IEEE 802.1AE Clause 10.7.14" + REFERENCE "10.7.14" ::= { secyRxSAEntry 5 } +--secyRxSAStartedTime secyRxSAStartedTime OBJECT-TYPE SYNTAX TimeStamp MAX-ACCESS read-only STATUS current - DESCRIPTION "The system time when this receiving SA last started - receiving MACsec frames." - REFERENCE "IEEE 802.1AE Clause 10.7.14" + DESCRIPTION "The system time when this SA last started receiving." + REFERENCE "10.7.14" ::= { secyRxSAEntry 6 } +--secyRxSAStoppedTime secyRxSAStoppedTime OBJECT-TYPE SYNTAX TimeStamp MAX-ACCESS read-only STATUS current - DESCRIPTION "The system time when this receiving SA last stopped - receiving MACsec frames." - REFERENCE "IEEE 802.1AE Clause 10.7.14" + DESCRIPTION "The system time when this SA last stopped receiving frames." + REFERENCE "10.7.14" ::= { secyRxSAEntry 7 } - -secyRxSANextXPN OBJECT-TYPE + +--secyRxSANextXPN +secyRxSANextXPN OBJECT-TYPE SYNTAX Counter64 MAX-ACCESS read-only STATUS current DESCRIPTION "One more than the highest PN conveyed in the SecTAG of successfully validates frames received on this SA." - REFERENCE "IEEE 802.1AE Clause 10.6.5, 10.7.14, Figure 10-4" + REFERENCE "10.6.5, 10.7.14, Figure 10-4" ::= { secyRxSAEntry 8 } - + +--secyRxSALowestXPN secyRxSALowestXPN OBJECT-TYPE SYNTAX Counter64 MAX-ACCESS read-only STATUS current - DESCRIPTION "The lowest acceptable packet number. A received frame - with a lower PN is discarded if + DESCRIPTION "The lowest acceptable packet number. A received frame + with a lower PN is discarded if secyIfReplayProtectEnable is enabled." - REFERENCE "IEEE 802.1AE Clause 10.6.2, 10.6.4, 10.6.5, 10.7.14, + REFERENCE "10.6.2, 10.6.4, 10.6.5, 10.7.14, Figure 10-4" ::= { secyRxSAEntry 9 } - + +--secyRxSAKeyIdentifier secyRxSAKeyIdentifier OBJECT-TYPE SYNTAX SnmpAdminString (SIZE (1..32)) MAX-ACCESS read-only STATUS current DESCRIPTION "The Key Identifier (KI) for the SAK for this SA." - REFERENCE "IEEE 802.1X, IEEE 802.1AE Clause 10.7.14" + REFERENCE "IEEE 802.1X, 10.7.14" ::= { secyRxSAEntry 10 } - + +--secyRxSASSCI secyRxSASSCI OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-only STATUS current - DESCRIPTION "The SSCI for this SA, 0 if an XPN Cipher Suite is not - being used." - REFERENCE "IEEE 802.1X, IEEE 802.1AE Clause 10.7.14" - ::= { secyRxSAEntry 11 } - --- --- SecY Selectable Cipher Suites --- + DESCRIPTION "The SSCI for this SA, 0 if an XPN Cipher Suite is not in use." + REFERENCE "IEEE 802.1X, 10.7.14" + ::= { secyRxSAEntry 11 } +-- ============================================================================= +--secyCipherSuiteTable secyCipherSuiteTable OBJECT-TYPE SYNTAX SEQUENCE OF SecyCipherSuiteEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION "A table of the system's Cipher Suite capabilities, which can differ - by Cipher Suite implementation, so there can be more than one entry - with the same secyCipherSuiteId. The secyIfCipherTable lists - available entries by SecY, avoiding the need for remote network - management to write objects or create rows in this table. Any - configured values shall be stored in persistent memory and remain + by Cipher Suite implementation, so there can be more than one entry + with the same secyCipherSuiteId. The secyIfCipherTable lists + available entries by SecY, avoiding the need for remote network + management to write objects or create rows in this table. Any + configured values shall be stored in persistent memory and remain unchanged across a re-initialization of the management system." - REFERENCE "IEEE 802.1AE Clause 10.7.25" + REFERENCE "10.7.25" ::= { secyMgmtMIBObjects 6 } +--secyCipherSuiteEntry secyCipherSuiteEntry OBJECT-TYPE SYNTAX SecyCipherSuiteEntry MAX-ACCESS not-accessible @@ -1032,6 +860,7 @@ secyCipherSuiteEntry OBJECT-TYPE INDEX { secyCipherSuiteIndex } ::= { secyCipherSuiteTable 1 } +--SecyCipherSuiteEntry SecyCipherSuiteEntry ::= SEQUENCE { secyCipherSuiteIndex Unsigned32, secyCipherSuiteId OCTET STRING, @@ -1044,6 +873,7 @@ SecyCipherSuiteEntry ::= SEQUENCE { secyCipherSuiteRowStatus RowStatus } +--secyCipherSuiteIndex secyCipherSuiteIndex OBJECT-TYPE SYNTAX Unsigned32 (1..4294967295) MAX-ACCESS not-accessible @@ -1051,23 +881,26 @@ secyCipherSuiteIndex OBJECT-TYPE DESCRIPTION "The CipherSuiteTable entry index." ::= { secyCipherSuiteEntry 1 } +--secyCipherSuiteId secyCipherSuiteId OBJECT-TYPE SYNTAX OCTET STRING (SIZE (8)) MAX-ACCESS read-create STATUS current - DESCRIPTION "A unique 64-bit (EUI-64) identifier for the Cipher + DESCRIPTION "A unique 64-bit (EUI-64) identifier for the Cipher Suite." - REFERENCE "IEEE 802.1AE Clause 10.7.25, Table 14-1" + REFERENCE "10.7.25, Table 14-1" ::= { secyCipherSuiteEntry 2 } +--secyCipherSuiteName secyCipherSuiteName OBJECT-TYPE SYNTAX SnmpAdminString (SIZE (1..128)) MAX-ACCESS read-create STATUS current DESCRIPTION "The Cipher Suite Name, 128 octets or fewer." - REFERENCE "IEEE 802.1AE Clause 10.7.25, Table 14-1" + REFERENCE "10.7.25, Table 14-1" ::= { secyCipherSuiteEntry 3 } +--secyCipherSuiteCapability secyCipherSuiteCapability OBJECT-TYPE SYNTAX BITS { integrity(0), @@ -1080,11 +913,12 @@ secyCipherSuiteCapability OBJECT-TYPE integrity(0) : integrity protection. confidentiality(1) : confidentiality protection. - offsetConfidentiality(2) : offset confidentiality + offsetConfidentiality(2) : offset confidentiality protection." - REFERENCE "IEEE 802.1AE Clause 10.7.24, 10.7.25" + REFERENCE "10.7.24, 10.7.25" ::= { secyCipherSuiteEntry 4 } +--secyCipherSuiteProtection secyCipherSuiteProtection OBJECT-TYPE SYNTAX BITS { integrity(0), @@ -1094,90 +928,72 @@ secyCipherSuiteProtection OBJECT-TYPE MAX-ACCESS read-create STATUS deprecated -- 802.1AEcg DESCRIPTION - "The secyIfCipherSuite table should be used instead of this object - to allow per SecY Cipher Suite configuration. - - The options provided by this control are a subset of those - defined by the object secyCipherSuiteCapability. - If secyCipherSuiteCapability has the integrity bit on,the integrity - bit can be turned on for this object. - If secyCipherSuiteCapability has the integrity and confidentiality - bits on, the confidentiality bit of this object can be turned on - and the integrity bit must be on. - If secyCipherSuiteCapability has the integrity and - offsetConfidentiality bits on, the offsetConfidentiality bit can be - turned on and the integrity bit must be on. - - integrity(0) : on or off the function of supporting integrity - protection for this cipher suite. - - confidentiality(1) : on or off the function of supporting - confidentiality for this cipher suite. - - offsetConfidentiality(2) : on or off the function of supporting - offset confidentiality for this cipher suite." - REFERENCE "IEEE 802.1AE Clause 10.7.25" + "The secyIfCipherSuite table supports per SecY configuration and should be + used instead of this object.If the secyCipherSuiteCapability integrity + bit is on, it can be turned on for this object. If the integrity and + confidentiality bits of the secyCipherSuiteCapability are both on, the + confidentiality bit of this object can be turned on provided that the + integrity bit is also turned on, and the offsetConfidentiality bit can + also be turned on if the secyCipherSuiteCapability has that bit on. + + integrity(0) : enable (on) or disable integrity protection. + confidentiality(1) : enable (on) or disable confidentiality protection. + offsetConfidentiality(2) : enable (on) or disable offset confidentiality." + REFERENCE "10.7.25" DEFVAL { { integrity } } ::= { secyCipherSuiteEntry 5 } +--secyCipherSuiteProtectionOffset secyCipherSuiteProtectionOffset OBJECT-TYPE SYNTAX Integer32 (0 | 30 | 50) UNITS "bytes" MAX-ACCESS read-create STATUS deprecated -- 802.1AEcg DESCRIPTION - "The confidentiality protection offset options of this cipher suite. - Options should depend on the choice of secyCipherSuiteProtection. - If the value of secyCipherSuiteProtection only turns on integrity - bit, users can only choose 0 byte for this object. - If the value of secyCipherSuiteProtection only turns on integrity - and confidentiality bits, users can only choose 0 byte for this - object. - If the value of secyCipherSuiteProtection only turns on integrity - and offsetConfidentiality bits, users can choose 30 or 50 bytes for - this object. - If the value of secyCipherSuiteProtection turns on integrity and - confidentiality and offsetConfidentiality bits, users can choose 0 - or 30 or 50 bytes for this object." - REFERENCE "IEEE 802.1AE Clause 10.7.25, 10.7.26" + "The confidentiality protection offset options provided by the cipher + suite. Can only be non-zero if the secyCipherSuiteProtection offset + confidentiality bit is on, and then can only be 0 if the confidentiality + bit is on." + REFERENCE "10.7.25, 10.7.26" DEFVAL { 0 } ::= { secyCipherSuiteEntry 6 } +--secyCipherSuiteDataLengthChange secyCipherSuiteDataLengthChange OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-create STATUS current DESCRIPTION "True if cipher suite changes the length of the data." - REFERENCE "IEEE 802.1AE Clause 10.7.25, Figure 9-1" + REFERENCE "10.7.25, Figure 9-1" ::= { secyCipherSuiteEntry 7 } +--secyCipherSuiteICVLength secyCipherSuiteICVLength OBJECT-TYPE SYNTAX Unsigned32 (8..16) UNITS "octets" MAX-ACCESS read-create STATUS current DESCRIPTION "The length of the integrity check value (ICV) field." - REFERENCE "IEEE 802.1AE Clause 10.7.25, Figure 9-1" + REFERENCE "10.7.25, Figure 9-1" ::= { secyCipherSuiteEntry 8 } +--secyCipherSuiteRowStatus secyCipherSuiteRowStatus OBJECT-TYPE SYNTAX RowStatus MAX-ACCESS read-create STATUS current DESCRIPTION "The secyIfCipherTable (if implemented) avoids the need for - network manager creation of entries in the secyCipherSuiteTable, + network manager creation of entries in the secyCipherSuiteTable, and RowStatus should always be valid(1), with any per SecY unavailability indicated by an absence of a corresponding secyIfCipherTable entry or one with secyCipherSuiteAvailable - false (the latter can indicate temporay unavailability)." - REFERENCE "IEEE 802.1AE Clause 10.7.25" + false (the latter can indicate temporary unavailability)." + REFERENCE "10.7.25" ::= { secyCipherSuiteEntry 9 } --- --- SecY Interface Ciphers Table : 802.1AEcg --- - +-- ============================================================================= +--secyIfCipherTable secyIfCipherTable OBJECT-TYPE SYNTAX SEQUENCE OF SecyIfCipherEntry MAX-ACCESS not-accessible @@ -1190,9 +1006,10 @@ secyIfCipherTable OBJECT-TYPE The configured value of writable objects in each table entry shall be stored in persistent memory and remain unchanged across a re-initialization of the system's management entity." - REFERENCE "IEEE 802.1AE Clause 10.7.26, Table 13-1" + REFERENCE "10.7.26, Table 13-1" ::= { secyMgmtMIBObjects 7 } - + +--secyIfCipherEntry secyIfCipherEntry OBJECT-TYPE SYNTAX SecyIfCipherEntry MAX-ACCESS not-accessible @@ -1201,296 +1018,393 @@ secyIfCipherEntry OBJECT-TYPE INDEX { secyIfInterfaceIndex, secyCipherSuiteIndex } ::= { secyIfCipherTable 1 } +--SecyIfCipherEntry SecyIfCipherEntry ::= SEQUENCE { secyIfCipherImplemented TruthValue, secyIfCipherEnableUse TruthValue, secyIfCipherRqConfidentiality TruthValue } - + +--secyIfCipherImplemented secyIfCipherImplemented OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-only STATUS current DESCRIPTION "True if the Cipher Suite implementation can be used by - this SecY (if secIfCipherEnablUse is true)." - REFERENCE "IEEE 802.1AE Clause 10.7.26" + this SecY (if secIfCipherEnableUse is true)." + REFERENCE "10.7.26" DEFVAL { true } ::= { secyIfCipherEntry 1 } +--secyIfCipherEnableUse secyIfCipherEnableUse OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-write STATUS current DESCRIPTION "Enables use of the Cipher Suite by this SecY." - REFERENCE "IEEE 802.1AE Clause 10.7.26" + REFERENCE "10.7.26" DEFVAL { true } ::= { secyIfCipherEntry 2 } - + +--secyIfCipherRqConfidentiality secyIfCipherRqConfidentiality OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-write STATUS current DESCRIPTION "True if confidentiality protection (without an offset) is required if this Cipher Suite is used." - REFERENCE "IEEE 802.1AE Clause 10.7.26" + REFERENCE "10.7.26" DEFVAL { true } ::= { secyIfCipherEntry 3 } --- --- SecY Interface Traffic Class Table : 802.1AEcg --- - +-- ============================================================================= +--secyIfTCTable secyIfTCTable OBJECT-TYPE SYNTAX SEQUENCE OF SecyIfTCEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION "The Traffic Class Table for each SecY in this system. - The configured value of writable objects in each table entry - shall be stored in persistent memory and remain unchanged across + MUST be stored in persistent memory and remain unchanged across a re-initialization of the system's management entity." - REFERENCE "IEEE 802.1AE Clause 10.5.1, 10.7.17, Table 13-1" + REFERENCE "10.5.1, 10.7.17, Table 13-1" ::= { secyMgmtMIBObjects 8 } - + +--secyIfTCEntry secyIfTCEntry OBJECT-TYPE SYNTAX SecyIfTCEntry MAX-ACCESS not-accessible STATUS current - DESCRIPTION "A table entry providing Traffic Class selection for a - given SecY and User Priority." + DESCRIPTION "A table entry providing Traffic Class selection for a given + SecY and user priority." INDEX { secyIfInterfaceIndex, secyIfTCUserPriority } ::= { secyIfTCTable 1 } +--SecyIfTCEntry SecyIfTCEntry ::= SEQUENCE { secyIfTCUserPriority Integer32, secyIfTCTrafficClass Integer32 } +--secyIfTCUserPriority secyIfTCUserPriority OBJECT-TYPE SYNTAX Integer32 (0..7) MAX-ACCESS not-accessible STATUS current - DESCRIPTION "One of the possible User Priority values for a frame." - REFERENCE "IEEE 802.1AE Clause 10.7.17" + DESCRIPTION "One of the possible user priority values for a frame." + REFERENCE "10.7.17" ::= { secyIfTCEntry 1 } - + +--secyIfTCTrafficClass secyIfTCTrafficClass OBJECT-TYPE SYNTAX Integer32 (0..7) MAX-ACCESS read-write STATUS current DESCRIPTION - "The Traffic Class for this SecY and User Priority, as + "The Traffic Class for this SecY and user priority, as transmitted in the four most significant bits of the Port Identifier component of the SCI of protected frames." - REFERENCE "IEEE 802.1AE Clause 10.7.17" + REFERENCE "10.7.17" DEFVAL { 0 } ::= { secyIfTCEntry 2 } --- --- SecY Interface Access Priority Table : 802.1AEcg --- - +-- ============================================================================= +--secyIfAPTable secyIfAPTable OBJECT-TYPE SYNTAX SEQUENCE OF SecyIfAPEntry MAX-ACCESS not-accessible STATUS current - DESCRIPTION + DESCRIPTION "The Access Priority Table for each SecY in this system. - The configured value of writable objects in each table entry - shall be stored in persistent memory and remain unchanged across + MUST be stored in persistent memory and remain unchanged across a re-initialization of the system's management entity." - REFERENCE "IEEE 802.1AE Clause 10.5.1, 10.7.17, Table 13-1" + REFERENCE "10.5.1, 10.7.17, Table 13-1" ::= { secyMgmtMIBObjects 9 } - + +--secyIfAPEntry secyIfAPEntry OBJECT-TYPE SYNTAX SecyIfAPEntry MAX-ACCESS not-accessible STATUS current - DESCRIPTION "A table entry selecting the Access Priority Code Point - for a given SecY and User Priority Code Point." + DESCRIPTION "A table entry for a given SecY, selecting the access priority + and the drop_eligible parameter value used for a given user + priority and drop_eligible parameter value." INDEX { secyIfInterfaceIndex, secyIfAPUserPCP } ::= { secyIfAPTable 1 } +--SecyIfAPEntry SecyIfAPEntry ::= SEQUENCE { secyIfAPUserPCP Integer32, secyIfAPAccessPCP Integer32 } +--secyIfAPUserPCP secyIfAPUserPCP OBJECT-TYPE SYNTAX Integer32 (0..15) MAX-ACCESS not-accessible STATUS current - DESCRIPTION "A User Priority Code Point." - REFERENCE "IEEE 802.1AE Clause 10.5, 10.7.17" + DESCRIPTION "The user priority (3 more significant bits) and drop_eligible + parameter (least significant bit) values." + REFERENCE "10.5, 10.7.17" ::= { secyIfAPEntry 1 } - + +--secyIfAPAccessPCP secyIfAPAccessPCP OBJECT-TYPE SYNTAX Integer32 (0..15) MAX-ACCESS read-write STATUS current - DESCRIPTION "The Access Priority Code Point for this SecY and User - PCP. Defaults to the User PCP value. " - REFERENCE "IEEE 802.1AE Clause 10.5, 10.7.17" + DESCRIPTION "The access priority (3 more significant bits) and drop_eligible + parameter (least significant bit) values." + REFERENCE "10.5, 10.7.17" ::= { secyIfAPEntry 2 } - --- --- TX SA Statistics : systems not supporting traffic class SCs --- - -secyTxSAStatsTable OBJECT-TYPE - SYNTAX SEQUENCE OF SecyTxSAStatsEntry +-- ============================================================================= +--secyTxSCTable +secyTxSCTable OBJECT-TYPE + SYNTAX SEQUENCE OF SecyTxSCEntry MAX-ACCESS not-accessible - STATUS deprecated -- 802.1AEcg - DESCRIPTION "A table of statistics for each transmit SA for each of - the system's SecYs." - REFERENCE "IEEE 802.1AE Clause 10.7.18, figure 10-4" - ::= { secyStatsMIBObjects 1 } + STATUS current -- ?? + DESCRIPTION "A transmit SC management table for systems not supporting + traffic class SC's, with an entry for each SecY." + REFERENCE "10.7.17, 10.7.20, Table 13-2" + ::= { secyMgmtMIBObjects 2 } -secyTxSAStatsEntry OBJECT-TYPE - SYNTAX SecyTxSAStatsEntry +--secyTxSCEntry +secyTxSCEntry OBJECT-TYPE + SYNTAX SecyTxSCEntry MAX-ACCESS not-accessible - STATUS deprecated -- 802.1AEcg + STATUS current + DESCRIPTION "An entry with transmit SC information for a SecY." + INDEX { secyIfInterfaceIndex } + ::= { secyTxSCTable 1 } + +--SecyTxSCEntry +SecyTxSCEntry ::= SEQUENCE { + secyTxSCI SecySCI, + secyTxSCState INTEGER, + secyTxSCEncodingSA RowPointer, + secyTxSCEncipheringSA RowPointer, -- deprecated + secyTxSCCreatedTime TimeStamp, + secyTxSCStartedTime TimeStamp, + secyTxSCStoppedTime TimeStamp +} +--secyTxSCI +secyTxSCI OBJECT-TYPE + SYNTAX SecySCI + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The SCI for the SecY's transmit SC." + REFERENCE "7.1.2, 10.7.1" + ::= { secyTxSCEntry 1 } + +--secyTxSCState +secyTxSCState OBJECT-TYPE + SYNTAX INTEGER { inUse(1), notInUse(2)} + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The transmitting state of the SecY's transmit SC." + REFERENCE "10.7.21 transmitting, 10.7.23" + ::= { secyTxSCEntry 2 } + +--secyTxSCEncodingSA +secyTxSCEncodingSA OBJECT-TYPE + SYNTAX RowPointer + MAX-ACCESS read-only + STATUS current DESCRIPTION - "An entry with statistics for a transmit SA. The AN that - identifies an SA (for a given SC) and this corresponding entry - can be reused. When creating the SA and before (re)using the - entry, the SA counters are (re)set to 0. When the SA is stopped - (secyTxSA notInuse) the counters will be stop incrementing. + "The SA currently used to encode the SecTAG for frames awaiting transmission. + The row pointer points to an entry in the secyTxSATable. If no such + information is available, the value shall be the OBJECT IDENTIFIER { 0 0 }." + REFERENCE "10.5.1, 10.7.21" + ::= { secyTxSCEntry 3 } - The secyTxSATable timestamps SA creation, start, and stop." - AUGMENTS { secyTxSAEntry } - ::= { secyTxSAStatsTable 1 } +--secyTxSCEncipheringSA +secyTxSCEncipheringSA OBJECT-TYPE + SYNTAX RowPointer + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "The SA currently used to encipher frames for transmission. + The row pointer points to an entry in the secyTxSATable. If no such + information is available, the value shall be the OBJECT IDENTIFIER { 0 0 }." + REFERENCE "10.5.4" + ::= { secyTxSCEntry 4 } -SecyTxSAStatsEntry ::= SEQUENCE { - secyTxSAStatsProtectedPkts Counter32, - secyTxSAStatsEncryptedPkts Counter32 -} +--secyTxSCCreatedTime +secyTxSCCreatedTime OBJECT-TYPE + SYNTAX TimeStamp + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The system time when this transmitting SC was created." + REFERENCE "10.7.21" + ::= { secyTxSCEntry 5 } -secyTxSAStatsProtectedPkts OBJECT-TYPE - SYNTAX Counter32 - UNITS "Packets" +--secyTxSCStartedTime +secyTxSCStartedTime OBJECT-TYPE + SYNTAX TimeStamp MAX-ACCESS read-only - STATUS deprecated -- 802.1AEcg - DESCRIPTION "The number of integrity protected but not encrypted - packets for this transmit SA. Zero if - secyTxSAConfidentiality is True, and one less than - secyTxSANextPN otherwise." - REFERENCE "IEEE 802.1AE Clause 10.7.18, figure 10-4" - ::= { secyTxSAStatsEntry 1 } + STATUS current + DESCRIPTION "The system time when this SC last started transmitting." + REFERENCE "10.7.21" + ::= { secyTxSCEntry 6 } -secyTxSAStatsEncryptedPkts OBJECT-TYPE - SYNTAX Counter32 - UNITS "Packets" +--secyTxSCStoppedTime +secyTxSCStoppedTime OBJECT-TYPE + SYNTAX TimeStamp MAX-ACCESS read-only - STATUS deprecated -- 802.1AEcg - DESCRIPTION "The number of integrity protected and encrypted packets - for this transmit SA. Zero if secyTxSAConfidentiality - is False, and one less than secyTxSANextPN otherwise." - REFERENCE "IEEE 802.1AE Clause 10.7.18, Figure 10-4" - ::= { secyTxSAStatsEntry 2 } - - --- --- TX SC Statistics : systems not supporting traffic class SCs --- + STATUS current + DESCRIPTION "The system time when this SC last stopped transmitting." + REFERENCE "10.7.21" + ::= { secyTxSCEntry 7 } -secyTxSCStatsTable OBJECT-TYPE - SYNTAX SEQUENCE OF SecyTxSCStatsEntry +-- ============================================================================= +--secyTxSATable +secyTxSATable OBJECT-TYPE + SYNTAX SEQUENCE OF SecyTxSAEntry MAX-ACCESS not-accessible STATUS current - DESCRIPTION "A table of statistics for each SecY's transmit SC." - REFERENCE "IEEE 802.1AE Clause 10.7.18, 10.7.19, Figure 10-3" - ::= { secyStatsMIBObjects 2 } + DESCRIPTION "A transmit SA management table for a system with no SecYs + capable of supporting traffic class transmit SCs." + REFERENCE "10.7.22, Table 13-2" + ::= { secyMgmtMIBObjects 3 } -secyTxSCStatsEntry OBJECT-TYPE - SYNTAX SecyTxSCStatsEntry +--secyTxSAEntry +secyTxSAEntry OBJECT-TYPE + SYNTAX SecyTxSAEntry MAX-ACCESS not-accessible STATUS current - DESCRIPTION - "An entry containing counts for a transmit SC. SA counters are - reset when the SA's AN is reused, so these SC counts are - a summation for all current and prior SAs belonging to the SC." - AUGMENTS { secyTxSCEntry } - ::= { secyTxSCStatsTable 1 } + DESCRIPTION "An entry for a transmit SA." + INDEX { secyIfInterfaceIndex, secyTxSA } + ::= { secyTxSATable 1 } -SecyTxSCStatsEntry ::= SEQUENCE { - secyTxSCStatsProtectedPkts Counter64, - secyTxSCStatsEncryptedPkts Counter64, - secyTxSCStatsOctetsProtected Counter64, -- deprecated - secyTxSCStatsOctetsEncrypted Counter64 -- deprecated +--SecyTxSAEntry +SecyTxSAEntry ::= SEQUENCE { + secyTxSA SecyAN, + secyTxSAState INTEGER, + secyTxSANextPN Unsigned32, + secyTxSAConfidentiality TruthValue, + secyTxSASAKUnchanged TruthValue, -- deprecated + secyTxSACreatedTime TimeStamp, + secyTxSAStartedTime TimeStamp, + secyTxSAStoppedTime TimeStamp } -secyTxSCStatsProtectedPkts OBJECT-TYPE - SYNTAX Counter64 - UNITS "Packets" +--secyTxSA +secyTxSA OBJECT-TYPE + SYNTAX SecyAN + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "The association number (AN) for this transmit SA." + REFERENCE "10.7.22" + ::= { secyTxSAEntry 1 } + +--secyTxSAState +secyTxSAState OBJECT-TYPE + SYNTAX INTEGER {inUse(1), notInUse(2)} MAX-ACCESS read-only STATUS current - DESCRIPTION "The number of integrity protected but not encrypted - packets for this transmit SC." - REFERENCE "IEEE 802.1AE Clause 10.7.18, Figure 10-3" - ::= { secyTxSCStatsEntry 1 } + DESCRIPTION "The transmit SAs current status: inUse(1), notInUse(2)." + REFERENCE "10.7.22" + ::= { secyTxSAEntry 2 } -secyTxSCStatsEncryptedPkts OBJECT-TYPE - SYNTAX Counter64 - UNITS "Packets" +--secyTxSANextPN +secyTxSANextPN OBJECT-TYPE + SYNTAX Unsigned32 MAX-ACCESS read-only STATUS current - DESCRIPTION "The number of integrity protected and encrypted packets - for this transmit SC." - REFERENCE "IEEE 802.1AE Clause 10.7.18, Figure 10-3" - ::= { secyTxSCStatsEntry 4 } + DESCRIPTION "The next packet number (PN) for this SA." + REFERENCE "10.5, 10.7.23" + ::= { secyTxSAEntry 3 } -secyTxSCStatsOctetsProtected OBJECT-TYPE - SYNTAX Counter64 - UNITS "Octets" +--secyTxSAConfidentiality +secyTxSAConfidentiality OBJECT-TYPE + SYNTAX TruthValue MAX-ACCESS read-only - STATUS deprecated -- 802.1AEcg - DESCRIPTION "The number of plain text octets that are integrity - protected but not encrypted for this transmit SC." - REFERENCE "IEEE 802.1AE Clause 10.7.19, Figure 10-3" - ::= { secyTxSCStatsEntry 10 } + STATUS current + DESCRIPTION "True if the SA provides confidentiality as well as + integrity for transmitted frames." + REFERENCE "10.7.23" + ::= { secyTxSAEntry 4 } -secyTxSCStatsOctetsEncrypted OBJECT-TYPE - SYNTAX Counter64 - UNITS "Octets" +--secyTxSASAKUnchanged +secyTxSASAKUnchanged OBJECT-TYPE + SYNTAX TruthValue MAX-ACCESS read-only - STATUS deprecated -- 802.1AEcg - DESCRIPTION - "The number of plain text octets that are integrity protected - and encrypted on the transmit SC." - REFERENCE "IEEE 802.1AE Clause 10.7.19, Figure 10-3" - ::= { secyTxSCStatsEntry 11 } --- --- Traffic Class capable transmit SC Statistics : 802.1AEcg --- + STATUS deprecated + DESCRIPTION "A reference to an SAK that is unchanged for the life + of the transmitting SA." + REFERENCE "10.7.22" + ::= { secyTxSAEntry 5 } + +--secyTxSACreatedTime +secyTxSACreatedTime OBJECT-TYPE + SYNTAX TimeStamp + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The system time when this transmit SA was created." + REFERENCE "10.7.23" + ::= { secyTxSAEntry 6 } + +--secyTxSAStartedTime +secyTxSAStartedTime OBJECT-TYPE + SYNTAX TimeStamp + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The system time when this SA last started transmitting." + REFERENCE "10.7.23" + ::= { secyTxSAEntry 7 } +--secyTxSAStoppedTime +secyTxSAStoppedTime OBJECT-TYPE + SYNTAX TimeStamp + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The system time when this SA last stopped transmitting." + REFERENCE "10.7.23" + ::= { secyTxSAEntry 8 } + +-- ============================================================================= +--secyStatsMIBObjects +-- secyTSCStatsTable +-- secyRxSCStatsTable +-- secyRxSAStatsTable +-- secyStatsTable +--The following are historic following approval of IEEE Std 802.1AEcg-2017, +--even if their STATUS remains 'current'. They do not include any objects +--that are part of a current conformance OBJECT-GROUP, and lack traffic +--class transmit SC and XPN support: +-- secyTxSCStatsTable, secyTxSAStatsTable +-- ============================================================================= +--secyTSCStatsTable secyTSCStatsTable OBJECT-TYPE SYNTAX SEQUENCE OF SecyTSCStatsEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION "A table of statistics for each SecY's transmit SCs." - REFERENCE "IEEE 802.1AE Clause 10.7.18, 10.7.19, Figure 10-3" + REFERENCE "10.7.18, 10.7.19, Figure 10-3" ::= { secyStatsMIBObjects 12 } +--secyTSCStatsEntry secyTSCStatsEntry OBJECT-TYPE SYNTAX SecyTSCStatsEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION - "A entry containing counts for a transmit SC, since SA counters + "A entry containing counts for a transmit SC, since SA counters are reset when the SA's AN is reused these are a summation for all current and prior SAs belonging to the SC." AUGMENTS { secyTSCEntry } ::= { secyTSCStatsTable 1 } +--SecyTSCStatsEntry SecyTSCStatsEntry ::= SEQUENCE { secyTSCStatsProtectedPkts Counter64, secyTSCStatsEncryptedPkts Counter64 } +--secyTSCStatsProtectedPkts secyTSCStatsProtectedPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" @@ -1499,9 +1413,10 @@ secyTSCStatsProtectedPkts OBJECT-TYPE DESCRIPTION "The number of integrity protected but not encrypted packets for this transmit SC." - REFERENCE "IEEE 802.1AE Clause 10.7.18, Figure 10-3" + REFERENCE "10.7.18, Figure 10-3" ::= { secyTSCStatsEntry 1 } +--secyTSCStatsEncryptedPkts secyTSCStatsEncryptedPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" @@ -1510,14 +1425,11 @@ secyTSCStatsEncryptedPkts OBJECT-TYPE DESCRIPTION "The number of integrity protected and encrypted packets for this transmit SC." - REFERENCE "IEEE 802.1AE Clause 10.7.18, Figure 10-3" + REFERENCE "10.7.18, Figure 10-3" ::= { secyTSCStatsEntry 2 } - --- --- RX SA Statistics Information --- - +-- ============================================================================= +--secyRxSAStatsTable secyRxSAStatsTable OBJECT-TYPE SYNTAX SEQUENCE OF SecyRxSAStatsEntry MAX-ACCESS not-accessible @@ -1525,24 +1437,26 @@ secyRxSAStatsTable OBJECT-TYPE DESCRIPTION "A table that contains the statistics objects for each receiving SA in the MAC security entity." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyStatsMIBObjects 3 } +--secyRxSAStatsEntry secyRxSAStatsEntry OBJECT-TYPE SYNTAX SecyRxSAStatsEntry MAX-ACCESS not-accessible STATUS deprecated -- 802.1AEcg DESCRIPTION - "An entry with statistics for a receive SA. The AN that + "An entry with statistics for a receive SA. The AN that identifies an SA (for a given SC) and this corresponding entry can be reused. When creating the SA and before (re)using the entry, the SA counters are (re)set to 0. When the SA is stopped - (secyRxSA notInuse) the counters will be stop incrementing. + (secyRxSA notInuse) the counters stop incrementing. The secyRxSATable timestamps SA creation, start, and stop." AUGMENTS { secyRxSAEntry } - ::= { secyRxSAStatsTable 1 } + ::= { secyRxSAStatsTable 1 } +--SecyRxSAStatsEntry SecyRxSAStatsEntry ::= SEQUENCE { secyRxSAStatsUnusedSAPkts Counter32, -- deprecated secyRxSAStatsNoUsingSAPkts Counter32, -- deprecated @@ -1551,6 +1465,7 @@ SecyRxSAStatsEntry ::= SEQUENCE { secyRxSAStatsOKPkts Counter32 -- deprecated } +--secyRxSAStatsUnusedSAPkts secyRxSAStatsUnusedSAPkts OBJECT-TYPE SYNTAX Counter32 UNITS "Packets" @@ -1560,9 +1475,10 @@ secyRxSAStatsUnusedSAPkts OBJECT-TYPE "For this SA which is not currently in use, the number of received, unencrypted, packets with secyValidateFrames not in the strict mode." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyRxSAStatsEntry 1 } +--secyRxSAStatsNoUsingSAPkts secyRxSAStatsNoUsingSAPkts OBJECT-TYPE SYNTAX Counter32 UNITS "Packets" @@ -1573,9 +1489,10 @@ secyRxSAStatsNoUsingSAPkts OBJECT-TYPE received packets that have been discarded, and have either the packets encrypted or secyValidateFrames set to strict mode." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyRxSAStatsEntry 4 } +--secyRxSAStatsNotValidPkts secyRxSAStatsNotValidPkts OBJECT-TYPE SYNTAX Counter32 UNITS "Packets" @@ -1586,9 +1503,10 @@ secyRxSAStatsNotValidPkts OBJECT-TYPE condition that the packets are not valid and one of the following conditions are true: either secyValidateFrames in strict mode or the packets encrypted." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyRxSAStatsEntry 13 } +--secyRxSAStatsInvalidPkts secyRxSAStatsInvalidPkts OBJECT-TYPE SYNTAX Counter32 UNITS "Packets" @@ -1598,9 +1516,10 @@ secyRxSAStatsInvalidPkts OBJECT-TYPE "For this SA, the number of packets with the condition that the packets are not valid and secyValidateFrames is in check mode." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyRxSAStatsEntry 16 } +--secyRxSAStatsOKPkts secyRxSAStatsOKPkts OBJECT-TYPE SYNTAX Counter32 UNITS "Packets" @@ -1608,33 +1527,33 @@ secyRxSAStatsOKPkts OBJECT-TYPE STATUS deprecated DESCRIPTION "For this SA, the number of validated packets." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyRxSAStatsEntry 25 } --- --- RX SC Statistics Information --- - +-- ============================================================================= +--secyRxSCStatsTable secyRxSCStatsTable OBJECT-TYPE SYNTAX SEQUENCE OF SecyRxSCStatsEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION "A table of statistics for each receive SC for each of the system's SecYs." - REFERENCE "IEEE 802.1AE Clause 10.7.9, 10.7.10, Figure 10-4" + REFERENCE "10.7.9, 10.7.9, Figure 10-4" ::= { secyStatsMIBObjects 4 } +--secyRxSCStatsEntry secyRxSCStatsEntry OBJECT-TYPE SYNTAX SecyRxSCStatsEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION - "An entry containing counts for a receive SC. SA counters are - reset when the SA's AN is reused, so these SC counts are a + "An entry containing counts for a receive SC. SA counters are + reset when the SA's AN is reused, so these SC counts are a summation for all current and prior SAs belonging to the SC." AUGMENTS { secyRxSCEntry } ::= { secyRxSCStatsTable 1 } +--SecyRxSCStatsEntry SecyRxSCStatsEntry ::= SEQUENCE { secyRxSCStatsUnusedSAPkts Counter64, -- deprecated secyRxSCStatsNoUsingSAPkts Counter64, -- deprecated @@ -1648,6 +1567,7 @@ SecyRxSCStatsEntry ::= SEQUENCE { secyRxSCStatsOctetsDecrypted Counter64 -- deprecated } +--secyRxSCStatsUnusedSAPkts secyRxSCStatsUnusedSAPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" @@ -1655,9 +1575,10 @@ secyRxSCStatsUnusedSAPkts OBJECT-TYPE STATUS deprecated -- 802.1AEcg DESCRIPTION "The sum of secyRxSAStatsUnusedSAPkts counts for all current and prior SAs belonging to this SC." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyRxSCStatsEntry 1 } +--secyRxSCStatsNoUsingSAPkts secyRxSCStatsNoUsingSAPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" @@ -1665,113 +1586,115 @@ secyRxSCStatsNoUsingSAPkts OBJECT-TYPE STATUS deprecated -- 802.1AEcg DESCRIPTION "The sum of secyRxSAStatsNoUsingSAPkts counts for all current and prior SAs belonging to this SC." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyRxSCStatsEntry 2 } +--secyRxSCStatsLatePkts secyRxSCStatsLatePkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" MAX-ACCESS read-only STATUS current - DESCRIPTION - "The number of packets discarded, for this SC, because the - the received PN was lower than the lowest acceptable PN - (secyRxSALowestXPN) and secyIfReplayProtectEnable was true." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + DESCRIPTION "Count of packets discarded for this SC, with a received PN + lower than the lowest acceptable PN (secyRxSALowestXPN) while + secyIfReplayProtectEnable was true." + REFERENCE "10.7.9, Figure 10-4" ::= { secyRxSCStatsEntry 3 } -secyRxSCStatsNotValidPkts OBJECT-TYPE +--secyRxSCStatsNotValidPkts +secyRxSCStatsNotValidPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" MAX-ACCESS read-only STATUS current - DESCRIPTION - "The number of packets discarded, for this SC, because validation - failed and secyIfvalidateFrames was 'strict' or the data was - encrypted (so the original frame could not be recovered)." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + DESCRIPTION "Count of packets discarded for this SC, because validation + failed and they were encrypted (unrecoverable) or + secyIfvalidateFrames was 'strict'." + REFERENCE "10.7.9, Figure 10-4" ::= { secyRxSCStatsEntry 4 } +--secyRxSCStatsInvalidPkts secyRxSCStatsInvalidPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" MAX-ACCESS read-only STATUS current - DESCRIPTION - "The number of packets, for this SC, that failed validation but - could be received because secyIfvalidateFrames was 'check' and - the data was not encrypted (so the original frame could be - recovered)." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + DESCRIPTION "Count of packets received for this SC, that failed validation + but were received unencrypted while secyIfvalidateFrames + was 'check'." + REFERENCE "10.7.9, Figure 10-4" ::= { secyRxSCStatsEntry 5 } +--secyRxSCStatsDelayedPkts secyRxSCStatsDelayedPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" MAX-ACCESS read-only STATUS current - DESCRIPTION - "The number of received packets, for this SC, with PN lower - than the lowest acceptable PN (secyRxSALowestXPN) and - secyIfReplayProtectEnable false." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + DESCRIPTION "Count of packets received for this SC, with PN lower than + the lowest acceptable PN (secyRxSALowestXPN) while + secyIfReplayProtectEnable was false." + REFERENCE "10.7.9, Figure 10-4" ::= { secyRxSCStatsEntry 6 } +--secyRxSCStatsUncheckedPkts secyRxSCStatsUncheckedPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" MAX-ACCESS read-only STATUS current - DESCRIPTION "The number of packets received for this SC, while + DESCRIPTION "Count of packets received for this SC while secyValidateFrames was 'disabled'." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyRxSCStatsEntry 7 } +--secyRxSCStatsOKPkts secyRxSCStatsOKPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" MAX-ACCESS read-only STATUS current - DESCRIPTION "The number of packets received for this SC + DESCRIPTION "Count of packets received for this SC that were successfully validated and within the replay window." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyRxSCStatsEntry 8 } +--secyRxSCStatsOctetsValidated secyRxSCStatsOctetsValidated OBJECT-TYPE SYNTAX Counter64 UNITS "Octets" MAX-ACCESS read-only STATUS deprecated -- 802.1AEcg - DESCRIPTION "The number of plaintext octets recovered from packets - that were integrity protected but not encrypted." - REFERENCE "Deprecated, the secyIsStatsTable has per SecY counts - for cryptographic performance management." + DESCRIPTION "Count of plaintext octets recovered from packets that were + integrity protected but not encrypted." + REFERENCE "Deprecated, the secyIsStatsTable has per SecY counts + for cryptographic performance management." ::= { secyRxSCStatsEntry 9 } +--secyRxSCStatsOctetsDecrypted secyRxSCStatsOctetsDecrypted OBJECT-TYPE SYNTAX Counter64 UNITS "Octets" MAX-ACCESS read-only STATUS deprecated -- 802.1AEcg - DESCRIPTION "The number of plaintext octets recovered from packets + DESCRIPTION "Count of plaintext octets recovered from packets that were integrity protected and encrypted." - REFERENCE "Deprecated, the secyIsStatsTable has per SecY counts - for cryptographic performance management." + REFERENCE "Deprecated, the secyIsStatsTable has per SecY counts + for cryptographic performance management." ::= { secyRxSCStatsEntry 10 } --- --- SecY statistics table --- - -secyStatsTable OBJECT-TYPE +-- ============================================================================= +--secyStatsTable +secyStatsTable OBJECT-TYPE SYNTAX SEQUENCE OF SecyStatsEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION "A table of statistics for each of the system's SecYs." - REFERENCE "IEEE 802.1AE Clause 10.7.9, 10.7.18, Figure 10-3, 10.5" + REFERENCE "10.7.9, 10.7.18, Figure 10-3, 10.5" ::= { secyStatsMIBObjects 5 } -secyStatsEntry OBJECT-TYPE +--secyStatsEntry +secyStatsEntry OBJECT-TYPE SYNTAX SecyStatsEntry MAX-ACCESS not-accessible STATUS current @@ -1780,6 +1703,7 @@ secyStatsEntry OBJECT-TYPE AUGMENTS { secyIfEntry } ::= { secyStatsTable 1 } +--SecyStatsEntry SecyStatsEntry ::= SEQUENCE { secyStatsTxUntaggedPkts Counter64, secyStatsTxTooLongPkts Counter64, @@ -1797,6 +1721,7 @@ SecyStatsEntry ::= SEQUENCE { secyStatsRxOctetsDecrypted Counter64 -- 802.1AEcg } +--secyStatsTxUntaggedPkts secyStatsTxUntaggedPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" @@ -1804,9 +1729,10 @@ secyStatsTxUntaggedPkts OBJECT-TYPE STATUS current DESCRIPTION "The number of packets transmitted without a SecTAG because secyProtectFramesEnable is configured false." - REFERENCE "IEEE 802.1AE Clause 10.7.18, Figure 10-3" + REFERENCE "10.7.18, Figure 10-3" ::= { secyStatsEntry 1 } +--secyStatsTxTooLongPkts secyStatsTxTooLongPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" @@ -1814,19 +1740,21 @@ secyStatsTxTooLongPkts OBJECT-TYPE STATUS current DESCRIPTION "The number of transmit packets discarded because their length is greater than the ifMtu of the Common Port." - REFERENCE "IEEE 802.1AE Clause 10.7.18, Figure 10-3" + REFERENCE "10.7.18, Figure 10-3" ::= { secyStatsEntry 2 } +--secyStatsRxUntaggedPkts secyStatsRxUntaggedPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" MAX-ACCESS read-only STATUS current - DESCRIPTION "The number of packets without the MACsec tag (SecTAG) + DESCRIPTION "The number of packets without the MACsec tag (SecTAG) received while secyValidateFrames was not 'strict'." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyStatsEntry 3 } +--secyStatsRxNoTagPkts secyStatsRxNoTagPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" @@ -1834,57 +1762,63 @@ secyStatsRxNoTagPkts OBJECT-TYPE STATUS current DESCRIPTION "The number of received packets without a SecTAG discarded because secyValidateFrames was 'strict'." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyStatsEntry 4 } +--secyStatsRxBadTagPkts secyStatsRxBadTagPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" MAX-ACCESS read-only STATUS current - DESCRIPTION "The number of received packets discarded with an + DESCRIPTION "The number of received packets discarded with an invalid SecTAG, zero value PN, or invalid ICV." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyStatsEntry 5 } +--secyStatsRxUnknownSCIPkts secyStatsRxUnknownSCIPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" MAX-ACCESS read-only STATUS deprecated -- 802.1AEcg DESCRIPTION "The number of received packets with an unknown SCI." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyStatsEntry 6 } +--secyStatsRxNoSCIPkts secyStatsRxNoSCIPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" MAX-ACCESS read-only STATUS deprecated -- 802.1AEcg DESCRIPTION "The number of discarded packets with an unknown SCI." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyStatsEntry 7 } +--secyStatsRxOverrunPkts secyStatsRxOverrunPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" MAX-ACCESS read-only STATUS current - DESCRIPTION "The number of packets discarded because they exceeded + DESCRIPTION "The number of packets discarded because they exceeded cryptographic performance capabilities." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyStatsEntry 8 } - + +--secyStatsRxNoSAPkts secyStatsRxNoSAPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" MAX-ACCESS read-only STATUS current - DESCRIPTION "The number of received packets with an unknown SCI + DESCRIPTION "The number of received packets with an unknown SCI or for an unused SA." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyStatsEntry 9 } +--secyStatsRxNoSAErrorPkts secyStatsRxNoSAErrorPkts OBJECT-TYPE SYNTAX Counter64 UNITS "Packets" @@ -1892,58 +1826,186 @@ secyStatsRxNoSAErrorPkts OBJECT-TYPE STATUS current DESCRIPTION "The number of packets discarded because the received SCI is unknown or the SA is not in use." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyStatsEntry 10 } +--secyStatsTxOctetsProtected secyStatsTxOctetsProtected OBJECT-TYPE SYNTAX Counter64 UNITS "Octets" MAX-ACCESS read-only STATUS current - DESCRIPTION "The number of plain text octets integrity protected + DESCRIPTION "The number of plain text octets integrity protected but not encrypted in transmitted frames." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyStatsEntry 11 } +--secyStatsTxOctetsEncrypted secyStatsTxOctetsEncrypted OBJECT-TYPE SYNTAX Counter64 UNITS "Octets" MAX-ACCESS read-only STATUS current - DESCRIPTION "The number of plain text octets integrity protected + DESCRIPTION "The number of plain text octets integrity protected and encrypted in transmitted frames." - REFERENCE "IEEE 802.1AE Clause 10.7.9, Figure 10-4" + REFERENCE "10.7.9, Figure 10-4" ::= { secyStatsEntry 12 } - + +--secyStatsRxOctetsValidated secyStatsRxOctetsValidated OBJECT-TYPE SYNTAX Counter64 UNITS "Octets" MAX-ACCESS read-only STATUS current - DESCRIPTION "The number of plaintext octets recovered from packets + DESCRIPTION "The number of plaintext octets recovered from packets that were integrity protected but not encrypted." - REFERENCE "IEEE 802.1AE Clause 10.6.3, Figure 10-3" + REFERENCE "10.6.3, Figure 10-3" ::= { secyStatsEntry 13 } +--secyStatsRxOctetsDecrypted secyStatsRxOctetsDecrypted OBJECT-TYPE SYNTAX Counter64 UNITS "Octets" MAX-ACCESS read-only STATUS current - DESCRIPTION "The number of plaintext octets recovered from packets + DESCRIPTION "The number of plaintext octets recovered from packets that were integrity protected and encrypted." - REFERENCE "IEEE 802.1AE Clause 10.6.3, Figure 10-3" + REFERENCE "10.6.3, Figure 10-3" ::= { secyStatsEntry 14 } --- --- Conformance --- +-- ============================================================================= +--secyTxSCStatsTable +secyTxSCStatsTable OBJECT-TYPE + SYNTAX SEQUENCE OF SecyTxSCStatsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "A transmit SC statistics table for systems without traffic + class SC support, with an entry for each SecY." + REFERENCE "10.7.18, 10.7.19, Figure 10-3" + ::= { secyStatsMIBObjects 2 } + +--secyTxSCStatsEntry +secyTxSCStatsEntry OBJECT-TYPE + SYNTAX SecyTxSCStatsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "A transmit SC statistics table entry (for systems without + traffic class SC support) with cumulative counts for a given + SecY's current and prior SAs." + AUGMENTS { secyTxSCEntry } + ::= { secyTxSCStatsTable 1 } + +--SecyTxSCStatsEntry +SecyTxSCStatsEntry ::= SEQUENCE { + secyTxSCStatsProtectedPkts Counter64, + secyTxSCStatsEncryptedPkts Counter64, + secyTxSCStatsOctetsProtected Counter64, -- deprecated + secyTxSCStatsOctetsEncrypted Counter64 -- deprecated +} +--secyTxSCStatsProtectedPkts +secyTxSCStatsProtectedPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Count of integrity protected but unencrypted packets for this + transmit SC." + REFERENCE "10.7.18, Figure 10-3" + ::= { secyTxSCStatsEntry 1 } + +--secyTxSCStatsEncryptedPkts +secyTxSCStatsEncryptedPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Count of integrity protected and encrypted packets for this + transmit SC." + REFERENCE "10.7.18, Figure 10-3" + ::= { secyTxSCStatsEntry 4 } + +--secyTxSCStatsOctetsProtected +secyTxSCStatsOctetsProtected OBJECT-TYPE + SYNTAX Counter64 + UNITS "Octets" + MAX-ACCESS read-only + STATUS deprecated -- 802.1AEcg + DESCRIPTION "Count of integrity protected plain text octets that are integrity + protected but not encrypted for this transmit SC." + REFERENCE "10.7.19, Figure 10-3" + ::= { secyTxSCStatsEntry 10 } + +--secyTxSCStatsOctetsEncrypted +secyTxSCStatsOctetsEncrypted OBJECT-TYPE + SYNTAX Counter64 + UNITS "Octets" + MAX-ACCESS read-only + STATUS deprecated -- 802.1AEcg + DESCRIPTION + "The number of plain text octets that are integrity protected + and encrypted on the transmit SC." + REFERENCE "10.7.19, Figure 10-3" + ::= { secyTxSCStatsEntry 11 } -secyMIBCompliances OBJECT IDENTIFIER ::= { secyMIBConformance 1 } +-- ============================================================================= +--secyTxSAStatsTable +secyTxSAStatsTable OBJECT-TYPE + SYNTAX SEQUENCE OF SecyTxSAStatsEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION "A table of statistics for each transmit SA for each of + the system's SecYs." + REFERENCE "10.7.18, Figure 10-4" + ::= { secyStatsMIBObjects 1 } -secyMIBGroups OBJECT IDENTIFIER ::= { secyMIBConformance 2 } +--secyTxSAStatsEntry +secyTxSAStatsEntry OBJECT-TYPE + SYNTAX SecyTxSAStatsEntry + MAX-ACCESS not-accessible + STATUS deprecated -- 802.1AEcg + DESCRIPTION + "An entry with statistics for a transmit SA. The AN that + identifies an SA (for a given SC) and this corresponding entry + can be reused. When creating the SA and before (re)using the + entry, the SA counters are (re)set to 0. When the SA is stopped + (secyTxSA notInuse) the counters stop incrementing. --- Compliance + The secyTxSATable timestamps SA creation, start, and stop." + AUGMENTS { secyTxSAEntry } + ::= { secyTxSAStatsTable 1 } +--SecyTxSAStatsEntry +SecyTxSAStatsEntry ::= SEQUENCE { + secyTxSAStatsProtectedPkts Counter32, + secyTxSAStatsEncryptedPkts Counter32 +} + +--secyTxSAStatsProtectedPkts +secyTxSAStatsProtectedPkts OBJECT-TYPE + SYNTAX Counter32 + UNITS "Packets" + MAX-ACCESS read-only + STATUS deprecated -- 802.1AEcg + DESCRIPTION "Count of integrity protected but unencrypted packets for this + transmit SA. Zero if secyTxSAConfidentiality is True, and one + less than secyTxSANextPN otherwise." + REFERENCE "10.7.18, Figure 10-4" + ::= { secyTxSAStatsEntry 1 } + +--secyTxSAStatsEncryptedPkts +secyTxSAStatsEncryptedPkts OBJECT-TYPE + SYNTAX Counter32 + UNITS "Packets" + MAX-ACCESS read-only + STATUS deprecated -- 802.1AEcg + DESCRIPTION "Count of integrity protected and encrypted packets for this + transmit SA. Zero if secyTxSAConfidentiality is False, and + one less than secyTxSANextPN otherwise." + REFERENCE "10.7.18, Figure 10-4" + ::= { secyTxSAStatsEntry 2 } + +-- ============================================================================= +--secyMIBCompliances +--secyMIBTcCompliance secyMIBTcCompliance MODULE-COMPLIANCE STATUS current -- 802.1AEcg DESCRIPTION @@ -1966,7 +2028,7 @@ secyMIBTcCompliance MODULE-COMPLIANCE secyCipherInfoGroup, secyCipherStatsGroup, secyTSCStatsGroup, - secyRSCStatsGroup, + secyRSCStatsGroup, secyIfStatsGroup } OBJECT secyIfCurrentCipherSuite @@ -1989,7 +2051,8 @@ secyMIBTcCompliance MODULE-COMPLIANCE MIN-ACCESS read-only DESCRIPTION "read-create not required, should be read-only." ::= { secyMIBCompliances 2 } - +-- ============================================================================= +--secyMIBCompliance secyMIBCompliance MODULE-COMPLIANCE STATUS deprecated -- 802.1AEcg DESCRIPTION @@ -2006,7 +2069,7 @@ secyMIBCompliance MODULE-COMPLIANCE secyTxSAStatsGroup, secyTxSCStatsGroup, secyRxSAStatsGroup, - secyRxSCStatsGroup, + secyRxSCStatsGroup, secyStatsGroup } OBJECT secyIfCurrentCipherSuite @@ -2037,10 +2100,10 @@ secyMIBCompliance MODULE-COMPLIANCE MIN-ACCESS read-only DESCRIPTION "read-create not required, may be read-only." ::= { secyMIBCompliances 1 } --- --- Units of Conformance --- Controlled Port service management MIB Groups +-- ============================================================================= +--secyMIBGroups +--secyIfGroup secyIfGroup OBJECT-GROUP OBJECTS { secyIfMaxPeerSCs, @@ -2060,11 +2123,12 @@ secyIfGroup OBJECT-GROUP secyIfIncludingSCI, -- 802.1AEcg secyIfMaxTSCs -- 802.1AEcg } - STATUS current --- 802.1AEcg, updates secyIfCtrlGroup - DESCRIPTION "SecY service management (secyIfTable objects) for + STATUS current --- Updated secyIfCtrlGroup + DESCRIPTION "SecY service management (secyIfTable objects) for systems supporting traffic class SCs." ::= { secyMIBGroups 12 } +--secyIfCtrlGroup secyIfCtrlGroup OBJECT-GROUP OBJECTS { secyIfMaxPeerSCs, @@ -2085,6 +2149,7 @@ secyIfCtrlGroup OBJECT-GROUP DESCRIPTION "SecY service management (secyIfTable) objects." ::= { secyMIBGroups 1 } +--secyIfTCGroup secyIfTCGroup OBJECT-GROUP OBJECTS { secyIfTCTrafficClass @@ -2093,16 +2158,17 @@ secyIfTCGroup OBJECT-GROUP DESCRIPTION "Traffic class control (secyIfTCTable)." ::= { secyMIBGroups 14 } +--secyIfAPGroup secyIfAPGroup OBJECT-GROUP OBJECTS { secyIfAPAccessPCP } - STATUS current --- 802.1AEcg + STATUS current DESCRIPTION "Access Priority Code Point control (secyIfAPTable)." ::= { secyMIBGroups 15 } - --- Transmit SC and SA MIB Groups + +--secyTSCGroup secyTSCGroup OBJECT-GROUP OBJECTS { secyTSCState, @@ -2111,11 +2177,12 @@ secyTSCGroup OBJECT-GROUP secyTSCStartedTime, secyTSCStoppedTime } - STATUS current --- 802.1AEcg, updates secyTxSCGroup + STATUS current --- Updated secyTxSCGroup DESCRIPTION "Transmit SC management (secyTSCTable objects) for systems supporting traffic class SCs." ::= { secyMIBGroups 16 } - + +--secyTxSCGroup secyTxSCGroup OBJECT-GROUP OBJECTS { secyTxSCI, @@ -2131,6 +2198,7 @@ secyTxSCGroup OBJECT-GROUP traffic class SC capabilities)." ::= { secyMIBGroups 2 } +--secyTSAGroup secyTSAGroup OBJECT-GROUP OBJECTS { secyTSAState, @@ -2147,6 +2215,7 @@ secyTSAGroup OBJECT-GROUP systems supporting traffic class SCs." ::= { secyMIBGroups 17 } +--secyTxSAGroup secyTxSAGroup OBJECT-GROUP OBJECTS { secyTxSAState, @@ -2161,9 +2230,8 @@ secyTxSAGroup OBJECT-GROUP DESCRIPTION "Transmit SA management objects (for systems without traffic class SC capabilities)." ::= { secyMIBGroups 3 } - --- Receive SC and SA MIB Groups +--secyRSCGroup secyRSCGroup OBJECT-GROUP OBJECTS { secyRxSCState, @@ -2175,6 +2243,7 @@ secyRSCGroup OBJECT-GROUP DESCRIPTION "Receive SC management (secyRxSCTable objects)." ::= { secyMIBGroups 18 } +--secyRxSCGroup secyRxSCGroup OBJECT-GROUP OBJECTS { secyRxSCState, @@ -2187,6 +2256,7 @@ secyRxSCGroup OBJECT-GROUP DESCRIPTION "Receive SC management objects." ::= { secyMIBGroups 4 } +--secyRSAGroup secyRSAGroup OBJECT-GROUP OBJECTS { secyRxSAState, @@ -2198,10 +2268,11 @@ secyRSAGroup OBJECT-GROUP secyRxSAStartedTime, secyRxSAStoppedTime } - STATUS current --- 802.1AEcg, updates secyRxSAGroup + STATUS current --- Updated secyRxSAGroup DESCRIPTION "Receive SA (secyRxSATable objects)." ::= { secyMIBGroups 19 } +--secyRxSAGroup secyRxSAGroup OBJECT-GROUP OBJECTS { secyRxSAState, @@ -2214,9 +2285,10 @@ secyRxSAGroup OBJECT-GROUP STATUS deprecated DESCRIPTION "Receive SA management objects." ::= { secyMIBGroups 5 } - + -- Cipher information, use, and statistics MIB Groups +--secyCipherInfoGroup secyCipherInfoGroup OBJECT-GROUP OBJECTS { secyCipherSuiteId, @@ -2225,11 +2297,12 @@ secyCipherInfoGroup OBJECT-GROUP secyCipherSuiteDataLengthChange, secyCipherSuiteICVLength } - STATUS current --- 802.1AEcg, updates secyCipherSuiteGroup - DESCRIPTION "Cipher Suite implementation information + STATUS current --- Updated secyCipherSuiteGroup + DESCRIPTION "Cipher Suite implementation information (secyCipherSuiteTable objects)." ::= { secyMIBGroups 21 } +--secyCipherSuiteGroup secyCipherSuiteGroup OBJECT-GROUP OBJECTS { secyCipherSuiteId, @@ -2244,7 +2317,8 @@ secyCipherSuiteGroup OBJECT-GROUP STATUS deprecated DESCRIPTION "Cipher Suite information objects." ::= { secyMIBGroups 6 } - + +--secyIfCipherGroup secyIfCipherGroup OBJECT-GROUP OBJECTS { secyIfCipherImplemented, @@ -2254,7 +2328,8 @@ secyIfCipherGroup OBJECT-GROUP STATUS current --- 802.1AEcg DESCRIPTION "Cipher Suite use control (secyIfCipherTable objects)." ::= { secyMIBGroups 13 } - + +--secyCipherStatsGroup secyCipherStatsGroup OBJECT-GROUP OBJECTS { secyStatsTxOctetsProtected, @@ -2262,13 +2337,12 @@ secyCipherStatsGroup OBJECT-GROUP secyStatsRxOctetsValidated, secyStatsRxOctetsDecrypted } - STATUS current --- 802.1AEcg + STATUS current DESCRIPTION "Cipher Suite performance statistics (from secyStatsTable)." ::= { secyMIBGroups 24 } - --- Transmit and Receive SA and SC statistics MIB Groups +--secyTxSAStatsGroup secyTxSAStatsGroup OBJECT-GROUP OBJECTS { secyTxSAStatsProtectedPkts, @@ -2278,6 +2352,7 @@ secyTxSAStatsGroup OBJECT-GROUP DESCRIPTION "Transmit SA statistics objects." ::= { secyMIBGroups 7 } +--secyRxSAStatsGroup secyRxSAStatsGroup OBJECT-GROUP OBJECTS { secyRxSAStatsUnusedSAPkts, @@ -2290,15 +2365,17 @@ secyRxSAStatsGroup OBJECT-GROUP DESCRIPTION "Receive SA statistics objects." ::= { secyMIBGroups 8 } +--secyTSCStatsGroup secyTSCStatsGroup OBJECT-GROUP OBJECTS { secyTSCStatsProtectedPkts, secyTSCStatsEncryptedPkts } - STATUS current --- 802.1AEcg, updates secyTxSCStatsGroup + STATUS current --- Updated secyTxSCStatsGroup DESCRIPTION "Transmit SC statistics (secyTSCStatsTable objects)." ::= { secyMIBGroups 22 } - + +--secyTxSCStatsGroup secyTxSCStatsGroup OBJECT-GROUP OBJECTS { secyTxSCStatsProtectedPkts, @@ -2310,6 +2387,7 @@ secyTxSCStatsGroup OBJECT-GROUP DESCRIPTION "Transmit SC statistics objects." ::= { secyMIBGroups 9 } +--secyRSCStatsGroup secyRSCStatsGroup OBJECT-GROUP OBJECTS { secyRxSCStatsLatePkts, @@ -2319,10 +2397,11 @@ secyRSCStatsGroup OBJECT-GROUP secyRxSCStatsUncheckedPkts, secyRxSCStatsOKPkts } - STATUS current --- 802.1AEcg, updates secyRxSCStatsGroup + STATUS current --- Updated secyRxSCStatsGroup DESCRIPTION "Receive SC statistics (secyRxSCStatsTable objects)." ::= { secyMIBGroups 23 } - + +--secyRxSCStatsGroup secyRxSCStatsGroup OBJECT-GROUP OBJECTS { secyRxSCStatsUnusedSAPkts, @@ -2340,9 +2419,8 @@ secyRxSCStatsGroup OBJECT-GROUP DESCRIPTION "Receive SC statistics objects." ::= { secyMIBGroups 10 } - --- Controlled Port service statistics MIB Groups +--secyIfStatsGroup secyIfStatsGroup OBJECT-GROUP OBJECTS { secyStatsTxUntaggedPkts, @@ -2359,6 +2437,7 @@ secyIfStatsGroup OBJECT-GROUP "SecY statistics (secyStatsTable objects)." ::= { secyMIBGroups 20 } +--secyStatsGroup secyStatsGroup OBJECT-GROUP OBJECTS { secyStatsTxUntaggedPkts, @@ -2374,7 +2453,5 @@ secyStatsGroup OBJECT-GROUP DESCRIPTION "SecY statistics objects." ::= { secyMIBGroups 11 } - -END - +END diff --git a/mibs/IEEE8021-TC-MIB b/mibs/IEEE8021-TC-MIB index 18aa5f3ec69..1ff6ae0115d 100644 --- a/mibs/IEEE8021-TC-MIB +++ b/mibs/IEEE8021-TC-MIB @@ -11,50 +11,50 @@ IMPORTS FROM SNMPv2-TC; -- RFC 2579 ieee8021TcMib MODULE-IDENTITY - LAST-UPDATED "201806210000Z" -- June 21, 2018 + LAST-UPDATED "202211080000Z" -- November 8, 2022 ORGANIZATION "IEEE 802.1 Working Group" CONTACT-INFO - " WG-URL: http://www.ieee802.org/1 - WG-EMail: stds-802-1-L@ieee.org - + " WG-URL: http://www.ieee802.org/1/ + WG-EMail: stds-802-1-l@ieee.org Contact: IEEE 802.1 Working Group Chair Postal: C/O IEEE 802.1 Working Group IEEE Standards Association 445 Hoes Lane - Piscataway - NJ 08855 + Piscataway, NJ 08854 USA - E-mail: STDS-802-1-L@IEEE.ORG" + E-mail: stds-802-1-chairs@ieee.org" DESCRIPTION "Textual conventions used throughout the various IEEE 802.1 MIB modules. Unless otherwise indicated, the references in this MIB - module are to IEEE Std 802.1Q. + module are to IEEE Std 802.1Q-2022. - Copyright (C) IEEE (2014). + Copyright (C) IEEE (2022). This version of this MIB module is part of IEEE Std 802.1Q; - see the draft itself for full legal notices." + see that standard for full legal notices." - REVISION "201806210000Z" -- June 21, 2018 + REVISION "202211080000Z" -- November 8, 2022 + DESCRIPTION + "Published as part of IEEE Std 802.1Q-2022. + Cross references and contact information updated." - + REVISION "201807010000Z" -- July 1, 2018 DESCRIPTION - "Published as part of IEEE Std 802.1Q 2017 revision. + "Published as part of IEEE Std 802.1Q 2018 revision. Cross references updated and corrected." REVISION "201412150000Z" -- December 15, 2014 - DESCRIPTION "Published as part of IEEE Std 802.1Q 2014 revision. Cross references updated and corrected. Updating of definition of IEEE8021PbbIngressEgress New identifier types for new SPBM MA types" - + REVISION "201202150000Z" -- February 15, 2012 DESCRIPTION "Modified IEEE8021BridgePortType textual convention to - include stationFacingBridgePort, + include stationFacingBridgePort, uplinkAccessPort, and uplinkRelayPort types." REVISION "201108230000Z" -- August 23, 2011 @@ -69,9 +69,9 @@ ieee8021TcMib MODULE-IDENTITY REVISION "201102270000Z" -- February 27, 2011 DESCRIPTION - "Minor edits to contact information etc. as part of + "Minor edits to contact information etc. as part of 2011 revision of IEEE Std 802.1Q." - + REVISION "200811180000Z" -- November 18, 2008 DESCRIPTION @@ -159,7 +159,7 @@ IEEE8021PbbServiceIdentifierOrUnassigned ::= TEXTUAL-CONVENTION IEEE8021PbbIngressEgress ::= TEXTUAL-CONVENTION STATUS current DESCRIPTION - "A 2 bit selector which determines if frames on this VIP may + "A 2 bit selector that determines if frames on this VIP may ingress to the PBBN but not egress the PBBN, egress to the PBBN but not ingress the PBBN, or both ingress and egress the PBBN." @@ -172,8 +172,8 @@ IEEE8021PbbIngressEgress ::= TEXTUAL-CONVENTION IEEE8021PriorityCodePoint ::= TEXTUAL-CONVENTION STATUS current DESCRIPTION - "Bridge ports may encode or decode the PCP value of the - frames that traverse the port. This textual convention + "Bridge ports may encode or decode the PCP value of the + frames that traverse the port. This textual convention names the possible encoding and decoding schemes that the port may use. The priority and drop_eligible parameters are encoded in the Priority Code Point (PCP) @@ -215,7 +215,7 @@ IEEE8021BridgePortType ::= TEXTUAL-CONVENTION DESCRIPTION "A port type. The possible port types are: - customerVlanPort(2) - Indicates a port is a + customerVlanPort(2) - Indicates a port is a C-tag-aware port of an enterprise VLAN-aware Bridge. providerNetworkPort(3) - Indicates a port is an S-tag- @@ -236,7 +236,7 @@ IEEE8021BridgePortType ::= TEXTUAL-CONVENTION virtualInstancePort(7) - Indicates a port is a virtual S-tag-aware port within a Backbone Edge Bridge's - I-component which is responsible for handling + I-component that is responsible for handling S-tagged traffic for a specific backbone service instance. @@ -247,16 +247,16 @@ IEEE8021BridgePortType ::= TEXTUAL-CONVENTION S-tag-aware port of a Provider Bridge used for connections to remote customer interface LANs through another PBN. - + stationFacingBridgePort (10) - Indicates a port of a Bridge that supports the EVB status parameters (40.4) with an EVBMode parameter value of EVB Bridge. - + uplinkAccessPort (11) - Indicates a port on a Port-mapping S-VLAN component that connects an EVB - Bridge with an EVB station. - + Bridge with an EVB station. + uplinkRelayPort (12) - Indicates a port of an edge relay that supports the EVB status parameters (40.4) with an EVBMode parameter value of EVB station." @@ -352,20 +352,20 @@ IEEE8021ServiceSelectorType ::= TEXTUAL-CONVENTION in Bridges that implement PBB-TE functionality. A selector of this type is interpreted as a 32 bit unsigned value of type IEEE8021PbbTeTSidId. This type is used to index the - ieee8021PbbTeTeSiEspTable to find the ESPs which comprise the TE + ieee8021PbbTeTeSiEspTable to find the ESPs that comprise the TE Service Instance named by this TE-SID value. - + The segid is used as a service selector for MAs that are present in Bridges that implement IPS functionality. A selector of this type is interpreted as a 32 bit unsigned value of type IEEE8021TeipsSegid. This type is used to index the - Ieee8021TeipsSegTable to find the SMPs which comprise the + Ieee8021TeipsSegTable to find the SMPs that comprise the Infrastructure Segment named by this segid value. The path-tesid is used as a service selector for SPBM path MAs. A selector of this type is interpreted as a 32 bit unsigned value corresponding to the MA index dot1agCfmMaIndex. This type is used - to index the dot1agCfmMepSpbmEspTable to find the ESPs which + to index the dot1agCfmMepSpbmEspTable to find the ESPs that comprise the SPBM path associated with an SPBM path MA. The group-isid is used as a service selector for SPBM group MAs. @@ -460,7 +460,7 @@ IEEE8021PortAcceptableFrameTypes ::= TEXTUAL-CONVENTION STATUS current DESCRIPTION "Acceptable frame types on a port." - REFERENCE "12.10.1.3, 12.13.3.3, 12.13.3.4" + REFERENCE "12.10.1.3, 12.13.2.3, 12.13.2.4" SYNTAX INTEGER { admitAll(1), admitUntaggedAndPriority(2), @@ -472,14 +472,14 @@ IEEE8021PriorityValue ::= TEXTUAL-CONVENTION STATUS current DESCRIPTION "An IEEE 802.1Q user priority value." - REFERENCE "12.13.3.3" + REFERENCE "12.13.2.3" SYNTAX Unsigned32 (0..7) IEEE8021PbbTeProtectionGroupId ::= TEXTUAL-CONVENTION DISPLAY-HINT "d" STATUS current DESCRIPTION - "The PbbTeProtectionGroupId identifier is used to distinguish + "The PbbTeProtectionGroupId identifier is used to distinguish protection group instances present in the B Component of an IB-BEB." REFERENCE "12.18.2" @@ -495,7 +495,7 @@ IEEE8021PbbTeEsp ::= TEXTUAL-CONVENTION Bytes (1..6) of this textual convention contain the ESP-MAC-DA, bytes (7..12) contain the ESP-MAC-SA, and bytes (13..14) contain the ESP-VID." - REFERENCE "3.83" + REFERENCE "3.86" SYNTAX OCTET STRING ( SIZE(14)) IEEE8021PbbTeTSidId ::= TEXTUAL-CONVENTION @@ -507,7 +507,7 @@ IEEE8021PbbTeTSidId ::= TEXTUAL-CONVENTION a TE-SID is implementation dependent. This textual convention defines the external representation of TE-SID values." REFERENCE - "3.270" + "3.275" SYNTAX Unsigned32 (1..42947295) IEEE8021PbbTeProtectionGroupConfigAdmin ::= TEXTUAL-CONVENTION @@ -516,7 +516,7 @@ IEEE8021PbbTeProtectionGroupConfigAdmin ::= TEXTUAL-CONVENTION "This textual convention is used to represent administrative commands that can be issued to a protection group. The value noAdmin(1) is used to indicate that no administrative action - is to be performed." + is to be performed." REFERENCE "26.10.3.3.5 26.10.3.3.6 26.10.3.3.7 @@ -545,16 +545,16 @@ IEEE8021PbbTeProtectionGroupActiveRequests ::= TEXTUAL-CONVENTION manualSwitchToProtection(6), manualSwitchToWorking(7) } - + IEEE8021TeipsIpgid ::= TEXTUAL-CONVENTION DISPLAY-HINT "d" STATUS current DESCRIPTION - "The TEIPS IPG identifier is used to distinguish + "The TEIPS IPG identifier is used to distinguish IPG instances present in a PBB." REFERENCE "12.24.1.1.3 a)" - SYNTAX Unsigned32 (1..429467295) - + SYNTAX Unsigned32 (1..429467295) + IEEE8021TeipsSegid ::= TEXTUAL-CONVENTION DISPLAY-HINT "d" STATUS current @@ -566,8 +566,8 @@ IEEE8021TeipsSegid ::= TEXTUAL-CONVENTION external representation of SEG-ID values." REFERENCE "26.11.1" - SYNTAX Unsigned32 (1..42947295) - + SYNTAX Unsigned32 (1..42947295) + IEEE8021TeipsSmpid ::= TEXTUAL-CONVENTION STATUS current DESCRIPTION @@ -579,7 +579,7 @@ IEEE8021TeipsSmpid ::= TEXTUAL-CONVENTION SMP-MAC-DA, bytes (7..12) contain the SMP-MAC-SA, and bytes (13..14) contain the SMP-VID." REFERENCE "26.11.1" - SYNTAX OCTET STRING ( SIZE(14)) + SYNTAX OCTET STRING ( SIZE(14)) IEEE8021TeipsIpgConfigAdmin ::= TEXTUAL-CONVENTION STATUS current @@ -587,7 +587,7 @@ IEEE8021TeipsIpgConfigAdmin ::= TEXTUAL-CONVENTION "This textual convention is used to represent administrative commands that can be issued to an IPG. The value clear(1) is used to indicate that no administrative action - is to be performed." + is to be performed." REFERENCE "12.24.2.1.3 h)" SYNTAX INTEGER { clear(1), @@ -614,4 +614,4 @@ IEEE8021TeipsIpgConfigActiveRequests ::= TEXTUAL-CONVENTION manualSwitchToWorking(7) } -END \ No newline at end of file +END diff --git a/mibs/IEEE8023-LAG-MIB b/mibs/IEEE8023-LAG-MIB index e999e04abbb..1c06747556a 100644 --- a/mibs/IEEE8023-LAG-MIB +++ b/mibs/IEEE8023-LAG-MIB @@ -4,7 +4,6 @@ IEEE8023-LAG-MIB DEFINITIONS ::= BEGIN -- IEEE 802.1AX MIB -- ------------------------------------------------------------- - IMPORTS MODULE-IDENTITY, OBJECT-TYPE, Counter32, Counter64, Integer32, TimeTicks, NOTIFICATION-TYPE @@ -21,22 +20,23 @@ IMPORTS FROM SNMP-FRAMEWORK-MIB ; - lagMIB MODULE-IDENTITY - LAST-UPDATED "201610120000Z" + LAST-UPDATED "202005290000Z" ORGANIZATION "IEEE 802.1 Working Group" CONTACT-INFO - " WG-URL: http://www.ieee802.org/1/index.html - WG-EMail: stds-802-1@ieee.org + " WG-URL: http://ieee802.org/1/ + WG-EMail: stds-802-1-l@ieee.org Contact: IEEE 802.1 Working Group Chair Postal: C/O IEEE 802.1 Working Group IEEE Standards Association 445 Hoes Lane - Piscataway - NJ 08854 + Piscataway, NJ 08854 USA - E-mail: STDS-802-1-L@LISTSERV.IEEE.ORG" + E-mail: stds-802-1-chairs@ieee.org" + DESCRIPTION + "The Link Aggregation module for IEEE 802.1AX-Rev-2020." + REVISION "202005290000Z" DESCRIPTION "The Link Aggregation module for managing IEEE 802.1AX-2014 as updated by 802.1AX-2014-Cor1." @@ -57,12 +57,10 @@ lagMIB MODULE-IDENTITY "Original publication IEEE 802.3ad" ::= { iso(1) member-body(2) us(840) ieee802dot3(10006) snmpmibs(300) 43 } - -- ------------------------------------------------------------- -- Textual Conventions -- ------------------------------------------------------------- - LacpKey ::= TEXTUAL-CONVENTION DISPLAY-HINT "d" STATUS current @@ -75,7 +73,7 @@ LacpState ::= TEXTUAL-CONVENTION DESCRIPTION "The Actor and Partner State values from the LACPDU." REFERENCE - "7.3.2.1.20" + "Figure 6-9" SYNTAX BITS { lacpActivity(0), lacpTimeout(1), @@ -86,9 +84,43 @@ LacpState ::= TEXTUAL-CONVENTION defaulted(6), expired(7) } - -DrcpState ::= TEXTUAL-CONVENTION + +IrpState ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION + "The Intra-Relay Port State values from the DRCPDU (9.6.2.3)." + REFERENCE + "Figure 9-13" + SYNTAX BITS { + distributedRelayNumberLSB(0), + distributedRelayNumberMSB(1), + shortTimeout(2), + synchronization(3), + ircData(4), + drni(5), + defaulted(6), + expired(7) + } + +CscdState ::= TEXTUAL-CONVENTION STATUS current + DESCRIPTION + "The CSCD State values from the Aggregator State TLV (9.6.2.4)." + REFERENCE + "Figure 9-15" + SYNTAX BITS { + reserved0(0), + reserved1(1), + reserved2(2), + cscdGatewayControl(3), + discardWrongConversation(4), + differConvLinkDigests(5), + differConvServiceDigests(6), + differPortAlgorithms(7) + } + +DrcpState ::= TEXTUAL-CONVENTION + STATUS obsolete DESCRIPTION "Administrative values of DRCP state." SYNTAX BITS { @@ -96,14 +128,14 @@ DrcpState ::= TEXTUAL-CONVENTION neighborGateway(1), otherGateway(2), ippActivity(3), - timeout(4), + timeout(4), gatewaySync(5), portSync(6), expired(7) } ChurnState ::= TEXTUAL-CONVENTION - STATUS current + STATUS deprecated DESCRIPTION "The state of the Churn Detection machine." SYNTAX INTEGER { @@ -123,16 +155,16 @@ AggState ::= TEXTUAL-CONVENTION DrniConvAdminGatewayList ::= TEXTUAL-CONVENTION DISPLAY-HINT "1x," - STATUS current + STATUS obsolete DESCRIPTION "The three elements of the octet string represent the three portal system numbers in order of priority with highest priority first." SYNTAX OCTET STRING (SIZE (3)) - + PortalLinkList ::= TEXTUAL-CONVENTION DISPLAY-HINT "4d," - STATUS current + STATUS obsolete DESCRIPTION "Each four octets of the octet string represent an ifIndex for an Intra-Port Link. The first ifIndex is @@ -140,18 +172,14 @@ PortalLinkList ::= TEXTUAL-CONVENTION System 2 and the third ifIndex is to portal System 3. The ifIndex of the current portal system is set to zero." SYNTAX OCTET STRING (SIZE (12)) - + ServiceIdList ::= TEXTUAL-CONVENTION DISPLAY-HINT "4d," STATUS current DESCRIPTION - "A list which contains, in general, a set of Service IDs - (8.2.2). If the Service IDs are representing VIDs, only a - single VID is applicable, while in the case that Service IDs - are representing I-SIDs, more than one I-SIDs are possible. - Each four octets represent a Service ID which may either be - I-SID or VID. An empty set is represented as an octet string - of size zero." + "A list which contains, in general, a set of 32-bit values + interpreted as Service Identifiers. An empty set is represented + as an octet string of size zero." SYNTAX OCTET STRING -- ------------------------------------------------------------- @@ -248,7 +276,6 @@ dot3adAggIndex OBJECT-TYPE "7.3.1.1.1" ::= { dot3adAggEntry 1 } - dot3adAggMACAddress OBJECT-TYPE SYNTAX MacAddress MAX-ACCESS read-only @@ -260,19 +287,17 @@ dot3adAggMACAddress OBJECT-TYPE "7.3.1.1.9" ::= { dot3adAggEntry 2 } - dot3adAggActorSystemPriority OBJECT-TYPE SYNTAX Integer32 (0..65535) MAX-ACCESS read-write STATUS current DESCRIPTION "A 2-octet read-write value indicating the priority value - associated with the Actor's System ID." + associated with the Actor's System Identifier." REFERENCE "7.3.1.1.5" ::= { dot3adAggEntry 3 } - dot3adAggActorSystemID OBJECT-TYPE SYNTAX MacAddress MAX-ACCESS read-write @@ -293,13 +318,12 @@ dot3adAggActorSystemID OBJECT-TYPE permit a single piece of equipment to be configured by management to contain more than one System from the point of view of the operation of Link Aggregation. This - may be of particular use in the configuration of + can be of particular use in the configuration of equipment that has limited aggregation capability (see 6.7)." REFERENCE "7.3.1.1.4" ::= { dot3adAggEntry 4 } - dot3adAggAggregateOrIndividual OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-only @@ -312,35 +336,27 @@ dot3adAggAggregateOrIndividual OBJECT-TYPE "7.3.1.1.6" ::= { dot3adAggEntry 5 } - dot3adAggActorAdminKey OBJECT-TYPE SYNTAX LacpKey MAX-ACCESS read-write STATUS current DESCRIPTION "The current administrative value of the Key for the - Aggregator. The administrative Key value may differ from the + Aggregator. The administrative Key value can differ from the operational Key value for the reasons discussed in 6.7.2. This is a 16-bit read-write value. The meaning of particular Key - values is of local significance. For an Aggregator that is - associated with a Portal, the aAggActorAdminKey has to be - different for each Portal System. Specifically the two most - significant bits are set to aDrniPortalSystemNumber - (7.4.1.1.7). The lower 14 bits may be any value, have - to be the same in each Portal System within the same Portal, - and have a default of zero." + values is of local significance." REFERENCE "7.3.1.1.7" ::= { dot3adAggEntry 6 } - dot3adAggActorOperKey OBJECT-TYPE SYNTAX LacpKey MAX-ACCESS read-only STATUS current DESCRIPTION "The current operational value of the Key for the Aggregator. - The administrative Key value may differ from the operational + The administrative Key value can differ from the operational Key value for the reasons discussed in 6.7.2. This is a 16-bit read-only value. The meaning of particular Key values is of local significance." @@ -348,7 +364,6 @@ dot3adAggActorOperKey OBJECT-TYPE "7.3.1.1.8" ::= { dot3adAggEntry 7 } - dot3adAggPartnerSystemID OBJECT-TYPE SYNTAX MacAddress MAX-ACCESS read-only @@ -357,13 +372,12 @@ dot3adAggPartnerSystemID OBJECT-TYPE "A 6-octet read-only MAC address value consisting of the unique identifier for the current protocol Partner of this Aggregator. A value of zero indicates that there is no known - Partner. If the aggregation is manually configured, this + Partner. If the aggregation is manually configured, this System ID value will be a value assigned by the local System." REFERENCE "7.3.1.1.10" ::= { dot3adAggEntry 8 } - dot3adAggPartnerSystemPriority OBJECT-TYPE SYNTAX Integer32 (0..65535) MAX-ACCESS read-only @@ -377,7 +391,6 @@ dot3adAggPartnerSystemPriority OBJECT-TYPE "7.3.1.1.11" ::= { dot3adAggEntry 9 } - dot3adAggPartnerOperKey OBJECT-TYPE SYNTAX LacpKey MAX-ACCESS read-only @@ -391,7 +404,6 @@ dot3adAggPartnerOperKey OBJECT-TYPE "7.3.1.1.12" ::= { dot3adAggEntry 10 } - dot3adAggCollectorMaxDelay OBJECT-TYPE SYNTAX Integer32 (0..65535) MAX-ACCESS read-write @@ -399,7 +411,7 @@ dot3adAggCollectorMaxDelay OBJECT-TYPE DESCRIPTION "The value of this 16-bit read-write attribute defines the maximum delay, in tens of microseconds, that - may be imposed by the Frame Collector between + can be imposed by the Frame Collector between receiving a frame from an Aggregator Parser, and either delivering the frame to its Aggregator Client or discarding the frame (see 6.2.3.1.1)." @@ -411,8 +423,6 @@ dot3adAggCollectorMaxDelay OBJECT-TYPE -- The Aggregation Port List Table -- ------------------------------------------------------------- - - dot3adAggPortListTable OBJECT-TYPE SYNTAX SEQUENCE OF Dot3adAggPortListEntry MAX-ACCESS not-accessible @@ -528,8 +538,22 @@ Dot3adAggXEntry ::= TruthValue, dot3adAggPartnerAdminConvServiceMappingDigest OCTET STRING, - dot3adAggAdminDiscardWrongConversation2 - INTEGER + dot3adAggAdminDiscardWrongConversation2 + INTEGER, + dot3adAggOperDiscardWrongConversation + TruthValue, + dot3adAggConvLinkDigest + OCTET STRING, + dot3adAggConvServiceDigest + OCTET STRING, + dot3adAggPartnerPortAlgorithm + OCTET STRING, + dot3adAggPartnerConvLinkDigest + OCTET STRING, + dot3adAggPartnerConvServiceDigest + OCTET STRING, + dot3adAggActiveLinks + OCTET STRING } dot3adAggDescription OBJECT-TYPE @@ -591,7 +615,7 @@ dot3adAggOperState OBJECT-TYPE ::= { dot3adAggXEntry 4 } dot3adAggTimeOfLastOperChange OBJECT-TYPE - SYNTAX Integer32 + SYNTAX Integer32 MAX-ACCESS read-only STATUS current DESCRIPTION @@ -603,8 +627,8 @@ dot3adAggTimeOfLastOperChange OBJECT-TYPE zero. The ifLastChange object in the Interfaces MIB defined in IETF RFC 2863 is a suitable object for supplying a value for aAggTimeOfLastOperChange. This value is read-only. - Note - aAggTimeOfLastOperChange was defined in terms of - the aTimeSinceSystemReset variable of IEEE Std 802.3-2008, + Note - aAggTimeOfLastOperChange was defined in terms of + the aTimeSinceSystemReset variable of IEEE Std 802.3-2018, F.2.1, in earlier versions of this standard. aTimeSinceSystemReset and ifLastChange have the same meaning." REFERENCE @@ -622,7 +646,7 @@ dot3adAggDataRate OBJECT-TYPE REFERENCE "7.3.1.1.16" ::= { dot3adAggXEntry 6 } - + dot3adAggOctetsTxOK OBJECT-TYPE SYNTAX Counter64 UNITS @@ -693,7 +717,7 @@ dot3adAggFramesRxOK OBJECT-TYPE REFERENCE "7.3.1.1.20" ::= { dot3adAggXEntry 10 } - + dot3adAggMulticastFramesTxOK OBJECT-TYPE SYNTAX Counter64 UNITS @@ -853,7 +877,7 @@ dot3adAggUnknownProtocolFrames OBJECT-TYPE REFERENCE "7.3.1.1.29" ::= { dot3adAggXEntry 19 } - + dot3adAggLinkUpDownNotificationEnable OBJECT-TYPE SYNTAX INTEGER { enabled(1), @@ -887,31 +911,35 @@ dot3adAggPortAlgorithm OBJECT-TYPE dot3adAggPartnerAdminPortAlgorithm OBJECT-TYPE SYNTAX OCTET STRING (SIZE (4)) MAX-ACCESS read-write - STATUS current + STATUS deprecated DESCRIPTION "This object identifies the value for the algorithm of the - Partner System, assigned by administrator or System policy + Partner System, administratively assigned for use when the Partner's information is unknown. Table 6-4 provides the IEEE 802.1 OUI (00-80-C2) Port Algorithm - encodings. Its default value is set to the 'Unspecified' value - in Table 6-4. A SEQUENCE OF OCTETS consisting of a 3-octet OUI - or CID and one following octet." + encodings. Its default value is set to the + 'Unspecified' value in Table 6-4. A SEQUENCE OF OCTETS + consisting of a 3-octet OUI or CID and one following octet. + This parameter was eliminated because there was no reason for + it ever to have a value different from the default value." REFERENCE - "7.3.1.1.34" + "7.3.1.1.34 of IEEE Std 802.1AX-2014" DEFVAL { '0080C200'H } ::= { dot3adAggXEntry 22 } dot3adAggPartnerAdminPortConversationListDigest OBJECT-TYPE SYNTAX OCTET STRING (SIZE (16)) MAX-ACCESS read-write - STATUS current + STATUS deprecated DESCRIPTION "The value for the digest of the prioritized Port Conversation - ID-to-Link Number ID assignments of the Partner System, assigned - by administrator or System policy for use when the Partner's - information is unknown. Its default value is set to NULL." + ID-to-Link Number assignments of the Partner System, + administratively assigned for use when the Partner's + information is unknown. Its default value is set to NULL. + This parameter was eliminated because there was no reason for + it ever to have a value different from the default value." REFERENCE - "7.3.1.1.36" + "7.3.1.1.36 of IEEE Std 802.1AX-2014" DEFVAL { ''H } ::= { dot3adAggXEntry 23 } @@ -921,56 +949,141 @@ dot3adAggAdminDiscardWrongConversation OBJECT-TYPE STATUS deprecated DESCRIPTION "The administrative value that determines what the Aggregator - does with a frame that is received from an Aggregation Port - with a Port Conversation ID that is not included in the + does with a frame that is received from an Aggregation Port + with a Port Conversation ID that is not included in the Collection_Conversation_Mask. The value 'TRUE' indicates that - such frames are to be discarded, and the value 'FALSE' that - they are to be forwarded. This variable needs to be set to - 'TRUE', if bidirectional congruity (8.2.1) is required. Its - value is set to 'TRUE' by default. - This object has been replaced by - dot3adAggAdminDiscardWrongConversation2." + such frames are to be discarded, and the value 'FALSE' that + they are to be forwarded. This variable needs to be set to + 'TRUE', if bidirectional congruity (8.2.1) is required. Its + value is set to 'TRUE' by default. + This object has been replaced by + dot3adAggAdminDiscardWrongConversation2." REFERENCE - "7.3.1.1.37" - ::= { dot3adAggXEntry 24 } + "7.3.1.1.37 of IEEE Std 802.1AX-2014" + ::= { dot3adAggXEntry 24 } dot3adAggPartnerAdminConvServiceMappingDigest OBJECT-TYPE SYNTAX OCTET STRING (SIZE (16)) - MAX-ACCESS read-write - STATUS current + MAX-ACCESS read-write + STATUS deprecated DESCRIPTION "The value for the digest of the Port Conversation ID-to-Service ID assignments of the Partner System, assigned by administrator - or System policy for use when the Partner's information is unknown. - Its default value is set to NULL." + or System policy for use when the Partner's information is + unknown. Its default value is set to NULL. + This parameter was eliminated because there was no reason for + it ever to have a value different from the default value." REFERENCE - "7.3.1.1.39" + "7.3.1.1.39 of IEEE Std 802.1AX-2014" DEFVAL { ''H } ::= { dot3adAggXEntry 25 } - + dot3adAggAdminDiscardWrongConversation2 OBJECT-TYPE SYNTAX INTEGER { - forceTrue(1), - forceFalse(2), - auto(3) - } + forceTrue(1), + forceFalse(2), + auto(3) + } MAX-ACCESS read-write STATUS current DESCRIPTION "The administrative value that determines whether an Aggregator - discards a frame that is received from an Aggregation Port - with a Port Conversation ID that is not included in the - Collection_Conversation_Mask. The value 'forceTrue' - indicates that such frames are to be discarded, the value - 'forceFalse' indicates that such frames are to be forwarded, - and the value 'auto' indicates that such frames are to be - forwarded only whe the actor and partner agree on the - algorithms and mapping tables used to map frames to - Aggregation Ports. Its value is set to 'auto' by default." + discards a frame that is received from an Aggregation Port + with a Port Conversation ID that has a value of FALSE in the + Port_Oper_Conversation_Mask. The value 'forceTrue' + indicates that such frames are to be discarded, the value + 'forceFalse' indicates that such frames are to be + forwarded, and the value 'auto' indicates that such frames + are to be forwarded only when the actor and partner agree + on the algorithms and mapping tables used to map frames to + Aggregation Ports. Its value is set to 'auto' by default." + REFERENCE + "7.3.1.1.35" + DEFVAL { auto } + ::= { dot3adAggXEntry 26 } + +dot3adAggOperDiscardWrongConversation OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The operational value that determines whether the Aggregator + discards a frame that is received from an Aggregation Port + with a Port Conversation ID that has a value of FALSE in the + Port_Oper_Conversation_Mask." REFERENCE "7.3.1.1.37" - DEFVAL { auto } - ::= { dot3adAggXEntry 26 } + ::= { dot3adAggXEntry 27 } + +dot3adAggConvLinkDigest OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The value for the MD5 digest of aAggAdminConvLinkMap + (7.3.1.1.34)." + REFERENCE + "7.3.1.1.38" + ::= { dot3adAggXEntry 28 } + +dot3adAggConvServiceDigest OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The value for the MD5 digest of aAggAdminConvServiceMap + (7.3.1.1.36)." + REFERENCE + "7.3.1.1.39" + ::= { dot3adAggXEntry 29 } + +dot3adAggPartnerPortAlgorithm OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (4)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This object identifies the algorithm used by the Partner + Aggregator to assign frames to a Port Conversation ID. + A SEQUENCE OF OCTETS consisting of a 3-octet OUI or CID + and one following octet." + REFERENCE + "7.3.1.1.40" + ::= { dot3adAggXEntry 30 } + +dot3adAggPartnerConvLinkDigest OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The value for the MD5 digest of the aAggAdminConvLinkMap + (7.3.1.1.34) in use by the LACP Partner." + REFERENCE + "7.3.1.1.41" + ::= { dot3adAggXEntry 31 } + +dot3adAggPartnerConvServiceDigest OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The value for the MD5 digest of the aAggAdminConvServiceMap + (7.3.1.1.36) in use by the LACP Partner." + REFERENCE + "7.3.1.1.42" + ::= { dot3adAggXEntry 32 } + +dot3adAggActiveLinks OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Each two octets of the octet string represent the operational + Link_Number of an Aggregation Port that is currently active + on the Aggregator. An octet string of size zero indicates that + there are no links currently active on the Aggregator." + REFERENCE + "7.3.1.1.43" + ::= { dot3adAggXEntry 33 } -- ------------------------------------------------------------- -- The Aggregation Conversation Admin Link Table @@ -981,26 +1094,18 @@ dot3adAggConversationAdminLinkTable OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - "There are 4096 aAggConversationAdminPort[] variables, - aAggConversationAdminLink[0] through - aAggConversationAdminLink[4095], indexed by Port Conversation - ID. Each contains administrative values of the link selection - priority list for the referenced Port Conversation ID. This - selection priority list is a sequence of Link-Number IDs for + "There are 4096 entries in the table, indexed by + Port Conversation ID. + Each contains administrative values of the link selection + preference list for the referenced Port Conversation ID. This + selection preference list is a sequence of Link-Numbers for each Port Conversation ID, in the order of preference, highest to lowest, for the corresponding link to carry that Port Conversation ID. A 16-bit zero value is used to indicate that no link is assigned to carry the associated Port - Conversation ID. NOTE - This mapping of Port Conversation - IDs to Link Number IDs is the fundamental administrative input. - An equivalent mapping of Port Conversation IDs to Port - IDs [Conversation_PortList[]] is derived from this and - used internally. NOTE - When a network administrator - issues a command for selection rules, provided by - aAggConversationAdminLink[], the ChangeActorOperDist is set as - specified in 6.6.2.2." + Conversation ID." REFERENCE - "7.3.1.1.35" + "7.3.1.1.34" ::= { dot3adAgg 4 } dot3adAggConversationAdminLinkEntry OBJECT-TYPE @@ -1009,19 +1114,18 @@ dot3adAggConversationAdminLinkEntry OBJECT-TYPE STATUS current DESCRIPTION "An entry contains administrative values of the link selection - priority list for the referenced Port Conversation ID. This - selection priority list is a sequence of Link-Number IDs for + preference list for the referenced Port Conversation ID. This + selection preference list is a sequence of Link-Numbers for each Port Conversation ID, in the order of preference, highest to lowest, for the corresponding link to carry that Port Conversation ID. A 16 bit zero value is used to indicate that no link is assigned to carry the associated Port Conversation ID." REFERENCE - "7.3.1.1.35" + "7.3.1.1.34" INDEX { dot3adAggConversationAdminLinkId, dot3adAggIndex} ::= { dot3adAggConversationAdminLinkTable 1 } - Dot3adAggConversationAdminLinkEntry ::= SEQUENCE { dot3adAggConversationAdminLinkId @@ -1038,41 +1142,36 @@ dot3adAggConversationAdminLinkId OBJECT-TYPE "An identifier for Port Conversation." ::= { dot3adAggConversationAdminLinkEntry 1 } - dot3adAggConversationAdminLinkList OBJECT-TYPE SYNTAX OCTET STRING MAX-ACCESS read-write STATUS current DESCRIPTION "Each two octets of the octet string represent the agreed - Link Number ID that is assigned to an Aggregation Port + Link Number that is assigned to an Aggregation Port (7.3.2.1.27). The list is in the order of preference, highest to lowest, for corresponding preferred link to carry that Port Conversation ID." REFERENCE - "7.3.1.1.35" + "7.3.1.1.34" ::= { dot3adAggConversationAdminLinkEntry 2 } -- ------------------------------------------------------------- -- The Aggregation Admin Service Conversation Map Table -- ------------------------------------------------------------- - + dot3adAggAdminServiceConversationMapTable OBJECT-TYPE SYNTAX SEQUENCE OF Dot3adAggAdminServiceConversationMapEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION - "There are 4096 aAggAdminServiceConversationMap[] variables, - aAggAdminServiceConversationMap[0] through - aAggAdminServiceConversationMap[4095], indexed by Port - Conversation ID. Each contains, in general, a set of Service - IDs (8.2.2), unique within the array. If the Service IDs are - representing VIDs, only a single VID is used, while in the case - that Service IDs are representing I-SIDs, more than one I-SIDs - are possible. Service IDs not contained in the map are not + "There are 4096 entries in the table, indexed by Port + Conversation ID. Each contains, in general, a set of + 32-bit values interpreted as Service Identifiers. + Service IDs not contained in the map are not mapped to any Port Conversation ID and will be discarded." REFERENCE - "7.3.1.1.38" + "7.3.1.1.36" ::= { dot3adAgg 5 } dot3adAggAdminServiceConversationMapEntry OBJECT-TYPE @@ -1080,18 +1179,13 @@ dot3adAggAdminServiceConversationMapEntry OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - "An entry contains, in general, a set of Service IDs (8.2.2), - unique within the array. If the Service IDs are representing - VIDs, only a single VID is applicable, while in the case that - Service IDs are representing I-SIDs, more than one I-SIDs are - possible." + "An entry contains, in general, a set of Service IDs, + unique within the array." REFERENCE - "7.3.1.1.38" + "7.3.1.1.36" INDEX { dot3adAggAdminServiceConversationMapId, dot3adAggIndex } ::= { dot3adAggAdminServiceConversationMapTable 1 } - - Dot3adAggAdminServiceConversationMapEntry ::= SEQUENCE { dot3adAggAdminServiceConversationMapId @@ -1114,11 +1208,12 @@ dot3adAggAdminServiceConversationServiceIDList OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "A list contains, in general, a set of Service IDs (8.2.2), + "A list contains, in general, a set of Service IDs, unique within the array." + REFERENCE + "7.3.1.1.36" ::= { dot3adAggAdminServiceConversationMapEntry 2} - -- ------------------------------------------------------------- -- The Aggregation Port Table -- ------------------------------------------------------------- @@ -1136,7 +1231,6 @@ dot3adAggPortTable OBJECT-TYPE "7.3.2" ::= { dot3adAggPort 1 } - dot3adAggPortEntry OBJECT-TYPE SYNTAX Dot3adAggPortEntry MAX-ACCESS not-accessible @@ -1147,7 +1241,6 @@ dot3adAggPortEntry OBJECT-TYPE INDEX { dot3adAggPortIndex } ::= { dot3adAggPortTable 1 } - Dot3adAggPortEntry ::= SEQUENCE { dot3adAggPortIndex @@ -1200,7 +1293,6 @@ Dot3adAggPortEntry ::= TruthValue } - dot3adAggPortIndex OBJECT-TYPE SYNTAX InterfaceIndex MAX-ACCESS not-accessible @@ -1215,7 +1307,6 @@ dot3adAggPortIndex OBJECT-TYPE "7.3.2.1.1" ::= { dot3adAggPortEntry 1 } - dot3adAggPortActorSystemPriority OBJECT-TYPE SYNTAX Integer32 (0..65535) MAX-ACCESS read-write @@ -1227,20 +1318,18 @@ dot3adAggPortActorSystemPriority OBJECT-TYPE "7.3.2.1.2" ::= { dot3adAggPortEntry 2 } - dot3adAggPortActorSystemID OBJECT-TYPE SYNTAX MacAddress MAX-ACCESS read-only STATUS current DESCRIPTION "A 6-octet read-only MAC address value that defines the - value of the System ID for the System that contains this + value of the System ID for the System that contains this Aggregation Port." REFERENCE "7.3.2.1.3" ::= { dot3adAggPortEntry 3 } - dot3adAggPortActorAdminKey OBJECT-TYPE SYNTAX LacpKey MAX-ACCESS read-write @@ -1253,8 +1342,6 @@ dot3adAggPortActorAdminKey OBJECT-TYPE "7.3.2.1.4" ::= { dot3adAggPortEntry 4 } - - dot3adAggPortActorOperKey OBJECT-TYPE SYNTAX LacpKey MAX-ACCESS read-only @@ -1267,8 +1354,6 @@ dot3adAggPortActorOperKey OBJECT-TYPE "7.3.2.1.5" ::= { dot3adAggPortEntry 5 } - - dot3adAggPortPartnerAdminSystemPriority OBJECT-TYPE SYNTAX Integer32 (0..65535) MAX-ACCESS read-write @@ -1284,8 +1369,6 @@ dot3adAggPortPartnerAdminSystemPriority OBJECT-TYPE "7.3.2.1.6" ::= { dot3adAggPortEntry 6 } - - dot3adAggPortPartnerOperSystemPriority OBJECT-TYPE SYNTAX Integer32 (0..65535) MAX-ACCESS read-only @@ -1293,15 +1376,13 @@ dot3adAggPortPartnerOperSystemPriority OBJECT-TYPE DESCRIPTION "A 2-octet read-only value indicating the operational value of priority associated with the Partner's System ID. The - value of this attribute may contain the manually configured + value of this attribute contains the manually configured value carried in aAggPortPartnerAdminSystemPriority if there is no protocol Partner." REFERENCE "7.3.2.1.7" ::= { dot3adAggPortEntry 7 } - - dot3adAggPortPartnerAdminSystemID OBJECT-TYPE SYNTAX MacAddress MAX-ACCESS read-write @@ -1318,7 +1399,6 @@ dot3adAggPortPartnerAdminSystemID OBJECT-TYPE "7.3.2.1.8" ::= { dot3adAggPortEntry 8 } - dot3adAggPortPartnerOperSystemID OBJECT-TYPE SYNTAX MacAddress MAX-ACCESS read-only @@ -1327,14 +1407,13 @@ dot3adAggPortPartnerOperSystemID OBJECT-TYPE "A 6-octet read-only MACAddress value representing the current value of the Aggregation Port's protocol Partner's System ID. A value of zero indicates that there is no known - protocol Partner. The value of this attribute may contain the + protocol Partner. The value of this attribute contains the manually configured value carried in aAggPortPartnerAdminSystemID if there is no protocol Partner." REFERENCE "7.3.2.1.9" ::= { dot3adAggPortEntry 9 } - dot3adAggPortPartnerAdminKey OBJECT-TYPE SYNTAX LacpKey MAX-ACCESS read-write @@ -1351,14 +1430,13 @@ dot3adAggPortPartnerAdminKey OBJECT-TYPE "7.3.2.1.10" ::= { dot3adAggPortEntry 10 } - dot3adAggPortPartnerOperKey OBJECT-TYPE SYNTAX LacpKey MAX-ACCESS read-only STATUS current DESCRIPTION "The current operational value of the Key for the - protocol Partner. The value of this attribute may contain + protocol Partner. The value of this attribute contains the manually configured value carried in aAggPortPartnerAdminKey if there is no protocol Partner. This is a 16-bit read-only value." @@ -1366,7 +1444,6 @@ dot3adAggPortPartnerOperKey OBJECT-TYPE "7.3.2.1.11" ::= { dot3adAggPortEntry 11 } - dot3adAggPortSelectedAggID OBJECT-TYPE SYNTAX InterfaceIndex MAX-ACCESS read-only @@ -1382,7 +1459,6 @@ dot3adAggPortSelectedAggID OBJECT-TYPE "7.3.2.1.12" ::= { dot3adAggPortEntry 12 } - dot3adAggPortAttachedAggID OBJECT-TYPE SYNTAX InterfaceIndex MAX-ACCESS read-only @@ -1396,7 +1472,6 @@ dot3adAggPortAttachedAggID OBJECT-TYPE "7.3.2.1.13" ::= { dot3adAggPortEntry 13 } - dot3adAggPortActorPort OBJECT-TYPE SYNTAX Integer32 (0..65535) MAX-ACCESS read-only @@ -1409,23 +1484,17 @@ dot3adAggPortActorPort OBJECT-TYPE "7.3.2.1.14" ::= { dot3adAggPortEntry 14 } - dot3adAggPortActorPortPriority OBJECT-TYPE SYNTAX Integer32 (0..65535) MAX-ACCESS read-write STATUS current DESCRIPTION "The priority value assigned to this Aggregation Port. - This 16-bit value is read-write. NOTE-In the case of DRNI - (Clause 9), the two least significant bits of the priority - for each Aggregation Port in a Distributed Relay's Aggregator - Port will be ignored because these bits are used to encode - the Portal System Number [item e) in 9.3.3]." + This 16-bit value is read-write." REFERENCE "7.3.2.1.15" ::= { dot3adAggPortEntry 15 } - dot3adAggPortPartnerAdminPort OBJECT-TYPE SYNTAX Integer32 (0..65535) MAX-ACCESS read-write @@ -1442,7 +1511,6 @@ dot3adAggPortPartnerAdminPort OBJECT-TYPE "7.3.2.1.16" ::= { dot3adAggPortEntry 16 } - dot3adAggPortPartnerOperPort OBJECT-TYPE SYNTAX Integer32 (0..65535) MAX-ACCESS read-only @@ -1450,14 +1518,13 @@ dot3adAggPortPartnerOperPort OBJECT-TYPE DESCRIPTION "The operational port number assigned to this Aggregation Port by the Aggregation Port's protocol Partner. The value - of this attribute may contain the manually configured value + of this attribute contains the manually configured value carried in aAggPortPartnerAdminPort if there is no protocol Partner. This 16-bit value is read-only." REFERENCE "7.3.2.1.17" ::= { dot3adAggPortEntry 17 } - dot3adAggPortPartnerAdminPortPriority OBJECT-TYPE SYNTAX Integer32 (0..65535) MAX-ACCESS read-write @@ -1474,14 +1541,13 @@ dot3adAggPortPartnerAdminPortPriority OBJECT-TYPE "7.3.2.1.18" ::= { dot3adAggPortEntry 18 } - dot3adAggPortPartnerOperPortPriority OBJECT-TYPE SYNTAX Integer32 (0..65535) MAX-ACCESS read-only STATUS current DESCRIPTION "The priority value assigned to this Aggregation Port - by the Partner. The value of this attribute may contain the + by the Partner. The value of this attribute contains the manually configured value carried in aAggPortPartnerAdminPortPriority if there is no protocol Partner. This 16-bit value is read-only." @@ -1489,30 +1555,28 @@ dot3adAggPortPartnerOperPortPriority OBJECT-TYPE "7.3.2.1.19" ::= { dot3adAggPortEntry 19 } - dot3adAggPortActorAdminState OBJECT-TYPE SYNTAX LacpState MAX-ACCESS read-write STATUS current DESCRIPTION "A string of 8 bits, corresponding to the administrative - values of Actor_State (5.4.2) as transmitted by the Actor - in LACPDUs. The first bit corresponds to bit 0 of Actor_State - (LACP_Activity), the second bit corresponds to bit 1 - (LACP_Timeout), the third bit corresponds to bit 2 + values of the Actor state (Figure 6-9) as transmitted by the + Actor in LACPDUs. The first bit corresponds to bit 0 of the + Actor_State (LACP_Activity), the second bit corresponds to + bit 1 (Short_Timeout), the third bit corresponds to bit 2 (Aggregation), the fourth bit corresponds to bit 3 (Synchronization), the fifth bit corresponds to bit 4 (Collecting), the sixth bit corresponds to bit 5 (Distributing), the seventh bit corresponds to bit 6 (Defaulted), and the eighth bit corresponds to bit 7 (Expired). These values allow administrative control over - the values of LACP_Activity, LACP_Timeout and Aggregation. + the values of LACP_Activity, Short_Timeout and Aggregation. This attribute value is read-write." REFERENCE "7.3.2.1.20" ::= { dot3adAggPortEntry 20 } - dot3adAggPortActorOperState OBJECT-TYPE SYNTAX LacpState MAX-ACCESS read-only @@ -1521,12 +1585,11 @@ dot3adAggPortActorOperState OBJECT-TYPE "A string of 8 bits, corresponding to the current operational values of Actor_State as transmitted by the Actor in LACPDUs. The bit allocations are as defined in - 7.3.2.1.20. This attribute value is read-only." + Figure 6-9. This attribute value is read-only." REFERENCE "7.3.2.1.21" ::= { dot3adAggPortEntry 21 } - dot3adAggPortPartnerAdminState OBJECT-TYPE SYNTAX LacpState MAX-ACCESS read-write @@ -1534,14 +1597,13 @@ dot3adAggPortPartnerAdminState OBJECT-TYPE DESCRIPTION "A string of 8 bits, corresponding to the current administrative value of Actor_State for the protocol Partner. - The bit allocations are as defined in 7.3.2.1.20. This + The bit allocations are as defined in Figure 6-9. This attribute value is read-write. The assigned value is used in order to achieve manually configured aggregation." REFERENCE "7.3.2.1.22" ::= { dot3adAggPortEntry 22 } - dot3adAggPortPartnerOperState OBJECT-TYPE SYNTAX LacpState MAX-ACCESS read-only @@ -1550,14 +1612,13 @@ dot3adAggPortPartnerOperState OBJECT-TYPE "A string of 8 bits, corresponding to the current values of Actor_State in the most recently received LACPDU transmitted by the protocol Partner. The bit allocations are as defined in - 7.3.2.1.20. In the absence of an active protocol Partner, this - value may reflect the manually configured value + Figure 6-9. In the absence of an active protocol Partner, this + value reflects the manually configured value aAggPortPartnerAdminState. This attribute value is read-only." REFERENCE "7.3.2.1.23" ::= { dot3adAggPortEntry 23 } - dot3adAggPortAggregateOrIndividual OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-only @@ -1570,12 +1631,10 @@ dot3adAggPortAggregateOrIndividual OBJECT-TYPE "7.3.2.1.24" ::= { dot3adAggPortEntry 24 } - -- ------------------------------------------------------------- -- LACP Statistics Table -- ------------------------------------------------------------- - dot3adAggPortStatsTable OBJECT-TYPE SYNTAX SEQUENCE OF Dot3adAggPortStatsEntry MAX-ACCESS not-accessible @@ -1588,7 +1647,6 @@ dot3adAggPortStatsTable OBJECT-TYPE "7.3.3" ::= { dot3adAggPort 2 } - dot3adAggPortStatsEntry OBJECT-TYPE SYNTAX Dot3adAggPortStatsEntry MAX-ACCESS not-accessible @@ -1599,7 +1657,6 @@ dot3adAggPortStatsEntry OBJECT-TYPE INDEX { dot3adAggPortIndex } ::= { dot3adAggPortStatsTable 1 } - Dot3adAggPortStatsEntry ::= SEQUENCE { dot3adAggPortStatsLACPDUsRx @@ -1620,7 +1677,6 @@ Dot3adAggPortStatsEntry ::= Counter32 } - dot3adAggPortStatsLACPDUsRx OBJECT-TYPE SYNTAX Counter32 MAX-ACCESS read-only @@ -1632,7 +1688,6 @@ dot3adAggPortStatsLACPDUsRx OBJECT-TYPE "7.3.3.1.2" ::= { dot3adAggPortStatsEntry 1 } - dot3adAggPortStatsMarkerPDUsRx OBJECT-TYPE SYNTAX Counter32 MAX-ACCESS read-only @@ -1644,7 +1699,6 @@ dot3adAggPortStatsMarkerPDUsRx OBJECT-TYPE "7.3.3.1.3" ::= { dot3adAggPortStatsEntry 2 } - dot3adAggPortStatsMarkerResponsePDUsRx OBJECT-TYPE SYNTAX Counter32 MAX-ACCESS read-only @@ -1656,41 +1710,37 @@ dot3adAggPortStatsMarkerResponsePDUsRx OBJECT-TYPE "7.3.3.1.4" ::= { dot3adAggPortStatsEntry 3 } - dot3adAggPortStatsUnknownRx OBJECT-TYPE SYNTAX Counter32 MAX-ACCESS read-only STATUS current DESCRIPTION "The number of frames received that either: - - carry the Slow Protocols Ethernet Type value - (IEEE Std 802.3-2008, Annex 57A.4), but + - carry the Slow Protocols EtherType value + (IEEE Std 802.3-2018, Annex 57A.4), but contain an unknown PDU, or: - are addressed to the Slow Protocols group MAC - Address (IEEE Std 802.3-2008, Annex 57A.3), - but do not carry the Slow Protocols Ethernet - Type. + Address (IEEE Std 802.3-2018, Annex 57A.3), + but do not carry the Slow Protocols EtherType. This value is read-only." REFERENCE "7.3.3.1.5" ::= { dot3adAggPortStatsEntry 4 } - dot3adAggPortStatsIllegalRx OBJECT-TYPE SYNTAX Counter32 MAX-ACCESS read-only STATUS current DESCRIPTION "The number of frames received that carry the Slow - Protocols Ethernet Type value (IEEE Std 802.3-2008, + Protocols Ethernet Type value (IEEE Std 802.3-2018, Annex 57A.4), but contain a badly formed PDU or an illegal value of Protocol Subtype (IEEE Std - 802.3-2008, Annex 57A.3). This value is read-only." + 802.3-2018, Annex 57A.3). This value is read-only." REFERENCE "7.3.3.1.6" ::= { dot3adAggPortStatsEntry 5 } - dot3adAggPortStatsLACPDUsTx OBJECT-TYPE SYNTAX Counter32 MAX-ACCESS read-only @@ -1702,7 +1752,6 @@ dot3adAggPortStatsLACPDUsTx OBJECT-TYPE "7.3.3.1.7" ::= { dot3adAggPortStatsEntry 6 } - dot3adAggPortStatsMarkerPDUsTx OBJECT-TYPE SYNTAX Counter32 MAX-ACCESS read-only @@ -1714,7 +1763,6 @@ dot3adAggPortStatsMarkerPDUsTx OBJECT-TYPE "7.3.3.1.8" ::= { dot3adAggPortStatsEntry 7 } - dot3adAggPortStatsMarkerResponsePDUsTx OBJECT-TYPE SYNTAX Counter32 MAX-ACCESS read-only @@ -1726,7 +1774,6 @@ dot3adAggPortStatsMarkerResponsePDUsTx OBJECT-TYPE "7.3.3.1.9" ::= { dot3adAggPortStatsEntry 8 } - -- ------------------------------------------------------------- -- LACP Debug Table -- ------------------------------------------------------------- @@ -1743,7 +1790,6 @@ dot3adAggPortDebugTable OBJECT-TYPE "7.3.4" ::= { dot3adAggPort 3 } - dot3adAggPortDebugEntry OBJECT-TYPE SYNTAX Dot3adAggPortDebugEntry MAX-ACCESS not-accessible @@ -1753,7 +1799,6 @@ dot3adAggPortDebugEntry OBJECT-TYPE INDEX { dot3adAggPortIndex } ::= { dot3adAggPortDebugTable 1 } - Dot3adAggPortDebugEntry ::= SEQUENCE { dot3adAggPortDebugRxState @@ -1782,7 +1827,6 @@ Dot3adAggPortDebugEntry ::= Counter32 } - dot3adAggPortDebugRxState OBJECT-TYPE SYNTAX INTEGER { currentRx(1), @@ -1796,7 +1840,7 @@ dot3adAggPortDebugRxState OBJECT-TYPE STATUS current DESCRIPTION "This attribute holds the value 'currentRx' if the Receive - state machine for the Aggregation Port is in the + state machine for the Aggregation Port is in the CURRENT state, 'expired' if the Receive state machine is in the EXPIRED state, 'defaulted' if the Receive state machine is in the DEFAULTED state, 'initialize' if the @@ -1809,7 +1853,6 @@ dot3adAggPortDebugRxState OBJECT-TYPE "7.3.4.1.2" ::= { dot3adAggPortDebugEntry 1 } - dot3adAggPortDebugLastRxTime OBJECT-TYPE SYNTAX TimeTicks MAX-ACCESS read-only @@ -1821,14 +1864,13 @@ dot3adAggPortDebugLastRxTime OBJECT-TYPE defined in IETF RFC 2863 is a suitable object for supplying a value for aAggPortDebugLastRxTime. This value is read-only. NOTE - aAggPortDebugLastRxTime was defined in terms of the - aTimeSinceSystemReset variable of IEEE Std 802.3-2008, + aTimeSinceSystemReset variable of IEEE Std 802.3-2018, Annex F, F.2.1, in earlier versions of this standard. aTimeSinceSystemReset and ifLastChange have the same meaning." REFERENCE "7.3.4.1.3" ::= { dot3adAggPortDebugEntry 2 } - dot3adAggPortDebugMuxState OBJECT-TYPE SYNTAX INTEGER { detached(1), @@ -1836,7 +1878,9 @@ dot3adAggPortDebugMuxState OBJECT-TYPE attached(3), collecting(4), distributing(5), - collectingDistributing(6) + collectingDistributing(6), + attach(7), + attachedWtr(8) } MAX-ACCESS read-only STATUS current @@ -1849,15 +1893,18 @@ dot3adAggPortDebugMuxState OBJECT-TYPE state, 'collecting' if the Mux state machine for the Aggregation Port is in the COLLECTING state, 'distributing' if the Mux state machine for the Aggregation Port is - in the DISTRIBUTING state, and 'collectingDistributing' + in the DISTRIBUTING state, 'collectingDistributing' + if the Mux state machine for the Aggregation Port is in + the COLLECTING_DISTRIBUTING state, 'attach' + if the Mux state machine for the Aggregation Port is + in the ATTACH state, and 'attachedWtr' if the Mux state machine for the Aggregation Port is in - the COLLECTING_DISTRIBUTING state. + the ATTACHED_WTR state. This value is read-only." REFERENCE "7.3.4.1.4" ::= { dot3adAggPortDebugEntry 3 } - dot3adAggPortDebugMuxReason OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only @@ -1870,27 +1917,27 @@ dot3adAggPortDebugMuxReason OBJECT-TYPE "7.3.4.1.5" ::= { dot3adAggPortDebugEntry 4 } - dot3adAggPortDebugActorChurnState OBJECT-TYPE SYNTAX ChurnState MAX-ACCESS read-only - STATUS current + STATUS deprecated DESCRIPTION "The state of the Actor Churn Detection machine (6.4.17) for the Aggregation Port. A value of 'noChurn' indicates that the state machine is in either the NO_ACTOR_CHURN or the ACTOR_CHURN_MONITOR state, and 'churn' indicates that the state machine is in the - ACTOR_CHURN state. This value is read-only." + ACTOR_CHURN state. This value is read-only. + The churn machines proved not to be as useful as originally + anticipated and were removed from the current revision." REFERENCE - "7.3.4.1.6" + "7.3.4.1.6 of IEEE Std 802.1AX-2014" ::= { dot3adAggPortDebugEntry 5 } - dot3adAggPortDebugPartnerChurnState OBJECT-TYPE SYNTAX ChurnState MAX-ACCESS read-only - STATUS current + STATUS deprecated DESCRIPTION "The state of the Partner Churn Detection machine (6.4.17) for the Aggregation Port. A value of 'noChurn' @@ -1898,64 +1945,67 @@ dot3adAggPortDebugPartnerChurnState OBJECT-TYPE NO_PARTNER_CHURN or the PARTNER_CHURN_MONITOR state, and 'churn' indicates that the state machine is in the PARTNER_CHURN state. - This value is read-only." + This value is read-only. + The churn machines proved not to be as useful as originally + anticipated and were removed from the current revision." REFERENCE - "7.3.4.1.7" + "7.3.4.1.7 of IEEE Std 802.1AX-2014" ::= { dot3adAggPortDebugEntry 6 } - dot3adAggPortDebugActorChurnCount OBJECT-TYPE SYNTAX Counter32 MAX-ACCESS read-only - STATUS current + STATUS deprecated DESCRIPTION "Count of the number of times the Actor Churn state machine has entered the ACTOR_CHURN state. - This value is read-only." + This value is read-only. + The churn machines proved not to be as useful as originally + anticipated and were removed from the current revision." REFERENCE - "7.3.4.1.8" + "7.3.4.1.8 of IEEE Std 802.1AX-2014" ::= { dot3adAggPortDebugEntry 7 } - dot3adAggPortDebugPartnerChurnCount OBJECT-TYPE SYNTAX Counter32 MAX-ACCESS read-only - STATUS current + STATUS deprecated DESCRIPTION "Count of the number of times the Partner Churn state machine has entered the PARTNER_CHURN state. - This value is read-only." + This value is read-only. + The churn machines proved not to be as useful as originally + anticipated and were removed from the current revision." REFERENCE - "7.3.4.1.9" + "7.3.4.1.9 of IEEE Std 802.1AX-2014" ::= { dot3adAggPortDebugEntry 8 } - dot3adAggPortDebugActorSyncTransitionCount OBJECT-TYPE SYNTAX Counter32 MAX-ACCESS read-only STATUS current DESCRIPTION "Count of the number of times the Actor's Mux state - machine (6.4.15) has entered the IN_SYNC state. + machine (6.4.13) has changed + Actor_Oper_Port_State.Synchronization from FALSE to TRUE. This value is read-only." REFERENCE - "7.3.4.1.10" + "7.3.4.1.6" ::= { dot3adAggPortDebugEntry 9 } - dot3adAggPortDebugPartnerSyncTransitionCount OBJECT-TYPE SYNTAX Counter32 MAX-ACCESS read-only STATUS current DESCRIPTION "Count of the number of times the Partner's Mux - state machine (6.4.15) has entered the IN_SYNC state. + state machine (6.4.13) has changed its synchronization + state from FALSE to TRUE. This value is read-only." REFERENCE - "7.3.4.1.11" + "7.3.4.1.7" ::= { dot3adAggPortDebugEntry 10 } - dot3adAggPortDebugActorChangeCount OBJECT-TYPE SYNTAX Counter32 MAX-ACCESS read-only @@ -1965,10 +2015,9 @@ dot3adAggPortDebugActorChangeCount OBJECT-TYPE the LAG ID for this Aggregation Port has changed. This value is read-only." REFERENCE - "7.3.4.1.12" + "7.3.4.1.8" ::= { dot3adAggPortDebugEntry 11 } - dot3adAggPortDebugPartnerChangeCount OBJECT-TYPE SYNTAX Counter32 MAX-ACCESS read-only @@ -1978,11 +2027,9 @@ dot3adAggPortDebugPartnerChangeCount OBJECT-TYPE the LAG ID (see 6.3.6.1) for this Aggregation Port has changed. This value is read-only." REFERENCE - "7.3.4.1.13" + "7.3.4.1.9" ::= { dot3adAggPortDebugEntry 12 } - - -- ------------------------------------------------------------- -- Extension of the Aggregation Port Table -- ------------------------------------------------------------- @@ -1996,7 +2043,6 @@ dot3adAggPortXTable OBJECT-TYPE "7.3.2.2" ::= { dot3adAggPort 4 } - dot3adAggPortXEntry OBJECT-TYPE SYNTAX Dot3adAggPortXEntry MAX-ACCESS not-accessible @@ -2006,7 +2052,6 @@ dot3adAggPortXEntry OBJECT-TYPE AUGMENTS { dot3adAggPortEntry } ::= { dot3adAggPortXTable 1 } - Dot3adAggPortXEntry ::= SEQUENCE { dot3adAggPortProtocolDA @@ -2042,7 +2087,6 @@ dot3adAggPortSecondXTable OBJECT-TYPE "7.3.2" ::= { dot3adAggPort 5 } - dot3adAggPortSecondXEntry OBJECT-TYPE SYNTAX Dot3adAggPortSecondXEntry MAX-ACCESS not-accessible @@ -2061,11 +2105,25 @@ Dot3adAggPortSecondXEntry ::= dot3adAggPortLinkNumberId Integer32, dot3adAggPortPartnerAdminLinkNumberId - Integer32, + Integer32, dot3adAggPortWTRTime Integer32, - dot3adAggPortEnableLongPDUXmit - TruthValue + dot3adAggPortEnableLongPDUXmit + TruthValue, + dot3adAggPortWTRTime2 + Integer32, + dot3adAggPortOperLinkNumber + Integer32, + dot3adAggPortPartnerLinkNumber + Integer32, + dot3adAggPortWtrRevertive + TruthValue, + dot3adAggPortWtrWaiting + TruthValue, + dot3adAggPortActorLacpVersion + Integer32, + dot3adAggPortPartnerLacpVersion + Integer32 } dot3adAggPortOperConversationPasses OBJECT-TYPE @@ -2079,7 +2137,8 @@ dot3adAggPortOperConversationPasses OBJECT-TYPE Conversation ID is distributed through this Aggregation Port, and a 0 indicates that it cannot. aAggPortOperConversationPasses is referencing the - current value of Port_Oper_Conversation_Mask (6.6.2.2)." + current value of Port_Oper_Conversation_Mask + (6.6.3.2, 6.2.7.1.2)." REFERENCE "7.3.2.1.25" ::= { dot3adAggPortSecondXEntry 1 } @@ -2094,7 +2153,7 @@ dot3adAggPortOperConversationCollected OBJECT-TYPE indicates that the Port Conversation ID is collected through this Aggregation Port, and a 0 indicates that it cannot. aAggPortOperConversationPasses is referencing the current - value of Collection_Conversation_Mask (6.6.1.1.2)." + value of Collection_Conversation_Mask (6.2.7.1.2)." REFERENCE "7.3.2.1.26" ::= { dot3adAggPortSecondXEntry 2 } @@ -2104,24 +2163,14 @@ dot3adAggPortLinkNumberId OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "The Link Number ID value configured for this Aggregation - Port by the System's administrator. When the Link Number - ID value matches one of the non zero values in the selection - prioritized lists in aAggConversationAdminLink[] (7.3.1.1.35), - then this Aggregation Port must be configured to have an - aAggPortActorAdminKey value that matches the aAggActorAdminKey - of the Aggregator used by the LAG of the links specified - in aAggConversationAdminLink[]. Its default value is set to - aAggPortActorPort (7.3.2.1.14). NOTE - In the case of DRNI, - the match of the aAggActorAdminKey to aAggPortActorAdminKey - values excludes the first two bits identifying the individual - Portal System in the Portal. If the network administrator fails - to configure the proper values for the aAggPortActorAdminKey - variables in all of the Aggregators Ports attached to a Portal, - the DRCP (9.4) and the variable Port_Oper_Conversation_Mask - (6.6.2.2) prevent looping and/or duplicate delivery, if - necessary, by discarding frames belonging to misconfigured - Conversations." + "The Link Number value configured for this Aggregation Port + by the System's administrator, unique among all Aggregation + Ports that have the same aAggPortActorSystemPriority, + aAggPortActorSystemID, and aAggPortActorAdminKey values, + and selected from the set of Link Numbers in the + aAggAdminConvLinkMap of any Aggregator with matching + aAggPortActorSystemPriority, aAggPortActorSystemID, and + aAggPortActorAdminKey values." REFERENCE "7.3.2.1.27" ::= { dot3adAggPortSecondXEntry 3 } @@ -2131,70 +2180,162 @@ dot3adAggPortPartnerAdminLinkNumberId OBJECT-TYPE MAX-ACCESS read-write STATUS deprecated DESCRIPTION - "The value for the Link Number ID of the Partner System for - this Aggregation Port, assigned by administrator or System - policy for use when the Partner's information is unknown. Its - default value is set to 0." + "The value for the Link Number of the Partner System for + this Aggregation Port, administratively assigned + for use when the Partner's information is unknown. Its + default value is set to 0. + This parameter was eliminated because there was no reason for + it ever to have a value different from the default value." REFERENCE - "7.3.2.1.28" + "7.3.2.1.28 of IEEE Std 802.1AX-2014" DEFVAL { 0 } ::= { dot3adAggPortSecondXEntry 4 } dot3adAggPortWTRTime OBJECT-TYPE SYNTAX Integer32 (0 | 5..12 | 100) - MAX-ACCESS read-write - STATUS current + MAX-ACCESS read-write + STATUS deprecated DESCRIPTION "The wait-to-restore (WTR) period accompanying selection - rules set by aAggConversationAdminLink[] in a command issued - by a network administrator. It may be configured in steps of - 1 min between 5 min and 12 min, while two additional special - values are also used. The value 0 indicates revertive and is - the default value. The value 100 indicates non-revertive mode - of operation, and the WTR_timer will be kept to the value 100." - REFERENCE - "7.3.2.1.29" + rules set by aAggConversationAdminLink[] in a command issued + by a network administrator. It can be configured in steps of + 1 min between 5 min and 12 min, while two additional special + values are also used. The value 0 indicates revertive and is + the default value. The value 100 indicates non-revertive mode + of operation, and the wtrWhile will be kept to the value 100. + This object has been replaced by dot3adAggPortWTRTime2." + REFERENCE + "7.3.2.1.29 of IEEE Std 802.1AX-2014" DEFVAL { 0 } - ::= { dot3adAggPortSecondXEntry 5 } + ::= { dot3adAggPortSecondXEntry 5 } dot3adAggPortEnableLongPDUXmit OBJECT-TYPE SYNTAX TruthValue - MAX-ACCESS read-write + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "A read-write Boolean value indicating whether the + Aggregation Port is able to transmit LACPDUs longer than + 110 octets ('TRUE') or is only able to transmit fixed + size 110 octet LACPDUs ('FALSE'). Its default value is + 'TRUE'. + This parameter was removed because an implementation + conformant to the current standard has no need to transmit + long LACPDUs." + REFERENCE + "7.3.2.1.30 of IEEE Std 802.1AX-2014/Cor1-2017" + DEFVAL { true } + ::= { dot3adAggPortSecondXEntry 6 } + +dot3adAggPortWTRTime2 OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write STATUS current DESCRIPTION - "A read-write Boolean value indicating whether the Aggregation Port - is able to transmit LACPDUs longer than 110 octets ('TRUE') - or is only able to transmit fixed size 110 octet LACPDUs - ('FALSE'). Its default value is 'TRUE'." + "The wait-to-restore (WTR) period, in seconds, that needs to + elapse between an Aggregation Port on a LAG coming up + (Port_Operational becoming TRUE) and being permitted to + become active (transmitting and receiving frames) on the LAG." REFERENCE "7.3.2.1.30" - DEFVAL { true } - ::= { dot3adAggPortSecondXEntry 6 } + DEFVAL { 0 } + ::= { dot3adAggPortSecondXEntry 7 } --- ------------------------------------------------------------- --- Extension of the LACP Debug Table --- ------------------------------------------------------------- -dot3adAggPortDebugXTable OBJECT-TYPE - SYNTAX SEQUENCE OF Dot3adAggPortDebugXEntry - MAX-ACCESS not-accessible - STATUS current +dot3adAggPortOperLinkNumber OBJECT-TYPE + SYNTAX Integer32 (0..65535) + MAX-ACCESS read-only + STATUS current DESCRIPTION - "A table that extends dot3adAggPortDebugTable." + "The operational Link_Number value for this Aggregation Port." REFERENCE - "7.3.4" - ::= { dot3adAggPort 6 } - + "7.3.2.1.28" + ::= { dot3adAggPortSecondXEntry 8 } -dot3adAggPortDebugXEntry OBJECT-TYPE - SYNTAX Dot3adAggPortDebugXEntry - MAX-ACCESS not-accessible - STATUS current +dot3adAggPortPartnerLinkNumber OBJECT-TYPE + SYNTAX Integer32 (0..65535) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The last-received value of the Partner_Link_Number, or zero + if the Aggregator Port is using default values for the Partner + or the Partner_LACP_Version is 1." + REFERENCE + "7.3.2.1.29" + ::= { dot3adAggPortSecondXEntry 9 } + +dot3adAggPortWtrRevertive OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Controls revertive or non-revertive mode of operation. + When TRUE the Aggregation Port can become active as soon + as the wait-to-restore timer expires regardless of the state + of other links in the LAG. When FALSE the Aggregation Port + cannot become active unless there are no other links that + can become active in the LAG." + REFERENCE + "7.3.2.1.31" + DEFVAL { true } + ::= { dot3adAggPortSecondXEntry 10 } + +dot3adAggPortWtrWaiting OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Indicates the Aggregation Port is inhibited from becoming + active for an interval (determined by the aAggPortWtrTime) + after becoming operational, or while non-revertive operation + is being enforced by the Selection Logic." + REFERENCE + "7.3.2.1.32" + ::= { dot3adAggPortSecondXEntry 11 } + +dot3adAggPortActorLacpVersion OBJECT-TYPE + SYNTAX Integer32 (0..65535) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The version number transmitted in LACPDUs on this + Aggregation Port." + REFERENCE + "7.3.2.1.33" + ::= { dot3adAggPortSecondXEntry 12 } + +dot3adAggPortPartnerLacpVersion OBJECT-TYPE + SYNTAX Integer32 (0..65535) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The version number in the LACPDU most recently received + on this Aggregation Port." + REFERENCE + "7.3.2.1.34" + ::= { dot3adAggPortSecondXEntry 13 } + +-- ------------------------------------------------------------- +-- Extension of the LACP Debug Table +-- ------------------------------------------------------------- +dot3adAggPortDebugXTable OBJECT-TYPE + SYNTAX SEQUENCE OF Dot3adAggPortDebugXEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "A table that extends dot3adAggPortDebugTable." + REFERENCE + "7.3.4" + ::= { dot3adAggPort 6 } + +dot3adAggPortDebugXEntry OBJECT-TYPE + SYNTAX Dot3adAggPortDebugXEntry + MAX-ACCESS not-accessible + STATUS deprecated DESCRIPTION "A list of extension parameters for the LACP Port Debug table." AUGMENTS { dot3adAggPortDebugEntry } ::= { dot3adAggPortDebugXTable 1 } - Dot3adAggPortDebugXEntry ::= SEQUENCE { dot3adAggPortDebugActorCDSChurnState @@ -2210,7 +2351,7 @@ Dot3adAggPortDebugXEntry ::= dot3adAggPortDebugActorCDSChurnState OBJECT-TYPE SYNTAX ChurnState MAX-ACCESS read-only - STATUS current + STATUS deprecated DESCRIPTION "This managed object is applicable only when Conversation-sensitive frame collection and distribution @@ -2220,15 +2361,17 @@ dot3adAggPortDebugActorCDSChurnState OBJECT-TYPE is in either the NO_ACTOR_CDS_CHURN or the ACTOR_CHURN_CDS_MONITOR state, and 'churn' indicates that the state machine is in the ACTOR_CDS_CHURN state. This value - is read-only." + is read-only. + The churn machines proved not to be as useful as originally + anticipated and were removed from the current revision." REFERENCE - "7.3.4.1.14" + "7.3.4.1.14 of IEEE Std 802.1AX-2014" ::= { dot3adAggPortDebugXEntry 1 } dot3adAggPortDebugPartnerCDSChurnState OBJECT-TYPE SYNTAX ChurnState MAX-ACCESS read-only - STATUS current + STATUS deprecated DESCRIPTION "This managed object is applicable only when Conversation-sensitive frame collection and distribution @@ -2238,9 +2381,11 @@ dot3adAggPortDebugPartnerCDSChurnState OBJECT-TYPE is in either the NO_PARTNER_CDS_CHURN or the PARTNER_CDS_CHURN_MONITOR state, and 'churn' indicates that the state machine is in the PARTNER_CDSCHURN state. This value - is read-only." + is read-only. + The churn machines proved not to be as useful as originally + anticipated and were removed from the current revision." REFERENCE - "7.3.4.1.15" + "7.3.4.1.15 of IEEE Std 802.1AX-2014" ::= { dot3adAggPortDebugXEntry 2 } dot3adAggPortDebugActorCDSChurnCount OBJECT-TYPE @@ -2248,15 +2393,17 @@ dot3adAggPortDebugActorCDSChurnCount OBJECT-TYPE UNITS "times entered ACTOR_CDS_CHURN" MAX-ACCESS read-only - STATUS current + STATUS deprecated DESCRIPTION "This managed object is applicable only when Conversation-sensitive frame collection and distribution as specified in 6.6 is supported. Count of the number of times the Actor CDS Churn state machine has entered the - ACTOR_CDS_CHURN state. This value is read-only." + ACTOR_CDS_CHURN state. This value is read-only. + The churn machines proved not to be as useful as originally + anticipated and were removed from the current revision." REFERENCE - "7.3.4.1.16" + "7.3.4.1.16 of IEEE Std 802.1AX-2014" ::= { dot3adAggPortDebugXEntry 3 } dot3adAggPortDebugPartnerCDSChurnCount OBJECT-TYPE @@ -2264,18 +2411,19 @@ dot3adAggPortDebugPartnerCDSChurnCount OBJECT-TYPE UNITS "times entered PARTNER_CDS_CHURN" MAX-ACCESS read-only - STATUS current + STATUS deprecated DESCRIPTION "This managed object is applicable only when Conversation-sensitive frame collection and distribution as specified in 6.6 is supported. Count of the number of times the Partner CDS Churn state machine has entered the - PARTNER_CDS_CHURN state. This value is read-only." + PARTNER_CDS_CHURN state. This value is read-only. + The churn machines proved not to be as useful as originally + anticipated and were removed from the current revision." REFERENCE - "7.3.4.1.7" + "7.3.4.1.17 of IEEE Std 802.1AX-2014" ::= { dot3adAggPortDebugXEntry 4 } - -- ------------------------------------------------------------- -- The DRNI Configuration Table -- ------------------------------------------------------------- @@ -2286,7 +2434,7 @@ dot3adDrniTable OBJECT-TYPE STATUS current DESCRIPTION "A table that contains information about every - DRNI that is associated with this System." + DRNI Gateway that is associated with this System." REFERENCE "7.4.1" ::= { dot3adDrni 1 } @@ -2297,7 +2445,7 @@ dot3adDrniEntry OBJECT-TYPE STATUS current DESCRIPTION "A list of the DRNI parameters. This is indexed - by the DRNI Portal ID." + by the ifIndex of the DRNI Gateway Port." INDEX { dot3adDrniIndex } ::= { dot3adDrniTable 1 } @@ -2313,11 +2461,11 @@ Dot3adDrniEntry ::= MacAddress, dot3adDrniPortalPriority Integer32, - dot3adDrniThreePortalSystem - TruthValue, + dot3adDrniThreePortalSystem + TruthValue, dot3adDrniPortalSystemNumber Integer32, - dot3adDrniIntraPortalLinkList + dot3adDrniIntraPortalLinkList PortalLinkList, dot3adDrniAggregator InterfaceIndex, @@ -2340,11 +2488,83 @@ Dot3adDrniEntry ::= dot3adDrniDRGatewayConversationPasses OCTET STRING, dot3adDrniPSI - TruthValue, + TruthValue, dot3adDrniPortConversationControl TruthValue, dot3adDrniIntraPortalPortProtocolDA - MacAddress + MacAddress, + dot3adDrniProtocolDA + MacAddress, + dot3adDrniAggregatorSystem + MacAddress, + dot3adDrniAggregatorSystemPriority + Integer32, + dot3adDrniCscdGatewayControl + TruthValue, + dot3adDrniDRClientGatewayControl + TruthValue, + dot3adDrniGatewayEnableMask + OCTET STRING, + dot3adDrniGatewayPreferenceMask + OCTET STRING, + dot3adDrniGatewayConvServiceDigest + OCTET STRING, + dot3adDrniGatewayAvailableMask + OCTET STRING, + dot3adDrniIntraRelayPort + InterfaceIndex, + dot3adDrniHomeAdminIrpState + IrpState, + dot3adDrniHomeOperIrpState + IrpState, + dot3adDrniNeighborOperIrpState + IrpState, + dot3adDrniNeighborPortConversationPasses + OCTET STRING, + dot3adDrniNeighborGatewayConversationPasses + OCTET STRING, + dot3adDrniNeighborSystem + MacAddress, + dot3adDrniNeighborSystemPriority + Integer32, + dot3adDrniSequenceNumbers + OCTET STRING, + dot3adDrniNeighborAggregatorAlgorithm + OCTET STRING, + dot3adDrniNeighborAggregatorConvServiceDigest + OCTET STRING, + dot3adDrniNeighborAggregatorConvLinkDigest + OCTET STRING, + dot3adDrniNeighborPartnerSystemPriority + Integer32, + dot3adDrniNeighborPartnerSystem + MacAddress, + dot3adDrniNeighborPartnerAggregatorKey + LacpKey, + dot3adDrniNeighborCscdState + CscdState, + dot3adDrniNeighborActiveLinks + OCTET STRING, + dot3adDrniNeighborGatewayAlgorithm + OCTET STRING, + dot3adDrniNeighborGatewayConvServiceDigest + OCTET STRING, + dot3adDrniNeighborGatewayAvailableMask + OCTET STRING, + dot3adDrniNeighborGatewayPreferenceMask + OCTET STRING, + dot3adDrniDRCPDUsRx + Counter64, + dot3adDrniIllegalRx + Counter64, + dot3adDrniDRCPDUsTx + Counter64, + dot3adDrniAggregationPortList + PortList, + dot3adDrniAggregatorKey + Integer32, + dot3adDrniNeighborDrniKey + Integer32 } dot3adDrniIndex OBJECT-TYPE @@ -2352,11 +2572,10 @@ dot3adDrniIndex OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - "The unique identifier allocated to this Distributed Relay by - the local System. This attribute identifies a Distributed Relay - instance among the subordinate managed objects of the - containing object. This value is read-only. NOTE - The aDrniID - is represented in the SMIv2 MIB as an ifIndex-see D.5." + "The unique identifier allocated to this DRNI Gateway by + the local System. This attribute identifies a DRNI Gateway + Port instance among the subordinate managed objects of the + containing object. This value is read-only." REFERENCE "7.4.1.1.1" ::= { dot3adDrniEntry 1 } @@ -2367,7 +2586,7 @@ dot3adDrniDescription OBJECT-TYPE STATUS current DESCRIPTION "A human-readable text string containing information about the - Distribute Relay. This string is read-only. The contents are + DRNI Gateway. This string is read-only. The contents are vendor specific." REFERENCE "7.4.1.1.2" @@ -2379,7 +2598,7 @@ dot3adDrniName OBJECT-TYPE STATUS current DESCRIPTION "A human-readable text string containing a locally significant - name for the Distributed Relay. This string is read-write." + name for the DRNI Gateway. This string is read-write." REFERENCE "7.4.1.1.3" ::= { dot3adDrniEntry 3 } @@ -2387,61 +2606,76 @@ dot3adDrniName OBJECT-TYPE dot3adDrniPortalAddr OBJECT-TYPE SYNTAX MacAddress MAX-ACCESS read-write - STATUS current + STATUS obsolete DESCRIPTION "A read-write identifier of a particular Portal. aDrniPortalAddr has to be unique among at least all of the potential Portal Systems to which a given Portal System might be attached via an IPL Intra-Portal Link. Also used as the - Actor's System ID (6.3.2) for the emulated system." + Actor's System ID (6.3.2) for the emulated system. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.1.1.4" + "7.4.1.1.4 of IEEE Std 802.1AX-2014" ::= { dot3adDrniEntry 4 } - dot3adDrniPortalPriority OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-write - STATUS current + STATUS obsolete DESCRIPTION "A 2-octet read-write value indicating the priority value associated with the Portal's System ID. Also used as the - Actor's System Priority (6.3.2) for the emulated system." + Actor's System Priority (6.3.2) for the emulated system. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.1.1.5" + "7.4.1.1.5 of IEEE Std 802.1AX-2014" ::= { dot3adDrniEntry 5 } dot3adDrniThreePortalSystem OBJECT-TYPE SYNTAX TruthValue MAX-ACCESS read-write - STATUS current + STATUS obsolete DESCRIPTION "A read-write Boolean value indicating whether this Portal System is part of a Portal consisting of three Portal Systems or not. Value 1 stands for a Portal of three Portal Systems, value 0 stands for a Portal of - two Portal Systems. The default value is 0." + two Portal Systems. The default value is 0. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.1.1.6" + "7.4.1.1.6 of IEEE Std 802.1AX-2014" ::= { dot3adDrniEntry 6 } dot3adDrniPortalSystemNumber OBJECT-TYPE SYNTAX Integer32 (1..3) MAX-ACCESS read-write - STATUS current + STATUS obsolete DESCRIPTION "A read-write identifier of this particular Portal System within a Portal. It is the responsibility of the network administrator to ensure that these numbers are unique among - the Portal Systems with the same aDrniPortalAddr (7.4.1.1.4)." + the Portal Systems with the same aDrniPortalAddr. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.1.1.7" + "7.4.1.1.7 of IEEE Std 802.1AX-2014" ::= { dot3adDrniEntry 7 } dot3adDrniIntraPortalLinkList OBJECT-TYPE SYNTAX PortalLinkList MAX-ACCESS read-write - STATUS current + STATUS obsolete DESCRIPTION "Read-write list of the Interface Identifiers of the Ports to the Intra-Portal Links assigned to this Distributed Relay. Each @@ -2452,9 +2686,13 @@ dot3adDrniIntraPortalLinkList OBJECT-TYPE topology. For a Portal of three Portal Systems two or three IPLs can be used, for a Portal of two Portal Systems a single IPL is required and for a single Portal System no IPL is - required." + required. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.1.1.8" + "7.4.1.1.8 of IEEE Std 802.1AX-2014" ::= { dot3adDrniEntry 8 } dot3adDrniAggregator OBJECT-TYPE @@ -2462,42 +2700,47 @@ dot3adDrniAggregator OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "An INTEGER that matches the syntax of an Interface Identifier. - Read-write Interface Identifier of the Aggregator Port assigned - to this Distributed Relay." + "The read-write Interface Identifier of the Aggregator + Port supporting this DRNI Gateway." REFERENCE - "7.4.1.1.9" + "7.4.1.1.4" ::= { dot3adDrniEntry 9 } - dot3adDrniNeighborAdminConvGatewayListDigest OBJECT-TYPE SYNTAX OCTET STRING (SIZE (16)) MAX-ACCESS read-write - STATUS current + STATUS obsolete DESCRIPTION "The value for the digest of the prioritized Gateway Conversation ID-to-Gateway assignments of the Neighbor - Portal System, assigned by administrator or System + Portal System, assigned by administrator or system policy for use when the Neighbor Portal System's - information is unknown. Its default value is set to NULL." + information is unknown. Its default value is set to NULL. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.1.1.11" + "7.4.1.1.11 of IEEE Std 802.1AX-2014" DEFVAL { ''H } ::= { dot3adDrniEntry 10 } - dot3adDrniNeighborAdminConvPortListDigest OBJECT-TYPE SYNTAX OCTET STRING (SIZE (16)) MAX-ACCESS read-write - STATUS current + STATUS obsolete DESCRIPTION "The value for the digest of the prioritized Port Conversation ID-to-Aggregation Port assignments of the Neighbor Portal - System, assigned by administrator or System policy for use when + System, assigned by administrator or system policy for use when the Neighbor Portal System's information is unknown. Its default - value is set to NULL." + value is set to NULL. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.1.1.12" + "7.4.1.1.12 of IEEE Std 802.1AX-2014" DEFVAL { ''H } ::= { dot3adDrniEntry 11 } @@ -2506,53 +2749,61 @@ dot3adDrniGatewayAlgorithm OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "This object identifies the algorithm used by the DR Function - to assign frames to a Gateway Conversation ID. Table 9-7 + "This object identifies the algorithm used by the DRNI Gateway + to assign frames to a Gateway Conversation ID. Table 8-1 provides the IEEE 802.1 OUI (00-80-C2) Gateway Algorithm encodings. A SEQUENCE OF OCTETS consisting of an OUI or CID and one following octet." REFERENCE - "7.4.1.1.13" + "7.4.1.1.6" ::= { dot3adDrniEntry 12 } dot3adDrniNeighborAdminGatewayAlgorithm OBJECT-TYPE SYNTAX OCTET STRING (SIZE (16)) MAX-ACCESS read-write - STATUS current + STATUS obsolete DESCRIPTION "This object identifies the value for the Gateway algorithm of the Neighbor Portal System, assigned by administrator or - System policy for use when the Neighbor Portal System's + system policy for use when the Neighbor Portal System's information is unknown. Table 9-7 provides the IEEE 802.1 OUI (00-80-C2) Gateway Algorithm encodings. Its default value is set to NULL. A SEQUENCE OF OCTETS consisting of a 3-octet - OUI or CID and one following octet." + OUI or CID and one following octet. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.1.1.14" + "7.4.1.1.14 of IEEE Std 802.1AX-2014" DEFVAL { ''H } ::= { dot3adDrniEntry 13 } dot3adDrniNeighborAdminPortAlgorithm OBJECT-TYPE SYNTAX OCTET STRING (SIZE (16)) MAX-ACCESS read-write - STATUS current + STATUS obsolete DESCRIPTION "This object identifies the value for the Port Algorithm of the Neighbor Portal System, assigned by administrator or - System policy for use when the Neighbor Portal System's + system policy for use when the Neighbor Portal System's information is unknown. Table 6-4 provides the IEEE 802.1 OUI (00-80-C2) Port Algorithm encodings. Its default value is set to NULL. A SEQUENCE OF OCTETS consisting of a - 3-octet OUI or CID and one following octet." + 3-octet OUI or CID and one following octet. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.1.1.15" + "7.4.1.1.15 of IEEE Std 802.1AX-2014" DEFVAL { ''H } ::= { dot3adDrniEntry 14 } dot3adDrniNeighborAdminDRCPState OBJECT-TYPE SYNTAX DrcpState MAX-ACCESS read-write - STATUS current + STATUS obsolete DESCRIPTION "A string of 8 bits, corresponding to the administrative values of DRCP_State [item s) in 9.4.3.2] as transmitted by @@ -2562,20 +2813,24 @@ dot3adDrniNeighborAdminDRCPState OBJECT-TYPE (OtherGateway), the fourth bit corresponds to bit 3 (IppActivity), the fifth bit corresponds to bit 4 (Timeout), the sixth bit corresponds to bit 5 (GatewaySync), the seventh - bit corresponds to bit 6 (PortSync), and the eighth bit + bit corresponds to bit 6 (PortSync), and the eighth bit corresponds to bit 7 (Expired). These values allow administrative control over the values of HomeGateway, NeighborGateway, OtherGateway, IppActivity, and Timeout. Their values are by default set to FALSE. This attribute value is - read-write." + read-write. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.1.1.16" + "7.4.1.1.16 of IEEE Std 802.1AX-2014" ::= { dot3adDrniEntry 15 } dot3adDrniEncapsulationMethod OBJECT-TYPE SYNTAX OCTET STRING (SIZE (4)) MAX-ACCESS read-write - STATUS current + STATUS obsolete DESCRIPTION "This managed object is applicable only when Network / IPL sharing by time (9.3.2.1) or Network / IPL sharing by tag @@ -2593,9 +2848,13 @@ dot3adDrniEncapsulationMethod OBJECT-TYPE of 1 indicates that Network / IPL sharing by time (9.3.2.1) is used. A value of 2 indicates that the encapsulation method used is the same as the one used by network frames and that Network / - IPL sharing by tag (9.3.2.2) is used." + IPL sharing by tag (9.3.2.2) is used. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.1.1.17" + "7.4.1.1.17 of IEEE Std 802.1AX-2014" DEFVAL { '0080C200'H } ::= { dot3adDrniEntry 16 } @@ -2607,12 +2866,11 @@ dot3adDrniDRPortConversationPasses OBJECT-TYPE "A read-only current operational vector of Boolean values, with one value for each possible Port Conversation ID. A 1 indicates that the Port Conversation ID is allowed to be distributed - through this DR Function's Aggregator, and a 0 indicates that + through this DRNI Gateway's Aggregator, and a 0 indicates that it cannot. aDrniDRPortConversationPasses is referencing the - current value of Drni_Portal_System_Port_Conversation - (9.3.4.2)." + current value of Home_Aggregator_Mask (9.5.2.2)." REFERENCE - "7.4.1.1.20" + "7.4.1.1.7" ::= { dot3adDrniEntry 17 } dot3adDrniDRGatewayConversationPasses OBJECT-TYPE @@ -2623,60 +2881,569 @@ dot3adDrniDRGatewayConversationPasses OBJECT-TYPE "A read-only current operational vector of Boolean values, with one value for each possible Gateway Conversation ID. A 1 indicates that the Gateway Conversation ID is allowed to pass - through this DR Function's Gateway, and a 0 indicates that it + through this DRNI Gateway Port, and a 0 indicates that it cannot. aDrniDRGatewayConversationPasses is referencing the - current value of Drni_Portal_System_Gateway_Conversation - (9.3.4.2)." + current value of Home_Gateway_Mask (9.5.2.2)." REFERENCE - "7.4.1.1.21" + "7.4.1.1.8" ::= { dot3adDrniEntry 18 } -dot3adDrniPSI OBJECT-TYPE - SYNTAX TruthValue +dot3adDrniPSI OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS obsolete + DESCRIPTION + "A read-only Boolean value providing the value of PSI, which + indicates whether this Portal System is isolated from the + other Portal Systems within the same Portal ('TRUE') or not + ('FALSE'). + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." + REFERENCE + "7.4.1.1.22 of IEEE Std 802.1AX-2014" + ::= { dot3adDrniEntry 19 } + +dot3adDrniPortConversationControl OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "A read-write Boolean value that controls the operation of the + updateDRFHomeState (9.4.11). When 'TRUE' the Home Gateway + Vector is set equal to Drni_Portal_System_Port_Conversation. + Setting this object to 'TRUE' is only possible when the Gateway + algorithm and the Port algorithm use the same distribution + methods. The default is 'FALSE', indicating that the Home + Gateway Vector is controlled by the network control protocol. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." + REFERENCE + "7.4.1.1.23 of IEEE Std 802.1AX-2014" + DEFVAL { false } + ::= { dot3adDrniEntry 20 } + +dot3adDrniIntraPortalPortProtocolDA OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "A 6-octet read-write MAC Address value specifying the + destination address to be used when sending DRCPDUs, + corresponding to the value of DRCP_Protocol_DA in 9.4.4.1.3. + Its values is one of the addresses selected from Table 9-4 + and its default shall be the IEEE 802.1 Nearest non-TPMR + Bridge group address (01-80-C2-00-00-03). + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." + REFERENCE + "7.4.1.1.24 of IEEE Std 802.1AX-2014" + DEFVAL { '0180C2000003'H } + ::= { dot3adDrniEntry 21 } + +dot3adDrniProtocolDA OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "A 6-octet read-write MAC Address value specifying the + destination address to be used when sending DRCPDUs, + corresponding to the value of DRCP_DA in 9.6.5. + The group addresses listed in Table 9-1 can be used to + determine the scope of propagation of DRCPDUs in a + Bridged LAN. The default is the IEEE 802.1 Nearest + non-TPMR Bridge group address (01-80-C2-00-00-03)." + REFERENCE + "7.4.1.1.12" + DEFVAL { '0180C2000003'H } + ::= { dot3adDrniEntry 22 } + +dot3adDrniAggregatorSystem OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Aggregator System value to be used by the + Aggregator supporting this DRNI Gateway (and the Aggregation + Ports assigned to this DRNI Gateway) when paired with a + neighbor DRNI System via the IRC. This value is read-write." + REFERENCE + "7.4.1.1.13" + ::= { dot3adDrniEntry 23 } + +dot3adDrniAggregatorSystemPriority OBJECT-TYPE + SYNTAX Integer32 (0..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Aggregator System Priority value to be used by the + Aggregator supporting this DRNI Gateway (and the Aggregation + Ports assigned to this DRNI Gateway) when paired with a + neighbor DRNI System via the IRC. This value is read-write." + REFERENCE + "7.4.1.1.14" + ::= { dot3adDrniEntry 24 } + +dot3adDrniCscdGatewayControl OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "A read-write Boolean value that, when TRUE, allows the + DRNI Gateway Port selection to be based on the CSCD parameters + that control the Aggregator Port selection (see 9.5.3.5)." + REFERENCE + "7.4.1.1.16" + ::= { dot3adDrniEntry 25 } + +dot3adDrniDRClientGatewayControl OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "A read-write Boolean value that, when TRUE, allows the + Distributed Relay Client to determine whether to forward + frames through the DRNI Gateway Port (see 9.5.3.5)." + REFERENCE + "7.4.1.1.17" + ::= { dot3adDrniEntry 26 } + +dot3adDrniGatewayEnableMask OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (512)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "A read-write vector of Boolean values, with one value for + each possible Gateway Conversation ID. A 1 (TRUE) indicates + frames associated with that Gateway Conversation ID are + allowed to pass through this DRNI Gateway Port, and a 0 (FALSE) + indicates that such frames are not allowed to pass." + REFERENCE + "7.4.1.1.18" + ::= { dot3adDrniEntry 27 } + +dot3adDrniGatewayPreferenceMask OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (512)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "A read-write vector of Boolean values, with one value for + each possible Gateway Conversation ID. A 1 (TRUE) indicates + that the DRNI Gateway Port in this DRNI System is the + preferred Gateway when both DRNI Gateways have the Gateway + Conversation ID enabled in the aDrniHomeGatewayAvailableMask + (7.4.1.1.22), and a 0 (FALSE) indicates that it is not." + REFERENCE + "7.4.1.1.19" + ::= { dot3adDrniEntry 28 } + +dot3adDrniGatewayConvServiceDigest OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The MD5 digest of the aDrniHomeAdminGatewayConvServiceMap + (7.4.1.1.20). The value can be NULL when the distribution + algorithm specified in aDrniHomeGatewayAlgorithm (7.4.1.1.6) + does not use the aDrniHomeAdminGatewayConvServiceMap." + REFERENCE + "7.4.1.1.21" + ::= { dot3adDrniEntry 29 } + +dot3adDrniGatewayAvailableMask OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (512)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A read-only vector of Boolean values, with one value for + each possible Gateway Conversation ID. A 1 (TRUE) indicates + that this DRNI Gateway Port is eligible to be selected + to pass that Gateway Conversation ID, and a 0 (FALSE) + indicates that it is not eligible." + REFERENCE + "7.4.1.1.22" + ::= { dot3adDrniEntry 30 } + +dot3adDrniIntraRelayPort OBJECT-TYPE + SYNTAX InterfaceIndex + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The read-write Interface Identifier of the Intra-Relay + Port supporting this DRNI Gateway." + REFERENCE + "7.4.1.1.23" + ::= { dot3adDrniEntry 31 } + +dot3adDrniHomeAdminIrpState OBJECT-TYPE + SYNTAX IrpState + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "A string of 8 bits, corresponding to the administrative + values of the Intra-Relay Port state (Figure 9-13). + The first two bits correspond to bits 0 and 1 of the + IRP state are reserved, the third bit corresponds to bit 2 + (Short_Timeout), the fourth bit corresponds to bit 3 + (Synchronization), the fifth bit corresponds to bit 4 + (IRC_Data), the sixth bit corresponds to bit 5 + (DRNI), the seventh bit corresponds to bit 6 + (Defaulted), and the eighth bit corresponds to bit 7 + (Expired). These values allow administrative control over + the values of IRC_Data and Short_Timeout. + This attribute value is read-write." + REFERENCE + "7.4.1.1.24" + ::= { dot3adDrniEntry 32 } + +dot3adDrniHomeOperIrpState OBJECT-TYPE + SYNTAX IrpState + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A string of 8 bits, corresponding to the current + operational values of Intra-Relay Port state as transmitted + in DRCPDUs. The bit allocations are as defined in + Figure 9-13. This attribute value is read-only." + REFERENCE + "7.4.1.1.25" + ::= { dot3adDrniEntry 33 } + +dot3adDrniNeighborOperIrpState OBJECT-TYPE + SYNTAX IrpState + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A string of 8 bits, corresponding to the current + operational values of the Neighbor DRNI Gateway's Intra-Relay + Port state as received in DRCPDUs. The bit allocations are + as defined in Figure 9-13. This attribute value is read-only." + REFERENCE + "7.4.1.1.26" + ::= { dot3adDrniEntry 34 } + +dot3adDrniNeighborPortConversationPasses OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (512)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A read-only current operational vector of Boolean values, with + one value for each possible Port Conversation ID. A 1 indicates + that the Port Conversation ID is allowed to be distributed + through the Neighbor DRNI Gateway's Aggregator, and a 0 + indicates that it cannot. + aDrniNeighborPortConversationPasses is referencing + the current value of Neighbor_Aggregator_Mask (9.5.2.2)." + REFERENCE + "7.4.1.1.27" + ::= { dot3adDrniEntry 35 } + +dot3adDrniNeighborGatewayConversationPasses OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (512)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A read-only current operational vector of Boolean values, + with one value for each possible Gateway Conversation ID. A 1 + indicates that the Gateway Conversation ID is allowed to pass + through the Neighbor DRNI Gateway's Gateway Port, and a 0 + indicates that it cannot. + aDrniNeighborGatewayConversationPasses is referencing + the current value of Neighbor_Gateway_Mask (9.5.2.2)." + REFERENCE + "7.4.1.1.28" + ::= { dot3adDrniEntry 36 } + +dot3adDrniNeighborSystem OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A read-only identifier of the Neighbor DRNI System, + connected via the Intra-Relay Port." + REFERENCE + "7.4.1.1.29" + ::= { dot3adDrniEntry 37 } + +dot3adDrniNeighborSystemPriority OBJECT-TYPE + SYNTAX Integer32 (0..65535) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A 2-octet read-only value indicating the priority value + associated with the Neighbor DRNI System Address." + REFERENCE + "7.4.1.1.30" + ::= { dot3adDrniEntry 38 } + +dot3adDrniSequenceNumbers OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (36)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The current values of all sequence numbers used by DRCP to + coordinate the exchange of Aggregator State, Gateway State, + and Gateway Preference variables. Every four octets in the + octet string represent a sequence number as follows: + Home Aggregator_Sequence_Number, + Home Gateway_Sequence_Number, + Home Gateway_Preference_Sequence_Number, + Neighbor Aggregator_Sequence_Number, + Neighbor Gateway_Sequence_Number, + Neighbor Gateway_Preference_Sequence_Number, + Reflected_Aggregator_Sequence_Number, + Reflected_Gateway_Sequence_Number, and + Reflected_Gateway_Preference_Sequence_Number." + REFERENCE + "7.4.1.1.32" + ::= { dot3adDrniEntry 39 } + +dot3adDrniNeighborAggregatorAlgorithm OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (4)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Identifies the algorithm used by the Neighbor DRNI Gateway + to assign frames to a Port Conversation ID. + A SEQUENCE OF OCTETS consisting of an OUI or CID + and one following octet. Received in DRCPDUs." + REFERENCE + "7.4.1.1.33" + ::= { dot3adDrniEntry 40 } + +dot3adDrniNeighborAggregatorConvServiceDigest OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The MD5 digest of the Neighbor Aggregator's + aAggAdminConvServiceMap (7.3.1.1.36). + The value can be NULL when the Neighbor's distribution + algorithm specified in aDrniNeighborAggregatorAlgorithm + (7.4.1.1.33) does not use the aAggAdminConvServiceMap. + Received in DRCPDUs." + REFERENCE + "7.4.1.1.34" + ::= { dot3adDrniEntry 41 } + +dot3adDrniNeighborAggregatorConvLinkDigest OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The MD5 digest of the Neighbor Aggregator's + aAggAdminConvLinkMap (7.3.1.1.34), received in DRCPDUs." + REFERENCE + "7.4.1.1.35" + ::= { dot3adDrniEntry 42 } + +dot3adDrniNeighborPartnerSystemPriority OBJECT-TYPE + SYNTAX Integer32 (0..65535) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A 2-octet read-only value indicating the priority value + associated with the Neighbor's LACP Partner System Address, + received in DRCPDUs." + REFERENCE + "7.4.1.1.36" + ::= { dot3adDrniEntry 43 } + +dot3adDrniNeighborPartnerSystem OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A read-only identifier of the Neighbor's LACP Partner System, + received in DRCPDUs." + REFERENCE + "7.4.1.1.37" + ::= { dot3adDrniEntry 44 } + +dot3adDrniNeighborPartnerAggregatorKey OBJECT-TYPE + SYNTAX LacpKey + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A 2-octet read-only value indicating the operational key value + associated with the Neighbor's LACP Partner, received in + DRCPDUs." + REFERENCE + "7.4.1.1.38" + ::= { dot3adDrniEntry 45 } + +dot3adDrniNeighborCscdState OBJECT-TYPE + SYNTAX CscdState + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A string of 8 bits, corresponding to the operational + values of the Neighbor's CSCD state (Figure 9-15), received in + DRCPDUs. The first three bits correspond to bits 0, 1 and 2 of + the CSCD state (reserved), the fourth bit corresponds to bit 3 + (CSCD_Gateway_Control), the fifth bit corresponds to bit 4 + (Discard_Wrong_Conversation), the sixth bit corresponds to + bit 5 (Differ_Conv_Link_Digests), the seventh bit corresponds + to bit 6 (Differ_Conv_Service_Digests), and the eighth bit + corresponds to bit 7 (Differ_Port_Algorithms)." + REFERENCE + "7.4.1.1.39" + ::= { dot3adDrniEntry 46 } + +dot3adDrniNeighborActiveLinks OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Each two octets of the octet string represent the operational + Link_Number of an Aggregation Port that is currently active + on the Neighbor's Aggregator. An octet string of size zero + indicates that there are no links currently active on + the Neighbor's Aggregator. Received in DRCPDUs." + REFERENCE + "7.4.1.1.40" + ::= { dot3adDrniEntry 47 } + +dot3adDrniNeighborGatewayAlgorithm OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (4)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Identifies the algorithm used by the Neighbor DRNI Gateway + to assign frames to a Gateway Conversation ID. + A SEQUENCE OF OCTETS consisting of an OUI or CID + and one following octet. Received in DRCPDUs." + REFERENCE + "7.4.1.1.41" + ::= { dot3adDrniEntry 48 } + +dot3adDrniNeighborGatewayConvServiceDigest OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The MD5 digest of the Neighbor DRNI Gateway's + aDrniHomeAdminGatewayConvServiceMap (7.4.1.1.20). + The value can be NULL when the Neighbor's distribution + algorithm specified in aDrniNeighborGatewayAlgorithm + (7.4.1.1.41) does not use the + aDrniHomeAdminGatewayConvServiceMap. + Received in DRCPDUs." + REFERENCE + "7.4.1.1.42" + ::= { dot3adDrniEntry 49 } + +dot3adDrniNeighborGatewayAvailableMask OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (512)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A read-only vector of Boolean values, with one value for + each possible Gateway Conversation ID. A 1 (TRUE) indicates + frames associated with that Gateway Conversation ID are + eligible to pass through the Neighbor DRNI Gateway + Port, and a 0 (FALSE) indicates that such + frames are not eligible to pass. Received in DRCPDUs." + REFERENCE + "7.4.1.1.43" + ::= { dot3adDrniEntry 50 } + +dot3adDrniNeighborGatewayPreferenceMask OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (512)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A read-only vector of Boolean values, with one value for + each possible Gateway Conversation ID. A 1 (TRUE) indicates + that the Neighbor DRNI Gateway Port is + the preferred Gateway when both DRNI Gateways have the Gateway + Conversation ID enabled in the aDrniHomeGatewayAvailableMask + (7.4.1.1.22), and a 0 (FALSE) indicates that it is not. + Received in DRCPDUs." + REFERENCE + "7.4.1.1.44" + ::= { dot3adDrniEntry 51 } + +dot3adDrniDRCPDUsRx OBJECT-TYPE + SYNTAX Counter64 + UNITS + "frames" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of valid DRCPDUs received on this IRP. This value + is read-only." + REFERENCE + "7.4.1.1.45" + ::= { dot3adDrniEntry 52 } + +dot3adDrniIllegalRx OBJECT-TYPE + SYNTAX Counter64 + UNITS + "frames" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of frames received on this IRP that carry the + DRCP EtherType value (9.6.1.4), but contain a badly formed PDU. + This value is read-only." + REFERENCE + "7.4.1.1.46" + ::= { dot3adDrniEntry 53 } + +dot3adDrniDRCPDUsTx OBJECT-TYPE + SYNTAX Counter64 + UNITS + "frames" MAX-ACCESS read-only STATUS current DESCRIPTION - "A read-only Boolean value providing the value of PSI, which - indicates whether this Portal System is isolated from the - other Portal Systems within the same Portal ('TRUE') or not - ('FALSE')." + "The number of valid DRCPDUs transmitted on this IRP. This value + is read-only." REFERENCE - "7.4.1.1.22" - ::= { dot3adDrniEntry 19 } + "7.4.1.1.47" + ::= { dot3adDrniEntry 54 } -dot3adDrniPortConversationControl OBJECT-TYPE - SYNTAX TruthValue - MAX-ACCESS read-write - STATUS current +dot3adDrniAggregationPortList OBJECT-TYPE + SYNTAX PortList + MAX-ACCESS read-write + STATUS current DESCRIPTION - "A read-write Boolean value that controls the operation of the - updateDRFHomeState (9.4.11). When set to 'TRUE' the Home Gateway - Vector is set equal to Drni_Portal_System_Port_Conversation. - Setting this object to 'TRUE' is only possible when the Gateway - algorithm and the Port algorithm use the same distributions - methods. The default is 'FALSE', indicating that the Home Gateway - Vector is controlled by the network control protocol." + "The complete set of Aggregation Ports currently associated + with this DRNI Gateway. Each bit set in this list represents + an Aggregation Port assigned to this DRNI." REFERENCE - "7.4.1.1.23" - DEFVAL { false } - ::= { dot3adDrniEntry 20 } + "7.4.1.1.5" + ::= { dot3adDrniEntry 55 } - -dot3adDrniIntraPortalPortProtocolDA OBJECT-TYPE - SYNTAX MacAddress - MAX-ACCESS read-write +dot3adDrniAggregatorKey OBJECT-TYPE + SYNTAX Integer32 (1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Aggregator Key value to be used by the Aggregator + supporting this DRNI Gateway (and the Aggregation Ports + assigned to this DRNI Gateway) when paired with a neighbor + DRNI System via the IRC. This value is read-write." + REFERENCE + "7.4.1.1.15" + ::= { dot3adDrniEntry 56 } + +dot3adDrniNeighborDrniKey OBJECT-TYPE + SYNTAX Integer32 (0..65535) + MAX-ACCESS read-only STATUS current DESCRIPTION - "A 6-octet read-write MAC Address value specifying the - destination address to be used when sending DRCPDUs, - corresponding to the value of DRCP_Protocol_DA in 9.4.4.1.3. - Its values is one of the addresses selected from Table 9-4 - and its default shall be the IEEE 802.1 Nearest non-TPMR - Bridge group address (01-80-C2-00-00-03)." + "The DRNI Key value received from the Neighbor DRNI System + (connected via the Intra-Relay Port)." REFERENCE - "7.4.1.1.24" - DEFVAL { '0180C2000003'H } - ::= { dot3adDrniEntry 21 } + "7.4.1.1.31" + ::= { dot3adDrniEntry 57 } -- ------------------------------------------------------------- -- DRNI Conversation Admin Gateway Table @@ -2685,7 +3452,7 @@ dot3adDrniIntraPortalPortProtocolDA OBJECT-TYPE dot3adDrniConvAdminGatewayTable OBJECT-TYPE SYNTAX SEQUENCE OF Dot3adDrniConvAdminGatewayEntry MAX-ACCESS not-accessible - STATUS current + STATUS obsolete DESCRIPTION "There are 4096 aDrniConvAdminGateway[] variables, aDrniConvAdminGateway[0] through aDrniConvAdminGateway[4095], @@ -2700,23 +3467,30 @@ dot3adDrniConvAdminGatewayTable OBJECT-TYPE administrator fails to configure the same values for the aDrniConvAdminGateway[] variables in all of the DR Functions of a Portal, frames can be misdirected. The DRCP (9.4) detects - such misconfiguration." + such misconfiguration. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.1.1.10" + "7.4.1.1.10 of IEEE Std 802.1AX-2014" ::= { dot3adDrni 2 } - dot3adDrniConvAdminGatewayEntry OBJECT-TYPE SYNTAX Dot3adDrniConvAdminGatewayEntry MAX-ACCESS not-accessible - STATUS current + STATUS obsolete DESCRIPTION "A Gateway selection priority list for the Distributed Relay for the referenced Gateway Conversation ID. This selection - priority list, a sequence of integers for each Gateway + preference list, a sequence of integers for each Gateway Conversation ID, is a list of Portal System Numbers in the order of preference, highest to lowest, for the corresponding - preferred Portal System's Gateway to carry that Conversation." + preferred Portal System's Gateway to carry that Conversation. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." INDEX { dot3adDrniGatewayConversationID, dot3adDrniIndex } ::= { dot3adDrniConvAdminGatewayTable 1} @@ -2731,20 +3505,28 @@ Dot3adDrniConvAdminGatewayEntry ::= dot3adDrniGatewayConversationID OBJECT-TYPE SYNTAX Integer32 (0..4095) MAX-ACCESS not-accessible - STATUS current + STATUS obsolete DESCRIPTION - "An identifer for a Gateway Conversation." + "An identifer for a Gateway Conversation. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." ::= { dot3adDrniConvAdminGatewayEntry 1} dot3adDrniConvAdminGatewayList OBJECT-TYPE SYNTAX DrniConvAdminGatewayList MAX-ACCESS read-write - STATUS current + STATUS obsolete DESCRIPTION "Priority list of Portal System Numbers in order of preference - from highest to lowest." + from highest to lowest. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.1.1.10" + "7.4.1.1.10 of IEEE Std 802.1AX-2014" ::= { dot3adDrniConvAdminGatewayEntry 2 } -- ------------------------------------------------------------- @@ -2754,26 +3536,35 @@ dot3adDrniConvAdminGatewayList OBJECT-TYPE dot3adDrniIPLEncapMapTable OBJECT-TYPE SYNTAX SEQUENCE OF Dot3adDrniIPLEncapMapEntry MAX-ACCESS not-accessible - STATUS current + STATUS obsolete DESCRIPTION "This managed object is applicable only when Network / IPL - sharing by tag (9.3.2.2) or Network / IPL sharing by encapsulation - (9.3.2.3) is supported. Each entry represents the value of the - identifier used for an IPL frame associated with that Gateway - Conversation ID for the encapsulation method specified in - 7.4.1.1.17." + sharing by tag (9.3.2.2) or Network / IPL sharing by + encapsulation (9.3.2.3) is supported. Each entry represents + the value of the identifier used for an IPL frame associated + with that Gateway Conversation ID for the encapsulation + method specified in 7.4.1.1.17 of IEEE Std 802.1AX-2014. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.1.1.18" + "7.4.1.1.18 of IEEE Std 802.1AX-2014" ::= { dot3adDrni 3 } dot3adDrniIPLEncapMapEntry OBJECT-TYPE SYNTAX Dot3adDrniIPLEncapMapEntry MAX-ACCESS not-accessible - STATUS current + STATUS obsolete DESCRIPTION "An entry represents the value of the identifier used for an IPL frame associated with that Gateway Conversation ID for the - encapsulation method specified in 7.4.1.1.17." + encapsulation method specified in 7.4.1.1.17 of IEEE Std + 802.1AX-2014. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." INDEX { dot3adDrniGatewayConversationID, dot3adDrniIndex } ::= { dot3adDrniIPLEncapMapTable 1 } @@ -2786,13 +3577,17 @@ Dot3adDrniIPLEncapMapEntry ::= dot3adDrniIPLFrameIdValue OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-write - STATUS current + STATUS obsolete DESCRIPTION "The value of the identifier used for an IPL frame associated with that Gateway Conversation ID for the encapsulation - method." + method. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.1.1.18" + "7.4.1.1.18 of IEEE Std 802.1AX-2014" ::= { dot3adDrniIPLEncapMapEntry 2 } -- ------------------------------------------------------------- @@ -2802,31 +3597,41 @@ dot3adDrniIPLFrameIdValue OBJECT-TYPE dot3adDrniNetEncapMapTable OBJECT-TYPE SYNTAX SEQUENCE OF Dot3adDrniNetEncapMapEntry MAX-ACCESS not-accessible - STATUS current + STATUS obsolete DESCRIPTION "This managed object is applicable only when Network / IPL sharing by tag (9.3.2.2) is supported. Each entry represents the translated value of the identifier used for a network frame associated with that Gateway Conversation ID when the method specified in 7.4.1.1.17 - is the Network / IPL sharing by tag method specified in - 9.3.2.2 and the network frames need to share the tag - space used by IPL frames." - REFERENCE - "7.4.1.1.19" + of IEEE Std 802.1AX-2014 is the Network / IPL sharing by + tag method specified in 9.3.2.2 of IEEE Std 802.1AX-2014 + and the network frames need to share the tag + space used by IPL frames. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." + REFERENCE + "7.4.1.1.19 of IEEE Std 802.1AX-2014" ::= { dot3adDrni 4 } dot3adDrniNetEncapMapEntry OBJECT-TYPE SYNTAX Dot3adDrniNetEncapMapEntry MAX-ACCESS not-accessible - STATUS current + STATUS obsolete DESCRIPTION "An entry represents the translated value of the identifier used for a network frame associated with that Gateway - Conversation ID when the method specified in 7.4.1.1.12 is the - Network / IPL sharing by tag method specified in 9.3.2.2 and + Conversation ID when the method specified in 7.4.1.1.12 of + IEEE Std 802.1AX-2014 is the Network / IPL sharing by tag + method specified in 9.3.2.2 of IEEE Std 802.1AX-2014 and the network frames need to share the tag space used by IPL - frames." + frames. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." INDEX { dot3adDrniGatewayConversationID, dot3adDrniIndex } ::= { dot3adDrniNetEncapMapTable 1} @@ -2839,14 +3644,76 @@ Dot3adDrniNetEncapMapEntry ::= dot3adDrniNetFrameIdValue OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-write - STATUS current + STATUS obsolete DESCRIPTION "The translated value of the identifier used for a network - frame associated that Gateway Conversation ID." + frame associated that Gateway Conversation ID. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.1.1.19" + "7.4.1.1.19 of IEEE Std 802.1AX-2014" ::= { dot3adDrniNetEncapMapEntry 1 } +-- ------------------------------------------------------------- +-- The DRNI Admin Gateway Conversation Service Map Table +-- ------------------------------------------------------------- + +dot3adDrniAdminGatewayConvServiceMapTable OBJECT-TYPE + SYNTAX SEQUENCE OF Dot3adDrniAdminGatewayConvServiceMapEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "There are 4096 entries in the table, indexed by + Gateway Conversation ID. Each contains, in general, a set of + 32-bit values interpreted as Service Identifiers. + Service IDs not contained in the map are not + mapped to any Gateway Conversation ID and will be discarded." + REFERENCE + "7.4.1.1.20" + ::= { dot3adDrni 5 } + +dot3adDrniAdminGatewayConvServiceMapEntry OBJECT-TYPE + SYNTAX Dot3adDrniAdminGatewayConvServiceMapEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry contains, in general, a set of Service IDs, + unique within the array." + REFERENCE + "7.4.1.1.20" + INDEX { dot3adDrniAdminGatewayConvServiceMapId, dot3adDrniIndex } + ::= { dot3adDrniAdminGatewayConvServiceMapTable 1 } + +Dot3adDrniAdminGatewayConvServiceMapEntry ::= + SEQUENCE { + dot3adDrniAdminGatewayConvServiceMapId + Integer32, + dot3adDrniAdminGatewayConvServiceMapServiceIDList + ServiceIdList + } + +dot3adDrniAdminGatewayConvServiceMapId OBJECT-TYPE + SYNTAX Integer32 (0..4095) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The Gateway Conversation ID used to index Map + entries." + ::= { dot3adDrniAdminGatewayConvServiceMapEntry 1} + +dot3adDrniAdminGatewayConvServiceMapServiceIDList OBJECT-TYPE + SYNTAX ServiceIdList + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "A list contains, in general, a set of Service IDs, + unique within the array." + REFERENCE + "7.4.1.1.20" + ::= { dot3adDrniAdminGatewayConvServiceMapEntry 2} + -- ------------------------------------------------------------- -- IPP Attribute Table -- ------------------------------------------------------------- @@ -2854,18 +3721,22 @@ dot3adDrniNetFrameIdValue OBJECT-TYPE dot3adIPPAttributeTable OBJECT-TYPE SYNTAX SEQUENCE OF Dot3adIPPAttributeEntry MAX-ACCESS not-accessible - STATUS current + STATUS obsolete DESCRIPTION "A table that contains information about every - IPP that is associated with this System." + IPP that is associated with this System. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.2" + "7.4.2 of IEEE Std 802.1AX-2014" ::= { dot3adIPP 1 } dot3adIPPAttributeEntry OBJECT-TYPE SYNTAX Dot3adIPPAttributeEntry MAX-ACCESS not-accessible - STATUS current + STATUS obsolete DESCRIPTION "An entry containing Attributes for an IPP." INDEX { dot3adIPPIndex } @@ -2885,43 +3756,51 @@ Dot3adIPPAttributeEntry ::= AggState, dot3adIPPTimeOfLastOperChange Integer32 - } + } dot3adIPPIndex OBJECT-TYPE SYNTAX InterfaceIndex MAX-ACCESS not-accessible - STATUS current + STATUS obsolete DESCRIPTION "The unique identifier allocated to this IPP by the local Portal System. This attribute identifies an IPP instance among the subordinate managed objects of the containing object. This value is read-only. NOTE-The aIPPID is represented in the SMIv2 MIB as - an ifIndex-see D.5." + an ifIndex-see D.5. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.2.1.1" + "7.4.2.1.1 of IEEE Std 802.1AX-2014" ::= { dot3adIPPAttributeEntry 1 } dot3adIPPPortConversationPasses OBJECT-TYPE SYNTAX OCTET STRING (SIZE (512)) MAX-ACCESS read-only - STATUS current + STATUS obsolete DESCRIPTION "A read-only current operational vector of Boolean values, with one value for each possible Port Conversation ID. A 1 indicates that the Port Conversation ID is allowed to be transmitted through this IPP Intra-Portal Port, and a 0 - indicates that it cannot. aDrniIPPPortConversationPasses is + indicates that it cannot. aIPPPortConversationPasses is referencing the current value of Ipp_Port_Conversation_Passes - (9.3.4.3)." + (9.3.4.3). + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.2.1.2" + "7.4.2.1.2 of IEEE Std 802.1AX-2014" ::= { dot3adIPPAttributeEntry 2 } dot3adIPPGatewayConversationDirection OBJECT-TYPE SYNTAX OCTET STRING (SIZE (512)) MAX-ACCESS read-only - STATUS current + STATUS obsolete DESCRIPTION "A read-only current operational vector of Boolean values, with one value for each possible Gateway Conversation ID. A 1 @@ -2929,16 +3808,20 @@ dot3adIPPGatewayConversationDirection OBJECT-TYPE Gateways reachable through this IPP Intra-Portal Port, and a 0 indicates that the Gateway for the indexed Gateway Conversation ID is not reachable through this IPP Intra-Portal Port. - aIPPGatewayConversationDirection is referencing the current value of -Ipp_Gateway_Conversation_Direction (9.3.4.3)." - REFERENCE - "7.4.2.1.3" + aIPPGatewayConversationDirection is referencing the current + value of Ipp_Gateway_Conversation_Direction (9.3.4.3). + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." + REFERENCE + "7.4.2.1.3 of IEEE Std 802.1AX-2014" ::= { dot3adIPPAttributeEntry 3 } dot3adIPPAdminState OBJECT-TYPE SYNTAX AggState MAX-ACCESS read-write - STATUS current + STATUS obsolete DESCRIPTION "This read-write value defines the administrative state of the IPP. A value of 'up' indicates that the operational state @@ -2946,15 +3829,19 @@ dot3adIPPAdminState OBJECT-TYPE down. A value of 'down' forces the operational state of the IPP to be down. A GET operation returns the current administrative state. A SET operation changes the administrative state to a - new value." + new value. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.2.1.4" + "7.4.2.1.4 of IEEE Std 802.1AX-2014" ::= { dot3adIPPAttributeEntry 4 } dot3adIPPOperState OBJECT-TYPE SYNTAX AggState MAX-ACCESS read-only - STATUS current + STATUS obsolete DESCRIPTION "This read-only value defines the operational state of the IPP. The operational state is 'up' if the IPL is operational, @@ -2964,15 +3851,19 @@ dot3adIPPOperState OBJECT-TYPE state is 'down.' An operational state of 'up' indicates that the IPP is available for use by the DR Function; a value of 'down' indicates that the IPP is not available for use by the - DR Function." + DR Function. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.2.1.5" + "7.4.2.1.5 of IEEE Std 802.1AX-2014" ::= { dot3adIPPAttributeEntry 5 } dot3adIPPTimeOfLastOperChange OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-only - STATUS current + STATUS obsolete DESCRIPTION "The time at which the interface entered its current operational state, in terms of centiseconds since the @@ -2981,12 +3872,15 @@ dot3adIPPTimeOfLastOperChange OBJECT-TYPE management subsystem, then this object contains a value of zero. The ifLastChange object in the Interfaces MIB defined in IETF RFC 2863 is a suitable object for supplying a - value for aIPPTimeOfLastOperChange. This value is read-only." + value for aIPPTimeOfLastOperChange. This value is read-only. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.2.1.6" + "7.4.2.1.6 of IEEE Std 802.1AX-2014" ::= { dot3adIPPAttributeEntry 6 } - -- ------------------------------------------------------------- -- IPP Statistics Table -- ------------------------------------------------------------- @@ -2994,21 +3888,29 @@ dot3adIPPTimeOfLastOperChange OBJECT-TYPE dot3adIPPStatsTable OBJECT-TYPE SYNTAX SEQUENCE OF Dot3adIPPStatsEntry MAX-ACCESS not-accessible - STATUS current + STATUS obsolete DESCRIPTION "A table that contains information for IPP statistics. A row appears in this table for - each IPP in the system." + each IPP in the system. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.3" + "7.4.3 of IEEE Std 802.1AX-2014" ::= { dot3adIPP 2 } dot3adIPPStatsEntry OBJECT-TYPE SYNTAX Dot3adIPPStatsEntry MAX-ACCESS not-accessible - STATUS current + STATUS obsolete DESCRIPTION - "An entry containing Statistics for an IPP." + "An entry containing Statistics for an IPP. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." INDEX { dot3adIPPIndex } ::= { dot3adIPPStatsTable 1 } @@ -3020,19 +3922,20 @@ Dot3adIPPStatsEntry ::= Counter64, dot3adIPPStatsDRCPDUsTx Counter64 - } + } dot3adIPPStatsDRCPDUsRx OBJECT-TYPE SYNTAX Counter64 UNITS "frames" MAX-ACCESS read-only - STATUS current + STATUS obsolete DESCRIPTION "The number of valid DRCPDUs received on this IPP. This value - is read-only." + is read-only. + This object was replaced by dot3adDrniDRCPDUsRx." REFERENCE - "7.4.3.1.2" + "7.4.3.1.2 of IEEE Std 802.1AX-2014" ::= { dot3adIPPStatsEntry 1 } dot3adIPPStatsIllegalRx OBJECT-TYPE @@ -3040,30 +3943,30 @@ dot3adIPPStatsIllegalRx OBJECT-TYPE UNITS "frames" MAX-ACCESS read-only - STATUS current + STATUS obsolete DESCRIPTION "The number of frames received that carry the DRCP Ethernet Type value (9.4.2.4), but contain a badly formed PDU. This - value is read-only." + value is read-only. + This object was replaced by dot3adDrniIllegalRx." REFERENCE - "7.4.3.1.3" + "7.4.3.1.3 of IEEE Std 802.1AX-2014" ::= { dot3adIPPStatsEntry 2 } - dot3adIPPStatsDRCPDUsTx OBJECT-TYPE SYNTAX Counter64 UNITS "frames" MAX-ACCESS read-only - STATUS current + STATUS obsolete DESCRIPTION "The number of DRCPDUs transmitted on this IPP. This value - is read-only." + is read-only. + This object was replaced by dot3adDrniDRCPDUsTx." REFERENCE - "7.4.3.1.4" + "7.4.3.1.4 of IEEE Std 802.1AX-2014" ::= { dot3adIPPStatsEntry 3 } - -- ------------------------------------------------------------- -- IPP Debug Table -- ------------------------------------------------------------- @@ -3071,21 +3974,29 @@ dot3adIPPStatsDRCPDUsTx OBJECT-TYPE dot3adIPPDebugTable OBJECT-TYPE SYNTAX SEQUENCE OF Dot3adIPPDebugEntry MAX-ACCESS not-accessible - STATUS current + STATUS obsolete DESCRIPTION "A table that contains IPP debug information. A row appears in this table for each IPP in - the system." + the system. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.4" + "7.4.4 of IEEE Std 802.1AX-2014" ::= { dot3adIPP 3 } dot3adIPPDebugEntry OBJECT-TYPE SYNTAX Dot3adIPPDebugEntry MAX-ACCESS not-accessible - STATUS current + STATUS obsolete DESCRIPTION - "An entry containing Debug Information for an IPP." + "An entry containing Debug Information for an IPP. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." INDEX { dot3adIPPIndex } ::= { dot3adIPPDebugTable 1 } @@ -3096,8 +4007,8 @@ Dot3adIPPDebugEntry ::= dot3adIPPDebugLastRxTime TimeTicks, dot3adIPPDebugDifferPortalReason - SnmpAdminString - } + SnmpAdminString + } dot3adIPPDebugDRCPRxState OBJECT-TYPE SYNTAX INTEGER { @@ -3108,7 +4019,7 @@ dot3adIPPDebugDRCPRxState OBJECT-TYPE reportToManagement(5) } MAX-ACCESS read-only - STATUS current + STATUS obsolete DESCRIPTION "This attribute holds the value 'current' if the DRCPDU Receive state machine for the IPP is in the CURRENT state, @@ -3117,40 +4028,50 @@ dot3adIPPDebugDRCPRxState OBJECT-TYPE is in the DEFAULTED state, 'initialize' if the DRCPDU Receive state machine is in the INITIALIZE state, or 'reportToManagement' if the Receive state machine is in the - REPORT_TO_MANAGEMENT state. This value is read-only." + REPORT_TO_MANAGEMENT state. This value is read-only. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.4.1.2" + "7.4.4.1.2 of IEEE Std 802.1AX-2014" ::= { dot3adIPPDebugEntry 1 } - dot3adIPPDebugLastRxTime OBJECT-TYPE SYNTAX TimeTicks MAX-ACCESS read-only - STATUS current + STATUS obsolete DESCRIPTION "The time at which the last DRCPDU was received by this IPP, in terms of centiseconds since the system was last reset. The ifLastChange object in the Interfaces MIB defined in IETF RFC 2863 is a suitable object for supplying a value for - aDrniIPPDebugLastRxTime. This value is read-only." + aIPPDebugLastRxTime. This value is read-only. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.4.1.3" + "7.4.4.1.3 of IEEE Std 802.1AX-2014" ::= { dot3adIPPDebugEntry 2 } dot3adIPPDebugDifferPortalReason OBJECT-TYPE SYNTAX SnmpAdminString MAX-ACCESS read-only - STATUS current + STATUS obsolete DESCRIPTION "A human-readable text string indicating the most recent set of variables that are responsible for setting the variable Differ_Portal or Differ_Conf_Portal (9.4.8) on this IPP to - TRUE. This value is read-only." + TRUE. This value is read-only. + This object was rendered obsolete when the Distributed + Relay model was changed to a sublayer supporting an ISS + (the 'DRNI Gateway Port') and limited to two DRNI Systems + in a DRNI." REFERENCE - "7.4.4.1.4" + "7.4.4.1.4 of IEEE Std 802.1AX-2014" ::= { dot3adIPPDebugEntry 3 } - -- ------------------------------------------------------------- -- Aggregator Notifications -- ------------------------------------------------------------- @@ -3180,7 +4101,6 @@ dot3adAggLinkDownNotification NOTIFICATION-TYPE the Aggregator whose state has changed." ::= { lagMIBNotifications 2 } - -- ------------------------------------------------------------- -- IEEE 802.3ad MIB - Conformance Information -- ------------------------------------------------------------- @@ -3199,7 +4119,7 @@ dot3adAggGroup OBJECT-GROUP OBJECTS { dot3adAggActorSystemID, dot3adAggActorSystemPriority, - dot3adAggAggregateOrIndividual, + dot3adAggAggregateOrIndividual, dot3adAggActorAdminKey, dot3adAggMACAddress, dot3adAggActorOperKey, @@ -3250,13 +4170,13 @@ dot3adAggPortGroup OBJECT-GROUP dot3adAggPortPartnerOperState, dot3adAggPortAggregateOrIndividual } - STATUS current + STATUS deprecated DESCRIPTION "A collection of objects providing information about every - port in an aggregation." + port in an aggregation. + Replaced by dot3adAggPortGroup2." ::= { dot3adAggGroups 3 } - dot3adAggPortStatsGroup OBJECT-GROUP OBJECTS { dot3adAggPortStatsLACPDUsRx, @@ -3266,7 +4186,7 @@ dot3adAggPortStatsGroup OBJECT-GROUP dot3adAggPortStatsIllegalRx, dot3adAggPortStatsLACPDUsTx, dot3adAggPortStatsMarkerPDUsTx, - dot3adAggPortStatsMarkerResponsePDUsTx + dot3adAggPortStatsMarkerResponsePDUsTx } STATUS current DESCRIPTION @@ -3274,7 +4194,6 @@ dot3adAggPortStatsGroup OBJECT-GROUP port in an aggregation." ::= { dot3adAggGroups 4 } - dot3adAggPortDebugGroup OBJECT-GROUP OBJECTS { dot3adAggPortDebugRxState, @@ -3290,10 +4209,11 @@ dot3adAggPortDebugGroup OBJECT-GROUP dot3adAggPortDebugActorChangeCount, dot3adAggPortDebugPartnerChangeCount } - STATUS current + STATUS deprecated DESCRIPTION - "A collection of objects providing debug information about - every aggregated port." + "A collection of objects providing debug information about + every aggregated port. + Replaced by dot3adAggPortDebugGroup2." ::= { dot3adAggGroups 5 } dot3adTablesLastChangedGroup OBJECT-GROUP @@ -3325,7 +4245,7 @@ dot3adAggNotificationGroup NOTIFICATION-GROUP } STATUS current DESCRIPTION - "A collection of notifications providing information about + "A collection of notifications providing information about the aggregation." ::= { dot3adAggGroups 8 } @@ -3380,7 +4300,7 @@ dot3adPerServiceFrameDistGroup OBJECT-GROUP OBJECTS { dot3adAggConversationAdminLinkList, dot3adAggPortAlgorithm, - dot3adAggPartnerAdminPortAlgorithm, + dot3adAggPartnerAdminPortAlgorithm, dot3adAggPartnerAdminPortConversationListDigest, dot3adAggAdminDiscardWrongConversation, dot3adAggPartnerAdminConvServiceMappingDigest, @@ -3389,13 +4309,13 @@ dot3adPerServiceFrameDistGroup OBJECT-GROUP dot3adAggPortPartnerAdminLinkNumberId, dot3adAggPortOperConversationPasses, dot3adAggPortOperConversationCollected, - dot3adAggPortWTRTime + dot3adAggPortWTRTime } STATUS deprecated DESCRIPTION "A collection of objects providing information about Per-Service Frame Distribution. - Replaced by dot3adPerServiceFrameDistGroup2." + Replaced by dot3adPerServiceFrameDistGroup2." ::= { dot3adAggGroups 12 } dot3adAggPortDebugXGroup OBJECT-GROUP @@ -3405,12 +4325,12 @@ dot3adAggPortDebugXGroup OBJECT-GROUP dot3adAggPortDebugActorCDSChurnCount, dot3adAggPortDebugPartnerCDSChurnCount } - STATUS current + STATUS deprecated DESCRIPTION - "A collection of objects extending aggregator port debug." + "A collection of objects extending aggregator port debug. + Deprecated because churn state machines no longer specified." ::= { dot3adAggGroups 13 } - dot3adDrniGroup OBJECT-GROUP OBJECTS { dot3adDrniDescription, @@ -3432,14 +4352,15 @@ dot3adDrniGroup OBJECT-GROUP dot3adDrniDRGatewayConversationPasses, dot3adDrniConvAdminGatewayList, dot3adDrniIPLFrameIdValue, - dot3adDrniNetFrameIdValue, - dot3adDrniPSI, - dot3adDrniPortConversationControl, + dot3adDrniNetFrameIdValue, + dot3adDrniPSI, + dot3adDrniPortConversationControl, dot3adDrniIntraPortalPortProtocolDA } - STATUS current + STATUS obsolete DESCRIPTION - "A collection of objects providing information about DRNI." + "A collection of objects providing information about DRNI. + Replaced by dot3adDrniGroup2." ::= { dot3adAggGroups 14 } dot3adIPPGroup OBJECT-GROUP @@ -3450,9 +4371,12 @@ dot3adIPPGroup OBJECT-GROUP dot3adIPPOperState, dot3adIPPTimeOfLastOperChange } - STATUS current + STATUS obsolete DESCRIPTION - "A collection of objects providing IPP information." + "A collection of objects providing IPP information. + Since only one Intra-Relay Port is supported, these + objects have been replaced by similar objects in + dot3adDrniGroup2." ::= { dot3adAggGroups 15 } dot3adIPPStatsGroup OBJECT-GROUP @@ -3461,9 +4385,12 @@ dot3adIPPStatsGroup OBJECT-GROUP dot3adIPPStatsIllegalRx, dot3adIPPStatsDRCPDUsTx } - STATUS current + STATUS obsolete DESCRIPTION - "A collection of objects providing IPP statistics information." + "A collection of objects providing IPP statistics information. + Since only one Intra-Relay Port is supported, these + objects have been replaced by similar objects in + dot3adDrniGroup2." ::= { dot3adAggGroups 16 } dot3adIPPDebugGroup OBJECT-GROUP @@ -3472,43 +4399,176 @@ dot3adIPPDebugGroup OBJECT-GROUP dot3adIPPDebugLastRxTime, dot3adIPPDebugDifferPortalReason } - STATUS current + STATUS obsolete DESCRIPTION - "A collection of objects providing IPP debug information." + "A collection of objects providing IPP debug information. + Since only one Intra-Relay Port is supported, these + objects have been replaced by similar objects in + dot3adDrniGroup2." ::= { dot3adAggGroups 17 } dot3adPerServiceFrameDistGroup2 OBJECT-GROUP OBJECTS { dot3adAggConversationAdminLinkList, dot3adAggPortAlgorithm, - dot3adAggPartnerAdminPortAlgorithm, + dot3adAggPartnerAdminPortAlgorithm, dot3adAggPartnerAdminPortConversationListDigest, dot3adAggAdminDiscardWrongConversation2, dot3adAggPartnerAdminConvServiceMappingDigest, dot3adAggAdminServiceConversationServiceIDList, dot3adAggPortLinkNumberId, + dot3adAggPortPartnerAdminLinkNumberId, dot3adAggPortOperConversationPasses, dot3adAggPortOperConversationCollected, - dot3adAggPortWTRTime, + dot3adAggPortWTRTime, dot3adAggPortEnableLongPDUXmit } - STATUS current + STATUS deprecated DESCRIPTION "A collection of objects providing information about - Per-Service Frame Distribution." + Per-Service Frame Distribution. + Replaced by dot3adPerServiceFrameDistGroup3." ::= { dot3adAggGroups 18 } +dot3adAggPortGroup2 OBJECT-GROUP + OBJECTS { + dot3adAggPortActorSystemPriority, + dot3adAggPortActorSystemID, + dot3adAggPortActorAdminKey, + dot3adAggPortActorOperKey, + dot3adAggPortPartnerAdminSystemPriority, + dot3adAggPortPartnerOperSystemPriority, + dot3adAggPortPartnerAdminSystemID, + dot3adAggPortPartnerOperSystemID, + dot3adAggPortPartnerAdminKey, + dot3adAggPortPartnerOperKey, + dot3adAggPortSelectedAggID, + dot3adAggPortAttachedAggID, + dot3adAggPortActorPort, + dot3adAggPortActorPortPriority, + dot3adAggPortPartnerAdminPort, + dot3adAggPortPartnerOperPort, + dot3adAggPortPartnerAdminPortPriority, + dot3adAggPortPartnerOperPortPriority, + dot3adAggPortActorAdminState, + dot3adAggPortActorOperState, + dot3adAggPortPartnerAdminState, + dot3adAggPortPartnerOperState, + dot3adAggPortAggregateOrIndividual, + dot3adAggPortWtrRevertive, + dot3adAggPortWtrWaiting, + dot3adAggPortActorLacpVersion, + dot3adAggPortPartnerLacpVersion + } + STATUS current + DESCRIPTION + "A collection of objects providing information about every + port in an aggregation." + ::= { dot3adAggGroups 19 } + +dot3adPerServiceFrameDistGroup3 OBJECT-GROUP + OBJECTS { + dot3adAggConversationAdminLinkList, + dot3adAggPortAlgorithm, + dot3adAggAdminDiscardWrongConversation2, + dot3adAggPortLinkNumberId, + dot3adAggPortOperConversationPasses, + dot3adAggPortOperConversationCollected, + dot3adAggPortWTRTime2, + dot3adAggOperDiscardWrongConversation, + dot3adAggConvLinkDigest, + dot3adAggConvServiceDigest, + dot3adAggPartnerPortAlgorithm, + dot3adAggPartnerConvLinkDigest, + dot3adAggPartnerConvServiceDigest, + dot3adAggActiveLinks, + dot3adAggPortOperLinkNumber, + dot3adAggPortPartnerLinkNumber +} + STATUS current + DESCRIPTION + "A collection of objects providing information about + Per-Service Frame Distribution." +::= { dot3adAggGroups 20 } + +dot3adAggPortDebugGroup2 OBJECT-GROUP + OBJECTS { + dot3adAggPortDebugRxState, + dot3adAggPortDebugLastRxTime, + dot3adAggPortDebugMuxState, + dot3adAggPortDebugMuxReason, + dot3adAggPortDebugActorSyncTransitionCount, + dot3adAggPortDebugPartnerSyncTransitionCount, + dot3adAggPortDebugActorChangeCount, + dot3adAggPortDebugPartnerChangeCount + } + STATUS current + DESCRIPTION + "A collection of objects providing debug information about + every aggregated port." + ::= { dot3adAggGroups 21 } + +dot3adDrniGroup2 OBJECT-GROUP + OBJECTS { + dot3adDrniDescription, + dot3adDrniName, + dot3adDrniAggregator, + dot3adDrniGatewayAlgorithm, + dot3adDrniDRPortConversationPasses, + dot3adDrniDRGatewayConversationPasses, + dot3adDrniProtocolDA, + dot3adDrniAggregatorSystem, + dot3adDrniAggregatorSystemPriority, + dot3adDrniAggregatorKey, + dot3adDrniCscdGatewayControl, + dot3adDrniDRClientGatewayControl, + dot3adDrniGatewayEnableMask, + dot3adDrniGatewayPreferenceMask, + dot3adDrniGatewayConvServiceDigest, + dot3adDrniGatewayAvailableMask, + dot3adDrniIntraRelayPort, + dot3adDrniHomeAdminIrpState, + dot3adDrniHomeOperIrpState, + dot3adDrniNeighborOperIrpState, + dot3adDrniNeighborPortConversationPasses, + dot3adDrniNeighborGatewayConversationPasses, + dot3adDrniNeighborSystem, + dot3adDrniNeighborSystemPriority, + dot3adDrniNeighborDrniKey, + dot3adDrniSequenceNumbers, + dot3adDrniNeighborAggregatorAlgorithm, + dot3adDrniNeighborAggregatorConvServiceDigest, + dot3adDrniNeighborAggregatorConvLinkDigest, + dot3adDrniNeighborPartnerSystem, + dot3adDrniNeighborPartnerSystemPriority, + dot3adDrniNeighborPartnerAggregatorKey, + dot3adDrniNeighborCscdState, + dot3adDrniNeighborActiveLinks, + dot3adDrniNeighborGatewayAlgorithm, + dot3adDrniNeighborGatewayConvServiceDigest, + dot3adDrniNeighborGatewayAvailableMask, + dot3adDrniNeighborGatewayPreferenceMask, + dot3adDrniDRCPDUsRx, + dot3adDrniIllegalRx, + dot3adDrniDRCPDUsTx, + dot3adDrniAggregationPortList, + dot3adDrniAdminGatewayConvServiceMapServiceIDList + } + STATUS current + DESCRIPTION + "A collection of objects providing information about DRNI." + ::= { dot3adAggGroups 22 } -- ------------------------------------------------------------- -- compliance statements -- ------------------------------------------------------------- dot3adAggCompliance MODULE-COMPLIANCE - STATUS deprecated + STATUS obsolete DESCRIPTION "The compliance statement for device support of Link Aggregation. - Replaced by dot3adAggCompliance2." + Replaced by dot3adAggCompliance2." MODULE MANDATORY-GROUPS { @@ -3573,10 +4633,11 @@ dot3adAggCompliance MODULE-COMPLIANCE ::= { dot3adAggCompliances 1 } dot3adAggCompliance2 MODULE-COMPLIANCE - STATUS current + STATUS obsolete DESCRIPTION "The compliance statement for device support of - Link Aggregation." + Link Aggregation. + Replaced by dot3adAggCompliance3." MODULE MANDATORY-GROUPS { @@ -3630,7 +4691,7 @@ dot3adAggCompliance2 MODULE-COMPLIANCE DESCRIPTION "This group is optional." - GROUP dot3adIPPStatsGroup + GROUP dot3adIPPStatsGroup DESCRIPTION "This group is optional." @@ -3640,4 +4701,55 @@ dot3adAggCompliance2 MODULE-COMPLIANCE ::= { dot3adAggCompliances 2 } -END \ No newline at end of file +dot3adAggCompliance3 MODULE-COMPLIANCE + STATUS current + DESCRIPTION + "The compliance statement for device support of + Link Aggregation." + + MODULE + MANDATORY-GROUPS { + dot3adAggGroup, + dot3adAggPortGroup2, + dot3adAggNotificationGroup, + dot3adTablesLastChangedGroup + } + + GROUP dot3adAggPortListGroup + DESCRIPTION + "This group is optional." + + GROUP dot3adAggXGroup + DESCRIPTION + "This group is optional." + + GROUP dot3adAggPortStatsGroup + DESCRIPTION + "This group is optional." + + GROUP dot3adAggPortDebugGroup2 + DESCRIPTION + "This group is optional." + + GROUP dot3adAggPortProtocolDAGroup + DESCRIPTION + "This group is optional." + + GROUP dot3adAggOptionalGroup + DESCRIPTION + "This group is optional." + + GROUP dot3adAggRecommendedGroup + DESCRIPTION + "This group is optional." + + GROUP dot3adPerServiceFrameDistGroup3 + DESCRIPTION + "This group is optional." + + GROUP dot3adDrniGroup2 + DESCRIPTION + "This group is optional." + + ::= { dot3adAggCompliances 3 } +END diff --git a/mibs/IGMP-STD-MIB b/mibs/IGMP-STD-MIB index 8fb1673fffe..f790b73d655 100644 --- a/mibs/IGMP-STD-MIB +++ b/mibs/IGMP-STD-MIB @@ -1,16 +1,15 @@ - IGMP-STD-MIB DEFINITIONS ::= BEGIN IMPORTS - MODULE-IDENTITY, OBJECT-TYPE, experimental, Counter32, Gauge32, - Integer32, IpAddress, TimeTicks FROM SNMPv2-SMI + MODULE-IDENTITY, OBJECT-TYPE, mib-2, Counter32, Gauge32, + Unsigned32, IpAddress, TimeTicks FROM SNMPv2-SMI RowStatus, TruthValue FROM SNMPv2-TC MODULE-COMPLIANCE, OBJECT-GROUP FROM SNMPv2-CONF InterfaceIndexOrZero, InterfaceIndex FROM IF-MIB; igmpStdMIB MODULE-IDENTITY - LAST-UPDATED "9909171200Z" -- September 17, 1999 + LAST-UPDATED "200009280000Z" -- September 28, 2000 ORGANIZATION "IETF IDMR Working Group." CONTACT-INFO " Dave Thaler @@ -20,25 +19,17 @@ igmpStdMIB MODULE-IDENTITY US Phone: +1 425 703 8835 - EMail: dthaler@dthaler.microsoft.com" + EMail: dthaler@microsoft.com" DESCRIPTION "The MIB module for IGMP Management." - REVISION "9909171200Z" -- September 17, 1999 - DESCRIPTION - "Initial version, published as RFC xxxx (to be filled in by - RFC-Editor)." --- ::= { mib-2 xx } + REVISION "200009280000Z" -- September 28, 2000 - ::= { experimental 59 } -- $$$ This value to be changed later !!! - - -- NOTE TO RFC EDITOR: When this document is published as - -- an RFC, replace XX with IANA-assigned value and delete - -- this comment. + DESCRIPTION + "Initial version, published as RFC 2933." + ::= { mib-2 85 } igmpMIBObjects OBJECT IDENTIFIER ::= { igmpStdMIB 1 } -igmp OBJECT IDENTIFIER ::= { igmpMIBObjects 1 } - -- -- The IGMP Interface Table -- @@ -50,7 +41,7 @@ igmpInterfaceTable OBJECT-TYPE DESCRIPTION "The (conceptual) table listing the interfaces on which IGMP is enabled." - ::= { igmp 1 } + ::= { igmpMIBObjects 1 } igmpInterfaceEntry OBJECT-TYPE SYNTAX IgmpInterfaceEntry @@ -64,20 +55,20 @@ igmpInterfaceEntry OBJECT-TYPE IgmpInterfaceEntry ::= SEQUENCE { igmpInterfaceIfIndex InterfaceIndex, - igmpInterfaceQueryInterval Integer32, + igmpInterfaceQueryInterval Unsigned32, igmpInterfaceStatus RowStatus, - igmpInterfaceVersion INTEGER, + igmpInterfaceVersion Unsigned32, igmpInterfaceQuerier IpAddress, - igmpInterfaceQueryMaxResponseTime Integer32, + igmpInterfaceQueryMaxResponseTime Unsigned32, + igmpInterfaceQuerierUpTime TimeTicks, + igmpInterfaceQuerierExpiryTime TimeTicks, igmpInterfaceVersion1QuerierTimer TimeTicks, igmpInterfaceWrongVersionQueries Counter32, igmpInterfaceJoins Counter32, - igmpInterfaceGroups Gauge32, - igmpInterfaceRobustness Integer32, - igmpInterfaceLastMembQueryIntvl Integer32, igmpInterfaceProxyIfIndex InterfaceIndexOrZero, - igmpInterfaceQuerierUpTime TimeTicks, - igmpInterfaceQuerierExpiryTime TimeTicks + igmpInterfaceGroups Gauge32, + igmpInterfaceRobustness Unsigned32, + igmpInterfaceLastMembQueryIntvl Unsigned32 } igmpInterfaceIfIndex OBJECT-TYPE @@ -90,9 +81,9 @@ igmpInterfaceIfIndex OBJECT-TYPE ::= { igmpInterfaceEntry 1 } igmpInterfaceQueryInterval OBJECT-TYPE - SYNTAX Integer32 + SYNTAX Unsigned32 UNITS "seconds" - MAX-ACCESS read-only + MAX-ACCESS read-create STATUS current DESCRIPTION "The frequency at which IGMP Host-Query packets are @@ -102,7 +93,7 @@ igmpInterfaceQueryInterval OBJECT-TYPE igmpInterfaceStatus OBJECT-TYPE SYNTAX RowStatus - MAX-ACCESS read-only + MAX-ACCESS read-create STATUS current DESCRIPTION "The activation of a row enables IGMP on the interface. The @@ -110,8 +101,8 @@ igmpInterfaceStatus OBJECT-TYPE ::= { igmpInterfaceEntry 3 } igmpInterfaceVersion OBJECT-TYPE - SYNTAX INTEGER { version1(1), version2(2) } - MAX-ACCESS read-only + SYNTAX Unsigned32 + MAX-ACCESS read-create STATUS current DESCRIPTION "The version of IGMP which is running on this interface. @@ -119,7 +110,7 @@ igmpInterfaceVersion OBJECT-TYPE running either value. For IGMP to function correctly, all routers on a LAN must be configured to run the same version of IGMP on that LAN." - DEFVAL { version2 } + DEFVAL { 2 } ::= { igmpInterfaceEntry 4 } igmpInterfaceQuerier OBJECT-TYPE @@ -128,13 +119,14 @@ igmpInterfaceQuerier OBJECT-TYPE STATUS current DESCRIPTION "The address of the IGMP Querier on the IP subnet to which + this interface is attached." ::= { igmpInterfaceEntry 5 } igmpInterfaceQueryMaxResponseTime OBJECT-TYPE - SYNTAX Integer32 + SYNTAX Unsigned32 (0..255) UNITS "tenths of seconds" - MAX-ACCESS read-only + MAX-ACCESS read-create STATUS current DESCRIPTION "The maximum query response time advertised in IGMPv2 @@ -142,6 +134,24 @@ igmpInterfaceQueryMaxResponseTime OBJECT-TYPE DEFVAL { 100 } ::= { igmpInterfaceEntry 6 } +igmpInterfaceQuerierUpTime OBJECT-TYPE + SYNTAX TimeTicks + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The time since igmpInterfaceQuerier was last changed." + ::= { igmpInterfaceEntry 7 } + +igmpInterfaceQuerierExpiryTime OBJECT-TYPE + SYNTAX TimeTicks + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The amount of time remaining before the Other Querier + Present Timer expires. If the local system is the querier, + the value of this object is zero." + ::= { igmpInterfaceEntry 8 } + igmpInterfaceVersion1QuerierTimer OBJECT-TYPE SYNTAX TimeTicks MAX-ACCESS read-only @@ -158,11 +168,13 @@ igmpInterfaceWrongVersionQueries OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION + "The number of queries received whose IGMP version does not - match igmpInterfaceVersion. IGMP requires that all routers - on a LAN be configured to run the same version of IGMP. - Thus, if any queries are received with the wrong version, - this indicates a configuration error." + match igmpInterfaceVersion, over the lifetime of the row + entry. IGMP requires that all routers on a LAN be + configured to run the same version of IGMP. Thus, if any + queries are received with the wrong version, this indicates + a configuration error." ::= { igmpInterfaceEntry 10 } igmpInterfaceJoins OBJECT-TYPE @@ -174,9 +186,25 @@ igmpInterfaceJoins OBJECT-TYPE this interface; that is, the number of times an entry for this interface has been added to the Cache Table. This object gives an indication of the amount of IGMP activity - over time." + over the lifetime of the row entry." ::= { igmpInterfaceEntry 11 } +igmpInterfaceProxyIfIndex OBJECT-TYPE + SYNTAX InterfaceIndexOrZero + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Some devices implement a form of IGMP proxying whereby + memberships learned on the interface represented by this + row, cause IGMP Host Membership Reports to be sent on the + interface whose ifIndex value is given by this object. Such + a device would implement the igmpV2RouterMIBGroup only on + its router interfaces (those interfaces with non-zero + igmpInterfaceProxyIfIndex). Typically, the value of this + object is 0, indicating that no proxying is being done." + DEFVAL { 0 } + ::= { igmpInterfaceEntry 12 } + igmpInterfaceGroups OBJECT-TYPE SYNTAX Gauge32 MAX-ACCESS read-only @@ -187,8 +215,9 @@ igmpInterfaceGroups OBJECT-TYPE ::= { igmpInterfaceEntry 13 } igmpInterfaceRobustness OBJECT-TYPE - SYNTAX Integer32 - MAX-ACCESS read-only + SYNTAX Unsigned32 (1..255) + MAX-ACCESS read-create + STATUS current DESCRIPTION "The Robustness Variable allows tuning for the expected @@ -199,9 +228,9 @@ igmpInterfaceRobustness OBJECT-TYPE ::= { igmpInterfaceEntry 14 } igmpInterfaceLastMembQueryIntvl OBJECT-TYPE - SYNTAX Integer32 + SYNTAX Unsigned32 (0..255) UNITS "tenths of seconds" - MAX-ACCESS read-only + MAX-ACCESS read-create STATUS current DESCRIPTION "The Last Member Query Interval is the Max Response Time @@ -211,44 +240,10 @@ igmpInterfaceLastMembQueryIntvl OBJECT-TYPE modify the leave latency of the network. A reduced value results in reduced time to detect the loss of the last member of a group. The value of this object is irrelevant - if igmpInterfaceVersion is version1." + if igmpInterfaceVersion is 1." DEFVAL { 10 } ::= { igmpInterfaceEntry 15 } -igmpInterfaceProxyIfIndex OBJECT-TYPE - SYNTAX InterfaceIndexOrZero - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "Some devices implement a form of IGMP proxying whereby - memberships learned on the interface represented by this - row, cause IGMP Host Membership Reports to be sent on the - interface whose ifIndex value is given by this object. Such - a device would implement the igmpV2RouterMIBGroup only on - its router interfaces (those interfaces with non-zero - igmpInterfaceProxyIfIndex). Typically, the value of this - object is 0, indicating that no proxying is being done." - DEFVAL { 0 } - ::= { igmpInterfaceEntry 16 } - -igmpInterfaceQuerierUpTime OBJECT-TYPE - SYNTAX TimeTicks - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The time since igmpInterfaceQuerier was last changed." - ::= { igmpInterfaceEntry 17 } - -igmpInterfaceQuerierExpiryTime OBJECT-TYPE - SYNTAX TimeTicks - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The amount of time remaining before the Other Querier - Present Timer expires. If the local system is the querier, - the value of this object is zero." - ::= { igmpInterfaceEntry 18 } - -- -- The IGMP Cache Table -- @@ -260,7 +255,7 @@ igmpCacheTable OBJECT-TYPE DESCRIPTION "The (conceptual) table listing the IP multicast groups for which there are members on a particular interface." - ::= { igmp 2 } + ::= { igmpMIBObjects 2 } igmpCacheEntry OBJECT-TYPE SYNTAX IgmpCacheEntry @@ -302,7 +297,7 @@ igmpCacheIfIndex OBJECT-TYPE igmpCacheSelf OBJECT-TYPE SYNTAX TruthValue - MAX-ACCESS read-only + MAX-ACCESS read-create STATUS current DESCRIPTION "An indication of whether the local system is a member of @@ -319,6 +314,7 @@ igmpCacheLastReporter OBJECT-TYPE received for this IP Multicast group address on this interface. If no membership report has been received, this object has the value 0.0.0.0." + ::= { igmpCacheEntry 4 } igmpCacheUpTime OBJECT-TYPE @@ -345,7 +341,7 @@ igmpCacheExpiryTime OBJECT-TYPE igmpCacheStatus OBJECT-TYPE SYNTAX RowStatus - MAX-ACCESS read-only + MAX-ACCESS read-create STATUS current DESCRIPTION "The status of this entry." @@ -388,6 +384,11 @@ igmpV1HostMIBCompliance MODULE-COMPLIANCE DESCRIPTION "Write access is not required." + OBJECT igmpCacheStatus + MIN-ACCESS read-only + DESCRIPTION + "Write access is not required." + ::= { igmpMIBCompliances 1 } igmpV1RouterMIBCompliance MODULE-COMPLIANCE @@ -402,6 +403,10 @@ igmpV1RouterMIBCompliance MODULE-COMPLIANCE OBJECT igmpInterfaceStatus MIN-ACCESS read-only + DESCRIPTION + "Write access is not required." + OBJECT igmpCacheStatus + MIN-ACCESS read-only DESCRIPTION "Write access is not required." @@ -422,6 +427,11 @@ igmpV2HostMIBCompliance MODULE-COMPLIANCE DESCRIPTION "Write access is not required." + OBJECT igmpCacheStatus + MIN-ACCESS read-only + DESCRIPTION + "Write access is not required." + ::= { igmpMIBCompliances 3 } igmpV2RouterMIBCompliance MODULE-COMPLIANCE @@ -437,6 +447,10 @@ igmpV2RouterMIBCompliance MODULE-COMPLIANCE OBJECT igmpInterfaceStatus MIN-ACCESS read-only + DESCRIPTION + "Write access is not required." + OBJECT igmpCacheStatus + MIN-ACCESS read-only DESCRIPTION "Write access is not required." @@ -490,6 +504,7 @@ igmpV2RouterMIBGroup OBJECT-GROUP igmpInterfaceQueryMaxResponseTime, igmpInterfaceRobustness, igmpInterfaceWrongVersionQueries, + igmpInterfaceLastMembQueryIntvl, igmpCacheVersion1HostTimer } @@ -508,4 +523,3 @@ igmpV2ProxyMIBGroup OBJECT-GROUP ::= { igmpMIBGroups 6 } END - diff --git a/mibs/endace/IPFIX-MIB b/mibs/IPFIX-MIB similarity index 86% rename from mibs/endace/IPFIX-MIB rename to mibs/IPFIX-MIB index 5a55438a36d..c3bf30d7684 100644 --- a/mibs/endace/IPFIX-MIB +++ b/mibs/IPFIX-MIB @@ -3,20 +3,20 @@ IPFIX-MIB DEFINITIONS ::= BEGIN IMPORTS MODULE-IDENTITY, OBJECT-TYPE, mib-2, Unsigned32, Counter64, Gauge32 - FROM SNMPv2-SMI -- RFC2578 + FROM SNMPv2-SMI -- [RFC2578] TimeStamp, DateAndTime - FROM SNMPv2-TC -- RFC2579 + FROM SNMPv2-TC -- [RFC2579] MODULE-COMPLIANCE, OBJECT-GROUP - FROM SNMPv2-CONF -- RFC2580 + FROM SNMPv2-CONF -- [RFC2580] InterfaceIndexOrZero - FROM IF-MIB -- RFC2863 + FROM IF-MIB -- [RFC2863] InetAddressType, InetAddress, InetPortNumber - FROM INET-ADDRESS-MIB -- RFC4001 + FROM INET-ADDRESS-MIB -- [RFC4001] PhysicalIndexOrZero - FROM ENTITY-MIB; -- RFC4133 + FROM ENTITY-MIB; -- [RFC4133] ipfixMIB MODULE-IDENTITY - LAST-UPDATED "201004190000Z" -- 19 April 2010 + LAST-UPDATED "201206110000Z" -- 11 June 2012 ORGANIZATION "IETF IPFIX Working Group" CONTACT-INFO "WG charter: @@ -34,16 +34,16 @@ ipfixMIB MODULE-IDENTITY NEC Laboratories Europe Network Research Division Kurfuersten-Anlage 36 - 69115 Heidelberg + Heidelberg 69115 Germany + Phone: +49 6221 4342-128 - Email: Thomas.Dietz@nw.neclab.eu + Email: Thomas.Dietz@neclab.eu Atsushi Kobayashi NTT Information Sharing Platform Laboratories 3-9-11 Midori-cho - Musashino-shi - 180-8585 + Musashino-shi, Tokyo 180-8585 Japan Phone: +81-422-59-3978 Email: akoba@nttv6.net @@ -51,7 +51,7 @@ ipfixMIB MODULE-IDENTITY Benoit Claise Cisco Systems, Inc. De Kleetlaan 6a b1 - Degem 1831 + Diegem 1831 Belgium Phone: +32 2 704 5622 Email: bclaise@cisco.com @@ -61,18 +61,17 @@ ipfixMIB MODULE-IDENTITY Department of Informatics Chair for Network Architectures and Services (I8) Boltzmannstr. 3 - 85748 Garching + Garching 85748 Germany - Phone: +49 89 289-18008 - Email: muenz@net.in.tum.de - URI: http://www.net.in.tum.de/~muenz" + Email: muenz@net.in.tum.de" + DESCRIPTION "The IPFIX MIB defines managed objects for IP Flow Information eXport. These objects provide information about managed nodes supporting the IPFIX protocol, for Exporters as well as for Collectors. - Copyright (c) 2010 IETF Trust and the persons identified as + Copyright (c) 2012 IETF Trust and the persons identified as authors of the code. All rights reserved. Redistribution and use in source and binary forms, with or @@ -84,15 +83,19 @@ ipfixMIB MODULE-IDENTITY -- Revision history - REVISION "201004190000Z" -- 19 April 2010 - DESCRIPTION + REVISION "201206110000Z" -- 11 June 2012 + DESCRIPTION + + "Fixed errata from RFC 5815. Published as RFC 6615." + + REVISION "201004190000Z" -- 19 April 2010 + DESCRIPTION "Initial version, published as RFC 5815." ::= { mib-2 193 } - --****************************************************************** --- Top Level Structure of the MIB +-- Top-Level Structure of the MIB --****************************************************************** ipfixObjects OBJECT IDENTIFIER ::= { ipfixMIB 1 } @@ -102,7 +105,7 @@ ipfixMainObjects OBJECT IDENTIFIER ::= { ipfixObjects 1 } ipfixStatistics OBJECT IDENTIFIER ::= { ipfixObjects 2 } --================================================================== --- 1.1: Objects used by all IPFIX implementations +-- 1.1: Objects Used by All IPFIX Implementations --================================================================== -------------------------------------------------------------------- -- 1.1.1: Transport Session Table @@ -131,6 +134,7 @@ IpfixTransportSessionEntry ::= ipfixTransportSessionIndex Unsigned32, ipfixTransportSessionProtocol Unsigned32, ipfixTransportSessionSourceAddressType InetAddressType, + ipfixTransportSessionSourceAddress InetAddress, ipfixTransportSessionDestinationAddressType InetAddressType, ipfixTransportSessionDestinationAddress InetAddress, @@ -165,25 +169,28 @@ ipfixTransportSessionProtocol OBJECT-TYPE "The transport protocol used for receiving or transmitting IPFIX Messages. Protocol numbers are assigned by IANA. A current list of all assignments is available from - ." + ." REFERENCE - "RFC 5101, Specification of the IP Flow - Information Export (IPFIX) Protocol for the Exchange of IP - Traffic Flow Information, Section 10." + "RFC 5101, Specification of the IP Flow Information Export + (IPFIX) Protocol for the Exchange of IP Traffic Flow + Information, Section 10." ::= { ipfixTransportSessionEntry 2 } ipfixTransportSessionSourceAddressType OBJECT-TYPE - SYNTAX InetAddressType + SYNTAX InetAddressType { unknown(0), ipv4(1), ipv6 (2) } MAX-ACCESS read-only STATUS current DESCRIPTION "The type of address used for the source address, - as specified in RFC 4001. This object is used with protocols - (specified in ipfixTransportSessionProtocol) like TCP (6) - and UDP (17) that have the notion of addresses. SCTP (132) - should use the ipfixTransportSessionSctpAssocId instead. - If SCTP (132) or any other protocol without the notion of - addresses is used, the object MUST be set to unknown(0)." + as specified in RFC 4001. The InetAddressType supported + + values are ipv4(1) and ipv6(2). This object is used with + protocols (specified in ipfixTransportSessionProtocol) like + TCP (6) and UDP (17) that have the notion of addresses. + SCTP (132) should use the ipfixTransportSessionSctpAssocId + instead. If SCTP (132) or any other protocol without the + notion of addresses is used, the object MUST be set to + unknown(0)." ::= { ipfixTransportSessionEntry 3 } ipfixTransportSessionSourceAddress OBJECT-TYPE @@ -193,7 +200,7 @@ ipfixTransportSessionSourceAddress OBJECT-TYPE DESCRIPTION "The source address of the Exporter of the IPFIX Transport Session. This value is interpreted according to the value of - ipfixTransportSessionAddressType as specified in RFC 4001. + ipfixTransportSessionAddressType, as specified in RFC 4001. This object is used with protocols (specified in ipfixTransportSessionProtocol) like TCP (6) and UDP (17) that have the notion of addresses. SCTP (132) should use the @@ -203,17 +210,19 @@ ipfixTransportSessionSourceAddress OBJECT-TYPE ::= { ipfixTransportSessionEntry 4 } ipfixTransportSessionDestinationAddressType OBJECT-TYPE - SYNTAX InetAddressType + SYNTAX InetAddressType { unknown(0), ipv4(1), ipv6 (2) } MAX-ACCESS read-only STATUS current DESCRIPTION "The type of address used for the destination address, - as specified in RFC 4001. This object is used with protocols - (specified in ipfixTransportSessionProtocol) like TCP (6) - and UDP (17) that have the notion of addresses. SCTP (132) - should use the ipfixTransportSessionSctpAssocId instead. - If SCTP (132) or any other protocol without the notion of - addresses is used, the object MUST be set to unknown(0)." + as specified in RFC 4001. The InetAddressType supported + values are ipv4(1) and ipv6(2). This object is used with + protocols (specified in ipfixTransportSessionProtocol) like + TCP (6) and UDP (17) that have the notion of addresses. + SCTP (132) should use the ipfixTransportSessionSctpAssocId + instead. If SCTP (132) or any other protocol without the + notion of addresses is used, the object MUST be set to + unknown(0)." ::= { ipfixTransportSessionEntry 5 } ipfixTransportSessionDestinationAddress OBJECT-TYPE @@ -223,6 +232,7 @@ ipfixTransportSessionDestinationAddress OBJECT-TYPE DESCRIPTION "The destination address of the Collector of the IPFIX Transport Session. This value is interpreted according to + the value of ipfixTransportSessionAddressType, as specified in RFC 4001. This object is used with protocols (specified in ipfixTransportSessionProtocol) like TCP (6) @@ -230,7 +240,7 @@ ipfixTransportSessionDestinationAddress OBJECT-TYPE should use the ipfixTransportSessionSctpAssocId instead. If SCTP (132) or any other protocol without the notion of addresses is used, the object MUST be set to a zero-length - string" + string." ::= { ipfixTransportSessionEntry 6 } ipfixTransportSessionSourcePort OBJECT-TYPE @@ -268,6 +278,7 @@ ipfixTransportSessionDestinationPort OBJECT-TYPE by the ipfixTransportSessionSctpAssocId. If any other protocol without the notion of ports is used, the object MUST be set to zero." + ::= { ipfixTransportSessionEntry 8 } ipfixTransportSessionSctpAssocId OBJECT-TYPE @@ -275,7 +286,7 @@ ipfixTransportSessionSctpAssocId OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "The association id used for the SCTP session between the + "The association ID used for the SCTP session between the Exporter and the Collector of the IPFIX Transport Session. It is equal to the sctpAssocId entry in the sctpAssocTable defined in the SCTP MIB. This object is only valid if @@ -299,12 +310,12 @@ ipfixTransportSessionDeviceMode OBJECT-TYPE exporting(1) This value MUST be used if the Transport Session is - used for exporting Records to other IPFIX Devices, + used for exporting Records to other IPFIX Devices; i.e., this device acts as Exporter. collecting(2) This value MUST be used if the Transport Session is - used for collecting Records from other IPFIX Devices, + used for collecting Records from other IPFIX Devices; i.e., this device acts as Collector." ::= { ipfixTransportSessionEntry 10 } @@ -346,7 +357,7 @@ ipfixTransportSessionOptionsTemplateRefreshTimeout OBJECT-TYPE not received again within this lifetime. This object is only valid if ipfixTransportSessionProtocol - has the value 17 (UDP). In all other cases the value MUST + has the value 17 (UDP). In all other cases, the value MUST be zero." REFERENCE "RFC 5101, Specification of the IP Flow Information Export @@ -369,7 +380,7 @@ ipfixTransportSessionTemplateRefreshPacket OBJECT-TYPE invalid when it is not received again within this lifetime. This object is only valid if ipfixTransportSessionProtocol - has the value 17 (UDP). In all other cases the value MUST + has the value 17 (UDP). In all other cases, the value MUST be zero." REFERENCE "RFC 5101, Specification of the IP Flow Information Export @@ -393,7 +404,7 @@ ipfixTransportSessionOptionsTemplateRefreshPacket OBJECT-TYPE lifetime. This object is only valid if ipfixTransportSessionProtocol - has the value 17 (UDP). In all other cases the value MUST + has the value 17 (UDP). In all other cases, the value MUST be zero." REFERENCE "RFC 5101, Specification of the IP Flow Information Export @@ -406,11 +417,11 @@ ipfixTransportSessionIpfixVersion OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "On Exporters the object contains the version number of the + "On Exporters, the object contains the version number of the IPFIX protocol that the Exporter uses to export its data in this Transport Session. - On Collectors the object contains the version number of the + On Collectors, the object contains the version number of the IPFIX protocol it receives for this Transport Session. If IPFIX Messages of different IPFIX protocol versions are @@ -442,9 +453,9 @@ ipfixTransportSessionStatus OBJECT-TYPE inactive(1) This value MUST be used for Transport Sessions that are specified in the system but are not currently active. - The value can be used, e.g., for Transport Sessions that - are backup (secondary) sessions in a Transport Session - group. + The value can be used, for example, for Transport + Sessions that are backup (secondary) sessions in a + Transport Session group. active(2) This value MUST be used for Transport Sessions that are @@ -467,7 +478,7 @@ ipfixTemplateTable OBJECT-TYPE are received or used for exporting data for a given Transport Session group and Observation Domain. - Withdrawn or invalidated (Options) Template MUST be removed + Withdrawn or invalidated (Options) Templates MUST be removed from this table." ::= { ipfixMainObjects 2 } @@ -497,11 +508,11 @@ ipfixTemplateObservationDomainId OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - "The Id of the Observation Domain for which this Template + "The ID of the Observation Domain for which this Template is defined. This value is used when sending IPFIX Messages. The special value of 0 indicates that the Data Records - exported with this (Option Template) cannot be applied to a + exported with this (Options Template) cannot be applied to a single Observation Domain." REFERENCE "RFC 5101, Specification of the IP Flow Information Export @@ -514,9 +525,9 @@ ipfixTemplateId OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - "This number indicates the Template Id in the IPFIX + "This number indicates the Template ID in the IPFIX Message. Values from 0 to 255 are not allowed for Template - Ids." + IDs." REFERENCE "RFC 5101, Specification of the IP Flow Information Export (IPFIX) Protocol for the Exchange of IP Traffic Flow @@ -528,8 +539,8 @@ ipfixTemplateSetId OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "This number indicates the Set Id of the Template. This - object allows to easily retrieve the Template type. + "This number indicates the Set ID of the Template. This + object allows the Template type to be easily retrieved. Currently, there are two values defined. The value 2 is used for Sets containing Template definitions. The value 3 @@ -553,11 +564,11 @@ ipfixTemplateAccessTime OBJECT-TYPE time is used to know when a retransmission of the (Options) Template is needed. - If it is in collecting mode, this object contains the - time when this (Options) Template was last received from - the Exporter. In the specific case of UDP as transport - protocol, this time is used to know when this (Options) - Template times out and thus is no longer valid." + If the Transport Session is in collecting mode, this object + contains the time when this (Options) Template was last + received from the Exporter. In the specific case of UDP as + transport protocol, this time is used to know when this + (Options) Template times out and thus is no longer valid." ::= { ipfixTemplateEntry 4 } -------------------------------------------------------------------- @@ -597,6 +608,7 @@ IpfixTemplateDefinitionEntry ::= SEQUENCE { ipfixTemplateDefinitionIndex Unsigned32, ipfixTemplateDefinitionIeId Unsigned32, + ipfixTemplateDefinitionIeLength Unsigned32, ipfixTemplateDefinitionEnterpriseNumber Unsigned32, ipfixTemplateDefinitionFlags BITS @@ -624,12 +636,12 @@ ipfixTemplateDefinitionIeId OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "This indicates the Information Element Id at position + "This indicates the Information Element ID at position ipfixTemplateDefinitionIndex in the (Options) Template ipfixTemplateId. This implicitly specifies the data type of the Information Element. The elements are registered at IANA. A current list of assignments can be found at - " + ." REFERENCE "RFC 5101, Specification of the IP Flow Information Export (IPFIX) Protocol for the Exchange of IP Traffic Flow @@ -642,8 +654,9 @@ ipfixTemplateDefinitionIeLength OBJECT-TYPE SYNTAX Unsigned32 (0..65535) MAX-ACCESS read-only STATUS current + DESCRIPTION - "This indicates the length of the Information Element Id at + "This indicates the length of the Information Element ID at position ipfixTemplateDefinitionIndex in the (Options) Template ipfixTemplateId." REFERENCE @@ -668,7 +681,7 @@ ipfixTemplateDefinitionEnterpriseNumber OBJECT-TYPE This object must be zero(0) for all standard Information Elements registered with IANA. A current list of these elements is available from - ." + ." REFERENCE "RFC 5101, Specification of the IP Flow Information Export (IPFIX) Protocol for the Exchange of IP Traffic Flow @@ -696,7 +709,7 @@ ipfixTemplateDefinitionFlags OBJECT-TYPE Thus, we get the following values for an Information Element: - If neither bit scope(0) nor bit flowKey(1) are set + If neither bit scope(0) nor bit flowKey(1) is set The Information Element is neither used for scoping nor as Flow Key. If only bit scope(0) is set @@ -707,8 +720,8 @@ ipfixTemplateDefinitionFlags OBJECT-TYPE Both bit scope(0) and flowKey(1) MUST NOT be set at the same time. This combination is not allowed." REFERENCE - "RFC 5101, Specification of the IP Flow Information - Export (IPFIX) Protocol for the Exchange of IP Traffic Flow + "RFC 5101, Specification of the IP Flow Information Export + (IPFIX) Protocol for the Exchange of IP Traffic Flow Information, Sections 2 and 3.4.2.1. RFC 5102, Information Model for IP Flow Information Export." @@ -722,9 +735,10 @@ ipfixExportTable OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - "This table lists all exports of an IPFIX device. + "This table lists all exports of an IPFIX Device. + On Exporters, this table contains all exports grouped by - Transport Session, Observation Domain Id, Template Id, and + Transport Session, Observation Domain ID, Template ID, and Metering Process represented by the ipfixMeteringProcessCacheId. Thanks to the ipfixExportIndex, the exports can group one or more Transport Sessions to @@ -734,10 +748,11 @@ ipfixExportTable OBJECT-TYPE and ipfixMeteringProcessCacheId define a Transport Session group. If the Exporter does not use Transport Session grouping, then each ipfixExportIndex contains a - single ipfixMeteringProcessCacheId and thus a singe - Transport Session, and this session MUST have the member - type primary(1). Transport Sessions referenced in this - table MUST have the ipfixTransportSessionDeviceMode + single ipfixMeteringProcessCacheId, and thus a single + Transport Session; this session MUST have a member type + + value of primary(1). Transport Sessions referenced in this + table MUST have a ipfixTransportSessionDeviceMode value of exporting(1). On Collectors, this table is not needed." @@ -771,8 +786,9 @@ ipfixExportIndex OBJECT-TYPE the ipfixExportTable. The value is expected to remain constant from a re-initialization of the entity's network management agent to the next re-initialization. + A common ipfixExportIndex between two entries from this - table expresses that there is a relationship between the + table indicates that there is a relationship between the Transport Sessions in ipfixTransportSessionIndex. The type of relationship is expressed by the value of ipfixExportMemberType." @@ -783,13 +799,14 @@ ipfixExportMemberType OBJECT-TYPE unknown(0), primary(1), secondary(2), + parallel(3), loadBalancing(4) } MAX-ACCESS read-only STATUS current DESCRIPTION - "The type of a member Transport Session in a Transport + "The type of member Transport Session in a Transport Session group (identified by the value of ipfixExportIndex, ipfixObservationDomainId, and ipfixMeteringProcessCacheId). The following values are valid: @@ -818,10 +835,10 @@ ipfixExportMemberType OBJECT-TYPE parallel(3) This value is used for a group member that is used for - duplicate exporting, i.e., all group members identified + duplicate exporting (i.e., all group members identified by the ipfixExportIndex are exporting the same Records - in parallel. This implies that all group members MUST - have the same membertype parallel(3). + in parallel). This implies that all group members MUST + have the same member type (i.e., parallel(3)). loadBalancing(4) This value is used for a group member that is used @@ -829,7 +846,7 @@ ipfixExportMemberType OBJECT-TYPE Record is sent to one of the group members in this group identified by ipfixExportIndex. This implies that all group members MUST have the same - membertype loadBalancing(4)." + member type (i.e., loadBalancing(4))." ::= { ipfixExportEntry 2 } -------------------------------------------------------------------- @@ -864,7 +881,7 @@ IpfixMeteringProcessEntry ::= ipfixMeteringProcessCacheId Unsigned32, ipfixMeteringProcessObservationPointGroupRef Unsigned32, ipfixMeteringProcessCacheActiveTimeout Unsigned32, - ipfixMeteringProcessCacheInactiveTimeout Unsigned32 + ipfixMeteringProcessCacheIdleTimeout Unsigned32 } ipfixMeteringProcessCacheId OBJECT-TYPE @@ -873,7 +890,7 @@ ipfixMeteringProcessCacheId OBJECT-TYPE STATUS current DESCRIPTION "Locally arbitrary, but unique identifier of an entry in the - ipfixMeterinProcessTable. The value is expected to remain + ipfixMeteringProcessTable. The value is expected to remain constant from a re-initialization of the entity's network management agent to the next re-initialization." ::= { ipfixMeteringProcessEntry 1 } @@ -883,7 +900,7 @@ ipfixMeteringProcessObservationPointGroupRef OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "The Observation Point Group Id that links this table entry + "The Observation Point Group ID that links this table entry to the ipfixObservationPointTable. The matching ipfixObservationPointGroupId in that table gives the Observation Points used in that cache. If the Observation @@ -898,7 +915,7 @@ ipfixMeteringProcessCacheActiveTimeout OBJECT-TYPE STATUS current DESCRIPTION "On the Exporter, this object contains the time after which a - Flow is expired (and a Data Record for the template is sent) + Flow is expired (and a Data Record for the Template is sent), even though packets matching this Flow are still received by the Metering Process. If this value is 0, the Flow is not prematurely expired." @@ -907,17 +924,17 @@ ipfixMeteringProcessCacheActiveTimeout OBJECT-TYPE Section 5.1.1, item 3." ::= { ipfixMeteringProcessEntry 3 } -ipfixMeteringProcessCacheInactiveTimeout OBJECT-TYPE +ipfixMeteringProcessCacheIdleTimeout OBJECT-TYPE SYNTAX Unsigned32 UNITS "seconds" MAX-ACCESS read-only STATUS current DESCRIPTION - "On the Exporter. this object contains the time after which a - Flow is expired (and a Data Record for the template is sent) + "On the Exporter, this object contains the time after which a + Flow is expired (and a Data Record for the Template is sent) when no packets matching this Flow are received by the Metering Process for the given number of seconds. If this - value is zero, the Flow is expired immediately, i.e., a Data + value is zero, the Flow is expired immediately; i.e., a Data Record is sent for every packet received by the Metering Process." REFERENCE @@ -934,11 +951,11 @@ ipfixObservationPointTable OBJECT-TYPE STATUS current DESCRIPTION "This table lists the Observation Points used within an - Exporter by the Metering Process. The index + Exporter by the Metering Process. The index ipfixObservationPointGroupId groups Observation Points and is referenced in the Metering Process table. - On Collectors this table is not needed." + On Collectors, this table is not needed." ::= { ipfixMainObjects 6 } ipfixObservationPointEntry OBJECT-TYPE @@ -976,11 +993,10 @@ ipfixObservationPointGroupId OBJECT-TYPE This index represents a group of Observation Points. The special value of 0 MUST NOT be used within this table - but is reserved for the usage in the - ipfixMeteringProcessTable. An index of 0 for the - ipfixObservationPointGroupReference index in that table - indicates that an Observation Point is unknown or - unspecified for a Metering Process cache." + but is reserved for usage in the ipfixMeteringProcessTable. + An index of 0 for the ipfixObservationPointGroupReference + index in that table indicates that an Observation Point is + unknown or unspecified for a Metering Process cache." ::= { ipfixObservationPointEntry 1 } ipfixObservationPointIndex OBJECT-TYPE @@ -1002,7 +1018,7 @@ ipfixObservationPointObservationDomainId OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "The Id of the Observation Domain in which this + "The ID of the Observation Domain in which this Observation Point is included. The special value of 0 indicates that the Observation @@ -1010,8 +1026,8 @@ ipfixObservationPointObservationDomainId OBJECT-TYPE Observation Domain." REFERENCE "RFC 5101, Specification of the IP Flow Information Export - (IPFIX) Protocol for the Exchange of IP - Traffic Flow Information, Section 3.1." + (IPFIX) Protocol for the Exchange of IP Traffic Flow + Information, Section 3.1." ::= { ipfixObservationPointEntry 3 } ipfixObservationPointPhysicalEntity OBJECT-TYPE @@ -1022,6 +1038,7 @@ ipfixObservationPointPhysicalEntity OBJECT-TYPE "This object contains the index of a physical entity in the ENTITY MIB. This physical entity is the given Observation Point. If such a physical entity cannot be + specified or is not known, then the object is zero." ::= { ipfixObservationPointEntry 4 } @@ -1031,16 +1048,17 @@ ipfixObservationPointPhysicalInterface OBJECT-TYPE STATUS current DESCRIPTION "This object contains the index of a physical interface in - the IF MIB. This physical interface is the given + the Interfaces MIB. This physical interface is the given Observation Point. If such a physical interface cannot be specified or is not known, then the object is zero. - This object MAY be used stand alone or in addition to + This object MAY be used alone or in addition to ipfixObservationPointPhysicalEntity. If - ipfixObservationPointPhysicalEntity is not zero, this object - MUST point to the same physical interface that is + ipfixObservationPointPhysicalEntity is not zero, this + object MUST point to the same physical interface that is referenced in ipfixObservationPointPhysicalEntity. - Otherwise, it may reference any interface in the IF MIB." + Otherwise, it may reference any interface in the + Interfaces MIB." ::= { ipfixObservationPointEntry 5 } ipfixObservationPointPhysicalEntityDirection OBJECT-TYPE @@ -1057,8 +1075,8 @@ ipfixObservationPointPhysicalEntityDirection OBJECT-TYPE physical entity. The following values are valid: unknown(0) - This value MUST be used if a direction is not - known for the given physical entity. + This value MUST be used if a direction is not known for + the given physical entity. ingress(1) This value is used for monitoring incoming Flows on the @@ -1069,6 +1087,7 @@ ipfixObservationPointPhysicalEntityDirection OBJECT-TYPE given physical entity. both(3) + This value is used for monitoring incoming and outgoing Flows on the given physical entity." ::= { ipfixObservationPointEntry 6 } @@ -1087,17 +1106,18 @@ ipfixSelectionProcessTable OBJECT-TYPE by the ipfixSelectionProcessIndex. The Selector Functions are applied within the Selection Process to the packets observed for the given Metering Process cache in increasing - order implied by the ipfixSelectionProcessSelectorIndex. - This means Selector Functions with lower - ipfixSelectionProcessSelectorIndex are applied first. The - remaining packets are accounted for in Flow Records. + order as indicated by the ipfixSelectionProcessSelectorIndex. + This means Selector Functions with a lower + ipfixSelectionProcessSelectorIndex are applied first. + The remaining packets are accounted for in Flow Records. + Since IPFIX does not define any Selector Function (except selecting every packet), this is a placeholder for future use and a guideline for implementing enterprise-specific Selector Function objects. - The following object tree should visualize how the - Selector Function objects should be implemented: + The following object tree should help the reader visualize + how the Selector Function objects should be implemented: ipfixSelectorFunctions | @@ -1112,7 +1132,7 @@ ipfixSelectionProcessTable OBJECT-TYPE | +- ipfixFuncF2Parameters (a table with parameters) ... | - +- ipfixFunFn... + +- ipfixFuncFn... If a Selector Function takes parameters, the MIB should contain a table with an entry for each set of parameters @@ -1155,11 +1175,11 @@ ipfixSelectionProcessSelectorIndex OBJECT-TYPE STATUS current DESCRIPTION "Index specifying the order in which the referenced - ipfixSelctionProcessSelectorFunctions are applied to the + ipfixSelectionProcessSelectorFunctions are applied to the observed packet stream within the given Selection Process (identified by the ipfixSelectionProcessIndex). The - Selector Functions are applied in increasing order, i.e., - Selector Functions with lower index are applied first." + Selector Functions are applied in increasing order; i.e., + Selector Functions with a lower index are applied first." ::= { ipfixSelectionProcessEntry 2 } ipfixSelectionProcessSelectorFunction OBJECT-TYPE @@ -1189,7 +1209,7 @@ ipfixTransportSessionStatsTable OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - "This table lists Transport Sessions statistics between + "This table lists Transport Session statistics between Exporting Processes and Collecting Processes." ::= { ipfixStatistics 1 } @@ -1210,6 +1230,7 @@ IpfixTransportSessionStatsEntry ::= ipfixTransportSessionMessages Counter64, ipfixTransportSessionDiscardedMessages Counter64, ipfixTransportSessionRecords Counter64, + ipfixTransportSessionTemplates Counter64, ipfixTransportSessionOptionsTemplates Counter64, ipfixTransportSessionDiscontinuityTime TimeStamp @@ -1224,7 +1245,7 @@ ipfixTransportSessionRate OBJECT-TYPE "The number of bytes per second received by the Collector or transmitted by the Exporter. A value of zero (0) means that no packets were sent or - received, yet. This object is updated every second." + received yet. This object is updated every second." ::= { ipfixTransportSessionStatsEntry 1 } ipfixTransportSessionPackets OBJECT-TYPE @@ -1258,6 +1279,7 @@ ipfixTransportSessionBytes OBJECT-TYPE ipfixTransportSessionMessages OBJECT-TYPE SYNTAX Counter64 MAX-ACCESS read-only + STATUS current DESCRIPTION "The number of IPFIX Messages received by the @@ -1273,13 +1295,13 @@ ipfixTransportSessionDiscardedMessages OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "The number of received IPFIX Message that are malformed, + "The number of received IPFIX Messages that are malformed, cannot be decoded, are received in the wrong order, or are missing according to the sequence number. If used at the Exporter, the number of messages that could - not be sent due to, e.g., internal buffer overflows, network - congestion, or routing issues. + not be sent due to, for example, internal buffer overflows, + network congestion, or routing issues. Discontinuities in the value of this counter can occur at re-initialization of the management system and at other times as indicated by the value of @@ -1306,6 +1328,7 @@ ipfixTransportSessionTemplates OBJECT-TYPE DESCRIPTION "The number of Templates received or transmitted. Discontinuities in the value of this counter can occur at + re-initialization of the management system and at other times as indicated by the value of ipfixTransportSessionDiscontinuityTime." @@ -1324,14 +1347,14 @@ ipfixTransportSessionOptionsTemplates OBJECT-TYPE ::= { ipfixTransportSessionStatsEntry 8 } ipfixTransportSessionDiscontinuityTime OBJECT-TYPE - SYNTAX TimeStamp - MAX-ACCESS read-only - STATUS current + SYNTAX TimeStamp + MAX-ACCESS read-only + STATUS current DESCRIPTION "The value of sysUpTime at the most recent occasion at which one or more of the Transport Session counters suffered a discontinuity. - A value of zero indicates no such discontinuity has + A value of zero indicates that no such discontinuity has occurred since the last re-initialization of the local management subsystem." ::= { ipfixTransportSessionStatsEntry 9 } @@ -1353,6 +1376,7 @@ ipfixTemplateStatsEntry OBJECT-TYPE STATUS current DESCRIPTION "Defines an entry in the ipfixTemplateStatsTable." + AUGMENTS { ipfixTemplateEntry } ::= { ipfixTemplateStatsTable 1 } @@ -1370,19 +1394,19 @@ ipfixTemplateDataRecords OBJECT-TYPE "The number of Data Records that are transmitted or received per Template. Discontinuities in the value of this counter can occur at - re-initialization of the management system, and at other + re-initialization of the management system and at other times as indicated by the value of ipfixTemplateDiscontinuityTime." ::= { ipfixTemplateStatsEntry 1 } ipfixTemplateDiscontinuityTime OBJECT-TYPE - SYNTAX TimeStamp - MAX-ACCESS read-only - STATUS current + SYNTAX TimeStamp + MAX-ACCESS read-only + STATUS current DESCRIPTION "The value of sysUpTime at the most recent occasion at which the Template counter suffered a discontinuity. - A value of zero indicates no such discontinuity has + A value of zero indicates that no such discontinuity has occurred since the last re-initialization of the local management subsystem." ::= { ipfixTemplateStatsEntry 2 } @@ -1395,7 +1419,7 @@ ipfixMeteringProcessStatsTable OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - "This table lists statistic objects that have data per + "This table lists statistics objects that have data per Metering Process cache. On Collectors, this table is not needed." @@ -1443,17 +1467,18 @@ ipfixMeteringProcessCacheDataRecords OBJECT-TYPE Discontinuities in the value of this counter can occur at re-initialization of the management system and at other times as indicated by the value of - ipfixTemplateDiscontinuityTime." + ipfixMeteringProcessCacheDiscontinuityTime." ::= { ipfixMeteringProcessStatsEntry 3 } ipfixMeteringProcessCacheDiscontinuityTime OBJECT-TYPE - SYNTAX TimeStamp - MAX-ACCESS read-only - STATUS current + SYNTAX TimeStamp + MAX-ACCESS read-only + + STATUS current DESCRIPTION "The value of sysUpTime at the most recent occasion at which the Metering Process counter suffered a discontinuity. - A value of zero indicates no such discontinuity has + A value of zero indicates that no such discontinuity has occurred since the last re-initialization of the local management subsystem." ::= { ipfixMeteringProcessStatsEntry 4 } @@ -1467,7 +1492,7 @@ ipfixSelectionProcessStatsTable OBJECT-TYPE STATUS current DESCRIPTION "This table contains statistics for the Selector Functions - connected to Metering Process by the index + connected to a Metering Process by the index ipfixMeteringProcessCacheId. The indexes MUST match an entry in the @@ -1497,6 +1522,7 @@ ipfixSelectionProcessStatsPacketsObserved OBJECT-TYPE "The number of packets observed at the entry point of the function. The entry point may be the Observation Point or the exit point of another Selector Function. + Discontinuities in the value of this counter can occur at re-initialization of the management system and at other times as indicated by the value of @@ -1516,14 +1542,14 @@ ipfixSelectionProcessStatsPacketsDropped OBJECT-TYPE ::= { ipfixSelectionProcessStatsEntry 2 } ipfixSelectionProcessStatsDiscontinuityTime OBJECT-TYPE - SYNTAX TimeStamp - MAX-ACCESS read-only - STATUS current + SYNTAX TimeStamp + MAX-ACCESS read-only + STATUS current DESCRIPTION "The value of sysUpTime at the most recent occasion at which one or more of the Selector counters suffered a discontinuity. - A value of zero indicates no such discontinuity has + A value of zero indicates that no such discontinuity has occurred since the last re-initialization of the local management subsystem." ::= { ipfixSelectionProcessStatsEntry 3 } @@ -1541,17 +1567,17 @@ ipfixCollectorCompliance MODULE-COMPLIANCE STATUS current DESCRIPTION "An implementation that builds an IPFIX Collector - that complies to this module MUST implement the objects + that complies with this module MUST implement the objects defined in the mandatory group ipfixCommonGroup. The implementation of all objects in the other groups is optional and depends on the corresponding functionality implemented in the equipment. - An implementation that is compliant to this MIB module - is limited to use only the values TCP (6), UDP (17), and + An implementation that is compliant with this MIB module + is limited to using only the values TCP (6), UDP (17), and SCTP (132) in the ipfixTransportSessionProtocol object - because these are the only protocol currently specified + because these are the only protocols currently specified for usage within IPFIX (see RFC 5101)." MODULE -- this module MANDATORY-GROUPS { @@ -1565,10 +1591,10 @@ ipfixCollectorCompliance MODULE-COMPLIANCE ::= { ipfixCompliances 1 } ipfixExporterCompliance MODULE-COMPLIANCE - STATUS current + STATUS current DESCRIPTION "An implementation that builds an IPFIX Exporter that - complies to this module MUST implement the objects defined + complies with this module MUST implement the objects defined in the mandatory group ipfixCommonGroup. The implementation of all other objects depends on the implementation of the corresponding functionality in the equipment." @@ -1585,8 +1611,8 @@ ipfixExporterCompliance MODULE-COMPLIANCE GROUP ipfixExporterStatsGroup DESCRIPTION - "These objects MUST be implemented if statistical functions - are implemented on the equipment." + "These objects MUST be implemented if statistics functions + are implemented in the equipment." ::= { ipfixCompliances 2 } -------------------------------------------------------------------- @@ -1637,6 +1663,7 @@ ipfixCommonStatsGroup OBJECT-GROUP ipfixTemplateDataRecords, ipfixTemplateDiscontinuityTime + } STATUS current DESCRIPTION @@ -1649,7 +1676,7 @@ ipfixExporterGroup OBJECT-GROUP ipfixMeteringProcessObservationPointGroupRef, ipfixMeteringProcessCacheActiveTimeout, - ipfixMeteringProcessCacheInactiveTimeout, + ipfixMeteringProcessCacheIdleTimeout, ipfixObservationPointObservationDomainId, ipfixObservationPointPhysicalEntity, @@ -1680,4 +1707,3 @@ ipfixExporterStatsGroup OBJECT-GROUP ::= { ipfixGroups 4 } END - diff --git a/mibs/equallogic/IPS-AUTH-MIB b/mibs/IPS-AUTH-MIB similarity index 100% rename from mibs/equallogic/IPS-AUTH-MIB rename to mibs/IPS-AUTH-MIB diff --git a/mibs/equallogic/ISCSI-MIB b/mibs/ISCSI-MIB similarity index 100% rename from mibs/equallogic/ISCSI-MIB rename to mibs/ISCSI-MIB diff --git a/mibs/LM-SENSORS-MIB b/mibs/LM-SENSORS-MIB index d0734b33fdb..217fef75b4f 100644 --- a/mibs/LM-SENSORS-MIB +++ b/mibs/LM-SENSORS-MIB @@ -17,13 +17,18 @@ IMPORTS FROM UCD-SNMP-MIB; lmSensorsMIB MODULE-IDENTITY - LAST-UPDATED "200011050000Z" + LAST-UPDATED "202411230000Z" ORGANIZATION "AdamsNames Ltd" CONTACT-INFO "Primary Contact: M J Oldfield email: m@mail.tc" DESCRIPTION "This MIB module defines objects for lm_sensor derived data." + + REVISION "202411230000Z" + DESCRIPTION + "Add the lmTempSensorsTemperature object to allow negative temperatures" + REVISION "200011050000Z" DESCRIPTION "Derived from DISKIO-MIB ex UCD." @@ -75,10 +80,22 @@ lmTempSensorsDevice OBJECT-TYPE lmTempSensorsValue OBJECT-TYPE SYNTAX Gauge32 MAX-ACCESS read-only - STATUS current + STATUS deprecated DESCRIPTION - "The temperature of this sensor in mC." + "The temperature of this sensor in mCel. + + Deprecated in favor of lmTempSensorsTemperature as temperatures can be + negative" ::= { lmTempSensorsEntry 3 } + +lmTempSensorsTemperature OBJECT-TYPE + SYNTAX Integer32 + UNITS "mCel" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The temperature of this sensor in mCel." + ::= { lmTempSensorsEntry 4 } -- lmFanSensorsTable OBJECT-TYPE diff --git a/mibs/nokia/MPLS-LDP-MIB b/mibs/MPLS-LDP-MIB similarity index 100% rename from mibs/nokia/MPLS-LDP-MIB rename to mibs/MPLS-LDP-MIB diff --git a/mibs/OSPF-TRAP-MIB b/mibs/OSPF-TRAP-MIB index 8a3ab990ce1..1ec17cd874c 100644 --- a/mibs/OSPF-TRAP-MIB +++ b/mibs/OSPF-TRAP-MIB @@ -1,443 +1,591 @@ OSPF-TRAP-MIB DEFINITIONS ::= BEGIN - IMPORTS - MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE, IpAddress - FROM SNMPv2-SMI - MODULE-COMPLIANCE, OBJECT-GROUP - FROM SNMPv2-CONF - ospfRouterId, ospfIfIpAddress, ospfAddressLessIf, ospfIfState, - ospfVirtIfAreaId, ospfVirtIfNeighbor, ospfVirtIfState, - ospfNbrIpAddr, ospfNbrAddressLessIndex, ospfNbrRtrId, - ospfNbrState, ospfVirtNbrArea, ospfVirtNbrRtrId, ospfVirtNbrState, - ospfLsdbType, ospfLsdbLsid, ospfLsdbRouterId, ospfLsdbAreaId, - ospfExtLsdbLimit, ospf - FROM OSPF-MIB; - - ospfTrap MODULE-IDENTITY - LAST-UPDATED "9501201225Z" -- Fri Jan 20 12:25:50 PST 1995 - ORGANIZATION "IETF OSPF Working Group" - CONTACT-INFO - " Fred Baker - Postal: Cisco Systems - 519 Lado Drive - Santa Barbara, California 93111 - Tel: +1 805 681 0115 - E-Mail: fred@cisco.com - - Rob Coltun - Postal: RainbowBridge Communications - Tel: (301) 340-9416 - E-Mail: rcoltun@rainbow-bridge.com" +IMPORTS + MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE, IpAddress + FROM SNMPv2-SMI + MODULE-COMPLIANCE, OBJECT-GROUP, NOTIFICATION-GROUP + FROM SNMPv2-CONF + ospfRouterId, ospfIfIpAddress, ospfAddressLessIf, ospfIfState, + ospfVirtIfAreaId, ospfVirtIfNeighbor, ospfVirtIfState, + ospfNbrIpAddr, ospfNbrAddressLessIndex, ospfNbrRtrId, + ospfNbrState, ospfVirtNbrArea, ospfVirtNbrRtrId, + ospfVirtNbrState, ospfLsdbType, ospfLsdbLsid, ospfLsdbRouterId, + ospfLsdbAreaId, ospfExtLsdbLimit, ospf, ospfAreaId, + ospfAreaNssaTranslatorState, ospfRestartStatus, + ospfRestartInterval, ospfRestartExitReason, + ospfNbrRestartHelperStatus, ospfNbrRestartHelperAge, + ospfNbrRestartHelperExitReason, ospfVirtNbrRestartHelperStatus, + ospfVirtNbrRestartHelperAge, ospfVirtNbrRestartHelperExitReason + FROM OSPF-MIB; + + ospfTrap MODULE-IDENTITY + + LAST-UPDATED "200611100000Z" -- November 10, 2006 00:00:00 EST + ORGANIZATION "IETF OSPF Working Group" + CONTACT-INFO + "WG E-Mail: ospf@ietf.org + + WG Chairs: acee@cisco.com + rohit@gmail.com + + Editors: Dan Joyal + Nortel + 600 Technology Park Drive + Billerica, MA 01821 + djoyal@nortel.com + + Piotr Galecki + Airvana + 19 Alpha Road + Chelmsford, MA 01824 + pgalecki@airvana.com + + Spencer Giacalone + CSFB + Eleven Madison Ave + New York, NY 10010-3629 + + spencer.giacalone@gmail.com" + DESCRIPTION - "The MIB module to describe traps for the OSPF - Version 2 Protocol." - ::= { ospf 16 } + "The MIB module to describe traps for the OSPF + Version 2 Protocol. --- Trap Support Objects + Copyright (C) The IETF Trust (2006). + This version of this MIB module is part of + RFC 4750; see the RFC itself for full legal + notices." --- The following are support objects for the OSPF traps. + REVISION "200611100000Z" -- November 10, 2006 00:00:00 EST + DESCRIPTION + "Updated for latest changes to OSPFv2: + -added graceful restart related traps + -added new config error types + -added ospfNssaTranslatorStatusChange trap. + See Appendix B of RFC 4750 for more details. -ospfTrapControl OBJECT IDENTIFIER ::= { ospfTrap 1 } -ospfTraps OBJECT IDENTIFIER ::= { ospfTrap 2 } + This version published as part of RFC 4750" - ospfSetTrap OBJECT-TYPE - SYNTAX OCTET STRING (SIZE(4)) - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "A four-octet string serving as a bit map for - the trap events defined by the OSPF traps. This - object is used to enable and disable specific - OSPF traps where a 1 in the bit field - represents enabled. The right-most bit (least - significant) represents trap 0." - ::= { ospfTrapControl 1 } - - - ospfConfigErrorType OBJECT-TYPE - SYNTAX INTEGER { - badVersion (1), - areaMismatch (2), - unknownNbmaNbr (3), -- Router is Dr eligible - unknownVirtualNbr (4), - authTypeMismatch(5), - authFailure (6), - netMaskMismatch (7), - helloIntervalMismatch (8), - deadIntervalMismatch (9), - optionMismatch (10) } - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "Potential types of configuration conflicts. - Used by the ospfConfigError and ospfConfigVir- - tError traps." - ::= { ospfTrapControl 2 } - - - ospfPacketType OBJECT-TYPE - SYNTAX INTEGER { - hello (1), - dbDescript (2), - lsReq (3), - lsUpdate (4), - lsAck (5) } - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "OSPF packet types." - ::= { ospfTrapControl 3 } + REVISION "199501201225Z" -- Fri Jan 20 12:25:50 PST 1995 + DESCRIPTION + "The initial SMIv2 revision of this MIB module, published + in RFC 1850." + ::= { ospf 16 } - ospfPacketSrc OBJECT-TYPE - SYNTAX IpAddress - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The IP address of an inbound packet that can- - not be identified by a neighbor instance." - ::= { ospfTrapControl 4 } +-- Trap Support Objects +-- The following are support objects for the OSPF traps. --- Traps + ospfTrapControl OBJECT IDENTIFIER ::= { ospfTrap 1 } + ospfTraps OBJECT IDENTIFIER ::= { ospfTrap 2 } + ospfSetTrap OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(4)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "A 4-octet string serving as a bit map for + the trap events defined by the OSPF traps. This + object is used to enable and disable specific + OSPF traps where a 1 in the bit field + represents enabled. The right-most bit (least + significant) represents trap 0. + + This object is persistent and when written + + the entity SHOULD save the change to non-volatile + storage." + ::= { ospfTrapControl 1 } + + ospfConfigErrorType OBJECT-TYPE + SYNTAX INTEGER { + badVersion (1), + areaMismatch (2), + unknownNbmaNbr (3), -- Router is DR eligible + unknownVirtualNbr (4), + authTypeMismatch(5), + authFailure (6), + netMaskMismatch (7), + helloIntervalMismatch (8), + deadIntervalMismatch (9), + optionMismatch (10), + mtuMismatch (11), + duplicateRouterId (12), + noError (13) } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Potential types of configuration conflicts. + Used by the ospfConfigError and + ospfConfigVirtError traps. When the last value + of a trap using this object is needed, but no + traps of that type have been sent, this value + pertaining to this object should be returned as + noError." + ::= { ospfTrapControl 2 } + + ospfPacketType OBJECT-TYPE + SYNTAX INTEGER { + hello (1), + dbDescript (2), + lsReq (3), + lsUpdate (4), + lsAck (5), + nullPacket (6) } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "OSPF packet types. When the last value of a trap + using this object is needed, but no traps of + that type have been sent, this value pertaining + to this object should be returned as nullPacket." + ::= { ospfTrapControl 3 } + + ospfPacketSrc OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The IP address of an inbound packet that cannot + be identified by a neighbor instance. When + the last value of a trap using this object is + needed, but no traps of that type have been sent, + this value pertaining to this object should + be returned as 0.0.0.0." + ::= { ospfTrapControl 4 } - ospfIfStateChange NOTIFICATION-TYPE - OBJECTS { - ospfRouterId, -- The originator of the trap - ospfIfIpAddress, - ospfAddressLessIf, - ospfIfState -- The new state - } - STATUS current - DESCRIPTION - "An ospfIfStateChange trap signifies that there - has been a change in the state of a non-virtual - OSPF interface. This trap should be generated - when the interface state regresses (e.g., goes - from Dr to Down) or progresses to a terminal - state (i.e., Point-to-Point, DR Other, Dr, or - Backup)." - ::= { ospfTraps 16 } - - - ospfVirtIfStateChange NOTIFICATION-TYPE - OBJECTS { - ospfRouterId, -- The originator of the trap - ospfVirtIfAreaId, - ospfVirtIfNeighbor, - ospfVirtIfState -- The new state - } - STATUS current - DESCRIPTION - "An ospfIfStateChange trap signifies that there - has been a change in the state of an OSPF vir- - tual interface. - This trap should be generated when the inter- - face state regresses (e.g., goes from Point- - to-Point to Down) or progresses to a terminal - state (i.e., Point-to-Point)." - ::= { ospfTraps 1 } - - - ospfNbrStateChange NOTIFICATION-TYPE - OBJECTS { - ospfRouterId, -- The originator of the trap - ospfNbrIpAddr, - ospfNbrAddressLessIndex, - ospfNbrRtrId, - ospfNbrState -- The new state - } - STATUS current - DESCRIPTION - "An ospfNbrStateChange trap signifies that - there has been a change in the state of a non- - virtual OSPF neighbor. This trap should be - generated when the neighbor state regresses - (e.g., goes from Attempt or Full to 1-Way or - Down) or progresses to a terminal state (e.g., - 2-Way or Full). When an neighbor transitions - from or to Full on non-broadcast multi-access - and broadcast networks, the trap should be gen- - erated by the designated router. A designated - router transitioning to Down will be noted by - ospfIfStateChange." - ::= { ospfTraps 2 } - - - ospfVirtNbrStateChange NOTIFICATION-TYPE - OBJECTS { - ospfRouterId, -- The originator of the trap - ospfVirtNbrArea, - ospfVirtNbrRtrId, - ospfVirtNbrState -- The new state - } - STATUS current - DESCRIPTION - "An ospfIfStateChange trap signifies that there - has been a change in the state of an OSPF vir- - tual neighbor. This trap should be generated - when the neighbor state regresses (e.g., goes - from Attempt or Full to 1-Way or Down) or - progresses to a terminal state (e.g., Full)." - ::= { ospfTraps 3 } - ospfIfConfigError NOTIFICATION-TYPE - OBJECTS { - ospfRouterId, -- The originator of the trap - ospfIfIpAddress, - ospfAddressLessIf, - ospfPacketSrc, -- The source IP address - ospfConfigErrorType, -- Type of error - ospfPacketType - } - STATUS current - DESCRIPTION - "An ospfIfConfigError trap signifies that a - packet has been received on a non-virtual in- - terface from a router whose configuration - parameters conflict with this router's confi- - guration parameters. Note that the event op- - tionMismatch should cause a trap only if it - prevents an adjacency from forming." - ::= { ospfTraps 4 } - - - ospfVirtIfConfigError NOTIFICATION-TYPE - OBJECTS { - ospfRouterId, -- The originator of the trap - ospfVirtIfAreaId, - ospfVirtIfNeighbor, - ospfConfigErrorType, -- Type of error - ospfPacketType - } - STATUS current - DESCRIPTION - "An ospfConfigError trap signifies that a pack- - et has been received on a virtual interface - from a router whose configuration parameters - conflict with this router's configuration - parameters. Note that the event optionMismatch - should cause a trap only if it prevents an ad- - jacency from forming." - ::= { ospfTraps 5 } - - - ospfIfAuthFailure NOTIFICATION-TYPE - OBJECTS { - ospfRouterId, -- The originator of the trap - ospfIfIpAddress, - ospfAddressLessIf, - ospfPacketSrc, -- The source IP address - ospfConfigErrorType, -- authTypeMismatch or - -- authFailure - ospfPacketType - } - STATUS current - DESCRIPTION - "An ospfIfAuthFailure trap signifies that a - packet has been received on a non-virtual in- - terface from a router whose authentication key - or authentication type conflicts with this - router's authentication key or authentication - type." - ::= { ospfTraps 6 } - - - ospfVirtIfAuthFailure NOTIFICATION-TYPE - OBJECTS { - ospfRouterId, -- The originator of the trap - ospfVirtIfAreaId, - ospfVirtIfNeighbor, - ospfConfigErrorType, -- authTypeMismatch or - -- authFailure - ospfPacketType - } - STATUS current - DESCRIPTION - "An ospfVirtIfAuthFailure trap signifies that a - packet has been received on a virtual interface - from a router whose authentication key or au- - thentication type conflicts with this router's - authentication key or authentication type." - ::= { ospfTraps 7 } - - - ospfIfRxBadPacket NOTIFICATION-TYPE - OBJECTS { - ospfRouterId, -- The originator of the trap - ospfIfIpAddress, - ospfAddressLessIf, - ospfPacketSrc, -- The source IP address - ospfPacketType - } - STATUS current - DESCRIPTION - "An ospfIfRxBadPacket trap signifies that an - OSPF packet has been received on a non-virtual - interface that cannot be parsed." - ::= { ospfTraps 8 } - - ospfVirtIfRxBadPacket NOTIFICATION-TYPE - OBJECTS { - ospfRouterId, -- The originator of the trap - ospfVirtIfAreaId, - ospfVirtIfNeighbor, - ospfPacketType - } - STATUS current - DESCRIPTION - "An ospfRxBadPacket trap signifies that an OSPF - packet has been received on a virtual interface - that cannot be parsed." - ::= { ospfTraps 9 } - - - ospfTxRetransmit NOTIFICATION-TYPE - OBJECTS { - ospfRouterId, -- The originator of the trap - ospfIfIpAddress, - ospfAddressLessIf, - ospfNbrRtrId, -- Destination - ospfPacketType, - ospfLsdbType, - ospfLsdbLsid, - ospfLsdbRouterId - } - STATUS current +-- Traps + + ospfVirtIfStateChange NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + ospfVirtIfAreaId, + ospfVirtIfNeighbor, + ospfVirtIfState -- The new state + } + STATUS current + DESCRIPTION + "An ospfVirtIfStateChange trap signifies that there + has been a change in the state of an OSPF virtual + interface. + + This trap should be generated when the interface + state regresses (e.g., goes from Point-to-Point to Down) + or progresses to a terminal state + (i.e., Point-to-Point)." + ::= { ospfTraps 1 } + + ospfNbrStateChange NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + ospfNbrIpAddr, + ospfNbrAddressLessIndex, + ospfNbrRtrId, + ospfNbrState -- The new state + } + STATUS current + DESCRIPTION + "An ospfNbrStateChange trap signifies that + there has been a change in the state of a + non-virtual OSPF neighbor. This trap should be + generated when the neighbor state regresses + (e.g., goes from Attempt or Full to 1-Way or + Down) or progresses to a terminal state (e.g., + + 2-Way or Full). When an neighbor transitions + from or to Full on non-broadcast multi-access + and broadcast networks, the trap should be + generated by the designated router. A designated + router transitioning to Down will be noted by + ospfIfStateChange." + ::= { ospfTraps 2 } + + ospfVirtNbrStateChange NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + ospfVirtNbrArea, + ospfVirtNbrRtrId, + ospfVirtNbrState -- The new state + } + STATUS current + DESCRIPTION + "An ospfVirtNbrStateChange trap signifies that there + has been a change in the state of an OSPF virtual + neighbor. This trap should be generated + when the neighbor state regresses (e.g., goes + from Attempt or Full to 1-Way or Down) or + progresses to a terminal state (e.g., Full)." + ::= { ospfTraps 3 } + + ospfIfConfigError NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + ospfIfIpAddress, + ospfAddressLessIf, + ospfPacketSrc, -- The source IP address + ospfConfigErrorType, -- Type of error + ospfPacketType + } + STATUS current + DESCRIPTION + "An ospfIfConfigError trap signifies that a + packet has been received on a non-virtual + interface from a router whose configuration + parameters conflict with this router's + configuration parameters. Note that the event + optionMismatch should cause a trap only if it + prevents an adjacency from forming." + ::= { ospfTraps 4 } + + ospfVirtIfConfigError NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + ospfVirtIfAreaId, + ospfVirtIfNeighbor, + ospfConfigErrorType, -- Type of error + + ospfPacketType + } + STATUS current + DESCRIPTION + "An ospfVirtIfConfigError trap signifies that a + packet has been received on a virtual interface + from a router whose configuration parameters + conflict with this router's configuration + parameters. Note that the event optionMismatch + should cause a trap only if it prevents an + adjacency from forming." + ::= { ospfTraps 5 } + + ospfIfAuthFailure NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + ospfIfIpAddress, + ospfAddressLessIf, + ospfPacketSrc, -- The source IP address + ospfConfigErrorType, -- authTypeMismatch or + -- authFailure + ospfPacketType + } + STATUS current + DESCRIPTION + "An ospfIfAuthFailure trap signifies that a + packet has been received on a non-virtual + interface from a router whose authentication key + or authentication type conflicts with this + router's authentication key or authentication + type." + ::= { ospfTraps 6 } + + ospfVirtIfAuthFailure NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + ospfVirtIfAreaId, + ospfVirtIfNeighbor, + ospfConfigErrorType, -- authTypeMismatch or + -- authFailure + ospfPacketType + } + STATUS current + DESCRIPTION + "An ospfVirtIfAuthFailure trap signifies that a + packet has been received on a virtual interface + from a router whose authentication key or + authentication type conflicts with this router's + authentication key or authentication type." + + ::= { ospfTraps 7 } + + ospfIfRxBadPacket NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + ospfIfIpAddress, + ospfAddressLessIf, + ospfPacketSrc, -- The source IP address + ospfPacketType + } + STATUS current + DESCRIPTION + "An ospfIfRxBadPacket trap signifies that an + OSPF packet has been received on a non-virtual + interface that cannot be parsed." + ::= { ospfTraps 8 } + + ospfVirtIfRxBadPacket NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + ospfVirtIfAreaId, + ospfVirtIfNeighbor, + ospfPacketType + } + STATUS current + DESCRIPTION + "An ospfVirtIfRxBadPacket trap signifies that an OSPF + packet has been received on a virtual interface + that cannot be parsed." + ::= { ospfTraps 9 } + + ospfTxRetransmit NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + ospfIfIpAddress, + ospfAddressLessIf, + ospfNbrRtrId, -- Destination + ospfPacketType, + ospfLsdbType, + ospfLsdbLsid, + ospfLsdbRouterId + } + STATUS current DESCRIPTION - "An ospfTxRetransmit trap signifies than an - OSPF packet has been retransmitted on a non- - virtual interface. All packets that may be re- - transmitted are associated with an LSDB entry. - The LS type, LS ID, and Router ID are used to + "An ospfTxRetransmit trap signifies than an + OSPF packet has been retransmitted on a + non-virtual interface. All packets that may be + retransmitted are associated with an LSDB entry. + The LS type, LS ID, and Router ID are used to identify the LSDB entry." - ::= { ospfTraps 10 } - - - ospfVirtIfTxRetransmit NOTIFICATION-TYPE - OBJECTS { - ospfRouterId, -- The originator of the trap - ospfVirtIfAreaId, - ospfVirtIfNeighbor, - ospfPacketType, - ospfLsdbType, - ospfLsdbLsid, - ospfLsdbRouterId - } - STATUS current - DESCRIPTION - "An ospfTxRetransmit trap signifies than an - OSPF packet has been retransmitted on a virtual - interface. All packets that may be retransmit- - ted are associated with an LSDB entry. The LS - type, LS ID, and Router ID are used to identify - the LSDB entry." - ::= { ospfTraps 11 } - - - ospfOriginateLsa NOTIFICATION-TYPE - OBJECTS { - ospfRouterId, -- The originator of the trap - ospfLsdbAreaId, -- 0.0.0.0 for AS Externals - ospfLsdbType, - ospfLsdbLsid, - ospfLsdbRouterId - } - STATUS current - DESCRIPTION - "An ospfOriginateLsa trap signifies that a new - LSA has been originated by this router. This - trap should not be invoked for simple refreshes - of LSAs (which happesn every 30 minutes), but - instead will only be invoked when an LSA is - (re)originated due to a topology change. Addi- - tionally, this trap does not include LSAs that - are being flushed because they have reached - MaxAge." - ::= { ospfTraps 12 } - - - ospfMaxAgeLsa NOTIFICATION-TYPE - OBJECTS { - ospfRouterId, -- The originator of the trap - ospfLsdbAreaId, -- 0.0.0.0 for AS Externals - ospfLsdbType, - ospfLsdbLsid, - ospfLsdbRouterId - } - STATUS current - DESCRIPTION - "An ospfMaxAgeLsa trap signifies that one of - the LSA in the router's link-state database has - aged to MaxAge." - ::= { ospfTraps 13 } - - - ospfLsdbOverflow NOTIFICATION-TYPE - OBJECTS { - ospfRouterId, -- The originator of the trap - ospfExtLsdbLimit - } - STATUS current - DESCRIPTION - "An ospfLsdbOverflow trap signifies that the - number of LSAs in the router's link-state data- - base has exceeded ospfExtLsdbLimit." - ::= { ospfTraps 14 } - - - ospfLsdbApproachingOverflow NOTIFICATION-TYPE - OBJECTS { - ospfRouterId, -- The originator of the trap - ospfExtLsdbLimit - } - STATUS current - DESCRIPTION - "An ospfLsdbApproachingOverflow trap signifies - that the number of LSAs in the router's link- - state database has exceeded ninety percent of - ospfExtLsdbLimit." - ::= { ospfTraps 15 } + ::= { ospfTraps 10 } + + ospfVirtIfTxRetransmit NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + ospfVirtIfAreaId, + ospfVirtIfNeighbor, + ospfPacketType, + ospfLsdbType, + ospfLsdbLsid, + ospfLsdbRouterId + } + STATUS current + DESCRIPTION + "An ospfVirtIfTxRetransmit trap signifies than an + OSPF packet has been retransmitted on a virtual + interface. All packets that may be retransmitted + are associated with an LSDB entry. The LS + type, LS ID, and Router ID are used to identify + the LSDB entry." + ::= { ospfTraps 11 } + + ospfOriginateLsa NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + ospfLsdbAreaId, -- 0.0.0.0 for AS Externals + ospfLsdbType, + ospfLsdbLsid, + ospfLsdbRouterId + } + STATUS current + DESCRIPTION + "An ospfOriginateLsa trap signifies that a new + LSA has been originated by this router. This + trap should not be invoked for simple refreshes + of LSAs (which happens every 30 minutes), but + instead will only be invoked when an LSA is + (re)originated due to a topology change. + Additionally, this trap does not include LSAs that + are being flushed because they have reached + MaxAge." + ::= { ospfTraps 12 } + + ospfMaxAgeLsa NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + ospfLsdbAreaId, -- 0.0.0.0 for AS Externals + ospfLsdbType, + ospfLsdbLsid, + ospfLsdbRouterId + } + STATUS current + DESCRIPTION + "An ospfMaxAgeLsa trap signifies that one of + the LSAs in the router's link state database has + aged to MaxAge." + ::= { ospfTraps 13 } --- conformance information + ospfLsdbOverflow NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + ospfExtLsdbLimit + } -ospfTrapConformance OBJECT IDENTIFIER ::= { ospfTrap 3 } + STATUS current + DESCRIPTION + "An ospfLsdbOverflow trap signifies that the + number of LSAs in the router's link state + database has exceeded ospfExtLsdbLimit." + ::= { ospfTraps 14 } + + ospfLsdbApproachingOverflow NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + ospfExtLsdbLimit + } + STATUS current + DESCRIPTION + "An ospfLsdbApproachingOverflow trap signifies + that the number of LSAs in the router's + link state database has exceeded ninety percent of + ospfExtLsdbLimit." + ::= { ospfTraps 15 } + + ospfIfStateChange NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + ospfIfIpAddress, + ospfAddressLessIf, + ospfIfState -- The new state + } + STATUS current + DESCRIPTION + "An ospfIfStateChange trap signifies that there + has been a change in the state of a non-virtual + OSPF interface. This trap should be generated + when the interface state regresses (e.g., goes + from Dr to Down) or progresses to a terminal + state (i.e., Point-to-Point, DR Other, Dr, or + Backup)." + ::= { ospfTraps 16 } + + ospfNssaTranslatorStatusChange NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + + ospfAreaId, + ospfAreaNssaTranslatorState -- The current translation + -- status + } + STATUS current + DESCRIPTION + "An ospfNssaTranslatorStatusChange trap indicates that + there has been a change in the router's ability to + translate OSPF type-7 LSAs into OSPF type-5 LSAs. + This trap should be generated when the translator + status transitions from or to any defined status on + a per-area basis." + ::= { ospfTraps 17 } + + ospfRestartStatusChange NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + ospfRestartStatus, + ospfRestartInterval, + ospfRestartExitReason + } + STATUS current + DESCRIPTION + "An ospfRestartStatusChange trap signifies that + there has been a change in the graceful restart + state for the router. This trap should be + generated when the router restart status + changes." + ::= { ospfTraps 18 } + + ospfNbrRestartHelperStatusChange NOTIFICATION-TYPE + OBJECTS { ospfRouterId, -- The originator of the trap + ospfNbrIpAddr, + ospfNbrAddressLessIndex, + ospfNbrRtrId, + ospfNbrRestartHelperStatus, + ospfNbrRestartHelperAge, + ospfNbrRestartHelperExitReason + } + STATUS current + DESCRIPTION + "An ospfNbrRestartHelperStatusChange trap signifies that + there has been a change in the graceful restart + helper state for the neighbor. This trap should be + generated when the neighbor restart helper status + transitions for a neighbor." + ::= { ospfTraps 19 } + + ospfVirtNbrRestartHelperStatusChange NOTIFICATION-TYPE + + OBJECTS { ospfRouterId, -- The originator of the trap + ospfVirtNbrArea, + ospfVirtNbrRtrId, + ospfVirtNbrRestartHelperStatus, + ospfVirtNbrRestartHelperAge, + ospfVirtNbrRestartHelperExitReason + } + STATUS current + DESCRIPTION + "An ospfVirtNbrRestartHelperStatusChange trap signifies + that there has been a change in the graceful restart + helper state for the virtual neighbor. This trap should + be generated when the virtual neighbor restart helper + status transitions for a virtual neighbor." + ::= { ospfTraps 20 } +-- conformance information + +ospfTrapConformance OBJECT IDENTIFIER ::= { ospfTrap 3 } ospfTrapGroups OBJECT IDENTIFIER ::= { ospfTrapConformance 1 } ospfTrapCompliances OBJECT IDENTIFIER ::= { ospfTrapConformance 2 } --- compliance statements - - ospfTrapCompliance MODULE-COMPLIANCE - STATUS current - DESCRIPTION - "The compliance statement " - MODULE -- this module - MANDATORY-GROUPS { ospfTrapControlGroup } - - - GROUP ospfTrapControlGroup - DESCRIPTION - "This group is optional but recommended for all - OSPF systems" - ::= { ospfTrapCompliances 1 } - - --- units of conformance - - ospfTrapControlGroup OBJECT-GROUP - OBJECTS { - ospfSetTrap, - ospfConfigErrorType, - ospfPacketType, - ospfPacketSrc - } - STATUS current - DESCRIPTION - "These objects are required to control traps - from OSPF systems." +-- compliance statements + +ospfTrapCompliance MODULE-COMPLIANCE + STATUS obsolete + DESCRIPTION + "The compliance statement." + MODULE -- this module + MANDATORY-GROUPS { ospfTrapControlGroup } + + GROUP ospfTrapControlGroup + DESCRIPTION + "This group is optional but recommended for all + OSPF systems." + ::= { ospfTrapCompliances 1 } + +ospfTrapCompliance2 MODULE-COMPLIANCE + STATUS current + DESCRIPTION + "The compliance statement." + MODULE -- this module + MANDATORY-GROUPS { ospfTrapControlGroup, ospfTrapEventGroup } + OBJECT ospfConfigErrorType + MIN-ACCESS accessible-for-notify + DESCRIPTION + "This object is only required to be supplied within + notifications." + + OBJECT ospfPacketType + MIN-ACCESS accessible-for-notify + DESCRIPTION + "This object is only required to be supplied within + notifications." + OBJECT ospfPacketSrc + MIN-ACCESS accessible-for-notify + DESCRIPTION + "This object is only required to be supplied within + notifications." + ::= { ospfTrapCompliances 2 } + +-- units of conformance + + ospfTrapControlGroup OBJECT-GROUP + OBJECTS { ospfSetTrap, + ospfConfigErrorType, + ospfPacketType, + ospfPacketSrc } + STATUS current + DESCRIPTION + "These objects are required to control traps + from OSPF systems." ::= { ospfTrapGroups 1 } + ospfTrapEventGroup NOTIFICATION-GROUP + NOTIFICATIONS { + ospfVirtIfStateChange, + ospfNbrStateChange, + ospfVirtNbrStateChange, + ospfIfConfigError, + ospfVirtIfConfigError, + ospfIfAuthFailure, + ospfVirtIfAuthFailure, + ospfIfRxBadPacket, + ospfVirtIfRxBadPacket, + ospfTxRetransmit, + ospfVirtIfTxRetransmit, + ospfOriginateLsa, + ospfMaxAgeLsa, + ospfLsdbOverflow, + ospfLsdbApproachingOverflow, + ospfIfStateChange, + ospfNssaTranslatorStatusChange, + ospfRestartStatusChange, + ospfNbrRestartHelperStatusChange, + ospfVirtNbrRestartHelperStatusChange + } + + STATUS current + DESCRIPTION + "A grouping of OSPF trap events, as specified + in NOTIFICATION-TYPE constructs." + ::= { ospfTrapGroups 2 } END diff --git a/mibs/nokia/PIM-BSR-MIB b/mibs/PIM-BSR-MIB similarity index 99% rename from mibs/nokia/PIM-BSR-MIB rename to mibs/PIM-BSR-MIB index bbd0dec30b6..26dd37899ef 100644 --- a/mibs/nokia/PIM-BSR-MIB +++ b/mibs/PIM-BSR-MIB @@ -136,6 +136,7 @@ pimBsrCandidateRPGroupPrefixLength OBJECT-TYPE pimBsrCandidateRPGroupAddress, identifies a group prefix for which the local router will advertise itself as a Candidate-RP. The InetAddressType is given by the + pimBsrCandidateRPAddressType object." ::= { pimBsrCandidateRPEntry 4 } @@ -184,6 +185,7 @@ pimBsrCandidateRPAdvInterval OBJECT-TYPE REFERENCE "RFC 5059, sections 3.2 and 5" DEFVAL { 60 } + ::= { pimBsrCandidateRPEntry 8 } pimBsrCandidateRPHoldtime OBJECT-TYPE @@ -219,7 +221,6 @@ pimBsrCandidateRPStatus OBJECT-TYPE ::= { pimBsrCandidateRPEntry 10 } - pimBsrCandidateRPStorageType OBJECT-TYPE SYNTAX StorageType MAX-ACCESS read-create @@ -232,6 +233,7 @@ pimBsrCandidateRPStorageType OBJECT-TYPE ::= { pimBsrCandidateRPEntry 11 } -- + -- The BSR Elected BSR RP-Set Table -- @@ -280,6 +282,7 @@ pimBsrElectedBSRGrpMappingAddrType OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION + "The Inet address type of the IP multicast group prefix." ::= { pimBsrElectedBSRRPSetEntry 2 } @@ -328,6 +331,7 @@ pimBsrElectedBSRGrpMappingRPAddr OBJECT-TYPE ::= { pimBsrElectedBSRRPSetEntry 5 } pimBsrElectedBSRRPSetPriority OBJECT-TYPE + SYNTAX Unsigned32 (0..255) MAX-ACCESS read-only STATUS current @@ -376,6 +380,7 @@ pimBsrCandidateBSRTable OBJECT-TYPE SYNTAX SEQUENCE OF PimBsrCandidateBSREntry MAX-ACCESS not-accessible STATUS current + DESCRIPTION "The (conceptual) table containing Candidate-BSR configuration for the local router. The table contains @@ -424,6 +429,7 @@ pimBsrCandidateBSRZoneIndex OBJECT-TYPE pimBsrCandidateBSRAddressType OBJECT-TYPE SYNTAX InetAddressType + MAX-ACCESS read-create STATUS current DESCRIPTION @@ -449,7 +455,7 @@ pimBsrCandidateBSRPriority OBJECT-TYPE "The priority value for the local router as a Candidate-BSR for this zone. Numerically higher values for this object indicate higher priorities." - DEFVAL { 64 } + DEFVAL { 0 } ::= { pimBsrCandidateBSREntry 4 } pimBsrCandidateBSRHashMaskLength OBJECT-TYPE @@ -472,6 +478,7 @@ pimBsrCandidateBSRElectedBSR OBJECT-TYPE DESCRIPTION "Whether the local router is the elected BSR for this zone." + ::= { pimBsrCandidateBSREntry 6 } pimBsrCandidateBSRBootstrapTimer OBJECT-TYPE @@ -520,6 +527,7 @@ pimBsrElectedBSRTable OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION + "The (conceptual) table containing information about elected BSRs. The table contains one row for each zone for which there is an elected BSR." @@ -617,6 +625,7 @@ pimBsrElectedBSRLostElection NOTIFICATION-TYPE pimBsrElectedBSRPriority } STATUS current DESCRIPTION + "A pimBsrElectedBSRLostElection notification should be generated when current E-BSR lost election to a new Candidate-BSR. Only an E-BSR should generate this @@ -665,6 +674,7 @@ pimBsrCompliance MODULE-COMPLIANCE -- pimBsrObjectGroup OBJECT-GROUP + OBJECTS { pimBsrCandidateRPBidir, pimBsrCandidateRPAdvTimer, pimBsrCandidateRPPriority, diff --git a/mibs/nokia/PIM-STD-MIB b/mibs/PIM-STD-MIB similarity index 100% rename from mibs/nokia/PIM-STD-MIB rename to mibs/PIM-STD-MIB diff --git a/mibs/PerfHist-TC-MIB b/mibs/PerfHist-TC-MIB index 5398f3c97d9..ceeb58ecc1d 100644 --- a/mibs/PerfHist-TC-MIB +++ b/mibs/PerfHist-TC-MIB @@ -1,173 +1,179 @@ --- ***************************************************************** --- PerfHist-TC-MIB.my: Performance History MIB file --- --- May 1999, Igor Chernin --- --- Copyright (c) 1999 by Cisco Systems, Inc. --- All rights reserved. --- --- ***************************************************************** --- --- This mib was extracted from RFC 2493 +PerfHist-TC-MIB DEFINITIONS ::= BEGIN - PerfHist-TC-MIB DEFINITIONS ::= BEGIN +IMPORTS + MODULE-IDENTITY, + Gauge32, mib-2 + FROM SNMPv2-SMI + TEXTUAL-CONVENTION + FROM SNMPv2-TC; - IMPORTS - MODULE-IDENTITY, - Gauge32, mib-2 - FROM SNMPv2-SMI - TEXTUAL-CONVENTION - FROM SNMPv2-TC; +perfHistTCMIB MODULE-IDENTITY + LAST-UPDATED "200308130000Z" + ORGANIZATION "IETF AToM MIB WG" + CONTACT-INFO + "WG charter: + http://www.ietf.org/html.charters/atommib-charter.html - perfHistTCMIB MODULE-IDENTITY - LAST-UPDATED "9811071100Z" - ORGANIZATION "IETF AToMMIB and TrunkMIB WGs" - CONTACT-INFO - "Kaj Tesink - Postal: Bellcore - 331 Newman Springs Road - Red Bank, NJ 07701 - USA - Tel: +1 732 758 5254 - Fax: +1 732 758 2269 - E-mail: kaj@bellcore.com" - DESCRIPTION - "This MIB Module provides Textual Conventions - to be used by systems supporting 15 minute - based performance history counts." - ::= { mib-2 58 } + Mailing Lists: + General Discussion: atommib@research.telcordia.com + To Subscribe: atommib-request@research.telcordia.com + Editor: Kaj Tesink + Postal: Telcordia Technologies + 331 Newman Springs Road + Red Bank, NJ 07701 + USA + Tel: +1 732 758 5254 + E-mail: kaj@research.telcordia.com" - -- The Textual Conventions defined below are organized - -- alphabetically + DESCRIPTION + "This MIB Module provides Textual Conventions + to be used by systems supporting 15 minute + based performance history counts. - -- Use of these TCs assumes the following: - -- 0 The agent supports 15 minute based history - -- counters. - -- 0 The agent is capable of keeping a history of n - -- intervals of 15 minute performance data. The - -- value of n is defined by the specific MIB - -- module but shall be 0 < n =< 96. - -- 0 The agent may optionally support performance - -- data aggregating the history intervals. - -- 0 The agent will keep separate tables for the - -- current interval, the history intervals, and - -- the total aggregates. - -- 0 The agent will keep the following objects. - -- If performance data is kept for multiple instances - -- of a measured entity, then - -- these objects are applied to each instance of - -- the measured entity (e.g., interfaces). + Copyright (C) The Internet Society (2003). + This version of this MIB module is part of + RFC 3593; see the RFC itself for full + legal notices." + REVISION "200308130000Z" + DESCRIPTION + "Contact information and references updated. + No technical changes have been applied. + Published as RFC 3593." + REVISION "199811071100Z" + DESCRIPTION + "The RFC 2493 version of this MIB module." + ::= { mib-2 58 } +-- The Textual Conventions defined below are organized +-- alphabetically - -- xyzTimeElapsed OBJECT-TYPE - -- SYNTAX INTEGER (0..899) - -- MAX-ACCESS read-only - -- STATUS current - -- DESCRIPTION - -- "The number of seconds that have elapsed since - -- the beginning of the current measurement period. - -- If, for some reason, such as an adjustment in the - -- system's time-of-day clock, the current interval - -- exceeds the maximum value, the agent will return - -- the maximum value." - -- ::= { xxx } +-- Use of these TCs assumes the following: +-- 0 The agent supports 15 minute based history +-- counters. +-- 0 The agent is capable of keeping a history of n +-- intervals of 15 minute performance data. The +-- value of n is defined by the specific MIB +-- module but shall be 0 < n =< 96. +-- 0 The agent may optionally support performance +-- data aggregating the history intervals. +-- 0 The agent will keep separate tables for the +-- current interval, the history intervals, and +-- the total aggregates. +-- 0 The agent will keep the following objects. +-- If performance data is kept for multiple instances +-- of a measured entity, then +-- these objects are applied to each instance of +-- the measured entity (e.g., interfaces). +-- +-- xyzTimeElapsed OBJECT-TYPE +-- SYNTAX INTEGER (0..899) +-- MAX-ACCESS read-only +-- STATUS current +-- DESCRIPTION +-- "The number of seconds that have elapsed since +-- the beginning of the current measurement period. +-- If, for some reason, such as an adjustment in the +-- system's time-of-day clock, the current interval +-- exceeds the maximum value, the agent will return +-- the maximum value." +-- ::= { xxx } - -- xyzValidIntervals OBJECT-TYPE - -- SYNTAX INTEGER (0..) - -- MAX-ACCESS read-only - -- STATUS current - -- DESCRIPTION - -- "The number of previous near end intervals - -- for which data was collected. - -- [ The overall constraint on is 1 =< n =< 96; ] - -- [ Define any additional constraints on here. ] - -- The value will be unless the measurement was - -- (re-)started within the last (*15) minutes, in which - -- case the value will be the number of complete 15 - -- minute intervals for which the agent has at least - -- some data. In certain cases (e.g., in the case - -- where the agent is a proxy) it is possible that some - -- intervals are unavailable. In this case, this - -- interval is the maximum interval number for - -- which data is available." - -- ::= { xxx } +-- xyzValidIntervals OBJECT-TYPE +-- SYNTAX INTEGER (0..) +-- MAX-ACCESS read-only +-- STATUS current +-- DESCRIPTION +-- "The number of previous near end intervals +-- for which data was collected. +-- [ The overall constraint on is 1 =< n =< 96; ] +-- [ Define any additional constraints on here. ] +-- The value will be unless the measurement was +-- (re-)started within the last (*15) minutes, in which +-- case the value will be the number of complete 15 +-- minute intervals for which the agent has at least +-- some data. In certain cases (e.g., in the case - -- xyzInvalidIntervals OBJECT-TYPE - -- SYNTAX INTEGER (0..) - -- MAX-ACCESS read-only - -- STATUS current - -- DESCRIPTION - -- "The number of intervals in the range from - -- 0 to xyzValidIntervals for which no - -- data is available. This object will typically - -- be zero except in cases where the data for some - -- intervals are not available (e.g., in proxy - -- situations)." - -- ::= { xxx } +-- where the agent is a proxy) it is possible that some +-- intervals are unavailable. In this case, this +-- interval is the maximum interval number for +-- which data is available." +-- ::= { xxx } +-- xyzInvalidIntervals OBJECT-TYPE +-- SYNTAX INTEGER (0..) +-- MAX-ACCESS read-only +-- STATUS current +-- DESCRIPTION +-- "The number of intervals in the range from +-- 0 to xyzValidIntervals for which no +-- data is available. This object will typically +-- be zero except in cases where the data for some +-- intervals are not available (e.g., in proxy +-- situations)." +-- ::= { xxx } - PerfCurrentCount ::= TEXTUAL-CONVENTION - STATUS current - DESCRIPTION - "A counter associated with a - performance measurement in a current 15 - minute measurement interval. The value - of this counter starts from zero and is - increased when associated events occur, - until the end of the 15 minute interval. - At that time the value of the counter is - stored in the first 15 minute history - interval, and the CurrentCount is - restarted at zero. In the - case where the agent has no valid data - available for the current interval the - corresponding object instance is not - available and upon a retrieval request - a corresponding error message shall be - returned to indicate that this instance - does not exist (for example, a noSuchName - error for SNMPv1 and a noSuchInstance for - SNMPv2 GET operation)." - SYNTAX Gauge32 +PerfCurrentCount ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION + "A counter associated with a + performance measurement in a current 15 + minute measurement interval. The value + of this counter starts from zero and is + increased when associated events occur, + until the end of the 15 minute interval. + At that time the value of the counter is + stored in the first 15 minute history + interval, and the CurrentCount is + restarted at zero. In the + case where the agent has no valid data + available for the current interval the + corresponding object instance is not + available and upon a retrieval request + a corresponding error message shall be + returned to indicate that this instance + does not exist (for example, a noSuchName + error for SNMPv1 and a noSuchInstance for + SNMPv2 GET operation)." + SYNTAX Gauge32 - PerfIntervalCount ::= TEXTUAL-CONVENTION - STATUS current - DESCRIPTION - "A counter associated with a - performance measurement in a previous - 15 minute measurement interval. In the - case where the agent has no valid data - available for a particular interval the - corresponding object instance is not - available and upon a retrieval request - a corresponding error message shall be - returned to indicate that this instance - does not exist (for example, a noSuchName - error for SNMPv1 and a noSuchInstance for - SNMPv2 GET operation). - In a system supporting - a history of n intervals with - IntervalCount(1) and IntervalCount(n) the - most and least recent intervals - respectively, the following applies at - the end of a 15 minute interval: - - discard the value of IntervalCount(n) - - the value of IntervalCount(i) becomes that - of IntervalCount(i-1) for n >= i > 1 - - the value of IntervalCount(1) becomes that - of CurrentCount - - the TotalCount, if supported, is adjusted." - SYNTAX Gauge32 +PerfIntervalCount ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION + "A counter associated with a + performance measurement in a previous + 15 minute measurement interval. In the + case where the agent has no valid data + available for a particular interval the + corresponding object instance is not + available and upon a retrieval request + a corresponding error message shall be + returned to indicate that this instance + does not exist (for example, a noSuchName + error for SNMPv1 and a noSuchInstance for + SNMPv2 GET operation). + In a system supporting + a history of n intervals with + IntervalCount(1) and IntervalCount(n) the + most and least recent intervals + respectively, the following applies at + the end of a 15 minute interval: + - discard the value of IntervalCount(n) + - the value of IntervalCount(i) becomes that + of IntervalCount(i-1) for n >= i > 1 + - the value of IntervalCount(1) becomes that + of CurrentCount + - the TotalCount, if supported, is adjusted." + SYNTAX Gauge32 - PerfTotalCount ::= TEXTUAL-CONVENTION - STATUS current - DESCRIPTION - "A counter associated with a - performance measurements aggregating the - previous valid 15 minute measurement - intervals. (Intervals for which no valid - data was available are not counted)" - SYNTAX Gauge32 +PerfTotalCount ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION + "A counter associated with a + performance measurements aggregating the + previous valid 15 minute measurement + intervals. (Intervals for which no valid + data was available are not counted)" + SYNTAX Gauge32 - END +END diff --git a/mibs/nokia/RS-232-MIB b/mibs/RS-232-MIB similarity index 100% rename from mibs/nokia/RS-232-MIB rename to mibs/RS-232-MIB diff --git a/mibs/equallogic/SCSI-MIB b/mibs/SCSI-MIB similarity index 100% rename from mibs/equallogic/SCSI-MIB rename to mibs/SCSI-MIB diff --git a/mibs/UCD-SNMP-MIB b/mibs/UCD-SNMP-MIB index d360bad0252..bcc7da68f60 100644 --- a/mibs/UCD-SNMP-MIB +++ b/mibs/UCD-SNMP-MIB @@ -40,7 +40,7 @@ IMPORTS FROM SNMPv2-TC; ucdavis MODULE-IDENTITY - LAST-UPDATED "201606100000Z" + LAST-UPDATED "202008210000Z" ORGANIZATION "University of California, Davis" CONTACT-INFO "This mib is no longer being maintained by the University of @@ -58,6 +58,10 @@ ucdavis MODULE-IDENTITY DESCRIPTION "This file defines the private UCD SNMP MIB extensions." + REVISION "202008210000Z" + DESCRIPTION + "Add new memSysAvail object" + REVISION "201606100000Z" DESCRIPTION "New 64-bit memory objects" @@ -65,6 +69,7 @@ ucdavis MODULE-IDENTITY REVISION "201407310000Z" DESCRIPTION "New object for number of CPUs as counted by the agent" + REVISION "201105140000Z" DESCRIPTION "New objects for monitoring CPU Steal, Guest and Nice values" diff --git a/mibs/alaxala/AX1230S-MIB b/mibs/alaxala/AX1230S similarity index 100% rename from mibs/alaxala/AX1230S-MIB rename to mibs/alaxala/AX1230S diff --git a/mibs/alaxala/AX12S-MIB b/mibs/alaxala/AX1240S similarity index 100% rename from mibs/alaxala/AX12S-MIB rename to mibs/alaxala/AX1240S diff --git a/mibs/alaxala/AX2000R-MIB b/mibs/alaxala/AX2000R similarity index 100% rename from mibs/alaxala/AX2000R-MIB rename to mibs/alaxala/AX2000R diff --git a/mibs/alaxala/AX2430S-MIB b/mibs/alaxala/AX2430S similarity index 100% rename from mibs/alaxala/AX2430S-MIB rename to mibs/alaxala/AX2430S diff --git a/mibs/alaxala/AX2530S-MIB b/mibs/alaxala/AX2530S similarity index 100% rename from mibs/alaxala/AX2530S-MIB rename to mibs/alaxala/AX2530S diff --git a/mibs/alaxala/AX260A-MIB b/mibs/alaxala/AX260A similarity index 100% rename from mibs/alaxala/AX260A-MIB rename to mibs/alaxala/AX260A diff --git a/mibs/alaxala/AX36S-MIB b/mibs/alaxala/AX3630S similarity index 100% rename from mibs/alaxala/AX36S-MIB rename to mibs/alaxala/AX3630S diff --git a/mibs/alaxala/AX3660S-MIB b/mibs/alaxala/AX3660S similarity index 100% rename from mibs/alaxala/AX3660S-MIB rename to mibs/alaxala/AX3660S diff --git a/mibs/alaxala/AX4630S-MIB b/mibs/alaxala/AX4630S similarity index 100% rename from mibs/alaxala/AX4630S-MIB rename to mibs/alaxala/AX4630S diff --git a/mibs/alaxala/AX63S-MIB b/mibs/alaxala/AX6300S similarity index 100% rename from mibs/alaxala/AX63S-MIB rename to mibs/alaxala/AX6300S diff --git a/mibs/alaxala/AXR-MIB b/mibs/alaxala/AX7800R similarity index 100% rename from mibs/alaxala/AXR-MIB rename to mibs/alaxala/AX7800R diff --git a/mibs/alaxala/AXS-MIB b/mibs/alaxala/AX7800S similarity index 100% rename from mibs/alaxala/AXS-MIB rename to mibs/alaxala/AX7800S diff --git a/mibs/bdt/BDT-MIB b/mibs/bdt/BDTMIB similarity index 100% rename from mibs/bdt/BDT-MIB rename to mibs/bdt/BDTMIB diff --git a/mibs/bosch/BVMS-MIB b/mibs/bosch/BOSCH similarity index 100% rename from mibs/bosch/BVMS-MIB rename to mibs/bosch/BOSCH diff --git a/mibs/brocade/IANA-PWE3-MIB b/mibs/brocade/IANA-PWE3-MIB deleted file mode 100644 index 5bf410f95d9..00000000000 --- a/mibs/brocade/IANA-PWE3-MIB +++ /dev/null @@ -1,137 +0,0 @@ -IANA-PWE3-MIB DEFINITIONS ::= BEGIN - -IMPORTS - MODULE-IDENTITY, mib-2 - FROM SNMPv2-SMI -- [RFC2578] - - TEXTUAL-CONVENTION - FROM SNMPv2-TC; -- [RFC2579] - -ianaPwe3MIB MODULE-IDENTITY - LAST-UPDATED "200906110000Z" -- 11 June 2009 00:00:00 GMT - ORGANIZATION "IANA" - CONTACT-INFO - "Internet Assigned Numbers Authority - Internet Corporation for Assigned Names and Numbers - 4676 Admiralty Way, Suite 330 - Marina del Rey, CA 90292-6601 - - Phone: +1 310 823 9358 - EMail: iana@iana.org" - DESCRIPTION - "This MIB module defines the IANAPwTypeTC and - IANAPwPsnTypeTC textual conventions for use in PWE3 - MIB modules. - - Any additions or changes to the contents of this MIB - module require either publication of an RFC, Designated - Expert Review as defined in RFC 5226, Guidelines for - Writing an IANA Considerations Section in RFCs, and should - be based on the procedures defined in [RFC4446]. The - Designated Expert will be selected by the IESG Area - Director(s) of the internet Area. - - Copyright (c) 2009 IETF Trust and the persons identified as - authors of the code. All rights reserved. - - Redistribution and use in source and binary forms, with or - without modification, are permitted provided that the - - following conditions are met: - - - Redistributions of source code must retain the above - copyright notice, this list of conditions and the - following disclaimer. - - - Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the - following disclaimer in the documentation and/or other - materials provided with the distribution. - - - Neither the name of Internet Society, IETF or IETF Trust, - nor the names of specific contributors, may be used to - endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - CONTRIBUTORS 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. " - - REVISION "200906110000Z" -- 11 June 2009 00:00:00 GMT - DESCRIPTION "Original version, published as part of RFC 5601." - ::= { mib-2 174 } - -IANAPwTypeTC ::= TEXTUAL-CONVENTION - STATUS current - DESCRIPTION - "Indicates the PW type (i.e., the carried service). " - SYNTAX INTEGER { - other(0), - frameRelayDlciMartiniMode(1), - atmAal5SduVcc(2), - atmTransparent(3), - ethernetTagged(4), - ethernet(5), - hdlc(6), - ppp(7), - cem(8), -- Historic type - atmCellNto1Vcc(9), - atmCellNto1Vpc(10), - ipLayer2Transport(11), - atmCell1to1Vcc(12), - atmCell1to1Vpc(13), - atmAal5PduVcc(14), - frameRelayPortMode(15), - cep(16), - e1Satop(17), - t1Satop(18), - e3Satop(19), - t3Satop(20), - basicCesPsn(21), - basicTdmIp(22), - tdmCasCesPsn(23), - tdmCasTdmIp(24), - frDlci(25), - wildcard (32767) - } - -IANAPwPsnTypeTC ::= TEXTUAL-CONVENTION - STATUS current - DESCRIPTION - "Identifies the PSN type that the PW will use over the - network." - SYNTAX INTEGER { - mpls (1), - l2tp (2), - udpOverIp (3), - mplsOverIp (4), - mplsOverGre (5), - other (6) - } - -IANAPwCapabilities ::= TEXTUAL-CONVENTION - STATUS current - DESCRIPTION - "This TC describes a collection of capabilities related to - a specific PW. - Values may be added in the future based on new capabilities - introduced in IETF documents. - " - SYNTAX BITS { - pwStatusIndication (0), -- Applicable only if maintenance - -- protocol is in use. - pwVCCV (1) - } - -END diff --git a/mibs/carel/CAREL-vak-cx-bms-snmp-1-MIB b/mibs/carel/CAREL-vak-cx-bms-snmp-1-MIB new file mode 100644 index 00000000000..e2e9c31d71e --- /dev/null +++ b/mibs/carel/CAREL-vak-cx-bms-snmp-1-MIB @@ -0,0 +1,518 @@ +-- +-- CAREL-vak-cx-bms-snmp-1.MIB +-- MIB generated by CAREL +-- Monday, 22 January 2024 +-- +-- NOTE: The vendor-supplied MIB uses object descriptors containing "." +-- (for example "inputscheck.rettemp-val"). A period is not a legal character +-- in an ASN.1/SMI descriptor and makes the module fail to parse ("Bad operator +-- (.)"). Hyphens are legal, so this module keeps the vendor names as-is except +-- for the periods: where the "." is a group.object separator the group prefix +-- is dropped (outputs.glbalrm-doutval -> glbalrm-doutval); where it is an +-- object.field separator the "." becomes "-" (al-hirettemp.active -> +-- al-hirettemp-active). The original vendor descriptor is noted in a comment +-- above each object. OID assignments, syntax and descriptions are verbatim and +-- all objects from the vendor MIB are present. +-- + + CAREL-vak-cx-bms-snmp-1-MIB DEFINITIONS ::= BEGIN + + IMPORTS + MODULE-IDENTITY, OBJECT-TYPE, Integer32, enterprises + FROM SNMPv2-SMI; + + vak-cx-bms-snmp-1MIB MODULE-IDENTITY + LAST-UPDATED "202401221515Z" -- January 22, 2024 at 15:15 GMT + ORGANIZATION "CAREL Industries S.r.l." + CONTACT-INFO + " + Carel Industries S.r.l. + Via dell'Industria, 11 + 35020 Brugine (PD) Italy + Tel: +39 049 9716611 + E-mail: carel@carel.com + " + DESCRIPTION + "This is the MIB module for the vak-cx-bms-snmp-1 device." + REVISION "202401221515Z" + DESCRIPTION + "version4pCOweb" + ::= { instruments 1 } + +-- +-- Node definitions +-- + + -- 1.3.6.1.4.1.9839 + carel OBJECT IDENTIFIER ::= { enterprises 9839 } + + -- 1.3.6.1.4.1.9839.1 + systm OBJECT IDENTIFIER ::= { carel 1 } + + -- 1.3.6.1.4.1.9839.1.1 + agentRelease OBJECT-TYPE + SYNTAX Integer32 + UNITS "N/A" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Release of the Agent." + ::= { systm 1 } + + -- 1.3.6.1.4.1.9839.1.2 + agentCode OBJECT-TYPE + SYNTAX Integer32 + UNITS "N/A" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Code of the Agent. 2=pCOWeb." + ::= { systm 2 } + + -- 1.3.6.1.4.1.9839.2 + instruments OBJECT IDENTIFIER ::= { carel 2 } + + -- 1.3.6.1.4.1.9839.2.0 + pCOWebInfo OBJECT IDENTIFIER ::= { instruments 0 } + + -- 1.3.6.1.4.1.9839.2.0.10 + pCOStatusgroup OBJECT IDENTIFIER ::= { pCOWebInfo 10 } + + -- 1.3.6.1.4.1.9839.2.0.10.1 + -- ... You will have how many pCOIdX-Status objects as the pCOs connected to pCOWeb. + pCOId1-Status OBJECT-TYPE + SYNTAX Integer32 + UNITS "N/A" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Status of pCOId1. 0=Offline, 1=Init, 2=Online" + ::= { pCOStatusgroup 1 } + + -- 1.3.6.1.4.1.9839.2.0.11 + pCOErrorsNumbergroup OBJECT IDENTIFIER ::= { pCOWebInfo 11 } + + -- 1.3.6.1.4.1.9839.2.0.11.1 + -- ... You will have how many pCOIdX-ErrorsNumber objects as the pCOs connected to pCOWeb. + pCOId1-ErrorsNumber OBJECT-TYPE + SYNTAX Integer32 + UNITS "N/A" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Number of Communication Errors from pCOId1 to pCOWeb." + ::= { pCOErrorsNumbergroup 1 } + + -- 1.3.6.1.4.1.9839.2.1.1 + digitalObjects OBJECT IDENTIFIER ::= { vak-cx-bms-snmp-1MIB 1 } + + -- 1.3.6.1.4.1.9839.2.1.1.1 + -- vendor descriptor: onoffunitmng.keybonoff + keybonoff OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Unit on/off by keyboard ( 0-off, 1-on)" + DEFVAL { 0 } + ::= { digitalObjects 1 } + + -- 1.3.6.1.4.1.9839.2.1.1.2 + -- vendor descriptor: outputs.heater-doutval + heater-doutval OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "NO2-Heater output value" + DEFVAL { 0 } + ::= { digitalObjects 2 } + + -- 1.3.6.1.4.1.9839.2.1.1.3 + -- vendor descriptor: outputs.glbalrm-doutval + glbalrm-doutval OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "NO7-Global alarm output value" + DEFVAL { 0 } + ::= { digitalObjects 3 } + + -- 1.3.6.1.4.1.9839.2.1.1.4 + -- vendor descriptor: inputscheck.lowp-pstat-din + lowp-pstat-din OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "ID3-Low pressure input status" + DEFVAL { 0 } + ::= { digitalObjects 4 } + + -- 1.3.6.1.4.1.9839.2.1.1.5 + -- vendor descriptor: inputscheck.hip-pstat-din + hip-pstat-din OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "ID2-High pressure input status" + DEFVAL { 0 } + ::= { digitalObjects 5 } + + -- 1.3.6.1.4.1.9839.2.1.1.6 + -- vendor descriptor: al-lowrettemp.active + al-lowrettemp-active OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Low return temperature alarm - Alarm status" + DEFVAL { 0 } + ::= { digitalObjects 6 } + + -- 1.3.6.1.4.1.9839.2.1.1.7 + -- vendor descriptor: al-hirettemp.active + al-hirettemp-active OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "High return temperature alarm - Alarm status" + DEFVAL { 0 } + ::= { digitalObjects 7 } + + -- 1.3.6.1.4.1.9839.2.1.1.8 + -- vendor descriptor: al-compdriboard-offline.active + al-compdriboard-offline-active OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Compressor drive board offline alarm - Alarm status" + DEFVAL { 0 } + ::= { digitalObjects 8 } + + -- 1.3.6.1.4.1.9839.2.1.1.9 + -- vendor descriptor: outputs.condheater-doutval + condheater-doutval OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "NO8-Condenser heater output value" + DEFVAL { 0 } + ::= { digitalObjects 9 } + + -- 1.3.6.1.4.1.9839.2.1.1.10 + -- vendor descriptor: outputs.condfan-doutval + condfan-doutval OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "NO3-Condenser fan output value" + DEFVAL { 0 } + ::= { digitalObjects 10 } + + -- 1.3.6.1.4.1.9839.2.1.1.11 + -- vendor descriptor: outputs.comp-doutval + comp-doutval OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "NO1-Compressor output value" + DEFVAL { 0 } + ::= { digitalObjects 11 } + + -- 1.3.6.1.4.1.9839.2.1.1.12 + -- vendor descriptor: outputs.evapfan-doutval + evapfan-doutval OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "NO9-Evaporating fan output value" + DEFVAL { 0 } + ::= { digitalObjects 12 } + + -- 1.3.6.1.4.1.9839.2.1.1.13 + -- vendor descriptor: inputscheck.condwatersw-din + condwatersw-din OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "ID6/U6-Condenser water switch input status" + DEFVAL { 0 } + ::= { digitalObjects 13 } + + -- 1.3.6.1.4.1.9839.2.1.1.14 + -- vendor descriptor: lowp-pstat + lowp-pstat OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "ID2-Low pressure status" + DEFVAL { 0 } + ::= { digitalObjects 14 } + + -- 1.3.6.1.4.1.9839.2.1.1.15 + -- vendor descriptor: hip-pstat + hip-pstat OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "ID1-High pressure status" + DEFVAL { 0 } + ::= { digitalObjects 15 } + + -- 1.3.6.1.4.1.9839.2.1.1.16 + -- vendor descriptor: heater-on + heater-on OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Heater status" + DEFVAL { 0 } + ::= { digitalObjects 16 } + + -- 1.3.6.1.4.1.9839.2.1.1.17 + -- vendor descriptor: evapfan-on + evapfan-on OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Evaporating fan status" + DEFVAL { 0 } + ::= { digitalObjects 17 } + + -- 1.3.6.1.4.1.9839.2.1.1.18 + -- vendor descriptor: inputscheck.dinonoff-din + dinonoff-din OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "ID1-Digital input status(0: system on; 1: system off)" + DEFVAL { 0 } + ::= { digitalObjects 18 } + + -- 1.3.6.1.4.1.9839.2.1.1.19 + -- vendor descriptor: comp-on + comp-on OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Compressor status" + DEFVAL { 0 } + ::= { digitalObjects 19 } + + -- 1.3.6.1.4.1.9839.2.1.1.20 + -- vendor descriptor: al-lowunitvol.active + al-lowunitvol-active OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Low unit voltage alarm - Alarm status" + DEFVAL { 0 } + ::= { digitalObjects 20 } + + -- 1.3.6.1.4.1.9839.2.1.1.21 + -- vendor descriptor: al-comprecedataerr.active + al-comprecedataerr-active OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Reveive data error alarm from drive board - Alarm status" + DEFVAL { 0 } + ::= { digitalObjects 21 } + + -- 1.3.6.1.4.1.9839.2.1.1.22 + -- vendor descriptor: al-compmodcomerr.active + al-compmodcomerr-active OBJECT-TYPE + SYNTAX Integer32 (0..1) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Compressor modbus communication error alarm from drive board - Alarm status" + DEFVAL { 0 } + ::= { digitalObjects 22 } + + -- 1.3.6.1.4.1.9839.2.1.2 + analogObjects OBJECT IDENTIFIER ::= { vak-cx-bms-snmp-1MIB 2 } + + -- 1.3.6.1.4.1.9839.2.1.2.1 + -- vendor descriptor: regulation.offs-coolsetp + offs-coolsetp OBJECT-TYPE + SYNTAX Integer32 (-32768..32767) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Regulate temperature setpoint difference in cooling mode" + DEFVAL { 0 } + ::= { analogObjects 1 } + + -- 1.3.6.1.4.1.9839.2.1.2.2 + -- vendor descriptor: offs-heatsetp + offs-heatsetp OBJECT-TYPE + SYNTAX Integer32 (-32768..32767) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Regulate temperature setpoint difference in heating mode" + DEFVAL { 0 } + ::= { analogObjects 2 } + + -- 1.3.6.1.4.1.9839.2.1.2.3 + heatsetp OBJECT-TYPE + SYNTAX Integer32 (-32768..32767) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Regulate setpoint in heating mode" + DEFVAL { 0 } + ::= { analogObjects 3 } + + -- 1.3.6.1.4.1.9839.2.1.2.4 + coolsetp OBJECT-TYPE + SYNTAX Integer32 (-32768..32767) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Regulate setpoint in cooling mode" + DEFVAL { 0 } + ::= { analogObjects 4 } + + -- 1.3.6.1.4.1.9839.2.1.2.5 + -- vendor descriptor: outputs.evapfan-aoutval + evapfan-aoutval OBJECT-TYPE + SYNTAX Integer32 (-32768..32767) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Y3-Evaporating fan analog output value" + DEFVAL { 0 } + ::= { analogObjects 5 } + + -- 1.3.6.1.4.1.9839.2.1.2.6 + -- vendor descriptor: outputs.condfan-aoutval + condfan-aoutval OBJECT-TYPE + SYNTAX Integer32 (-32768..32767) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Y2-Condenser fan analog output value" + DEFVAL { 0 } + ::= { analogObjects 6 } + + -- 1.3.6.1.4.1.9839.2.1.2.7 + -- vendor descriptor: inputscheck.rettemp-val + rettemp-val OBJECT-TYPE + SYNTAX Integer32 (-32768..32767) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "B1/U1-Return temperature input" + DEFVAL { 0 } + ::= { analogObjects 7 } + + -- 1.3.6.1.4.1.9839.2.1.2.8 + condsrcoiltemp OBJECT-TYPE + SYNTAX Integer32 (-32768..32767) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "B2/U2-Condenser coil temperature" + DEFVAL { 0 } + ::= { analogObjects 8 } + + -- 1.3.6.1.4.1.9839.2.1.2.12 + rettemp OBJECT-TYPE + SYNTAX Integer32 (-32768..32767) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "B1/U1-Return temperature" + DEFVAL { 0 } + ::= { analogObjects 12 } + + -- 1.3.6.1.4.1.9839.2.1.2.13 + -- vendor descriptor: inputscheck.condsrcoiltemp-val + condsrcoiltemp-val OBJECT-TYPE + SYNTAX Integer32 (-32768..32767) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "B2/U2-Condenser coil temperature input" + DEFVAL { 0 } + ::= { analogObjects 13 } + + -- 1.3.6.1.4.1.9839.2.1.2.14 + -- vendor descriptor: inputscheck.comptemp-val + comptemp-val OBJECT-TYPE + SYNTAX Integer32 (-32768..32767) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "B5/U5-Compressor temperature input" + DEFVAL { 0 } + ::= { analogObjects 14 } + + -- 1.3.6.1.4.1.9839.2.1.2.15 + -- vendor descriptor: inputscheck.ambtemp-val + ambtemp-val OBJECT-TYPE + SYNTAX Integer32 (-32768..32767) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "B6/U6-Ambient temerature input" + DEFVAL { 0 } + ::= { analogObjects 15 } + + -- 1.3.6.1.4.1.9839.2.1.3 + integerObjects OBJECT IDENTIFIER ::= { vak-cx-bms-snmp-1MIB 3 } + + -- 1.3.6.1.4.1.9839.2.1.3.9 + -- vendor descriptor: comp-vol-in + comp-vol-in OBJECT-TYPE + SYNTAX Integer32 (-32768..32767) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Compressor voltage from drive board" + DEFVAL { 0 } + ::= { integerObjects 9 } + + -- 1.3.6.1.4.1.9839.2.1.3.10 + -- vendor descriptor: comp-actspeed + comp-actspeed OBJECT-TYPE + SYNTAX Integer32 (-2147483648..2147483647) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Compressor actual speed" + DEFVAL { 0 } + ::= { integerObjects 10 } + + -- 1.3.6.1.4.1.9839.2.1.3.16 + -- vendor descriptor: comp-speedfb + comp-speedfb OBJECT-TYPE + SYNTAX Integer32 (-32768..32767) + UNITS "N/A" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Compressor feedback speed" + DEFVAL { 0 } + ::= { integerObjects 16 } + + END + +-- +-- CAREL-vak-cx-bms-snmp-1.MIB +-- diff --git a/mibs/datacom/DATACOM-XCVR-MIB b/mibs/datacom/DATACOM-XCVR-MIB new file mode 100644 index 00000000000..93c231fe41c --- /dev/null +++ b/mibs/datacom/DATACOM-XCVR-MIB @@ -0,0 +1,161 @@ +DATACOM-XCVR-MIB DEFINITIONS ::= BEGIN + +-- Partial MIB (RouterX custom) exposing DmOS transceiver DDM to LibreNMS. +-- Three real agent subtrees under enterprises.3709.3.6, all keyed by ifIndex: +-- .11.3 inventory + alarm/warning thresholds (per port) +-- .8.1 real-time temperature / voltage (per port) +-- .8.2 real-time rx/tx power / bias current (per port, per lane) + +IMPORTS + MODULE-IDENTITY, OBJECT-TYPE, enterprises, Integer32, Gauge32 + FROM SNMPv2-SMI + DisplayString + FROM SNMPv2-TC + ifIndex + FROM IF-MIB; + +datacomXcvrMIB MODULE-IDENTITY + LAST-UPDATED "202610050000Z" + ORGANIZATION "RouterX" + CONTACT-INFO "Josi - RouterX" + DESCRIPTION "Partial DmOS transceiver DDM MIB for LibreNMS optical monitoring." + REVISION "202610050000Z" + DESCRIPTION "Values + thresholds mapped against DmOS CLI digital-diagnostics." + ::= { enterprises 3709 } + +-- ============ .3.6.11.3 : inventory + thresholds (index = ifIndex) ============ +dmXcvrTable OBJECT-TYPE + SYNTAX SEQUENCE OF DmXcvrEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "Transceiver inventory and DDM thresholds." + ::= { enterprises 3709 3 6 11 3 } + +dmXcvrEntry OBJECT-TYPE + SYNTAX DmXcvrEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "Entry." + INDEX { ifIndex } + ::= { dmXcvrTable 1 } + +DmXcvrEntry ::= SEQUENCE { + dmXcvrType DisplayString, + dmXcvrTempLoAlarm DisplayString, dmXcvrTempHiAlarm DisplayString, + dmXcvrTempLoWarn DisplayString, dmXcvrTempHiWarn DisplayString, + dmXcvrRxLoAlarm DisplayString, dmXcvrRxHiAlarm DisplayString, + dmXcvrRxLoWarn DisplayString, dmXcvrRxHiWarn DisplayString, + dmXcvrTxLoAlarm DisplayString, dmXcvrTxHiAlarm DisplayString, + dmXcvrTxLoWarn DisplayString, dmXcvrTxHiWarn DisplayString, + dmXcvrVoltLoAlarm DisplayString, dmXcvrVoltHiAlarm DisplayString, + dmXcvrVoltLoWarn DisplayString, dmXcvrVoltHiWarn DisplayString, + dmXcvrBiasLoAlarm DisplayString, dmXcvrBiasHiAlarm DisplayString, + dmXcvrBiasLoWarn DisplayString, dmXcvrBiasHiWarn DisplayString +} + +dmXcvrType OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Compliance/type." ::= { dmXcvrEntry 4 } +dmXcvrTempLoAlarm OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Temp low alarm (C)." ::= { dmXcvrEntry 10 } +dmXcvrTempHiAlarm OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Temp high alarm (C)." ::= { dmXcvrEntry 11 } +dmXcvrTempLoWarn OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Temp low warn (C)." ::= { dmXcvrEntry 12 } +dmXcvrTempHiWarn OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Temp high warn (C)." ::= { dmXcvrEntry 13 } +dmXcvrRxLoAlarm OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Rx low alarm (dBm)." ::= { dmXcvrEntry 14 } +dmXcvrRxHiAlarm OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Rx high alarm (dBm)." ::= { dmXcvrEntry 15 } +dmXcvrRxLoWarn OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Rx low warn (dBm)." ::= { dmXcvrEntry 16 } +dmXcvrRxHiWarn OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Rx high warn (dBm)." ::= { dmXcvrEntry 17 } +dmXcvrTxLoAlarm OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Tx low alarm (dBm)." ::= { dmXcvrEntry 18 } +dmXcvrTxHiAlarm OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Tx high alarm (dBm)." ::= { dmXcvrEntry 19 } +dmXcvrTxLoWarn OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Tx low warn (dBm)." ::= { dmXcvrEntry 20 } +dmXcvrTxHiWarn OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Tx high warn (dBm)." ::= { dmXcvrEntry 21 } +dmXcvrVoltLoAlarm OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Vcc low alarm (V)." ::= { dmXcvrEntry 22 } +dmXcvrVoltHiAlarm OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Vcc high alarm (V)." ::= { dmXcvrEntry 23 } +dmXcvrVoltLoWarn OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Vcc low warn (V)." ::= { dmXcvrEntry 24 } +dmXcvrVoltHiWarn OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Vcc high warn (V)." ::= { dmXcvrEntry 25 } +dmXcvrBiasLoAlarm OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Bias low alarm (mA)." ::= { dmXcvrEntry 26 } +dmXcvrBiasHiAlarm OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Bias high alarm (mA)."::= { dmXcvrEntry 27 } +dmXcvrBiasLoWarn OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Bias low warn (mA)." ::= { dmXcvrEntry 28 } +dmXcvrBiasHiWarn OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Bias high warn (mA)." ::= { dmXcvrEntry 29 } + +-- ============ .3.6.8.1 : real-time temperature / voltage (index = ifIndex) ============ +dmXcvrDiagTable OBJECT-TYPE + SYNTAX SEQUENCE OF DmXcvrDiagEntry + MAX-ACCESS not-accessible STATUS current + DESCRIPTION "Real-time per-port temperature/voltage (scaled x100)." + ::= { enterprises 3709 3 6 8 1 } +dmXcvrDiagE1 OBJECT IDENTIFIER ::= { dmXcvrDiagTable 1 } +dmXcvrDiagEntry OBJECT-TYPE + SYNTAX DmXcvrDiagEntry MAX-ACCESS not-accessible STATUS current + DESCRIPTION "Entry." INDEX { ifIndex } ::= { dmXcvrDiagE1 1 } +DmXcvrDiagEntry ::= SEQUENCE { dmXcvrDiagTemp Integer32, dmXcvrDiagVolt Integer32 } +dmXcvrDiagTemp OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-only STATUS current DESCRIPTION "Temperature, 0.01 C." ::= { dmXcvrDiagEntry 1 } +dmXcvrDiagVolt OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-only STATUS current DESCRIPTION "Voltage, 0.01 V." ::= { dmXcvrDiagEntry 2 } + +-- ============ .3.6.8.2 : real-time rx/tx power, bias (index = ifIndex, lane) ============ +dmXcvrLaneTable OBJECT-TYPE + SYNTAX SEQUENCE OF DmXcvrLaneEntry + MAX-ACCESS not-accessible STATUS current + DESCRIPTION "Real-time per-lane rx/tx power and bias (scaled x100)." + ::= { enterprises 3709 3 6 8 2 } +dmXcvrLaneE1 OBJECT IDENTIFIER ::= { dmXcvrLaneTable 1 } +dmXcvrLaneEntry OBJECT-TYPE + SYNTAX DmXcvrLaneEntry MAX-ACCESS not-accessible STATUS current + DESCRIPTION "Entry." INDEX { ifIndex, dmXcvrLaneNum } ::= { dmXcvrLaneE1 1 } +DmXcvrLaneEntry ::= SEQUENCE { + dmXcvrLaneNum Integer32, + dmXcvrRxDbm Integer32, + dmXcvrTxDbm Integer32, + dmXcvrBias Integer32 +} +dmXcvrLaneNum OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS not-accessible STATUS current DESCRIPTION "Lane number." ::= { dmXcvrLaneEntry 1 } +dmXcvrRxDbm OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-only STATUS current DESCRIPTION "Rx power, 0.01 dBm." ::= { dmXcvrLaneEntry 2 } +dmXcvrTxDbm OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-only STATUS current DESCRIPTION "Tx power, 0.01 dBm." ::= { dmXcvrLaneEntry 3 } +dmXcvrBias OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-only STATUS current DESCRIPTION "Tx bias, 0.01 mA." ::= { dmXcvrLaneEntry 4 } + +-- ============ .3.6.6.1.3 : equipment temperature sensors (scaled x10) ============ +dmEnvTempTable OBJECT-TYPE + SYNTAX SEQUENCE OF DmEnvTempEntry + MAX-ACCESS not-accessible STATUS current + DESCRIPTION "Board/CPU/fabric/PSU temperature sensors." + ::= { enterprises 3709 3 6 6 1 3 } +dmEnvTempEntry OBJECT-TYPE + SYNTAX DmEnvTempEntry MAX-ACCESS not-accessible STATUS current + DESCRIPTION "Entry." INDEX { dmEnvTempUnit } ::= { dmEnvTempTable 1 } +DmEnvTempEntry ::= SEQUENCE { + dmEnvTempUnit Integer32, dmEnvTempName DisplayString, + dmEnvTempHiAlarm Integer32, dmEnvTempValue Integer32 +} +dmEnvTempUnit OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS not-accessible STATUS current DESCRIPTION "Unit." ::= { dmEnvTempEntry 1 } +dmEnvTempName OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Sensor name." ::= { dmEnvTempEntry 2 } +dmEnvTempHiAlarm OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-only STATUS current DESCRIPTION "High alarm, 0.1 C." ::= { dmEnvTempEntry 3 } +dmEnvTempValue OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-only STATUS current DESCRIPTION "Temperature, 0.1 C." ::= { dmEnvTempEntry 6 } + +-- ============ .3.6.6.1.4 : fans (RPM) ============ +dmEnvFanTable OBJECT-TYPE + SYNTAX SEQUENCE OF DmEnvFanEntry + MAX-ACCESS not-accessible STATUS current + DESCRIPTION "Fan tray speeds." + ::= { enterprises 3709 3 6 6 1 4 } +dmEnvFanEntry OBJECT-TYPE + SYNTAX DmEnvFanEntry MAX-ACCESS not-accessible STATUS current + DESCRIPTION "Entry." INDEX { dmEnvFanUnit } ::= { dmEnvFanTable 1 } +DmEnvFanEntry ::= SEQUENCE { + dmEnvFanUnit Integer32, dmEnvFanName DisplayString, dmEnvFanRpm Gauge32 +} +dmEnvFanUnit OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS not-accessible STATUS current DESCRIPTION "Unit." ::= { dmEnvFanEntry 1 } +dmEnvFanName OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Fan name." ::= { dmEnvFanEntry 2 } +dmEnvFanRpm OBJECT-TYPE SYNTAX Gauge32 MAX-ACCESS read-only STATUS current DESCRIPTION "Fan speed, RPM." ::= { dmEnvFanEntry 4 } + +-- ============ .3.6.11.2 : chassis / module / PSU inventory + status ============ +dmInvTable OBJECT-TYPE + SYNTAX SEQUENCE OF DmInvEntry + MAX-ACCESS not-accessible STATUS current + DESCRIPTION "Chassis, module and power-supply inventory." + ::= { enterprises 3709 3 6 11 2 } +dmInvEntry OBJECT-TYPE + SYNTAX DmInvEntry MAX-ACCESS not-accessible STATUS current + DESCRIPTION "Entry." INDEX { dmInvIdx } ::= { dmInvTable 1 } +DmInvEntry ::= SEQUENCE { dmInvIdx Integer32, dmInvName DisplayString, dmUnitStatus Integer32 } +dmInvIdx OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS not-accessible STATUS current DESCRIPTION "Index." ::= { dmInvEntry 1 } +dmInvName OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current DESCRIPTION "Unit name (e.g. 1/PSU2)." ::= { dmInvEntry 2 } +dmUnitStatus OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-only STATUS current DESCRIPTION "Operational status (1=OK)." ::= { dmInvEntry 18 } + +END diff --git a/mibs/dcn/DCN-MIB b/mibs/dcn/DCN-MIB index ca36b220acb..4535741a3a8 100644 --- a/mibs/dcn/DCN-MIB +++ b/mibs/dcn/DCN-MIB @@ -1,26 +1,43 @@ DCN-MIB DEFINITIONS ::= BEGIN - ---2.1.32 + +--2.1.113 IMPORTS - OBJECT-TYPE FROM SNMPv2-SMI - TEXTUAL-CONVENTION,RowStatus,TimeStamp, TruthValue FROM SNMPv2-TC + OBJECT-TYPE FROM SNMPv2-SMI + TEXTUAL-CONVENTION,RowStatus,TimeStamp, TruthValue FROM SNMPv2-TC MODULE-IDENTITY, OBJECT-TYPE, mib-2, Integer32, Counter32, Counter64,Gauge32,Unsigned32, NOTIFICATION-TYPE, IpAddress, TimeTicks,experimental FROM SNMPv2-SMI MODULE-COMPLIANCE, OBJECT-GROUP, NOTIFICATION-GROUP FROM SNMPv2-CONF + ifIndex FROM RFC1213-MIB TRAP-TYPE FROM RFC-1215 enterprises FROM RFC1155-SMI; + dcn MODULE-IDENTITY + LAST-UPDATED "202307140000Z" + ORGANIZATION "DCN" + CONTACT-INFO + "DC YunKe Networks Co.,Ltd. + Phone: 400-810-9119 + Web: http://www.dcnetworks.com.cn + Locate: CN" + DESCRIPTION + "DCN MIB." + REVISION "202307140000Z" + DESCRIPTION + "Adjust the mib file to normalize it." + ::= { enterprises 6339 } + DisplayString ::= OCTET STRING - MacAddress ::= OCTET STRING (SIZE (17)) - -- a 17 octet address + MacAddress ::= OCTET STRING (SIZE (17)) + -- a 17 octet address -- in the -- "canonical" -- order + InetAddressType ::= TEXTUAL-CONVENTION STATUS current DESCRIPTION @@ -344,12 +361,12 @@ Ipv6Address ::= TEXTUAL-CONVENTION --******************************************************************************************************** --******************************************************************************************************** - dcn OBJECT IDENTIFIER ::= { enterprises 6339 } +-- dcn OBJECT IDENTIFIER ::= { enterprises 6339 } - os OBJECT IDENTIFIER ::= { dcn 100 } - notifications OBJECT IDENTIFIER ::= { dcn 101 } - conformance OBJECT IDENTIFIER ::= { dcn 102 } + os OBJECT IDENTIFIER ::= { dcn 100 } + notifications OBJECT IDENTIFIER ::= { dcn 101 } + conformance OBJECT IDENTIFIER ::= { dcn 102 } --xxx.100.1 @@ -357,9 +374,9 @@ Ipv6Address ::= TEXTUAL-CONVENTION --xxx.100.2 priSpanningTree OBJECT IDENTIFIER ::= { os 2 } --xxx.100.3 - priPorts OBJECT IDENTIFIER ::= { os 3 } + priPorts OBJECT IDENTIFIER ::= { os 3 } --xxx.100.4 - priIpConfig OBJECT IDENTIFIER ::= { os 4 } + priIpConfig OBJECT IDENTIFIER ::= { os 4 } --xxx.100.5 priVlanConfig OBJECT IDENTIFIER ::= { os 5 } --xxx.100.6 @@ -369,23 +386,23 @@ Ipv6Address ::= TEXTUAL-CONVENTION --xxx.100.8 priIgmpSnoopingMib OBJECT IDENTIFIER ::= { os 8 } --xxx.100.9 - priQinQmib OBJECT IDENTIFIER ::= { os 9 } + priQinQmib OBJECT IDENTIFIER ::= { os 9 } --xxx.100.10 - prisecurity OBJECT IDENTIFIER ::= { os 10 } + prisecurity OBJECT IDENTIFIER ::= { os 10 } --xxx.100.11 - priQos OBJECT IDENTIFIER ::= { os 11 } + priQos OBJECT IDENTIFIER ::= { os 11 } --xxx.100.12 - primirror OBJECT IDENTIFIER ::= { os 12 } + primirror OBJECT IDENTIFIER ::= { os 12 } --xxx.100.13 - pridhcp OBJECT IDENTIFIER ::= { os 13 } + pridhcp OBJECT IDENTIFIER ::= { os 13 } --xxx.100.14 - priportGroup OBJECT IDENTIFIER ::= { os 14 } + priportGroup OBJECT IDENTIFIER ::= { os 14 } --xxx.100.15 - prisnmpMgt OBJECT IDENTIFIER ::= { os 15 } + prisnmpMgt OBJECT IDENTIFIER ::= { os 15 } --xxx.100.16 - l3 OBJECT IDENTIFIER ::= { os 16 } + l3 OBJECT IDENTIFIER ::= { os 16 } --xxx.100.17 - sntpMgt OBJECT IDENTIFIER ::= { os 17 } + sntpMgt OBJECT IDENTIFIER ::= { os 17 } --xxx.100.18 urpf OBJECT IDENTIFIER ::= { os 18 } --xxx.100.20 @@ -400,19 +417,19 @@ Ipv6Address ::= TEXTUAL-CONVENTION --xxx.100.25 ntpSnmpMIB OBJECT IDENTIFIER ::= { os 25 } --xxx.100.26 - priPoeConfig OBJECT IDENTIFIER ::= { os 26 } + priPoeConfig OBJECT IDENTIFIER ::= { os 26 } --xxx.100.27 - priQos2 OBJECT IDENTIFIER ::= { os 27 } + priQos2 OBJECT IDENTIFIER ::= { os 27 } --xxx.100.28 - dot1xMgt OBJECT IDENTIFIER ::= { os 28 } + dot1xMgt OBJECT IDENTIFIER ::= { os 28 } --xxx.100.29 - portMacCountLimit OBJECT IDENTIFIER ::= { os 29 } + portMacCountLimit OBJECT IDENTIFIER ::= { os 29 } --xxx.100.30 - ddm OBJECT IDENTIFIER ::= { os 30 } + ddm OBJECT IDENTIFIER ::= { os 30 } --xxx.100.31 - priPppoeIaMib OBJECT IDENTIFIER ::= { os 31 } + priPppoeIaMib OBJECT IDENTIFIER ::= { os 31 } --xxx.100.32 portSecurity OBJECT IDENTIFIER ::= { os 32 } @@ -431,10 +448,28 @@ Ipv6Address ::= TEXTUAL-CONVENTION --xxx.100.37 priCable OBJECT IDENTIFIER ::= { os 37 } + --xxx.100.38 - priMrppRing OBJECT IDENTIFIER ::= { os 38 } + priMrppRing OBJECT IDENTIFIER ::= { os 38 } + +--xxx.100.39 + erpsMgt OBJECT IDENTIFIER ::= { os 39 } + +--xxx.100.40 + fdbMacInfo OBJECT IDENTIFIER ::= { os 40 } + +--xxx.100.41 + fdbMacQuery OBJECT IDENTIFIER ::= { os 41 } + +--xxx.100.42 + vplsMacCntQuery OBJECT IDENTIFIER ::= { os 42 } + +--xxx.100.43 + isolatePortCfgQuery OBJECT IDENTIFIER ::= { os 43 } + +--xxx.100.200 + lldpPrivateInfo OBJECT IDENTIFIER ::= { os 200 } - -- ntpSnmpMIBObjects OBJECT IDENTIFIER ::= { ntpSnmpMIB 1 } @@ -460,9 +495,9 @@ sysResetUnit OBJECT-TYPE STATUS current DESCRIPTION " setfactory(2) - warmReset(3) - noReset(1) - default the status is 1 " + warmReset(3) + noReset(1) + default the status is 1 " ::= { priSystem 1} --xxx.100.1.2 @@ -497,7 +532,7 @@ sysStackFlag OBJECT-TYPE --xxx.100.1.5 sysCPUMac OBJECT-TYPE - SYNTAX MacAddress (SIZE(17)) + SYNTAX MacAddress MAX-ACCESS read-only STATUS current DESCRIPTION @@ -538,15 +573,16 @@ SysPowerStateEntry ::= SEQUENCE { sysPowerSlotIndex INTEGER, - sysPowerState INTEGER, - sysPowerValue INTEGER, - sysPowerType INTEGER, - sysPowerStatus INTEGER + sysPowerState INTEGER, + sysPowerValue INTEGER, + sysPowerType INTEGER, + sysPowerStatus INTEGER, + sysPowerSupplyType INTEGER } --xxx.100.1.7.1.1 sysPowerSlotIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (0..32) MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -555,7 +591,7 @@ sysPowerSlotIndex OBJECT-TYPE --xxx.100.1.7.1.2 sysPowerState OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER { sysPowerInstalled(1), sysPowerNotInstalled(0) @@ -597,7 +633,20 @@ sysPowerStatus OBJECT-TYPE STATUS current DESCRIPTION "Power Status" ::= { sysPowerStateEntry 5 } - + +--xxx.100.1.7.1.6 +sysPowerSupplyType OBJECT-TYPE + SYNTAX INTEGER + { + na(0), + ac(1), + dc(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Power supply type 0-na 1-ac 2-dc" + ::= { sysPowerStateEntry 6 } + --xxx.100.1.8 sysSlotTable OBJECT-TYPE SYNTAX SEQUENCE OF SysSlotEntry @@ -620,23 +669,27 @@ sysSlotEntry OBJECT-TYPE SysSlotEntry ::= SEQUENCE { - sysSlotIndex INTEGER, - sysCPUType DisplayString, - sysCPUFiveSecondIdle INTEGER, - sysCPUThirtySecondIdle INTEGER, - sysCPUFiveMinuteIdle INTEGER, - sysCPUIdle INTEGER, - sysMemorySize INTEGER, - sysMemoryBusy INTEGER, - sysFlashSize INTEGER, - sysTemperature INTEGER, - sysCpuUsage INTEGER , - sysMemoryUsage INTEGER + sysSlotIndex INTEGER, + sysCPUType DisplayString, + sysCPUFiveSecondIdle INTEGER, + sysCPUThirtySecondIdle INTEGER, + sysCPUFiveMinuteIdle INTEGER, + sysCPUIdle INTEGER, + sysMemorySize INTEGER, + sysMemoryBusy INTEGER, + sysFlashSize INTEGER, + sysTemperature INTEGER, + sysCpuUsage INTEGER , + sysMemoryUsage INTEGER, + sysMemUsage INTEGER, + sysPortNum INTEGER, + sysFreeFlashSize INTEGER, + sysMemorySizeInMB INTEGER } --xxx.100.1.8.1.1 sysSlotIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..16) MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -721,7 +774,7 @@ sysTemperature OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "The Temperature of this slot.80 is 80centigrade" + "The Temperature of this slot.80 is 80centigrade, but -100 means that the slot does not support temperature display" ::= { sysSlotEntry 10 } --xxx.100.1.8.1.11 @@ -739,7 +792,44 @@ sysMemoryUsage OBJECT-TYPE STATUS current DESCRIPTION "The memory usage of this slot." - ::= { sysSlotEntry 12 } + ::= { sysSlotEntry 12 } + + +--xxx.100.1.8.1.21 +sysMemUsage OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The memory usage of this slot." + ::= { sysSlotEntry 21 } + +--xxx.100.1.8.1.22 +sysPortNum OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The physical port number of this slot." + ::= { sysSlotEntry 22 } + + --xxx.100.1.8.1.23 +sysFreeFlashSize OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The free flash capacity of this slot in Kbytes." + ::= { sysSlotEntry 23 } + + --xxx.100.1.8.1.24 +sysMemorySizeInMB OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The memory size in MB" + ::= { sysSlotEntry 24 } --******************************************************************************************************** --xxx.100.1.9 @@ -770,7 +860,7 @@ SwitchInfoEntry ::= SEQUENCE --xxx.100.1.9.1.1 swSlotIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..16) MAX-ACCESS read-only STATUS current DESCRIPTION "This object identifies the slot within the switch @@ -780,7 +870,7 @@ swSlotIndex OBJECT-TYPE --xxx.100.1.9.1.2 swUnitIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (0..4) MAX-ACCESS read-only STATUS current DESCRIPTION "This object identifies the switch within the system @@ -792,122 +882,164 @@ swUnitIndex OBJECT-TYPE swModuleType OBJECT-TYPE SYNTAX INTEGER { - typeMFC(0), - typeSFC(1), - type1GS(2), - type1GL(3), - type100M1GT(4), - type10M100MT(8), - type1-M12GB(101), - type1-12GT(102), - type1-210Gx(103), - type1-110Gx(104), - type1-CPU8245(105), - type1-BACKPLANE(106), - type1-24GB(107), - type1-24GT(108), - type1-36TX(109), - type1-4GX32TX(110), - type1-16FX(111), - type1-ES2GB(112), - type1-M4GX24TX(113), - type1-ES(114), - type1-MI(115), - type1-MII(116), - type1-12GB(117), - type1-M8GB(118), - type1-2XFP8GX16GB(119), - type1-8GX16GB(120), - type1-4GX24TX(121), - type1-L-M4GX24TX(122), - type1-1XFP8GX16GB(123), - type1-2XFP12GX12GT(124), - type1-12GX12GT(125), - type1-1XFP12GX12GT(126), - type1-48GT(127), - type1-M1XFP12GX12GT(128), - type1-4XFP(129), - type1-48GB(130), - type1-M44GT(131), - type1-M1XFP12GX12GB(132), - type1-12GX12GB(133), - type1-2XFP12GX12GB(134), - type1-2XFP24GB12GT(136), - type1-24GB12GT(137), - type1-NEWMI(138), - type1-M1XFP12GX12GTR4(139), - type1-12GX12GTR4(140), - type1-2XFP12GX12GTR4(141), - type1-E-24GB12GT(142), - type1-E-2XFP24GB12GT(143), - type8QSFP(145), - type2-M12GB(165), - type2-12GT(166), - type2-210Gx(167), - type2-110Gx(168), - type2-CPU8245(169), - type2-BACKPLANE(170), - type2-24GB(171), - type2-24GT(172), - type2-36TX(173), - type2-4GX32TX(174), - type2-16FX(175), - type2-ES2GB(176), - type2-M4GX24TX(177), - type2-ES(178), - type2-MI(179), - type2-MII(180), - type2-12GB(181), - type2-M8GB(182), - type2-2XFP8GX16GB(183), - type2-8GX16GB(184), - type2-4GX24TX(185), - type2-L-M4GX24TX(186), - type2-1XFP8GX16GB(187), - type2-2XFP12GX12GT(188), - type2-12GX12GT(189), - type2-1XFP12GX12GT(190), - type2-48GT(191), - type2-M1XFP12GX12GT(192), - type2-4XFP(193), - type2-48GB(194), - type2-M44GT(195), - type2-M1XFP12GX12GB(196), - type2-12GX12GB(197), - type2-2XFP12GX12GB(198), - type2-2XFP24GB12GT(200), - type2-24GB12GT(201), - type2-NEWMI(202), - type2-M1XFP12GX12GTR4(203), - type2-12GX12GTR4(204), - type2-2XFP12GX12GTR4(205), - type2-E-24GB12GT(206), - type2-E-2XFP24GB12GT(207), - type3-M (228), - type3-MI(229), - type3-MII(230), - type3-24GT(231), - type3-24GB(232), - type3-ES-FW(233), - type3-4XFP(234), - type3-8XFP(235), - type3-24GT-V(236), - type3-24GB-V(237), - type3-24SFP-PLUS(238), - type3-08BACKPLANE(239), - type3-16BACKPLANE(240), - type4-4GT(300), - type4-4FX(301), - type4-2GB(302), - type4-4TX(303), - type4-4GB(304), - type4-4FB(305), - type5-M16K-SUP(320), - type5-M16K-16Q(321), - type5-M16K-FC(322), - type5-M16K-48XS2Q(323), - type5-M16K-24T24S2XS(324) - + typeMFC(0), + typeSFC(1), + type1GS(2), + type1GL(3), + type100M1GT(4), + type10M100MT(8), + type1-M12GB(101), + type1-12GT(102), + type1-210Gx(103), + type1-110Gx(104), + type1-CPU8245(105), + type1-BACKPLANE(106), + type1-24GB(107), + type1-24GT(108), + type1-36TX(109), + type1-4GX32TX(110), + type1-16FX(111), + type1-ES2GB(112), + type1-M4GX24TX(113), + type1-ES(114), + type1-MI(115), + type1-MII(116), + type1-12GB(117), + type1-M8GB(118), + type1-2XFP8GX16GB(119), + type1-8GX16GB(120), + type1-4GX24TX(121), + type1-L-M4GX24TX(122), + type1-1XFP8GX16GB(123), + type1-2XFP12GX12GT(124), + type1-12GX12GT(125), + type1-1XFP12GX12GT(126), + type1-48GT(127), + type1-M1XFP12GX12GT(128), + type1-4XFP(129), + type1-48GB(130), + type1-M44GT(131), + type1-M1XFP12GX12GB(132), + type1-12GX12GB(133), + type1-2XFP12GX12GB(134), + type1-4GB12GX8GT(135), + type1-2XFP24GB12GT(136), + type1-24GB12GT(137), + type1-NEWMI(138), + type1-M1XFP12GX12GTR4(139), + type1-12GX12GTR4(140), + type1-2XFP12GX12GTR4(141), + type1-E-24GB12GT(142), + type1-E-2XFP24GB12GT(143), + type1-MSC(144), + type8QSFP(145), + type1-FW(146), + type1-OF(147), + type1-MIIR2(148), + type1-E-M16GX8GB(149), + type1-E-4XS16GX8GB(150), + type1-2XFP12GX12GTR5(151), + type1-MIIR3(152), + type1-M2XS8GX16GB(154), + type1-28GB16GT4XS(155), + type1-E-48GT(156), + type1-44GB4XS(157), + type1-20XS2Q(158), + type1-M2Q20G12XS(159), + type1-2Q20G16XS(160), + type2-M12GB(165), + type2-12GT(166), + type2-210Gx(167), + type2-110Gx(168), + type2-CPU8245(169), + type2-BACKPLANE(170), + type2-24GB(171), + type2-24GT(172), + type2-36TX(173), + type2-4GX32TX(174), + type2-16FX(175), + type2-ES2GB(176), + type2-M4GX24TX(177), + type2-ES(178), + type2-MI(179), + type2-MII(180), + type2-12GB(181), + type2-M8GB(182), + type2-2XFP8GX16GB(183), + type2-8GX16GB(184), + type2-4GX24TX(185), + type2-L-M4GX24TX(186), + type2-1XFP8GX16GB(187), + type2-2XFP12GX12GT(188), + type2-12GX12GT(189), + type2-1XFP12GX12GT(190), + type2-48GT(191), + type2-M1XFP12GX12GT(192), + type2-4XFP(193), + type2-48GB(194), + type2-M44GT(195), + type2-M1XFP12GX12GB(196), + type2-12GX12GB(197), + type2-2XFP12GX12GB(198), + type2-4GB12GX8GT(199), + type2-2XFP24GB12GT(200), + type2-24GB12GT(201), + type2-NEWMI(202), + type2-M1XFP12GX12GTR4(203), + type2-12GX12GTR4(204), + type2-2XFP12GX12GTR4(205), + type2-E-24GB12GT(206), + type2-E-2XFP24GB12GT(207), + type2-MSC(208), + type2-M1XFP12GX12GTV(209), + type2-FW(210), + type2-OF(211), + type2-MIIR2(212), + type2-E-M16GX8GB(213), + type2-E-4XS16GX8GB(214), + type2-2XFP12GX12GTR5(215), + type2-MIIR3(216), + type2-M2XS8GX16GB(218), + type2-28GB16GT4XS(219), + type2-E-48GT(220), + type2-44GB4XS(221), + type2-20XS2Q(222), + type3-M (228), + type3-MI(229), + type3-MII(230), + type3-24GT(231), + type3-24GB(232), + type3-ES-FW(233), + type3-4XFP(234), + type3-8XFP(235), + type3-24GT-V(236), + type3-24GB-V(237), + type3-24SFP-PLUS(238), + type3-SUP(239), + type3-FAB(240), + type3-MSC(241), + type3-24GT-WS(242), + type3-24GB-WS(243), + type3-FW(244), + type3-8QSFP(245), + type3-OF(246), + type3-20XS2Q(247), + type3-FAB-TWO-CHIP(248), + type3-08BACKPLANE(299), + + type4-4GT(300), + type4-4FX(301), + type4-2GB(302), + type4-4TX(303), + type4-4GB(304), + type4-4FB(305), + type5-M16K-SUP(320), + type5-M16K-16Q(321), + type5-M16K-FC(322), + type5-M16K-48XS2Q(323), + type5-M16K-24T24S2XS(324), + type5-DCFW-1800-M16K(326) + } MAX-ACCESS read-only STATUS current @@ -919,56 +1051,56 @@ switchFileCopy OBJECT IDENTIFIER ::= { priSystem 10 } --xxx.100.1.10.1 fileUserName OBJECT-TYPE - SYNTAX DisplayString (SIZE(1..100)) - MAX-ACCESS read-write - STATUS current - DESCRIPTION "ftp user name" - ::= { switchFileCopy 1 } + SYNTAX DisplayString (SIZE(1..100)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "ftp user name" + ::= { switchFileCopy 1 } --xxx.100.1.10.2 fileUserPassword OBJECT-TYPE - SYNTAX DisplayString (SIZE(1..100)) - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "ftp user password" - ::= { switchFileCopy 2 } - + SYNTAX DisplayString (SIZE(1..100)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ftp user password" + ::= { switchFileCopy 2 } + --xxx.100.1.10.3 fileIPaddress OBJECT-TYPE - SYNTAX DisplayString (SIZE(1..100)) - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "ftp or tftp server ip address" - ::= { switchFileCopy 3 } + SYNTAX DisplayString (SIZE(1..100)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ftp or tftp server ip address" + ::= { switchFileCopy 3 } --xxx.100.1.10.4 sourceFileCopy OBJECT-TYPE - SYNTAX DisplayString (SIZE(1..100)) - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "Source file name or Copy from current system configuration - ." - ::= { switchFileCopy 4 } + SYNTAX DisplayString (SIZE(1..100)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Source file name or Copy from current system configuration + ." + ::= { switchFileCopy 4 } --xxx.100.1.10.5 destinationFileCopy OBJECT-TYPE - SYNTAX DisplayString (SIZE(1..100)) - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "Destination file name or Copy to startup configuration." - ::= { switchFileCopy 5 } + SYNTAX DisplayString (SIZE(1..100)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Destination file name or Copy to startup configuration." + ::= { switchFileCopy 5 } --xxx.100.1.10.6 fileCopyMode OBJECT-TYPE SYNTAX INTEGER - { - ascii(0), - binary(1) - } + { + ascii(0), + binary(1) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -979,10 +1111,10 @@ fileCopyMode OBJECT-TYPE --xxx.100.1.10.7 fileCopyUseMode OBJECT-TYPE SYNTAX INTEGER - { - ftp(1), - tftp(2) - } + { + ftp(1), + tftp(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -993,35 +1125,118 @@ fileCopyUseMode OBJECT-TYPE --xxx.100.1.10.8 fileCopy OBJECT-TYPE SYNTAX INTEGER - { - upload(1), - download(2) - } - MAX-ACCESS read-write - STATUS current - DESCRIPTION + { + upload(1), + download(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "File copy configurate." - ::= { switchFileCopy 8 } - + ::= { switchFileCopy 8 } + --xxx.100.1.10.9 fileCopyResult OBJECT-TYPE SYNTAX INTEGER - { - error(0), - ok(1), - uploading(2), - downloading(3), - idle(4) - } - MAX-ACCESS read-only - STATUS current - DESCRIPTION + { + error(0), + ok(1), + uploading(2), + downloading(3), + idle(4) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The result of file copy:error(0):copy file failure;ok(1):copy file success; + uploading(2):in process of upload file;downloading(3):in process of download file; + idle(4):be out of copy file." + ::= { switchFileCopy 9 } + +--xxx.100.1.10.21 +fileName OBJECT-TYPE + SYNTAX DisplayString (SIZE(1..100)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Source file name and destination file name." + ::= { switchFileCopy 21 } + +--xxx.100.1.10.22 +fileType OBJECT-TYPE + SYNTAX INTEGER + { + any(0), + img(1), + cfg(2), + log(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "File type." + ::= { switchFileCopy 22 } + +--xxx.100.1.10.23 +filePort OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ftp or tftp server port number." + ::= { switchFileCopy 23 } + +--xxx.100.1.10.24 +fileCopyFailReason OBJECT-TYPE + SYNTAX DisplayString (SIZE(0..127)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The reason when copy file failed." + ::= { switchFileCopy 24 } + +--xxx.100.1.10.25 +fileCMCCCopy OBJECT-TYPE + SYNTAX INTEGER + { + upload(1), + download(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "File copy configurate." + ::= { switchFileCopy 25 } + +--xxx.100.1.10.26 +fileCMCCIPaddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ftp or tftp server ip address" + ::= { switchFileCopy 26 } + +--xxx.100.1.10.27 +fileCMCCCopyResult OBJECT-TYPE + SYNTAX INTEGER + { + error(0), + ok(1), + uploading(2), + downloading(3), + idle(4) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The result of file copy:error(0):copy file failure;ok(1):copy file success; uploading(2):in process of upload file;downloading(3):in process of download file; idle(4):be out of copy file." - ::= { switchFileCopy 9 } + ::= { switchFileCopy 27 } + --xxx.100.1.11 - switchInfo OBJECT IDENTIFIER ::= { priSystem 11 } + switchInfo OBJECT IDENTIFIER ::= { priSystem 11 } --xxx.100.1.11.1 switchCPUType OBJECT-TYPE @@ -1115,13 +1330,67 @@ switchCpuUsage OBJECT-TYPE --xx.100.1.11.11 switchMemoryUsage OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER MAX-ACCESS read-only STATUS current DESCRIPTION "The memory usage of switch." ::= { switchInfo 11 } - + +--xxx.100.1.11.14 +switchFlashSizeInBytes OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The flash capacity of switch." + ::= { switchInfo 14 } + +--xxx.100.1.11.15 +switchFlashOccupiedSizeInBytes OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The occupied flash size of switch." + ::= { switchInfo 15 } + +--xxx.100.1.11.16 +switchFlashFreeSizeInBytes OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The free flash size of switch." + ::= { switchInfo 16 } + +--xxx.100.1.11.20 +switchMemUsage OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The memory usage of switch." + ::= { switchInfo 20 } + +--xxx.100.1.11.21 +switchFreeFlashSize OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The free flash size of switch." + ::= { switchInfo 21 } + +--xxx.100.1.11.22 +switchMemorySizeInMB OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The memory usage of switch." + ::= { switchInfo 22 } + --xxx.100.1.12 sysFanTable OBJECT-TYPE SYNTAX SEQUENCE OF SysFanEntry @@ -1143,15 +1412,15 @@ sysFanEntry OBJECT-TYPE SysFanEntry ::= SEQUENCE { - sysFanIndex INTEGER, + sysFanIndex INTEGER, sysFanInserted INTEGER, - sysFanStatus INTEGER, - sysFanSpeed INTEGER + sysFanStatus INTEGER, + sysFanSpeed INTEGER } --xxx.100.1.12.1.1.1 sysFanIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (0..32) MAX-ACCESS not-accessible STATUS current DESCRIPTION "system fan entry index" @@ -1183,19 +1452,19 @@ sysFanStatus OBJECT-TYPE --xxx.100.1.12.1.1.4 sysFanSpeed OBJECT-TYPE - SYNTAX INTEGER - { - none(0), - low(1), - medium-low(2), - medium(3), - medium-high(4), - high(5) - } + SYNTAX INTEGER + { + none(0), + low(1), + medium-low(2), + medium(3), + medium-high(4), + high(5) + } MAX-ACCESS read-write - STATUS current - DESCRIPTION - "Status of Fan. Status: Low(1), Medium-Low(2), Medium(3), Medium-High(4), High(5), none(0) is readonly" + STATUS current + DESCRIPTION + "Status of Fan. Status: Low(1), Medium-Low(2), Medium(3), Medium-High(4), High(5), none(0) is readonly" ::= { sysFanEntry 4 } --xxx.100.1.13 @@ -1240,7 +1509,7 @@ showSwitchStartUpStatus OBJECT-TYPE --xxx.100.1.17 sysSlotBootInfoTable OBJECT-TYPE - SYNTAX SEQUENCE OF SysSlotBootInfoEntry + SYNTAX SEQUENCE OF SysSlotBootInfoEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -1263,10 +1532,11 @@ SysSlotBootInfoEntry sysBootInfoIndex INTEGER, sysBootImgPrimary DisplayString, sysBootImgSecondary DisplayString, - sysBootStartupCfg DisplayString + sysBootStartupCfg DisplayString, + sysBootImgCurrent DisplayString } sysBootInfoIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..16) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -1296,7 +1566,14 @@ sysBootStartupCfg OBJECT-TYPE DESCRIPTION "Set or get filename of boot startup config ,and the length of filename is between 1 and 128." ::= { sysSlotBootInfoEntry 4} - +--xxx.100.1.17.5 +sysBootImgCurrent OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..128)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Filename of boot img for current,and the length of filename is between 1 and 128." + ::= { sysSlotBootInfoEntry 5} --xxx.100.1.18 sysSetBootPassword OBJECT IDENTIFIER ::= { priSystem 18 } @@ -1382,9 +1659,9 @@ sysUserPassword OBJECT-TYPE --xxx.100.1.22.3 sysUserPasswordOption OBJECT-TYPE SYNTAX INTEGER { - uncrypted(0), - crypted(7) - } + uncrypted(0), + crypted(7) + } MAX-ACCESS read-write STATUS current DESCRIPTION "set a uncrypted(0) or crypted(7) password,default uncrypted(0)." @@ -1402,6 +1679,7 @@ sysUserNamePrivilege OBJECT-TYPE --xxx.100.1.22.5 sysAddUserStatus OBJECT-TYPE SYNTAX INTEGER { + disable (0), enable (1) } MAX-ACCESS read-write @@ -1412,7 +1690,7 @@ sysAddUserStatus OBJECT-TYPE --xxx.100.1.23 weiyya begin priPowerTable OBJECT-TYPE - SYNTAX SEQUENCE OF priPowerEntry + SYNTAX SEQUENCE OF PriPowerEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION "Table of power information about @@ -1421,7 +1699,7 @@ priPowerTable OBJECT-TYPE --xxx.100.1.23.1 priPowerEntry OBJECT-TYPE - SYNTAX priPowerEntry + SYNTAX PriPowerEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION "An entry in the table, containing information @@ -1429,7 +1707,7 @@ priPowerEntry OBJECT-TYPE INDEX { priPowerIndex} ::= { priPowerTable 1 } -priPowerEntry ::= SEQUENCE +PriPowerEntry ::= SEQUENCE { priPowerIndex INTEGER, priPowerPresent INTEGER, @@ -1441,10 +1719,10 @@ priPowerEntry ::= SEQUENCE --xxx.100.1.23.1.1 priPowerIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2) MAX-ACCESS read-only STATUS current - DESCRIPTION "get power number(power1;power2)." + DESCRIPTION "get power number(power1-AC;power2-DC)." ::= { priPowerEntry 1 } --xxx.100.1.23.1.2 @@ -1452,7 +1730,7 @@ priPowerPresent OBJECT-TYPE SYNTAX INTEGER MAX-ACCESS read-only STATUS current - DESCRIPTION "get power's status of present(1:present; 0: not present)." + DESCRIPTION "get power's status of present(1:present; 0: not present; 2-unknown,not use)." ::= { priPowerEntry 2 } --xxx.100.1.23.1.3 @@ -1460,20 +1738,20 @@ priPowerSupply OBJECT-TYPE SYNTAX INTEGER MAX-ACCESS read-only STATUS current - DESCRIPTION "get power's supply status(1:up; 0:shutdown)." + DESCRIPTION "get power's supply status(1:up; 0:shutdown;2-unknown,not use)." ::= { priPowerEntry 3 } ---xxx.100.1.23.1.1 -priPowerStatus OBJECT-TYPE - SYNTAX INTEGER - { - AC(1), - DC(2) - } - MAX-ACCESS read-only - STATUS current - DESCRIPTION "get power status(1:AC; 2:DC)." - ::= { priPowerTable 2 } +--xxx.100.1.23.2 +--priPowerStatus OBJECT-TYPE +-- SYNTAX INTEGER +-- { +-- ac(1), +-- dc(2) +-- } +-- MAX-ACCESS read-only +-- STATUS current +-- DESCRIPTION "get power status(1:ac; 2:dc)." +-- ::= { priPowerTable 2 } --xxx.100.1.30 vsfInfo OBJECT IDENTIFIER ::= { priSystem 30 } @@ -1485,9 +1763,9 @@ vsfCount OBJECT-TYPE STATUS current DESCRIPTION "vsf member count." ::= { vsfInfo 1 } - + vsfModuleTable OBJECT-TYPE - SYNTAX SEQUENCE OF vsfModuleEntry + SYNTAX SEQUENCE OF VsfModuleEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION "Table of descriptive and status information about @@ -1496,7 +1774,7 @@ vsfModuleTable OBJECT-TYPE --xxx.100.1.30.2.1 vsfModuleEntry OBJECT-TYPE - SYNTAX vsfModuleEntry + SYNTAX VsfModuleEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION "An entry in the table, containing information @@ -1504,24 +1782,28 @@ vsfModuleEntry OBJECT-TYPE INDEX { vsfSlotIndex , vsfMemberIndex } ::= { vsfModuleTable 1 } -vsfModuleEntry ::= SEQUENCE +VsfModuleEntry ::= SEQUENCE { vsfSlotIndex INTEGER, vsfMemberIndex INTEGER, - vsfModuleType INTEGER + vsfModuleType INTEGER, + vsfCpuMac MacAddress, + vsfPriority INTEGER, + vsfRole INTEGER, + vsfUptime INTEGER } --xxx.100.1.30.2.1.1 vsfSlotIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..32) MAX-ACCESS read-only STATUS current DESCRIPTION "the value is real vsf slot number." ::= { vsfModuleEntry 1 } --xxx.100.1.30.2.1.2 -vsfMemberIndex OBJECT-TYPE - SYNTAX INTEGER +vsfMemberIndex OBJECT-TYPE + SYNTAX INTEGER (1..16) MAX-ACCESS read-only STATUS current DESCRIPTION "vsf member index." @@ -1531,128 +1813,204 @@ vsfMemberIndex OBJECT-TYPE vsfModuleType OBJECT-TYPE SYNTAX INTEGER { - typeMFC(0), - typeSFC(1), - type1GS(2), - type1GL(3), - type100M1GT(4), - type10M100MT(8), - type1-M12GB(101), - type1-12GT(102), - type1-210Gx(103), - type1-110Gx(104), - type1-CPU8245(105), - type1-BACKPLANE(106), - type1-24GB(107), - type1-24GT(108), - type1-36TX(109), - type1-4GX32TX(110), - type1-16FX(111), - type1-ES2GB(112), - type1-M4GX24TX(113), - type1-ES(114), - type1-MI(115), - type1-MII(116), - type1-12GB(117), - type1-M8GB(118), - type1-2XFP8GX16GB(119), - type1-8GX16GB(120), - type1-4GX24TX(121), - type1-L-M4GX24TX(122), - type1-1XFP8GX16GB(123), - type1-2XFP12GX12GT(124), - type1-12GX12GT(125), - type1-1XFP12GX12GT(126), - type1-48GT(127), - type1-M1XFP12GX12GT(128), - type1-4XFP(129), - type1-48GB(130), - type1-M44GT(131), - type1-M1XFP12GX12GB(132), - type1-12GX12GB(133), - type1-2XFP12GX12GB(134), - type1-2XFP24GB12GT(136), - type1-24GB12GT(137), - type1-NEWMI(138), - type1-M1XFP12GX12GTR4(139), - type1-12GX12GTR4(140), - type1-2XFP12GX12GTR4(141), - type1-E-24GB12GT(142), - type1-E-2XFP24GB12GT(143), - type8QSFP(145), - type2-M12GB(165), - type2-12GT(166), - type2-210Gx(167), - type2-110Gx(168), - type2-CPU8245(169), - type2-BACKPLANE(170), - type2-24GB(171), - type2-24GT(172), - type2-36TX(173), - type2-4GX32TX(174), - type2-16FX(175), - type2-ES2GB(176), - type2-M4GX24TX(177), - type2-ES(178), - type2-MI(179), - type2-MII(180), - type2-12GB(181), - type2-M8GB(182), - type2-2XFP8GX16GB(183), - type2-8GX16GB(184), - type2-4GX24TX(185), - type2-L-M4GX24TX(186), - type2-1XFP8GX16GB(187), - type2-2XFP12GX12GT(188), - type2-12GX12GT(189), - type2-1XFP12GX12GT(190), - type2-48GT(191), - type2-M1XFP12GX12GT(192), - type2-4XFP(193), - type2-48GB(194), - type2-M44GT(195), - type2-M1XFP12GX12GB(196), - type2-12GX12GB(197), - type2-2XFP12GX12GB(198), - type2-2XFP24GB12GT(200), - type2-24GB12GT(201), - type2-NEWMI(202), - type2-M1XFP12GX12GTR4(203), - type2-12GX12GTR4(204), - type2-2XFP12GX12GTR4(205), - type2-E-24GB12GT(206), - type2-E-2XFP24GB12GT(207), - type3-M (228), - type3-MI(229), - type3-MII(230), - type3-24GT(231), - type3-24GB(232), - type3-ES-FW(233), - type3-4XFP(234), - type3-8XFP(235), - type3-24GT-V(236), - type3-24GB-V(237), - type3-24SFP-PLUS(238), - type3-08BACKPLANE(239), - type3-16BACKPLANE(240), - type4-4GT(300), - type4-4FX(301), - type4-2GB(302), - type4-4TX(303), - type4-4GB(304), - type4-4FB(305), - type5-M16K-SUP(320), - type5-M16K-16Q(321), - type5-M16K-FC(322), - type5-M16K-48XS2Q(323), - type5-M16K-24T24S2XS(324) - + typeMFC(0), + typeSFC(1), + type1GS(2), + type1GL(3), + type100M1GT(4), + type10M100MT(8), + type1-M12GB(101), + type1-12GT(102), + type1-210Gx(103), + type1-110Gx(104), + type1-CPU8245(105), + type1-BACKPLANE(106), + type1-24GB(107), + type1-24GT(108), + type1-36TX(109), + type1-4GX32TX(110), + type1-16FX(111), + type1-ES2GB(112), + type1-M4GX24TX(113), + type1-ES(114), + type1-MI(115), + type1-MII(116), + type1-12GB(117), + type1-M8GB(118), + type1-2XFP8GX16GB(119), + type1-8GX16GB(120), + type1-4GX24TX(121), + type1-L-M4GX24TX(122), + type1-1XFP8GX16GB(123), + type1-2XFP12GX12GT(124), + type1-12GX12GT(125), + type1-1XFP12GX12GT(126), + type1-48GT(127), + type1-M1XFP12GX12GT(128), + type1-4XFP(129), + type1-48GB(130), + type1-M44GT(131), + type1-M1XFP12GX12GB(132), + type1-12GX12GB(133), + type1-2XFP12GX12GB(134), + type1-4GB12GX8GT(135), + type1-2XFP24GB12GT(136), + type1-24GB12GT(137), + type1-NEWMI(138), + type1-M1XFP12GX12GTR4(139), + type1-12GX12GTR4(140), + type1-2XFP12GX12GTR4(141), + type1-E-24GB12GT(142), + type1-E-2XFP24GB12GT(143), + type1-MSC(144), + type8QSFP(145), + type1-FW(146), + type1-OF(147), + type1-MIIR2(148), + type1-E-M16GX8GB(149), + type1-E-4XS16GX8GB(150), + type1-2XFP12GX12GTR5(151), + type1-MIIR3(152), + type1-M2XS8GX16GB(154), + type1-28GB16GT4XS(155), + type1-E-48GT(156), + type1-44GB4XS(157), + type1-20XS2Q(158), + type1-M2Q20G12XS(159), + type1-2Q20G16XS(160), + type2-M12GB(165), + type2-12GT(166), + type2-210Gx(167), + type2-110Gx(168), + type2-CPU8245(169), + type2-BACKPLANE(170), + type2-24GB(171), + type2-24GT(172), + type2-36TX(173), + type2-4GX32TX(174), + type2-16FX(175), + type2-ES2GB(176), + type2-M4GX24TX(177), + type2-ES(178), + type2-MI(179), + type2-MII(180), + type2-12GB(181), + type2-M8GB(182), + type2-2XFP8GX16GB(183), + type2-8GX16GB(184), + type2-4GX24TX(185), + type2-L-M4GX24TX(186), + type2-1XFP8GX16GB(187), + type2-2XFP12GX12GT(188), + type2-12GX12GT(189), + type2-1XFP12GX12GT(190), + type2-48GT(191), + type2-M1XFP12GX12GT(192), + type2-4XFP(193), + type2-48GB(194), + type2-M44GT(195), + type2-M1XFP12GX12GB(196), + type2-12GX12GB(197), + type2-2XFP12GX12GB(198), + type2-4GB12GX8GT(199), + type2-2XFP24GB12GT(200), + type2-24GB12GT(201), + type2-NEWMI(202), + type2-M1XFP12GX12GTR4(203), + type2-12GX12GTR4(204), + type2-2XFP12GX12GTR4(205), + type2-E-24GB12GT(206), + type2-E-2XFP24GB12GT(207), + type2-MSC(208), + type2-M1XFP12GX12GTV(209), + type2-FW(210), + type2-OF(211), + type2-MIIR2(212), + type2-E-M16GX8GB(213), + type2-E-4XS16GX8GB(214), + type2-2XFP12GX12GTR5(215), + type2-MIIR3(216), + type2-M2XS8GX16GB(218), + type2-28GB16GT4XS(219), + type2-E-48GT(220), + type2-44GB4XS(221), + type2-20XS2Q(222), + type3-M (228), + type3-MI(229), + type3-MII(230), + type3-24GT(231), + type3-24GB(232), + type3-ES-FW(233), + type3-4XFP(234), + type3-8XFP(235), + type3-24GT-V(236), + type3-24GB-V(237), + type3-24SFP-PLUS(238), + type3-SUP(239), + type3-FAB(240), + type3-MSC(241), + type3-24GT-WS(242), + type3-24GB-WS(243), + type3-FW(244), + type3-8QSFP(245), + type3-OF(246), + type3-20XS2Q(247), + type3-FAB-TWO-CHIP(248), + type3-08BACKPLANE(299), + + type4-4GT(300), + type4-4FX(301), + type4-2GB(302), + type4-4TX(303), + type4-4GB(304), + type4-4FB(305), + type5-M16K-SUP(320), + type5-M16K-16Q(321), + type5-M16K-FC(322), + type5-M16K-48XS2Q(323), + type5-M16K-24T24S2XS(324) + } MAX-ACCESS read-only STATUS current DESCRIPTION "Type of expansion module in this vsf slot." ::= { vsfModuleEntry 3 } +--xxx.100.1.30.2.1.4 +vsfCpuMac OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION "vsf member cpu mac." + ::= { vsfModuleEntry 4 } + +--xxx.100.1.30.2.1.5 +vsfPriority OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION "vsf member priority ." + ::= { vsfModuleEntry 5 } + + +--xxx.100.1.30.2.1.6 +vsfRole OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION "vsf member role:1-master, 2-standby-master, 4-slave" + ::= { vsfModuleEntry 6 } + + +--xxx.100.1.30.2.1.7 +vsfUptime OBJECT-TYPE + SYNTAX INTEGER (0..2147483647) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "vsf member running time(Seconds)." + ::= { vsfModuleEntry 7 } + + --xxx.100.1.31 sysMonitorAlarmTable OBJECT-TYPE SYNTAX SEQUENCE OF SysMonitorAlarmEntry @@ -1674,22 +2032,22 @@ sysMonitorAlarmEntry OBJECT-TYPE SysMonitorAlarmEntry ::= SEQUENCE { - sysMonitorAlarmIndex INTEGER, + sysMonitorAlarmIndex INTEGER, sysMonitorAlarmEnable INTEGER, - sysMonitorAlarmBindSet INTEGER, - sysMonitorAlarmInputSet INTEGER, - sysMonitorAlarmOutputSet INTEGER + sysMonitorAlarmBindSet INTEGER, + sysMonitorAlarmInputSet INTEGER, + sysMonitorAlarmOutputSet INTEGER } ---xxx.100.1.12.1.1.1 +--xxx.100.1.31.1.1 sysMonitorAlarmIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (0..2147483647) MAX-ACCESS not-accessible STATUS current DESCRIPTION "system MonitorAlarm entry index" ::= { sysMonitorAlarmEntry 1 } ---xxx.100.1.12.1.1.2 +--xxx.100.1.31.1.2 sysMonitorAlarmEnable OBJECT-TYPE SYNTAX INTEGER { @@ -1701,7 +2059,7 @@ sysMonitorAlarmEnable OBJECT-TYPE DESCRIPTION "Whether the slot MonitorAlarm is enabled or not." ::= { sysMonitorAlarmEntry 2 } ---xxx.100.1.12.1.1.3 +--xxx.100.1.31.1.3 sysMonitorAlarmBindSet OBJECT-TYPE SYNTAX INTEGER { @@ -1715,34 +2073,34 @@ sysMonitorAlarmBindSet OBJECT-TYPE DESCRIPTION "Whether the slot fan is normal or abnormal." ::= { sysMonitorAlarmEntry 3 } ---xxx.100.1.12.1.1.4 +--xxx.100.1.31.1.4 sysMonitorAlarmInputSet OBJECT-TYPE - SYNTAX INTEGER - { - input1-high(1), - input1-low(2), - input2-high(3), - input2-low(4) - } + SYNTAX INTEGER + { + input1-high(1), + input1-low(2), + input2-high(3), + input2-low(4) + } MAX-ACCESS read-write - STATUS current - DESCRIPTION - "InputSet of MonitorAlarm. Status: input1-high(1), input1-low(2), input2-high(3), input2-low(4) is readonly" + STATUS current + DESCRIPTION + "InputSet of MonitorAlarm. Status: input1-high(1), input1-low(2), input2-high(3), input2-low(4) is readonly" ::= { sysMonitorAlarmEntry 4 } - +--xxx.100.1.31.1.5 sysMonitorAlarmOutputSet OBJECT-TYPE - SYNTAX INTEGER - { - output1-high(1), - output1-low(2), - output2-high(3), - output2-low(4) - } + SYNTAX INTEGER + { + output1-high(1), + output1-low(2), + output2-high(3), + output2-low(4) + } MAX-ACCESS read-write - STATUS current - DESCRIPTION - "Output of MonitorAlarm. Status: output1-high(1), output1-low(2), output2-high(3)), output2-low(4)is readonly" + STATUS current + DESCRIPTION + "Output of MonitorAlarm. Status: output1-high(1), output1-low(2), output2-high(3)), output2-low(4)is readonly" ::= { sysMonitorAlarmEntry 5 } --xxx.100.1.100 @@ -1752,7 +2110,69 @@ deviceTypeID OBJECT-TYPE STATUS current DESCRIPTION "the hardware type ID of the physical entity." - ::= { priSystem 100} + ::= { priSystem 100} + +--xxx.100.1.101 +rpsPowerVoltage OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "show rps power voltage." + ::= { priSystem 101} + +--xxx.100.1.102 +applycationLevel OBJECT-TYPE + SYNTAX INTEGER + { + access(1), + convergence(2), + core(3), + accessCore(4), + manageCore(5) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Device Application Level. Status: Access Device(1), Convergence Device(2),Core Device(3)), Access Core(4),Manage Core(5)" + ::= { priSystem 102 } + +--xxx.100.1.103 +manageAddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The IP Address of the manage interface(Ethernet0)." + ::= { priSystem 103} + + +--xxx.100.1.104 +manageId OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "the ID of mangage interface." + ::= { priSystem 104} + + --xxx.100.1.105 +sysVlanMac OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The MAC Address of the switch's VLAN CPU" + ::= { priSystem 105 } + + --xxx.100.1.106 +switchBootImgCurrent OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..128)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Filename of boot img for current time,and the length of filename is between 1 and 128." + ::= { priSystem 106} --******************************************************************************************************** --******************************************************************************************************** @@ -1772,29 +2192,30 @@ spanGlobalEnable OBJECT-TYPE --******************************************************************************************************** --xxx.100.2.2 - mstpMgt OBJECT IDENTIFIER ::= { priSpanningTree 2 } + mstpMgt OBJECT IDENTIFIER ::= { priSpanningTree 2 } --xxx.100.2.2.1 - mstpSystemGroup OBJECT IDENTIFIER ::= { mstpMgt 1 } + mstpSystemGroup OBJECT IDENTIFIER ::= { mstpMgt 1 } --xxx.100.2.2.1.1 mstpEnable OBJECT-TYPE SYNTAX INTEGER - { - enable(1), - disable(0) - } - MAX-ACCESS read-create + { + enable(1), + disable(0) + } + MAX-ACCESS read-write STATUS current DESCRIPTION - "Enable or disable the Spanning Tree algorithm in the switch." + "Enable or disable the Spanning Tree algorithm in the switch. + This scalar takes effect when Spanning Tree is globally enabled." ::= { mstpSystemGroup 1 } --xxx.100.2.2.1.2 mstpTCFlush OBJECT-TYPE SYNTAX INTEGER - { - enable(1), - disable(2), - protect(3) + { + enable(1), + disable(2), + protect(3) } MAX-ACCESS read-create STATUS current @@ -1803,7 +2224,7 @@ spanGlobalEnable OBJECT-TYPE ::= { mstpSystemGroup 2 } --xxx.100.2.2.1.3 mstpForwardTime OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER MAX-ACCESS read-only STATUS current DESCRIPTION @@ -1830,7 +2251,7 @@ spanGlobalEnable OBJECT-TYPE --xxx.100.2.2.1.5 mstpMaxage OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER MAX-ACCESS read-only STATUS current DESCRIPTION @@ -1851,11 +2272,11 @@ spanGlobalEnable OBJECT-TYPE --xxx.100.2.2.1.7 mstpMode OBJECT-TYPE SYNTAX INTEGER - { - stp(0), - rstp(2), - mstp(3) - } + { + stp(0), + rstp(2), + mstp(3) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -1872,7 +2293,7 @@ spanGlobalEnable OBJECT-TYPE ::= { mstpSystemGroup 8 } --xxx.100.2.2.1.9 mstpRevisionLevel OBJECT-TYPE - SYNTAX INTEGER (0..65535) + SYNTAX INTEGER (0..65535) MAX-ACCESS read-create STATUS current DESCRIPTION @@ -1881,7 +2302,7 @@ spanGlobalEnable OBJECT-TYPE --xxx.100.2.2.1.10 mstpBridgeForwardDelay OBJECT-TYPE - SYNTAX INTEGER (4..30) + SYNTAX INTEGER (4..30) MAX-ACCESS read-create STATUS current DESCRIPTION @@ -1899,7 +2320,7 @@ spanGlobalEnable OBJECT-TYPE --xxx.100.2.2.1.12 mstpBridgeMaxage OBJECT-TYPE - SYNTAX INTEGER (6..40) + SYNTAX INTEGER (6..40) MAX-ACCESS read-create STATUS current DESCRIPTION @@ -1928,11 +2349,11 @@ mstpInstancePortEntry OBJECT-TYPE MstpInstancePortEntry ::= SEQUENCE { - mstpInstancePortInstanceID INTEGER, - mstpInstancePortPortIndex INTEGER, - mstpInstancePortCost INTEGER, - mstpInstancePortPriority INTEGER, - mstpInstancePortRootGuard INTEGER, + mstpInstancePortInstanceID INTEGER, + mstpInstancePortPortIndex INTEGER, + mstpInstancePortCost INTEGER, + mstpInstancePortPriority INTEGER, + mstpInstancePortRootGuard INTEGER, mstpInstancePortID OCTET STRING, mstpInstancePortExtRootPathCost Unsigned32, mstpInstancePortIntRootPathCost Unsigned32, @@ -1944,7 +2365,7 @@ MstpInstancePortEntry --xxx.100.2.2.3.1.1 mstpInstancePortInstanceID OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (0..48) MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -1953,7 +2374,7 @@ mstpInstancePortInstanceID OBJECT-TYPE --xxx.100.2.2.3.1.2 mstpInstancePortPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..128) MAX-ACCESS not-accessible STATUS current DESCRIPTION "port index" @@ -1976,9 +2397,9 @@ mstpInstancePortPriority OBJECT-TYPE --xxx.100.2.2.3.1.5 mstpInstancePortRootGuard OBJECT-TYPE SYNTAX INTEGER - { - enable(1), - disable(0) + { + enable(1), + disable(0) } MAX-ACCESS read-create STATUS current @@ -1987,7 +2408,7 @@ mstpInstancePortRootGuard OBJECT-TYPE --xxx.100.2.2.3.1.6 mstpInstancePortID OBJECT-TYPE - SYNTAX OCTET STRING + SYNTAX OCTET STRING MAX-ACCESS read-only STATUS current DESCRIPTION "ID of port which receive a BPDU" @@ -1995,7 +2416,7 @@ mstpInstancePortID OBJECT-TYPE --xxx.100.2.2.3.1.7 mstpInstancePortExtRootPathCost OBJECT-TYPE - SYNTAX Unsigned32 + SYNTAX Unsigned32 MAX-ACCESS read-only STATUS current DESCRIPTION "the path cost from self bridge to Root bridge" @@ -2003,7 +2424,7 @@ mstpInstancePortExtRootPathCost OBJECT-TYPE --xxx.100.2.2.3.1.8 mstpInstancePortIntRootPathCost OBJECT-TYPE - SYNTAX Unsigned32 + SYNTAX Unsigned32 MAX-ACCESS read-only STATUS current DESCRIPTION "the path cost from self bridge to Region Root" @@ -2012,11 +2433,11 @@ mstpInstancePortIntRootPathCost OBJECT-TYPE --xxx.100.2.2.3.1.9 mstpInstancePortState OBJECT-TYPE SYNTAX INTEGER - { - block(0), - forwarding(1), - learning(2) - } + { + block(0), + forwarding(1), + learning(2) + } MAX-ACCESS read-only STATUS current DESCRIPTION "the port state in the instance" @@ -2025,15 +2446,15 @@ mstpInstancePortState OBJECT-TYPE --xxx.100.2.2.3.1.10 mstpInstancePortRole OBJECT-TYPE SYNTAX INTEGER - { - nonstp(0), - alternate(1), - root(2), - designated(3), - backup(4), - master(5), - disabled(6) - } + { + nonstp(0), + alternate(1), + root(2), + designated(3), + backup(4), + master(5), + disabled(6) + } MAX-ACCESS read-only STATUS current DESCRIPTION "the port role in the instance" @@ -2041,7 +2462,7 @@ mstpInstancePortRole OBJECT-TYPE --xxx.100.2.2.3.1.11 mstpInstancePortDesignatedBridgeID OBJECT-TYPE - SYNTAX OCTET STRING + SYNTAX OCTET STRING MAX-ACCESS read-only STATUS current DESCRIPTION "the designated bridge ID" @@ -2049,7 +2470,7 @@ mstpInstancePortDesignatedBridgeID OBJECT-TYPE --xxx.100.2.2.3.1.12 mstpInstancePortDesignatedPortID OBJECT-TYPE - SYNTAX OCTET STRING + SYNTAX OCTET STRING MAX-ACCESS read-only STATUS current DESCRIPTION "the designated port ID" @@ -2078,9 +2499,9 @@ mstpInstanceEntry OBJECT-TYPE MstpInstanceEntry ::= SEQUENCE { - mstpInstanceID INTEGER, - mstpInstanceVlans DisplayString, - mstpInstanceSwitchPriority INTEGER, + mstpInstanceID INTEGER, + mstpInstanceVlans DisplayString, + mstpInstanceSwitchPriority INTEGER, mstpInstanceRegionRootID OCTET STRING, mstpInstanceIntRootPathCost Unsigned32, mstpInstanceRootPortID OCTET STRING @@ -2088,7 +2509,7 @@ MstpInstanceEntry --xxx.100.2.2.2.1.1 mstpInstanceID OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (0..48) MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -2097,7 +2518,7 @@ mstpInstanceID OBJECT-TYPE --xxx.100.2.2.2.1.2 mstpInstanceVlans OBJECT-TYPE - SYNTAX DisplayString (SIZE(0..512)) + SYNTAX DisplayString (SIZE(0..512)) MAX-ACCESS read-create STATUS current DESCRIPTION " the map of vlans to instance.The input format is consonant with cli." @@ -2157,19 +2578,19 @@ mstpPortInfoEntry OBJECT-TYPE MstpPortInfoEntry ::= SEQUENCE { - mstpPortInfoPortIndex INTEGER, - mstpPortInfoEnable INTEGER, - mstpPortLinkType INTEGER, - mstpPortMcheck INTEGER, - mstpPortPortFast INTEGER, - mstpPortFormat INTEGER, - mstpPortDigestSnp INTEGER, - mstpPortTCFlush INTEGER + mstpPortInfoPortIndex INTEGER, + mstpPortInfoEnable INTEGER, + mstpPortLinkType INTEGER, + mstpPortMcheck INTEGER, + mstpPortPortFast INTEGER, + mstpPortFormat INTEGER, + mstpPortDigestSnp INTEGER, + mstpPortTCFlush INTEGER } --xxx.100.2.2.4.1.1 mstpPortInfoPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..128) MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -2178,11 +2599,11 @@ mstpPortInfoPortIndex OBJECT-TYPE --xxx.100.2.2.4.1.2 mstpPortInfoEnable OBJECT-TYPE - SYNTAX INTEGER - { - disable(0), - enable(1) - } + SYNTAX INTEGER + { + disable(0), + enable(1) + } MAX-ACCESS read-create STATUS current DESCRIPTION "enable/disable mstp on the port." @@ -2190,12 +2611,12 @@ mstpPortInfoEnable OBJECT-TYPE --xxx.100.2.2.4.1.3 mstpPortLinkType OBJECT-TYPE - SYNTAX INTEGER - { - auto(2), - force-true(1), - force-false(0) - } + SYNTAX INTEGER + { + auto(2), + force-true(1), + force-false(0) + } MAX-ACCESS read-create STATUS current DESCRIPTION " the p2p link type of the port" @@ -2204,10 +2625,10 @@ mstpPortLinkType OBJECT-TYPE --xxx.100.2.2.4.1.4 mstpPortMcheck OBJECT-TYPE SYNTAX INTEGER - { - untrigger(0), - trigger(1) - } + { + untrigger(0), + trigger(1) + } MAX-ACCESS read-create STATUS current DESCRIPTION "trigger/untrigger" @@ -2216,12 +2637,12 @@ mstpPortMcheck OBJECT-TYPE --xxx.100.2.2.4.1.5 mstpPortPortFast OBJECT-TYPE SYNTAX INTEGER - { - default(0), - bpdufilter(1), - bpduguard(2), - noportfast(3)-- no spanningtree portfast - } + { + default(0), + bpdufilter(1), + bpduguard(2), + noportfast(3)-- no spanningtree portfast + } MAX-ACCESS read-create STATUS current DESCRIPTION " @@ -2234,10 +2655,10 @@ mstpPortPortFast OBJECT-TYPE --xxx.100.2.2.4.1.6 mstpPortFormat OBJECT-TYPE SYNTAX INTEGER - { - standard(0), - privacy(1), - auto(2) + { + standard(0), + privacy(1), + auto(2) } MAX-ACCESS read-create STATUS current @@ -2247,10 +2668,10 @@ mstpPortFormat OBJECT-TYPE --xxx.100.2.2.4.1.7 mstpPortDigestSnp OBJECT-TYPE SYNTAX INTEGER - { - enable(1), - disable(0) - } + { + enable(1), + disable(0) + } MAX-ACCESS read-create STATUS current DESCRIPTION "Whether the port use peer's authentication key" @@ -2259,12 +2680,12 @@ mstpPortDigestSnp OBJECT-TYPE --xxx.100.2.2.4.1.8 mstpPortTCFlush OBJECT-TYPE SYNTAX INTEGER - { - enable(1), - disable(2), - protect(3), - useglobal(0) - } + { + enable(1), + disable(2), + protect(3), + useglobal(0) + } MAX-ACCESS read-create STATUS current DESCRIPTION "when topology is changed, how to flush the mac" @@ -2284,7 +2705,7 @@ portCount OBJECT-TYPE ::= { priPorts 1 } --xxx.100.3.2 -portTable OBJECT-TYPE +priPortTable OBJECT-TYPE SYNTAX SEQUENCE OF PriPortEntry MAX-ACCESS not-accessible STATUS current @@ -2301,34 +2722,34 @@ portTable OBJECT-TYPE " A port entry containing port information, status, and control." INDEX { portIndex } - ::= { portTable 1 } + ::= { priPortTable 1 } PriPortEntry ::= SEQUENCE { portIndex INTEGER, portName DisplayString, - switchNum INTEGER, - slotNum INTEGER, + switchNum INTEGER, + slotNum INTEGER, portType INTEGER, - flowControlStatus INTEGER, - bandwidthControlStatus INTEGER, - maxBandwidth INTEGER, - receiveBandwidth INTEGER, - transmitBandwidth INTEGER, --- mdi INTEGER, - shutdown INTEGER, - loopback INTEGER, - speedDuplex INTEGER, - portMode INTEGER, - pvid INTEGER, - indicatesType INTEGER, + flowControlStatus INTEGER, + bandwidthControlStatus INTEGER, + maxBandwidth INTEGER, + receiveBandwidth INTEGER, + transmitBandwidth INTEGER, +-- mdi INTEGER, + shutdown INTEGER, + loopback INTEGER, + speedDuplex INTEGER, + portMode INTEGER, + pvid INTEGER, + indicatesType INTEGER, vctAction INTEGER, vctLastStatus DisplayString, portTrunkAllowedvlan OCTET STRING, portHybridTaggedAllowedvlan OCTET STRING, portHybridUntaggedAllowedvlan OCTET STRING, - portBandWidthUsage INTEGER, + portBandWidthUsage OCTET STRING, lastFiveMinInPktsPerSec Counter32, lastFiveMinOutPktsPerSec Counter32, lastFiveSecInPktsPerSec Counter32, @@ -2336,12 +2757,17 @@ portTable OBJECT-TYPE transceiverSn DisplayString, portBlockMode Counter32, portBlockState Counter32, - portComboMediaType INTEGER --add 2015/10/13 + portComboMediaType INTEGER, --add 2015/10/13 + portDiscardPktType INTEGER, + outBroadcastPkts Counter32, + outMulticastPkts Counter32 + + } --xxx.100.3.2.1.1 portIndex OBJECT-TYPE - SYNTAX INTEGER (1..1024) + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -2388,17 +2814,20 @@ portTable OBJECT-TYPE SYNTAX INTEGER { typeSFP(0), - typeCombo(1), - typeFiber(2), - typeSingleOptFE(3), --modify 04/9/9 - typeMultiOptFE(4), - typeElecFE(5), - typeSingleOptGE(6), - typeMultiOptGE(7), - typeElecGE(8), - typePortAGG(9), - typePortUsbGE(10), - typeOptXge(11), + typeCombo(1), + typeFiber(2), + typeSingleOptFE(3), --modify 04/9/9 + typeMultiOptFE(4), + typeElecFE(5), + typeSingleOptGE(6), + typeMultiOptGE(7), + typeElecGE(8), + typePortAGG(9), + typePortUsbGE(10), + typeOptXge(11), + typeElecXge(12), -- modify 16/1/11 + typeOpt25ge(13), + typeOptQuad25ge(14), other(255)--modify 03/1/21 } MAX-ACCESS read-only @@ -2414,176 +2843,183 @@ portTable OBJECT-TYPE SYNTAX INTEGER { disable(0), - enable(1) + enable(1) } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "The flow-control status of the port. - Its functionality is exactly same as 'flow control' or 'no flow control' commands - in console mode." - ::= { priPortEntry 6 } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The flow-control status of the port. + Its functionality is exactly same as 'flow control' or 'no flow control' commands + in console mode." + ::= { priPortEntry 6 } --xxx.100.3.2.1.7 bandwidthControlStatus OBJECT-TYPE SYNTAX INTEGER { ingress(0), - egress(1), - both(2), - none(3) + egress(1), + both(2), + none(3) } - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The bandwidth-control status of the port. - Its functionality is to stop the bandwidth control. - The only way to enable bandwidth control is to set receiveBandwidth or transmitBandwith." - ::= { priPortEntry 7 } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The bandwidth-control status of the port. + Its functionality is to stop the bandwidth control. + The only way to enable bandwidth control is to set receiveBandwidth or transmitBandwith." + ::= { priPortEntry 7 } --xxx.100.3.2.1.8 maxBandwidth OBJECT-TYPE SYNTAX INTEGER - { - default(0), - bw100M(1), - bw1000M(2), - bw10000M(3), - bw40000M(4) - } - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The max bandwidth of the port." - ::= { priPortEntry 8 } + { + default(0), + bw100M(1), + bw1000M(2), + bw10000M(3), + bw40000M(4), + bw20000M(5), + bw25G(6), + bw100G(7), + bw2500M(8) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The max bandwidth of the port." + ::= { priPortEntry 8 } --xxx.100.3.2.1.9 receiveBandwidth OBJECT-TYPE SYNTAX INTEGER - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "The recevice bandwidth of the port. Its unit is kbs. - The command 'bandwidth control 50 both' in console mode equals - setting both receiveBandwidth and transmitBandwidth to 50 kbs. - Set 0 is no bandwidth." - ::= { priPortEntry 9 } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The recevice bandwidth of the port. Its unit is kbs. + The command 'bandwidth control 50 both' in console mode equals + setting both receiveBandwidth and transmitBandwidth to 50 kbs. + Set 0 is no bandwidth." + ::= { priPortEntry 9 } --xxx.100.3.2.1.10 transmitBandwidth OBJECT-TYPE SYNTAX INTEGER - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "The transmit bandwidth of the port. Its unit is kbs. - Set 0 is no bandwidth." - ::= { priPortEntry 10 } - + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The transmit bandwidth of the port. Its unit is kbs. + Set 0 is no bandwidth." + ::= { priPortEntry 10 } + --xxx.100.3.2.1.11 -- mdi OBJECT-TYPE -- SYNTAX INTEGER -- { -- auto(0), --- across(1), --- normal(2) +-- across(1), +-- normal(2) -- } --- MAX-ACCESS read-write --- STATUS current --- DESCRIPTION --- "Establish to specify the on-line type of the port; --- Exchange the every kind of plank card of machine --- of thousand trillion this order of above port nonsupport." --- ::= { priPortEntry 11 } +-- MAX-ACCESS read-write +-- STATUS current +-- DESCRIPTION +-- "Establish to specify the on-line type of the port; +-- Exchange the every kind of plank card of machine +-- of thousand trillion this order of above port nonsupport." +-- ::= { priPortEntry 11 } --xxx.100.3.2.1.12 shutdown OBJECT-TYPE SYNTAX INTEGER { shutDown(0), - noshutdown(1) + noshutdown(1) } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "Close or open to specify the port." - ::= { priPortEntry 12 } - + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Close or open to specify the port." + ::= { priPortEntry 12 } + --xxx.100.3.2.1.13 loopback OBJECT-TYPE SYNTAX INTEGER { noloopback(0), - loopback(1) + loopback(1) } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "Open or close to specify the wreath of - the port back to test the function." - ::= { priPortEntry 13 } - + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Open or close to specify the wreath of + the port back to test the function." + ::= { priPortEntry 13 } + --xxx.100.3.2.1.14 speedDuplex OBJECT-TYPE SYNTAX INTEGER { auto(0), - half10(1), - full10(2), - half100(3), - full100(4), - half1000(5), - full1000(6), - half-1000-M(7), - half-1000-s(8), - full-1000-M(9), - full-1000-s(10), - fx-100(13), - fx-100-phy(14), - fx-100-no-phy(15), - neg-10-auto(16), - neg-10-full(17), - neg-10-half(18), - neg-10-100-auto(19), - neg-10-100-full(20), - neg-10-100-half(21), - neg-10-100-1000-full(22), - neg-10-100-1000-half(23), - neg-full-10g(24), - full-10g(25), - full-40g(26) - + half10(1), + full10(2), + half100(3), + full100(4), + half1000(5), + full1000(6), + half-1000-M(7), + half-1000-s(8), + full-1000-M(9), + full-1000-s(10), + fx-100(13), + fx-100-phy(14), + fx-100-no-phy(15), + neg-10-auto(16), + neg-10-full(17), + neg-10-half(18), + neg-10-100-auto(19), + neg-10-100-full(20), + neg-10-100-half(21), + neg-10-100-1000-full(22), + neg-10-100-1000-half(23), + neg-full-10g(24), + full-10g(25), + full-40g(26), + full-25g(27), + neg-10-100-1000-2500-auto(28), + neg-10-100-1000-2500-full(29), + neg-10-100-1000-2500-half(30) } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "The speed and duplex status of the port." - ::= { priPortEntry 14 } - + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The speed and duplex status of the port." + ::= { priPortEntry 14 } + --xxx.100.3.2.1.15 portMode OBJECT-TYPE SYNTAX INTEGER { access(1), - trunk(2), - hybrid(3) + trunk(2), + hybrid(3) } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "port mode: 1 is access,2 is trunk,3 is hybrid" - ::= { priPortEntry 15 } - + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "port mode: 1 is access,2 is trunk,3 is hybrid" + ::= { priPortEntry 15 } + --xxx.100.3.2.1.16 pvid OBJECT-TYPE SYNTAX INTEGER - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "port of native vlan No." - ::= { priPortEntry 16 } - + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "port of native vlan No." + ::= { priPortEntry 16 } + --xxx.100.3.2.1.17 - indicatesType OBJECT-TYPE + indicatesType OBJECT-TYPE SYNTAX INTEGER { other(1), @@ -2597,150 +3033,189 @@ portTable OBJECT-TYPE hundredBaseFxScSingleMode(9), hundredBaseFxScMultiMode(10), thousandBaseCX(11), - tenG(12) + tenG(12), + twentyfiveSFP28(13), + hundredQSFP28(14) } MAX-ACCESS read-only STATUS current DESCRIPTION "Indicates the port type of the configuration of the switch." - ::= { priPortEntry 17 } + ::= { priPortEntry 17 } --xxx.100.3.2.1.18 - vctAction OBJECT-TYPE + vctAction OBJECT-TYPE SYNTAX INTEGER MAX-ACCESS read-write STATUS current - DESCRIPTION "This object indicates the VCT action of the port,only the value 1 is permitted + DESCRIPTION "This object indicates the VCT action of the port, the value 1(standard mode) and value 2(shutdown mode) is permitted when SET this entry though you can GET 1(processing) and 0(succeed); - The specified port will be shutdown when one sets 1 to this entry,and then it will return - to no shutdown after operate the virtual-cable-test. You can get the status of VCT from - the entry vctLastStatus." - ::= { priPortEntry 18 } + The specified port will be shutdown when one sets 1 to this entry by standard mode,and then it will return + to no shutdown after operate the virtual-cable-test. You can get the status of VCT from the entry vctLastStatus. + The specified port will be shutdown when one sets 2 to this entry by shutdown mode,and then it will return + to operate the virtual-cable-test. You can get the status of VCT from the entry vctLastStatus." + ::= { priPortEntry 18 } --xxx.100.3.2.1.19 - vctLastStatus OBJECT-TYPE + vctLastStatus OBJECT-TYPE SYNTAX DisplayString (SIZE(0..1000)) MAX-ACCESS read-only STATUS current DESCRIPTION "Indicates the last VCT status of the port." - ::= { priPortEntry 19 } - + ::= { priPortEntry 19 } + --xxx.100.3.2.1.20 portTrunkAllowedvlan OBJECT-TYPE - SYNTAX OCTET STRING - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "trunk port allowed vlan list string" - ::= { priPortEntry 20 } - + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "trunk port allowed vlan list string" + ::= { priPortEntry 20 } + --xxx.100.3.2.1.21 portHybridTaggedAllowedvlan OBJECT-TYPE - SYNTAX OCTET STRING - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "hybrid port tagged allowed vlan list string" - ::= { priPortEntry 21 } - + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "hybrid port tagged allowed vlan list string" + ::= { priPortEntry 21 } + --xxx.100.3.2.1.22 portHybridUntaggedAllowedvlan OBJECT-TYPE - SYNTAX OCTET STRING - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "hybrid port untagged allowed vlan list string" - ::= { priPortEntry 22 } - + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "hybrid port untagged allowed vlan list string" + ::= { priPortEntry 22 } + --xxx.100.3.2.1.23 portBandWidthUsage OBJECT-TYPE - SYNTAX INTEGER (0..100) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The percentage of the port's bandwidth usage" - ::= { priPortEntry 23 } + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The percentage of the port's bandwidth usage" + ::= { priPortEntry 23 } --xxx.100.3.2.1.24 lastFiveMinInPktsPerSec OBJECT-TYPE SYNTAX Counter32 - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "last five minutes input packets/Sec." - ::= { priPortEntry 24 } - + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "last five minutes input packets/Sec." + ::= { priPortEntry 24 } + --xxx.100.3.2.1.25 lastFiveMinOutPktsPerSec OBJECT-TYPE SYNTAX Counter32 - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "last five minutes output packets/Sec." - ::= { priPortEntry 25 } - + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "last five minutes output packets/Sec." + ::= { priPortEntry 25 } + --xxx.100.3.2.1.26 lastFiveSecInPktsPerSec OBJECT-TYPE SYNTAX Counter32 - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "last five seconds input packets/Sec." - ::= { priPortEntry 26 } - + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "last five seconds input packets/Sec." + ::= { priPortEntry 26 } + --xxx.100.3.2.1.27 lastFiveSecOutPktsPerSec OBJECT-TYPE SYNTAX Counter32 - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "last five seconds output packets/Sec." - ::= { priPortEntry 27 } ---xxx.100.3.2.1.28 - transceiverSn OBJECT-TYPE + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "last five seconds output packets/Sec." + ::= { priPortEntry 27 } +--xxx.100.3.2.1.28 + transceiverSn OBJECT-TYPE SYNTAX DisplayString (SIZE(0..16)) MAX-ACCESS read-only STATUS current DESCRIPTION " serial num of transceiver.if port is not a transceiver,value is null." - ::= { priPortEntry 28 } + ::= { priPortEntry 28 } --xxx.100.3.2.1.29 portBlockMode OBJECT-TYPE SYNTAX Counter32 - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "port block mode.value: - noblock: 0, - rate-violation block: 1, - loopback-detection block: 2, - unknown-protocol block: 3" - ::= { priPortEntry 29} + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "port block mode.value: + noblock: 0, + rate-violation block: 1, + loopback-detection block: 2, + unknown-protocol block: 3" + ::= { priPortEntry 29} --xxx.100.3.2.1.30 portBlockState OBJECT-TYPE SYNTAX Counter32 - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "port shutdown mode.value: - noblock state: 0, - rate-violation block state: 1, - loopback-detection block state: 2, - unknown-protocol block state: 3" - ::= { priPortEntry 30} - ---xxx.100.3.2.1.31 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "port shutdown mode.value: + noblock state: 0, + rate-violation block state: 1, + loopback-detection block state: 2, + unknown-protocol block state: 3" + ::= { priPortEntry 30} + +--xxx.100.3.2.1.31 portComboMediaType OBJECT-TYPE SYNTAX INTEGER { - phyModeUnkown(0), phyModeCopperPrefered(1), phyModeCopperForced(2), phyModeFiberPrefered(3), phyModeFiberForced(4) } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "The media type of combo port" - ::= { priPortEntry 31 } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The media type of combo port" + ::= { priPortEntry 31 } +--xxx.100.3.2.1.32 +portDiscardPktType OBJECT-TYPE + SYNTAX INTEGER + { + tag(1), + untag(2), + no-tag(3), + no-untag(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "port mode: 1 is tag,2 is untag; + 3 is set no tag,4 is set no untag." + ::= { priPortEntry 32 } + +--xxx.100.3.2.1.33 + outBroadcastPkts OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "output broadcast packets." + ::= { priPortEntry 33 } + +--xxx.100.3.2.1.34 + outMulticastPkts OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "output multicast packets." + ::= { priPortEntry 34 } + + + + --******************************************************************************************************** --xxx.100.3.3 stormControlTable OBJECT-TYPE @@ -2765,15 +3240,15 @@ stormControlTable OBJECT-TYPE ::= SEQUENCE { stormControlIndex INTEGER, - stormControlType INTEGER, - stormControlRate INTEGER, + stormControlType INTEGER, + stormControlRate INTEGER, stormControlStatus INTEGER } --xxx.100.3.3.1.1 stormControlIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -2784,15 +3259,15 @@ stormControlTable OBJECT-TYPE --xxx.100.3.3.1.2 stormControlType OBJECT-TYPE SYNTAX INTEGER - { - broadcast(0), - multicast(1), - unicast(2), - dlf(3), - brmc(4), - brmcdlf(5), - all(6) - } + { + broadcast(0), + multicast(1), + unicast(2), + dlf(3), + brmc(4), + brmcdlf(5), + all(6) + } MAX-ACCESS read-only STATUS current DESCRIPTION @@ -2808,7 +3283,7 @@ stormControlTable OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "the suppress rate.the value range at <1> or <1> on different devices." + "the suppress rate.the value range at <1-1488095> or <1-1000000> on different devices." ::= { stormControlEntry 3 } @@ -2816,14 +3291,14 @@ stormControlTable OBJECT-TYPE stormControlStatus OBJECT-TYPE SYNTAX INTEGER { - destroy(0), - active(1) + destroy(0), + active(1) } MAX-ACCESS read-write STATUS current DESCRIPTION "Setting it to active(1) to creates an entry,setting it to destroy(2) to destroy an entry " - ::= { stormControlEntry 4 } + ::= { stormControlEntry 4 } --******************************************************************************************************** --****************************************************************************************** --xxx.100.3.4 @@ -2899,7 +3374,7 @@ LoopbackDetecCtrlEntry ::= SEQUENCE --xxx.100.3.4.3.1.1 lpbackDetecCtrlIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION "An unique value for each port." @@ -2911,7 +3386,7 @@ lpbackDetecCtrlMode OBJECT-TYPE nocontrol(0), shutdown(1), block(2) --- learningƷʽѱȥ +-- learning control mode has been removed -- learning(3) } MAX-ACCESS read-write @@ -2957,7 +3432,7 @@ LoopbackDetecSpecVlanEntry ::= SEQUENCE } --xxx.100.3.4.4.1.1 lpbackDetecVlanPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION "An unique value for each port." @@ -3018,7 +3493,7 @@ LoopbackDetecShowEntry ::= SEQUENCE } --xxx.100.3.4.5.1.1 lpbackDetecShowPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION "An unique value for each port." @@ -3031,39 +3506,209 @@ lpbackDetecShowInformation OBJECT-TYPE STATUS current DESCRIPTION "The value display the configuration and state of loopback detection for the specified port." ::= { loopbackDetecShowEntry 2 } + --******************************************************************************************************** ---xxx.100.3.5 - stormControlPortTable OBJECT-TYPE - SYNTAX SEQUENCE OF StormControlPortEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "storm-contol port table" - ::= { priPorts 5 } - --xxx.100.3.5.1 - stormControlPortEntry OBJECT-TYPE - SYNTAX StormControlPortEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - " storm-control entry" - INDEX { stormControlPortIndex,stormControlSuppressType } - ::= { stormControlPortTable 1 } +--xxx.100.3.4.6 +loopbackDetecStatusTable OBJECT-TYPE + SYNTAX SEQUENCE OF LoopbackDetecStatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "Show the status of loopback detection for the specified port." + ::= { loopbackDetection 6 } - StormControlPortEntry - ::= SEQUENCE - { + +--xxx.100.3.4.6.1 +loopbackDetecStatusEntry OBJECT-TYPE + SYNTAX LoopbackDetecStatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry in the loopback detection Status table." + INDEX { lpbackDetecStatusIndex} + ::= { loopbackDetecStatusTable 1 } + +LoopbackDetecStatusEntry ::= SEQUENCE + { + lpbackDetecStatusIndex INTEGER, + lpbackDetecStatusIfname DisplayString, + lpbackDetecStatus INTEGER + } + +--xxx.100.3.4.6.1.1 +lpbackDetecStatusIndex OBJECT-TYPE + SYNTAX INTEGER (1..2048) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An unique value for each port." + ::={ loopbackDetecStatusEntry 1 } + + +--xxx.100.3.4.6.1.2 + lpbackDetecStatusIfname OBJECT-TYPE + SYNTAX DisplayString(SIZE(0..512)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "interface Name." + ::= { loopbackDetecStatusEntry 2 } + + +--xxx.100.3.4.6.1.3 +lpbackDetecStatus OBJECT-TYPE + SYNTAX INTEGER { + disable(0), + enable(1) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Indicates the control status of the loopback detection. + If loopback detection function is disabled,the value is 0 ,else the value 1" + ::= { loopbackDetecStatusEntry 3 } + + +--******************************************************************************************************** +--xxx.100.3.4.7 +loopbackDetecHappenTimesTable OBJECT-TYPE + SYNTAX SEQUENCE OF LoopbackDetecHappenTimesEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "Show the happen times of loopback detection for the specified port." + ::= { loopbackDetection 7 } + + +--xxx.100.3.4.7.1 +loopbackDetecHappenTimesEntry OBJECT-TYPE + SYNTAX LoopbackDetecHappenTimesEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry in the loopback detection happen times table." + INDEX { lpbackDetecHappenTimesIndex} + ::= { loopbackDetecHappenTimesTable 1 } + +LoopbackDetecHappenTimesEntry ::= SEQUENCE + { + lpbackDetecHappenTimesIndex INTEGER, + lpbackDetecHappenTimesIfname DisplayString, + lpbackDetecHappenTimesStatus INTEGER + } + +--xxx.100.3.4.7.1.1 +lpbackDetecHappenTimesIndex OBJECT-TYPE + SYNTAX INTEGER (1..2048) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An unique value for each port." + ::={ loopbackDetecHappenTimesEntry 1 } + +--xxx.100.3.4.7.1.2 + lpbackDetecHappenTimesIfname OBJECT-TYPE + SYNTAX DisplayString(SIZE(0..512)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "interface Name." + ::= { loopbackDetecHappenTimesEntry 2 } + + +--xxx.100.3.4.7.1.3 +lpbackDetecHappenTimesStatus OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Indicates the happen times of the loopback detected." + ::= { loopbackDetecHappenTimesEntry 3 } + + +--******************************************************************************************************** +--xxx.100.3.4.8 +loopbackDetecControlledTable OBJECT-TYPE + SYNTAX SEQUENCE OF LoopbackDetecControlledEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "Show the controlled state of loopback detection for the specified port." + ::= { loopbackDetection 8 } + + +--xxx.100.3.4.8.1 +loopbackDetecControlledEntry OBJECT-TYPE + SYNTAX LoopbackDetecControlledEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry in the loopback detection controlled state table." + INDEX { lpbackDetecControlledIndex} + ::= { loopbackDetecControlledTable 1 } + +LoopbackDetecControlledEntry ::= SEQUENCE + { + lpbackDetecControlledIndex INTEGER, + lpbackDetecControlledIfname DisplayString, + lpbackDetecControlledStatus INTEGER + } + +--xxx.100.3.4.8.1.1 +lpbackDetecControlledIndex OBJECT-TYPE + SYNTAX INTEGER (1..2048) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An unique value for each port." + ::={ loopbackDetecControlledEntry 1 } + +--xxx.100.3.4.8.1.2 + lpbackDetecControlledIfname OBJECT-TYPE + SYNTAX DisplayString(SIZE(0..512)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "interface Name." + ::= { loopbackDetecControlledEntry 2 } + + +--xxx.100.3.4.8.1.3 +lpbackDetecControlledStatus OBJECT-TYPE + SYNTAX INTEGER { + noControlled(0), + isControlled(1) + } + + MAX-ACCESS read-only + STATUS current + DESCRIPTION "ndicates the control status of the loopback detection. + If port is shutdowned or blocked for the loopback detection ,the value is 1 ;else the value 0" + ::= { loopbackDetecControlledEntry 3 } + + +--******************************************************************************************************** +--xxx.100.3.5 + stormControlPortTable OBJECT-TYPE + SYNTAX SEQUENCE OF StormControlPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "storm-contol port table" + ::= { priPorts 5 } + --xxx.100.3.5.1 + stormControlPortEntry OBJECT-TYPE + SYNTAX StormControlPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " storm-control entry" + INDEX { stormControlPortIndex,stormControlSuppressType } + ::= { stormControlPortTable 1 } + + StormControlPortEntry + ::= SEQUENCE + { stormControlPortIndex INTEGER, - stormControlSuppressType INTEGER, - stormControlSuppressRateUnit INTEGER, - stormControlSuppressRateValue INTEGER, + stormControlSuppressType INTEGER, + stormControlSuppressRateUnit INTEGER, + stormControlSuppressRateValue INTEGER, stormControlSuppressStatus INTEGER } --xxx.100.3.5.1.1 stormControlPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -3074,11 +3719,11 @@ lpbackDetecShowInformation OBJECT-TYPE --xxx.100.3.5.1.2 stormControlSuppressType OBJECT-TYPE SYNTAX INTEGER - { - broadcast(0), - multicast(1), - unicast(2) - } + { + broadcast(0), + multicast(1), + unicast(2) + } MAX-ACCESS read-only STATUS current DESCRIPTION @@ -3090,8 +3735,8 @@ lpbackDetecShowInformation OBJECT-TYPE stormControlSuppressRateUnit OBJECT-TYPE SYNTAX INTEGER { - kbps(0), - pps(1) + kbps(0), + pps(1) } MAX-ACCESS read-write STATUS current @@ -3105,7 +3750,7 @@ lpbackDetecShowInformation OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "if the suppressrate unit is pps,the value range at <1> ,or if the suppressrate unit is bps,the value range at <1>, + "if the suppressrate unit is pps,the value range at <1-1488095> ,or if the suppressrate unit is bps,the value range at <1-1000000>, it depends on stormControlSuppressRateUnit." ::= { stormControlPortEntry 4 } @@ -3113,26 +3758,26 @@ lpbackDetecShowInformation OBJECT-TYPE stormControlSuppressStatus OBJECT-TYPE SYNTAX INTEGER { - destroy(0), - active(1) + destroy(0), + active(1) } MAX-ACCESS read-write STATUS current DESCRIPTION "Setting it to active(1) to creates an entry,setting it to destroy(2) to destroy an entry " - ::= { stormControlPortEntry 5 } + ::= { stormControlPortEntry 5 } --******************************************************************************************************** --xxx.100.3.6 flowCounterTable OBJECT-TYPE - SYNTAX SEQUENCE OF FlowCouterEntry + SYNTAX SEQUENCE OF FlowCounterEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION "control port and vlan interface flow table" ::= { priPorts 6 } --xxx.100.3.6.1 - flowCouterEntry OBJECT-TYPE - SYNTAX FlowCouterEntry + flowCounterEntry OBJECT-TYPE + SYNTAX FlowCounterEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -3140,37 +3785,37 @@ lpbackDetecShowInformation OBJECT-TYPE INDEX { flowPortIndex,flowVlanID} ::= { flowCounterTable 1 } - FlowCouterEntry + FlowCounterEntry ::= SEQUENCE { - flowPortIndex INTEGER, + flowPortIndex INTEGER, flowVlanID INTEGER, - flowCounterInOctets Counter64, + flowCounterInOctets Counter64, flowCounterInUcastPkts Counter64, flowCounterInMulticastPkts Counter64, - flowCounterInBroadcastPkts Counter64, - flowCounterOutOctets Counter64, - flowCounterOutUcastPkts Counter64, - flowCounterOutMulticastPkts Counter64, - flowCounterOutBroadcastPkts Counter64, - clearFlowCounter INTEGER + flowCounterInBroadcastPkts Counter64, + flowCounterOutOctets Counter64, + flowCounterOutUcastPkts Counter64, + flowCounterOutMulticastPkts Counter64, + flowCounterOutBroadcastPkts Counter64, + clearFlowCounter INTEGER } --xxx.100.3.6.1.1 - flowPortIndex OBJECT-TYPE - SYNTAX INTEGER + flowPortIndex OBJECT-TYPE + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION "Port Index" - ::= { flowCouterEntry 1 } + ::= { flowCounterEntry 1 } --xxx.100.3.6.1.2 - flowVlanID OBJECT-TYPE - SYNTAX INTEGER + flowVlanID OBJECT-TYPE + SYNTAX INTEGER (1..4094) MAX-ACCESS read-only STATUS current DESCRIPTION "Vlan ID" - ::= { flowCouterEntry 2 } + ::= { flowCounterEntry 2 } --xxx.100.3.6.1.3 flowCounterInOctets OBJECT-TYPE SYNTAX Counter64 @@ -3180,7 +3825,7 @@ lpbackDetecShowInformation OBJECT-TYPE "The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets." - ::= { flowCouterEntry 3 } + ::= { flowCounterEntry 3 } --xxx.100.3.6.1.4 flowCounterInUcastPkts OBJECT-TYPE SYNTAX Counter64 @@ -3191,7 +3836,7 @@ lpbackDetecShowInformation OBJECT-TYPE a higher (sub-)layer, which were not addressed to a multicast or broadcast address at this sub-layer. This object is a 64-bit version of ifInUcastPkts." - ::= { flowCouterEntry 4 } + ::= { flowCounterEntry 4 } --xxx.100.3.6.1.5 flowCounterInMulticastPkts OBJECT-TYPE SYNTAX Counter64 @@ -3203,9 +3848,9 @@ lpbackDetecShowInformation OBJECT-TYPE multicast address at this sub-layer. For a MAC layer protocol, this includes both Group and Functional addresses. This object is a 64-bit version of ifInMulticastPkts." - ::= { flowCouterEntry 5 } + ::= { flowCounterEntry 5 } --xxx.100.3.6.1.6 - flowCounterInBroadcastPkts OBJECT-TYPE + flowCounterInBroadcastPkts OBJECT-TYPE SYNTAX Counter64 MAX-ACCESS read-only STATUS current @@ -3214,9 +3859,9 @@ lpbackDetecShowInformation OBJECT-TYPE a higher (sub-)layer, which were addressed to a broadcast address at this sub-layer. This object is a 64-bit version of ifInBroadcastPkts." - ::= { flowCouterEntry 6 } + ::= { flowCounterEntry 6 } --xxx.100.3.6.1.7 - flowCounterOutOctets OBJECT-TYPE + flowCounterOutOctets OBJECT-TYPE SYNTAX Counter64 MAX-ACCESS read-only STATUS current @@ -3224,7 +3869,7 @@ lpbackDetecShowInformation OBJECT-TYPE "The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets." - ::= { flowCouterEntry 7 } + ::= { flowCounterEntry 7 } --xxx.100.3.6.1.8 flowCounterOutUcastPkts OBJECT-TYPE SYNTAX Counter64 @@ -3237,7 +3882,7 @@ lpbackDetecShowInformation OBJECT-TYPE sub-layer, including those that were discarded or not sent. This object is a 64-bit version of ifOutUcastPkts." - ::= { flowCouterEntry 8 } + ::= { flowCounterEntry 8 } --xxx.100.3.6.1.9 flowCounterOutMulticastPkts OBJECT-TYPE SYNTAX Counter64 @@ -3251,7 +3896,7 @@ lpbackDetecShowInformation OBJECT-TYPE a MAC layer protocol, this includes both Group and Functional addresses. This object is a 64-bit version of ifOutMulticastPkts." - ::= { flowCouterEntry 9 } + ::= { flowCounterEntry 9 } --xxx.100.3.6.1.10 flowCounterOutBroadcastPkts OBJECT-TYPE SYNTAX Counter64 @@ -3263,31 +3908,31 @@ lpbackDetecShowInformation OBJECT-TYPE addressed to a broadcast address at this sub-layer, including those that were discarded or not sent. This object is a 64-bit version of ifOutBroadcastPkts." - ::= { flowCouterEntry 10 } + ::= { flowCounterEntry 10 } --xxx.100.3.6.1.11 - clearFlowCounter OBJECT-TYPE - SYNTAX INTEGER - { - disable(0), - enable(1) - } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "Clear flow counter." - ::={flowCouterEntry 11} + clearFlowCounter OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Clear flow counter." + ::={flowCounterEntry 11} --******************************************************************************************************** --xxx.100.3.7 sumFlowCounterTable OBJECT-TYPE - SYNTAX SEQUENCE OF SumFlowCouterEntry + SYNTAX SEQUENCE OF SumFlowCounterEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION "control port and vlan interface flow table" ::= { priPorts 7 } --xxx.100.3.7.1 - sumFlowCouterEntry OBJECT-TYPE - SYNTAX SumFlowCouterEntry + sumFlowCounterEntry OBJECT-TYPE + SYNTAX SumFlowCounterEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -3295,24 +3940,24 @@ lpbackDetecShowInformation OBJECT-TYPE INDEX { sumFlowVlanID} ::= { sumFlowCounterTable 1 } - SumFlowCouterEntry + SumFlowCounterEntry ::= SEQUENCE { sumFlowVlanID INTEGER, - sumFlowCounterInOctets Counter64, + sumFlowCounterInOctets Counter64, sumFlowCounterInPkts Counter64, - sumFlowCounterOutOctets Counter64, - sumFlowCounterOutPkts Counter64, - clearSumFlowCounter INTEGER + sumFlowCounterOutOctets Counter64, + sumFlowCounterOutPkts Counter64, + clearSumFlowCounter INTEGER } --xxx.100.3.7.1.1 - sumFlowVlanID OBJECT-TYPE - SYNTAX INTEGER + sumFlowVlanID OBJECT-TYPE + SYNTAX INTEGER (1..4094) MAX-ACCESS read-only STATUS current DESCRIPTION "Vlan ID" - ::= { sumFlowCouterEntry 1 } + ::= { sumFlowCounterEntry 1 } --xxx.100.3.7.1.2 sumFlowCounterInOctets OBJECT-TYPE SYNTAX Counter64 @@ -3322,7 +3967,7 @@ lpbackDetecShowInformation OBJECT-TYPE "The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets." - ::= { sumFlowCouterEntry 2 } + ::= { sumFlowCounterEntry 2 } --xxx.100.3.7.1.3 sumFlowCounterInPkts OBJECT-TYPE @@ -3334,10 +3979,10 @@ lpbackDetecShowInformation OBJECT-TYPE a higher (sub-)layer, which were not addressed to a multicast or broadcast address at this sub-layer. This object is a 64-bit version of ifInUcastPkts." - ::= { sumFlowCouterEntry 3 } + ::= { sumFlowCounterEntry 3 } --xxx.100.3.7.1.4 - sumFlowCounterOutOctets OBJECT-TYPE + sumFlowCounterOutOctets OBJECT-TYPE SYNTAX Counter64 MAX-ACCESS read-only STATUS current @@ -3345,7 +3990,7 @@ lpbackDetecShowInformation OBJECT-TYPE "The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets." - ::= { sumFlowCouterEntry 4} + ::= { sumFlowCounterEntry 4} --xxx.100.3.7.1.5 sumFlowCounterOutPkts OBJECT-TYPE SYNTAX Counter64 @@ -3358,52 +4003,52 @@ lpbackDetecShowInformation OBJECT-TYPE sub-layer, including those that were discarded or not sent. This object is a 64-bit version of ifOutUcastPkts." - ::= { sumFlowCouterEntry 5 } + ::= { sumFlowCounterEntry 5 } --xxx.100.3.7.1.6 - clearSumFlowCounter OBJECT-TYPE - SYNTAX INTEGER - { - disable(0), - enable(1) - } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "Clear flow counter." - ::={sumFlowCouterEntry 6} + clearSumFlowCounter OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Clear flow counter." + ::={sumFlowCounterEntry 6} --******************************************************************************************************** --xxx.100.3.10 portUtilTable OBJECT-TYPE - SYNTAX SEQUENCE OF PortUtilEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "A list of port util entries." - ::={priPorts 10} - + SYNTAX SEQUENCE OF PortUtilEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A list of port util entries." + ::={priPorts 10} + --xxx.100.3.10.1 - portUtilEntry OBJECT-TYPE - SYNTAX PortUtilEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "A port util entry containing wan port in util,wan port out util, - bit error rate and packet lost rate." - INDEX {portUtilIndex} - ::= {portUtilTable 1} - - PortUtilEntry - ::= SEQUENCE - { - portUtilIndex INTEGER, - wanIfInUtil INTEGER, - wanIfOutUtil INTEGER, - ifBer INTEGER, - ifPaketLostRate INTEGER - } + portUtilEntry OBJECT-TYPE + SYNTAX PortUtilEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A port util entry containing wan port in util,wan port out util, + bit error rate and packet lost rate." + INDEX {portUtilIndex} + ::= {portUtilTable 1} + + PortUtilEntry + ::= SEQUENCE + { + portUtilIndex INTEGER, + wanIfInUtil INTEGER, + wanIfOutUtil INTEGER, + ifBer INTEGER, + ifPaketLostRate INTEGER + } --xxx.100.3.10.1.1 - portUtilIndex OBJECT-TYPE + portUtilIndex OBJECT-TYPE SYNTAX INTEGER (1..1024) MAX-ACCESS read-only STATUS current @@ -3411,40 +4056,40 @@ lpbackDetecShowInformation OBJECT-TYPE "port No." ::= { portUtilEntry 1 } --xxx.100.3.10.1.2 - wanIfInUtil OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "WAN port inflows utilization." - ::= {portUtilEntry 2 } + wanIfInUtil OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "WAN port inflows utilization." + ::= {portUtilEntry 2 } --xxx.100.3.10.1.3 - wanIfOutUtil OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "WAN port outflows utilization." - ::= {portUtilEntry 3} + wanIfOutUtil OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "WAN port outflows utilization." + ::= {portUtilEntry 3} --xxx.100.3.10.1.4 - ifBer OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "port error rate." - ::= {portUtilEntry 4} + ifBer OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "port error rate." + ::= {portUtilEntry 4} --xxx.100.3.10.1.5 - ifPaketLostRate OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "port packet lost rate." - ::= {portUtilEntry 5} - + ifPaketLostRate OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "port packet lost rate." + ::= {portUtilEntry 5} + --******************************************************************************************************** --******************************************************************************************************** --xxx.100.3.11 @@ -3474,13 +4119,13 @@ portLEDTimeRangeMapTable OBJECT-TYPE ::= SEQUENCE { portLEDTimeRangeMapIndex INTEGER, - portLEDTimeRangeMapName DisplayString, - portLEDTimeRangeMapStatus INTEGER + portLEDTimeRangeMapName DisplayString, + portLEDTimeRangeMapStatus INTEGER } --xxx.100.3.11.1.1.1.1 portLEDTimeRangeMapIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2147483647) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -3499,11 +4144,11 @@ portLEDTimeRangeMapTable OBJECT-TYPE --xxx.100.3.11.1.1.1.3 portLEDTimeRangeMapStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -3532,21 +4177,21 @@ portLEDTimeRangeTable OBJECT-TYPE PortLEDTimeRangeEntry ::= SEQUENCE { - portLEDTimeRangeIndex INTEGER, - portLEDTimeRangeSubIndex INTEGER, - portLEDTimeRangeType INTEGER, - portLEDTimeRangeStartWeek BITS, - portLEDTimeRangeStartDate DisplayString, - portLEDTimeRangeStartTime DisplayString, - portLEDTimeRangeEndWeek BITS, - portLEDTimeRangeEndDate DisplayString, - portLEDTimeRangeEndTime DisplayString, - portLEDTimeRangeStatus INTEGER + portLEDTimeRangeIndex INTEGER, + portLEDTimeRangeSubIndex INTEGER, + portLEDTimeRangeType INTEGER, + portLEDTimeRangeStartWeek BITS, + portLEDTimeRangeStartDate DisplayString, + portLEDTimeRangeStartTime DisplayString, + portLEDTimeRangeEndWeek BITS, + portLEDTimeRangeEndDate DisplayString, + portLEDTimeRangeEndTime DisplayString, + portLEDTimeRangeStatus INTEGER } --xxx.100.3.11.1.1.2.1.1 portLEDTimeRangeIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..1000) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -3555,7 +4200,7 @@ portLEDTimeRangeTable OBJECT-TYPE --xxx.100.3.11.1.1.2.1.2 portLEDTimeRangeSubIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..1000) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -3579,14 +4224,14 @@ portLEDTimeRangeTable OBJECT-TYPE portLEDTimeRangeStartWeek OBJECT-TYPE SYNTAX BITS { - monday(0), - tuesday(1), - wednesday(2), - thursday(3), - friday(4), - saturday(5), - sunday(6) - } + monday(0), + tuesday(1), + wednesday(2), + thursday(3), + friday(4), + saturday(5), + sunday(6) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -3615,14 +4260,14 @@ portLEDTimeRangeTable OBJECT-TYPE portLEDTimeRangeEndWeek OBJECT-TYPE SYNTAX BITS { - monday(0), - tuesday(1), - wednesday(2), - thursday(3), - friday(4), - saturday(5), - sunday(6) - } + monday(0), + tuesday(1), + wednesday(2), + thursday(3), + friday(4), + saturday(5), + sunday(6) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -3649,11 +4294,11 @@ portLEDTimeRangeTable OBJECT-TYPE --xxx.100.3.11.1.1.2.1.10 portLEDTimeRangeStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -3662,7 +4307,7 @@ portLEDTimeRangeTable OBJECT-TYPE --***************************************************************************************** --xxx.100.3.11.2 - portLEDConfig OBJECT IDENTIFIER ::= { portLEDShutoffTable 2 } + portLEDConfig OBJECT IDENTIFIER ::= { portLEDShutoffTable 2 } --xxx.100.3.11.2.1.1 portLEDTimeRangeName OBJECT-TYPE SYNTAX DisplayString(SIZE (1..64)) @@ -3672,9 +4317,9 @@ portLEDTimeRangeTable OBJECT-TYPE "the timer range of port LED shut-off config" ::= { portLEDConfig 1 } --xxx.100.3.11.2.1.2 - portLEDState OBJECT-TYPE + portLEDState OBJECT-TYPE SYNTAX INTEGER{ - allOn(0), + allOn(0), allOff(1) } MAX-ACCESS read-only @@ -3682,127 +4327,138 @@ portLEDTimeRangeTable OBJECT-TYPE DESCRIPTION " enable or disable LED shut-off on all ports." ::= { portLEDConfig 2 } + --xxx.100.3.11.2.1.3 + portLEDTimeRangeDelete OBJECT-TYPE + SYNTAX INTEGER{ + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "the timer range of port LED shut-off delete" + ::= { portLEDConfig 3 } --******************************************************************************************************** --xxx.100.3.12 - portTruckAllowedVlanTable OBJECT-TYPE - SYNTAX SEQUENCE OF portTruckAllowedVlanEntry + portTrunkAllowedVlanTable OBJECT-TYPE + SYNTAX SEQUENCE OF PortTrunkAllowedVlanEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION - "Truck port alllowed vlan table" + "Trunk port alllowed vlan table" ::= { priPorts 12 } --xxx.100.3.12.1 - portTruckAllowedVlanEntry OBJECT-TYPE - SYNTAX portTruckAllowedVlanEntry + portTrunkAllowedVlanEntry OBJECT-TYPE + SYNTAX PortTrunkAllowedVlanEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION - " Truck port alllowed vlan entry" - INDEX {portTruckPortIndex} - ::= { portTruckAllowedVlanTable 1 } + " Trunk port alllowed vlan entry" + INDEX {portTrunkPortIndex} + ::= { portTrunkAllowedVlanTable 1 } - portTruckAllowedVlanEntry + PortTrunkAllowedVlanEntry ::= SEQUENCE { - portTruckPortIndex INTEGER, - portTruckAllowedVlan OCTET STRING, - portTruckAllowedVlanAdd OCTET STRING, - portTruckAllowedVlanExcept OCTET STRING, - portTruckAllowedVlanRemove OCTET STRING, - portTruckAllowedVlanAll INTEGER , + portTrunkPortIndex INTEGER, + portTrunkAllowedVlan OCTET STRING, + portTrunkAllowedVlanAdd OCTET STRING, + portTrunkAllowedVlanExcept OCTET STRING, + portTrunkAllowedVlanRemove OCTET STRING, + portTrunkAllowedVlanAll INTEGER } --xxx.100.3.12.1.1 - portTruckPortIndex OBJECT-TYPE - SYNTAX INTEGER + portTrunkPortIndex OBJECT-TYPE + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION "port index of truck mode" - ::= { portTruckAllowedVlanEntry 1 } + ::= { portTrunkAllowedVlanEntry 1 } --xxx.100.3.12.1.2 - portTruckAllowedVlan OBJECT-TYPE + portTrunkAllowedVlan OBJECT-TYPE SYNTAX OCTET STRING MAX-ACCESS read-write STATUS current DESCRIPTION "VLAN IDs of the allowed VLANs when this port is in trunking mode." - ::= { portTruckAllowedVlanEntry 2 } + ::= { portTrunkAllowedVlanEntry 2 } --xxx.100.3.12.1.3 - portTruckAllowedVlanAdd OBJECT-TYPE + portTrunkAllowedVlanAdd OBJECT-TYPE SYNTAX OCTET STRING MAX-ACCESS read-write STATUS current DESCRIPTION "Add VLANs to the current list." - ::= { portTruckAllowedVlanEntry 3 } + ::= { portTrunkAllowedVlanEntry 3 } --xxx.100.3.12.1.4 - portTruckAllowedVlanExcept OBJECT-TYPE + portTrunkAllowedVlanExcept OBJECT-TYPE SYNTAX OCTET STRING MAX-ACCESS read-write STATUS current DESCRIPTION "All VLANs except the following." - ::= { portTruckAllowedVlanEntry 4} + ::= { portTrunkAllowedVlanEntry 4} --xxx.100.3.12.1.5 - portTruckAllowedVlanRemove OBJECT-TYPE + portTrunkAllowedVlanRemove OBJECT-TYPE SYNTAX OCTET STRING MAX-ACCESS read-write STATUS current DESCRIPTION "Remove VLANs from the current list." - ::= { portTruckAllowedVlanEntry 5 } + ::= { portTrunkAllowedVlanEntry 5 } --xxx.100.3.12.1.6 - portTruckAllowedVlanAll OBJECT-TYPE - SYNTAX INTEGER - { - none(0), - all(1) - } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "Allow all(1) vlans or none vlans." - ::={portTruckAllowedVlanEntry 6} + portTrunkAllowedVlanAll OBJECT-TYPE + SYNTAX INTEGER + { + none(0), + all(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Allow all(1) vlans or none vlans." + ::={portTrunkAllowedVlanEntry 6} --******************************************************************************************************** --xxx.100.3.13 portHybridTaggedAllowedVlanTable OBJECT-TYPE - SYNTAX SEQUENCE OF portHybridTaggedAllowedVlanEntry + SYNTAX SEQUENCE OF PortHybridTaggedAllowedVlanEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION - "Truck port alllowed vlan table" + "Trunk port alllowed vlan table" ::= { priPorts 13 } - --xxx.100.3.12.1 + --xxx.100.3.13.1 portHybridTaggedAllowedVlanEntry OBJECT-TYPE - SYNTAX portHybridTaggedAllowedVlanEntry + SYNTAX PortHybridTaggedAllowedVlanEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION - " Truck port alllowed vlan entry" + " Trunk port alllowed vlan entry" INDEX { portHybridTaggedPortIndex } ::= { portHybridTaggedAllowedVlanTable 1 } - portHybridTaggedAllowedVlanEntry + PortHybridTaggedAllowedVlanEntry ::= SEQUENCE { portHybridTaggedPortIndex INTEGER, - portHybridTaggedAllowedVlan OCTET STRING, + portHybridTaggedAllowedVlan OCTET STRING, portHybridTaggedAllowedVlanAdd OCTET STRING, - portHybridTaggedAllowedVlanExcept OCTET STRING, - portHybridTaggedAllowedVlanRemove OCTET STRING, - portHybridTaggedAllowedVlanAll INTEGER + portHybridTaggedAllowedVlanExcept OCTET STRING, + portHybridTaggedAllowedVlanRemove OCTET STRING, + portHybridTaggedAllowedVlanAll INTEGER } ---xxx.100.3.12.1.1 - portHybridTaggedPortIndex OBJECT-TYPE - SYNTAX INTEGER +--xxx.100.3.13.1.1 + portHybridTaggedPortIndex OBJECT-TYPE + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION "port index of Hybrid mode" ::= { portHybridTaggedAllowedVlanEntry 1 } ---xxx.100.3.12.1.2 +--xxx.100.3.13.1.2 portHybridTaggedAllowedVlan OBJECT-TYPE SYNTAX OCTET STRING MAX-ACCESS read-write @@ -3811,7 +4467,7 @@ portLEDTimeRangeTable OBJECT-TYPE "VLAN IDs of the allowed VLANs when this port is in hybrid mode." ::= { portHybridTaggedAllowedVlanEntry 2 } ---xxx.100.3.12.1.3 +--xxx.100.3.13.1.3 portHybridTaggedAllowedVlanAdd OBJECT-TYPE SYNTAX OCTET STRING MAX-ACCESS read-write @@ -3820,15 +4476,15 @@ portLEDTimeRangeTable OBJECT-TYPE "Add VLANs to the current list." ::= { portHybridTaggedAllowedVlanEntry 3 } ---xxx.100.3.12.1.4 - portHybridTaggedAllowedVlanExcept OBJECT-TYPE +--xxx.100.3.13.1.4 + portHybridTaggedAllowedVlanExcept OBJECT-TYPE SYNTAX OCTET STRING MAX-ACCESS read-write STATUS current DESCRIPTION "All VLANs except the following." ::= { portHybridTaggedAllowedVlanEntry 4} ---xxx.100.3.12.1.5 +--xxx.100.3.13.1.5 portHybridTaggedAllowedVlanRemove OBJECT-TYPE SYNTAX OCTET STRING MAX-ACCESS read-write @@ -3836,57 +4492,57 @@ portLEDTimeRangeTable OBJECT-TYPE DESCRIPTION "Remove VLANs from the current list." ::= { portHybridTaggedAllowedVlanEntry 5 } ---xxx.100.3.12.1.6 - portHybridTaggedAllowedVlanAll OBJECT-TYPE - SYNTAX INTEGER - { - none(0), - all(1) - } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "allow all(1) vlans or none vlans." - ::={portHybridTaggedAllowedVlanEntry 6} +--xxx.100.3.13.1.6 + portHybridTaggedAllowedVlanAll OBJECT-TYPE + SYNTAX INTEGER + { + none(0), + all(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "allow all(1) vlans or none vlans." + ::={portHybridTaggedAllowedVlanEntry 6} --****************************************************************************************************************** --******************************************************************************************************** --xxx.100.3.14 portHybridUntaggedAllowedVlanTable OBJECT-TYPE - SYNTAX SEQUENCE OF portHybridUntaggedAllowedVlanEntry + SYNTAX SEQUENCE OF PortHybridUntaggedAllowedVlanEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION - "Truck port alllowed vlan table" + "Trunk port alllowed vlan table" ::= { priPorts 14 } - --xxx.100.3.12.1 + --xxx.100.3.14.1 portHybridUntaggedAllowedVlanEntry OBJECT-TYPE - SYNTAX portHybridUntaggedAllowedVlanEntry + SYNTAX PortHybridUntaggedAllowedVlanEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION - " Truck port alllowed vlan entry" + " Trunk port alllowed vlan entry" INDEX { portHybridUntaggedPortIndex } ::= { portHybridUntaggedAllowedVlanTable 1 } - portHybridUntaggedAllowedVlanEntry + PortHybridUntaggedAllowedVlanEntry ::= SEQUENCE { portHybridUntaggedPortIndex INTEGER, - portHybridUntaggedAllowedVlan OCTET STRING, + portHybridUntaggedAllowedVlan OCTET STRING, portHybridUntaggedAllowedVlanAdd OCTET STRING, - portHybridUntaggedAllowedVlanExcept OCTET STRING, - portHybridUntaggedAllowedVlanRemove OCTET STRING, - portHybridUntaggedAllowedVlanAll INTEGER + portHybridUntaggedAllowedVlanExcept OCTET STRING, + portHybridUntaggedAllowedVlanRemove OCTET STRING, + portHybridUntaggedAllowedVlanAll INTEGER } ---xxx.100.3.12.1.1 - portHybridUntaggedPortIndex OBJECT-TYPE - SYNTAX INTEGER +--xxx.100.3.14.1.1 + portHybridUntaggedPortIndex OBJECT-TYPE + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION "port index of Hybrid mode" ::= { portHybridUntaggedAllowedVlanEntry 1 } ---xxx.100.3.12.1.2 +--xxx.100.3.14.1.2 portHybridUntaggedAllowedVlan OBJECT-TYPE SYNTAX OCTET STRING MAX-ACCESS read-write @@ -3895,7 +4551,7 @@ portLEDTimeRangeTable OBJECT-TYPE "VLAN IDs of the allowed VLANs when this port is in hybrid mode." ::= { portHybridUntaggedAllowedVlanEntry 2 } ---xxx.100.3.12.1.3 +--xxx.100.3.14.1.3 portHybridUntaggedAllowedVlanAdd OBJECT-TYPE SYNTAX OCTET STRING MAX-ACCESS read-write @@ -3904,15 +4560,15 @@ portLEDTimeRangeTable OBJECT-TYPE "Add VLANs to the current list." ::= { portHybridUntaggedAllowedVlanEntry 3 } ---xxx.100.3.12.1.4 - portHybridUntaggedAllowedVlanExcept OBJECT-TYPE +--xxx.100.3.14.1.4 + portHybridUntaggedAllowedVlanExcept OBJECT-TYPE SYNTAX OCTET STRING MAX-ACCESS read-write STATUS current DESCRIPTION "All VLANs except the following." ::= { portHybridUntaggedAllowedVlanEntry 4} ---xxx.100.3.12.1.5 +--xxx.100.3.14.1.5 portHybridUntaggedAllowedVlanRemove OBJECT-TYPE SYNTAX OCTET STRING MAX-ACCESS read-write @@ -3920,18 +4576,91 @@ portLEDTimeRangeTable OBJECT-TYPE DESCRIPTION "Remove VLANs from the current list." ::= { portHybridUntaggedAllowedVlanEntry 5 } ---xxx.100.3.12.1.6 - portHybridUntaggedAllowedVlanAll OBJECT-TYPE - SYNTAX INTEGER - { - none(0), - all(1) - } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "allow all(1) vlans or none vlans." - ::={portHybridUntaggedAllowedVlanEntry 6} +--xxx.100.3.14.1.6 + portHybridUntaggedAllowedVlanAll OBJECT-TYPE + SYNTAX INTEGER + { + none(0), + all(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "allow all(1) vlans or none vlans." + ::={portHybridUntaggedAllowedVlanEntry 6} +--******************************************************************************************************** +--xxx.100.3.15 + portClearCountTable OBJECT-TYPE + SYNTAX SEQUENCE OF PortClearCountEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " Clear port count table" + ::= { priPorts 15 } + --xxx.100.3.15.1 + portClearCountEntry OBJECT-TYPE + SYNTAX PortClearCountEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " Clear port count entry" + INDEX { slotNum } + ::= { portClearCountTable 1 } + + PortClearCountEntry + ::= SEQUENCE + { + portClearCountAll INTEGER, + portClearCountPortEth OCTET STRING, + portClearCountPortChannel OCTET STRING, + portClearCountPortVlan OCTET STRING, + portClearCountPortTunnel OCTET STRING + } +--xxx.100.3.15.1.1 + portClearCountAll OBJECT-TYPE + SYNTAX INTEGER + { + clearCountAll(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "clear counters all" + ::= { portClearCountEntry 1 } +--xxx.100.3.15.1.2 + portClearCountPortEth OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "clear counters port ethernet,for example: 1/0/1" + ::= { portClearCountEntry 2 } + +--xxx.100.3.15.1.3 + portClearCountPortChannel OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "clear counters port port-channel,for example: 1" + ::= { portClearCountEntry 3 } + +--xxx.100.3.15.1.4 + portClearCountPortVlan OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "clear counters port vlan,for example: 1" + ::= { portClearCountEntry 4} +--xxx.100.3.15.1.5 + portClearCountPortTunnel OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "clear counters port tunnel,for example: 1" + ::= { portClearCountEntry 5} --****************************************************************************************************************** --xxx.100.4 priIpConfig @@ -3940,26 +4669,26 @@ portLEDTimeRangeTable OBJECT-TYPE --xxx.100.4.1 netDefaultGateway OBJECT-TYPE SYNTAX IpAddress - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "The IP Address of the default gateway. If this value is - undefined or unknown, it shall have the value 0.0.0.0." - ::= { priIpConfig 1 } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The IP Address of the default gateway. If this value is + undefined or unknown, it shall have the value 0.0.0.0." + ::= { priIpConfig 1 } --xxx.100.4.2 ipHttpState OBJECT-TYPE SYNTAX INTEGER { disable(0), - enable(1) + enable(1) } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "Web server on-off." - ::= { priIpConfig 2 } - + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Web server on-off." + ::= { priIpConfig 2 } + --xxx.100.4.3 iPAddrTable OBJECT-TYPE SYNTAX SEQUENCE OF IPAddrEntry @@ -3984,15 +4713,15 @@ iPAddrEntry OBJECT-TYPE IPAddrEntry ::= SEQUENCE { - iPAddrVid INTEGER, + iPAddrVid INTEGER, iPAddrIPAddress IpAddress, - iPAddrSubnetMask IpAddress, + iPAddrSubnetMask IpAddress, iPAddrPrimaryInterface INTEGER, - iPAddrStatus INTEGER + iPAddrStatus INTEGER } --xxx.100.4.3.1.1 iPAddrVid OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4094) MAX-ACCESS not-accessible STATUS current DESCRIPTION "The VLAN interface being used by this table entry. Only the @@ -4047,9 +4776,9 @@ iPAddrPrimaryInterface OBJECT-TYPE iPAddrStatus OBJECT-TYPE SYNTAX INTEGER { - createAndGo(0), - active(1), - destroy(2) + createAndGo(0), + active(1), + destroy(2) } MAX-ACCESS read-create STATUS current @@ -4083,11 +4812,11 @@ interfaceEntry OBJECT-TYPE InterfaceEntry ::= SEQUENCE { - intfacetype INTEGER, - intfaceID INTEGER, - intfaceIndex INTEGER, --- intfaceAddressMethod INTEGER, - intfaceStatus INTEGER + intfacetype INTEGER, + intfaceID INTEGER, + intfaceIndex INTEGER, +-- intfaceAddressMethod INTEGER, + intfaceStatus INTEGER } intfacetype OBJECT-TYPE @@ -4104,7 +4833,7 @@ intfacetype OBJECT-TYPE ::= { interfaceEntry 1 } intfaceID OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4094) MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -4139,9 +4868,9 @@ intfaceIndex OBJECT-TYPE intfaceStatus OBJECT-TYPE SYNTAX INTEGER { - createAndGo(0), - active(1), - destroy(2) + createAndGo(0), + active(1), + destroy(2) } MAX-ACCESS read-create STATUS current @@ -4149,8 +4878,64 @@ intfaceStatus OBJECT-TYPE "Now state." ::= { interfaceEntry 5 } +--xxx.100.4.5 +iPHttpsTable OBJECT-TYPE + SYNTAX SEQUENCE OF IPHttpsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "A table of iPHttpsEntry." + ::= { priIpConfig 5 } + +--xxx.100.4.5.1 +iPHttpsEntry OBJECT-TYPE + SYNTAX IPHttpsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "A set of configuration parameters for http secure server on this device." + INDEX { slotNum } + ::= { iPHttpsTable 1 } + +IPHttpsEntry ::= SEQUENCE +{ + iPSecureCiphersuite INTEGER, + iPSecurePort INTEGER, + iPSecureServerState INTEGER +} +--xxx.100.4.5.1.1 +iPSecureCiphersuite OBJECT-TYPE + SYNTAX INTEGER + { + rc4-md5(0), + des-cbc-sha(1), + des-cbc3-sha(2), + rc4-128-sha(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Secure Ciphersuite for http secure server." + ::= { iPHttpsEntry 1 } + +--xxx.100.4.5.1.2 +iPSecurePort OBJECT-TYPE + SYNTAX INTEGER (443 | 1025..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Secure Port for http secure server." + DEFVAL { 443 } + ::= { iPHttpsEntry 2 } + +--xxx.100.4.5.1.3 +iPSecureServerState OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Web secure server on-off." + ::= { iPHttpsEntry 3 } - --******************************************************************************************************** --******************************************************************************************************** @@ -4216,10 +5001,10 @@ vlanPortNumber OBJECT-TYPE --xxx.100.5.1.1.4 vlanRowStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -4267,10 +5052,10 @@ mvlanID OBJECT-TYPE --xxx.100.5.2.1.2 mvlanStatus OBJECT-TYPE SYNTAX INTEGER - { - enable(1), - disable(0) - } + { + enable(1), + disable(0) + } MAX-ACCESS read-write STATUS current DESCRIPTION "the status of mVLAN:enable(1) to active a mvlanID;disable(0) is to destroy a mvlanID." @@ -4286,10 +5071,10 @@ SYNTAX DisplayString (SIZE(1..100)) --xxx.100.5.2.1.4 mvlanAssoVlanStatus OBJECT-TYPE SYNTAX INTEGER - { - enable(1), - disable(0) - } + { + enable(1), + disable(0) + } MAX-ACCESS read-write STATUS current DESCRIPTION "the status of mvlanAssoVlan:enable(1) to enable multicast Vlan association with Vlan; @@ -4298,11 +5083,11 @@ mvlanAssoVlanStatus OBJECT-TYPE --xxx.100.5.2.1.5 mvlanMode OBJECT-TYPE SYNTAX INTEGER - { - default(0), - dynamic(1), - compatible(2) - } + { + default(0), + dynamic(1), + compatible(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -4341,7 +5126,7 @@ mvlanVId OBJECT-TYPE ::= { mvlanPortInfoEntry 1 } --xxx.100.5.3.1.2 mvlanPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -4349,7 +5134,7 @@ mvlanPortIndex OBJECT-TYPE ::= { mvlanPortInfoEntry 2 } --xxx.100.5.3.1.3 mvlanAssoPortTagid OBJECT-TYPE -SYNTAX INTEGER (1..4094) +SYNTAX INTEGER (1..4094) MAX-ACCESS read-write STATUS current DESCRIPTION "tagId of portIndex association with multicast Vlan,Default:0.if port needn't Tagid, @@ -4358,10 +5143,10 @@ SYNTAX INTEGER (1..4094) --xxx.100.5.3.1.4 mvlanPortStatus OBJECT-TYPE SYNTAX INTEGER - { - enable(1), - disable(0) - } + { + enable(1), + disable(0) + } MAX-ACCESS read-write STATUS current DESCRIPTION "the status of mvlanPortStatus:enable(1) to enable port association with multicast Vlan; @@ -4442,8 +5227,8 @@ vlanFCVlanID OBJECT-TYPE protocol, this includes both Group and Functional addresses. This object is a 64-bit version of ifInMulticastPkts." ::= { vlanFlowCounterEntry 4 } ---xxx.100.5.4.1.5 - vlanInBroadcastPkts OBJECT-TYPE +--xxx.100.5.4.1.5 + vlanInBroadcastPkts OBJECT-TYPE SYNTAX Counter64 MAX-ACCESS read-only STATUS current @@ -4453,8 +5238,8 @@ vlanFCVlanID OBJECT-TYPE broadcast address at this sub-layer. This object is a 64-bit version of ifInBroadcastPkts." ::= { vlanFlowCounterEntry 5 } ---xxx.100.5.4.1.6 - vlanOutOctets OBJECT-TYPE +--xxx.100.5.4.1.6 + vlanOutOctets OBJECT-TYPE SYNTAX Counter64 MAX-ACCESS read-only STATUS current @@ -4464,7 +5249,7 @@ vlanFCVlanID OBJECT-TYPE is a 64-bit version of ifOutOctets." ::= { vlanFlowCounterEntry 6 } --xxx.100.5.4.1.7 - vlanOutUcastPkts OBJECT-TYPE + vlanOutUcastPkts OBJECT-TYPE SYNTAX Counter64 MAX-ACCESS read-only STATUS current @@ -4503,17 +5288,17 @@ vlanFCVlanID OBJECT-TYPE object is a 64-bit version of ifOutBroadcastPkts." ::= { vlanFlowCounterEntry 9 } --xxx.100.5.4.1.10 - clearVlanFlowCounter OBJECT-TYPE - SYNTAX INTEGER - { - disable(0), - enable(1) - } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "Clear flow counter." - ::={vlanFlowCounterEntry 10} + clearVlanFlowCounter OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Clear flow counter." + ::={vlanFlowCounterEntry 10} --***************************************************************************************** --***************************************************************************************** @@ -4586,7 +5371,7 @@ swSoftwareVersion OBJECT-TYPE --xxx.100.6.1.1.4 swCPUMac OBJECT-TYPE - SYNTAX MacAddress (SIZE(17)) + SYNTAX MacAddress MAX-ACCESS read-only STATUS current DESCRIPTION @@ -4637,7 +5422,7 @@ PortSecurityEntry ::= SEQUENCE --xxx.100.7.1.1.1 psPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION "A unique value for each port" @@ -4656,7 +5441,7 @@ psPortSecurity OBJECT-TYPE --xxx.100.7.1.1.3 psSecuritytSaticMacAdd OBJECT-TYPE - SYNTAX MacAddress (SIZE(17)) + SYNTAX MacAddress MAX-ACCESS read-write STATUS current DESCRIPTION "bind Security mac address on this port" @@ -4664,7 +5449,7 @@ psSecuritytSaticMacAdd OBJECT-TYPE --xxx.100.7.1.1.4 psSecurityStaticMacDel OBJECT-TYPE - SYNTAX MacAddress (SIZE(17)) + SYNTAX MacAddress MAX-ACCESS read-write STATUS current DESCRIPTION "delete Security mac address on this port" @@ -4731,7 +5516,7 @@ SecurityMacPortEntry ::= SEQUENCE --xxx.100.7.2.1.1 secPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION "A unique value for each port" @@ -4739,7 +5524,7 @@ secPortIndex OBJECT-TYPE --xxx.100.7.2.1.2 secMacAdress OBJECT-TYPE - SYNTAX MacAddress (SIZE(17)) + SYNTAX MacAddress MAX-ACCESS read-only STATUS current DESCRIPTION "Mac adress bind on this port" @@ -4773,7 +5558,7 @@ priIgmpSnoopingGlobalEnable OBJECT-TYPE --xxx.100.8.2 priIgmpSnoopingVlanTable OBJECT-TYPE - SYNTAX SEQUENCE OF PriIgmpSnoopingEntry + SYNTAX SEQUENCE OF PriIgmpSnoopingVlanEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -4781,8 +5566,8 @@ priIgmpSnoopingVlanTable OBJECT-TYPE ::= { priIgmpSnoopingMib 2 } --xxx.100.8.2.1 - priIgmpSnoopingEntry OBJECT-TYPE - SYNTAX PriIgmpSnoopingEntry + priIgmpSnoopingVlanEntry OBJECT-TYPE + SYNTAX PriIgmpSnoopingVlanEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -4790,66 +5575,67 @@ priIgmpSnoopingVlanTable OBJECT-TYPE INDEX { priIgmpSnoopingvlanID } ::= { priIgmpSnoopingVlanTable 1 } - PriIgmpSnoopingEntry + PriIgmpSnoopingVlanEntry ::= SEQUENCE { - priIgmpSnoopingvlanID INTEGER, + priIgmpSnoopingvlanID INTEGER, priIgmpSnoopingvlanEnable INTEGER, priIgmpSnoopingleave INTEGER, priIgmpSnoopingL2gen INTEGER, priIgmpSnoopingGroupNum INTEGER, priIgmpSnoopingSourceNum INTEGER, - priIgmpSnoopingPort DisplayString, - priIgmpSnoopingPortTime INTEGER, - priIgmpSnoopingQueryInterval INTEGER, - priIgmpSnoopingQueryMrsp INTEGER, + priIgmpSnoopingPort OCTET STRING, + priIgmpSnoopingPortTime INTEGER, + priIgmpSnoopingQueryInterval INTEGER, + priIgmpSnoopingQueryMrsp INTEGER, priIgmpSnoopingQueryRobustness INTEGER, - priIgmpSnoopingSuppression INTEGER + priIgmpSnoopingSuppression INTEGER, + priIgmpSnoopingSpecificMrsp INTEGER } --xxx.100.8.2.1.1 priIgmpSnoopingvlanID OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4094) MAX-ACCESS not-accessible STATUS current DESCRIPTION "This value is vlan's ID." - ::= { priIgmpSnoopingEntry 1 } + ::= { priIgmpSnoopingVlanEntry 1 } --xxx.100.8.2.1.2 priIgmpSnoopingvlanEnable OBJECT-TYPE SYNTAX INTEGER - { - disable(0), - enable(1) - } + { + disable(0), + enable(1) + } MAX-ACCESS read-write STATUS current DESCRIPTION " Enable or disable the IgmpSnooping in the switch.Default:0" - ::= { priIgmpSnoopingEntry 2 } + ::= { priIgmpSnoopingVlanEntry 2 } --xxx.100.8.2.1.3 priIgmpSnoopingleave OBJECT-TYPE SYNTAX INTEGER - { - no-immediate-leave(0), - immediate-leave(1) - } + { + no-immediate-leave(0), + immediate-leave(1) + } MAX-ACCESS read-write STATUS current DESCRIPTION " Enable or disable the immediate leave config.Default:0" - ::= { priIgmpSnoopingEntry 3 } + ::= { priIgmpSnoopingVlanEntry 3 } --xxx.100.8.2.1.4 priIgmpSnoopingL2gen OBJECT-TYPE SYNTAX INTEGER - { - no-l2-general-querier(0), - l2-general-querier(1) - } + { + no-l2-general-querier(0), + l2-general-querier(1) + } MAX-ACCESS read-write STATUS current DESCRIPTION " Enable or disable the l2-general-querier config.Default:0" - ::= { priIgmpSnoopingEntry 4 } + ::= { priIgmpSnoopingVlanEntry 4 } --xxx.100.8.2.1.5 priIgmpSnoopingGroupNum OBJECT-TYPE @@ -4857,7 +5643,7 @@ priIgmpSnoopingvlanID OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION "set the maximum IGMP group the port can join" - ::= { priIgmpSnoopingEntry 5 } + ::= { priIgmpSnoopingVlanEntry 5 } --xxx.100.8.2.1.6 priIgmpSnoopingSourceNum OBJECT-TYPE @@ -4865,18 +5651,18 @@ priIgmpSnoopingvlanID OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION "set the maximum source number" - ::= { priIgmpSnoopingEntry 6 } + ::= { priIgmpSnoopingVlanEntry 6 } --xxx.100.8.2.1.7 priIgmpSnoopingPort OBJECT-TYPE - SYNTAX DisplayString + SYNTAX OCTET STRING(SIZE(0..255)) MAX-ACCESS read-only STATUS current - DESCRIPTION " Get static mrouter port of vlan. - ethernet: Name of Ethernet port - ifname: Name of interface - port-channel: Port aggregation." - ::= { priIgmpSnoopingEntry 7 } + DESCRIPTION " set static mrouter port of vlan. + ethernet: Name of Ethernet port + ifname: Name of interface + port-channel: Port aggregation." + ::= { priIgmpSnoopingVlanEntry 7 } --xxx.100.8.2.1.8 priIgmpSnoopingPortTime OBJECT-TYPE @@ -4884,7 +5670,7 @@ priIgmpSnoopingvlanID OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION " Configure this survive time of mrouter port.Default: 255s" - ::= { priIgmpSnoopingEntry 8 } + ::= { priIgmpSnoopingVlanEntry 8 } --xxx.100.8.2.1.9 priIgmpSnoopingQueryInterval OBJECT-TYPE @@ -4892,7 +5678,7 @@ priIgmpSnoopingvlanID OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION " Configure this query interval. Default: 125s" - ::= { priIgmpSnoopingEntry 9 } + ::= { priIgmpSnoopingVlanEntry 9 } --xxx.100.8.2.1.10 priIgmpSnoopingQueryMrsp OBJECT-TYPE @@ -4900,7 +5686,7 @@ priIgmpSnoopingvlanID OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION " Configure the maximum query response period. Default: 10s" - ::= { priIgmpSnoopingEntry 10 } + ::= { priIgmpSnoopingVlanEntry 10 } --xxx.100.8.2.1.11 priIgmpSnoopingQueryRobustness OBJECT-TYPE @@ -4908,7 +5694,7 @@ priIgmpSnoopingvlanID OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION " Configure the query robustness.Default: 2" - ::= { priIgmpSnoopingEntry 11 } + ::= { priIgmpSnoopingVlanEntry 11 } --xxx.100.8.2.1.12 priIgmpSnoopingSuppression OBJECT-TYPE @@ -4916,7 +5702,15 @@ priIgmpSnoopingvlanID OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION " Configure the suppression query time.Default: 255s" - ::= { priIgmpSnoopingEntry 12 } + ::= { priIgmpSnoopingVlanEntry 12 } + +--xxx.100.8.2.1.13 + priIgmpSnoopingSpecificMrsp OBJECT-TYPE + SYNTAX INTEGER(1..25) + MAX-ACCESS read-write + STATUS current + DESCRIPTION " Configure the maximum specific query response period. Default: 1s" + ::= { priIgmpSnoopingVlanEntry 13 } --xxx.100.8.3 priIgmpSnoopingBindTable OBJECT-TYPE @@ -4940,14 +5734,14 @@ priIgmpSnoopingBindTable OBJECT-TYPE PriIgmpSnoopingBindEntry ::= SEQUENCE { - priIgmpSnoopingVlanID INTEGER, + priIgmpSnoopingVlanID INTEGER, priIgmpSnoopingGroupAddress IpAddress, priIgmpSnoopingPortBitmap OCTET STRING } --xxx.100.8.3.1.1 priIgmpSnoopingVlanID OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4094) MAX-ACCESS not-accessible STATUS current DESCRIPTION "This value is vlan's ID." @@ -4991,7 +5785,7 @@ priIgmpSnoopingLimitPortTable OBJECT-TYPE PriIgmpSnoopingLimitPortEntry ::= SEQUENCE { - priIgmpSnoopingLimitVlanID INTEGER, + priIgmpSnoopingLimitVlanID INTEGER, priIgmpSnoopingLimitPortIndex INTEGER, priIgmpSnoopingLimitPortGroupNum INTEGER, priIgmpSnoopingLimitPortSourceNum INTEGER, @@ -5001,60 +5795,150 @@ priIgmpSnoopingLimitPortTable OBJECT-TYPE --xxx.100.8.4.1.1 priIgmpSnoopingLimitVlanID OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4094) MAX-ACCESS not-accessible STATUS current DESCRIPTION "This value is vlan's ID which enable ip igmp snooping." ::= { priIgmpSnoopingLimitPortEntry 1 } --xxx.100.8.4.1.2 priIgmpSnoopingLimitPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION "This value is port's Index." ::= { priIgmpSnoopingLimitPortEntry 2 } --xxx.100.8.4.1.3 priIgmpSnoopingLimitPortGroupNum OBJECT-TYPE - SYNTAX INTEGER (1..65535) - MAX-ACCESS read-write - STATUS current - DESCRIPTION "set the maximum IGMP group the port can join.Default:FFFFFFFF, if only set source_num, - when geting ,the result is -1(FFFFFFFF)" - ::= { priIgmpSnoopingLimitPortEntry 3 } + SYNTAX INTEGER (1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "set the maximum IGMP group the port can join.Default:FFFFFFFF, if only set source_num, + when geting ,the result is -1(FFFFFFFF)" + ::= { priIgmpSnoopingLimitPortEntry 3 } --xxx.100.8.4.1.4 priIgmpSnoopingLimitPortSourceNum OBJECT-TYPE - SYNTAX INTEGER (1..65535) - MAX-ACCESS read-write - STATUS current - DESCRIPTION "set the maximum source number the port can join.Default:FFFFFFFF, if only set group_num, - when geting ,the result is -1(FFFFFFFF)" - ::= { priIgmpSnoopingLimitPortEntry 4 } + SYNTAX INTEGER (1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "set the maximum source number the port can join.Default:FFFFFFFF, if only set group_num, + when geting ,the result is -1(FFFFFFFF)" + ::= { priIgmpSnoopingLimitPortEntry 4 } --xxx.100.8.4.1.5 priIgmpSnoopingLimitPortStrategy OBJECT-TYPE - SYNTAX INTEGER - { - replace(1), - drop(2) - } - MAX-ACCESS read-write - STATUS current - DESCRIPTION "configure the strategy over limit." - ::= {priIgmpSnoopingLimitPortEntry 5} + SYNTAX INTEGER + { + replace(1), + drop(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "configure the strategy over limit." + ::= {priIgmpSnoopingLimitPortEntry 5} --xxx.100.8.4.1.6 priIgmpSnoopingLimitPortStatus OBJECT-TYPE - SYNTAX INTEGER - { - enable(1), - disable(0) - } - MAX-ACCESS read-write - STATUS current - DESCRIPTION "the status of limitPort:enable(1) to enable value of limitation; + SYNTAX INTEGER + { + enable(1), + disable(0) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "the status of limitPort:enable(1) to enable value of limitation; disable(0) is to disable value of limitation." - ::= {priIgmpSnoopingLimitPortEntry 6 } - ---******************************************************************************************************** + ::= {priIgmpSnoopingLimitPortEntry 6 } + +--xxx.100.8.5 +priIgmpSnoopingPortCtrlPktTable OBJECT-TYPE + SYNTAX SEQUENCE OF PriIgmpSnoopingPortCtrlPktEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " IgmpSnooping filter of the layer 3 control packet function of a port." + ::= { priIgmpSnoopingMib 5 } + +--xxx.100.8.5.1 + priIgmpSnoopingPortCtrlPktEntry OBJECT-TYPE + SYNTAX PriIgmpSnoopingPortCtrlPktEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " IgmpSnooping control packet per port." + INDEX { priIgmpSnoopingPortCtrlPktDrop} + ::= { priIgmpSnoopingPortCtrlPktTable 1 } + + PriIgmpSnoopingPortCtrlPktEntry + ::= SEQUENCE + { + priIgmpSnoopingPortCtrlPktDrop INTEGER + } +--xxx.100.8.5.1.1 +priIgmpSnoopingPortCtrlPktDrop OBJECT-TYPE + SYNTAX INTEGER + { + query(1), + report(2), + query-and-report(3), + no-query(4), + no-report(5) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION " if set(1), drop query packet , + and if set(2), drop report packet, + if set(4), no drop query packet , + and if set(5), no drop report packet, + query_and_report(3): drop query and report packet," + ::= { priIgmpSnoopingPortCtrlPktEntry 1 } + +--xxx.100.8.6 +priIgmpSnoopingPortAuthTable OBJECT-TYPE + SYNTAX SEQUENCE OF PriIgmpSnoopingPortAuthEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " This table is used to manage the IGMP Access Authentication + configurations of a port." + ::= { priIgmpSnoopingMib 6 } + +--xxx.100.8.6.1 + priIgmpSnoopingPortAuthEntry OBJECT-TYPE + SYNTAX PriIgmpSnoopingPortAuthEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " IgmpSnooping: A list of manageable entities for IGMP Access Authentication. + The configuration is done per port." + INDEX { priIgmpSnoopingPortAuthEnable} + ::= { priIgmpSnoopingPortAuthTable 1 } + + PriIgmpSnoopingPortAuthEntry + ::= SEQUENCE + { + priIgmpSnoopingPortAuthEnable INTEGER, + priIgmpSnoopingPortAuthFreeRule OCTET STRING + } + +--xxx.100.8.6.1.1 +priIgmpSnoopingPortAuthEnable OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "If set(0), not enable igmp snooping authentication on port, + if set(1), enable igmp snooping authentication on port." + ::= { priIgmpSnoopingPortAuthEntry 1 } +--xxx.100.8.6.1.2 +priIgmpSnoopingPortAuthFreeRule OBJECT-TYPE + SYNTAX OCTET STRING(SIZE(0..255)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "get the igmpsnooping authentication group control" + ::= { priIgmpSnoopingPortAuthEntry 2 } +--******************************************************************************************************** --******************************************************************************************************** -- (xxx.100.9) QinQ group @@ -5065,7 +5949,7 @@ dot1qTunnelTable OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - " port of qinq tunnel function list" + " port of qinq tunnel function list" ::= { priQinQmib 1} --xxx.100.9.1 @@ -5081,14 +5965,14 @@ dot1qTunnelEntry OBJECT-TYPE Dot1qTunnelEntry ::= SEQUENCE { - qinqPortIndex INTEGER, - tunnelPortEnable INTEGER, - tunnelPortType INTEGER + qinqPortIndex INTEGER, + tunnelPortEnable INTEGER, + tunnelPortType INTEGER } --xxx.100.9.1.1 qinqPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -5124,7 +6008,7 @@ vlanTranslationTable OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - " VLAN translation basic config." + " VLAN translation basic config." ::= { priQinQmib 2} --xxx.100.9.2.1 @@ -5140,14 +6024,14 @@ vlanTranslationEntry OBJECT-TYPE VlanTranslationEntry ::= SEQUENCE { - translatPortIndex INTEGER, - translationEnable INTEGER, - translationDropType INTEGER + translatPortIndex INTEGER, + translationEnable INTEGER, + translationDropType INTEGER } --xxx.100.9.2.1.1 translatPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -5169,12 +6053,12 @@ translationEnable OBJECT-TYPE --xxx.100.9.2.1.3 translationDropType OBJECT-TYPE SYNTAX INTEGER { - in(1), - out(2), - both(3), - noIn(4), - noOut(5), - noBoth(6) + in(1), + out(2), + both(3), + noIn(4), + noOut(5), + noBoth(6) } MAX-ACCESS read-write STATUS current @@ -5189,7 +6073,7 @@ vlanTranslationTypeTable OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - " port VLAN-translation of translation relation list" + " port VLAN-translation of translation relation list" ::= { priQinQmib 3} --xxx.100.9.3.1 @@ -5205,16 +6089,16 @@ vlanTranslationTypeEntry OBJECT-TYPE VlanTranslationTypeEntry ::= SEQUENCE { - translatPortTypeIndex INTEGER, - translationType INTEGER, - translationOldVlanid INTEGER, - translationNewVlanid INTEGER, - translationTypeStatus INTEGER + translatPortTypeIndex INTEGER, + translationType INTEGER, + translationOldVlanid INTEGER, + translationNewVlanid INTEGER, + translationTypeStatus INTEGER } --xxx.100.9.3.1.1 translatPortTypeIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -5225,9 +6109,9 @@ translatPortTypeIndex OBJECT-TYPE --xxx.100.9.3.1.2 translationType OBJECT-TYPE SYNTAX INTEGER{ - in(1), - out(2) - } + in(1), + out(2) + } MAX-ACCESS read-only STATUS current DESCRIPTION @@ -5255,10 +6139,10 @@ translationNewVlanid OBJECT-TYPE --xxx.100.9.3.1.5 translationTypeStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -5272,15 +6156,15 @@ translationNewVlanid OBJECT-TYPE -- (xxx.100.10) prisecurity group --xxx.100.10.1 - acl OBJECT IDENTIFIER ::= { prisecurity 1 } + acl OBJECT IDENTIFIER ::= { prisecurity 1 } --xxx.100.10.1.1 - fireWall OBJECT IDENTIFIER ::= { acl 1 } + fireWall OBJECT IDENTIFIER ::= { acl 1 } --xxx.100.10.1.2 - timeRange OBJECT IDENTIFIER ::= { acl 2 } + timeRange OBJECT IDENTIFIER ::= { acl 2 } --xxx.100.10.1.3 - aclConfig OBJECT IDENTIFIER ::= { acl 3 } + aclConfig OBJECT IDENTIFIER ::= { acl 3 } --xxx.100.10.1.4 - aclAttach OBJECT IDENTIFIER ::= { acl 4 } + aclAttach OBJECT IDENTIFIER ::= { acl 4 } --xxx.100.10.1.1.1 @@ -5321,13 +6205,13 @@ timeRangeMapTable OBJECT-TYPE ::= SEQUENCE { timeRangeMapIndex INTEGER, - timeRangeMapName DisplayString, - timeRangeMapStatus INTEGER + timeRangeMapName DisplayString, + timeRangeMapStatus INTEGER } --xxx.100.10.1.2.1.1.1 timeRangeMapIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2147483647) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -5346,11 +6230,11 @@ timeRangeMapTable OBJECT-TYPE --xxx.100.10.1.2.1.1.3 timeRangeMapStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -5381,19 +6265,19 @@ timeRangeTable OBJECT-TYPE { timeRangeIndex INTEGER, timeRangeSubIndex INTEGER, - timeRangeType INTEGER, - timeRangeStartWeek BITS, - timeRangeStartDate DisplayString, - timeRangeStartTime DisplayString, - timeRangeEndWeek BITS, - timeRangeEndDate DisplayString, - timeRangeEndTime DisplayString, + timeRangeType INTEGER, + timeRangeStartWeek BITS, + timeRangeStartDate DisplayString, + timeRangeStartTime DisplayString, + timeRangeEndWeek BITS, + timeRangeEndDate DisplayString, + timeRangeEndTime DisplayString, timeRangeStatus INTEGER } --xxx.100.10.1.2.2.1.1 - timeRangeIndex OBJECT-TYPE - SYNTAX INTEGER + timeRangeIndex OBJECT-TYPE + SYNTAX INTEGER (1..1000) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -5402,7 +6286,7 @@ timeRangeTable OBJECT-TYPE --xxx.100.10.1.2.2.1.2 timeRangeSubIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..1000) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -5426,14 +6310,14 @@ timeRangeTable OBJECT-TYPE timeRangeStartWeek OBJECT-TYPE SYNTAX BITS { - monday(0), - tuesday(1), - wednesday(2), - thursday(3), - friday(4), - saturday(5), - sunday(6) - } + monday(0), + tuesday(1), + wednesday(2), + thursday(3), + friday(4), + saturday(5), + sunday(6) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -5465,14 +6349,14 @@ timeRangeTable OBJECT-TYPE timeRangeEndWeek OBJECT-TYPE SYNTAX BITS { - monday(0), - tuesday(1), - wednesday(2), - thursday(3), - friday(4), - saturday(5), - sunday(6) - } + monday(0), + tuesday(1), + wednesday(2), + thursday(3), + friday(4), + saturday(5), + sunday(6) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -5503,11 +6387,11 @@ timeRangeTable OBJECT-TYPE --xxx.100.10.1.2.2.1.10 timeRangeStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -5540,18 +6424,20 @@ numAclGroupTable OBJECT-TYPE ::= SEQUENCE { numAclGroupAclIndex INTEGER, - numAclGroupMatchOrder INTEGER, - numAclGroupSubitemNum INTEGER, + numAclGroupMatchOrder INTEGER, + numAclGroupSubitemNum INTEGER, numAclGroupStatus INTEGER } --xxx.100.10.1.3.1.1.1 numAclGroupAclIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..8000) MAX-ACCESS read-only STATUS current DESCRIPTION - "the index of number acl,ip standard <1>,ip extern <100>,mac standard <700>, - mac extern <1100>,ipv6 standard <500> ipv6 extern <600>." + "the index of number acl,ip standard <1-99>,ip extern <100-199>, + ip extern (support discontinuous ip address mask)<200-299>, mac standard <700-799>, + mac extern <1100-1199>,ipv6 standard <500-599> ipv6 extern <600-699>, + mac-ip extern <3100-3199>,mac-ip extern(support discontinuous ip address mask) <3200-3299>" ::= { numAclGroupEntry 1 } --xxx.100.10.1.3.1.1.2 @@ -5619,13 +6505,13 @@ nameAclGroupTable OBJECT-TYPE nameAclGroupAclIndex INTEGER, nameAclGroupAclName DisplayString, nameAclGroupAclType INTEGER, - nameAclGroupMatchOrder INTEGER, - nameAclGroupSubitemNum INTEGER, + nameAclGroupMatchOrder INTEGER, + nameAclGroupSubitemNum INTEGER, nameAclGroupStatus INTEGER } --xxx.100.10.1.3.2.1.1 nameAclGroupAclIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (20000..30000) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -5723,15 +6609,15 @@ ipStandardAclTable OBJECT-TYPE ipStandardIndex INTEGER, ipStandardSubIndex INTEGER, ipStandardPriority INTEGER, - ipStandardAct INTEGER, - ipStandardSrcIp IpAddress, + ipStandardAct INTEGER, + ipStandardSrcIp IpAddress, ipStandardSrcIpWild IpAddress, ipStandardStatus INTEGER } --xxx.100.10.1.3.3.1.1 ipStandardIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..99) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -5740,7 +6626,7 @@ ipStandardAclTable OBJECT-TYPE --xxx.100.10.1.3.3.1.2 ipStandardSubIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..99) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -5760,10 +6646,10 @@ ipStandardAclTable OBJECT-TYPE --xxx.100.10.1.3.3.1.4 ipStandardAct OBJECT-TYPE SYNTAX INTEGER - { - deny(0), - permit(1) - } + { + deny(0), + permit(1) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -5792,11 +6678,11 @@ ipStandardAclTable OBJECT-TYPE --xxx.100.10.1.3.3.1.7 ipStandardStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -5830,9 +6716,9 @@ ipExternAclTable OBJECT-TYPE ipExternIndex INTEGER, ipExternSubIndex INTEGER, ipExternPriority INTEGER, - ipExternAct INTEGER, - ipExternProtocal INTEGER, - ipExternSrcIp IpAddress, + ipExternAct INTEGER, + ipExternProtocal Integer32, + ipExternSrcIp IpAddress, ipExternSrcIpWild IpAddress, ipExternDstIp IpAddress, ipExternDstIpWild IpAddress, @@ -5848,7 +6734,7 @@ ipExternAclTable OBJECT-TYPE --xxx.100.10.1.3.4.1.1 ipExternIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (100..199) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -5857,7 +6743,7 @@ ipExternAclTable OBJECT-TYPE --xxx.100.10.1.3.4.1.2 ipExternSubIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..100) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -5876,10 +6762,10 @@ ipExternAclTable OBJECT-TYPE --xxx.100.10.1.3.4.1.4 ipExternAct OBJECT-TYPE SYNTAX INTEGER - { - deny(0), - permit(1) - } + { + deny(0), + permit(1) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -5888,19 +6774,19 @@ ipExternAclTable OBJECT-TYPE --xxx.100.10.1.3.4.1.5 ipExternProtocal OBJECT-TYPE - SYNTAX INTEGER(0..255) + SYNTAX Integer32(0..255|65535) MAX-ACCESS read-write STATUS current DESCRIPTION "The protocol number field in the IP header used to indicate the higher layer protocol as specified in RFC 1700. A value - value of 0 matches every IP packet. + value of 65535 matches every IP packet. For example : - 0 is IP, 1 is ICMP, 2 is IGMP, 4 is IP in IP encapsulation, + 1 is ICMP, 2 is IGMP, 4 is IP in IP encapsulation, 6 is TCP, 9 is IGRP, 17 is UDP, 47 is GRE, 50 is ESP, 51 is AH, 88 is EIGRP, 89 is OSPF, 94 is KA9Q/NOS compatible IP over IP, - 103 is PIMv2, 108 is PCP." + 103 is PIMv2, 108 is PCP, 65535 is ip." ::= { ipExternAclEntry 5} --xxx.100.10.1.3.4.1.6 @@ -5954,9 +6840,9 @@ ipExternAclTable OBJECT-TYPE ipExternSrcOp OBJECT-TYPE SYNTAX INTEGER{ noOperator(0), - eq(1), - range(2) - } + eq(1), + range(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -5998,12 +6884,12 @@ ipExternAclTable OBJECT-TYPE ::= { ipExternAclEntry 12 } --xxx.100.10.1.3.4.1.13 - ipExternSrcPort2 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "The source port number of the TCP or UDP protocol. If the + ipExternSrcPort2 OBJECT-TYPE + SYNTAX INTEGER(0..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The source port number of the TCP or UDP protocol. If the numIpExternSrcOP object in the same row is range(5), this object will be the ending port number of the port range. This object cannot be configured if numIpExternStatus in the @@ -6015,9 +6901,9 @@ ipExternAclTable OBJECT-TYPE ipExternDstOp OBJECT-TYPE SYNTAX INTEGER{ noOperator(0), - eq(1), - range(2) - } + eq(1), + range(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -6058,28 +6944,28 @@ ipExternAclTable OBJECT-TYPE ::= { ipExternAclEntry 15 } --xxx.100.10.1.3.4.1.16 - ipExternDstPort2 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "The source port number of the TCP or UDP protocol. If the + ipExternDstPort2 OBJECT-TYPE + SYNTAX INTEGER(0..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The source port number of the TCP or UDP protocol. If the numIpExternDestOP object in the same row is range(5), this object will be the ending port number of the port range. This object cannot be configured if numIpExternStatus in the same row is active(1) or numIpExternDestOP in the same row is not range(5)." - ::= { ipExternAclEntry 16 } + ::= { ipExternAclEntry 16 } --xxx.100.10.1.3.4.1.17 ipExternStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -6113,15 +6999,15 @@ macStandardAclTable OBJECT-TYPE macStandardIndex INTEGER, macStandardSubIndex INTEGER, macStandardPriority INTEGER, - macStandardAct INTEGER, - macStandardSrcMac DisplayString, + macStandardAct INTEGER, + macStandardSrcMac DisplayString, macStandardSrcMacWild DisplayString, macStandardStatus INTEGER } --xxx.100.10.1.3.5.1.1 macStandardIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (700..799) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -6130,7 +7016,7 @@ macStandardAclTable OBJECT-TYPE --xxx.100.10.1.3.5.1.2 macStandardSubIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..100) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -6139,7 +7025,7 @@ macStandardAclTable OBJECT-TYPE --xxx.100.10.1.3.5.1.3 macStandardPriority OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..100) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -6149,10 +7035,10 @@ macStandardAclTable OBJECT-TYPE --xxx.100.10.1.3.5.1.4 macStandardAct OBJECT-TYPE SYNTAX INTEGER - { - deny(0), - permit(1) - } + { + deny(0), + permit(1) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -6180,11 +7066,11 @@ macStandardAclTable OBJECT-TYPE --xxx.100.10.1.3.5.1.7 macStandardStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -6219,24 +7105,24 @@ macStandardAclTable OBJECT-TYPE macExternIndex INTEGER, macExternSubIndex INTEGER, macExternPriority INTEGER, - macExternAct INTEGER, - macExternSrcMac DisplayString, + macExternAct INTEGER, + macExternSrcMac DisplayString, macExternSrcMacWild DisplayString, macExternDstMac DisplayString, macExternDstMacWild DisplayString, macExternPacketType INTEGER, macExternEtherType INTEGER, macExternEtherTypeWild INTEGER, - macExternCos INTEGER, + macExternCos INTEGER, macExternCosWild INTEGER, - macExternVlanId INTEGER, + macExternVlanId INTEGER, macExternVlanIdWild INTEGER, macExternStatus INTEGER } --xxx.100.10.1.3.6.1.1 macExternIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1100..1199) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -6245,7 +7131,7 @@ macStandardAclTable OBJECT-TYPE --xxx.100.10.1.3.6.1.2 macExternSubIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..100) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -6264,10 +7150,10 @@ macStandardAclTable OBJECT-TYPE --xxx.100.10.1.3.6.1.4 macExternAct OBJECT-TYPE SYNTAX INTEGER - { - deny(0), - permit(1) - } + { + deny(0), + permit(1) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -6311,77 +7197,77 @@ macStandardAclTable OBJECT-TYPE ::= { macExternAclEntry 8 } --xxx.100.10.1.3.6.1.9 - macExternPacketType OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-write - STATUS current - DESCRIPTION + macExternPacketType OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Indicates the message type of packets.none(0),untagged-eth2(1), untagged-802.3(2),tagged-eth2(3),tagged-802.3(4)" - ::= { macExternAclEntry 9 } + ::= { macExternAclEntry 9 } --xxx.100.10.1.3.6.1.10 - macExternEtherType OBJECT-TYPE - SYNTAX INTEGER(1536..65535) - MAX-ACCESS read-write - STATUS current - DESCRIPTION + macExternEtherType OBJECT-TYPE + SYNTAX INTEGER(1536..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Value of the ethertype" - ::= { macExternAclEntry 10 } + ::= { macExternAclEntry 10 } --xxx.100.10.1.3.6.1.11 - macExternEtherTypeWild OBJECT-TYPE - SYNTAX INTEGER(0..65535) - MAX-ACCESS read-write - STATUS current - DESCRIPTION + macExternEtherTypeWild OBJECT-TYPE + SYNTAX INTEGER(0..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Anti-mask of the ethertype" - ::= { macExternAclEntry 11 } + ::= { macExternAclEntry 11 } --xxx.100.10.1.3.6.1.12 - macExternCos OBJECT-TYPE - SYNTAX INTEGER(0..7) - MAX-ACCESS read-write - STATUS current - DESCRIPTION + macExternCos OBJECT-TYPE + SYNTAX INTEGER(0..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "value of the cos" - ::= { macExternAclEntry 12 } + ::= { macExternAclEntry 12 } --xxx.100.10.1.3.6.1.13 - macExternCosWild OBJECT-TYPE - SYNTAX INTEGER(0..7) - MAX-ACCESS read-write - STATUS current - DESCRIPTION + macExternCosWild OBJECT-TYPE + SYNTAX INTEGER(0..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Anti-mask of the cos" - ::= { macExternAclEntry 13 } + ::= { macExternAclEntry 13 } --xxx.100.10.1.3.6.1.14 - macExternVlanId OBJECT-TYPE - SYNTAX INTEGER(1..4094) - MAX-ACCESS read-write - STATUS current - DESCRIPTION + macExternVlanId OBJECT-TYPE + SYNTAX INTEGER(1..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "vlan id" - ::= { macExternAclEntry 14 } + ::= { macExternAclEntry 14 } --xxx.100.10.1.3.6.1.15 - macExternVlanIdWild OBJECT-TYPE - SYNTAX INTEGER(0..4095) - MAX-ACCESS read-write - STATUS current - DESCRIPTION + macExternVlanIdWild OBJECT-TYPE + SYNTAX INTEGER(0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Anti-mask of the vlan id" - ::= { macExternAclEntry 15 } - + ::= { macExternAclEntry 15 } + --xxx.100.10.1.3.6.1.16 macExternStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -6414,15 +7300,15 @@ ipv6StandardAclTable OBJECT-TYPE ipv6StandardIndex INTEGER, ipv6StandardSubIndex INTEGER, ipv6StandardPriority INTEGER, - ipv6StandardAct INTEGER, - ipv6StandardSrcIp DisplayString, + ipv6StandardAct INTEGER, + ipv6StandardSrcIp DisplayString, ipv6StandardSrcPrefixLen INTEGER, ipv6StandardStatus INTEGER } --xxx.100.10.1.3.7.1.1 ipv6StandardIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (500..599) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -6431,7 +7317,7 @@ ipv6StandardAclTable OBJECT-TYPE --xxx.100.10.1.3.7.1.2 ipv6StandardSubIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..100) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -6451,10 +7337,10 @@ ipv6StandardAclTable OBJECT-TYPE --xxx.100.10.1.3.7.1.4 ipv6StandardAct OBJECT-TYPE SYNTAX INTEGER - { - deny(0), - permit(1) - } + { + deny(0), + permit(1) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -6483,11 +7369,11 @@ ipv6StandardAclTable OBJECT-TYPE --xxx.100.10.1.3.7.1.7 ipv6StandardStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -6521,9 +7407,9 @@ ipv6ExternAclTable OBJECT-TYPE ipv6ExternIndex INTEGER, ipv6ExternSubIndex INTEGER, ipv6ExternPriority INTEGER, - ipv6ExternAct INTEGER, + ipv6ExternAct INTEGER, ipv6ExternProtocal INTEGER, - ipv6ExternSrcIp DisplayString, + ipv6ExternSrcIp DisplayString, ipv6ExternSrcPreLen INTEGER, ipv6ExternDstIp DisplayString, ipv6ExternDstPreLen INTEGER, @@ -6539,7 +7425,7 @@ ipv6ExternAclTable OBJECT-TYPE --xxx.100.10.1.3.8.1.1 ipv6ExternIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (600..699) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -6548,7 +7434,7 @@ ipv6ExternAclTable OBJECT-TYPE --xxx.100.10.1.3.8.1.2 ipv6ExternSubIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..100) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -6557,7 +7443,7 @@ ipv6ExternAclTable OBJECT-TYPE --xxx.100.10.1.3.8.1.3 ipv6ExternPriority OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..100) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -6567,10 +7453,10 @@ ipv6ExternAclTable OBJECT-TYPE --xxx.100.10.1.3.8.1.4 ipv6ExternAct OBJECT-TYPE SYNTAX INTEGER - { - deny(0), - permit(1) - } + { + deny(0), + permit(1) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -6646,9 +7532,9 @@ ipv6ExternAclTable OBJECT-TYPE ipv6ExternSrcOp OBJECT-TYPE SYNTAX INTEGER{ noOperator(0), - eq(3), - range(5) - } + eq(3), + range(5) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -6685,12 +7571,12 @@ ipv6ExternAclTable OBJECT-TYPE ::= { ipv6ExternAclEntry 12 } --xxx.100.10.1.3.8.1.13 - ipv6ExternSrcPort2 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "The source port number of the TCP or UDP protocol. If the + ipv6ExternSrcPort2 OBJECT-TYPE + SYNTAX INTEGER(0..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The source port number of the TCP or UDP protocol. If the ipv6ExternSrcOp object in the same row is range(5), this object will be the ending port number of the port range. This object cannot be configured if ipv6ExternStatus in the @@ -6702,9 +7588,9 @@ ipv6ExternAclTable OBJECT-TYPE ipv6ExternDstOp OBJECT-TYPE SYNTAX INTEGER{ noOperator(0), - eq(3), - range(5) - } + eq(3), + range(5) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -6741,28 +7627,28 @@ ipv6ExternAclTable OBJECT-TYPE ::= { ipv6ExternAclEntry 15 } --xxx.100.10.1.3.8.1.16 - ipv6ExternDstPort2 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "The Destination port number of the TCP or UDP protocol. If the + ipv6ExternDstPort2 OBJECT-TYPE + SYNTAX INTEGER(0..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Destination port number of the TCP or UDP protocol. If the ipv6ExternDstOp object in the same row is range(5), this object will be the ending port number of the port range. This object cannot be configured if ipv6ExternStatus in the same row is active(1) or ipv6ExternDstOp in the same row is not range(5)." - ::= { ipv6ExternAclEntry 16 } + ::= { ipv6ExternAclEntry 16 } --xxx.100.10.1.3.8.1.17 ipv6ExternStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -6779,7 +7665,7 @@ macIpExternAclTable OBJECT-TYPE "mac-ip extern Acl Table" ::= { aclConfig 9 } ---xxx.100.10.1.3.4.1 +--xxx.100.10.1.3.9.1 macIpExternAclEntry OBJECT-TYPE SYNTAX MacIpExternAclEntry MAX-ACCESS not-accessible @@ -6795,13 +7681,13 @@ macIpExternAclTable OBJECT-TYPE macIpExternIndex INTEGER, macIpExternSubIndex INTEGER, macIpExternPriority INTEGER, - macIpExternAct INTEGER, - macIpExternProtocal INTEGER, - macIpExternSrcMac DisplayString, + macIpExternAct INTEGER, + macIpExternProtocal Integer32, + macIpExternSrcMac DisplayString, macIpExternSrcMacWild DisplayString, macIpExternDstMac DisplayString, macIpExternDstMacWild DisplayString, - macIpExternSrcIp IpAddress, + macIpExternSrcIp IpAddress, macIpExternSrcIpWild IpAddress, macIpExternDstIp IpAddress, macIpExternDstIpWild IpAddress, @@ -6814,68 +7700,72 @@ macIpExternAclTable OBJECT-TYPE macIpExternDstPort2 INTEGER, macIpExternPrecedence INTEGER, macIpExternTos INTEGER, - macIpExternStatus INTEGER + macIpExternStatus INTEGER, + macIpExternVlanId INTEGER, + macIpExternVlanIdWild INTEGER, + macIpExternIcmpType INTEGER, + macIpExternIcmpCode INTEGER } ---xxx.100.10.1.3.4.1.1 +--xxx.100.10.1.3.9.1.1 macIpExternIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (3100..3299) MAX-ACCESS read-only STATUS current DESCRIPTION "The index of macIp-Extern-acl group ." ::= { macIpExternAclEntry 1 } ---xxx.100.10.1.3.4.1.2 +--xxx.100.10.1.3.9.1.2 macIpExternSubIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..100) MAX-ACCESS read-only STATUS current DESCRIPTION "The index of macIp-Extern-acl rule ." ::= { macIpExternAclEntry 2 } ---xxx.100.10.1.3.4.1.3 +--xxx.100.10.1.3.9.1.3 macIpExternPriority OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..100) MAX-ACCESS read-write STATUS current DESCRIPTION "The priority of extern macIp acl's rule,it is not supported now." ::= { macIpExternAclEntry 3 } ---xxx.100.10.1.3.4.1.4 +--xxx.100.10.1.3.9.1.4 macIpExternAct OBJECT-TYPE SYNTAX INTEGER - { - deny(0), - permit(1) - } + { + deny(0), + permit(1) + } MAX-ACCESS read-write STATUS current DESCRIPTION " The action of acl rule." ::= { macIpExternAclEntry 4 } ---xxx.100.10.1.3.4.1.5 +--xxx.100.10.1.3.9.1.5 macIpExternProtocal OBJECT-TYPE - SYNTAX INTEGER(0..255) + SYNTAX Integer32(0..255|65535) MAX-ACCESS read-write STATUS current DESCRIPTION "The protocol number field in the IP header used to indicate the higher layer protocol as specified in RFC 1700. A value - value of 0 matches every IP packet. + value of 65535 matches every IP packet. For example : - 0 is IP, 1 is ICMP, 2 is IGMP, 4 is IP in IP encapsulation, + 1 is ICMP, 2 is IGMP, 4 is IP in IP encapsulation, 6 is TCP, 9 is IGRP, 17 is UDP, 47 is GRE, 50 is ESP, 51 is AH, 88 is EIGRP, 89 is OSPF, 94 is KA9Q/NOS compatible IP over IP, - 103 is PIMv2, 108 is PCP." + 103 is PIMv2, 108 is PCP, 65535 is ip." ::= { macIpExternAclEntry 5} - --xxx.100.10.1.3.6.1.5 + --xxx.100.10.1.3.9.1.6 macIpExternSrcMac OBJECT-TYPE SYNTAX DisplayString(SIZE(17)) MAX-ACCESS read-write @@ -6884,7 +7774,7 @@ macIpExternAclTable OBJECT-TYPE " Source Mac-address of advanced acl rule,for example : ff-ff-ff-ff-ff-00." ::= { macIpExternAclEntry 6 } - --xxx.100.10.1.3.6.1.6 + --xxx.100.10.1.3.9.1.7 macIpExternSrcMacWild OBJECT-TYPE SYNTAX DisplayString(SIZE(17)) MAX-ACCESS read-write @@ -6893,7 +7783,7 @@ macIpExternAclTable OBJECT-TYPE " Source Mac-address's anti-mask of advanced acl rule,for example : ff-ff-ff-ff-00-00." ::= { macIpExternAclEntry 7 } - --xxx.100.10.1.3.6.1.7 + --xxx.100.10.1.3.9.1.8 macIpExternDstMac OBJECT-TYPE SYNTAX DisplayString(SIZE(17)) MAX-ACCESS read-write @@ -6902,7 +7792,7 @@ macIpExternAclTable OBJECT-TYPE " Destination Mac-address of advanced acl rule,for example : ff-ff-ff-ff-ff-00." ::= { macIpExternAclEntry 8 } - --xxx.100.10.1.3.6.1.8 + --xxx.100.10.1.3.9.1.9 macIpExternDstMacWild OBJECT-TYPE SYNTAX DisplayString(SIZE(17)) MAX-ACCESS read-write @@ -6912,7 +7802,7 @@ macIpExternAclTable OBJECT-TYPE ::= { macIpExternAclEntry 9 } ---xxx.100.10.1.3.4.1.6 +--xxx.100.10.1.3.9.1.10 macIpExternSrcIp OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-write @@ -6921,7 +7811,7 @@ macIpExternAclTable OBJECT-TYPE " Source IP-address of advanced acl rule,for example 10.1.1.0 ." ::= { macIpExternAclEntry 10} ---xxx.100.10.1.3.4.1.7 +--xxx.100.10.1.3.9.1.11 macIpExternSrcIpWild OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-write @@ -6931,7 +7821,7 @@ macIpExternAclTable OBJECT-TYPE ::= { macIpExternAclEntry 11 } ---xxx.100.10.1.3.4.1.8 +--xxx.100.10.1.3.9.1.12 macIpExternDstIp OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-write @@ -6940,7 +7830,7 @@ macIpExternAclTable OBJECT-TYPE " Destination IP-address of advanced acl rule,for example 10.1.1.0 ." ::= { macIpExternAclEntry 12 } ---xxx.100.10.1.3.4.1.9 +--xxx.100.10.1.3.9.1.13 macIpExternDstIpWild OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-write @@ -6950,7 +7840,7 @@ macIpExternAclTable OBJECT-TYPE ::= { macIpExternAclEntry 13 } ---xxx.100.10.1.3.4.1.10 +--xxx.100.10.1.3.9.1.14 macIpExternTimeRangeName OBJECT-TYPE SYNTAX DisplayString(SIZE (1..64)) MAX-ACCESS read-write @@ -6959,13 +7849,13 @@ macIpExternAclTable OBJECT-TYPE "The Time-range of advanced acl rule." ::= { macIpExternAclEntry 14 } ---xxx.100.10.1.3.4.1.11 +--xxx.100.10.1.3.9.1.15 macIpExternSrcOp OBJECT-TYPE SYNTAX INTEGER{ noOperator(0), - eq(3), - range(5) - } + eq(3), + range(5) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -6992,7 +7882,7 @@ macIpExternAclTable OBJECT-TYPE Now support(3)eq,(5)range." ::= { macIpExternAclEntry 15 } ---xxx.100.10.1.3.4.1.12 +--xxx.100.10.1.3.9.1.16 macIpExternSrcPort1 OBJECT-TYPE SYNTAX INTEGER(0..65535) MAX-ACCESS read-write @@ -7006,13 +7896,13 @@ macIpExternAclTable OBJECT-TYPE is noOperator(0)." ::= { macIpExternAclEntry 16 } ---xxx.100.10.1.3.4.1.13 - macIpExternSrcPort2 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "The source port number of the TCP or UDP protocol. If the +--xxx.100.10.1.3.9.1.17 + macIpExternSrcPort2 OBJECT-TYPE + SYNTAX INTEGER(0..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The source port number of the TCP or UDP protocol. If the macIpExternSrcOP object in the same row is range(5), this object will be the ending port number of the port range. This object cannot be configured if numIpExternStatus in the @@ -7020,13 +7910,13 @@ macIpExternAclTable OBJECT-TYPE is not range(5)." ::= { macIpExternAclEntry 17 } ---xxx.100.10.1.3.4.1.14 +--xxx.100.10.1.3.9.1.18 macIpExternDstOp OBJECT-TYPE SYNTAX INTEGER{ noOperator(0), - eq(1), - range(2) - } + eq(1), + range(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -7052,7 +7942,7 @@ macIpExternAclTable OBJECT-TYPE Now support(3)eq,(5)range." ::= { macIpExternAclEntry 18 } ---xxx.100.10.1.3.4.1.15 +--xxx.100.10.1.3.9.1.19 macIpExternDstPort1 OBJECT-TYPE SYNTAX INTEGER(0..65535) MAX-ACCESS read-write @@ -7066,20 +7956,21 @@ macIpExternAclTable OBJECT-TYPE is noOperator(0)." ::= { macIpExternAclEntry 19 } ---xxx.100.10.1.3.4.1.16 - macIpExternDstPort2 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "The source port number of the TCP or UDP protocol. If the +--xxx.100.10.1.3.9.1.20 + macIpExternDstPort2 OBJECT-TYPE + SYNTAX INTEGER(0..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The source port number of the TCP or UDP protocol. If the macIpExternDstOP object in the same row is range(5), this object will be the ending port number of the port range. This object cannot be configured if numIpExternStatus in the same row is active(1) or macIpExternDstOP in the same row is not range(5)." - ::= { macIpExternAclEntry 20 } - + ::= { macIpExternAclEntry 20 } + +--xxx.100.10.1.3.9.1.21 macIpExternPrecedence OBJECT-TYPE SYNTAX INTEGER(0..7) MAX-ACCESS read-write @@ -7088,6 +7979,7 @@ macIpExternAclTable OBJECT-TYPE "The precedence of macIp-Extern-acl ." ::= { macIpExternAclEntry 21 } +--xxx.100.10.1.3.9.1.22 macIpExternTos OBJECT-TYPE SYNTAX INTEGER(0..15) MAX-ACCESS read-write @@ -7096,19 +7988,56 @@ macIpExternAclTable OBJECT-TYPE "The tos of macIp-Extern-acl ." ::= { macIpExternAclEntry 22 } ---xxx.100.10.1.3.4.1.17 +--xxx.100.10.1.3.9.1.23 macIpExternStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION " state of the access-list." ::= { macIpExternAclEntry 23 } + +--xxx.100.10.1.3.9.1.24 + macIpExternVlanId OBJECT-TYPE + SYNTAX INTEGER(1..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The vlan Id" + ::= { macIpExternAclEntry 24 } + +--xxx.100.10.1.3.9.1.25 + macIpExternVlanIdWild OBJECT-TYPE + SYNTAX INTEGER(0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The vlan Id mask" + ::= { macIpExternAclEntry 25 } + +--xxx.100.10.1.3.9.1.26 + macIpExternIcmpType OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Icmp Type cfg <0-255>,default is -1" + ::= { macIpExternAclEntry 26 } + +--xxx.100.10.1.3.9.1.27 + macIpExternIcmpCode OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Icmp Code cfg <0-255>,default is -1" + ::= { macIpExternAclEntry 27 } + --******************************************************************************************************** --xxx.100.10.1.4.1 aclActiveTable OBJECT-TYPE @@ -7134,8 +8063,8 @@ aclActiveTable OBJECT-TYPE { aclActiveBindType INTEGER, aclActiveIndex INTEGER, - aclActiveType INTEGER, - aclActiveDirection INTEGER, + aclActiveType INTEGER, + aclActiveDirection INTEGER, aclActiveAclIndex INTEGER, aclActiveStatistic INTEGER, aclActiveStatus INTEGER @@ -7158,7 +8087,7 @@ aclActiveTable OBJECT-TYPE --xxx.100.10.1.4.1.1.2 aclActiveIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4094) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -7170,9 +8099,9 @@ aclActiveTable OBJECT-TYPE SYNTAX INTEGER { ip(1), - ipv6(2), - mac(3), - macIp(5) + ipv6(3), + mac(5), + macIp(8) } MAX-ACCESS read-only @@ -7255,7 +8184,7 @@ aclStatisticClearTable OBJECT-TYPE ::= SEQUENCE { aclStatisticClearBindType INTEGER, - aclStatisticClearDirection INTEGER, + aclStatisticClearDirection INTEGER, aclStatisticClearIndex INTEGER, aclStatisticClearStatus INTEGER } @@ -7311,16 +8240,16 @@ aclStatisticClearTable OBJECT-TYPE ::= { aclStatisticClearEntry 4} --******************************************************************************************************** --xxx.100.10.2 - sshMgt OBJECT IDENTIFIER ::= { prisecurity 2 } + sshMgt OBJECT IDENTIFIER ::= { prisecurity 2 } --******************************************************************************************************** sshServerStatus OBJECT-TYPE SYNTAX INTEGER { - enable(1), - disable(0) - } + enable(1), + disable(0) + } MAX-ACCESS read-write STATUS current DESCRIPTION "The status of Secure Shell Server, set this value @@ -7370,15 +8299,15 @@ sshUseEntry OBJECT-TYPE SshUseEntry ::= SEQUENCE { - sshUserIndex INTEGER, + sshUserIndex INTEGER, sshUserName DisplayString, - sshUserType INTEGER, + sshUserType INTEGER, sshUserPassword DisplayString, - sshUserStatus INTEGER + sshUserStatus INTEGER } sshUserIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..16) MAX-ACCESS not-accessible STATUS current DESCRIPTION "" @@ -7393,10 +8322,10 @@ sshUserName OBJECT-TYPE sshUserType OBJECT-TYPE SYNTAX INTEGER - { - noCryptograph(0), - cryptograph(7) - } + { + noCryptograph(0), + cryptograph(7) + } MAX-ACCESS read-write STATUS current DESCRIPTION "" @@ -7411,11 +8340,11 @@ sshUserPassword OBJECT-TYPE sshUserStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION "" @@ -7441,13 +8370,13 @@ sshConnInfoEntry OBJECT-TYPE SshConnInfoEntry ::= SEQUENCE { sshConnID INTEGER, - sshConnVersion INTEGER, + sshConnVersion INTEGER, sshConnStatus INTEGER, sshConnUserName DisplayString } sshConnID OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..1000) MAX-ACCESS read-only STATUS current DESCRIPTION "The connection ID of the Secure Shell Connection." @@ -7489,7 +8418,7 @@ sshConnUserName OBJECT-TYPE -- Management for Terminal Access Controller Access Control System plus (TACACS+). --xxx.100.10.3 - tacacsMgt OBJECT IDENTIFIER ::= { prisecurity 3 } + tacacsMgt OBJECT IDENTIFIER ::= { prisecurity 3 } --******************************************************************************************************** @@ -7512,27 +8441,27 @@ tacacsServerHostEntry OBJECT-TYPE TacacsServerHostEntry ::= SEQUENCE { - tacacsServerHostIndex INTEGER, - tacacsServerHostIP IpAddress, - tacacsServerHostPort INTEGER, - tacacsServerHostPrimary INTEGER, - tacacsServerHostStatus INTEGER, - tacacsServerHostKey DisplayString, - tacacsServerHostTimeout INTEGER + tacacsServerHostIndex INTEGER, + tacacsServerHostIP DisplayString, + tacacsServerHostPort INTEGER, + tacacsServerHostPrimary INTEGER, + tacacsServerHostStatus INTEGER, + tacacsServerHostKey DisplayString, + tacacsServerHostTimeout INTEGER } tacacsServerHostIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (0..5) MAX-ACCESS not-accessible STATUS current DESCRIPTION "IP address of TACACS server." ::= { tacacsServerHostEntry 1 } tacacsServerHostIP OBJECT-TYPE - SYNTAX IpAddress + SYNTAX DisplayString (SIZE(1..39)) MAX-ACCESS read-write STATUS current - DESCRIPTION "IP address of TACACS server." + DESCRIPTION "IP or IPv6 address of TACACS server." ::= { tacacsServerHostEntry 2 } tacacsServerHostPort OBJECT-TYPE @@ -7545,8 +8474,8 @@ tacacsServerHostPort OBJECT-TYPE tacacsServerHostPrimary OBJECT-TYPE SYNTAX INTEGER { - noPrimary(0), - primary(1) + noPrimary(0), + primary(1) } MAX-ACCESS read-write STATUS current @@ -7556,9 +8485,9 @@ tacacsServerHostPrimary OBJECT-TYPE tacacsServerHostStatus OBJECT-TYPE SYNTAX INTEGER { - createAndGo(0), - active(1), - destroy(2) + createAndGo(0), + active(1), + destroy(2) } MAX-ACCESS read-write STATUS current @@ -7566,7 +8495,7 @@ tacacsServerHostStatus OBJECT-TYPE ::= { tacacsServerHostEntry 5 } tacacsServerHostKey OBJECT-TYPE - SYNTAX DisplayString (SIZE(1..16)) + SYNTAX DisplayString (SIZE(1..64)) MAX-ACCESS read-write STATUS current DESCRIPTION "Key for TACACS. Input space(' ') to clear this key" @@ -7589,7 +8518,7 @@ tacacsServerTimeout OBJECT-TYPE ::= { tacacsMgt 2 } tacacsServerKey OBJECT-TYPE - SYNTAX DisplayString (SIZE(1..16)) + SYNTAX DisplayString (SIZE(1..64)) MAX-ACCESS read-write STATUS current DESCRIPTION "Key for TACACS. Input space(' ') to clear this key" @@ -7599,7 +8528,7 @@ tacacsServerKey OBJECT-TYPE --******************************************************************************************************** --xxx.100.10.4 - am OBJECT IDENTIFIER ::= { prisecurity 4 } + am OBJECT IDENTIFIER ::= { prisecurity 4 } --******************************************************************************************************** @@ -7634,17 +8563,17 @@ amPortInfoEntry OBJECT-TYPE AmPortInfoEntry ::= SEQUENCE { - amPortIndex INTEGER, - amPortEnable INTEGER, - amPortForwardingType INTEGER, - amPortIp IpAddress, - amPortMac MacAddress, - amPortCount INTEGER, - amPortStatus INTEGER + amPortIndex INTEGER, + amPortEnable INTEGER, + amPortForwardingType INTEGER, + amPortIp IpAddress, + amPortMac MacAddress, + amPortCount INTEGER, + amPortStatus INTEGER } amPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION "port index" @@ -7662,8 +8591,8 @@ amPortEnable OBJECT-TYPE amPortForwardingType OBJECT-TYPE SYNTAX INTEGER{ - ip-pool(1), - mac-ip-pool(2) + ip-pool(1), + mac-ip-pool(2) } MAX-ACCESS read-write STATUS current @@ -7678,7 +8607,7 @@ amPortIp OBJECT-TYPE ::= { amPortInfoEntry 4 } amPortMac OBJECT-TYPE - SYNTAX MacAddress (SIZE(17)) + SYNTAX MacAddress MAX-ACCESS read-write STATUS current DESCRIPTION "Mac address of Access Management." @@ -7694,28 +8623,85 @@ amPortCount OBJECT-TYPE amPortStatus OBJECT-TYPE SYNTAX INTEGER { - createAndGo(0), - active(1), - destroy(2) + createAndGo(0), + active(1), + destroy(2) } MAX-ACCESS read-write STATUS current DESCRIPTION "" ::= { amPortInfoEntry 7 } + +--******************************************************************************************************** + +--xxx.100.10.4.3 +amPortStateTable OBJECT-TYPE + SYNTAX SEQUENCE OF AmPortStateEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Access Management information list of port am.." + ::= { am 3} + +--xxx.100.10.4.3.1 + amPortStateEntry OBJECT-TYPE + SYNTAX AmPortStateEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "entry for port am information." + INDEX { amIfIndex } + ::= { amPortStateTable 1 } + + + AmPortStateEntry::= SEQUENCE { + amIfIndex INTEGER, + amIfName DisplayString, + amIfState INTEGER + } + + amIfIndex OBJECT-TYPE + SYNTAX INTEGER (10000..20000) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "interface NO." + ::= { amPortStateEntry 1 } + + amIfName OBJECT-TYPE + SYNTAX DisplayString(SIZE(0..32)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "interface name." + ::= { amPortStateEntry 2 } + + amIfState OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "1:Enable;0:Disable" + ::= { amPortStateEntry 3 } --******************************************************************************************************** --******************************************************************************************************** --xxx.100.10.5 - radiusMgt OBJECT IDENTIFIER ::= { prisecurity 5 } + radiusMgt OBJECT IDENTIFIER ::= { prisecurity 5 } --******************************************************************************************************** aaaEnabled OBJECT-TYPE SYNTAX INTEGER { - enable(1), - disable(0) + enable(1), + disable(0) } MAX-ACCESS read-write STATUS current @@ -7725,8 +8711,8 @@ aaaEnabled OBJECT-TYPE aaaAccount OBJECT-TYPE SYNTAX INTEGER { - enable(1), - disable(0) + enable(1), + disable(0) } MAX-ACCESS read-write STATUS current @@ -7736,8 +8722,8 @@ aaaAccount OBJECT-TYPE aaaAccountUpdate OBJECT-TYPE SYNTAX INTEGER { - enable(1), - disable(0) + enable(1), + disable(0) } MAX-ACCESS read-write STATUS current @@ -7747,8 +8733,8 @@ aaaAccountUpdate OBJECT-TYPE aaaAccountBindingDHCP OBJECT-TYPE SYNTAX INTEGER { - enable(1), - disable(0) + enable(1), + disable(0) } MAX-ACCESS read-write STATUS current @@ -7775,17 +8761,17 @@ radiusAuthenServerHostEntry OBJECT-TYPE RadiusAuthenServerHostEntry ::= SEQUENCE { - radiusAuthenServerHostIndex INTEGER, - radiusAuthenServerHostIP DisplayString, - radiusAuthenServerHostPort INTEGER, - radiusAutServerHostKey DisplayString, - radiusAuthenServerHostPrimary INTEGER, + radiusAuthenServerHostIndex INTEGER, + radiusAuthenServerHostIP DisplayString, + radiusAuthenServerHostPort INTEGER, + radiusAutServerHostKey DisplayString, + radiusAuthenServerHostPrimary INTEGER, radiusAutServerHostAccessMode INTEGER, - radiusAuthenServerHostStatus INTEGER + radiusAuthenServerHostStatus INTEGER } radiusAuthenServerHostIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (0..32) MAX-ACCESS not-accessible STATUS current DESCRIPTION "Index of RADIUS authentication server." @@ -7815,8 +8801,8 @@ radiusAutServerHostKey OBJECT-TYPE radiusAuthenServerHostPrimary OBJECT-TYPE SYNTAX INTEGER { - noPrimary(0), - primary(1) + noPrimary(0), + primary(1) } MAX-ACCESS read-write STATUS current @@ -7827,8 +8813,8 @@ radiusAutServerHostAccessMode OBJECT-TYPE SYNTAX INTEGER { none(0), - dot1x(1), - telnet(2) + dot1x(1), + telnet(2) } MAX-ACCESS read-write STATUS current @@ -7837,9 +8823,9 @@ radiusAutServerHostAccessMode OBJECT-TYPE radiusAuthenServerHostStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) + { + active(1), + destroy(2) } MAX-ACCESS read-write STATUS current @@ -7866,16 +8852,16 @@ radiusAcctServerHostEntry OBJECT-TYPE RadiusAcctServerHostEntry ::= SEQUENCE { - radiusAcctServerHostIndex INTEGER, - radiusAcctServerHostIP DisplayString, - radiusAcctServerHostPort INTEGER, - radiusAcctServerHostKey DisplayString, - radiusAcctServerHostPrimary INTEGER, - radiusAcctServerHostStatus INTEGER + radiusAcctServerHostIndex INTEGER, + radiusAcctServerHostIP DisplayString, + radiusAcctServerHostPort INTEGER, + radiusAcctServerHostKey DisplayString, + radiusAcctServerHostPrimary INTEGER, + radiusAcctServerHostStatus INTEGER } radiusAcctServerHostIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (0..32) MAX-ACCESS not-accessible STATUS current DESCRIPTION "Index of RADIUS accounting server." @@ -7902,11 +8888,11 @@ radiusAcctServerHostKey OBJECT-TYPE DESCRIPTION "Key for RADIUS accounting server. Input space(' ') to clear this key" ::= { radiusAcctServerHostEntry 4 } -radiusAcctServerHostPrimary OBJECT-TYPE +radiusAcctServerHostPrimary OBJECT-TYPE SYNTAX INTEGER { - noPrimary(0), - primary(1) + noPrimary(0), + primary(1) } MAX-ACCESS read-write STATUS current @@ -7915,9 +8901,9 @@ radiusAcctServerHostPrimary OBJECT-TYPE radiusAcctServerHostStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) + { + active(1), + destroy(2) } MAX-ACCESS read-write STATUS current @@ -7970,12 +8956,47 @@ radiusServerNasIpv6 OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION "Radius server nas IPv6. Input 0 to delete nas IPv6 address" - ::= { radiusMgt 13 } + ::= { radiusMgt 13 } +--******************************************************************************************************** +--******************************************************************************************************** + +--xxx.100.10.6 + authenLineConf OBJECT IDENTIFIER ::= { prisecurity 6 } + +--xxx.100.10.6.1 +consoleLoginMethod OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "console login method and priority.0: no authentication 1: loccal 2: radius 3:tacacs, null: default. + for example: if you want to configure 'local tacacs radius',you should configure '132',and if you want to restore the default configuration,you should not enter any characters." + ::= { authenLineConf 1 } + +--xxx.100.11.6.2 +vtyLoginMethod OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "vty login method and priority.0: no authentication 1: loccal 2: radius 3:tacacs, null: default. + for example: if you want to configure 'local tacacs radius',you should configure '132',and if you want to restore the default configuration,you should not enter any characters." + ::= { authenLineConf 2 } + +--xxx.100.11.6.3 +webLoginMethod OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "web login method and priority.0: no authentication 1: loccal 2: radius 3:tacacs, null: default. + for example: if you want to configure 'local tacacs radius',you should configure '132',and if you want to restore the default configuration,you should not enter any characters." + ::= { authenLineConf 3 } --******************************************************************************************************** -- (xxx.100.11) priQos group --xxx.100.11.1 - qos OBJECT IDENTIFIER ::= { priQos 1 } + qos OBJECT IDENTIFIER ::= { priQos 1 } --******************************************************************************************************** @@ -8015,19 +9036,19 @@ qosPortTable OBJECT-TYPE QosPortEntry ::= SEQUENCE { - qosPortIndex INTEGER, - qosPortType INTEGER, - qosPortCos INTEGER, - qosPortTrust INTEGER, - qosPortPriority INTEGER, - qosPortMutation DisplayString, - qosPortQueue INTEGER, - qosPortStatus INTEGER + qosPortIndex INTEGER, + qosPortType INTEGER, + qosPortCos INTEGER, + qosPortTrust INTEGER, + qosPortPriority INTEGER, + qosPortMutation DisplayString, + qosPortQueue INTEGER, + qosPortStatus INTEGER } --xxx.100.11.1.2.1.1 qosPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -8038,22 +9059,22 @@ qosPortIndex OBJECT-TYPE qosPortType OBJECT-TYPE SYNTAX INTEGER { - cos(1), - trust(0), - dscpMutation(2), - priorityQueueOut(3) - } + cos(1), + trust(0), + dscpMutation(2), + priorityQueueOut(3) + } MAX-ACCESS read-create STATUS current DESCRIPTION "the relation between qosPortType and CLI: - 1 mls qos cos { }; - 0 mls qos trust {cos [pass-through-cos] [pass-through-dscp]|dscp [pass-through-cos] [pass-through-dscp]| ip-precedence [pass-through-cos] [pass-through-dscp] |port priority [pass-through-cos] [pass-through-dscp]} ; - 2 mls qos dscp-mutation ; - 3 priority-queue out. - According to the relation,when configurate qos with snmp,first set the qosPortType to the correct value to select CLI, - then set next CLI parameter.Fox example,set qos default cos is 5, first set qosPortType=1 ,then set qosPortCos to 5, - finally setting qosPortStatus to 1, trigger snmp-cache works." + 1 mls qos cos { }; + 0 mls qos trust {cos [pass-through-cos] [pass-through-dscp]|dscp [pass-through-cos] [pass-through-dscp]| ip-precedence [pass-through-cos] [pass-through-dscp] |port priority [pass-through-cos] [pass-through-dscp]} ; + 2 mls qos dscp-mutation ; + 3 priority-queue out. + According to the relation,when configurate qos with snmp,first set the qosPortType to the correct value to select CLI, + then set next CLI parameter.Fox example,set qos default cos is 5, first set qosPortType=1 ,then set qosPortCos to 5, + finally setting qosPortStatus to 1, trigger snmp-cache works." ::= { qosPortEntry 2 } --xxx.100.11.1.2.1.3 @@ -8068,25 +9089,25 @@ qosPortCos OBJECT-TYPE --xxx.100.11.1.2.1.4 qosPortTrust OBJECT-TYPE SYNTAX INTEGER - { - priority(0), - priAndPassThroughDscp(1), - priAndPassThroughCos(2), - priAndPassThroughCosAndPassThroughDscp(3), - cos(4), - cosAndPassThroughDscp(5), - cosAndPassThroughCos(6), - cosAndPassThroughCosAndPassThroughDscp(7), - dscp(8), - dscpAndPassThroughCos(9), - dscpAndPassThroughDscp(10), - dscpAndPassThroughDscpAndPassThroughCos(11), - ipPrecedence(12), - ipPreAndPassThroughCos(13), - ipPreAndPassThroughDSCP(14), - ipPreAndPassThroughDSCPAndPassThroughCos(15), - mplsEXP(16) - } + { + priority(0), + priAndPassThroughDscp(1), + priAndPassThroughCos(2), + priAndPassThroughCosAndPassThroughDscp(3), + cos(4), + cosAndPassThroughDscp(5), + cosAndPassThroughCos(6), + cosAndPassThroughCosAndPassThroughDscp(7), + dscp(8), + dscpAndPassThroughCos(9), + dscpAndPassThroughDscp(10), + dscpAndPassThroughDscpAndPassThroughCos(11), + ipPrecedence(12), + ipPreAndPassThroughCos(13), + ipPreAndPassThroughDSCP(14), + ipPreAndPassThroughDSCPAndPassThroughCos(15), + mplsEXP(16) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -8095,19 +9116,19 @@ qosPortTrust OBJECT-TYPE priAndPassThroughDscp(1),opposite cli is mls qos trust port priority pass-through-dscp; priAndPassThroughCos(2),opposite cli is mls qos trust port priority pass-through-cos; priAndPassThroughCosAndPassThroughDscp(3),opposite cli is mls qos trust port priority pass-through-cos pass-through-dscp; - cos(4),mls qos trust cos; - cosAndPassThroughDscp(5),opposite cli is mls qos trust cos pass-through-dscp; - cosAndPassThroughCos(6),opposite cli is mls qos trust cos pass-through-cos; - cosAndPassThroughCosAndPassThroughDscp(7),opposite cli is mls qos trust cos pass-through-cos pass-through-dscp; - dscp(8),mls qos trust dscp; - dscpAndPassThroughCos(9),opposite cli is mls qos trust dscp pass-through-cos; - dscpAndPassThroughDscp(10),opposite cli is mls qos trust dscp pass-through-dscp; - dscpAndPassThroughDscpAndPassThroughCos(11),opposite cli is mls qos trust dscp pass-through-dscp pass-through-cos; - ipPrecedence(12), mls qos trust ip-precedence; - ipPreAndPassThroughCos(13),opposite cli is mls qos trust ip-precedence pass-through-cos; - ipPreAndPassThroughDSCP(14),opposite cli is mls qos trust ip-precedence pass-through-dscp; - ipPreAndPassThroughDSCPAndPassThroughCos(15),opposite cli is mls qos trust ip-precedence pass-through-dscp pass-through-cos; - mplsEXP(16),mls qos mpls trust exp." + cos(4),mls qos trust cos; + cosAndPassThroughDscp(5),opposite cli is mls qos trust cos pass-through-dscp; + cosAndPassThroughCos(6),opposite cli is mls qos trust cos pass-through-cos; + cosAndPassThroughCosAndPassThroughDscp(7),opposite cli is mls qos trust cos pass-through-cos pass-through-dscp; + dscp(8),mls qos trust dscp; + dscpAndPassThroughCos(9),opposite cli is mls qos trust dscp pass-through-cos; + dscpAndPassThroughDscp(10),opposite cli is mls qos trust dscp pass-through-dscp; + dscpAndPassThroughDscpAndPassThroughCos(11),opposite cli is mls qos trust dscp pass-through-dscp pass-through-cos; + ipPrecedence(12), mls qos trust ip-precedence; + ipPreAndPassThroughCos(13),opposite cli is mls qos trust ip-precedence pass-through-cos; + ipPreAndPassThroughDSCP(14),opposite cli is mls qos trust ip-precedence pass-through-dscp; + ipPreAndPassThroughDSCPAndPassThroughCos(15),opposite cli is mls qos trust ip-precedence pass-through-dscp pass-through-cos; + mplsEXP(16),mls qos mpls trust exp." ::= { qosPortEntry 4 } --xxx.100.11.1.2.1.5 @@ -8125,16 +9146,16 @@ qosPortMutation OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "configure port of dscp-mutation,opposite cli 'mls qos dscp-mutation '" + "configure port of dscp-mutation,opposite cli 'mls qos dscp-mutation '" ::= { qosPortEntry 6 } --xxx.100.11.1.2.1.7 qosPortQueue OBJECT-TYPE SYNTAX INTEGER - { - priorityQueue(0), - wrrQueue(1) - } + { + priorityQueue(0), + wrrQueue(1) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -8145,10 +9166,10 @@ qosPortMutation OBJECT-TYPE --xxx.100.11.1.2.1.8 qosPortStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -8167,7 +9188,7 @@ qosClassMapTable OBJECT-TYPE ::= { qos 3 } --xxx.100.11.1.3.1 - qosclassmapEntry OBJECT-TYPE + qosClassMapEntry OBJECT-TYPE SYNTAX QosClassMapEntry MAX-ACCESS not-accessible STATUS current @@ -8179,18 +9200,18 @@ qosClassMapTable OBJECT-TYPE QosClassMapEntry ::= SEQUENCE { - qosClassMapName DisplayString, - qosClassMapType INTEGER, - qosClassMapAccessGroup DisplayString, - qosClassMapDscp DisplayString, - qosClassMapV6Dscp DisplayString, - qosClassMapIpPre DisplayString, - qosClassMapV6AccGroup DisplayString, - qosClassMapV6Flow DisplayString, - qosClassMapVlan DisplayString, - qosClassCos DisplayString, + qosClassMapName DisplayString, + qosClassMapType INTEGER, + qosClassMapAccessGroup DisplayString, + qosClassMapDscp DisplayString, + qosClassMapV6Dscp DisplayString, + qosClassMapIpPre DisplayString, + qosClassMapV6AccGroup DisplayString, + qosClassMapV6Flow DisplayString, + qosClassMapVlan DisplayString, + qosClassCos DisplayString, qosClassMapEXPtopmost DisplayString, - qosClassMapStatus INTEGER + qosClassMapStatus INTEGER } --xxx.100.11.1.3.1.1 @@ -8200,37 +9221,37 @@ qosClassMapTable OBJECT-TYPE STATUS current DESCRIPTION "classmap name" - ::= { qosclassmapEntry 1} + ::= { qosClassMapEntry 1} --xxx.100.11.1.3.1.2 qosClassMapType OBJECT-TYPE SYNTAX INTEGER - { - configurClassMap(0), - accessGroup(1), - dscp(2), - v6dscp(5), - ippre(3), - v6AccessGroup(8), - v6Flow(7), - vlan(4), - cos(9), - exptopmost(10) - } + { + configurClassMap(0), + accessGroup(1), + dscp(2), + v6dscp(5), + ippre(3), + v6AccessGroup(8), + v6Flow(7), + vlan(4), + cos(9), + exptopmost(10) + } MAX-ACCESS read-create STATUS current DESCRIPTION - "0 class-map ,index is classmapname; - 1 match access-group ,need qosClassMapAccessGroup cooperation; - 2 match ip dscp qosClassMapDscp ; - 3 match ip precedence qosClassMapIpPre; - 4 match vlan qosClassMapVlan; - 5 match ipv6 dscp qosClassMapV6Dscp; - 7 match ipv6 flowlabel qosClassMapV6Flow; - 8 match ipv6 access-group qosClassMapV6AccGroup - 9 match cos qosClassCos - 10 match mpls-experimental topmost qosClassMapEXPtopmost" - ::= { qosclassmapEntry 2 } + "0 class-map ,index is classmapname; + 1 match access-group ,need qosClassMapAccessGroup cooperation; + 2 match ip dscp qosClassMapDscp ; + 3 match ip precedence qosClassMapIpPre; + 4 match vlan qosClassMapVlan; + 5 match ipv6 dscp qosClassMapV6Dscp; + 7 match ipv6 flowlabel qosClassMapV6Flow; + 8 match ipv6 access-group qosClassMapV6AccGroup + 9 match cos qosClassCos + 10 match mpls-experimental topmost qosClassMapEXPtopmost" + ::= { qosClassMapEntry 2 } --xxx.100.11.1.3.1.3 qosClassMapAccessGroup OBJECT-TYPE @@ -8241,7 +9262,7 @@ qosClassMapTable OBJECT-TYPE "Match specify access-group (name or number). This object be configured only if qosClassMapType in the same row is accessGroup(1)." - ::= { qosclassmapEntry 3 } + ::= { qosClassMapEntry 3 } --xxx.100.11.1.3.1.4 qosClassMapDscp OBJECT-TYPE @@ -8252,7 +9273,7 @@ qosClassMapTable OBJECT-TYPE "Match specify Dscp. This object be configured only if qosClassMapType in the same row is dscp(2)." - ::= { qosclassmapEntry 4 } + ::= { qosClassMapEntry 4 } --xxx.100.11.1.3.1.5 qosClassMapV6Dscp OBJECT-TYPE @@ -8263,7 +9284,7 @@ qosClassMapTable OBJECT-TYPE "Match specify ipv6 Dscp. This object be configured only if qosClassMapType in the same row is v6dscp(5)." - ::= { qosclassmapEntry 5 } + ::= { qosClassMapEntry 5 } --xxx.100.11.1.3.1.6 qosClassMapIpPre OBJECT-TYPE @@ -8274,7 +9295,7 @@ qosClassMapTable OBJECT-TYPE "Match specify Ip Precedence. This object be configured only if qosClassMapType in the same row is ippre(3)." - ::= { qosclassmapEntry 6 } + ::= { qosClassMapEntry 6 } --xxx.100.11.1.3.1.7 qosClassMapV6AccGroup OBJECT-TYPE @@ -8285,7 +9306,7 @@ qosClassMapTable OBJECT-TYPE "Match specify Ipv6 Access-Group. This object be configured only if qosClassMapType in the same row is v6AccessGroup(8)." - ::= { qosclassmapEntry 7 } + ::= { qosClassMapEntry 7 } --xxx.100.11.1.3.1.8 qosClassMapV6Flow OBJECT-TYPE @@ -8296,7 +9317,7 @@ qosClassMapTable OBJECT-TYPE "Match specify Ipv6 Flowlabel. This object be configured only if qosClassMapType in the same row is v6Flow(6)." - ::= { qosclassmapEntry 8 } + ::= { qosClassMapEntry 8 } --xxx.100.11.1.3.1.9 qosClassMapVlan OBJECT-TYPE @@ -8307,7 +9328,7 @@ qosClassMapTable OBJECT-TYPE "Match specify Vlan list . At most 8 vlan id. This object be configured only if qosClassMapType in the same row is vlan(4)." - ::= { qosclassmapEntry 9 } + ::= { qosClassMapEntry 9 } --xxx.100.11.1.3.1.10 qosClassCos OBJECT-TYPE @@ -8318,31 +9339,31 @@ qosClassMapTable OBJECT-TYPE "Match specify Cos . This object be configured only if qosClassMapType in the same row is cos(9)." - ::= { qosclassmapEntry 10 } + ::= { qosClassMapEntry 10 } --xxx.100.11.1.3.1.11 - qosClassMapEXPtopmost OBJECT-TYPE - SYNTAX DisplayString - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Match specify MPLS EXP. - This object be configured only if qosClassMapType - in the same row is EXPtopmost(10)." - ::= { qosclassmapEntry 11 } + qosClassMapEXPtopmost OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Match specify MPLS EXP. + This object be configured only if qosClassMapType + in the same row is EXPtopmost(10)." + ::= { qosClassMapEntry 11 } --xxx.100.11.1.3.1.12 qosClassMapStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION " Setting it to active(1) to creates an entry,setting it to destroy(2) to destroy an entry." - ::= { qosclassmapEntry 12 } + ::= { qosClassMapEntry 12 } --******************************************************************************************************** @@ -8368,19 +9389,19 @@ qosPolicyTable OBJECT-TYPE QosPolicyEntry ::= SEQUENCE { - qosPolicyName DisplayString, - qosPolicyClassMap DisplayString, - qosPolicyType INTEGER, - qosPolicyRateKbps INTEGER, - qosPolicyNormalBurstKbps INTEGER, - qosPolicyMaximumBurstKbps INTEGER, - qosPolicyPeakKbps INTEGER, - qosPolicyConformAction INTEGER, - qosPolicyConformActionChangeValue INTEGER, - qosPolicyExceedAction INTEGER, - qosPolicyViolateAction INTEGER, - qosPolicyAggregatePolicer DisplayString, - qosPolicyStatus INTEGER + qosPolicyName DisplayString, + qosPolicyClassMap DisplayString, + qosPolicyType INTEGER, + qosPolicyRateKbps INTEGER, + qosPolicyNormalBurstKbps INTEGER, + qosPolicyMaximumBurstKbps INTEGER, + qosPolicyPeakKbps INTEGER, + qosPolicyConformAction INTEGER, + qosPolicyConformActionChangeValue INTEGER, + qosPolicyExceedAction INTEGER, + qosPolicyViolateAction INTEGER, + qosPolicyAggregatePolicer DisplayString, + qosPolicyStatus INTEGER } --xxx.100.11.1.4.1.1 @@ -8405,21 +9426,21 @@ qosPolicyTable OBJECT-TYPE --xxx.100.11.1.4.1.3 qosPolicyType OBJECT-TYPE - SYNTAX INTEGER - { - policymap(0), - matchclassmap(1), - sp(2), - aggregatePolicer(3) - } + SYNTAX INTEGER + { + policymap(0), + matchclassmap(1), + sp(2), + aggregatePolicer(3) + } MAX-ACCESS read-create STATUS current DESCRIPTION "the relation between qosPolicyType and CLI: - 0 policy-map ; - 1 class ; - 2 police [exceed-action {drop | policed-dscp-transmit}]; - 3 police aggregate ; " + 0 policy-map ; + 1 class ; + 2 police [exceed-action {drop | policed-dscp-transmit}]; + 3 police aggregate ; " ::= { qosPolicyEntry 3 } --xxx.100.11.1.4.1.4 @@ -8463,12 +9484,12 @@ qosPolicyTable OBJECT-TYPE --xxx.100.11.1.4.1.8 qosPolicyConformAction OBJECT-TYPE SYNTAX INTEGER - { - transmit(0), - drop(1), - set-dscp-transmit(2), - set-prec-transmit(3) - } + { + transmit(0), + drop(1), + set-dscp-transmit(2), + set-prec-transmit(3) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -8493,11 +9514,11 @@ qosPolicyTable OBJECT-TYPE --xxx.100.11.1.4.1.10 qosPolicyExceedAction OBJECT-TYPE SYNTAX INTEGER - { - transmit(0), - drop(1), - policeDscpTransmit(2) - } + { + transmit(0), + drop(1), + policeDscpTransmit(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -8510,11 +9531,11 @@ qosPolicyTable OBJECT-TYPE --xxx.100.11.1.4.1.11 qosPolicyViolateAction OBJECT-TYPE SYNTAX INTEGER - { - transmit(0), - drop(1), - policeDscpTransmit(2) - } + { + transmit(0), + drop(1), + policeDscpTransmit(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -8538,10 +9559,10 @@ qosPolicyTable OBJECT-TYPE --xxx.100.11.1.4.1.13 qosPolicyStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -8573,16 +9594,16 @@ qosAggPolicerTable OBJECT-TYPE QosAggPolicerEntry ::= SEQUENCE { - qosAggPolicerName DisplayString, - qosAggPolicerRateKbps INTEGER, - qosAggPolicerNormalBurstKbps INTEGER, - qosAggPolicerMaximumBurstKbps INTEGER, - qosAggPolicerPeakKbps INTEGER, - qosAggPolicerConformAction INTEGER, - qosAggPolicerConformActionChangeValue INTEGER, - qosAggPolicerExceedAction INTEGER, - qosAggPolicerViolateAction INTEGER, - qosAggPolicerStatus INTEGER + qosAggPolicerName DisplayString, + qosAggPolicerRateKbps INTEGER, + qosAggPolicerNormalBurstKbps INTEGER, + qosAggPolicerMaximumBurstKbps INTEGER, + qosAggPolicerPeakKbps INTEGER, + qosAggPolicerConformAction INTEGER, + qosAggPolicerConformActionChangeValue INTEGER, + qosAggPolicerExceedAction INTEGER, + qosAggPolicerViolateAction INTEGER, + qosAggPolicerStatus INTEGER } --xxx.100.11.1.5.1.1 @@ -8633,12 +9654,12 @@ qosAggPolicerTable OBJECT-TYPE --xxx.100.11.1.5.1.6 qosAggPolicerConformAction OBJECT-TYPE SYNTAX INTEGER - { - transmit(0), - drop(1), - set-dscp-transmit(2), - set-prec-transmit(3) - } + { + transmit(0), + drop(1), + set-dscp-transmit(2), + set-prec-transmit(3) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -8663,11 +9684,11 @@ qosAggPolicerTable OBJECT-TYPE --xxx.100.11.1.5.1.8 qosAggPolicerExceedAction OBJECT-TYPE SYNTAX INTEGER - { - transmit(0), - drop(1), - policeDscpTransmit(2) - } + { + transmit(0), + drop(1), + policeDscpTransmit(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -8680,11 +9701,11 @@ qosAggPolicerTable OBJECT-TYPE --xxx.100.11.1.5.1.9 qosAggPolicerViolateAction OBJECT-TYPE SYNTAX INTEGER - { - transmit(0), - drop(1), - policeDscpTransmit(2) - } + { + transmit(0), + drop(1), + policeDscpTransmit(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -8697,10 +9718,10 @@ qosAggPolicerTable OBJECT-TYPE --xxx.100.11.1.5.1.10 qosAggPolicerStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -8731,18 +9752,18 @@ qosSetTable OBJECT-TYPE QosSetEntry ::= SEQUENCE { - qosSetPolicyMapName DisplayString, - qosSetClassMapName DisplayString, - qosSetType INTEGER, - qosSetdscp INTEGER, - qosSetprecedence INTEGER, - qosSetnextHop IpAddress, - qosSetv6Dscp INTEGER, - qosSetv6FlowLabel INTEGER, - qosSetv6nextHop DisplayString, - qosSetCos INTEGER, - qosSetEXPimposition INTEGER, - qosSetStatus INTEGER + qosSetPolicyMapName DisplayString, + qosSetClassMapName DisplayString, + qosSetType INTEGER, + qosSetdscp INTEGER, + qosSetprecedence INTEGER, + qosSetnextHop IpAddress, + qosSetv6Dscp INTEGER, + qosSetv6FlowLabel INTEGER, + qosSetv6nextHop DisplayString, + qosSetCos INTEGER, + qosSetEXPimposition INTEGER, + qosSetStatus INTEGER } --xxx.100.11.1.6.1.1 @@ -8766,16 +9787,16 @@ qosSetTable OBJECT-TYPE --xxx.100.11.1.6.1.3 qosSetType OBJECT-TYPE SYNTAX INTEGER - { - dscp(1), - precedence(2), - nextHop(3), - v6Dscp(4), - v6FlowLabel(6), - v6nextHop(7), - cos(8), - expimposition(9) - } + { + dscp(1), + precedence(2), + nextHop(3), + v6Dscp(4), + v6FlowLabel(6), + v6nextHop(7), + cos(8), + expimposition(9) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -8785,9 +9806,9 @@ qosSetTable OBJECT-TYPE 3 nexthop Set IP nexthop; 4 dscp Set IPv6 DSCP (DiffServ CodePoints); 6 flowlabel Set IPv6 flowlabel; - 7 v6nextHop Set IPv6 nexthop; + 7 v6nextHop Set IPv6 nexthop; 8 cos Set CoS ; - 9 expimposition Set mpls-experimental-imposition " + 9 expimposition Set mpls-experimental-imposition " ::= { qosSetEntry 3 } --xxx.100.11.1.6.1.4 @@ -8865,10 +9886,10 @@ qosSetTable OBJECT-TYPE --xxx.100.11.1.6.1.12 qosSetStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -8899,14 +9920,14 @@ qosPortBindTable OBJECT-TYPE QosPortBindEntry ::= SEQUENCE { - qosPortBindIndex INTEGER, - qosPortBindPolicy DisplayString, - qosPortBindType INTEGER - } - + qosPortBindIndex INTEGER, + qosPortBindPolicy DisplayString, + qosPortBindType INTEGER + } + --xxx.100.11.1.7.1.1 qosPortBindIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -8925,19 +9946,19 @@ qosPortBindTable OBJECT-TYPE --xxx.100.11.1.7.1.3 qosPortBindType OBJECT-TYPE SYNTAX INTEGER - { - input(1), - output(2), - noinput(3), - nooutput(4) - } + { + input(1), + output(2), + noinput(3), + nooutput(4) + } MAX-ACCESS read-create STATUS current DESCRIPTION " input(1),bind the policy-map to ingress port; - output(2),bind the policy-map to egress port; - noinput(3),unbind the policy-map to ingress port; - nooutput(4), unbind the policy-map to egress port" + output(2),bind the policy-map to egress port; + noinput(3),unbind the policy-map to ingress port; + nooutput(4), unbind the policy-map to egress port" ::= { qosPortBindEntry 3 } --******************************************************************************************************** @@ -8964,21 +9985,21 @@ qosPortQueueTable OBJECT-TYPE QosPortQueueEntry ::= SEQUENCE { - qosPortQueueIndex INTEGER, - qosPortQueueWeight1 INTEGER, - qosPortQueueWeight2 INTEGER, - qosPortQueueWeight3 INTEGER, - qosPortQueueWeight4 INTEGER, - qosPortQueueWeight5 INTEGER, - qosPortQueueWeight6 INTEGER, - qosPortQueueWeight7 INTEGER, - qosPortQueueWeight8 INTEGER, - qosPortQueueStatus INTEGER - } - + qosPortQueueIndex INTEGER, + qosPortQueueWeight1 INTEGER, + qosPortQueueWeight2 INTEGER, + qosPortQueueWeight3 INTEGER, + qosPortQueueWeight4 INTEGER, + qosPortQueueWeight5 INTEGER, + qosPortQueueWeight6 INTEGER, + qosPortQueueWeight7 INTEGER, + qosPortQueueWeight8 INTEGER, + qosPortQueueStatus INTEGER + } + --xxx.100.11.1.8.1.1 qosPortQueueIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -9060,10 +10081,10 @@ qosPortQueueTable OBJECT-TYPE --xxx.100.11.1.8.1.10 qosPortQueueStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -9071,37 +10092,37 @@ qosPortQueueTable OBJECT-TYPE ::= { qosPortQueueEntry 10 } --******************************************************************************************************** - + --******************************************************************************************************** --xxx.100.11.1.10 - qosMap OBJECT IDENTIFIER ::= { qos 10 } + qosMap OBJECT IDENTIFIER ::= { qos 10 } --set class of service(CoS)-to-Differentiated Services Code Point (DSCP) map,DSCP-to-CoS map,DSCP-to-DSCP-mutation map,IP-precedence-to-DSCP map and policed-DSCP map --xxx.100.11.1.10.1 qosMapType OBJECT-TYPE SYNTAX INTEGER - { - cosDscp(1), - dscpCos(2), - dscpMutation(3), - ipPrecDscp(4), - policedDscp(5), - expdscp(6), - dscpexp(7) - } + { + cosDscp(1), + dscpCos(2), + dscpMutation(3), + ipPrecDscp(4), + policedDscp(5), + expdscp(6), + dscpexp(7) + } MAX-ACCESS read-create STATUS current DESCRIPTION - "qosMapType range is 1~5.1 mls qos map cos-dscp ; - 2 mls qos map dscp-cos to ; - 3 mls qos map dscp-mutation to ; - 4 mls qos map ip-prec-dscp ; - 5 mls qos map policed-dscp to ; - 6 mls qos map exp-dscp ; - 7 mls qos map dscp-exp to - When you want to configure the Map of DSCP to COS,please configure the qosMapType==2 firstly, - input the dscp(1~8) optionally, then configure the qosMapCos , valid/invalid the qosMapStatus finally." - + "qosMapType range is 1~5.1 mls qos map cos-dscp ; + 2 mls qos map dscp-cos to ; + 3 mls qos map dscp-mutation to ; + 4 mls qos map ip-prec-dscp ; + 5 mls qos map policed-dscp to ; + 6 mls qos map exp-dscp ; + 7 mls qos map dscp-exp to + When you want to configure the Map of DSCP to COS,please configure the qosMapType==2 firstly, + input the dscp(1~8) optionally, then configure the qosMapCos , valid/invalid the qosMapStatus finally." + ::= { qosMap 1 } --xxx.100.11.1.10.2 @@ -9206,9 +10227,9 @@ qosPortQueueTable OBJECT-TYPE qosMapMarkDownType OBJECT-TYPE SYNTAX INTEGER { - normal-burst(0), - max-burst(1) - } + normal-burst(0), + max-burst(1) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -9235,10 +10256,10 @@ qosPortQueueTable OBJECT-TYPE --xxx.100.11.1.10.16 qosMapStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -9247,7 +10268,7 @@ qosPortQueueTable OBJECT-TYPE --xxx.100.11 - showqos OBJECT IDENTIFIER ::= { qos 11 } + showqos OBJECT IDENTIFIER ::= { qos 11 } --xxx.100.16.2.1 showclassmapTable OBJECT-TYPE @@ -9271,8 +10292,8 @@ showclassmapEntry OBJECT-TYPE ShowclassmapEntry ::= SEQUENCE { - showclassmapname DisplayString, - showclassmapmatch DisplayString + showclassmapname DisplayString, + showclassmapmatch DisplayString } --xxx.100.16.2.1.1.1 @@ -9286,7 +10307,7 @@ showclassmapname OBJECT-TYPE --xxx.100.16.2.1.1.2 showclassmapmatch OBJECT-TYPE - SYNTAX DisplayString (SIZE(1..512)) + SYNTAX DisplayString (SIZE(1..512)) MAX-ACCESS read-only STATUS current DESCRIPTION "one item classmap match rule" @@ -9315,8 +10336,8 @@ showpolicymapEntry OBJECT-TYPE ShowpolicymapEntry ::= SEQUENCE { - showpolicymapname DisplayString, - showpolicymapcontent DisplayString + showpolicymapname DisplayString, + showpolicymapcontent DisplayString } --xxx.100.16.2.1.1.1 @@ -9330,7 +10351,7 @@ showpolicymapname OBJECT-TYPE --xxx.100.16.2.1.1.2 showpolicymapcontent OBJECT-TYPE - SYNTAX DisplayString (SIZE(1..512)) + SYNTAX DisplayString (SIZE(1..512)) MAX-ACCESS read-only STATUS current DESCRIPTION "the match classmap and all defined other rules" @@ -9359,8 +10380,8 @@ showqosaggregatepolicerEntry OBJECT-TYPE ShowqosaggregatepolicerEntry ::= SEQUENCE { - showqosaggregatepolicername DisplayString, - showqosaggregatepolicercontent DisplayString + showqosaggregatepolicername DisplayString, + showqosaggregatepolicercontent DisplayString } --xxx.100.16.2.1.1.1 @@ -9374,7 +10395,7 @@ showqosaggregatepolicername OBJECT-TYPE --xxx.100.16.2.1.1.2 showqosaggregatepolicercontent OBJECT-TYPE - SYNTAX DisplayString (SIZE(1..512)) + SYNTAX DisplayString (SIZE(1..512)) MAX-ACCESS read-only STATUS current DESCRIPTION "aggregatepolicer parameter" @@ -9403,13 +10424,13 @@ showmlsqosinterfaceEntry OBJECT-TYPE ShowmlsqosinterfaceEntry ::= SEQUENCE { - showmlsqosinterfaceIndex INTEGER, - showmlsqosinterfaceqoscontent DisplayString + showmlsqosinterfaceIndex INTEGER, + showmlsqosinterfaceqoscontent DisplayString } --xxx.100.16.2.1.1.1 showmlsqosinterfaceIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -9418,18 +10439,18 @@ showmlsqosinterfaceIndex OBJECT-TYPE --xxx.100.16.2.1.1.2 showmlsqosinterfaceqoscontent OBJECT-TYPE - SYNTAX DisplayString (SIZE(1..512)) + SYNTAX DisplayString (SIZE(1..512)) MAX-ACCESS read-only STATUS current DESCRIPTION "qos port configuration" ::= { showmlsqosinterfaceEntry 2 } --xxx.100.9 - showmlsqosmaps OBJECT IDENTIFIER ::= { showqos 5 } + showmlsqosmaps OBJECT IDENTIFIER ::= { showqos 5 } --xxx.100.16.1.1 showmlsqosmapscosdscp OBJECT-TYPE - SYNTAX DisplayString (SIZE(1..512)) + SYNTAX DisplayString (SIZE(1..512)) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -9446,7 +10467,7 @@ showmlsqosinterfaceqoscontent OBJECT-TYPE ::= { showmlsqosmaps 2 } --xxx.100.16.1.3 showmlsqosmapsdscpcos OBJECT-TYPE - SYNTAX DisplayString (SIZE(1..512)) + SYNTAX DisplayString (SIZE(1..512)) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -9463,7 +10484,7 @@ showmlsqosinterfaceqoscontent OBJECT-TYPE ::= { showmlsqosmaps 4 } --xxx.100.16.1.5 showmlsqosmapspoliceddscp OBJECT-TYPE - SYNTAX DisplayString (SIZE(1..512)) + SYNTAX DisplayString (SIZE(1..512)) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -9472,7 +10493,7 @@ showmlsqosinterfaceqoscontent OBJECT-TYPE --xxx.100.16.1.6 showmlsqosmapspoliceddscpnormalburst OBJECT-TYPE - SYNTAX DisplayString (SIZE(1..512)) + SYNTAX DisplayString (SIZE(1..512)) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -9481,7 +10502,7 @@ showmlsqosinterfaceqoscontent OBJECT-TYPE --xxx.100.16.1.7 showmlsqosmapsexpdscp OBJECT-TYPE - SYNTAX DisplayString (SIZE(1..512)) + SYNTAX DisplayString (SIZE(1..512)) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -9490,7 +10511,7 @@ showmlsqosinterfaceqoscontent OBJECT-TYPE --xxx.100.16.1.8 showmlsqosmapsdscpexp OBJECT-TYPE - SYNTAX DisplayString (SIZE(1..512)) + SYNTAX DisplayString (SIZE(1..512)) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -9519,8 +10540,8 @@ showmlsqosmapsdscpmutationEntry OBJECT-TYPE ShowmlsqosmapsdscpmutationEntry ::= SEQUENCE { - showmlsqosmapsdscpmutationname DisplayString, - showmlsqosmapsdscpmutationcontent DisplayString + showmlsqosmapsdscpmutationname DisplayString, + showmlsqosmapsdscpmutationcontent DisplayString } --xxx.100.16.2.1.1.1 @@ -9534,7 +10555,7 @@ showmlsqosmapsdscpmutationname OBJECT-TYPE --xxx.100.16.2.1.1.2 showmlsqosmapsdscpmutationcontent OBJECT-TYPE - SYNTAX DisplayString (SIZE(1..512)) + SYNTAX DisplayString (SIZE(1..512)) MAX-ACCESS read-only STATUS current DESCRIPTION "DSCP-DSCP map" @@ -9565,13 +10586,13 @@ MirrorDestEntry ::= SEQUENCE { mirrorDestSession INTEGER, - mirrorDestPort DisplayString, - mirrorDestStatus INTEGER + mirrorDestPort DisplayString, + mirrorDestStatus INTEGER } --xxx.100.12.1.1.1 mirrorDestSession OBJECT-TYPE - SYNTAX INTEGER (1..4) + SYNTAX INTEGER (1..4) MAX-ACCESS read-only STATUS current DESCRIPTION "Session ID." @@ -9579,7 +10600,7 @@ mirrorDestSession OBJECT-TYPE --xxx.100.12.1.1.2 mirrorDestPort OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..20)) + SYNTAX DisplayString(SIZE(1..20)) MAX-ACCESS read-create STATUS current DESCRIPTION "mirror destination port eg:Ethernet1/1." @@ -9587,12 +10608,12 @@ mirrorDestPort OBJECT-TYPE --xxx.100.12.1.1.3 mirrorDestStatus OBJECT-TYPE - SYNTAX INTEGER - { - - active(1), - destroy(2) - } + SYNTAX INTEGER + { + + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION "Status." @@ -9623,14 +10644,14 @@ MirrorSrcPortEntry ::= SEQUENCE { mirrorSrcPortSession INTEGER, - mirrorSrcPortDirect INTEGER, - mirrorSrcPort DisplayString, + mirrorSrcPortDirect INTEGER, + mirrorSrcPort DisplayString, mirrorSrcPortStatus INTEGER } --xxx.100.12.2.1.1 mirrorSrcPortSession OBJECT-TYPE - SYNTAX INTEGER (1..4) + SYNTAX INTEGER (1..4) MAX-ACCESS read-only STATUS current DESCRIPTION "Session ID." @@ -9638,11 +10659,11 @@ mirrorSrcPortSession OBJECT-TYPE --xxx.100.12.2.1.2 mirrorSrcPortDirect OBJECT-TYPE - SYNTAX INTEGER - { - rx(1), - tx(2) - } + SYNTAX INTEGER + { + rx(1), + tx(2) + } MAX-ACCESS read-only STATUS current DESCRIPTION "Direction of mirror." @@ -9650,7 +10671,7 @@ mirrorSrcPortDirect OBJECT-TYPE --xxx.100.12.2.1.3 mirrorSrcPort OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..512)) + SYNTAX DisplayString(SIZE(1..512)) MAX-ACCESS read-create STATUS current DESCRIPTION "mirror source port. eg:Ethernet1/1." @@ -9658,12 +10679,12 @@ mirrorSrcPort OBJECT-TYPE --xxx.100.12.2.1.4 mirrorSrcPortStatus OBJECT-TYPE - SYNTAX INTEGER - { - - active(1), - destroy(2) - } + SYNTAX INTEGER + { + + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION "Status." @@ -9672,7 +10693,7 @@ mirrorSrcPortStatus OBJECT-TYPE --******************************************************************************************************** --******************************************************************************************************** --xxx.100.11.2 - qos3 OBJECT IDENTIFIER ::= { priQos 2 } + qos3 OBJECT IDENTIFIER ::= { priQos 2 } --******************************************************************************************************** @@ -9699,16 +10720,16 @@ qos3PolicyMapGroupTable OBJECT-TYPE Qos3PolicyMapGroupEntry ::= SEQUENCE { - qos3PolicyMapGroupIndex INTEGER, - qos3PolicyMapGroupName DisplayString, + qos3PolicyMapGroupIndex INTEGER, + qos3PolicyMapGroupName DisplayString, qos3PolicyMapGroupIsExt INTEGER, - qos3PolicyMapGroupStatus INTEGER + qos3PolicyMapGroupStatus INTEGER } --xxx.100.11.2.1.1.1 qos3PolicyMapGroupIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (0..2147483647) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -9775,8 +10796,8 @@ qos3ClassMapTable OBJECT-TYPE Qos3ClassMapEntry ::= SEQUENCE { - qos3ClassMapName DisplayString, - qos3ClassMapType INTEGER, + qos3ClassMapName DisplayString, + qos3ClassMapType INTEGER, qos3ClassMapValue DisplayString, qos3ClassMapUsedTime INTEGER, qos3ClassMapStatus INTEGER @@ -9818,7 +10839,7 @@ qos3ClassMapValue OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "the value of you choosed type at last node,the limits: cos <0> dscp <0> ipPrecedence<0> ipv6Dscp<0> vlan <1> ipv6Flowlabel<0> + "the value of you choosed type at last node,the limits: cos <0-7> dscp <0-63> ipPrecedence<0-7> ipv6Dscp<0-63> vlan <1-4094> ipv6Flowlabel<0-1048575> exp is not support now.except aclindex,you can config 8 parameters at most,for example,if you choose the type of cos,you can config 0,1,2,3,4,5,6,7 or 0,1 at here." ::= { qos3ClassMapEntry 3 } @@ -9871,12 +10892,12 @@ qos3AggregatePolicyTable OBJECT-TYPE Qos3AggregatePolicyEntry ::= SEQUENCE { - qos3AggPolicyMapName DisplayString, - qos3AggPolicyCIRKbps INTEGER, + qos3AggPolicyMapName DisplayString, + qos3AggPolicyCIRKbps INTEGER, qos3AggPolicyCBSKbps INTEGER, - qos3AggPolicyPBSKbps INTEGER, + qos3AggPolicyPBSKbps INTEGER, qos3AggPolicyPIRKbps INTEGER, - qos3AggPolicyConformAction BITS, + qos3AggPolicyConformAction BITS, qos3AggPolicyconformSetCos INTEGER, qos3AggPolicyconformSetDscp INTEGER, qos3AggPolicyconformSetPrec INTEGER, @@ -9913,7 +10934,7 @@ qos3AggPolicyCIRKbps OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "CIR(Committed Information Rate) Kbits per second <1>" + "CIR(Committed Information Rate) Kbits per second <1-10000000>" ::= { qos3AggregatePolicyEntry 2 } --xxx.100.11.2.3.1.3 @@ -9922,7 +10943,7 @@ qos3AggPolicyCBSKbps OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "CBS(Committed Burst Size) Kbytes <1>" + "CBS(Committed Burst Size) Kbytes <1-1000000>" ::= { qos3AggregatePolicyEntry 3 } --xxx.100.11.2.3.1.4 @@ -9931,7 +10952,7 @@ qos3AggPolicyPBSKbps OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "PBS(Peak Burst Size) Kbytes <1>" + "PBS(Peak Burst Size) Kbytes <1-1000000>" ::= { qos3AggregatePolicyEntry 4 } --xxx.100.11.2.3.1.5 @@ -9940,7 +10961,7 @@ qos3AggPolicyPIRKbps OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "PIR(Peak Information Rate) Kbits per second <1>" + "PIR(Peak Information Rate) Kbits per second <1-10000000>" ::= { qos3AggregatePolicyEntry 5 } --xxx.100.11.2.3.1.6 @@ -10172,14 +11193,14 @@ qos3PolicyTable OBJECT-TYPE ::= SEQUENCE { qos3PolicyMapIndex INTEGER, - qos3PolicyClassMapName DisplayString, + qos3PolicyClassMapName DisplayString, qos3PolicyInsertClassMapName DisplayString, qos3PolicyType BITS, - qos3PolicyCIRKbps INTEGER, + qos3PolicyCIRKbps INTEGER, qos3PolicyCBSKbps INTEGER, - qos3PolicyPBSKbps INTEGER, + qos3PolicyPBSKbps INTEGER, qos3PolicyPIRKbps INTEGER, - qos3PolicyConformAction BITS, + qos3PolicyConformAction BITS, qos3PolicyconformSetCos INTEGER, qos3PolicyconformSetDscp INTEGER, qos3PolicyconformSetPrec INTEGER, @@ -10224,7 +11245,7 @@ qos3PolicyTable OBJECT-TYPE --xxx.100.11.2.4.1.1 qos3PolicyMapIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (0..1000) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -10270,7 +11291,7 @@ qos3PolicyCIRKbps OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "CIR(Committed Information Rate) Kbits per second <1>" + "CIR(Committed Information Rate) Kbits per second <1-10000000>" ::= { qos3PolicyEntry 5 } --xxx.100.11.2.4.1.6 @@ -10279,7 +11300,7 @@ qos3PolicyCBSKbps OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - " CBS(Committed Burst Size) Kbytes <1>" + " CBS(Committed Burst Size) Kbytes <1-1000000>" ::= { qos3PolicyEntry 6 } --xxx.100.11.2.4.1.7 @@ -10288,7 +11309,7 @@ qos3PolicyPBSKbps OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - " PBS(Peak Burst Size) Kbytes <1>" + " PBS(Peak Burst Size) Kbytes <1-1000000>" ::= { qos3PolicyEntry 7 } --xxx.100.11.2.4.1.8 @@ -10297,7 +11318,7 @@ qos3PolicyPIRKbps OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION - "PIR(Peak Information Rate) Kbits per second <1>" + "PIR(Peak Information Rate) Kbits per second <1-10000000>" ::= { qos3PolicyEntry 8 } --xxx.100.11.2.4.1.9 @@ -10540,10 +11561,10 @@ qos3PolicyPidAction OBJECT-TYPE "simple policy action,for example: if you want to config cos(0) and setSTpid(10),you must set 8020 (1000 0000 0010 0000). some network Management Software offer selections that is not correct,in RFC3417,When encoding an object whose syntax is described using the BITS construct, the value is encoded as an OCTET STRING, in which all the named bits in (the definition of) the bitstring, - commencing with the first bit and proceeding to the last bit,are placed in bits 8 (high order bit) to 1 (low order bit) of - the first octet, followed by bits 8 to 1 of each subsequent octet in turn, followed by as many bits as are needed of the - final subsequent octet, commencing with bit 8. Remaining bits,if any, of the final octet are set to zero on generation and - ignored on receipt." + commencing with the first bit and proceeding to the last bit,are placed in bits 8 (high order bit) to 1 (low order bit) of + the first octet, followed by bits 8 to 1 of each subsequent octet in turn, followed by as many bits as are needed of the + final subsequent octet, commencing with bit 8. Remaining bits,if any, of the final octet are set to zero on generation and + ignored on receipt." ::= { qos3PolicyEntry 29 } --xxx.100.11.2.3.1.26 @@ -10770,8 +11791,8 @@ Qos3PortEntry ::= SEQUENCE { qos3PortIndex INTEGER, - qos3PortCos INTEGER, - qos3PortTrust BITS, + qos3PortCos INTEGER, + qos3PortTrust BITS, qos3PortWredEnable INTEGER, qos3PortQueueAlgorithm INTEGER, qos3PortPassThroughCos INTEGER, @@ -10780,7 +11801,7 @@ Qos3PortEntry --xxx.100.11.2.5.1.1 qos3PortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -10789,7 +11810,7 @@ qos3PortIndex OBJECT-TYPE --xxx.100.11.2.5.1.2 qos3PortCos OBJECT-TYPE - SYNTAX INTEGER(0..7) + SYNTAX INTEGER(0..7) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -10798,15 +11819,15 @@ qos3PortCos OBJECT-TYPE --xxx.100.11.2.5.1.3 qos3PortTrust OBJECT-TYPE - SYNTAX BITS - { - cosEnable(0), - dscpEnable(1), - expEnable(2), - cosDisable(3), - dscpDisable(4), - expDisbable(5) - } + SYNTAX BITS + { + cosEnable(0), + dscpEnable(1), + expEnable(2), + cosDisable(3), + dscpDisable(4), + expDisbable(5) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -10816,11 +11837,11 @@ qos3PortTrust OBJECT-TYPE --xxx.100.11.2.5.1.4 qos3PortWredEnable OBJECT-TYPE - SYNTAX INTEGER - { - tail(0), - wred(1) - } + SYNTAX INTEGER + { + tail(0), + wred(1) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -10829,12 +11850,12 @@ qos3PortWredEnable OBJECT-TYPE --xxx.100.11.2.5.1.5 qos3PortQueueAlgorithm OBJECT-TYPE - SYNTAX INTEGER - { - sp(0), - wrr(1), - wdrr(2) - } + SYNTAX INTEGER + { + sp(0), + wrr(1), + wdrr(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -10842,11 +11863,11 @@ qos3PortQueueAlgorithm OBJECT-TYPE ::= { qos3PortEntry 5 } qos3PortPassThroughCos OBJECT-TYPE - SYNTAX INTEGER - { - disable(0), - enable(1) - } + SYNTAX INTEGER + { + disable(0), + enable(1) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -10854,11 +11875,11 @@ qos3PortPassThroughCos OBJECT-TYPE ::= { qos3PortEntry 6 } qos3PortPassThroughDscp OBJECT-TYPE - SYNTAX INTEGER - { - disable(0), - enable(1) - } + SYNTAX INTEGER + { + disable(0), + enable(1) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -10889,8 +11910,8 @@ Qos3QueueWeightEntry ::= SEQUENCE { qos3QueueWeightPortIndex INTEGER, - qos3QueueWeightType INTEGER, - qos3QueueWeight0 INTEGER, + qos3QueueWeightType INTEGER, + qos3QueueWeight0 INTEGER, qos3QueueWeight1 INTEGER, qos3QueueWeight2 INTEGER, qos3QueueWeight3 INTEGER, @@ -10903,7 +11924,7 @@ Qos3QueueWeightEntry --xxx.100.11.2.6.1.1 qos3QueueWeightPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -10912,11 +11933,11 @@ qos3QueueWeightPortIndex OBJECT-TYPE --xxx.100.11.2.6.1.2 qos3QueueWeightType OBJECT-TYPE - SYNTAX INTEGER - { - wrr(0), - wdrr(1) - } + SYNTAX INTEGER + { + wrr(0), + wdrr(1) + } MAX-ACCESS read-only STATUS current DESCRIPTION @@ -10926,7 +11947,7 @@ qos3QueueWeightType OBJECT-TYPE --xxx.100.11.2.6.1.3 qos3QueueWeight0 OBJECT-TYPE - SYNTAX INTEGER(0..32767) + SYNTAX INTEGER(0..32767) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -10936,7 +11957,7 @@ qos3QueueWeight0 OBJECT-TYPE --xxx.100.11.2.6.1.4 qos3QueueWeight1 OBJECT-TYPE - SYNTAX INTEGER(0..32767) + SYNTAX INTEGER(0..32767) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -10945,7 +11966,7 @@ qos3QueueWeight1 OBJECT-TYPE --xxx.100.11.2.6.1.5 qos3QueueWeight2 OBJECT-TYPE - SYNTAX INTEGER(0..32767) + SYNTAX INTEGER(0..32767) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -10954,7 +11975,7 @@ qos3QueueWeight2 OBJECT-TYPE --xxx.100.11.2.6.1.6 qos3QueueWeight3 OBJECT-TYPE - SYNTAX INTEGER(0..32767) + SYNTAX INTEGER(0..32767) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -10963,7 +11984,7 @@ qos3QueueWeight3 OBJECT-TYPE --xxx.100.11.2.6.1.7 qos3QueueWeight4 OBJECT-TYPE - SYNTAX INTEGER(0..32767) + SYNTAX INTEGER(0..32767) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -10972,7 +11993,7 @@ qos3QueueWeight4 OBJECT-TYPE --xxx.100.11.2.6.1.8 qos3QueueWeight5 OBJECT-TYPE - SYNTAX INTEGER(0..32767) + SYNTAX INTEGER(0..32767) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -10981,7 +12002,7 @@ qos3QueueWeight5 OBJECT-TYPE --xxx.100.11.2.6.1.9 qos3QueueWeight6 OBJECT-TYPE - SYNTAX INTEGER(0..32767) + SYNTAX INTEGER(0..32767) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -10990,7 +12011,7 @@ qos3QueueWeight6 OBJECT-TYPE --xxx.100.11.2.6.1.10 qos3QueueWeight7 OBJECT-TYPE - SYNTAX INTEGER(0..32767) + SYNTAX INTEGER(0..32767) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -10999,12 +12020,12 @@ qos3QueueWeight7 OBJECT-TYPE --xxx.100.11.2.6.1.11 qos3QueueWeightStatus OBJECT-TYPE - SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + SYNTAX INTEGER + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11036,15 +12057,15 @@ Qos3QueueBindWidthEntry ::= SEQUENCE { qos3QueueBindWidthPortIndex INTEGER, - qos3QueueBindWidthQueueId INTEGER, - qos3QueueBindWidthMin INTEGER, + qos3QueueBindWidthQueueId INTEGER, + qos3QueueBindWidthMin INTEGER, qos3QueueBindWidthMax INTEGER, qos3QueueBindWidthStatus INTEGER } --xxx.100.11.2.7.1.1 qos3QueueBindWidthPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11053,7 +12074,7 @@ qos3QueueBindWidthPortIndex OBJECT-TYPE --xxx.100.11.2.7.1.2 qos3QueueBindWidthQueueId OBJECT-TYPE - SYNTAX INTEGER(1..8) + SYNTAX INTEGER(1..8) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11062,7 +12083,7 @@ qos3QueueBindWidthQueueId OBJECT-TYPE --xxx.100.11.2.7.1.3 qos3QueueBindWidthMin OBJECT-TYPE - SYNTAX INTEGER(0..128000) + SYNTAX INTEGER(0..128000) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11071,7 +12092,7 @@ qos3QueueBindWidthMin OBJECT-TYPE --xxx.100.11.2.7.1.4 qos3QueueBindWidthMax OBJECT-TYPE - SYNTAX INTEGER(0..128000) + SYNTAX INTEGER(0..128000) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11080,12 +12101,12 @@ qos3QueueBindWidthMax OBJECT-TYPE --xxx.100.11.2.7.1.5 qos3QueueBindWidthStatus OBJECT-TYPE - SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + SYNTAX INTEGER + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11116,8 +12137,8 @@ Qos3QueueWredEntry ::= SEQUENCE { qos3QueueWredPortIndex INTEGER, - qos3QueueWredQueueId INTEGER, - qos3QueueWredDp INTEGER, + qos3QueueWredQueueId INTEGER, + qos3QueueWredDp INTEGER, qos3QueueWredDpStart INTEGER, qos3QueueWredDpEnd INTEGER, qos3QueueWredDpMaxRate INTEGER, @@ -11126,7 +12147,7 @@ Qos3QueueWredEntry --xxx.100.11.2.8.1.1 qos3QueueWredPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11135,7 +12156,7 @@ qos3QueueWredPortIndex OBJECT-TYPE --xxx.100.11.2.8.1.2 qos3QueueWredQueueId OBJECT-TYPE - SYNTAX INTEGER(1..8) + SYNTAX INTEGER(1..8) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11144,7 +12165,7 @@ qos3QueueWredQueueId OBJECT-TYPE --xxx.100.11.2.8.1.3 qos3QueueWredDp OBJECT-TYPE - SYNTAX INTEGER(0..2) + SYNTAX INTEGER(0..2) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11153,7 +12174,7 @@ qos3QueueWredDp OBJECT-TYPE --xxx.100.11.2.8.1.4 qos3QueueWredDpStart OBJECT-TYPE - SYNTAX INTEGER(1..100) + SYNTAX INTEGER(1..100) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11162,7 +12183,7 @@ qos3QueueWredDpStart OBJECT-TYPE --xxx.100.11.2.8.1.5 qos3QueueWredDpEnd OBJECT-TYPE - SYNTAX INTEGER(1..100) + SYNTAX INTEGER(1..100) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11171,7 +12192,7 @@ qos3QueueWredDpEnd OBJECT-TYPE --xxx.100.11.2.8.1.6 qos3QueueWredDpMaxRate OBJECT-TYPE - SYNTAX INTEGER(0..100) + SYNTAX INTEGER(0..100) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11180,12 +12201,12 @@ qos3QueueWredDpMaxRate OBJECT-TYPE --xxx.100.11.2.8.1.7 qos3QueueWredStatus OBJECT-TYPE - SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + SYNTAX INTEGER + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11216,8 +12237,8 @@ Qos3MapEntry ::= SEQUENCE { qos3MapType INTEGER, - qos3MapAtoB1 INTEGER, - qos3MapAtoB2 INTEGER, + qos3MapAtoB1 INTEGER, + qos3MapAtoB2 INTEGER, qos3MapAtoB3 INTEGER, qos3MapAtoB4 INTEGER, qos3MapAtoB5 INTEGER, @@ -11229,22 +12250,22 @@ Qos3MapEntry --xxx.100.11.2.9.1.1 qos3MapType OBJECT-TYPE - SYNTAX INTEGER - { - cosToIntp(0), - cosToDp(1), - expToIntp(2), - expToDp(3), - intpToCos(4), - intpToDscp(5), - intpToExp(6), - cosToCosGreen(7), - cosToCosYellow(8), - cosToCosRed(9), - cosToDscpGreen(10), - cosToDscpYellow(11), - cosToDscpRed(12) - } + SYNTAX INTEGER + { + cosToIntp(0), + cosToDp(1), + expToIntp(2), + expToDp(3), + intpToCos(4), + intpToDscp(5), + intpToExp(6), + cosToCosGreen(7), + cosToCosYellow(8), + cosToCosRed(9), + cosToDscpGreen(10), + cosToDscpYellow(11), + cosToDscpRed(12) + } MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11253,7 +12274,7 @@ qos3MapType OBJECT-TYPE --xxx.100.11.2.9.1.2 qos3MapAtoB1 OBJECT-TYPE - SYNTAX INTEGER(0..119) + SYNTAX INTEGER(0..119) MAX-ACCESS read-write STATUS current DESCRIPTION "according to maptype,map a to b for the first value." @@ -11261,7 +12282,7 @@ qos3MapAtoB1 OBJECT-TYPE --xxx.100.11.2.9.1.3 qos3MapAtoB2 OBJECT-TYPE - SYNTAX INTEGER(0..119) + SYNTAX INTEGER(0..119) MAX-ACCESS read-write STATUS current DESCRIPTION "according to maptype,map a to b for the second value." @@ -11269,7 +12290,7 @@ qos3MapAtoB2 OBJECT-TYPE --xxx.100.11.2.9.1.4 qos3MapAtoB3 OBJECT-TYPE - SYNTAX INTEGER(0..119) + SYNTAX INTEGER(0..119) MAX-ACCESS read-write STATUS current DESCRIPTION "according to maptype,map a to b for the third value." @@ -11277,7 +12298,7 @@ qos3MapAtoB3 OBJECT-TYPE --xxx.100.11.2.9.1.5 qos3MapAtoB4 OBJECT-TYPE - SYNTAX INTEGER(0..119) + SYNTAX INTEGER(0..119) MAX-ACCESS read-write STATUS current DESCRIPTION "according to maptype,map a to b for the fourth value." @@ -11285,7 +12306,7 @@ qos3MapAtoB4 OBJECT-TYPE --xxx.100.11.2.9.1.6 qos3MapAtoB5 OBJECT-TYPE - SYNTAX INTEGER(0..119) + SYNTAX INTEGER(0..119) MAX-ACCESS read-write STATUS current DESCRIPTION "according to maptype,map a to b for the fifth value." @@ -11293,7 +12314,7 @@ qos3MapAtoB5 OBJECT-TYPE --xxx.100.11.2.9.1.7 qos3MapAtoB6 OBJECT-TYPE - SYNTAX INTEGER(0..119) + SYNTAX INTEGER(0..119) MAX-ACCESS read-write STATUS current DESCRIPTION "according to maptype,map a to b for the sixth value." @@ -11301,7 +12322,7 @@ qos3MapAtoB6 OBJECT-TYPE --xxx.100.11.2.9.1.8 qos3MapAtoB7 OBJECT-TYPE - SYNTAX INTEGER(0..119) + SYNTAX INTEGER(0..119) MAX-ACCESS read-write STATUS current DESCRIPTION "according to maptype,map a to b for the seventh value." @@ -11309,7 +12330,7 @@ qos3MapAtoB7 OBJECT-TYPE --xxx.100.11.2.9.1.9 qos3MapAtoB8 OBJECT-TYPE - SYNTAX INTEGER(0..119) + SYNTAX INTEGER(0..119) MAX-ACCESS read-write STATUS current DESCRIPTION "according to maptype,map a to b for the eighth value." @@ -11317,12 +12338,12 @@ qos3MapAtoB8 OBJECT-TYPE --xxx.100.11.2.9.1.10 qos3MapStatus OBJECT-TYPE - SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + SYNTAX INTEGER + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11353,25 +12374,25 @@ Qos3MapDscpEntry ::= SEQUENCE { qos3MapDscpType INTEGER, - qos3MapDscpIndex INTEGER, - qos3MapDscpValue INTEGER, + qos3MapDscpIndex INTEGER, + qos3MapDscpValue INTEGER, qos3mapDscpStatus INTEGER } --xxx.100.11.2.10.1.1 qos3MapDscpType OBJECT-TYPE - SYNTAX INTEGER - { - dscpToIntp(0), - dscpToDp(1), - dscpToDscp(2), - dscpToDscpGreen(3), - dscpToDscpYellow(4), - dscpToDscpRed(5), - dscpToCosGreen(6), - dscpToCosYellow(7), - dscpToCosRed(8) - } + SYNTAX INTEGER + { + dscpToIntp(0), + dscpToDp(1), + dscpToDscp(2), + dscpToDscpGreen(3), + dscpToDscpYellow(4), + dscpToDscpRed(5), + dscpToCosGreen(6), + dscpToCosYellow(7), + dscpToCosRed(8) + } MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11380,7 +12401,7 @@ qos3MapDscpType OBJECT-TYPE --xxx.100.11.2.10.1.2 qos3MapDscpIndex OBJECT-TYPE - SYNTAX INTEGER(0..63) + SYNTAX INTEGER(0..63) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11389,7 +12410,7 @@ qos3MapDscpIndex OBJECT-TYPE --xxx.100.11.2.10.1.3 qos3MapDscpValue OBJECT-TYPE - SYNTAX INTEGER(0..63) + SYNTAX INTEGER(0..63) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11398,12 +12419,12 @@ qos3MapDscpValue OBJECT-TYPE --xxx.100.11.2.10.1.4 qos3mapDscpStatus OBJECT-TYPE - SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + SYNTAX INTEGER + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11433,20 +12454,20 @@ Qos3ServicePolicyEntry ::= SEQUENCE { qos3ServicePolicyBindType INTEGER, - qos3ServicePolicyIndex INTEGER, - qos3ServicePolicyDirection INTEGER, + qos3ServicePolicyIndex INTEGER, + qos3ServicePolicyDirection INTEGER, qos3ServicePolicyName DisplayString, qos3SercivePolicyStatus INTEGER } --xxx.100.11.2.11.1.1 qos3ServicePolicyBindType OBJECT-TYPE - SYNTAX INTEGER - { - port(0), - vlan(1) - - } + SYNTAX INTEGER + { + port(0), + vlan(1) + + } MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11455,7 +12476,7 @@ qos3ServicePolicyBindType OBJECT-TYPE --xxx.100.11.2.11.1.3 qos3ServicePolicyIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4094) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11464,12 +12485,12 @@ qos3ServicePolicyIndex OBJECT-TYPE --xxx.100.11.2.11.1.2 qos3ServicePolicyDirection OBJECT-TYPE - SYNTAX INTEGER - { - out(0), - in(1), - ext(2) - } + SYNTAX INTEGER + { + out(0), + in(1), + ext(2) + } MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11479,7 +12500,7 @@ qos3ServicePolicyDirection OBJECT-TYPE --xxx.100.11.2.11.1.4 qos3ServicePolicyName OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..64)) + SYNTAX DisplayString(SIZE(1..64)) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11488,12 +12509,12 @@ qos3ServicePolicyName OBJECT-TYPE --xxx.100.11.2.11.1.5 qos3SercivePolicyStatus OBJECT-TYPE - SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + SYNTAX INTEGER + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11525,18 +12546,18 @@ Qos3StatisticClearEntry ::= SEQUENCE { qos3StatisticClearBindType INTEGER, - qos3StatisticClearIndex INTEGER, - qos3StatisticClearDirection INTEGER, + qos3StatisticClearIndex INTEGER, + qos3StatisticClearDirection INTEGER, qos3StatisticClearStatus INTEGER } --xxx.100.11.2.11.1 qos3StatisticClearBindType OBJECT-TYPE - SYNTAX INTEGER - { - port(0), - vlan(1) - } + SYNTAX INTEGER + { + port(0), + vlan(1) + } MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11545,7 +12566,7 @@ qos3StatisticClearBindType OBJECT-TYPE --xxx.100.11.2.11.3 qos3StatisticClearIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4094) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11554,11 +12575,11 @@ qos3StatisticClearIndex OBJECT-TYPE --xxx.100.11.2.11.2 qos3StatisticClearDirection OBJECT-TYPE - SYNTAX INTEGER - { - out(0), - in(1) - } + SYNTAX INTEGER + { + out(0), + in(1) + } MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11568,11 +12589,11 @@ qos3StatisticClearDirection OBJECT-TYPE --xxx.100.11.2.11.4 qos3StatisticClearStatus OBJECT-TYPE - SYNTAX INTEGER - { - disable(0), - enable(1) - } + SYNTAX INTEGER + { + disable(0), + enable(1) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11604,12 +12625,12 @@ Qos3EtsEntry ::= SEQUENCE { qos3EtsPortIndex INTEGER, - qos3EtsScheduleStatusConfig INTEGER, + qos3EtsScheduleStatusConfig INTEGER, qos3EtsStatus INTEGER } qos3EtsPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11617,13 +12638,13 @@ qos3EtsPortIndex OBJECT-TYPE ::= { qos3EtsEntry 1 } qos3EtsScheduleStatusConfig OBJECT-TYPE - SYNTAX INTEGER - { - normal(0), - uc(1), - mc(2), - ets(3) - } + SYNTAX INTEGER + { + normal(0), + uc(1), + mc(2), + ets(3) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11631,11 +12652,11 @@ qos3EtsScheduleStatusConfig OBJECT-TYPE ::= { qos3EtsEntry 2 } qos3EtsStatus OBJECT-TYPE - SYNTAX INTEGER - { + SYNTAX INTEGER + { disable(0), enable(1) - } + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11664,14 +12685,14 @@ Qos3McQueueBindWidthEntry ::= SEQUENCE { qos3McQueueBindWidthPortIndex INTEGER, - qos3McQueueID INTEGER, + qos3McQueueID INTEGER, qos3McQueueBindWidthMin INTEGER, qos3McQueueBindWidthMax INTEGER, qos3McQueueBindWidthStatus INTEGER } qos3McQueueBindWidthPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11679,7 +12700,7 @@ qos3McQueueBindWidthPortIndex OBJECT-TYPE ::= { qos3McQueueBindWidthEntry 1 } qos3McQueueID OBJECT-TYPE - SYNTAX INTEGER(1..4) + SYNTAX INTEGER(1..4) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11687,7 +12708,7 @@ qos3McQueueID OBJECT-TYPE ::= { qos3McQueueBindWidthEntry 2 } qos3McQueueBindWidthMin OBJECT-TYPE - SYNTAX INTEGER(0..128000) + SYNTAX INTEGER(0..128000) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11695,7 +12716,7 @@ qos3McQueueBindWidthMin OBJECT-TYPE ::= { qos3McQueueBindWidthEntry 3 } qos3McQueueBindWidthMax OBJECT-TYPE - SYNTAX INTEGER(0..128000) + SYNTAX INTEGER(0..128000) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11703,11 +12724,11 @@ qos3McQueueBindWidthMax OBJECT-TYPE ::= { qos3McQueueBindWidthEntry 4 } qos3McQueueBindWidthStatus OBJECT-TYPE - SYNTAX INTEGER - { + SYNTAX INTEGER + { disable(0), enable(1) - } + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11742,7 +12763,7 @@ Qos3SchedulePolicyMapEntry } qos3SchedulePolicyMapIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (0..2147483647) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11750,7 +12771,7 @@ qos3SchedulePolicyMapIndex OBJECT-TYPE ::= { qos3SchedulePolicyMapEntry 1 } qos3SchedulePolicyName OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..64)) + SYNTAX DisplayString(SIZE(1..64)) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11758,17 +12779,17 @@ qos3SchedulePolicyName OBJECT-TYPE ::= { qos3SchedulePolicyMapEntry 2 } qos3SchedulePolicyStatus OBJECT-TYPE - SYNTAX INTEGER - { + SYNTAX INTEGER + { createAndGo(0), active(1), destroy(2) - } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "the status of qos3SchedulePolicyGroupTable." - ::= { qos3SchedulePolicyMapEntry 3 } + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "the status of qos3SchedulePolicyGroupTable." + ::= { qos3SchedulePolicyMapEntry 3 } qos3NodeScheduleTable OBJECT-TYPE @@ -11798,7 +12819,7 @@ Qos3NodeScheduleEntry } qos3NodeSchedulePolicyIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..1000) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11806,7 +12827,7 @@ qos3NodeSchedulePolicyIndex OBJECT-TYPE ::= { qos3NodeScheduleEntry 1 } qos3NodeScheduleLevelID OBJECT-TYPE - SYNTAX INTEGER(1..3) + SYNTAX INTEGER(1..3) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11814,7 +12835,7 @@ qos3NodeScheduleLevelID OBJECT-TYPE ::= { qos3NodeScheduleEntry 2 } qos3NodeScheduleNodeID OBJECT-TYPE - SYNTAX INTEGER(1..4) + SYNTAX INTEGER(1..4) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11823,19 +12844,19 @@ qos3NodeScheduleNodeID OBJECT-TYPE ::= { qos3NodeScheduleEntry 3 } qos3NodeScheduleStatus OBJECT-TYPE - SYNTAX INTEGER - { + SYNTAX INTEGER + { createAndGo(0), active(1), destroy(2) - } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "the status of qos3NodeScheduleTable." - ::= { qos3NodeScheduleEntry 4 } - ---xxx.100.11.2.13.4 + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "the status of qos3NodeScheduleTable." + ::= { qos3NodeScheduleEntry 4 } + +--xxx.100.11.2.13.4 qos3ScheduleQueueAlgorithmTable OBJECT-TYPE SYNTAX SEQUENCE OF Qos3ScheduleQueueAlgorithmEntry MAX-ACCESS not-accessible @@ -11859,12 +12880,12 @@ Qos3ScheduleQueueAlgorithmEntry qos3ScheduleQueueAlgorithmPolicyIndex INTEGER, qos3ScheduleQueueAlgorithmLevelID INTEGER, qos3ScheduleQueueAlgorithmNodeID INTEGER, - qos3ScheduleQueueAlgorithmConfig INTEGER, - qos3ScheduleQueueAlgorithmStatus INTEGER + qos3ScheduleQueueAlgorithmConfig INTEGER, + qos3ScheduleQueueAlgorithmStatus INTEGER } qos3ScheduleQueueAlgorithmPolicyIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..1024) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11872,7 +12893,7 @@ qos3ScheduleQueueAlgorithmPolicyIndex OBJECT-TYPE ::= { qos3ScheduleQueueAlgorithmEntry 1 } qos3ScheduleQueueAlgorithmLevelID OBJECT-TYPE - SYNTAX INTEGER(1..3) + SYNTAX INTEGER(1..3) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11881,7 +12902,7 @@ qos3ScheduleQueueAlgorithmLevelID OBJECT-TYPE qos3ScheduleQueueAlgorithmNodeID OBJECT-TYPE - SYNTAX INTEGER(1..4) + SYNTAX INTEGER(1..4) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11890,13 +12911,13 @@ qos3ScheduleQueueAlgorithmNodeID OBJECT-TYPE ::= { qos3ScheduleQueueAlgorithmEntry 3 } qos3ScheduleQueueAlgorithmConfig OBJECT-TYPE - SYNTAX INTEGER - { - rr(0), - sp(1), - wrr(2), - wdrr(3) - } + SYNTAX INTEGER + { + rr(0), + sp(1), + wrr(2), + wdrr(3) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -11904,19 +12925,19 @@ qos3ScheduleQueueAlgorithmConfig OBJECT-TYPE ::= { qos3ScheduleQueueAlgorithmEntry 4 } qos3ScheduleQueueAlgorithmStatus OBJECT-TYPE - SYNTAX INTEGER - { + SYNTAX INTEGER + { createAndGo(0), active(1), destroy(2) - } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "the status of qos3ScheduleQueueAlgorithmTable." - ::= { qos3ScheduleQueueAlgorithmEntry 5 } - ---xxx.100.11.2.13.5 + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "the status of qos3ScheduleQueueAlgorithmTable." + ::= { qos3ScheduleQueueAlgorithmEntry 5 } + +--xxx.100.11.2.13.5 qos3ScheduleQueueWeightTable OBJECT-TYPE SYNTAX SEQUENCE OF Qos3ScheduleQueueWeightEntry MAX-ACCESS not-accessible @@ -11942,12 +12963,12 @@ Qos3ScheduleQueueWeightEntry qos3ScheduleQueueWeightNodeID INTEGER, qos3ScheduleQueueAlgorithm INTEGER, qos3ScheduleQueueWeightQueueID INTEGER, - qos3ScheduleQueueWeightValue INTEGER, + qos3ScheduleQueueWeightValue INTEGER, qos3ScheduleQueueWeightStatus INTEGER } qos3ScheduleQueueWeightPolicyIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..1024) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11955,7 +12976,7 @@ qos3ScheduleQueueWeightPolicyIndex OBJECT-TYPE ::= { qos3ScheduleQueueWeightEntry 1 } qos3ScheduleQueueWeightLevelID OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11963,7 +12984,7 @@ qos3ScheduleQueueWeightLevelID OBJECT-TYPE ::= { qos3ScheduleQueueWeightEntry 2 } qos3ScheduleQueueWeightNodeID OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11972,11 +12993,11 @@ qos3ScheduleQueueWeightNodeID OBJECT-TYPE ::= { qos3ScheduleQueueWeightEntry 3 } qos3ScheduleQueueAlgorithm OBJECT-TYPE - SYNTAX INTEGER - { - wrr(0), - wdrr(1) - } + SYNTAX INTEGER + { + wrr(0), + wdrr(1) + } MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11984,7 +13005,7 @@ qos3ScheduleQueueAlgorithm OBJECT-TYPE ::= { qos3ScheduleQueueWeightEntry 4 } qos3ScheduleQueueWeightQueueID OBJECT-TYPE - SYNTAX INTEGER(0..18) + SYNTAX INTEGER(0..18) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -11992,7 +13013,7 @@ qos3ScheduleQueueWeightQueueID OBJECT-TYPE ::= { qos3ScheduleQueueWeightEntry 5 } qos3ScheduleQueueWeightValue OBJECT-TYPE - SYNTAX INTEGER(0..32767) + SYNTAX INTEGER(0..32767) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -12000,18 +13021,18 @@ qos3ScheduleQueueWeightValue OBJECT-TYPE ::= { qos3ScheduleQueueWeightEntry 6 } qos3ScheduleQueueWeightStatus OBJECT-TYPE - SYNTAX INTEGER - { + SYNTAX INTEGER + { disable(0), enable(1) - } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "the status of qos3ScheduleQueueWeightTable." - ::= { qos3ScheduleQueueWeightEntry 7 } - ---xxx.100.11.2.13.6 + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "the status of qos3ScheduleQueueWeightTable." + ::= { qos3ScheduleQueueWeightEntry 7 } + +--xxx.100.11.2.13.6 qos3ScheduleQueueInputTable OBJECT-TYPE SYNTAX SEQUENCE OF Qos3ScheduleQueueInputEntry MAX-ACCESS not-accessible @@ -12036,13 +13057,13 @@ Qos3ScheduleQueueInputEntry qos3ScheduleQueueInputLevelID INTEGER, qos3ScheduleQueueInputNodeID INTEGER, qos3ScheduleQueueInputQueueID INTEGER, - qos3ScheduleQueueInputType INTEGER, + qos3ScheduleQueueInputType INTEGER, qos3ScheduleQueueInputTypeValue INTEGER, qos3ScheduleQueueInputStatus INTEGER } qos3ScheduleQueueInputPolicyIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..1024) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -12050,7 +13071,7 @@ qos3ScheduleQueueInputPolicyIndex OBJECT-TYPE ::= { qos3ScheduleQueueInputEntry 1 } qos3ScheduleQueueInputLevelID OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -12059,7 +13080,7 @@ qos3ScheduleQueueInputLevelID OBJECT-TYPE qos3ScheduleQueueInputNodeID OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -12068,7 +13089,7 @@ qos3ScheduleQueueInputNodeID OBJECT-TYPE ::= { qos3ScheduleQueueInputEntry 3 } qos3ScheduleQueueInputQueueID OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..8) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -12076,12 +13097,12 @@ qos3ScheduleQueueInputQueueID OBJECT-TYPE ::= { qos3ScheduleQueueInputEntry 4 } qos3ScheduleQueueInputType OBJECT-TYPE - SYNTAX INTEGER - { - uc(0), - mc(1), - node(2) - } + SYNTAX INTEGER + { + uc(0), + mc(1), + node(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -12089,7 +13110,7 @@ qos3ScheduleQueueInputType OBJECT-TYPE ::= { qos3ScheduleQueueInputEntry 5 } qos3ScheduleQueueInputTypeValue OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER MAX-ACCESS read-write STATUS current DESCRIPTION @@ -12097,17 +13118,17 @@ qos3ScheduleQueueInputTypeValue OBJECT-TYPE ::= { qos3ScheduleQueueInputEntry 6 } qos3ScheduleQueueInputStatus OBJECT-TYPE - SYNTAX INTEGER - { + SYNTAX INTEGER + { disable(0), enable(1) - } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "the status of qos3ScheduleBindWidthTable." - ::= { qos3ScheduleQueueInputEntry 7 } - + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "the status of qos3ScheduleBindWidthTable." + ::= { qos3ScheduleQueueInputEntry 7 } + --xxx.100.11.2.13.7 qos3ScheduleBindWidthTable OBJECT-TYPE SYNTAX SEQUENCE OF Qos3ScheduleBindWidthEntry @@ -12132,13 +13153,13 @@ Qos3ScheduleBindWidthEntry qos3ScheduleBindWidthPolicyIndex INTEGER, qos3ScheduleBindWidthLevelID INTEGER, qos3ScheduleBindWidthNodeID INTEGER, - qos3ScheduleBindWidthMin INTEGER, + qos3ScheduleBindWidthMin INTEGER, qos3ScheduleBindWidthMax INTEGER, qos3ScheduleBindWidthStatus INTEGER } qos3ScheduleBindWidthPolicyIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..1024) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -12146,7 +13167,7 @@ qos3ScheduleBindWidthPolicyIndex OBJECT-TYPE ::= { qos3ScheduleBindWidthEntry 1 } qos3ScheduleBindWidthLevelID OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..3) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -12155,7 +13176,7 @@ qos3ScheduleBindWidthLevelID OBJECT-TYPE qos3ScheduleBindWidthNodeID OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -12164,7 +13185,7 @@ qos3ScheduleBindWidthNodeID OBJECT-TYPE ::= { qos3ScheduleBindWidthEntry 3 } qos3ScheduleBindWidthMin OBJECT-TYPE - SYNTAX INTEGER(0..12800) + SYNTAX INTEGER(0..12800) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -12172,7 +13193,7 @@ qos3ScheduleBindWidthMin OBJECT-TYPE ::= { qos3ScheduleBindWidthEntry 4 } qos3ScheduleBindWidthMax OBJECT-TYPE - SYNTAX INTEGER(0..12800) + SYNTAX INTEGER(0..12800) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -12180,18 +13201,18 @@ qos3ScheduleBindWidthMax OBJECT-TYPE ::= { qos3ScheduleBindWidthEntry 5 } qos3ScheduleBindWidthStatus OBJECT-TYPE - SYNTAX INTEGER - { + SYNTAX INTEGER + { disable(0), enable(1) - } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "the status of qos3ScheduleBindWidthTable." - ::= { qos3ScheduleBindWidthEntry 6 } - ---xxx.100.11.2.13.8 + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "the status of qos3ScheduleBindWidthTable." + ::= { qos3ScheduleBindWidthEntry 6 } + +--xxx.100.11.2.13.8 qos3SchedulePolicyBindTable OBJECT-TYPE SYNTAX SEQUENCE OF Qos3SchedulePolicyBindEntry MAX-ACCESS not-accessible @@ -12218,7 +13239,7 @@ Qos3SchedulePolicyBindEntry } qos3SchedulePolicyBindPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -12226,7 +13247,7 @@ qos3SchedulePolicyBindPortIndex OBJECT-TYPE ::= { qos3SchedulePolicyBindEntry 1 } qos3SchedulePolicyBindPolicyName OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..64)) + SYNTAX DisplayString(SIZE(1..64)) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -12234,19 +13255,19 @@ qos3SchedulePolicyBindPolicyName OBJECT-TYPE ::= { qos3SchedulePolicyBindEntry 2 } qos3SchedulePolicyBindStatus OBJECT-TYPE - SYNTAX INTEGER - { + SYNTAX INTEGER + { disable(0), enable(1) - } - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "the status of qos3SchedulePolicyBindTable." - ::= { qos3SchedulePolicyBindEntry 3 } - ---xxx.100.11.2.14 -qos3MapIntpExtendTable OBJECT-TYPE + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "the status of qos3SchedulePolicyBindTable." + ::= { qos3SchedulePolicyBindEntry 3 } + +--xxx.100.11.2.14 +qos3MapIntpExtendTable OBJECT-TYPE SYNTAX SEQUENCE OF Qos3MapIntpExtendEntry MAX-ACCESS not-accessible STATUS current @@ -12267,23 +13288,23 @@ Qos3MapIntpExtendEntry ::= SEQUENCE { qos3MapIntpExtendType INTEGER, - qos3MapIntpExtendIndex INTEGER, - qos3MapIntpExtendValue INTEGER, + qos3MapIntpExtendIndex INTEGER, + qos3MapIntpExtendValue INTEGER, qos3mapIntpExtendStatus INTEGER } --xxx.100.11.2.10.1.1 qos3MapIntpExtendType OBJECT-TYPE - SYNTAX INTEGER - { - intpToCos(0), - intpToDscp(1), - intpToExp(2), - intpToQueue(3), - intpToDp(4), - intpToIntpRed(5), - intpToIntpYellow(6) - } + SYNTAX INTEGER + { + intpToCos(0), + intpToDscp(1), + intpToExp(2), + intpToQueue(3), + intpToDp(4), + intpToIntpRed(5), + intpToIntpYellow(6) + } MAX-ACCESS read-only STATUS current DESCRIPTION @@ -12292,7 +13313,7 @@ qos3MapIntpExtendType OBJECT-TYPE --xxx.100.11.2.10.1.2 qos3MapIntpExtendIndex OBJECT-TYPE - SYNTAX INTEGER(0..119) + SYNTAX INTEGER(0..119) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -12301,7 +13322,7 @@ qos3MapIntpExtendIndex OBJECT-TYPE --xxx.100.11.2.10.1.3 qos3MapIntpExtendValue OBJECT-TYPE - SYNTAX INTEGER(0..119) + SYNTAX INTEGER(0..119) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -12310,27 +13331,27 @@ qos3MapIntpExtendValue OBJECT-TYPE --xxx.100.11.2.10.1.4 qos3mapIntpExtendStatus OBJECT-TYPE - SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + SYNTAX INTEGER + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION "the status of qos3MapIntpExtendTable" - ::= { qos3MapIntpExtendEntry 4 } + ::= { qos3MapIntpExtendEntry 4 } --xxx.100.11.2.15 -qos3EgressRemark OBJECT IDENTIFIER ::= { qos3 15 } +qos3EgressRemark OBJECT IDENTIFIER ::= { qos3 15 } --xxx.100.11.2.15.1 qos3EgressGreenRemark OBJECT-TYPE - SYNTAX INTEGER - { + SYNTAX INTEGER + { disable(0), enable(1) - } + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -12365,11 +13386,11 @@ ShowQos3VlanEntry showQos3VlanId INTEGER, showQos3PolicyDirection INTEGER, showQos3ClassmapName DisplayString, - showQos3VlanInCounter Counter64, + showQos3VlanInCounter Counter64, showQos3VlanOutCounter Counter64, - showQos3VlanGreenCounter Counter64, + showQos3VlanGreenCounter Counter64, showQos3VlanYellowCounter Counter64, - showQos3VlanRedCounter Counter64 + showQos3VlanRedCounter Counter64 } --xxx.100.11.2.16.1.1.1 @@ -12384,12 +13405,12 @@ showQos3VlanId OBJECT-TYPE --xxx.100.11.2.16.1.1.2 showQos3PolicyDirection OBJECT-TYPE SYNTAX INTEGER - { - in(0), - out(1), - pre(2), - ext(3) - } + { + in(0), + out(1), + pre(2), + ext(3) + } MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -12407,7 +13428,7 @@ showQos3ClassmapName OBJECT-TYPE --xxx.100.11.2.16.1.1.4 showQos3VlanInCounter OBJECT-TYPE - SYNTAX Counter64 + SYNTAX Counter64 MAX-ACCESS read-only STATUS current DESCRIPTION "in vlan counter" @@ -12415,7 +13436,7 @@ showQos3VlanInCounter OBJECT-TYPE --xxx.100.11.2.16.1.1.5 showQos3VlanOutCounter OBJECT-TYPE - SYNTAX Counter64 + SYNTAX Counter64 MAX-ACCESS read-only STATUS current DESCRIPTION "out vlan counter" @@ -12423,7 +13444,7 @@ showQos3VlanOutCounter OBJECT-TYPE --xxx.100.11.2.16.1.1.6 showQos3VlanGreenCounter OBJECT-TYPE - SYNTAX Counter64 + SYNTAX Counter64 MAX-ACCESS read-only STATUS current DESCRIPTION "green vlan counter" @@ -12431,7 +13452,7 @@ showQos3VlanGreenCounter OBJECT-TYPE --xxx.100.11.2.16.1.1.7 showQos3VlanYellowCounter OBJECT-TYPE - SYNTAX Counter64 + SYNTAX Counter64 MAX-ACCESS read-only STATUS current DESCRIPTION "yellow vlan counter" @@ -12439,12 +13460,141 @@ showQos3VlanYellowCounter OBJECT-TYPE --xxx.100.11.2.16.1.1.8 showQos3VlanRedCounter OBJECT-TYPE - SYNTAX Counter64 + SYNTAX Counter64 MAX-ACCESS read-only STATUS current DESCRIPTION "red vlan counter" ::= { showQos3VlanEntry 8 } - + + + +--xxx.100.11.2.17 +showQos3QueueStatisticsTable OBJECT-TYPE --add 2017/10/18 + SYNTAX SEQUENCE OF ShowQos3QueueStatisticsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " Show Qos3 Queue Statistics Table" + ::= { qos3 17} + +--xxx.100.11.2.17.1 +showQos3QueueStatisticsEntry OBJECT-TYPE + SYNTAX ShowQos3QueueStatisticsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "index is port id" + INDEX { showQos3QueueStatisticsPortIndex} + ::= { showQos3QueueStatisticsTable 1 } + +ShowQos3QueueStatisticsEntry + ::= SEQUENCE + { + showQos3QueueStatisticsPortIndex INTEGER, + showQos3QueueStatisticsQueueID INTEGER, + showQos3QueueStatisticsPassedPacket INTEGER, + showQos3QueueStatisticsDropedPacket INTEGER + + } + +--xxx.100.11.2.17.1.1 +showQos3QueueStatisticsPortIndex OBJECT-TYPE + SYNTAX INTEGER (1..2048) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + " show qos port id." + ::= { showQos3QueueStatisticsEntry 1 } + +--xxx.100.11.2.17.1.2 +showQos3QueueStatisticsQueueID OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "show qos queue id" + ::= { showQos3QueueStatisticsEntry 2 } + +--xxx.100.11.2.17.1.3 +showQos3QueueStatisticsPassedPacket OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "QoS queue statististics passed packet" + ::= { showQos3QueueStatisticsEntry 3 } + +--xxx.100.11.2.17.1.4 +showQos3QueueStatisticsDropedPacket OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION "QoS queue statististics drop packet" + ::= { showQos3QueueStatisticsEntry 4 } + +--xxx.100.11.2.18 +showQos3MCQueueStatisticsTable OBJECT-TYPE --add 2018/1/16 + SYNTAX SEQUENCE OF ShowQos3MCQueueStatisticsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " Show Qos3 MC-Queue Statistics Table" + ::= { qos3 18} + +--xxx.100.11.2.18.1 +showQos3MCQueueStatisticsEntry OBJECT-TYPE + SYNTAX ShowQos3MCQueueStatisticsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "index is port id for MC-QUEUE" + INDEX { showQos3MCQueueStatisticsPortIndex} + ::= { showQos3MCQueueStatisticsTable 1 } + +ShowQos3MCQueueStatisticsEntry + ::= SEQUENCE + { + showQos3MCQueueStatisticsPortIndex INTEGER, + showQos3MCQueueStatisticsQueueID INTEGER, + showQos3MCQueueStatisticsPassedPacket INTEGER, + showQos3MCQueueStatisticsDropedPacket INTEGER + + } + +--xxx.100.11.2.18.1.1 +showQos3MCQueueStatisticsPortIndex OBJECT-TYPE + SYNTAX INTEGER (1..2048) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + " show qos port id for MC-QUEUE." + ::= { showQos3MCQueueStatisticsEntry 1 } + +--xxx.100.11.2.18.1.2 +showQos3MCQueueStatisticsQueueID OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "show qos MC-queue id" + ::= { showQos3MCQueueStatisticsEntry 2 } + +--xxx.100.11.2.18.1.3 +showQos3MCQueueStatisticsPassedPacket OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "QoS MC-queue statististics passed packet" + ::= { showQos3MCQueueStatisticsEntry 3 } + +--xxx.100.11.2.18.1.4 +showQos3MCQueueStatisticsDropedPacket OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION "QoS MC-queue statististics drop packet" + ::= { showQos3MCQueueStatisticsEntry 4 } --******************************************************************************************************** --******************************************************************************************************** @@ -12478,7 +13628,7 @@ MirrorSrcCpuEntry --xxx.100.12.3.1.1 mirrorSrcCpuSession OBJECT-TYPE - SYNTAX INTEGER(4) + SYNTAX INTEGER(4) MAX-ACCESS read-only STATUS current DESCRIPTION "Session ID." @@ -12486,11 +13636,11 @@ mirrorSrcCpuSession OBJECT-TYPE --xxx.100.12.3.1.2 mirrorSrcCpuDirect OBJECT-TYPE - SYNTAX INTEGER - { - rx(1), - tx(2) - } + SYNTAX INTEGER + { + rx(1), + tx(2) + } MAX-ACCESS read-only STATUS current DESCRIPTION "Direction of mirror." @@ -12498,7 +13648,7 @@ mirrorSrcCpuDirect OBJECT-TYPE --xxx.100.12.3.1.3 mirrorSrcCpuSlot OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (0..16) MAX-ACCESS read-only STATUS current DESCRIPTION "Src cpu slot index." @@ -12506,12 +13656,12 @@ mirrorSrcCpuSlot OBJECT-TYPE --xxx.100.12.3.1.4 mirrorSrcCpuStatus OBJECT-TYPE - SYNTAX INTEGER - { - - active(1), - destroy(2) - } + SYNTAX INTEGER + { + + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION "Status." @@ -12554,7 +13704,7 @@ MirrorReflectorPortEntry --xxx.100.12.4.1.1 mirrorReflectorPortSession OBJECT-TYPE - SYNTAX INTEGER (1..4) + SYNTAX INTEGER (1..4) MAX-ACCESS read-only STATUS current DESCRIPTION "Session ID." @@ -12562,7 +13712,7 @@ mirrorReflectorPortSession OBJECT-TYPE --xxx.100.12.4.1.2 mirrorReflectorPort OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..54) MAX-ACCESS read-only STATUS current DESCRIPTION "mirror reflector destination port number." @@ -12571,12 +13721,12 @@ mirrorReflectorPort OBJECT-TYPE --xxx.100.12.4.1.3 mirrorReflectorPortStatus OBJECT-TYPE - SYNTAX INTEGER - { - - active(1), - destroy(2) - } + SYNTAX INTEGER + { + + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION "The configuration status of the reflector destination port and its associated session." @@ -12612,7 +13762,7 @@ MirrorRspanVlanEntry --xxx.100.12.5.1.1 mirrorRspanVlan OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4094) MAX-ACCESS read-only STATUS current DESCRIPTION "Vlan ID." @@ -12620,12 +13770,12 @@ mirrorRspanVlan OBJECT-TYPE --xxx.100.12.5.1.2 mirrorRspanVlanStatus OBJECT-TYPE - SYNTAX INTEGER - { - - active(1), - destroy(2) - } + SYNTAX INTEGER + { + + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION "Vlan status." @@ -12665,7 +13815,7 @@ MirrorRspanSessionEntry --xxx.100.12.6.1.1 mirrorRspanSession OBJECT-TYPE - SYNTAX INTEGER (1..4) + SYNTAX INTEGER (1..4) MAX-ACCESS read-only STATUS current DESCRIPTION "Session ID." @@ -12673,7 +13823,7 @@ mirrorRspanSession OBJECT-TYPE --xxx.100.12.6.1.2 mirrorRspanSessionVlan OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4094) MAX-ACCESS read-only STATUS current DESCRIPTION "Vlan ID." @@ -12681,12 +13831,12 @@ mirrorRspanSessionVlan OBJECT-TYPE --xxx.100.12.6.1.3 mirrorRspanSessionStatus OBJECT-TYPE - SYNTAX INTEGER - { - - active(1), - destroy(2) - } + SYNTAX INTEGER + { + + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION "The configuration status of the mirror session and its associated Rspan Vlan." @@ -12715,16 +13865,16 @@ MirrorDestGreEntry ::= SEQUENCE { mirrorDestGreSession INTEGER, - mirrorDestGrePort INTEGER, + mirrorDestGrePort INTEGER, mirrorDestMacAddr MacAddress, mirrorDestIP IpAddress, mirrorSrcIP IpAddress, - mirrorDestGreStatus INTEGER + mirrorDestGreStatus INTEGER } --xxx.100.12.7.1.1 mirrorDestGreSession OBJECT-TYPE - SYNTAX INTEGER (1..4) + SYNTAX INTEGER (1..4) MAX-ACCESS read-only STATUS current DESCRIPTION "Session ID." @@ -12732,44 +13882,44 @@ mirrorDestGreSession OBJECT-TYPE --xxx.100.12.7.1.2 mirrorDestGrePort OBJECT-TYPE -SYNTAX INTEGER +SYNTAX INTEGER (16000..20000) MAX-ACCESS read-only STATUS current DESCRIPTION "configure GRE port index." ::= { mirrorDestGreEntry 2 } --xxx.100.12.7.1.3 mirrorDestMacAddr OBJECT-TYPE - SYNTAX MacAddress(SIZE(17)) + SYNTAX MacAddress MAX-ACCESS read-create STATUS current DESCRIPTION "MAC address of equipment contacted with destination inferface." ::= { mirrorDestGreEntry 3 } --xxx.100.12.7.1.4 mirrorDestIP OBJECT-TYPE - SYNTAX IpAddress + SYNTAX IpAddress MAX-ACCESS read-create STATUS current DESCRIPTION "GRE destination IP address." ::= { mirrorDestGreEntry 4 } --xxx.100.12.7.1.5 mirrorSrcIP OBJECT-TYPE - SYNTAX IpAddress + SYNTAX IpAddress MAX-ACCESS read-create STATUS current DESCRIPTION "GRE source IP address." ::= { mirrorDestGreEntry 5 } --xxx.100.12.7.1.6 mirrorDestGreStatus OBJECT-TYPE - SYNTAX INTEGER - { - - active(1), - destroy(2) - } + SYNTAX INTEGER + { + + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION "Status." - ::= { mirrorDestGreEntry 6 } + ::= { mirrorDestGreEntry 6 } --******************************************************************************************************** --xxx.100.13.1 dhcpRelay OBJECT IDENTIFIER ::= { pridhcp 1 } @@ -12819,7 +13969,7 @@ DhcpRelayServerAddrEntry ::= SEQUENCE --xxx.100.13.1.2.1.1 dhcpRelayServerAddrVlanId OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4094) MAX-ACCESS not-accessible STATUS current DESCRIPTION "The ID of VLAN interface used by this table entry." @@ -12827,7 +13977,7 @@ dhcpRelayServerAddrVlanId OBJECT-TYPE --xxx.100.13.1.2.1.2 dhcpRelayServerAddrIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4094) MAX-ACCESS not-accessible STATUS current DESCRIPTION "The index of relay address set in the VLAN interface." @@ -12851,8 +14001,8 @@ dhcpRelayServerAddrStatus OBJECT-TYPE MAX-ACCESS read-write STATUS current DESCRIPTION "Configuration status." - ::= { dhcpRelayServerAddrEntry 4 } - + ::= { dhcpRelayServerAddrEntry 4 } + --xxx.100.13.1.3 dhcpRelayOption82Enalbe OBJECT-TYPE SYNTAX INTEGER @@ -12934,7 +14084,7 @@ dhcpRelayServerAddrStatus OBJECT-TYPE set(2), use slash to compart sub-option parameters, set(3), use space to compart sub-option parameters, the default value is set(2)." - ::= { dhcpRelay 8 } + ::= { dhcpRelay 8 } --xxx.100.13.1.9 dhcpRelayOptionSelfDefinedSubscriberIDFormat OBJECT-TYPE @@ -12962,7 +14112,7 @@ dhcpRelayServerAddrStatus OBJECT-TYPE DESCRIPTION "If set(0), then use hex format to generate remote ID, set(1), use ASCII format to generate remote ID, the default value is set(1)." - ::= { dhcpRelay 10 } + ::= { dhcpRelay 10 } --xxx.100.13.1.11 dhcpRelayOptionSelfDefinedSubscriberID OBJECT-TYPE @@ -12972,7 +14122,7 @@ dhcpRelayServerAddrStatus OBJECT-TYPE DESCRIPTION "If user does not configure the circuit-id of option82 explicitly on a port, then the user can self define format to generate the circuit-id, the format options include vlan, port, ID, self-designed string, the subscriber ID may be only one or any combination of them, - and is strictly generated according to the sequence of format options, the ID option includes + and is strictly generated according to the sequence of format options, the ID option includes switch ID and remote-mac, but the user just select only one of them, also In the swtich ID, it includes mac and hostname options, the user just select only one of two, the maximum length of self-designed striing is 64. If user input the string 'NULL', then delete the last configuration. @@ -13023,7 +14173,7 @@ DhcpRelayOption82InterfaceConfigureEntry ::= SEQUENCE --xxx.100.13.1.13.1.1 dhcpRelayOption82Vid OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4094) MAX-ACCESS not-accessible STATUS current DESCRIPTION "The Vlan interface being used by this table entry. @@ -13034,8 +14184,8 @@ dhcpRelayOption82Vid OBJECT-TYPE dhcpRelayOption82ForwardPolicy OBJECT-TYPE SYNTAX INTEGER { - drop(1), - keep(2), + drop(1), + keep(2), replace(3) } MAX-ACCESS read-write @@ -13054,7 +14204,48 @@ dhcpRelayOption82SubscriberID OBJECT-TYPE DESCRIPTION "If input the 'standard' string ,then use vlan and physical port format for option82 sub-option 1, other string, that be used as circuit-id of option82 sub-option 1, the default string is 'standard'." - ::= { dhcpRelayOption82InterfaceConfigureEntry 3 } + ::= { dhcpRelayOption82InterfaceConfigureEntry 3 } + +--xxx.100.13.1.14 +dhcpRelaySharevlanSubvlanConfigureTable OBJECT-TYPE + SYNTAX SEQUENCE OF DhcpRelaySharevlanSubvlanConfigureEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "the swith use the subvlan + to handle receving the dhcp request packets." + ::= { dhcpRelay 14 } + +--xxx.100.13.1.14.1 +dhcpRelaySharevlanSubvlanConfigureEntry OBJECT-TYPE + SYNTAX DhcpRelaySharevlanSubvlanConfigureEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "A conceptual row of dhcpRelaySharevlanSubvlanConfigureTable." + INDEX { dhcpRelaySharevlanSubvlanList } + ::= { dhcpRelaySharevlanSubvlanConfigureTable 1 } + +DhcpRelaySharevlanSubvlanConfigureEntry ::= SEQUENCE +{ + dhcpRelaySharevlanSubvlanList OCTET STRING, + dhcpRelayNoSharevlan INTEGER +} + +--xxx.100.13.1.14.1.1 +dhcpRelaySharevlanSubvlanList OBJECT-TYPE + SYNTAX OCTET STRING(SIZE(0..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "DHCP Relay: set the subvlan list for the sharevlan." + ::= { dhcpRelaySharevlanSubvlanConfigureEntry 1 } +--xxx.100.13.1.14.1.2 +dhcpRelayNoSharevlan OBJECT-TYPE + SYNTAX INTEGER{ + disable(0) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "DHCP Relay: UNset the subvlan list for the sharevlan." + ::= { dhcpRelaySharevlanSubvlanConfigureEntry 2 } --******************************************************************************************************** --xxx.100.13.2 @@ -13063,7 +14254,7 @@ dhcpRelayOption82SubscriberID OBJECT-TYPE --xxx.100.13.2.1 dhcpServerServiceStatus OBJECT-TYPE SYNTAX INTEGER - { + { enable(1), disable(0) } @@ -13077,7 +14268,7 @@ dhcpRelayOption82SubscriberID OBJECT-TYPE --xxx.100.13.2.2 dhcploggingStatus OBJECT-TYPE SYNTAX INTEGER - { + { enable(1), disable(0) } @@ -13090,7 +14281,7 @@ dhcpRelayOption82SubscriberID OBJECT-TYPE --********************************************************************************************************] --xxx.100.13.2.3 - dhcpPool OBJECT IDENTIFIER ::= { dhcpServer 3 } + dhcpPool OBJECT IDENTIFIER ::= { dhcpServer 3 } --******************************************************************************************************** @@ -13121,15 +14312,15 @@ dhcpPoolEntry OBJECT-TYPE DhcpPoolEntry ::= SEQUENCE { - dhcpPoolPoolName DisplayString, - dhcpPoolStatus INTEGER, - dhcpPoolAddressType INTEGER, - dhcpPoolAddress IpAddress, - dhcpPoolAddressPrefix IpAddress, - dhcpPoolAddressStatus INTEGER, - dhcpPoolMacAddress DisplayString, - dhcpPoolProType INTEGER, - dhcpPoolMacStatus INTEGER + dhcpPoolPoolName DisplayString, + dhcpPoolStatus INTEGER, + dhcpPoolAddressType INTEGER, + dhcpPoolAddress IpAddress, + dhcpPoolAddressPrefix IpAddress, + dhcpPoolAddressStatus INTEGER, + dhcpPoolMacAddress DisplayString, + dhcpPoolProType INTEGER, + dhcpPoolMacStatus INTEGER } --xxx.100.13.2.3.1.1.1 @@ -13143,10 +14334,10 @@ dhcpPoolPoolName OBJECT-TYPE --xxx.100.13.2.3.1.1.2 dhcpPoolStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(0) - } + { + active(1), + destroy(0) + } MAX-ACCESS read-create STATUS current DESCRIPTION "accession delete the pool,according to dhcpPoolName" @@ -13155,10 +14346,10 @@ dhcpPoolStatus OBJECT-TYPE --xxx.100.13.2.3.1.1.3 dhcpPoolAddressType OBJECT-TYPE SYNTAX INTEGER - { - network(1), - host(2) - } + { + network(1), + host(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION "configure dhcppool of address style" @@ -13171,7 +14362,7 @@ dhcpPoolAddress OBJECT-TYPE STATUS current DESCRIPTION "configurate dhcp pool. if dhcpPoolAddressType=1 configurate address range, - if dhcpPoolAddressType=2 configurate single address" + if dhcpPoolAddressType=2 configurate single address" ::= { dhcpPoolEntry 4 } --xxx.100.13.2.3.1.1.5 @@ -13185,10 +14376,10 @@ dhcpPoolAddressPrefix OBJECT-TYPE --xxx.100.13.2.3.1.1.6 dhcpPoolAddressStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(0) - } + { + active(1), + destroy(0) + } MAX-ACCESS read-create STATUS current DESCRIPTION "address of configuration satus" @@ -13213,10 +14404,10 @@ dhcpPoolProType OBJECT-TYPE --xxx.100.13.2.3.1.1.9 dhcpPoolMacStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(0) - } + { + active(1), + destroy(0) + } MAX-ACCESS read-create STATUS current DESCRIPTION "hardware address configure status.Condition: dhcpPoolAddressType(2)." @@ -13251,13 +14442,13 @@ dhcpPoolExpandEntry OBJECT-TYPE DhcpPoolExpandEntry ::= SEQUENCE { - dhcpPoolExpandName DisplayString, - dhcpPoolNetbiosNodeType INTEGER, - dhcpPoolDomainName DisplayString, - dhcpPoolBootFile DisplayString, - dhcpPoolCLid DisplayString, --- dhcpPoolCLname DisplayString, - dhcpPoolExpandstatus INTEGER + dhcpPoolExpandName DisplayString, + dhcpPoolNetbiosNodeType INTEGER, + dhcpPoolDomainName DisplayString, + dhcpPoolBootFile DisplayString, + dhcpPoolCLid DisplayString, +-- dhcpPoolCLname DisplayString, + dhcpPoolExpandstatus INTEGER } --xxx.100.13.2.3.2.1.1 @@ -13301,7 +14492,7 @@ dhcpPoolCLid OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION "set dhcp pool client id. - Condition: the pool of address is handcraft bind" + Condition: the pool of address is handcraft bind" ::= { dhcpPoolExpandEntry 5 } --xxx.100.13.2.3.2.1.6 @@ -13310,20 +14501,20 @@ dhcpPoolCLid OBJECT-TYPE -- MAX-ACCESS read-create -- STATUS current -- DESCRIPTION "configure user name. --- Condition: the pool address is handcraft bind." +-- Condition: the pool address is handcraft bind." -- ::= { dhcpPoolExpandEntry 6 } --xxx.100.13.2.3.2.1.7 dhcpPoolExpandstatus OBJECT-TYPE SYNTAX INTEGER - { - valid(0), - destroy(1) - } + { + valid(0), + destroy(1) + } MAX-ACCESS read-create STATUS current DESCRIPTION "if configure is valid(0),and the list of all configuration operatation accession - if configure is destroy(1),and the list of all configuration operation delet" + if configure is destroy(1),and the list of all configuration operation delet" ::= { dhcpPoolExpandEntry 7 } --******************************************************************************************************** @@ -13347,12 +14538,12 @@ dhcpLeaseTimeEntry OBJECT-TYPE DhcpLeaseTimeEntry ::= SEQUENCE { - dhcpLeaseTimePoolName DisplayString, - dhcpLeaseTimeType INTEGER, - dhcpLeaseTimeDay INTEGER, - dhcpLeaseTimeHours INTEGER, - dhcpLeaseTimeMinutes INTEGER, - dhcpLeaseTimeStatus INTEGER + dhcpLeaseTimePoolName DisplayString, + dhcpLeaseTimeType INTEGER, + dhcpLeaseTimeDay INTEGER, + dhcpLeaseTimeHours INTEGER, + dhcpLeaseTimeMinutes INTEGER, + dhcpLeaseTimeStatus INTEGER } --xxx.100.13.2.4.1.1 @@ -13367,10 +14558,10 @@ dhcpLeaseTimePoolName OBJECT-TYPE --xxx.100.13.2.4.1.2 dhcpLeaseTimeType OBJECT-TYPE SYNTAX INTEGER - { - temp(0), - infinite(1) - } + { + temp(0), + infinite(1) + } MAX-ACCESS read-create STATUS current DESCRIPTION "rent time style,0 is temporarily rent,1 is forever rent" @@ -13403,16 +14594,16 @@ dhcpLeaseTimeMinutes OBJECT-TYPE --xxx.100.13.2.4.1.6A dhcpLeaseTimeStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION "Setting this to active(1) creates an entry. Setting this to destroy(2) destroys an entry. - default status is 0,no opperation" + default status is 0,no opperation" ::= { dhcpLeaseTimeEntry 6 } --******************************************************************************************************** @@ -13436,12 +14627,12 @@ dhcpPoolOptionEntry OBJECT-TYPE DhcpPoolOptionEntry ::= SEQUENCE { - dhcpPoolOptionName DisplayString, - dhcpPoolOptionIndex INTEGER, - dhcpPoolOptionId INTEGER, - dhcpPoolOptionType INTEGER, - dhcpPoolOption DisplayString, - dhcpPoolOptionStatus INTEGER + dhcpPoolOptionName DisplayString, + dhcpPoolOptionIndex INTEGER, + dhcpPoolOptionId INTEGER, + dhcpPoolOptionType INTEGER, + dhcpPoolOption DisplayString, + dhcpPoolOptionStatus INTEGER } --xxx.100.13.2.5.1.1 @@ -13455,7 +14646,7 @@ dhcpPoolOptionName OBJECT-TYPE --xxx.100.13.2.5.1.2 dhcpPoolOptionIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (0..254) MAX-ACCESS not-accessible STATUS current DESCRIPTION "The index of option which has been set in this pool" @@ -13472,11 +14663,11 @@ dhcpPoolOptionId OBJECT-TYPE --xxx.100.13.2.5.1.4 dhcpPoolOptionType OBJECT-TYPE SYNTAX INTEGER - { - ascii(1), - hex(2), - ipaddress(3) - } + { + ascii(1), + hex(2), + ipaddress(3) + } MAX-ACCESS read-create STATUS current DESCRIPTION "dhcpPoolOptionType" @@ -13489,18 +14680,18 @@ dhcpPoolOption OBJECT-TYPE STATUS current DESCRIPTION " if dhcpPoolOptionType=1, ASCII string - if dhcpPoolOptionType=2, HEX string - if dhcpPoolOptionType=3,IP address" + if dhcpPoolOptionType=2, HEX string + if dhcpPoolOptionType=3,IP address" ::= { dhcpPoolOptionEntry 5 } --xxx.100.13.2.5.1.6 dhcpPoolOptionStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION "optional parameters configure status" @@ -13527,9 +14718,9 @@ dhcpServerExcludedIpAddrEntry OBJECT-TYPE DhcpServerExcludedIpAddrEntry ::= SEQUENCE { - dhcpServerExcludedIpAddrLowIp IpAddress, - dhcpServerExcludedIpAddrHiIp IpAddress, - dhcpServerExcludedIpAddrStatus INTEGER + dhcpServerExcludedIpAddrLowIp IpAddress, + dhcpServerExcludedIpAddrHiIp IpAddress, + dhcpServerExcludedIpAddrStatus INTEGER } --xxx.100.13.2.6.2 @@ -13552,11 +14743,11 @@ dhcpServerExcludedIpAddrHiIp OBJECT-TYPE --xxx.100.13.2.6.4 dhcpServerExcludedIpAddrStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION "Setting this to active(1) creates an entry. @@ -13571,7 +14762,7 @@ dhcpPoolDnsSerTable OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION " dhcpPool Dns Server Table:the maximum 8 dns is allowed - the first dns server has the highest priority.so address1 is highest priority,next is address2,address3..." + the first dns server has the highest priority.so address1 is highest priority,next is address2,address3..." ::= { dhcpServer 8 } --xxx.100.13.2.8.1 @@ -13585,21 +14776,21 @@ dhcpPoolDnsSerEntry OBJECT-TYPE DhcpPoolDnsSerEntry ::= SEQUENCE { - dhcpPoolDnsSerPoolName DisplayString, - dhcpPoolDnsSerIpAddress1 IpAddress, - dhcpPoolDnsSerIpAddress2 IpAddress, - dhcpPoolDnsSerIpAddress3 IpAddress, - dhcpPoolDnsSerIpAddress4 IpAddress, - dhcpPoolDnsSerIpAddress5 IpAddress, - dhcpPoolDnsSerIpAddress6 IpAddress, - dhcpPoolDnsSerIpAddress7 IpAddress, - dhcpPoolDnsSerIpAddress8 IpAddress, - dhcpPoolDnsSerStatus INTEGER + dhcpPoolDnsSerPoolName DisplayString, + dhcpPoolDnsSerIpAddress1 IpAddress, + dhcpPoolDnsSerIpAddress2 IpAddress, + dhcpPoolDnsSerIpAddress3 IpAddress, + dhcpPoolDnsSerIpAddress4 IpAddress, + dhcpPoolDnsSerIpAddress5 IpAddress, + dhcpPoolDnsSerIpAddress6 IpAddress, + dhcpPoolDnsSerIpAddress7 IpAddress, + dhcpPoolDnsSerIpAddress8 IpAddress, + dhcpPoolDnsSerStatus INTEGER } --xxx.100.13.2.8.1 dhcpPoolDnsSerPoolName OBJECT-TYPE - SYNTAX DisplayString + SYNTAX DisplayString (SIZE(1..32)) MAX-ACCESS not-accessible STATUS current DESCRIPTION "PoolName, simply specify a string which @@ -13673,11 +14864,11 @@ dhcpPoolDnsSerIpAddress8 OBJECT-TYPE --xxx.100.13.2.8.10 dhcpPoolDnsSerStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION "configure DNS server status" @@ -13707,16 +14898,16 @@ dhcpPoolDefaultRouterEntry OBJECT-TYPE DhcpPoolDefaultRouterEntry ::= SEQUENCE { - dhcpPoolDefaultRouterPoolName DisplayString, - dhcpPoolDefaultRouterIpAddress1 IpAddress, - dhcpPoolDefaultRouterIpAddress2 IpAddress, - dhcpPoolDefaultRouterIpAddress3 IpAddress, - dhcpPoolDefaultRouterIpAddress4 IpAddress, - dhcpPoolDefaultRouterIpAddress5 IpAddress, - dhcpPoolDefaultRouterIpAddress6 IpAddress, - dhcpPoolDefaultRouterIpAddress7 IpAddress, - dhcpPoolDefaultRouterIpAddress8 IpAddress, - dhcpPoolDefaultRouterStatus INTEGER + dhcpPoolDefaultRouterPoolName DisplayString, + dhcpPoolDefaultRouterIpAddress1 IpAddress, + dhcpPoolDefaultRouterIpAddress2 IpAddress, + dhcpPoolDefaultRouterIpAddress3 IpAddress, + dhcpPoolDefaultRouterIpAddress4 IpAddress, + dhcpPoolDefaultRouterIpAddress5 IpAddress, + dhcpPoolDefaultRouterIpAddress6 IpAddress, + dhcpPoolDefaultRouterIpAddress7 IpAddress, + dhcpPoolDefaultRouterIpAddress8 IpAddress, + dhcpPoolDefaultRouterStatus INTEGER } --xxx.100.13.2.9.1 @@ -13795,11 +14986,11 @@ dhcpPoolDefaultRouterIpAddress8 OBJECT-TYPE --xxx.100.13.2.9.10 dhcpPoolDefaultRouterStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION "configure default gateway state machine" @@ -13826,21 +15017,21 @@ dhcpPoolNextServerEntry OBJECT-TYPE DhcpPoolNextServerEntry ::= SEQUENCE { - dhcpPoolNextServerPoolName DisplayString, - dhcpPoolNextServerIpAddress1 IpAddress, - dhcpPoolNextServerIpAddress2 IpAddress, - dhcpPoolNextServerIpAddress3 IpAddress, - dhcpPoolNextServerIpAddress4 IpAddress, - dhcpPoolNextServerIpAddress5 IpAddress, - dhcpPoolNextServerIpAddress6 IpAddress, - dhcpPoolNextServerIpAddress7 IpAddress, - dhcpPoolNextServerIpAddress8 IpAddress, - dhcpPoolNextServerStatus INTEGER + dhcpPoolNextServerPoolName DisplayString, + dhcpPoolNextServerIpAddress1 IpAddress, + dhcpPoolNextServerIpAddress2 IpAddress, + dhcpPoolNextServerIpAddress3 IpAddress, + dhcpPoolNextServerIpAddress4 IpAddress, + dhcpPoolNextServerIpAddress5 IpAddress, + dhcpPoolNextServerIpAddress6 IpAddress, + dhcpPoolNextServerIpAddress7 IpAddress, + dhcpPoolNextServerIpAddress8 IpAddress, + dhcpPoolNextServerStatus INTEGER } --xxx.100.13.2.10.1 dhcpPoolNextServerPoolName OBJECT-TYPE - SYNTAX DisplayString + SYNTAX DisplayString (SIZE(1..32)) MAX-ACCESS not-accessible STATUS current DESCRIPTION "PoolName, simply specify a string which @@ -13914,11 +15105,11 @@ dhcpPoolNextServerIpAddress8 OBJECT-TYPE --xxx.100.13.2.10.10 dhcpPoolNextServerStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION "status machine" @@ -13945,16 +15136,16 @@ dhcpPoolWinsEntry OBJECT-TYPE DhcpPoolWinsEntry ::= SEQUENCE { - dhcpPoolWinsPoolName DisplayString, - dhcpPoolWinsIpAddress1 IpAddress, - dhcpPoolWinsIpAddress2 IpAddress, - dhcpPoolWinsIpAddress3 IpAddress, - dhcpPoolWinsIpAddress4 IpAddress, - dhcpPoolWinsIpAddress5 IpAddress, - dhcpPoolWinsIpAddress6 IpAddress, - dhcpPoolWinsIpAddress7 IpAddress, - dhcpPoolWinsIpAddress8 IpAddress, - dhcpPoolWinsStatus INTEGER + dhcpPoolWinsPoolName DisplayString, + dhcpPoolWinsIpAddress1 IpAddress, + dhcpPoolWinsIpAddress2 IpAddress, + dhcpPoolWinsIpAddress3 IpAddress, + dhcpPoolWinsIpAddress4 IpAddress, + dhcpPoolWinsIpAddress5 IpAddress, + dhcpPoolWinsIpAddress6 IpAddress, + dhcpPoolWinsIpAddress7 IpAddress, + dhcpPoolWinsIpAddress8 IpAddress, + dhcpPoolWinsStatus INTEGER } --xxx.100.13.2.11.1 @@ -14033,11 +15224,11 @@ dhcpPoolWinsIpAddress8 OBJECT-TYPE --xxx.100.13.2.11.10 dhcpPoolWinsStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION "configure wins server status machine" @@ -14063,10 +15254,10 @@ dhcpServerLeaseBindingEntry OBJECT-TYPE DhcpServerLeaseBindingEntry ::= SEQUENCE { - dhcpServerLeaseBindingIp IpAddress, - dhcpServerLeaseBindingType INTEGER, - dhcpServerLeaseBindingMac DisplayString, - dhcpServerLeaseBindingLeaseTime INTEGER + dhcpServerLeaseBindingIp IpAddress, + dhcpServerLeaseBindingType INTEGER, + dhcpServerLeaseBindingMac DisplayString, + dhcpServerLeaseBindingLeaseTime INTEGER } --xxx.100.13.2.12.1.1 @@ -14081,10 +15272,10 @@ dhcpServerLeaseBindingIp OBJECT-TYPE --xxx.100.13.2.12.1.2 dhcpServerLeaseBindingType OBJECT-TYPE SYNTAX INTEGER - { - manual(1), - dynamic(2) - } + { + manual(1), + dynamic(2) + } MAX-ACCESS read-only STATUS current DESCRIPTION "manual express handcraft bind style;dynamic express dynamic distribution style" @@ -14113,10 +15304,10 @@ dhcpServerLeaseBindingLeaseTime OBJECT-TYPE --xxx.100.13.3.1 dhcpSnoopingEnable OBJECT-TYPE SYNTAX INTEGER - { - noEnable(0), - enable(1) - } + { + noEnable(0), + enable(1) + } MAX-ACCESS read-create STATUS current DESCRIPTION "Enable the dhcp snooping function." @@ -14125,99 +15316,99 @@ dhcpServerLeaseBindingLeaseTime OBJECT-TYPE --xxx.100.13.3.2 dhcpSnoopingBindingEnalbe OBJECT-TYPE SYNTAX INTEGER - { - noEnable(0), - enable(1) - } + { + noEnable(0), + enable(1) + } MAX-ACCESS read-create STATUS current DESCRIPTION "Enable the dhcp snooping binding function." ::= { dhcpSnooping 2 } - + --xxx.100.13.3.3 dhcpSnoopingVlanEnable OBJECT-TYPE SYNTAX OCTET STRING MAX-ACCESS read-create STATUS current DESCRIPTION " Enable the dhcp snooping on vlan list string, the vlan list string is input - like as '1-2'. If the next time input the string '3-5',then the final vlan list - is '1-5'.If input the string 'NULL',then delete the whole vlan list." - ::= { dhcpSnooping 3 } + like as '1-2'. If the next time input the string '3-5',then the final vlan list + is '1-5'.If input the string 'NULL',then delete the whole vlan list." + ::= { dhcpSnooping 3 } --xxx.100.13.3.4 dhcpSnoopingInformationEnalbe OBJECT-TYPE SYNTAX INTEGER - { - noEnable(0), - enable(1) - } + { + noEnable(0), + enable(1) + } MAX-ACCESS read-create STATUS current DESCRIPTION "Enable the dhcp snooping information function." - ::= { dhcpSnooping 4 } - ---xxx.100.13.3.5 - dhcpSnoopingLimitRate OBJECT-TYPE + ::= { dhcpSnooping 4 } + +--xxx.100.13.3.5 + dhcpSnoopingLimitRate OBJECT-TYPE SYNTAX INTEGER(0..100) MAX-ACCESS read-create STATUS current DESCRIPTION "Configration of dhcp packets rate on the switch, the default rate of dhcp packets received is 100 pps." - ::= { dhcpSnooping 5} + ::= { dhcpSnooping 5} ---xxx.100.13.3.6 - dhcpSnoopingActionMaxNum OBJECT-TYPE +--xxx.100.13.3.6 + dhcpSnoopingActionMaxNum OBJECT-TYPE SYNTAX INTEGER(0..200) MAX-ACCESS read-create STATUS current DESCRIPTION "Configration of the maximum number of dhcp snooping action on a port, the default value is 10." - ::= { dhcpSnooping 6} - ---xxx.100.13.3.7 - dhcpSnoopingbindingARP OBJECT-TYPE - SYNTAX INTEGER - { - notBindingARP(0), - bindingARP(1) - } + ::= { dhcpSnooping 6} + +--xxx.100.13.3.7 + dhcpSnoopingbindingARP OBJECT-TYPE + SYNTAX INTEGER + { + notBindingARP(0), + bindingARP(1) + } MAX-ACCESS read-create STATUS current DESCRIPTION "If set(0), the static ARP entry is not added when the dhcp snooping is created, - if set(1), the static ARP entry is added according to the dhcp snooping binding, - the priority of this static ARP entry is lower than that configured by administrator." - ::= { dhcpSnooping 7} + if set(1), the static ARP entry is added according to the dhcp snooping binding, + the priority of this static ARP entry is lower than that configured by administrator." + ::= { dhcpSnooping 7} --xxx.100.13.3.8 dhcpSnoopingInformationOptionDelimiter OBJECT-TYPE SYNTAX INTEGER - { - colon(0), - dot(1), - slash(2), - space(3) - } + { + colon(0), + dot(1), + slash(2), + space(3) + } MAX-ACCESS read-create STATUS current DESCRIPTION "If set(0), then use colon to compart sub-option parameters, - set(1), use dot to compart sub-option parameters, - set(2), use slash to compart sub-option parameters, - set(3), use space to compart sub-option parameters - the default value is set(2)." - ::= { dhcpSnooping 8 } + set(1), use dot to compart sub-option parameters, + set(2), use slash to compart sub-option parameters, + set(3), use space to compart sub-option parameters + the default value is set(2)." + ::= { dhcpSnooping 8 } --xxx.100.13.3.9 dhcpSnoopingInformationOptionSubscriberIDFormat OBJECT-TYPE SYNTAX INTEGER - { - hex(0), - acsii(1), - vs-hp(2) - } + { + hex(0), + acsii(1), + vs-hp(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION "If set(0), then use hex format of vlan and mac address, - set(1), use ACSII format of vlan and mac address, - set(2), use vs-hp format to keep compatibility with HP, - the default value is set(1)." + set(1), use ACSII format of vlan and mac address, + set(2), use vs-hp format to keep compatibility with HP, + the default value is set(1)." ::= { dhcpSnooping 9 } --xxx.100.13.3.10 @@ -14226,81 +15417,81 @@ dhcpServerLeaseBindingLeaseTime OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION "If input the 'standard' string ,then use vlan mac address format for option82 sub-option 2, - other string, that be used as romote ID of option82 sub-option 2, - the default string is 'standard'." + other string, that be used as romote ID of option82 sub-option 2, + the default string is 'standard'." ::= { dhcpSnooping 10 } - ---xxx.100.13.3.11 - dhcpSnoopingInformationOptionAllowUntrusted OBJECT-TYPE - SYNTAX INTEGER - { - notAllowUntrusted(0), - allowUntrusted(1) - } + +--xxx.100.13.3.11 + dhcpSnoopingInformationOptionAllowUntrusted OBJECT-TYPE + SYNTAX INTEGER + { + notAllowUntrusted(0), + allowUntrusted(1) + } MAX-ACCESS read-create STATUS current DESCRIPTION "If set(0), the dhcp packets with option82 are discarded, - if set (1), the dhcp packets with option82 are permitted, and the content of option82 is not changed." + if set (1), the dhcp packets with option82 are permitted, and the content of option82 is not changed." ::= { dhcpSnooping 11 } --xxx.100.13.3.12 dhcpSnoopingOptionSelfDefinedSubscriberIDFormat OBJECT-TYPE SYNTAX INTEGER - { - hex(0), - ascii(1) - } + { + hex(0), + ascii(1) + } MAX-ACCESS read-create STATUS current DESCRIPTION "If set(0), then use ASCII format to generate sub-scriber ID, - set(1), use hex format to generate sub-scriber ID, - the default value is set(1)." - ::= { dhcpSnooping 12 } + set(1), use hex format to generate sub-scriber ID, + the default value is set(1)." + ::= { dhcpSnooping 12 } --xxx.100.13.3.13 dhcpSnoopingOptionSelfDefinedRemoteIDFormat OBJECT-TYPE SYNTAX INTEGER - { - hex(0), - ascii(1) - } + { + hex(0), + ascii(1) + } MAX-ACCESS read-create STATUS current DESCRIPTION "If set(0), then use ASCII format to generate remote ID, - set(1), use hex format to generate remote ID, - the default value is set(1)." - ::= { dhcpSnooping 13 } + set(1), use hex format to generate remote ID, + the default value is set(1)." + ::= { dhcpSnooping 13 } --xxx.100.13.3.14 - dhcpSnoopingOptionSelfDefinedSubscriberID OBJECT-TYPE + dhcpSnoopingOptionSelfDefinedSubscriberID OBJECT-TYPE SYNTAX DisplayString(SIZE(1..128)) MAX-ACCESS read-create STATUS current DESCRIPTION "If user does not configure the circuit-id of option82 explicitly on a port, then - the user can self define format to generate the circuit-id, the format options include - vlan, port, ID, self designed string, the subscriber ID may be only one or any combination of - them,and is strictly generated according to the sequence of format options, the ID option - includes switch ID and remote-mac, but the user just selects only one of them, also In the - swtich ID, it includes mac and hostname options, the user just selects only one of two, the - maximum length of self-designed striing is 64. - if user inputs the string 'NULL', then delete the last configuration. - For example, if select vlan ,ID(swtich-id(mac)), and string 'str' format, - the user can input the string like as 'vlan id swtich-id mac string str'." - ::= { dhcpSnooping 14 } - + the user can self define format to generate the circuit-id, the format options include + vlan, port, ID, self designed string, the subscriber ID may be only one or any combination of + them,and is strictly generated according to the sequence of format options, the ID option + includes switch ID and remote-mac, but the user just selects only one of them, also In the + swtich ID, it includes mac and hostname options, the user just selects only one of two, the + maximum length of self-designed striing is 64. + if user inputs the string 'NULL', then delete the last configuration. + For example, if select vlan ,ID(swtich-id(mac)), and string 'str' format, + the user can input the string like as 'vlan id swtich-id mac string str'." + ::= { dhcpSnooping 14 } + --xxx.100.13.3.15 dhcpSnoopingOptionSelfDefinedRemoteID OBJECT-TYPE SYNTAX DisplayString(SIZE(1..64)) MAX-ACCESS read-create STATUS current DESCRIPTION "If user does not configure the remote-id of option82 explicitly on a port, then - the user can self define format to generate the remote-id, the format options include - mac,hostname and self designed string, the remote ID may be only one or any combination of - them,and is strictly generated according to the sequence of format options, - the maximum length of self designed striing is 32. - If user inputs the string 'NULL', then delete the last configuration. - For example, if select hostname,mac,and string 'str' format, - the user can input the string like as 'hostname mac string str'." + the user can self define format to generate the remote-id, the format options include + mac,hostname and self designed string, the remote ID may be only one or any combination of + them,and is strictly generated according to the sequence of format options, + the maximum length of self designed striing is 32. + If user inputs the string 'NULL', then delete the last configuration. + For example, if select hostname,mac,and string 'str' format, + the user can input the string like as 'hostname mac string str'." ::= { dhcpSnooping 15 } --xxx.100.13.3.16 @@ -14309,24 +15500,24 @@ dhcpServerLeaseBindingLeaseTime OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION "Clear the dhcp snooping bindings, the user can specify the mac address and vlan ID, - or interface name and vlan ID ,or vlan ID, if input 'all' string, then clear all of the - bindings,if input 'mac 00-24-e3-3a-f3-24 vlan 2', then clear the bindings with mac address - 00-24-e3-3a-f3-24 in the vlan 2, if input 'interface ethernet0/0/1 vlan 2', then clear all of - the bidings on the interface ethernet0/0/1 in the vlan 2, if input 'vlan 1' string ,then clear - all of bindings in the vlan 1." + or interface name and vlan ID ,or vlan ID, if input 'all' string, then clear all of the + bindings,if input 'mac 00-24-e3-3a-f3-24 vlan 2', then clear the bindings with mac address + 00-24-e3-3a-f3-24 in the vlan 2, if input 'interface ethernet0/0/1 vlan 2', then clear all of + the bidings on the interface ethernet0/0/1 in the vlan 2, if input 'vlan 1' string ,then clear + all of bindings in the vlan 1." ::= { dhcpSnooping 16 } ---************************************************************************ +--************************************************************************ --dhcp snooping sub table --************************************************************************ --dhcpSnoopingPortConfigTable --xxx.100.13.3.17 - dhcpSnoopingPortConfigTable OBJECT-TYPE + dhcpSnoopingPortConfigTable OBJECT-TYPE SYNTAX SEQUENCE OF DhcpSnoopingPortConfigEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION "After enable the dhcp snooping function, the administrator can configure the port information." ::= { dhcpSnooping 17 } - + --xxx.100.13.3.17.1 dhcpSnoopingPortConfigEntry OBJECT-TYPE SYNTAX DhcpSnoopingPortConfigEntry @@ -14338,19 +15529,19 @@ dhcpSnoopingPortConfigEntry OBJECT-TYPE DhcpSnoopingPortConfigEntry ::= SEQUENCE { - dhcpSnoopingPortIndex INTEGER, - dhcpSnoopingUserControlMaxNum INTEGER, - dhcpSnoopingUserControl INTEGER, - dhcpSnoopingTrust OCTET STRING, - dhcpSnoopingBindingDot1x INTEGER, - dhcpSnoopingSubScriberID DisplayString, - dhcpSnoopingAlarmCount INTEGER, - dhcpSnoopingBindingCount INTEGER + dhcpSnoopingPortIndex INTEGER, + dhcpSnoopingUserControlMaxNum INTEGER, + dhcpSnoopingUserControl INTEGER, + dhcpSnoopingTrust OCTET STRING, + dhcpSnoopingBindingDot1x INTEGER, + dhcpSnoopingSubScriberID DisplayString, + dhcpSnoopingAlarmCount INTEGER, + dhcpSnoopingBindingCount INTEGER } --xxx.100.13.3.17.1.1 dhcpSnoopingPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION "Configure the dhcp snooping function on the specified port." @@ -14362,21 +15553,21 @@ dhcpSnoopingUserControlMaxNum OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION "Configure the maximum of the binding users on a port, the range of binding users number is - 0-1024,the default number is 1024." + 0-1024,the default number is 1024." ::= { dhcpSnoopingPortConfigEntry 2 } --xxx.100.13.3.17.1.3 dhcpSnoopingUserControl OBJECT-TYPE SYNTAX INTEGER - { - notEnable(0), - enable(1) - } + { + notEnable(0), + enable(1) + } MAX-ACCESS read-create STATUS current DESCRIPTION "If set(0), not enable the user control function on a specified port, - if set(1), enable the user control function on a specified port, - the default value is set(0)." + if set(1), enable the user control function on a specified port, + the default value is set(0)." ::= { dhcpSnoopingPortConfigEntry 3 } --xxx.100.13.3.17.1.4 @@ -14385,59 +15576,59 @@ dhcpSnoopingTrust OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION "Configure trust function on a port or vlan list string.If input the string 'all', then trust - all the vlan. If input the string '1-2', then only trust the DHCP packets with that - vlan ID is 1 or 2. If input string 'NULL', then close the trust function on the port." + all the vlan. If input the string '1-2', then only trust the DHCP packets with that + vlan ID is 1 or 2. If input string 'NULL', then close the trust function on the port." ::= { dhcpSnoopingPortConfigEntry 4 } --xxx.100.13.3.17.1.5 dhcpSnoopingBindingDot1x OBJECT-TYPE SYNTAX INTEGER - { - notEnable(0), - enable(1) - } + { + notEnable(0), + enable(1) + } MAX-ACCESS read-create STATUS current DESCRIPTION "If set(0), not enable to notify dhcp snooping binding information to Dot1x module, - if set(1), enable to notify dhcp snooping binding information to Dot1x module, - the default value is set(0)." + if set(1), enable to notify dhcp snooping binding information to Dot1x module, + the default value is set(0)." ::= { dhcpSnoopingPortConfigEntry 5 } - + --xxx.100.13.3.17.1.6 dhcpSnoopingSubScriberID OBJECT-TYPE SYNTAX DisplayString(SIZE(1..32)) MAX-ACCESS read-create STATUS current DESCRIPTION "If input the 'standard' string ,then use vlan mac address format for option82 sub-option 2, - other string, that be used as romote ID of option82 sub-option 2, - the default string is 'standard'." + other string, that be used as romote ID of option82 sub-option 2, + the default string is 'standard'." ::= { dhcpSnoopingPortConfigEntry 6 } - + --xxx.100.13.3.17.1.7 dhcpSnoopingAlarmCount OBJECT-TYPE SYNTAX INTEGER MAX-ACCESS read-only STATUS current DESCRIPTION "Show the alarm count of dhcp snooping on a specified port." - ::= { dhcpSnoopingPortConfigEntry 7} - + ::= { dhcpSnoopingPortConfigEntry 7} + --xxx.100.13.3.17.1.8 dhcpSnoopingBindingCount OBJECT-TYPE SYNTAX INTEGER MAX-ACCESS read-only STATUS current DESCRIPTION "Show the binding count of dhcp snooping on a specified port." - ::= { dhcpSnoopingPortConfigEntry 8} - + ::= { dhcpSnoopingPortConfigEntry 8} + --******************************************************************** --xxx.100.13.3.18 - dhcpSnoopingPortActionTable OBJECT-TYPE + dhcpSnoopingPortActionTable OBJECT-TYPE SYNTAX SEQUENCE OF DhcpSnoopingPortActionEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION "After enable the dhcp snooping function, the administrator can configure the port action." ::= { dhcpSnooping 18 } - + --xxx.100.13.3.18.1 dhcpSnoopingPortActionEntry OBJECT-TYPE SYNTAX DhcpSnoopingPortActionEntry @@ -14449,10 +15640,10 @@ dhcpSnoopingPortActionEntry OBJECT-TYPE DhcpSnoopingPortActionEntry ::= SEQUENCE { - dhcpSnoopingPort INTEGER, - dhcpSnoopingActionType INTEGER, - dhcpSnoopingActionRecoveryTime INTEGER, - dhcpSnoopingActionStatus INTEGER + dhcpSnoopingPort INTEGER, + dhcpSnoopingActionType INTEGER, + dhcpSnoopingActionRecoveryTime INTEGER, + dhcpSnoopingActionStatus INTEGER } --xxx.100.13.3.18.1.1 dhcpSnoopingPort OBJECT-TYPE @@ -14461,20 +15652,20 @@ dhcpSnoopingPort OBJECT-TYPE STATUS current DESCRIPTION "Configure the dhcp snooping function on the specified port." ::= { dhcpSnoopingPortActionEntry 1 } - + --xxx.100.13.3.18.1.2 dhcpSnoopingActionType OBJECT-TYPE SYNTAX INTEGER - { - noAction(0), - shutdown(1), - blackhole(2) - } + { + noAction(0), + shutdown(1), + blackhole(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION "If set(0), not to add any action, - if set(1), add shutdown action , - and if set(2), add blackhole action on a port when detectd the DHCP server protended ." + if set(1), add shutdown action , + and if set(2), add blackhole action on a port when detectd the DHCP server protended ." ::= { dhcpSnoopingPortActionEntry 2 } --xxx.100.13.3.18.1.3 @@ -14483,23 +15674,23 @@ dhcpSnoopingActionRecoveryTime OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION "Configure the recovery time of action, the range time is 10-3600 seconds, - the default value is 30 seconds." + the default value is 30 seconds." ::= { dhcpSnoopingPortActionEntry 3 } --xxx.100.13.3.18.1.4 dhcpSnoopingActionStatus OBJECT-TYPE SYNTAX INTEGER - { - destroy(0), - active(1) - } + { + destroy(0), + active(1) + } MAX-ACCESS read-create STATUS current DESCRIPTION "If set(0), then destory an aciton configured previously, - if set(1), then configure an action on a port." + if set(1), then configure an action on a port." ::= { dhcpSnoopingPortActionEntry 4 } - ---******************************************************************** + +--******************************************************************** --dhcpSnoopingStaticBindingTable --xxx.100.13.3.19 dhcpSnoopingStaticBindingTable OBJECT-TYPE @@ -14507,9 +15698,9 @@ dhcpSnoopingStaticBindingTable OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION "After enable the dhcp snooping function, the administrator can configure or delete the dhcp - snooping static binding." + snooping static binding." ::= { dhcpSnooping 19 } - + --xxx.100.13.3.19.1 dhcpSnoopingStaticBindingEntry OBJECT-TYPE SYNTAX DhcpSnoopingStaticBindingEntry @@ -14523,11 +15714,11 @@ DhcpSnoopingStaticBindingEntry ::= SEQUENCE { dhcpSnoopingStaticBindingMAC OCTET STRING, dhcpSnoopingStaticBindingIP IpAddress, - dhcpSnoopingStaticBindingMAC OCTET STRING, - dhcpSnoopingStaticBindingMask IpAddress, + dhcpSnoopingStaticBindingMAC OCTET STRING, + dhcpSnoopingStaticBindingMask IpAddress, dhcpSnoopingStaticBindingPort INTEGER, dhcpSnoopingStaticBindingVid INTEGER, - dhcpSnoopingStaticBindingStatus INTEGER + dhcpSnoopingStaticBindingStatus INTEGER } --xxx.100.13.3.19.1.1 @@ -14553,7 +15744,7 @@ dhcpSnoopingStaticBindingMask OBJECT-TYPE STATUS current DESCRIPTION "Configure the IP address mask of the static binding." ::= { dhcpSnoopingStaticBindingEntry 3 } - + --xxx.100.13.3.19.1.4 dhcpSnoopingStaticBindingPort OBJECT-TYPE SYNTAX INTEGER @@ -14569,21 +15760,21 @@ dhcpSnoopingStaticBindingVid OBJECT-TYPE STATUS current DESCRIPTION "Configure the vlan ID of the static binding." ::= { dhcpSnoopingStaticBindingEntry 5 } - + --xxx.100.13.3.19.1.6 dhcpSnoopingStaticBindingStatus OBJECT-TYPE SYNTAX INTEGER - { - destory(0), - active(1) - } + { + destory(0), + active(1) + } MAX-ACCESS read-create STATUS current DESCRIPTION "If set(0), then distory a specified static binding that has been configured, - if set(1), create a specified static binding according to the input content." - ::= { dhcpSnoopingStaticBindingEntry 6 } ---**************************************************************** ---dhcpSnoopingAckBindingInfoTable + if set(1), create a specified static binding according to the input content." + ::= { dhcpSnoopingStaticBindingEntry 6 } +--**************************************************************** +--dhcpSnoopingAckBindingInfoTable --**************************************************************** --xxx.100.13.3.20 dhcpSnoopingAckBindingInfoTable OBJECT-TYPE @@ -14592,7 +15783,7 @@ dhcpSnoopingAckBindingInfoTable OBJECT-TYPE STATUS current DESCRIPTION "Show the specified bindings after received the DHCP ACK packets." ::= { dhcpSnooping 20 } - + --xxx.100.13.3.20.1 dhcpSnoopingAckBindingInfoEntry OBJECT-TYPE SYNTAX DhcpSnoopingAckBindingInfoEntry @@ -14605,11 +15796,11 @@ dhcpSnoopingAckBindingInfoEntry OBJECT-TYPE DhcpSnoopingAckBindingInfoEntry ::= SEQUENCE { dhcpSnoopingAckBindingIP IpAddress, - dhcpSnoopingAckBindingMAC OCTET STRING, - dhcpSnoopingAckBindingPort INTEGER, - dhcpSnoopingAckBindingVid INTEGER, - dhcpSnoopingAckBindingLease Counter32, - dhcpSnoopingAckBindingFlag DisplayString + dhcpSnoopingAckBindingMAC OCTET STRING, + dhcpSnoopingAckBindingPort INTEGER, + dhcpSnoopingAckBindingVid INTEGER, + dhcpSnoopingAckBindingLease Counter32, + dhcpSnoopingAckBindingFlag DisplayString } --xxx.100.13.3.20.1.1 @@ -14619,7 +15810,7 @@ dhcpSnoopingAckBindingIP OBJECT-TYPE STATUS current DESCRIPTION "The one IP address just only identifies one ack binding entry." ::= { dhcpSnoopingAckBindingInfoEntry 1 } - + --xxx.100.13.3.20.1.2 dhcpSnoopingAckBindingMAC OBJECT-TYPE SYNTAX OCTET STRING(SIZE(17)) @@ -14650,7 +15841,7 @@ dhcpSnoopingAckBindingLease OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION "Show the lease of the ack binding. The lease of static binding is infinite, the lease of dynamic binding comes from the DHCP - reply packets of dhcp server." + reply packets of dhcp server." ::= { dhcpSnoopingAckBindingInfoEntry 5 } --xxx.100.13.3.20.1.6 @@ -14660,12 +15851,12 @@ dhcpSnoopingAckBindingFlag OBJECT-TYPE STATUS current DESCRIPTION "Show the type of the ack binding. The flag 'S' indentifies the static type binding, 'D' indentifies the dynamic type binding, 'U' indentifies that bindings are uploaded from the server, 'O' indentifies that DHCP request packet is - with option82 information, 'X' indentifies that the bindings have been notified Dot1x module, and the + with option82 information, 'X' indentifies that the bindings have been notified Dot1x module, and the client is control under the Dot1x function, 'L' indentifies that the binding entry has been sent to the driver, 'E' indentifies that the notification to Dot1x module is failed." - ::= { dhcpSnoopingAckBindingInfoEntry 6 } + ::= { dhcpSnoopingAckBindingInfoEntry 6 } --************************************************************ ---dhcpSnoopingRequestBindingInfoTable +--dhcpSnoopingRequestBindingInfoTable --xxx.100.13.3.21 dhcpSnoopingRequestBindingInfoTable OBJECT-TYPE SYNTAX SEQUENCE OF DhcpSnoopingRequestBindingInfoEntry @@ -14673,7 +15864,7 @@ dhcpSnoopingRequestBindingInfoTable OBJECT-TYPE STATUS current DESCRIPTION "Show the specified bindings after received the DHCP request packets." ::= { dhcpSnooping 21 } - + --xxx.100.13.3.21.1 dhcpSnoopingRequestBindingInfoEntry OBJECT-TYPE SYNTAX DhcpSnoopingRequestBindingInfoEntry @@ -14686,10 +15877,10 @@ dhcpSnoopingRequestBindingInfoEntry OBJECT-TYPE DhcpSnoopingRequestBindingInfoEntry ::= SEQUENCE { dhcpSnoopingRequestBindingIP IpAddress, - dhcpSnoopingRequestBindingMAC OCTET STRING, - dhcpSnoopingRequestBindingPort INTEGER, - dhcpSnoopingRequestBindingVid INTEGER, - dhcpSnoopingRequestBindingLease Counter32 + dhcpSnoopingRequestBindingMAC OCTET STRING, + dhcpSnoopingRequestBindingPort INTEGER, + dhcpSnoopingRequestBindingVid INTEGER, + dhcpSnoopingRequestBindingLease Counter32 } --xxx.100.13.3.21.1.1 @@ -14699,7 +15890,7 @@ dhcpSnoopingRequestBindingIP OBJECT-TYPE STATUS current DESCRIPTION "The one IP address just only identifies one Request binding entry." ::= { dhcpSnoopingRequestBindingInfoEntry 1 } - + --xxx.100.13.3.21.1.2 dhcpSnoopingRequestBindingMAC OBJECT-TYPE SYNTAX OCTET STRING(SIZE(17)) @@ -14723,16 +15914,16 @@ dhcpSnoopingRequestBindingVid OBJECT-TYPE STATUS current DESCRIPTION "Show the Vid information of the Request binding." ::= { dhcpSnoopingRequestBindingInfoEntry 4 } - + --xxx.100.13.3.21.1.5 dhcpSnoopingRequestBindingLease OBJECT-TYPE SYNTAX Counter32 MAX-ACCESS read-only STATUS current DESCRIPTION "Show the lease of the Request binding." - ::= { dhcpSnoopingRequestBindingInfoEntry 5 } + ::= { dhcpSnoopingRequestBindingInfoEntry 5 } --******************************************************************* ---dhcpSnoopingAlarmInfoTable +--dhcpSnoopingAlarmInfoTable --******************************************************************* --xxx.100.13.3.22 dhcpSnoopingAlarmInfoTable OBJECT-TYPE @@ -14754,7 +15945,7 @@ dhcpSnoopingAlarmInfoEntry OBJECT-TYPE DhcpSnoopingAlarmInfoEntry ::= SEQUENCE { dhcpSnoopingAlarmInfoPortIndex INTEGER, - dhcpSnoopingAlarmInfoNum INTEGER, + dhcpSnoopingAlarmInfoNum INTEGER, dhcpSnoopingAlarmInfoType INTEGER, dhcpSnoopingAlarmInfoBlackholeMAC OCTET STRING, dhcpSnoopingAlarmInfoRecoveryTime DisplayString, @@ -14763,7 +15954,7 @@ DhcpSnoopingAlarmInfoEntry ::= SEQUENCE --xxx.100.13.3.22.1.1 dhcpSnoopingAlarmInfoPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION "The port sequence of the alarm events." @@ -14771,11 +15962,11 @@ dhcpSnoopingAlarmInfoPortIndex OBJECT-TYPE --xxx.100.13.3.22.1.2 dhcpSnoopingAlarmInfoNum OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS not-accessible STATUS current DESCRIPTION "The sequence of the alarm events on a port." - ::= { dhcpSnoopingAlarmInfoEntry 2 } + ::= { dhcpSnoopingAlarmInfoEntry 2 } --xxx.100.13.3.22.1.3 dhcpSnoopingAlarmInfoType OBJECT-TYPE @@ -14800,7 +15991,7 @@ dhcpSnoopingAlarmInfoRecoveryTime OBJECT-TYPE STATUS current DESCRIPTION "Show the recovery time of the alarm event." ::= { dhcpSnoopingAlarmInfoEntry 5 } - + --xxx.100.13.3.22.1.6 dhcpSnoopingAlarmInfoRecoveryActionStatus OBJECT-TYPE SYNTAX INTEGER @@ -14809,7 +16000,7 @@ dhcpSnoopingAlarmInfoRecoveryActionStatus OBJECT-TYPE DESCRIPTION "Show the status of the recovery action." ::= { dhcpSnoopingAlarmInfoEntry 6 } --********************************************************************** ---dhcpSnoopingStatisticTable +--dhcpSnoopingStatisticTable --********************************************************************** --xxx.100.13.3.23 dhcpSnoopingStatisticTable OBJECT IDENTIFIER ::= { dhcpSnooping 23 } @@ -14828,7 +16019,7 @@ dhcpSnoopingStatisticAckBindingNum OBJECT-TYPE STATUS current DESCRIPTION "Show the total number of the ack bindings." ::= { dhcpSnoopingStatisticTable 2 } - + --xxx.100.13.3.23.1.3 dhcpSnoopingStatisticRequestBindingNum OBJECT-TYPE SYNTAX INTEGER @@ -14851,244 +16042,308 @@ dhcpSnoopingStatisticDiscardPktsNum OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION "Show the total number of the discarded packets." - ::= { dhcpSnoopingStatisticTable 5 } + ::= { dhcpSnoopingStatisticTable 5 } + +--******************************************************************************************************** +--dhcpSnoopingBlockedInfoTable +--******************************************************************* +--xxx.100.13.3.24 +dhcpSnoopingBlockedInfoTable OBJECT-TYPE + SYNTAX SEQUENCE OF DhcpSnoopingBlockedInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "Show the dhcp snooping blocked information." + ::= { dhcpSnooping 24 } + +--xxx.100.13.3.24.1 +dhcpSnoopingBlockedInfoEntry OBJECT-TYPE + SYNTAX DhcpSnoopingBlockedInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "A conceptual row of dhcpSnoopingBlockedInfoTable." + INDEX { dhcpSnoopingBlockedInfoPortIndex, dhcpSnoopingBlockedInfoRecordingTime} + ::= { dhcpSnoopingBlockedInfoTable 1 } + +DhcpSnoopingBlockedInfoEntry ::= SEQUENCE +{ + dhcpSnoopingBlockedInfoPortIndex INTEGER, + dhcpSnoopingBlockedInfoRecordingTime INTEGER, + dhcpSnoopingBlockedInfoShow OCTET STRING +} + +--xxx.100.13.3.24.1.1 +dhcpSnoopingBlockedInfoPortIndex OBJECT-TYPE + SYNTAX INTEGER (1..2048) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "The port sequence of the blocked information." + ::= { dhcpSnoopingBlockedInfoEntry 1 } + +--xxx.100.13.3.24.1.2 +dhcpSnoopingBlockedInfoRecordingTime OBJECT-TYPE + SYNTAX INTEGER (1..2147483647) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "The recording time of one blocked info entry on a port." + ::= { dhcpSnoopingBlockedInfoEntry 2 } + +--xxx.100.13.3.24.1.3 +dhcpSnoopingBlockedInfoShow OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Show the blocked information of one blocked info entry." + ::= { dhcpSnoopingBlockedInfoEntry 3 } + --******************************************************************************************************** --portGroupMgt --xxx.100.14.1 - systemPriority OBJECT-TYPE - SYNTAX INTEGER (0..65535) - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Modify the system priority which is used by port group." - ::= { priportGroup 1 } - + systemPriority OBJECT-TYPE + SYNTAX INTEGER (0..65535) + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Modify the system priority which is used by port group." + ::= { priportGroup 1 } + --xxx.100.14.2 - portGroupTable OBJECT-TYPE - SYNTAX SEQUENCE OF PortGroupEntry + portGroupTable OBJECT-TYPE + SYNTAX SEQUENCE OF PortGroupEntry MAX-ACCESS not-accessible - STATUS current + STATUS current DESCRIPTION - "This table contains port group information associated - with the local system known to this agent." - ::= { priportGroup 2 } + "This table contains port group information associated + with the local system known to this agent." + ::= { priportGroup 2 } --xxx.100.14.2.1 - portGroupEntry OBJECT-TYPE - SYNTAX PortGroupEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "Configure the port group information." - INDEX { portGroupIndex } - ::= { portGroupTable 1 } + portGroupEntry OBJECT-TYPE + SYNTAX PortGroupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Configure the port group information." + INDEX { portGroupIndex } + ::= { portGroupTable 1 } - PortGroupEntry ::= SEQUENCE { - portGroupIndex INTEGER, - portGroupMemberCount INTEGER, - loadBalance INTEGER, - portGroupInfo DisplayString - } + PortGroupEntry ::= SEQUENCE { + portGroupIndex INTEGER, + portGroupMemberCount INTEGER, + loadBalance INTEGER, + portGroupInfo DisplayString + } --xxx.100.14.2.1.1 - portGroupIndex OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "Port group number." - ::= { portGroupEntry 1 } + portGroupIndex OBJECT-TYPE + SYNTAX INTEGER (1..128) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Port group number." + ::= { portGroupEntry 1 } --xxx.100.14.2.1.2 - portGroupMemberCount OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The number of port group member." - ::= { portGroupEntry 2 } + portGroupMemberCount OBJECT-TYPE + SYNTAX INTEGER (1..8) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of port group member." + ::= { portGroupEntry 2 } --xxx.100.14.2.1.3 - loadBalance OBJECT-TYPE - SYNTAX INTEGER - { - dst-src-mac(1), - dst-src-ip(2), - src-mac(3), - dst-mac(4), - src-ip(5), - dst-ip(6), - dst-src-mac-ip(7), - enhance-profile(8) - } - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Load balancing method: - dst-src-mac(1):destination and source mac address; - dst-src-ip(2):destination and source ip address; - src-mac(3):source mac address; - dst-mac(4):destination mac address; - src-ip(5):source ip address; - dst-ip(6):destination ip address; - dst-src-mac-ip(7):destination and source mac address, ip address; - enhance-profile(8):enhance-profile. - If there is no member in the port group, the value is -1. - If you set value to the load balance method that your switch is not unsupported, it will return error. - Please see the handbook and make sure that the load balance method is supported by your switch." - ::= { portGroupEntry 3 } - + loadBalance OBJECT-TYPE + SYNTAX INTEGER + { + dst-src-mac(1), + dst-src-ip(2), + src-mac(3), + dst-mac(4), + src-ip(5), + dst-ip(6), + dst-src-mac-ip(7), + enhance-profile(8), + dst-src-mac-vlan(9), + dst-src-ip-port(10), + dst-src-mac-ip-port(13), + dst-src-mac-vlan-normal(14), + dst-src-ip-port-normal(15), + dst-src-mac-ip-port-normal(16) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Load balancing method: + dst-src-mac(1):destination and source mac address; + dst-src-ip(2):destination and source ip address; + src-mac(3):source mac address; + dst-mac(4):destination mac address; + src-ip(5):source ip address; + dst-ip(6):destination ip address; + dst-src-mac-ip(7):destination and source mac address, ip address; + enhance-profile(8):enhance-profile; + dst-src-mac-vlan(9):destination and source mac address, vlan; + dst-src-ip-port(10):destination and source ip address, port; + dst-src-mac-ip-port(13):destination and source mac address, ip address, port; + dst-src-mac-vlan-normal(14):destination and source mac address, vlan, normal; + dst-src-ip-port-normal(15):destination and source ip address, port, normal; + dst-src-mac-ip-port-normal(16):destination and source mac address, ip address, port, normal. + If there is no member in the port group, the value is -1. + If you set value to the load balance method that your switch is not unsupported, it will return error. + Please see the handbook and make sure that the load balance method is supported by your switch." + ::= { portGroupEntry 3 } + --xxx.100.14.2.1.4 - portGroupInfo OBJECT-TYPE - SYNTAX DisplayString - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "Port group brief information. Format is ID, Mode, Partner ID, Ports and Load-balance. - If there is no member in the port group, the value is empty." - ::= { portGroupEntry 4 } - + portGroupInfo OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Port group brief information. Format is ID, Mode, Partner ID, Ports and Load-balance. + If there is no member in the port group, the value is empty." + ::= { portGroupEntry 4 } + --xxx.100.14.3 - portGroupPortListTable OBJECT-TYPE - SYNTAX SEQUENCE OF PortGroupPortListEntry + portGroupPortListTable OBJECT-TYPE + SYNTAX SEQUENCE OF PortGroupPortListEntry MAX-ACCESS not-accessible - STATUS current + STATUS current DESCRIPTION - "This table contains port group member information associated - with the local system known to this agent." - ::= { priportGroup 3 } + "This table contains port group member information associated + with the local system known to this agent." + ::= { priportGroup 3 } --xxx.100.14.3.1 - portGroupPortListEntry OBJECT-TYPE - SYNTAX PortGroupPortListEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "Configure the port group member information." - INDEX { portGroupIndex, portGroupMemberIndex} - ::= { portGroupPortListTable 1 } + portGroupPortListEntry OBJECT-TYPE + SYNTAX PortGroupPortListEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Configure the port group member information." + INDEX { portGroupIndex, portGroupMemberIndex} + ::= { portGroupPortListTable 1 } - PortGroupPortListEntry ::= SEQUENCE { - portGroupMemberIndex INTEGER, - portGroupMemberName DisplayString, - portGroupMemberMode INTEGER, - portGroupMemberPriority INTEGER, - portGroupMemberTimeout INTEGER, - portGroupMemberStatus INTEGER - } + PortGroupPortListEntry ::= SEQUENCE { + portGroupMemberIndex INTEGER, + portGroupMemberName DisplayString, + portGroupMemberMode INTEGER, + portGroupMemberPriority INTEGER, + portGroupMemberTimeout INTEGER, + portGroupMemberStatus INTEGER + } --xxx.100.14.3.1.1 - portGroupMemberIndex OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "Port group member index. Format is group number and port index of member." - ::= { portGroupPortListEntry 1 } + portGroupMemberIndex OBJECT-TYPE + SYNTAX INTEGER (1..128) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Port group member index. Format is group number and port index of member." + ::= { portGroupPortListEntry 1 } --xxx.100.14.3.1.2 - portGroupMemberName OBJECT-TYPE - SYNTAX DisplayString - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The name of port group member." - ::= { portGroupPortListEntry 2 } - + portGroupMemberName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The name of port group member." + ::= { portGroupPortListEntry 2 } + --xxx.100.14.3.1.3 - portGroupMemberMode OBJECT-TYPE - SYNTAX INTEGER - { - on(1), - active(2), - passive(3) - } - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The mode of port group member." - ::= { portGroupPortListEntry 3 } - + portGroupMemberMode OBJECT-TYPE + SYNTAX INTEGER + { + on(1), + active(2), + passive(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The mode of port group member." + ::= { portGroupPortListEntry 3 } + --xxx.100.14.3.1.4 - portGroupMemberPriority OBJECT-TYPE - SYNTAX INTEGER (0..65535) - MAX-ACCESS read-write - STATUS current - DESCRIPTION - "The port priority of port group member. If the port group mode is on, the value is -1." - ::= { portGroupPortListEntry 4 } - + portGroupMemberPriority OBJECT-TYPE + SYNTAX INTEGER (0..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The port priority of port group member. If the port group mode is on, the value is -1." + ::= { portGroupPortListEntry 4 } + --xxx.100.14.3.1.5 - portGroupMemberTimeout OBJECT-TYPE - SYNTAX INTEGER - { - long(0), - short(1) - } - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The timeout mode of port group member. If the port group mode is on, the value is -1." - ::= { portGroupPortListEntry 5 } - + portGroupMemberTimeout OBJECT-TYPE + SYNTAX INTEGER + { + long(0), + short(1) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The timeout mode of port group member. If the port group mode is on, the value is -1." + ::= { portGroupPortListEntry 5 } + --xxx.100.14.3.1.6 - portGroupMemberStatus OBJECT-TYPE - SYNTAX INTEGER - { - unselected(0), - selected(1), - standby(2) - } - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The status of port group member. If the port group mode is on, the value is -1." - ::= { portGroupPortListEntry 6 } + portGroupMemberStatus OBJECT-TYPE + SYNTAX INTEGER + { + unselected(0), + selected(1), + standby(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The status of port group member. If the port group mode is on, the value is -1." + ::= { portGroupPortListEntry 6 } --******************************************************************************************************** --snmpMgt --xxx.100.15.1 - snmpSecurityIpStatus OBJECT-TYPE - SYNTAX INTEGER - { - enable(1), - disable(0) - } - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Enable or disable secure IP address check function on the NMS." - ::= { prisnmpMgt 1 } - + snmpSecurityIpStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(0) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Enable or disable secure IP address check function on the NMS." + ::= { prisnmpMgt 1 } + --xxx.100.15.2 - snmpTrapHostStatus OBJECT-TYPE - SYNTAX INTEGER - { - enable(1), - disable(0) - } - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Enable the switch to send Trap message. - This command is used for SNMP v1/v2." - ::= { prisnmpMgt 2 } - + snmpTrapHostStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(0) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Enable the switch to send Trap message. + This command is used for SNMP v1/v2." + ::= { prisnmpMgt 2 } + --xxx.100.15.3 - snmpRmonStatus OBJECT-TYPE - SYNTAX INTEGER - { - enable(1), - disable(0) - } - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Enable/disable RMON." - ::= { prisnmpMgt 3 } - + snmpRmonStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(0) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Enable/disable RMON." + ::= { prisnmpMgt 3 } + --******************************************************************************************************** - + --xxx.100.15.4 securityIpTable OBJECT-TYPE SYNTAX SEQUENCE OF SecurityIpEntry @@ -15111,14 +16366,14 @@ securityIpEntry OBJECT-TYPE --xxx.100.15.4.1.1 SecurityIpEntry ::= SEQUENCE { - securityIpIndex INTEGER, + securityIpIndex INTEGER, securityIpAddress IpAddress, securityIpStatus INTEGER } --xxx.100.15.4.1.1.2 securityIpIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..20) MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -15138,8 +16393,8 @@ securityIpAddress OBJECT-TYPE securityIpStatus OBJECT-TYPE SYNTAX INTEGER { - active(1), - destroy(2) + active(1), + destroy(2) } MAX-ACCESS read-create STATUS current @@ -15150,7 +16405,7 @@ securityIpStatus OBJECT-TYPE --******************************************************************************************************** - + --xxx.100.15.5 trapDestTable OBJECT-TYPE SYNTAX SEQUENCE OF TrapDestEntry @@ -15173,7 +16428,7 @@ trapDestEntry OBJECT-TYPE --xxx.100.15.5.1.1 TrapDestEntry ::= SEQUENCE { - trapDestIndex INTEGER, + trapDestIndex INTEGER, trapDestAddress IpAddress, trapDestVersion INTEGER, trapDestCommunity DisplayString, @@ -15182,7 +16437,7 @@ TrapDestEntry ::= SEQUENCE { --xxx.100.15.5.1.1.2 trapDestIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..32) MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -15226,8 +16481,8 @@ trapDestCommunity OBJECT-TYPE trapDestStatus OBJECT-TYPE SYNTAX INTEGER { - active(1), - destroy(2) + active(1), + destroy(2) } MAX-ACCESS read-create STATUS current @@ -15239,16 +16494,16 @@ trapDestStatus OBJECT-TYPE --******************************************************************************************************** --xxx.100.16.1 - arpMgt OBJECT IDENTIFIER ::= { l3 1 } + arpMgt OBJECT IDENTIFIER ::= { l3 1 } --xxx.100.16.2 - routeMgt OBJECT IDENTIFIER ::= { l3 2 } + routeMgt OBJECT IDENTIFIER ::= { l3 2 } --xxx.100.16.1.1 arpCacheDeleteAll OBJECT-TYPE SYNTAX INTEGER - { - delete(1), -- trigger clear all arp cache - noDelete(0)-- when then snmp agent read this node, the value is meaningless - } + { + delete(1), -- trigger clear all arp cache + noDelete(0)-- when then snmp agent read this node, the value is meaningless + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -15266,10 +16521,10 @@ trapDestStatus OBJECT-TYPE --xxx.100.16.1.3 arpSecurityUpdateProtectALL OBJECT-TYPE SYNTAX INTEGER - { - enable(1), - disable(0) - } + { + enable(1), + disable(0) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -15279,9 +16534,9 @@ trapDestStatus OBJECT-TYPE --xxx.100.16.1.4 arpSecurityLearnProtectALL OBJECT-TYPE SYNTAX INTEGER - { - enable(1), - disable(0) + { + enable(1), + disable(0) } MAX-ACCESS read-create STATUS current @@ -15291,10 +16546,10 @@ trapDestStatus OBJECT-TYPE --xxx.100.16.1.5 arpSecurityConvertALL OBJECT-TYPE SYNTAX INTEGER - { - enable(1), - disable(0) - } + { + enable(1), + disable(0) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -15304,7 +16559,7 @@ trapDestStatus OBJECT-TYPE --xxx.100.16.1.6 arpSecurityTable OBJECT-TYPE - SYNTAX SEQUENCE OF ArpsecurityEntry + SYNTAX SEQUENCE OF ArpSecurityEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -15312,8 +16567,8 @@ arpSecurityTable OBJECT-TYPE ::= { arpMgt 6} --xxx.100.16.1.6.1 -arpsecurityEntry OBJECT-TYPE - SYNTAX ArpsecurityEntry +arpSecurityEntry OBJECT-TYPE + SYNTAX ArpSecurityEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -15321,60 +16576,60 @@ arpsecurityEntry OBJECT-TYPE INDEX { arpSecurityIfindex} ::= { arpSecurityTable 1 } -ArpsecurityEntry +ArpSecurityEntry ::= SEQUENCE { - arpSecurityIfindex INTEGER, - arpSecurityUpdateProtect INTEGER, - arpSecurityLearnProtect INTEGER, - arpSecurityConvert INTEGER + arpSecurityIfindex INTEGER, + arpSecurityUpdateProtect INTEGER, + arpSecurityLearnProtect INTEGER, + arpSecurityConvert INTEGER } --xxx.100.16.1.6.1.1 arpSecurityIfindex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (10000..20000) MAX-ACCESS not-accessible STATUS current DESCRIPTION "L3 interface index" - ::= { arpsecurityEntry 1 } + ::= { arpSecurityEntry 1 } --xxx.100.16.1.6.1.2 arpSecurityUpdateProtect OBJECT-TYPE - SYNTAX INTEGER - { - enable(1), - disable(0) - } + SYNTAX INTEGER + { + enable(1), + disable(0) + } MAX-ACCESS read-create STATUS current DESCRIPTION "enable or disable arp security update protect on the current port" - ::= { arpsecurityEntry 2 } + ::= { arpSecurityEntry 2 } --xxx.100.16.1.6.1.3 arpSecurityLearnProtect OBJECT-TYPE SYNTAX INTEGER - { - enable(1), - disable(0) + { + enable(1), + disable(0) } MAX-ACCESS read-create STATUS current DESCRIPTION "enable or disable arp security learn protect on the current port" - ::= { arpsecurityEntry 3 } + ::= { arpSecurityEntry 3 } --xxx.100.16.1.6.1.4 arpSecurityConvert OBJECT-TYPE SYNTAX INTEGER - { - enable(1), - disable(0) + { + enable(1), + disable(0) } MAX-ACCESS read-create STATUS current DESCRIPTION "convert dynamic arp-cache to static arp item on the port.enable mean convert,get OPS is nosense" - ::= { arpsecurityEntry 4 } + ::= { arpSecurityEntry 4 } @@ -15400,13 +16655,13 @@ arpProxyArpEntry OBJECT-TYPE ArpProxyArpEntry ::= SEQUENCE { - arpProxyArpIfIndex INTEGER, - arpProxyArpStatus INTEGER + arpProxyArpIfIndex INTEGER, + arpProxyArpStatus INTEGER } --xxx.100.16.1.7.1.1 arpProxyArpIfIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (10000..20000) MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -15415,11 +16670,11 @@ arpProxyArpIfIndex OBJECT-TYPE --xxx.100.16.1.7.1.2 arpProxyArpStatus OBJECT-TYPE - SYNTAX INTEGER - { - enable(1), - disable(0) - } + SYNTAX INTEGER + { + enable(1), + disable(0) + } MAX-ACCESS read-create STATUS current DESCRIPTION "arp proxy enable" @@ -15427,7 +16682,7 @@ arpProxyArpStatus OBJECT-TYPE --xxx.100.16.1.7 -arpStacticTable OBJECT-TYPE +arpStaticTable OBJECT-TYPE SYNTAX SEQUENCE OF ArpStaticEntry MAX-ACCESS not-accessible STATUS current @@ -15443,16 +16698,16 @@ arpStaticEntry OBJECT-TYPE DESCRIPTION " index is 'arpProxyArpIfIndex.arpStaticIpaddress'." INDEX { arpProxyArpIfIndex,arpStaticIpaddress} - ::= { arpStacticTable 1 } + ::= { arpStaticTable 1 } ArpStaticEntry ::= SEQUENCE { - arpStaticIfindex INTEGER, - arpStaticIpaddress IpAddress, - arpStaticMac MacAddress, - arpStaticPortIndex INTEGER, - arpStaticStatus INTEGER + arpStaticIfindex INTEGER, + arpStaticIpaddress IpAddress, + arpStaticMac MacAddress, + arpStaticPortIndex INTEGER, + arpStaticStatus INTEGER } --xxx.100.16.1.8.1.1 @@ -15466,14 +16721,14 @@ arpStaticIfindex OBJECT-TYPE --xxx.100.16.1.8.1.2 arpStaticIpaddress OBJECT-TYPE - SYNTAX IpAddress + SYNTAX IpAddress MAX-ACCESS not-accessible STATUS current DESCRIPTION "ip address" ::= { arpStaticEntry 2 } --xxx.100.16.1.8.1.3 arpStaticMac OBJECT-TYPE - SYNTAX MacAddress (SIZE(17)) + SYNTAX MacAddress MAX-ACCESS read-create STATUS current DESCRIPTION @@ -15482,7 +16737,7 @@ arpStaticMac OBJECT-TYPE --xxx.100.16.1.8.1.4 arpStaticPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER MAX-ACCESS read-create STATUS current DESCRIPTION "the port index of the arp item" @@ -15490,17 +16745,17 @@ arpStaticPortIndex OBJECT-TYPE --xxx.100.16.1.8.1.5 arpStaticStatus OBJECT-TYPE SYNTAX INTEGER - { - valid(1),--create one arp entry , stand for this arp entry is valid - invalid(2), --destory one arp entry , stand for this arp entry is invalid - waitingforset(3) -- this is the default status - } + { + valid(1),--create one arp entry , stand for this arp entry is valid + invalid(2), --destory one arp entry , stand for this arp entry is invalid + waitingforset(3) -- this is the default status + } MAX-ACCESS read-create STATUS current DESCRIPTION "valid(1),this is a active arp when get/getnext; when set,mean create the static arp item - invalid(2); when set, mean destory the current arp item - waitingforset(3); reserved" + invalid(2); when set, mean destory the current arp item + waitingforset(3); reserved" ::= { arpStaticEntry 5 } @@ -15527,11 +16782,11 @@ ipStaticRouteExtEntry OBJECT-TYPE IpStaticRouteExtEntry ::= SEQUENCE { - ipStaticRouteExtDest IpAddress, - ipStaticRouteExtMask IpAddress, - ipStaticRouteExtNextHop IpAddress, - ipStaticRouteExtMetric INTEGER, - ipStaticRouteExtStatus INTEGER + ipStaticRouteExtDest IpAddress, + ipStaticRouteExtMask IpAddress, + ipStaticRouteExtNextHop IpAddress, + ipStaticRouteExtMetric INTEGER, + ipStaticRouteExtStatus INTEGER } --xxx.100.16.2.1.1.1 @@ -15545,7 +16800,7 @@ ipStaticRouteExtDest OBJECT-TYPE --xxx.100.16.2.1.1.2 ipStaticRouteExtMask OBJECT-TYPE - SYNTAX IpAddress + SYNTAX IpAddress MAX-ACCESS not-accessible STATUS current DESCRIPTION "mask" @@ -15561,7 +16816,7 @@ ipStaticRouteExtNextHop OBJECT-TYPE --xxx.100.16.2.1.1.4 ipStaticRouteExtMetric OBJECT-TYPE - SYNTAX INTEGER(1..255) + SYNTAX INTEGER(1..255) MAX-ACCESS read-create STATUS current DESCRIPTION " Manage distance/PRI" @@ -15569,11 +16824,11 @@ ipStaticRouteExtMetric OBJECT-TYPE --xxx.100.16.2.1.1.5 ipStaticRouteExtStatus OBJECT-TYPE SYNTAX INTEGER - { - valid(1), - invalid(2), - waitingforset(3) - } + { + valid(1), + invalid(2), + waitingforset(3) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -16162,7 +17417,75 @@ dvmrpPruneExpiryTime OBJECT-TYPE if any." ::= { dvmrpPruneEntry 4 } +--******************************************************************************************************** +--******************************************************************************************************** + + +bgpMgt OBJECT IDENTIFIER ::= { l3 6 } + + bgpVrfIPv4UnicastPeerTable OBJECT-TYPE + SYNTAX SEQUENCE OF BgpVrfIpv4UnicastPeerEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "BGP vrf ipv4 peer table. This table contains, + one entry per BGP vrf ipv4 peer, information about + the connections with BGP vrf ipv4 peers." + ::= { bgpMgt 1 } + + bgpVrfIpv4UnicastPeerEntry OBJECT-TYPE + SYNTAX BgpVrfIpv4UnicastPeerEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry containing information about the + connection with a BGP vrf ipv4 peer." + INDEX { bgpVrfNameIpv4UnicastPeer, bgpVrfIpv4UnicastPeerRemoteAddr } + ::= { bgpVrfIPv4UnicastPeerTable 1 } + + BgpVrfIpv4UnicastPeerEntry ::= SEQUENCE + { + bgpVrfNameIpv4UnicastPeer + DisplayString, + bgpVrfIpv4UnicastPeerRemoteAddr + IpAddress, + bgpVrfIpv4UnicastPeerState + INTEGER + } + + bgpVrfNameIpv4UnicastPeer OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..64)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The name of bgp vrf ipv4 Unicast." + ::= { bgpVrfIpv4UnicastPeerEntry 1 } + + bgpVrfIpv4UnicastPeerRemoteAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The vrf remote IPv4 address of this entry's BGP + peer." + ::= { bgpVrfIpv4UnicastPeerEntry 2 } + + bgpVrfIpv4UnicastPeerState OBJECT-TYPE + SYNTAX INTEGER { + idle(1), + connect(2), + active(3), + opensent(4), + openconfirm(5), + established(6) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The BGP vrf ipv4 peer connection state." + ::= { bgpVrfIpv4UnicastPeerEntry 3 } +--******************************************************************************************************** +--******************************************************************************************************** ripMgt OBJECT IDENTIFIER ::= { l3 3 } @@ -16258,7 +17581,7 @@ RipInstabilityPreventingEntry ::= SEQUENCE ripVlanIndex OBJECT-TYPE - SYNTAX Integer32 + SYNTAX Integer32 (1..4094) MAX-ACCESS read-only STATUS current DESCRIPTION "This is defined as a VLAN interface. @@ -16418,7 +17741,7 @@ ospfRfc1583CompatibleState OBJECT-TYPE SYNTAX EnabledStatusPrivate MAX-ACCESS read-write STATUS current - DESCRIPTION "Enable or disable rfc1583 compatibility." + DESCRIPTION "Enable or disable rfc1583 compatibility." DEFVAL { disabled } ::= { ospfSystemGroup 2 } @@ -16439,9 +17762,9 @@ ospfAdvertiseDefaultRoute OBJECT-TYPE } MAX-ACCESS read-write STATUS current - DESCRIPTION "If always is set, always advertises the default route regardless - of whether the default route exists;If notalways is set ,advertises - the default route when the router have the default route." + DESCRIPTION "If always is set, always advertises the default route regardless + of whether the default route exists;If notalways is set ,advertises + the default route when the router have the default route." DEFVAL { disable } ::= { ospfSystemGroup 4 } @@ -16457,7 +17780,7 @@ ospfSpfHoldTime OBJECT-TYPE SYNTAX Unsigned32 (0..4294967295) MAX-ACCESS read-write STATUS current - DESCRIPTION "Sets the hold time between two consecutive SPF calculations." + DESCRIPTION "Sets the hold time between two consecutive SPF calculations." DEFVAL { 10 } ::= { ospfSystemGroup 6 } @@ -16465,7 +17788,7 @@ ospfSpfDelayTime OBJECT-TYPE SYNTAX Unsigned32 (0..4294967295) MAX-ACCESS read-write STATUS current - DESCRIPTION "Sets the delay time to calculate SPF Delay time, in seconds, between + DESCRIPTION "Sets the delay time to calculate SPF Delay time, in seconds, between when OSPF receives a topology change and when it starts an SPF calculation." DEFVAL { 5 } ::= { ospfSystemGroup 7 } @@ -16474,7 +17797,7 @@ ospfAreaNumber OBJECT-TYPE SYNTAX Integer32 MAX-ACCESS read-only STATUS current - DESCRIPTION "Records the OSPF area numbers." + DESCRIPTION "Records the OSPF area numbers." DEFVAL { 0 } ::= { ospfSystemGroup 8 } @@ -16483,7 +17806,7 @@ clearOspfProcess OBJECT-TYPE SYNTAX Integer32(0..65535) MAX-ACCESS read-write STATUS current - DESCRIPTION "clear ip ospf process by process ID." + DESCRIPTION "clear ip ospf process by process ID." DEFVAL { 0 } ::= { ospfSystemGroup 9 } @@ -16517,7 +17840,7 @@ ospfNssaAreaId OBJECT-TYPE SYNTAX OspfAreaID MAX-ACCESS read-only STATUS current - DESCRIPTION "The 32-bit identifier for the NSSA. On creation, + DESCRIPTION "The 32-bit identifier for the NSSA. On creation, this can be derived from the instance." ::= { ospfNssaEntry 1 } @@ -16526,9 +17849,9 @@ ospfNssaStatus OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "The status of this conceptual row entry. This object isused to manage the - creation and deletion of conceptual rows." - + "The status of this conceptual row entry. This object isused to manage the + creation and deletion of conceptual rows." + ::= { ospfNssaEntry 2 } ospfNssaRedistributeStatus OBJECT-TYPE @@ -16545,7 +17868,7 @@ ospfNssaOriginateDefaultInfoStatus OBJECT-TYPE SYNTAX EnabledStatusPrivate MAX-ACCESS read-create STATUS current - DESCRIPTION "Enable or disable to generate a Type 7 default into the NSSA area." + DESCRIPTION "Enable or disable to generate a Type 7 default into the NSSA area." DEFVAL { disabled } ::= { ospfNssaEntry 4 } @@ -16592,7 +17915,7 @@ ospfRedistributeProtocol OBJECT-TYPE } MAX-ACCESS read-only STATUS current - DESCRIPTION "Protocol ID." + DESCRIPTION "Protocol ID." ::= { ospfRedistributeEntry 1 } @@ -16601,15 +17924,15 @@ ospfRedistributeStatus OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - " enable-- redistribute the specific route,disable--- does not redistribute the specific route.For example - when the ospfRedistributeProtocol is equal to rip, 'enable' stands for redistribute the route from rip." + " enable-- redistribute the specific route,disable--- does not redistribute the specific route.For example + when the ospfRedistributeProtocol is equal to rip, 'enable' stands for redistribute the route from rip." ::= { ospfRedistributeEntry 2 } ospfRedistributeMetricType OBJECT-TYPE SYNTAX INTEGER { type1(1), - type2(2) + type2(2) } MAX-ACCESS read-create STATUS current @@ -16674,7 +17997,7 @@ ospfSummaryStatus OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - " valid/enable--- define a summary, invalid/disable destory the summary from the router" + " valid/enable--- define a summary, invalid/disable destory the summary from the router" ::= { ospfSummaryAddressEntry 3 } ospfNetworkAreaAddressTable OBJECT-TYPE @@ -16731,10 +18054,10 @@ ospfNetworkAreaStatus OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "enabled(1), disabled(0). - valid/enable--- run the ospf on the interfaces,which match the ipaddr/mask; - invalid/disable--disable the ospf. - ValidStatus: + "enabled(1), disabled(0). + valid/enable--- run the ospf on the interfaces,which match the ipaddr/mask; + invalid/disable--disable the ospf. + ValidStatus: A simple status value for the object to create and destroy a table entry. This is a simplified variant of RowStatus as it supports only two values. Setting it to valid(1) creates an entry. @@ -16776,7 +18099,7 @@ SntpServerEntry { sntpServerVersion INTEGER, sntpServerAddress IpAddress, - sntpServerStatus INTEGER + sntpServerStatus INTEGER } sntpServerVersion OBJECT-TYPE @@ -16799,9 +18122,9 @@ sntpServerAddress OBJECT-TYPE sntpServerStatus OBJECT-TYPE SYNTAX INTEGER { - active(1), - destroy (2) - } + active(1), + destroy (2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -16830,7 +18153,7 @@ SntpServer6Entry { sntpServer6Version INTEGER, sntpServer6Address Ipv6Address, - sntpServer6Status INTEGER + sntpServer6Status INTEGER } sntpServer6Version OBJECT-TYPE @@ -16852,9 +18175,9 @@ sntpServer6Address OBJECT-TYPE sntpServer6Status OBJECT-TYPE SYNTAX INTEGER { - active(1), - destroy (2) - } + active(1), + destroy (2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -16872,10 +18195,10 @@ sntpTimeZoneName OBJECT-TYPE sntpTimeZoneType OBJECT-TYPE SYNTAX INTEGER - { - add(1), - subtract(0) - } + { + add(1), + subtract(0) + } MAX-ACCESS read-write STATUS current DESCRIPTION "The type of sntp time zone." @@ -16890,11 +18213,11 @@ sntpTimeZoneTime OBJECT-TYPE sntpTimeZoneStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-write STATUS current DESCRIPTION "now state of sntp time zone." @@ -16940,12 +18263,12 @@ UrpfPortEntry urpfPortIndex INTEGER, urpfPortMode INTEGER, urpfPortAllowDefault INTEGER, - urpfPortStatus INTEGER + urpfPortStatus INTEGER } --xxx.100.18.1.1.1 urpfPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -16956,9 +18279,9 @@ urpfPortIndex OBJECT-TYPE urpfPortMode OBJECT-TYPE SYNTAX INTEGER { - loose(1), - strict(0) - } + loose(1), + strict(0) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -16969,9 +18292,9 @@ urpfPortMode OBJECT-TYPE urpfPortAllowDefault OBJECT-TYPE SYNTAX INTEGER { - allowdefaultroute(1), - noallowdefaultroute(0) - } + allowdefaultroute(1), + noallowdefaultroute(0) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -16982,9 +18305,9 @@ urpfPortAllowDefault OBJECT-TYPE urpfPortStatus OBJECT-TYPE SYNTAX INTEGER { - active(1), - destroy (2) - } + active(1), + destroy (2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -17014,55 +18337,90 @@ dcscmdcEnable OBJECT-TYPE -- The Dcscm dc Acl Table -dcscmdcAcl OBJECT IDENTIFIER ::= { dcscm 2 } - +dcscmdcAclTable OBJECT-TYPE + SYNTAX SEQUENCE OF DcscmdcAclEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "dcscm dst control multicast" + ::= { dcscm 2 } --xxx.100.20.2.1 +dcscmdcAclEntry OBJECT-TYPE + SYNTAX DcscmdcAclEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "dcscm dst control multicast entry" + INDEX { dcscmdcAclNumber,dcscmdcAclSubNumber } + ::= { dcscmdcAclTable 1 } + DcscmdcAclEntry + ::= SEQUENCE + { + dcscmdcAclNumber INTEGER, + dcscmdcAclSubNumber INTEGER, + dcscmdcAclSourceIp IpAddress, + dcscmdcAclSourceMask IpAddress, + dcscmdcAclDestinationIp IpAddress, + dcscmdcAclDestinationMask IpAddress, + dcscmdcAclPermitOrDeny INTEGER + } + +--xxx.100.20.2.1.1 dcscmdcAclNumber OBJECT-TYPE SYNTAX INTEGER (6000..7999) MAX-ACCESS read-create STATUS current DESCRIPTION "Acl number of Dcscm destination control multicast,the range is 6000--7999." - ::= { dcscmdcAcl 1 } + ::= { dcscmdcAclEntry 1 } + +--xxx.100.20.2.1.2 +dcscmdcAclSubNumber OBJECT-TYPE + SYNTAX INTEGER (1..1024) + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Acl sub number of Dcscm destination control multicast,the range is 1--1024." + ::= { dcscmdcAclEntry 2 } ---xxx.100.20.2.2 +--xxx.100.20.2.1.3 dcscmdcAclSourceIp OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-create STATUS current DESCRIPTION "Source ip address of acl entry " - ::= { dcscmdcAcl 2} + ::= { dcscmdcAclEntry 3} ---xxx.100.20.2.3 +--xxx.100.20.2.1.4 dcscmdcAclSourceMask OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-create STATUS current DESCRIPTION "Source Mask of acl entry " - ::= { dcscmdcAcl 3} + ::= { dcscmdcAclEntry 4} ---xxx.100.20.2.4 +--xxx.100.20.2.1.5 dcscmdcAclDestinationIp OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-create STATUS current DESCRIPTION "Destination ip address of acl entry.the destination ip must be a valid multicast group address. " - ::= { dcscmdcAcl 4} + ::= { dcscmdcAclEntry 5} ---xxx.100.20.2.5 +--xxx.100.20.2.1.6 dcscmdcAclDestinationMask OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-create STATUS current DESCRIPTION "Destination Mask of acl entry. the destination mask should meet the request of muticast group address. " - ::= { dcscmdcAcl 5} + ::= { dcscmdcAclEntry 6} ---xxx.100.20.2.6 +--xxx.100.20.2.1.7 dcscmdcAclPermitOrDeny OBJECT-TYPE SYNTAX INTEGER { @@ -17074,7 +18432,7 @@ dcscmdcAclPermitOrDeny OBJECT-TYPE STATUS current DESCRIPTION " acl entry permit or deny ; 0:deny; 1:permit; 2:del this acl entry" - ::= { dcscmdcAcl 6} + ::= { dcscmdcAclEntry 7} --xxx.100.20.3 @@ -17116,7 +18474,7 @@ dcscmVMacbindingVlanid OBJECT-TYPE --xxx.100.20.3.1.2 dcscmVMacbindingMacAddr OBJECT-TYPE - SYNTAX MacAddress (SIZE(17)) + SYNTAX MacAddress MAX-ACCESS read-only STATUS current DESCRIPTION @@ -17172,7 +18530,7 @@ dcscmSipbindingSipAddress OBJECT-TYPE --xxx.100.20.4.1.2 dcscmSipbindingSipMask OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (0..32) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -17218,7 +18576,7 @@ DcscmdcPortbindingEntry --xxx.100.20.5.1.1 dcscmdcPortbindingPortName OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -17254,55 +18612,90 @@ dcscmscEnable OBJECT-TYPE -- The DCSCM Sc Acl Table -dcscmscAcl OBJECT IDENTIFIER ::= { dcscm 7 } +dcscmscAclTable OBJECT-TYPE + SYNTAX SEQUENCE OF DcscmscAclEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "dcscm src control multicast" + ::= { dcscm 7 } +--xxx.100.20.7.1 +dcscmscAclEntry OBJECT-TYPE + SYNTAX DcscmscAclEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "dcscm src control multicast entry" + INDEX { dcscmscAclNumber,dcscmscAclSubNumber } + ::= { dcscmscAclTable 1 } + DcscmscAclEntry + ::= SEQUENCE + { + dcscmscAclNumber INTEGER, + dcscmscAclSubNumber INTEGER, + dcscmscAclSourceIp IpAddress, + dcscmscAclSourceMask IpAddress, + dcscmscAclDestinationIp IpAddress, + dcscmscAclDestinationMask IpAddress, + dcscmscAclPermitOrDeny INTEGER + } ---xxx.100.20.7.1 +--xxx.100.20.7.1.1 dcscmscAclNumber OBJECT-TYPE SYNTAX INTEGER (5000..5099) MAX-ACCESS read-write STATUS current DESCRIPTION "Acl number of Dcscm source control multicast,the range is 5000--5099." - ::= { dcscmscAcl 1 } + ::= { dcscmscAclEntry 1 } + +--xxx.100.20.7.1.2 +dcscmscAclSubNumber OBJECT-TYPE + SYNTAX INTEGER (1..1024) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Acl sub number" + ::= { dcscmscAclEntry 2} ---xxx.100.20.7.2 +--xxx.100.20.7.1.3 dcscmscAclSourceIp OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-write STATUS current DESCRIPTION "Source ip address of acl entry " - ::= { dcscmscAcl 2} + ::= { dcscmscAclEntry 3} ---xxx.100.20.7.3 +--xxx.100.20.7.1.4 dcscmscAclSourceMask OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-write STATUS current DESCRIPTION "Source Mask of acl entry " - ::= { dcscmscAcl 3} + ::= { dcscmscAclEntry 4} ---xxx.100.20.7.4 +--xxx.100.20.7.1.5 dcscmscAclDestinationIp OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-write STATUS current DESCRIPTION "Destination ip address of acl entry, the destination ip must be a valid multicast group address." - ::= { dcscmscAcl 4} + ::= { dcscmscAclEntry 5} ---xxx.100.20.7.5 +--xxx.100.20.7.1.6 dcscmscAclDestinationMask OBJECT-TYPE SYNTAX IpAddress MAX-ACCESS read-write STATUS current DESCRIPTION "Destination Mask of acl entry, the destination mask should meet the request of muticast group address." - ::= { dcscmscAcl 5} + ::= { dcscmscAclEntry 6} ---xxx.100.20.7.6 +--xxx.100.20.7.1.7 dcscmscAclPermitOrDeny OBJECT-TYPE SYNTAX INTEGER { @@ -17314,7 +18707,7 @@ dcscmscAclPermitOrDeny OBJECT-TYPE STATUS current DESCRIPTION " acl entry permit or deny;0:deny; 1:permit; 2:del this acl" - ::= { dcscmscAcl 6} + ::= { dcscmscAclEntry 7} --xxx.100.20.8 @@ -17346,7 +18739,7 @@ DcscmscPortbindingEntry --xxx.100.20.8.1.1 dcscmscPortbindingPortName OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -17386,8 +18779,8 @@ dcscmpcEntry OBJECT-TYPE DcscmpcEntry ::= SEQUENCE { - dcscmpcSourceIp IpAddress, - dcscmpcSourceMasklen INTEGER, + dcscmpcSourceIp IpAddress, + dcscmpcSourceMasklen INTEGER, dcscmpcDestinationIp IpAddress, dcscmpcDestinationMasklen INTEGER, dcscmpccos INTEGER @@ -17404,7 +18797,7 @@ dcscmpcSourceIp OBJECT-TYPE --xxx.100.20.9.1.2 dcscmpcSourceMasklen OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..32) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -17422,7 +18815,7 @@ dcscmpcDestinationIp OBJECT-TYPE --xxx.100.20.9.1.4 dcscmpcDestinationMasklen OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..32) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -17560,7 +18953,7 @@ dcscm6VMacbindingVlanid OBJECT-TYPE --xxx.100.21.3.1.2 dcscm6VMacbindingMacAddr OBJECT-TYPE - SYNTAX MacAddress (SIZE(17)) + SYNTAX MacAddress MAX-ACCESS read-only STATUS current DESCRIPTION @@ -17662,7 +19055,7 @@ Dcscm6dcPortbindingEntry --xxx.100.21.5.1.1 dcscm6dcPortbindingPortName OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -17789,7 +19182,7 @@ Dcscm6scPortbindingEntry --xxx.100.21.8.1.1 dcscm6scPortbindingPortName OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -17829,8 +19222,8 @@ dcscm6pcEntry OBJECT-TYPE Dcscm6pcEntry ::= SEQUENCE { - dcscm6pcSourceIp Ipv6Address, - dcscm6pcSourceMask INTEGER, + dcscm6pcSourceIp Ipv6Address, + dcscm6pcSourceMask INTEGER, dcscm6pcDestinationIp Ipv6Address, dcscm6pcDestinationMask INTEGER, dcscm6pccos INTEGER @@ -17982,27 +19375,27 @@ clusterv2CreateIPPool OBJECT-TYPE --xxx.100.22.2.2 clusterv2CreateName OBJECT-TYPE SYNTAX OCTET STRING (SIZE (1..32)) - MAX-ACCESS read-write - STATUS current - DESCRIPTION + MAX-ACCESS read-write + STATUS current + DESCRIPTION "create the clustername while create the cluster commander, set it only on the device is not commander and should set it with set clusterv2CreateCmdrOperate." - ::= { clusterv2Create 2} + ::= { clusterv2Create 2} --xxx.100.22.2.3 clusterv2CreateCmdrOperate OBJECT-TYPE - SYNTAX INTEGER { - create(1), - destroy(0) + SYNTAX INTEGER { + create(1), + destroy(0) } - MAX-ACCESS read-write - STATUS current - DESCRIPTION + MAX-ACCESS read-write + STATUS current + DESCRIPTION "if set create ,operation is to build cluster according to clusterv2CreateClusterIPPool/clusterv2StatusClusterName. if set destroy , operation is try to clear the IPPool and the ClusterName. set create only on the device is not commander. set destroy only on the device is commander." - ::= { clusterv2Create 3} + ::= { clusterv2Create 3} --xxx.100.22.3 clusterv2Status OBJECT IDENTIFIER ::= { prClusterv2 3 } @@ -18082,17 +19475,17 @@ clusterv2MemberEntry OBJECT-TYPE Clusterv2MemberEntry ::= SEQUENCE { - clusterv2MemberNumber INTEGER, + clusterv2MemberNumber INTEGER, clusterv2MemberIpAddress IpAddress, clusterv2MemberMacAddress MacAddress, clusterv2MemberOperStatus INTEGER, - clusterv2MemberHostName OCTET STRING, - clusterv2MemberDeviceType OCTET STRING + clusterv2MemberHostName OCTET STRING, + clusterv2MemberDeviceType OCTET STRING } --xxx.100.22.4.3.1.1 clusterv2MemberNumber OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..128) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -18114,9 +19507,9 @@ clusterv2MemberIpAddress OBJECT-TYPE clusterv2MemberOperStatus OBJECT-TYPE SYNTAX INTEGER { notMember(1), - inactiveMember(2), - memberTobe(3), - activeMember(4) + inactiveMember(2), + memberTobe(3), + activeMember(4) } MAX-ACCESS read-only STATUS current @@ -18130,7 +19523,7 @@ clusterv2MemberOperStatus OBJECT-TYPE --xxx.100.22.4.3.1.4 clusterv2MemberMacAddress OBJECT-TYPE - SYNTAX MacAddress (SIZE(17)) + SYNTAX MacAddress MAX-ACCESS read-only STATUS current DESCRIPTION @@ -18200,13 +19593,13 @@ clusterv2CandidateEntry OBJECT-TYPE Clusterv2CandidateEntry ::= SEQUENCE { clusterv2CandidateId INTEGER, clusterv2CandidateMacAddress MacAddress, - clusterv2CandidateHostName OCTET STRING, - clusterv2CandidateDeviceType OCTET STRING + clusterv2CandidateHostName OCTET STRING, + clusterv2CandidateDeviceType OCTET STRING } --xxx.100.22.4.5.1.1 clusterv2CandidateId OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..256) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -18216,7 +19609,7 @@ clusterv2CandidateId OBJECT-TYPE --xxx.100.22.4.5.1.2 clusterv2CandidateMacAddress OBJECT-TYPE - SYNTAX MacAddress (SIZE(17)) + SYNTAX MacAddress MAX-ACCESS read-only STATUS current DESCRIPTION @@ -18247,13 +19640,13 @@ clusterv2CandidateDeviceType OBJECT-TYPE --xxx.100.22.4.6 clusterv2RebootMem OBJECT-TYPE SYNTAX OCTET STRING (SIZE (1..30)) - MAX-ACCESS read-write - STATUS current - DESCRIPTION + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Operation is to reboot the specified member.you can select more member one time, the value connected with '-' or ';',the string len is 1-30 .set only on commander." - ::= { clusterv2Commander 6} - + ::= { clusterv2Commander 6} + --******************************************************************************************************** --******************************************************************************************************** --xxx.100.23 Dns group @@ -18297,9 +19690,9 @@ DnsServerEntry ::= SEQUENCE { dnsServerInetAddrType InetAddressType, - dnsServerIpAddr InetAddress, - dnsServerPriority INTEGER, - dnsServerStatus INTEGER + dnsServerIpAddr InetAddress, + dnsServerPriority INTEGER, + dnsServerStatus INTEGER } --xxx.100.23.2.1.1 @@ -18332,11 +19725,11 @@ dnsServerPriority OBJECT-TYPE --xxx.100.23.2.1.4 dnsServerStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -18369,13 +19762,13 @@ dnsDomainSuffixEntry OBJECT-TYPE DnsDomainSuffixEntry ::= SEQUENCE { - dnsDomainSuffix DisplayString, - dnsDomainSuffixStatus INTEGER + dnsDomainSuffix DisplayString, + dnsDomainSuffixStatus INTEGER } --xxx.100.23.3.1.1 dnsDomainSuffix OBJECT-TYPE - SYNTAX DisplayString + SYNTAX DisplayString (SIZE(1..256)) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -18385,11 +19778,11 @@ dnsDomainSuffix OBJECT-TYPE --xxx.100.23.3.1.2 dnsDomainSuffixStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -18424,14 +19817,14 @@ DnsDynHostEntry ::= SEQUENCE { dnsDynHostIndex INTEGER, - dnsDynHostName DisplayString, - dnsDynHostIpAddr InetAddress, - dnsDynHostTtl INTEGER + dnsDynHostName DisplayString, + dnsDynHostIpAddr InetAddress, + dnsDynHostTtl INTEGER } --xxx.100.23.4.1.1 dnsDynHostIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..6) MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -18464,7 +19857,7 @@ dnsDynHostTtl OBJECT-TYPE STATUS current DESCRIPTION "The dns dynamic host's living time(seconds)." - ::= { dnsDynHostEntry 4} + ::= { dnsDynHostEntry 4} -- -- Textual Conventions @@ -18706,6 +20099,7 @@ ntpEntNTPCompliance MODULE-COMPLIANCE MANDATORY-GROUPS { ntpEntObjectsGroup1, ntpEntObjectsGroup2 +-- ntpEntNotifPrefixGroup } ::= { ntpEntCompliances 1 } @@ -18780,120 +20174,181 @@ ntpEntObjectsGroup2 OBJECT-GROUP for NTP or SNTP entities to implement." ::= { ntpEntGroups 2 } +--ntpEntNotifPrefixGroup NOTIFICATION-GROUP +-- NOTIFICATIONS { +-- ntpEntNotifModeChange, +-- ntpEntNotifStratumChange, +-- ntpEntNotifSyspeerChanged, +-- ntpEntNotifAddAssociation, +-- ntpEntNotifRemoveAssociation, +-- ntpEntNotifConfigChanged, +-- ntpEntNotifLeapSecondAnnounced, +-- ntpEntNotifHeartbeat +-- } +-- STATUS current +-- DESCRIPTION +-- "A collection of notifications for the NTP MIB" +-- ::= { ntpEntGroups 3 } + --******************************************************************************************************** --******************************************************************************************************** -- (xxx.100.26) priPoeConfig group - + --xxx.100.26.1 + +poeGlobalConfigTable OBJECT-TYPE + SYNTAX SEQUENCE OF PoeGlobalConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " The power inline global configuration table" + ::= { priPoeConfig 1 } + +--xxx.100.26.1.1 + poeGlobalConfigEntry OBJECT-TYPE + SYNTAX PoeGlobalConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " The power inline global configuration." + INDEX { poeSlotIndex } + ::= { poeGlobalConfigTable 1 } + + PoeGlobalConfigEntry + ::= SEQUENCE + { + poeSlotIndex INTEGER, + poeSystemEnable INTEGER, + poeMaxPower INTEGER, + poePoliceEnable INTEGER, + poeLegacyEnable INTEGER, + poeDisconnect INTEGER, + poeCurrentPower INTEGER, + poePortMode INTEGER, + poeSoftwareVersion DisplayString, + poeHardwareVersion DisplayString + } + +--xxx.100.26.1.1 +poeSlotIndex OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The power inline member index." + ::= { poeGlobalConfigEntry 1 } + + +--xxx.100.26.1.2 poeSystemEnable OBJECT-TYPE SYNTAX INTEGER - { - enable (1), - disable (0) - } + { + enable (1), + disable (0) + } MAX-ACCESS read-write STATUS current DESCRIPTION " The power inline global switch. Enable expresses it is turned on, while disable indicates that off." - ::= { priPoeConfig 1 } + ::= { poeGlobalConfigEntry 2 } ---xxx.100.26.2 +--xxx.100.26.1.3 poeMaxPower OBJECT-TYPE - SYNTAX INTEGER (37..776) + SYNTAX INTEGER (37..780) MAX-ACCESS read-write STATUS current DESCRIPTION " The power inline global available power whitch cannot be exceeded by the total power of all PDs." - ::= { priPoeConfig 2 } + ::= { poeGlobalConfigEntry 3 } ---xxx.100.26.3 +--xxx.100.26.1.4 poePoliceEnable OBJECT-TYPE SYNTAX INTEGER - { - enable (1), - disable (0) - } + { + enable (1), + disable (0) + } MAX-ACCESS read-write STATUS current DESCRIPTION " The power inline power mamagement switch. Enable expresses it is in priority-policy mode, while disable indicates that in first-in-first-get mode." - ::= { priPoeConfig 3 } + ::= { poeGlobalConfigEntry 4 } ---xxx.100.26.4 +--xxx.100.26.1.5 poeLegacyEnable OBJECT-TYPE SYNTAX INTEGER - { - enable (1), - disable (0) - } + { + enable (1), + disable (0) + } MAX-ACCESS read-write STATUS current DESCRIPTION " The power inline nonstandard PD detect switch. Enable expresses nonstandard PD can be detected, while disable indicates that cannot be detected." - ::= { priPoeConfig 4 } + ::= { poeGlobalConfigEntry 5 } ---xxx.100.26.5 +--xxx.100.26.1.6 poeDisconnect OBJECT-TYPE SYNTAX INTEGER - { - ac (0), - dc (1) - } + { + ac (0), + dc (1) + } MAX-ACCESS read-only STATUS current DESCRIPTION " The power inline disconnection mode." - ::= { priPoeConfig 5 } + ::= { poeGlobalConfigEntry 6 } ---xxx.100.26.6 +--xxx.100.26.1.7 poeCurrentPower OBJECT-TYPE SYNTAX INTEGER MAX-ACCESS read-only STATUS current DESCRIPTION " The power inline current export power. It is a real time value." - ::= { priPoeConfig 6 } + ::= { poeGlobalConfigEntry 7 } ---xxx.100.26.7 +--xxx.100.26.1.8 poePortMode OBJECT-TYPE SYNTAX INTEGER - { + { spare (1), signal (0) - } + } MAX-ACCESS read-only STATUS current DESCRIPTION " The power inline power supply mode." - ::= { priPoeConfig 7 } + ::= { poeGlobalConfigEntry 8 } ---xxx.100.26.8 +--xxx.100.26.1.9 poeSoftwareVersion OBJECT-TYPE SYNTAX DisplayString (SIZE(1..32)) MAX-ACCESS read-only STATUS current DESCRIPTION " The power inline software version." - ::= { priPoeConfig 8 } + ::= { poeGlobalConfigEntry 9 } ---xxx.100.26.9 +--xxx.100.26.1.10 poeHardwareVersion OBJECT-TYPE SYNTAX DisplayString (SIZE(1..32)) MAX-ACCESS read-only STATUS current DESCRIPTION " The power inline hardware version." - ::= { priPoeConfig 9 } + ::= { poeGlobalConfigEntry 10 } ---xxx.100.26.10 +--xxx.100.26.2 poePortConfigTable OBJECT-TYPE SYNTAX SEQUENCE OF PoePortConfigEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION " The power inline port configuration table" - ::= { priPoeConfig 10 } + ::= { priPoeConfig 2 } --xxx.100.26.10.1 poePortConfigEntry OBJECT-TYPE @@ -18910,13 +20365,14 @@ poeHardwareVersion OBJECT-TYPE { poePortIndex INTEGER, poePortStatus INTEGER, - poePortPriority INTEGER, - poePortMaxPower INTEGER, + poePortPriority INTEGER, + poePortMaxPower INTEGER, poePortCurrentPower INTEGER, - poePortCurrentCurrent INTEGER, + poePortCurrentCurrent INTEGER, poePortCurrentVoltage INTEGER, - poePortPdStatus INTEGER, - poePortPdClass INTEGER + poePortPdStatus INTEGER, + poePortPdClass INTEGER, + poePortMaxPowerType INTEGER } --xxx.100.26.10.1.1 @@ -18926,16 +20382,16 @@ poePortIndex OBJECT-TYPE STATUS current DESCRIPTION "The power inline port index." - ::= { poePortConfigEntry 1 } + ::= { poePortConfigEntry 1 } --xxx.100.26.10.1.2 poePortStatus OBJECT-TYPE SYNTAX INTEGER - { - disable (0), - enableAuto (1), - enableStatic (2) - } + { + disable (0), + enableAuto (1), + enableStatic (2) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -18946,11 +20402,11 @@ poePortStatus OBJECT-TYPE --xxx.100.26.10.1.3 poePortPriority OBJECT-TYPE SYNTAX INTEGER - { + { critical (0), high (1), low (2) - } + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -18959,7 +20415,7 @@ poePortPriority OBJECT-TYPE --xxx.100.26.10.1.4 poePortMaxPower OBJECT-TYPE - SYNTAX INTEGER (1..31000) + SYNTAX INTEGER (1..63000) MAX-ACCESS read-write STATUS current DESCRIPTION @@ -19017,29 +20473,43 @@ poePortPdClass OBJECT-TYPE STATUS current DESCRIPTION " The connected PD class of power inline" - ::= { poePortConfigEntry 9 } ---xxx.100.26.11 + ::= { poePortConfigEntry 9 } + +--xxx.100.26.10.1.3 +poePortMaxPowerType OBJECT-TYPE + SYNTAX INTEGER + { + class (1), + usr-define (2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + " The power inline port priority." + ::= { poePortConfigEntry 12 } + +--xxx.100.26.3 poeHighInrushEnable OBJECT-TYPE SYNTAX INTEGER - { - enable (0), - disable (1) - } + { + enable (0), + disable (1) + } MAX-ACCESS read-write STATUS current DESCRIPTION " The power inline high-inrush switch. Enable expresses it is turned on, while disable indicates that off." - ::= { priPoeConfig 11 } + ::= { priPoeConfig 3 } --******************************************************************************************************** --******************************************************************************************************** -- (xxx.100.27) priQos2 group --xxx.100.27.1 - qos2 OBJECT IDENTIFIER ::= { priQos2 1 } + qos2 OBJECT IDENTIFIER ::= { priQos2 1 } --******************************************************************************************************** --xxx.100.27.1.1 - qos2MapCostoIntp OBJECT IDENTIFIER ::= { qos2 1 } + qos2MapCostoIntp OBJECT IDENTIFIER ::= { qos2 1 } --xxx.100.27.1.1.1 qos2MapCostoIntp1 OBJECT-TYPE @@ -19047,79 +20517,79 @@ poeHighInrushEnable OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "COS to IntPrio map,IntPrio1<0>." + "COS to IntPrio map,IntPrio1<0-7>." ::= { qos2MapCostoIntp 1 } --xxx.100.27.1.1.2 - qos2MapCostoIntp2 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "COS to IntPrio map,IntPrio2<0>." - ::= { qos2MapCostoIntp 2 } + qos2MapCostoIntp2 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "COS to IntPrio map,IntPrio2<0-7>." + ::= { qos2MapCostoIntp 2 } --xxx.100.27.1.1.3 - qos2MapCostoIntp3 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "COS to IntPrio map,IntPrio1<0>." - ::= { qos2MapCostoIntp 3 } + qos2MapCostoIntp3 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "COS to IntPrio map,IntPrio1<0-7>." + ::= { qos2MapCostoIntp 3 } --xxx.100.27.1.1.4 - qos2MapCostoIntp4 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "COS to IntPrio map,IntPrio1<0>." - ::= { qos2MapCostoIntp 4 } + qos2MapCostoIntp4 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "COS to IntPrio map,IntPrio1<0-7>." + ::= { qos2MapCostoIntp 4 } --xxx.100.27.1.1.5 - qos2MapCostoIntp5 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "COS to IntPrio map,IntPrio1<0>." - ::= { qos2MapCostoIntp 5 } + qos2MapCostoIntp5 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "COS to IntPrio map,IntPrio1<0-7>." + ::= { qos2MapCostoIntp 5 } --xxx.100.27.1.1.6 - qos2MapCostoIntp6 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "COS to IntPrio map,IntPrio1<0>." - ::= { qos2MapCostoIntp 6 } + qos2MapCostoIntp6 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "COS to IntPrio map,IntPrio1<0-7>." + ::= { qos2MapCostoIntp 6 } --xxx.100.27.1.1.7 - qos2MapCostoIntp7 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "COS to IntPrio map,IntPrio1<0>." - ::= { qos2MapCostoIntp 7 } + qos2MapCostoIntp7 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "COS to IntPrio map,IntPrio1<0-7>." + ::= { qos2MapCostoIntp 7 } --xxx.100.27.1.1.8 - qos2MapCostoIntp8 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "COS to IntPrio map,IntPrio1<0>." - ::= { qos2MapCostoIntp 8 } + qos2MapCostoIntp8 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "COS to IntPrio map,IntPrio1<0-7>." + ::= { qos2MapCostoIntp 8 } --xxx.100.27.1.1.9 qos2MapCostoIntpStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -19127,7 +20597,7 @@ poeHighInrushEnable OBJECT-TYPE ::= { qos2MapCostoIntp 9 } --xxx.100.27.1.2 - qos2MapCostoDP OBJECT IDENTIFIER ::= { qos2 2 } + qos2MapCostoDP OBJECT IDENTIFIER ::= { qos2 2 } --xxx.100.27.1.2.1 qos2MapCostoDP1 OBJECT-TYPE @@ -19135,79 +20605,79 @@ poeHighInrushEnable OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "COS to drop precedence map,Drop Precedence1<0>." + "COS to drop precedence map,Drop Precedence1<0-2>." ::= { qos2MapCostoDP 1 } --xxx.100.27.1.2.2 - qos2MapCostoDP2 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "COS to drop precedence map,Drop Precedence2<0>." - ::= { qos2MapCostoDP 2 } + qos2MapCostoDP2 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "COS to drop precedence map,Drop Precedence2<0-2>." + ::= { qos2MapCostoDP 2 } --xxx.100.27.1.2.3 - qos2MapCostoDP3 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "COS to drop precedence map,Drop Precedence3<0>." - ::= { qos2MapCostoDP 3 } + qos2MapCostoDP3 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "COS to drop precedence map,Drop Precedence3<0-2>." + ::= { qos2MapCostoDP 3 } --xxx.100.27.1.2.4 - qos2MapCostoDP4 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "COS to drop precedence map,Drop Precedence4<0>." - ::= { qos2MapCostoDP 4 } + qos2MapCostoDP4 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "COS to drop precedence map,Drop Precedence4<0-2>." + ::= { qos2MapCostoDP 4 } --xxx.100.27.1.2.5 - qos2MapCostoDP5 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "COS to drop precedence map,Drop Precedence5<0>." - ::= { qos2MapCostoDP 5 } + qos2MapCostoDP5 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "COS to drop precedence map,Drop Precedence5<0-2>." + ::= { qos2MapCostoDP 5 } --xxx.100.27.1.2.6 - qos2MapCostoDP6 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "COS to drop precedence map,Drop Precedence6<0>." - ::= { qos2MapCostoDP 6 } + qos2MapCostoDP6 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "COS to drop precedence map,Drop Precedence6<0-2>." + ::= { qos2MapCostoDP 6 } --xxx.100.27.1.2.7 - qos2MapCostoDP7 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "COS to drop precedence map,Drop Precedence7<0>." - ::= { qos2MapCostoDP 7 } + qos2MapCostoDP7 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "COS to drop precedence map,Drop Precedence7<0-2>." + ::= { qos2MapCostoDP 7 } --xxx.100.27.1.2.8 - qos2MapCostoDP8 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "COS to drop precedence map,Drop Precedence8<0>." - ::= { qos2MapCostoDP 8 } + qos2MapCostoDP8 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "COS to drop precedence map,Drop Precedence8<0-2>." + ::= { qos2MapCostoDP 8 } --xxx.100.27.1.2.9 qos2MapCostoDPStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -19215,7 +20685,7 @@ poeHighInrushEnable OBJECT-TYPE ::= { qos2MapCostoDP 9 } --xxx.100.27.1.3 - qos2MapDSCPtoDSCP OBJECT IDENTIFIER ::= { qos2 3 } + qos2MapDSCPtoDSCP OBJECT IDENTIFIER ::= { qos2 3 } --xxx.100.27.1.3.1 qos2MapDSCPtoDSCP1 OBJECT-TYPE @@ -19223,88 +20693,88 @@ poeHighInrushEnable OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "DSCP to DSCP map, DSCP1<0>." + "DSCP to DSCP map, DSCP1<0-63>." ::= { qos2MapDSCPtoDSCP 1 } --xxx.100.27.1.3.2 - qos2MapDSCPtoDSCP2 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to DSCP map, DSCP2<0>." - ::= { qos2MapDSCPtoDSCP 2 } + qos2MapDSCPtoDSCP2 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to DSCP map, DSCP2<0-63>." + ::= { qos2MapDSCPtoDSCP 2 } --xxx.100.27.1.3.3 - qos2MapDSCPtoDSCP3 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to DSCP map, DSCP3<0>." - ::= { qos2MapDSCPtoDSCP 3 } + qos2MapDSCPtoDSCP3 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to DSCP map, DSCP3<0-63>." + ::= { qos2MapDSCPtoDSCP 3 } --xxx.100.27.1.3.4 - qos2MapDSCPtoDSCP4 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to DSCP map, DSCP4<0>." - ::= { qos2MapDSCPtoDSCP 4 } + qos2MapDSCPtoDSCP4 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to DSCP map, DSCP4<0-63>." + ::= { qos2MapDSCPtoDSCP 4 } --xxx.100.27.1.3.5 - qos2MapDSCPtoDSCP5 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to DSCP map, DSCP5<0>." - ::= { qos2MapDSCPtoDSCP 5 } + qos2MapDSCPtoDSCP5 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to DSCP map, DSCP5<0-63>." + ::= { qos2MapDSCPtoDSCP 5 } --xxx.100.27.1.3.6 - qos2MapDSCPtoDSCP6 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to DSCP map, DSCP6<0>." - ::= { qos2MapDSCPtoDSCP 6 } + qos2MapDSCPtoDSCP6 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to DSCP map, DSCP6<0-63>." + ::= { qos2MapDSCPtoDSCP 6 } --xxx.100.27.1.3.7 - qos2MapDSCPtoDSCP7 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to DSCP map, DSCP7<0>." - ::= { qos2MapDSCPtoDSCP 7 } + qos2MapDSCPtoDSCP7 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to DSCP map, DSCP7<0-63>." + ::= { qos2MapDSCPtoDSCP 7 } --xxx.100.27.1.3.8 - qos2MapDSCPtoDSCP8 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to DSCP map, DSCP8<0>." - ::= { qos2MapDSCPtoDSCP 8 } + qos2MapDSCPtoDSCP8 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to DSCP map, DSCP8<0-63>." + ::= { qos2MapDSCPtoDSCP 8 } --xxx.100.27.1.3.9 - qos2MapDSCPtoDSCPoutDSCP OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to DSCP map, outDSCP<0>." - ::= { qos2MapDSCPtoDSCP 9 } - + qos2MapDSCPtoDSCPoutDSCP OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to DSCP map, outDSCP<0-63>." + ::= { qos2MapDSCPtoDSCP 9 } + --xxx.100.27.1.3.10 qos2MapDSCPtoDSCPStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -19312,7 +20782,7 @@ poeHighInrushEnable OBJECT-TYPE ::= { qos2MapDSCPtoDSCP 10 } --xxx.100.27.1.4 - qos2MapDSCPtoIntp OBJECT IDENTIFIER ::= { qos2 4 } + qos2MapDSCPtoIntp OBJECT IDENTIFIER ::= { qos2 4 } --xxx.100.27.1.4.1 qos2MapDSCPtoIntp1 OBJECT-TYPE @@ -19320,88 +20790,88 @@ poeHighInrushEnable OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "DSCP to Intp map, DSCP1<0>." + "DSCP to Intp map, DSCP1<0-63>." ::= { qos2MapDSCPtoIntp 1 } --xxx.100.27.1.4.2 - qos2MapDSCPtoIntp2 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to Intp map, DSCP2<0>." - ::= { qos2MapDSCPtoIntp 2 } + qos2MapDSCPtoIntp2 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to Intp map, DSCP2<0-63>." + ::= { qos2MapDSCPtoIntp 2 } --xxx.100.27.1.4.3 - qos2MapDSCPtoIntp3 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to Intp map, DSCP3<0>." - ::= { qos2MapDSCPtoIntp 3 } + qos2MapDSCPtoIntp3 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to Intp map, DSCP3<0-63>." + ::= { qos2MapDSCPtoIntp 3 } --xxx.100.27.1.4.4 - qos2MapDSCPtoIntp4 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to Intp map, DSCP4<0>." - ::= { qos2MapDSCPtoIntp 4 } + qos2MapDSCPtoIntp4 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to Intp map, DSCP4<0-63>." + ::= { qos2MapDSCPtoIntp 4 } --xxx.100.27.1.4.5 - qos2MapDSCPtoIntp5 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to Intp map, DSCP5<0>." - ::= { qos2MapDSCPtoIntp 5 } + qos2MapDSCPtoIntp5 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to Intp map, DSCP5<0-63>." + ::= { qos2MapDSCPtoIntp 5 } --xxx.100.27.1.4.6 - qos2MapDSCPtoIntp6 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to Intp map, DSCP6<0>." - ::= { qos2MapDSCPtoIntp 6 } + qos2MapDSCPtoIntp6 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to Intp map, DSCP6<0-63>." + ::= { qos2MapDSCPtoIntp 6 } --xxx.100.27.1.4.7 - qos2MapDSCPtoIntp7 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to Intp map, DSCP7<0>." - ::= { qos2MapDSCPtoIntp 7 } + qos2MapDSCPtoIntp7 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to Intp map, DSCP7<0-63>." + ::= { qos2MapDSCPtoIntp 7 } --xxx.100.27.1.4.8 - qos2MapDSCPtoIntp8 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to Intp map, DSCP8<0>." - ::= { qos2MapDSCPtoIntp 8 } + qos2MapDSCPtoIntp8 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to Intp map, DSCP8<0-63>." + ::= { qos2MapDSCPtoIntp 8 } --xxx.100.27.1.4.9 - qos2MapDSCPtoIntpIntPriovalue OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to Intp map, IntPrio value<0>." - ::= { qos2MapDSCPtoIntp 9 } - + qos2MapDSCPtoIntpIntPriovalue OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to Intp map, IntPrio value<0-7>." + ::= { qos2MapDSCPtoIntp 9 } + --xxx.100.27.1.4.10 qos2MapDSCPtoIntpStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -19409,7 +20879,7 @@ poeHighInrushEnable OBJECT-TYPE ::= { qos2MapDSCPtoIntp 10 } --xxx.100.27.1.5 - qos2MapDSCPtoDP OBJECT IDENTIFIER ::= { qos2 5 } + qos2MapDSCPtoDP OBJECT IDENTIFIER ::= { qos2 5 } --xxx.100.27.1.5.1 qos2MapDSCPtoDP1 OBJECT-TYPE @@ -19417,88 +20887,88 @@ poeHighInrushEnable OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "DSCP to DP map, DSCP1<0>." + "DSCP to DP map, DSCP1<0-63>." ::= { qos2MapDSCPtoDP 1 } --xxx.100.27.1.5.2 - qos2MapDSCPtoDP2 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to DP map, DSCP2<0>." - ::= { qos2MapDSCPtoDP 2 } + qos2MapDSCPtoDP2 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to DP map, DSCP2<0-63>." + ::= { qos2MapDSCPtoDP 2 } --xxx.100.27.1.5.3 - qos2MapDSCPtoDP3 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to DP map, DSCP3<0>." - ::= { qos2MapDSCPtoDP 3 } + qos2MapDSCPtoDP3 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to DP map, DSCP3<0-63>." + ::= { qos2MapDSCPtoDP 3 } --xxx.100.27.1.5.4 - qos2MapDSCPtoDP4 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to DP map, DSCP4<0>." - ::= { qos2MapDSCPtoDP 4 } + qos2MapDSCPtoDP4 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to DP map, DSCP4<0-63>." + ::= { qos2MapDSCPtoDP 4 } --xxx.100.27.1.5.5 - qos2MapDSCPtoDP5 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to DP map, DSCP5<0>." - ::= { qos2MapDSCPtoDP 5 } + qos2MapDSCPtoDP5 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to DP map, DSCP5<0-63>." + ::= { qos2MapDSCPtoDP 5 } --xxx.100.27.1.5.6 - qos2MapDSCPtoDP6 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to DP map, DSCP6<0>." - ::= { qos2MapDSCPtoDP 6 } + qos2MapDSCPtoDP6 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to DP map, DSCP6<0-63>." + ::= { qos2MapDSCPtoDP 6 } --xxx.100.27.1.5.7 - qos2MapDSCPtoDP7 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to DP map, DSCP7<0>." - ::= { qos2MapDSCPtoDP 7 } + qos2MapDSCPtoDP7 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to DP map, DSCP7<0-63>." + ::= { qos2MapDSCPtoDP 7 } --xxx.100.27.1.5.8 - qos2MapDSCPtoDP8 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to DP map, DSCP8<0>." - ::= { qos2MapDSCPtoDP 8 } + qos2MapDSCPtoDP8 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to DP map, DSCP8<0-63>." + ::= { qos2MapDSCPtoDP 8 } --xxx.100.27.1.5.9 - qos2MapDSCPtoDPvalue OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "DSCP to DP map, Drop Precedence value<0>." - ::= { qos2MapDSCPtoDP 9 } - + qos2MapDSCPtoDPvalue OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "DSCP to DP map, Drop Precedence value<0-2>." + ::= { qos2MapDSCPtoDP 9 } + --xxx.100.27.1.5.10 qos2MapDSCPtoDPStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -19506,7 +20976,7 @@ poeHighInrushEnable OBJECT-TYPE ::= { qos2MapDSCPtoDP 10 } --xxx.100.27.1.6 - qos2MapExptoIntp OBJECT IDENTIFIER ::= { qos2 6 } + qos2MapExptoIntp OBJECT IDENTIFIER ::= { qos2 6 } --xxx.100.27.1.6.1 qos2MapExptoIntp1 OBJECT-TYPE @@ -19514,79 +20984,79 @@ poeHighInrushEnable OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "EXP to Intp map, IntPrio1 value<0>." + "EXP to Intp map, IntPrio1 value<0-7>." ::= { qos2MapExptoIntp 1 } --xxx.100.27.1.6.2 - qos2MapExptoIntp2 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "EXP to Intp map, IntPrio2 value<0>." - ::= { qos2MapExptoIntp 2 } + qos2MapExptoIntp2 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "EXP to Intp map, IntPrio2 value<0-7>." + ::= { qos2MapExptoIntp 2 } --xxx.100.27.1.6.3 - qos2MapExptoIntp3 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "EXP to Intp map, IntPrio3 value<0>." - ::= { qos2MapExptoIntp 3 } + qos2MapExptoIntp3 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "EXP to Intp map, IntPrio3 value<0-7>." + ::= { qos2MapExptoIntp 3 } --xxx.100.27.1.6.4 - qos2MapExptoIntp4 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "EXP to Intp map, IntPrio4 value<0>." - ::= { qos2MapExptoIntp 4 } + qos2MapExptoIntp4 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "EXP to Intp map, IntPrio4 value<0-7>." + ::= { qos2MapExptoIntp 4 } --xxx.100.27.1.6.5 - qos2MapExptoIntp5 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "EXP to Intp map, IntPrio5 value<0>." - ::= { qos2MapExptoIntp 5 } + qos2MapExptoIntp5 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "EXP to Intp map, IntPrio5 value<0-7>." + ::= { qos2MapExptoIntp 5 } --xxx.100.27.1.6.6 - qos2MapExptoIntp6 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "EXP to Intp map, IntPrio6 value<0>." - ::= { qos2MapExptoIntp 6 } + qos2MapExptoIntp6 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "EXP to Intp map, IntPrio6 value<0-7>." + ::= { qos2MapExptoIntp 6 } --xxx.100.27.1.6.7 - qos2MapExptoIntp7 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "EXP to Intp map, IntPrio7 value<0>." - ::= { qos2MapExptoIntp 7 } + qos2MapExptoIntp7 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "EXP to Intp map, IntPrio7 value<0-7>." + ::= { qos2MapExptoIntp 7 } --xxx.100.27.1.6.8 - qos2MapExptoIntp8 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "EXP to Intp map, IntPrio8 value<0>." - ::= { qos2MapExptoIntp 8 } - + qos2MapExptoIntp8 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "EXP to Intp map, IntPrio8 value<0-7>." + ::= { qos2MapExptoIntp 8 } + --xxx.100.27.1.6.9 qos2MapExptoIntpStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -19594,7 +21064,7 @@ poeHighInrushEnable OBJECT-TYPE ::= { qos2MapExptoIntp 9 } --xxx.100.27.1.7 - qos2MapExptoDP OBJECT IDENTIFIER ::= { qos2 7 } + qos2MapExptoDP OBJECT IDENTIFIER ::= { qos2 7 } --xxx.100.27.1.7.1 qos2MapExptoDP1 OBJECT-TYPE @@ -19602,79 +21072,79 @@ poeHighInrushEnable OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "EXP to DP map, Drop Precedence value<0>." + "EXP to DP map, Drop Precedence value<0-2>." ::= { qos2MapExptoDP 1 } --xxx.100.27.1.7.2 - qos2MapExptoDP2 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "EXP to DP map, Drop Precedence value<0>." - ::= { qos2MapExptoDP 2 } + qos2MapExptoDP2 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "EXP to DP map, Drop Precedence value<0-2>." + ::= { qos2MapExptoDP 2 } --xxx.100.27.1.7.3 - qos2MapExptoDP3 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "EXP to DP map, Drop Precedence value<0>." - ::= { qos2MapExptoDP 3 } + qos2MapExptoDP3 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "EXP to DP map, Drop Precedence value<0-2>." + ::= { qos2MapExptoDP 3 } --xxx.100.27.1.7.4 - qos2MapExptoDP4 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "EXP to DP map, Drop Precedence value<0>." - ::= { qos2MapExptoDP 4 } + qos2MapExptoDP4 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "EXP to DP map, Drop Precedence value<0-2>." + ::= { qos2MapExptoDP 4 } --xxx.100.27.1.7.5 - qos2MapExptoDP5 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "EXP to DP map, Drop Precedence value<0>." - ::= { qos2MapExptoDP 5 } + qos2MapExptoDP5 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "EXP to DP map, Drop Precedence value<0-2>." + ::= { qos2MapExptoDP 5 } --xxx.100.27.1.7.6 - qos2MapExptoDP6 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "EXP to DP map, Drop Precedence value<0>." - ::= { qos2MapExptoDP 6 } + qos2MapExptoDP6 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "EXP to DP map, Drop Precedence value<0-2>." + ::= { qos2MapExptoDP 6 } --xxx.100.27.1.7.7 - qos2MapExptoDP7 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "EXP to DP map, Drop Precedence value<0>." - ::= { qos2MapExptoDP 7 } + qos2MapExptoDP7 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "EXP to DP map, Drop Precedence value<0-2>." + ::= { qos2MapExptoDP 7 } --xxx.100.27.1.7.8 - qos2MapExptoDP8 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "EXP to DP map, Drop Precedence value<0>." - ::= { qos2MapExptoDP 8 } - + qos2MapExptoDP8 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "EXP to DP map, Drop Precedence value<0-2>." + ::= { qos2MapExptoDP 8 } + --xxx.100.27.1.7.9 qos2MapExptoDPStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -19682,7 +21152,7 @@ poeHighInrushEnable OBJECT-TYPE ::= { qos2MapExptoDP 9 } --xxx.100.27.1.8 - qos2MapIntptoDSCP OBJECT IDENTIFIER ::= { qos2 8 } + qos2MapIntptoDSCP OBJECT IDENTIFIER ::= { qos2 8 } --xxx.100.27.1.8.1 qos2MapIntptoDSCP1 OBJECT-TYPE @@ -19690,79 +21160,79 @@ poeHighInrushEnable OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "Intp to DSCP map, IntPrio value<0>." + "Intp to DSCP map, IntPrio value<0-7>." ::= { qos2MapIntptoDSCP 1 } --xxx.100.27.1.8.2 - qos2MapIntptoDSCP2 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Intp to DSCP map, IntPrio value<0>." - ::= { qos2MapIntptoDSCP 2 } + qos2MapIntptoDSCP2 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Intp to DSCP map, IntPrio value<0-7>." + ::= { qos2MapIntptoDSCP 2 } --xxx.100.27.1.8.3 - qos2MapIntptoDSCP3 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Intp to DSCP map, IntPrio value<0>." - ::= { qos2MapIntptoDSCP 3 } + qos2MapIntptoDSCP3 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Intp to DSCP map, IntPrio value<0-7>." + ::= { qos2MapIntptoDSCP 3 } --xxx.100.27.1.8.4 - qos2MapIntptoDSCP4 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Intp to DSCP map, IntPrio value<0>." - ::= { qos2MapIntptoDSCP 4 } + qos2MapIntptoDSCP4 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Intp to DSCP map, IntPrio value<0-7>." + ::= { qos2MapIntptoDSCP 4 } --xxx.100.27.1.8.5 - qos2MapIntptoDSCP5 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Intp to DSCP map, IntPrio value<0>." - ::= { qos2MapIntptoDSCP 5 } + qos2MapIntptoDSCP5 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Intp to DSCP map, IntPrio value<0-7>." + ::= { qos2MapIntptoDSCP 5 } --xxx.100.27.1.8.6 - qos2MapIntptoDSCP6 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Intp to DSCP map, IntPrio value<0>." - ::= { qos2MapIntptoDSCP 6 } + qos2MapIntptoDSCP6 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Intp to DSCP map, IntPrio value<0-7>." + ::= { qos2MapIntptoDSCP 6 } --xxx.100.27.1.8.7 - qos2MapIntptoDSCP7 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Intp to DSCP map, IntPrio value<0>." - ::= { qos2MapIntptoDSCP 7 } + qos2MapIntptoDSCP7 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Intp to DSCP map, IntPrio value<0-7>." + ::= { qos2MapIntptoDSCP 7 } --xxx.100.27.1.8.8 - qos2MapIntptoDSCP8 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Intp to DSCP map, IntPrio value<0>." - ::= { qos2MapIntptoDSCP 8 } - + qos2MapIntptoDSCP8 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Intp to DSCP map, IntPrio value<0-7>." + ::= { qos2MapIntptoDSCP 8 } + --xxx.100.27.1.8.9 qos2MapIntptoDSCPStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -19770,7 +21240,7 @@ poeHighInrushEnable OBJECT-TYPE ::= { qos2MapIntptoDSCP 9 } --xxx.100.27.1.10 - qos2MapIntptoEXP OBJECT IDENTIFIER ::= { qos2 10 } + qos2MapIntptoEXP OBJECT IDENTIFIER ::= { qos2 10 } --xxx.100.27.1.10.1 qos2MapIntptoEXP1 OBJECT-TYPE @@ -19778,79 +21248,79 @@ poeHighInrushEnable OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "Intp to EXP map, EXP value<0>." + "Intp to EXP map, EXP value<0-7>." ::= { qos2MapIntptoEXP 1 } --xxx.100.27.1.10.2 - qos2MapIntptoEXP2 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Intp to EXP map, EXP value<0>." - ::= { qos2MapIntptoEXP 2 } + qos2MapIntptoEXP2 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Intp to EXP map, EXP value<0-7>." + ::= { qos2MapIntptoEXP 2 } --xxx.100.27.1.10.3 - qos2MapIntptoEXP3 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Intp to EXP map, EXP value<0>." - ::= { qos2MapIntptoEXP 3 } + qos2MapIntptoEXP3 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Intp to EXP map, EXP value<0-7>." + ::= { qos2MapIntptoEXP 3 } --xxx.100.27.1.10.4 - qos2MapIntptoEXP4 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Intp to EXP map, EXP value<0>." - ::= { qos2MapIntptoEXP 4 } + qos2MapIntptoEXP4 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Intp to EXP map, EXP value<0-7>." + ::= { qos2MapIntptoEXP 4 } --xxx.100.27.1.10.5 - qos2MapIntptoEXP5 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Intp to EXP map, EXP value<0>." - ::= { qos2MapIntptoEXP 5 } + qos2MapIntptoEXP5 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Intp to EXP map, EXP value<0-7>." + ::= { qos2MapIntptoEXP 5 } --xxx.100.27.1.10.6 - qos2MapIntptoEXP6 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Intp to EXP map, EXP value<0>." - ::= { qos2MapIntptoEXP 6 } + qos2MapIntptoEXP6 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Intp to EXP map, EXP value<0-7>." + ::= { qos2MapIntptoEXP 6 } --xxx.100.27.1.10.7 - qos2MapIntptoEXP7 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Intp to EXP map, EXP value<0>." - ::= { qos2MapIntptoEXP 7 } + qos2MapIntptoEXP7 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Intp to EXP map, EXP value<0-7>." + ::= { qos2MapIntptoEXP 7 } --xxx.100.27.1.10.8 - qos2MapIntptoEXP8 OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Intp to EXP map, EXP value<0>." - ::= { qos2MapIntptoEXP 8 } - + qos2MapIntptoEXP8 OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Intp to EXP map, EXP value<0-7>." + ::= { qos2MapIntptoEXP 8 } + --xxx.100.27.1.10.9 qos2MapIntptoEXPStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -19858,7 +21328,7 @@ poeHighInrushEnable OBJECT-TYPE ::= { qos2MapIntptoEXP 9 } --xxx.100.27.1.11 - qos2AggregatePolicy OBJECT IDENTIFIER ::= { qos2 11 } + qos2AggregatePolicy OBJECT IDENTIFIER ::= { qos2 11 } --xxx.100.27.1.11.1 qos2AggPolicyName OBJECT-TYPE @@ -19866,157 +21336,157 @@ poeHighInrushEnable OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "Aggregate policy name<1>." + "Aggregate policy name<1-64>." ::= { qos2AggregatePolicy 1 } --xxx.100.27.1.11.2 - qos2AggPolicyCIRKbps OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "CIR(Committed Information Rate) Kbits per second <1>." - ::= { qos2AggregatePolicy 2 } + qos2AggPolicyCIRKbps OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "CIR(Committed Information Rate) Kbits per second <1-10000000>." + ::= { qos2AggregatePolicy 2 } --xxx.100.27.1.11.3 - qos2AggPolicyCBSKbps OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "CBS(Committed Burst Size) Kbits per second <1>." - ::= { qos2AggregatePolicy 3 } + qos2AggPolicyCBSKbps OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "CBS(Committed Burst Size) Kbits per second <1-1000000>." + ::= { qos2AggregatePolicy 3 } --xxx.100.27.1.11.4 - qos2AggPolicyPBSKbps OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "PBS(Peak Burst Size) Kbits per second <1>." - ::= { qos2AggregatePolicy 4 } + qos2AggPolicyPBSKbps OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "PBS(Peak Burst Size) Kbits per second <1-1000000>." + ::= { qos2AggregatePolicy 4 } --xxx.100.27.1.11.5 - qos2AggPolicyPIRKbps OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "PIR(Peak Information Rate) Kbits per second <1>." - ::= { qos2AggregatePolicy 5 } + qos2AggPolicyPIRKbps OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "PIR(Peak Information Rate) Kbits per second <1-10000000>." + ::= { qos2AggregatePolicy 5 } --xxx.100.27.1.11.6 - qos2AggPolicyConformAction OBJECT-TYPE - SYNTAX INTEGER - { - transmit(0), - drop(1), - set-dscp-transmit(2), - set-prec-transmit(3), - set-cos-transmit(4), - set-drop-precedence(5), - set-internal-priority(6) - } - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "conform-action transmit means send packets without any change when specified speed is not exceeded; - conform-action drop means drop packets when specified speed is not exceeded; - conform-action set-dscp-transmit specifies to mark down packet DSCP value according to policed-dscp mapping when specified speed is not exceeded; - conform-action set-prec-transmit specifies to mark down packet TOS value according to policed-dscp mapping when specified speed is not exceeded. + qos2AggPolicyConformAction OBJECT-TYPE + SYNTAX INTEGER + { + transmit(0), + drop(1), + set-dscp-transmit(2), + set-prec-transmit(3), + set-cos-transmit(4), + set-drop-precedence(5), + set-internal-priority(6) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "conform-action transmit means send packets without any change when specified speed is not exceeded; + conform-action drop means drop packets when specified speed is not exceeded; + conform-action set-dscp-transmit specifies to mark down packet DSCP value according to policed-dscp mapping when specified speed is not exceeded; + conform-action set-prec-transmit specifies to mark down packet TOS value according to policed-dscp mapping when specified speed is not exceeded. ." - ::= { qos2AggregatePolicy 6 } + ::= { qos2AggregatePolicy 6 } --xxx.100.27.1.11.7 - qos2AggPolicyConformActionChangeValue OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "If conform-action is set-dscp-transmit(2),the value is between 0-63; - If conform-action is set-prec-transmit(3),the value is between 0-7; - If conform-action is set-cos-transmit(4),the value is between 0-7; - If conform-action is set-drop-precedence(5),the value is between 0-2; - If conform-action is set-internal-priority(6),the value is between 0-7;" - ::= { qos2AggregatePolicy 7 } + qos2AggPolicyConformActionChangeValue OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "If conform-action is set-dscp-transmit(2),the value is between 0-63; + If conform-action is set-prec-transmit(3),the value is between 0-7; + If conform-action is set-cos-transmit(4),the value is between 0-7; + If conform-action is set-drop-precedence(5),the value is between 0-2; + If conform-action is set-internal-priority(6),the value is between 0-7;" + ::= { qos2AggregatePolicy 7 } --xxx.100.27.1.11.8 - qos2AggPolicyExceedAction OBJECT-TYPE - SYNTAX INTEGER - { - transmit(0), - drop(1), - set-dscp-transmit(2), - set-prec-transmit(3), - set-cos-transmit(4), - set-drop-precedence(5), - set-internal-priority(6) - } - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "conform-action transmit means send packets without any change when specified speed is not exceeded; - conform-action drop means drop packets when specified speed is not exceeded; - conform-action set-dscp-transmit specifies to mark down packet DSCP value according to policed-dscp mapping when specified speed is not exceeded; - conform-action set-prec-transmit specifies to mark down packet TOS value according to policed-dscp mapping when specified speed is not exceeded. + qos2AggPolicyExceedAction OBJECT-TYPE + SYNTAX INTEGER + { + transmit(0), + drop(1), + set-dscp-transmit(2), + set-prec-transmit(3), + set-cos-transmit(4), + set-drop-precedence(5), + set-internal-priority(6) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "conform-action transmit means send packets without any change when specified speed is not exceeded; + conform-action drop means drop packets when specified speed is not exceeded; + conform-action set-dscp-transmit specifies to mark down packet DSCP value according to policed-dscp mapping when specified speed is not exceeded; + conform-action set-prec-transmit specifies to mark down packet TOS value according to policed-dscp mapping when specified speed is not exceeded. ." - ::= { qos2AggregatePolicy 8 } + ::= { qos2AggregatePolicy 8 } --xxx.100.27.1.11.9 - qos2AggPolicyExceedActionChangeValue OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "If conform-action is set-dscp-transmit(2),the value is between 0-63; - If conform-action is set-prec-transmit(3),the value is between 0-7; - If conform-action is set-cos-transmit(4),the value is between 0-7; - If conform-action is set-drop-precedence(5),the value is between 0-2; - If conform-action is set-internal-priority(6),the value is between 0-7;" - ::= { qos2AggregatePolicy 9 } - + qos2AggPolicyExceedActionChangeValue OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "If conform-action is set-dscp-transmit(2),the value is between 0-63; + If conform-action is set-prec-transmit(3),the value is between 0-7; + If conform-action is set-cos-transmit(4),the value is between 0-7; + If conform-action is set-drop-precedence(5),the value is between 0-2; + If conform-action is set-internal-priority(6),the value is between 0-7;" + ::= { qos2AggregatePolicy 9 } + --xxx.100.27.1.11.10 - qos2AggPolicyViolateAction OBJECT-TYPE - SYNTAX INTEGER - { - transmit(0), - drop(1), - set-dscp-transmit(2), - set-prec-transmit(3), - set-cos-transmit(4), - set-drop-precedence(5), - set-internal-priority(6) - } - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "conform-action transmit means send packets without any change when specified speed is not exceeded; - conform-action drop means drop packets when specified speed is not exceeded; - conform-action set-dscp-transmit specifies to mark down packet DSCP value according to policed-dscp mapping when specified speed is not exceeded; - conform-action set-prec-transmit specifies to mark down packet TOS value according to policed-dscp mapping when specified speed is not exceeded. + qos2AggPolicyViolateAction OBJECT-TYPE + SYNTAX INTEGER + { + transmit(0), + drop(1), + set-dscp-transmit(2), + set-prec-transmit(3), + set-cos-transmit(4), + set-drop-precedence(5), + set-internal-priority(6) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "conform-action transmit means send packets without any change when specified speed is not exceeded; + conform-action drop means drop packets when specified speed is not exceeded; + conform-action set-dscp-transmit specifies to mark down packet DSCP value according to policed-dscp mapping when specified speed is not exceeded; + conform-action set-prec-transmit specifies to mark down packet TOS value according to policed-dscp mapping when specified speed is not exceeded. ." - ::= { qos2AggregatePolicy 10 } + ::= { qos2AggregatePolicy 10 } --xxx.100.27.1.11.11 - qos2AggPolicyViolateActionChangeValue OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "If conform-action is set-dscp-transmit(2),the value is between 0-63; - If conform-action is set-prec-transmit(3),the value is between 0-7; - If conform-action is set-cos-transmit(4),the value is between 0-7; - If conform-action is set-drop-precedence(5),the value is between 0-2; - If conform-action is set-internal-priority(6),the value is between 0-7;" - ::= { qos2AggregatePolicy 11 } + qos2AggPolicyViolateActionChangeValue OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "If conform-action is set-dscp-transmit(2),the value is between 0-63; + If conform-action is set-prec-transmit(3),the value is between 0-7; + If conform-action is set-cos-transmit(4),the value is between 0-7; + If conform-action is set-drop-precedence(5),the value is between 0-2; + If conform-action is set-internal-priority(6),the value is between 0-7;" + ::= { qos2AggregatePolicy 11 } --xxx.100.27.1.11.12 qos2AggPolicyStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -20030,7 +21500,7 @@ qos2ServicePolicyTable OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - " QoS service policy table." + " QoS service policy table." ::= { qos2 12} --xxx.100.27.1.12.1 @@ -20046,9 +21516,9 @@ qos2ServicePolicyEntry OBJECT-TYPE Qos2ServicePolicyEntry ::= SEQUENCE { - qos2PolicyMapName DisplayString , - qos2ServicePolicyVlanList DisplayString , - qos2ServicePolicyStatus INTEGER + qos2PolicyMapName DisplayString , + qos2ServicePolicyVlanList DisplayString , + qos2ServicePolicyStatus INTEGER } --xxx.100.27.1.12.1.1 @@ -20057,7 +21527,7 @@ qos2PolicyMapName OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "Policy map name<1>." + "Policy map name<1-64>." ::= { qos2ServicePolicyEntry 1 } @@ -20073,18 +21543,18 @@ qos2ServicePolicyVlanList OBJECT-TYPE --xxx.100.27.1.12.1.3 qos2ServicePolicyStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION " Setting it to active(1) to creates an entry,setting it to destroy(2) to destroy an entry." ::= { qos2ServicePolicyEntry 3 } - + --xxx.100.27.1.13 -qos2PortTable OBJECT IDENTIFIER ::= { qos2 13 } +qos2PortTable OBJECT IDENTIFIER ::= { qos2 13 } --xxx.100.27.1.13.1 qos2PortIndex OBJECT-TYPE @@ -20099,28 +21569,28 @@ qos2PortIndex OBJECT-TYPE qos2PortType OBJECT-TYPE SYNTAX INTEGER { - trust(0), - cos(1), - policy(2), - queueAndBandwidth(3), - queueAndAlgorithm(4), - queueAndWdrr(5), - queueAndWrr(6) - } + trust(0), + cos(1), + policy(2), + queueAndBandwidth(3), + queueAndAlgorithm(4), + queueAndWdrr(5), + queueAndWrr(6) + } MAX-ACCESS read-create STATUS current DESCRIPTION "the relation between qosPortType and CLI: - 0 mls qos trust {cos |dscp }; - 1 mls qos cos {}; - 2 service-policy input WORD; - 3 mls qos queue {} bandwidth { }; - 4 mls qos queue algorithm {sp |wdrr |wrr }; - 5 mls qos queue wdrr weight { }; - 6 mls qos queue wrr weight { }. - According to the relation,when configurate qos with snmp,first set the qosPortType to the correct value to select CLI, - then set next CLI parameter.Fox example,set qos default cos is 5, first set qosPortType=1 ,then set qosPortCos to 5, - finally setting qosPortStatus to 1, trigger snmp-cache works." + 0 mls qos trust {cos |dscp }; + 1 mls qos cos {}; + 2 service-policy input WORD; + 3 mls qos queue {} bandwidth { }; + 4 mls qos queue algorithm {sp |wdrr |wrr }; + 5 mls qos queue wdrr weight { }; + 6 mls qos queue wrr weight { }. + According to the relation,when configurate qos with snmp,first set the qosPortType to the correct value to select CLI, + then set next CLI parameter.Fox example,set qos default cos is 5, first set qosPortType=1 ,then set qosPortCos to 5, + finally setting qosPortStatus to 1, trigger snmp-cache works." ::= { qos2PortTable 2 } --xxx.100.27.1.13.3 @@ -20135,16 +21605,16 @@ qos2PortCos OBJECT-TYPE --xxx.100.27.1.13.4 qos2PortTrust OBJECT-TYPE SYNTAX INTEGER - { - cos(0), - dscp(1) - } + { + cos(0), + dscp(1) + } MAX-ACCESS read-create STATUS current DESCRIPTION "Configure port trust. - cos(0),mls qos trust cos; - dscp(1),mls qos trust dscp." + cos(0),mls qos trust cos; + dscp(1),mls qos trust dscp." ::= { qos2PortTable 4 } --xxx.100.27.1.13.5 @@ -20162,19 +21632,19 @@ qos2PortQueueBandwidth OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "The corresponding CLI:mls qos queue {} bandwidth { }." + "The corresponding CLI:mls qos queue {} bandwidth { }." ::= { qos2PortTable 6 } --xxx.100.27.1.13.7 qos2PortQueueAlgorithm OBJECT-TYPE SYNTAX INTEGER - { - sp(0), - wdrr(1), - wrr(2) - } - MAX-ACCESS read-create - STATUS current + { + sp(0), + wdrr(1), + wrr(2) + } + MAX-ACCESS read-create + STATUS current DESCRIPTION "The corresponding CLI:mls qos queue algorithm {sp |wdrr |wrr }." ::= { qos2PortTable 7 } @@ -20185,7 +21655,7 @@ qos2PortQueueWdrr OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "The corresponding CLI:mls qos queue wdrr weight { }." + "The corresponding CLI:mls qos queue wdrr weight { }." ::= { qos2PortTable 8 } --xxx.100.27.1.13.9 @@ -20194,16 +21664,16 @@ qos2PortQueueWrr OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "The corresponding CLI:mls qos queue wrr weight { }." + "The corresponding CLI:mls qos queue wrr weight { }." ::= { qos2PortTable 9 } --xxx.100.27.1.13.10 qos2PortStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -20213,7 +21683,7 @@ qos2PortStatus OBJECT-TYPE --******************************************************************************************************** --xxx.100.27.1.14 -qos2ClassMapTable OBJECT IDENTIFIER ::= { qos2 14 } +qos2ClassMapTable OBJECT IDENTIFIER ::= { qos2 14 } --xxx.100.27.1.14.1 qos2ClassMapName OBJECT-TYPE @@ -20227,31 +21697,31 @@ qos2ClassMapTable OBJECT IDENTIFIER ::= { qos2 14 } --xxx.100.27.1.14.2 qos2ClassMapType OBJECT-TYPE SYNTAX INTEGER - { - configurClassMap(0), - accessGroup(1), - dscp(2), - v6dscp(5), - ippre(3), - v6AccessGroup(8), - v6Flow(7), - vlan(4), - cos(9), - exp(10) - } + { + configurClassMap(0), + accessGroup(1), + dscp(2), + v6dscp(5), + ippre(3), + v6AccessGroup(8), + v6Flow(7), + vlan(4), + cos(9), + exp(10) + } MAX-ACCESS read-create STATUS current DESCRIPTION - "0 class-map ,index is classmapname; - 1 match access-group ,need qos2ClassMapAccessGroup cooperation; - 2 match ip dscp ,need qos2ClassMapDscp cooperation; - 3 match ip precedence ,need qos2ClassMapIpPre cooperation; - 4 match vlan ,need qos2ClassMapVlan cooperation; - 5 match ipv6 dscp ,need qos2ClassMapV6Dscp cooperation; - 7 match ipv6 flowlabel,need qos2ClassMapV6Flow cooperation; - 8 match ipv6 access-group,need qos2ClassMapV6AccGroup cooperation; - 9 match cos,need qos2ClassCos cooperation; - 10 match exp ,need qos2ClassMapExp cooperation." + "0 class-map ,index is classmapname; + 1 match access-group ,need qos2ClassMapAccessGroup cooperation; + 2 match ip dscp ,need qos2ClassMapDscp cooperation; + 3 match ip precedence ,need qos2ClassMapIpPre cooperation; + 4 match vlan ,need qos2ClassMapVlan cooperation; + 5 match ipv6 dscp ,need qos2ClassMapV6Dscp cooperation; + 7 match ipv6 flowlabel,need qos2ClassMapV6Flow cooperation; + 8 match ipv6 access-group,need qos2ClassMapV6AccGroup cooperation; + 9 match cos,need qos2ClassCos cooperation; + 10 match exp ,need qos2ClassMapExp cooperation." ::= { qos2ClassMapTable 2 } --xxx.100.27.1.14.3 @@ -20351,15 +21821,15 @@ qos2ClassMapTable OBJECT IDENTIFIER ::= { qos2 14 } "Match specify MPLS EXP. This object be configured only if qosClassMapType in the same row is Exp(10)." - ::= { qos2ClassMapTable 11 } + ::= { qos2ClassMapTable 11 } --xxx.100.27.1.14.12 qos2ClassMapStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -20369,7 +21839,7 @@ qos2ClassMapTable OBJECT IDENTIFIER ::= { qos2 14 } --******************************************************************************************************** --xxx.100.27.1.15 -qos2PolicyTable OBJECT IDENTIFIER ::= { qos2 15 } +qos2PolicyTable OBJECT IDENTIFIER ::= { qos2 15 } --xxx.100.27.1.15.1 qos2PolicyName OBJECT-TYPE @@ -20402,23 +21872,23 @@ qos2PolicyTable OBJECT IDENTIFIER ::= { qos2 15 } --xxx.100.27.1.15.4 qos2PolicyType OBJECT-TYPE - SYNTAX INTEGER - { - policymap(0), - matchclassmap(1), - threeColor(2), - aggregatePolicer(3), - accounting(4) - } + SYNTAX INTEGER + { + policymap(0), + matchclassmap(1), + threeColor(2), + aggregatePolicer(3), + accounting(4) + } MAX-ACCESS read-create STATUS current DESCRIPTION "the relation between qosPolicyType and CLI: - 0 policy-map ; - 1 class ; - 2 policy [pir ] | [{conform-action ACTION | exceed-action ACTION | violate-action ACTION }]; - 3 policy aggregate ; - 4 accounting. " + 0 policy-map ; + 1 class ; + 2 policy [pir ] | [{conform-action ACTION | exceed-action ACTION | violate-action ACTION }]; + 3 policy aggregate ; + 4 accounting. " ::= { qos2PolicyTable 4 } --xxx.100.27.1.15.5 @@ -20427,7 +21897,7 @@ qos2PolicyTable OBJECT IDENTIFIER ::= { qos2 15 } MAX-ACCESS read-create STATUS current DESCRIPTION - "CIR(Committed Information Rate) Kbits per second <1>." + "CIR(Committed Information Rate) Kbits per second <1-10000000>." ::= { qos2PolicyTable 5 } --xxx.100.27.1.15.6 @@ -20436,7 +21906,7 @@ qos2PolicyTable OBJECT IDENTIFIER ::= { qos2 15 } MAX-ACCESS read-create STATUS current DESCRIPTION - "CBS(Committed Burst Size) Kbits per second <1>." + "CBS(Committed Burst Size) Kbits per second <1-1000000>." ::= { qos2PolicyTable 6 } --xxx.100.27.1.15.7 @@ -20445,7 +21915,7 @@ qos2PolicyTable OBJECT IDENTIFIER ::= { qos2 15 } MAX-ACCESS read-create STATUS current DESCRIPTION - "PBS(Peak Burst Size) Kbits per second <1>." + "PBS(Peak Burst Size) Kbits per second <1-1000000>." ::= { qos2PolicyTable 7 } --xxx.100.27.1.15.8 @@ -20454,31 +21924,31 @@ qos2PolicyTable OBJECT IDENTIFIER ::= { qos2 15 } MAX-ACCESS read-create STATUS current DESCRIPTION - "PIR(Peak Information Rate) Kbits per second <1>." + "PIR(Peak Information Rate) Kbits per second <1-10000000>." ::= { qos2PolicyTable 8 } --xxx.100.27.1.15.9 qos2PolicyConformActionChange OBJECT-TYPE SYNTAX INTEGER - { - transmit(0), - drop(1), - set-dscp-transmit(2), - set-prec-transmit(3), - set-cos-transmit(4), - set-internal-priority(5), - set-drop-Precedence(6) - } + { + transmit(0), + drop(1), + set-dscp-transmit(2), + set-prec-transmit(3), + set-cos-transmit(4), + set-internal-priority(5), + set-drop-Precedence(6) + } MAX-ACCESS read-create STATUS current DESCRIPTION "transmit(0): means send packets without any change; - drop(1): means drop packets; - set-dscp-transmit(2): send packets and remark dscp value; - set-prec-transmit(3): send packets and remark ip-precedence value; - set-cos-transmit(4): send packets and remark cos value; - set-internal-priority(5):send packets and remark internal-priority value ; - set-drop-Precedence(6): send packets and remark drop-precedence value." + drop(1): means drop packets; + set-dscp-transmit(2): send packets and remark dscp value; + set-prec-transmit(3): send packets and remark ip-precedence value; + set-cos-transmit(4): send packets and remark cos value; + set-internal-priority(5):send packets and remark internal-priority value ; + set-drop-Precedence(6): send packets and remark drop-precedence value." ::= { qos2PolicyTable 9 } --xxx.100.27.1.15.10 @@ -20497,25 +21967,25 @@ qos2PolicyTable OBJECT IDENTIFIER ::= { qos2 15 } --xxx.100.27.1.15.11 qos2PolicyExceedActionChange OBJECT-TYPE SYNTAX INTEGER - { - transmit(0), - drop(1), - set-dscp-transmit(2), - set-prec-transmit(3), - set-cos-transmit(4), - set-internal-priority(5), - set-drop-Precedence(6) - } + { + transmit(0), + drop(1), + set-dscp-transmit(2), + set-prec-transmit(3), + set-cos-transmit(4), + set-internal-priority(5), + set-drop-Precedence(6) + } MAX-ACCESS read-create STATUS current DESCRIPTION "transmit(0): means send packets without any change; - drop(1): means drop packets; - set-dscp-transmit(2): send packets and remark dscp value; - set-prec-transmit(3): send packets and remark ip-precedence value; - set-cos-transmit(4): send packets and remark cos value; - set-internal-priority(5):send packets and remark internal-priority value ; - set-drop-Precedence(6): send packets and remark drop-precedence value." + drop(1): means drop packets; + set-dscp-transmit(2): send packets and remark dscp value; + set-prec-transmit(3): send packets and remark ip-precedence value; + set-cos-transmit(4): send packets and remark cos value; + set-internal-priority(5):send packets and remark internal-priority value ; + set-drop-Precedence(6): send packets and remark drop-precedence value." ::= { qos2PolicyTable 11 } --xxx.100.27.1.15.12 @@ -20534,25 +22004,25 @@ qos2PolicyTable OBJECT IDENTIFIER ::= { qos2 15 } --xxx.100.27.1.15.13 qos2PolicyViolateActionChange OBJECT-TYPE SYNTAX INTEGER - { - transmit(0), - drop(1), - set-dscp-transmit(2), - set-prec-transmit(3), - set-cos-transmit(4), - set-internal-priority(5), - set-drop-Precedence(6) - } + { + transmit(0), + drop(1), + set-dscp-transmit(2), + set-prec-transmit(3), + set-cos-transmit(4), + set-internal-priority(5), + set-drop-Precedence(6) + } MAX-ACCESS read-create STATUS current DESCRIPTION "transmit(0): means send packets without any change; - drop(1): means drop packets; - set-dscp-transmit(2): send packets and remark dscp value; - set-prec-transmit(3): send packets and remark ip-precedence value; - set-cos-transmit(4): send packets and remark cos value; - set-internal-priority(5):send packets and remark internal-priority value ; - set-drop-Precedence(6): send packets and remark drop-precedence value." + drop(1): means drop packets; + set-dscp-transmit(2): send packets and remark dscp value; + set-prec-transmit(3): send packets and remark ip-precedence value; + set-cos-transmit(4): send packets and remark cos value; + set-internal-priority(5):send packets and remark internal-priority value ; + set-drop-Precedence(6): send packets and remark drop-precedence value." ::= { qos2PolicyTable 13 } --xxx.100.27.1.15.14 @@ -20582,10 +22052,10 @@ qos2PolicyTable OBJECT IDENTIFIER ::= { qos2 15 } --xxx.100.27.1.15.16 qos2PolicyStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -20597,7 +22067,7 @@ qos2PolicyTable OBJECT IDENTIFIER ::= { qos2 15 } --******************************************************************************************************** --xxx.100.27.1.16 -qos2SetTable OBJECT IDENTIFIER ::= { qos2 16 } +qos2SetTable OBJECT IDENTIFIER ::= { qos2 16 } --xxx.100.27.1.16.1 qos2SetPolicyMapName OBJECT-TYPE @@ -20620,26 +22090,26 @@ qos2SetTable OBJECT IDENTIFIER ::= { qos2 16 } --xxx.100.27.1.16.3 qos2SetType OBJECT-TYPE SYNTAX INTEGER - { - dscp(1), - precedence(2), - internal-priority(3), - drop-precedence(4), - nextHop(5), - v6nextHop(6), - cos(7) - } + { + dscp(1), + precedence(2), + internal-priority(3), + drop-precedence(4), + nextHop(5), + v6nextHop(6), + cos(7) + } MAX-ACCESS read-create STATUS current DESCRIPTION "qos2SetType range:1,2,3,4,5,6 - 1 dscp Set IP DSCP (DiffServ CodePoints); - 2 precedence Set IP precedence; + 1 dscp Set IP DSCP (DiffServ CodePoints); + 2 precedence Set IP precedence; 3 internal-priority Set internal-priority; - 4 drop-precedence Set drop-precedence; - 5 nexthop Set IP nexthop; - 6 v6nextHop Set IPv6 nexthop; - 7 cos Set CoS ." + 4 drop-precedence Set drop-precedence; + 5 nexthop Set IP nexthop; + 6 v6nextHop Set IPv6 nexthop; + 7 cos Set CoS ." ::= { qos2SetTable 3 } --xxx.100.27.1.16.4 @@ -20728,16 +22198,16 @@ qos2SetTable OBJECT IDENTIFIER ::= { qos2 16 } --xxx.100.27.1.16.13 qos2SetStatus OBJECT-TYPE SYNTAX INTEGER - { - active(1), - destroy(2) - } + { + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION " Setting it to active(1) to creates an entry,setting it to destroy(2) to destroy an entry." ::= { qos2SetTable 13 } - + --******************************************************************************************************** --******************************************************************************************************** -- (xxx.100.28) dot1xMgt group @@ -20762,15 +22232,15 @@ mabOnlineUserEntry OBJECT-TYPE MabOnlineUserEntry ::= SEQUENCE { - mabOnlineUserIndex INTEGER, - mabOnlineUserMac DisplayString, - mabOnlineUserName DisplayString, - mabOnlineUserPort DisplayString, - mabOnlineUserState DisplayString + mabOnlineUserIndex INTEGER, + mabOnlineUserMac DisplayString, + mabOnlineUserName DisplayString, + mabOnlineUserPort DisplayString, + mabOnlineUserState DisplayString } mabOnlineUserIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4096) MAX-ACCESS not-accessible STATUS current DESCRIPTION "The index of MAB user." @@ -20829,18 +22299,18 @@ dot1xOnlineUserEntry OBJECT-TYPE Dot1xOnlineUserEntry ::= SEQUENCE { - dot1xOnlineUserIndex INTEGER, - dot1xOnlineUserMac DisplayString, - dot1xOnlineUserName DisplayString, - dot1xOnlineUserPort DisplayString, - dot1xOnlineUserPortVlanid INTEGER, + dot1xOnlineUserIndex INTEGER, + dot1xOnlineUserMac DisplayString, + dot1xOnlineUserName DisplayString, + dot1xOnlineUserPort DisplayString, + dot1xOnlineUserPortVlanid INTEGER, dot1xOnlineUserPortMethod DisplayString, dot1xOnlineUserPortControl DisplayString, - dot1xOnlineUserState DisplayString + dot1xOnlineUserState DisplayString } dot1xOnlineUserIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4096) MAX-ACCESS not-accessible STATUS current DESCRIPTION "The index of dot1x user." @@ -20929,15 +22399,15 @@ PortMacCountLimitEntry { portMacCountLimitPortIndex INTEGER, portMacCountLimitConfigNum INTEGER, - portMacCountLimitCurNum INTEGER, - portMacCountLimitDisable INTEGER, - portMacCountLimitViolationMode INTEGER, - portMacCountLimitShutRecoveryTime INTEGER + portMacCountLimitCurNum INTEGER, + portMacCountLimitDisable INTEGER, + portMacCountLimitViolationMode INTEGER, + portMacCountLimitShutRecoveryTime INTEGER } --xxx.100.29.1.1.1 portMacCountLimitPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -20961,14 +22431,14 @@ portMacCountLimitCurNum OBJECT-TYPE DESCRIPTION "The current number of the dynamic mac learned on the port." ::= { portMacCountLimitEntry 3 } - + --xxx.100.29.1.1.4 portMacCountLimitDisable OBJECT-TYPE SYNTAX INTEGER - { - disable(1), + { + disable(1), not-disable(0) - } + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -20978,11 +22448,11 @@ portMacCountLimitDisable OBJECT-TYPE --xxx.100.29.1.1.5 portMacCountLimitViolationMode OBJECT-TYPE SYNTAX INTEGER - { - protect(1), - shutdown(2), - replace(4) - } + { + protect(1), + shutdown(2), + replace(4) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -20992,14 +22462,14 @@ portMacCountLimitViolationMode OBJECT-TYPE --xxx.100.29.1.1.6 portMacCountLimitShutRecoveryTime OBJECT-TYPE - SYNTAX INTEGER (0..3600) + SYNTAX INTEGER (0..3600) MAX-ACCESS read-create STATUS current DESCRIPTION - "The recovery time of violation shutdown mode, the recovery time range is <5>, the value 0 is to cancel recovery time, the value <1> is not allowed to config." + "The recovery time of violation shutdown mode, the recovery time range is <5-3600>, the value 0 is to cancel recovery time, the value <1-4> is not allowed to config." ::= { portMacCountLimitEntry 6 } - + --DDM --*********************************************************************************************************************************** -- xxx.100.30.1 @@ -21012,253 +22482,253 @@ ddmTranscDiagnosisTable OBJECT-TYPE "A list of ddm transceiver diagnosis information." ::= { ddm 1 } -- xxx.100.30.1.1 - ddmTranscDiagnosisEntry OBJECT-TYPE - SYNTAX DdmTranscDiagnosisEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "entry for ddm transceiver diagnosis information." - INDEX { ddmDiagnosisIfIndex } - ::= { ddmTranscDiagnosisTable 1 } - - DdmTranscDiagnosisEntry ::= SEQUENCE { - ddmDiagnosisIfIndex INTEGER, - ddmDiagnosisTemperature DisplayString, - ddmDiagTempHighAlarmThreshold DisplayString, - ddmDiagTempLowAlarmThreshold DisplayString, - ddmDiagTempHighWarnThreshold DisplayString, - ddmDiagTempLowWarnThreshold DisplayString, - ddmDiagnosisVoltage DisplayString, - ddmDiagVoltHighAlarmThreshold DisplayString, - ddmDiagVoltLowAlarmThreshold DisplayString, - ddmDiagVoltHighWarnThreshold DisplayString, - ddmDiagVoltLowWarnThreshold DisplayString, - ddmDiagnosisBias DisplayString, - ddmDiagBiasHighAlarmThreshold DisplayString, - ddmDiagBiasLowAlarmThreshold DisplayString, - ddmDiagBiasHighWarnThreshold DisplayString, - ddmDiagBiasLowWarnThreshold DisplayString, - ddmDiagnosisRXPower DisplayString, - ddmDiagRXPowerHighAlarmThreshold DisplayString, - ddmDiagRXPowerLowAlarmThreshold DisplayString, - ddmDiagRXPowerHighWarnThreshold DisplayString, - ddmDiagRXPowerLowWarnThreshold DisplayString, - ddmDiagnosisTXPower DisplayString, - ddmDiagTXPowerHighAlarmThreshold DisplayString, - ddmDiagTXPowerLowAlarmThreshold DisplayString, - ddmDiagTXPowerHighWarnThreshold DisplayString, - ddmDiagTXPowerLowWarnThreshold DisplayString - } --- xxx.100.30.1.1.1 + ddmTranscDiagnosisEntry OBJECT-TYPE + SYNTAX DdmTranscDiagnosisEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "entry for ddm transceiver diagnosis information." + INDEX { ddmDiagnosisIfIndex } + ::= { ddmTranscDiagnosisTable 1 } + + DdmTranscDiagnosisEntry ::= SEQUENCE { + ddmDiagnosisIfIndex INTEGER, + ddmDiagnosisTemperature DisplayString, + ddmDiagTempHighAlarmThreshold DisplayString, + ddmDiagTempLowAlarmThreshold DisplayString, + ddmDiagTempHighWarnThreshold DisplayString, + ddmDiagTempLowWarnThreshold DisplayString, + ddmDiagnosisVoltage DisplayString, + ddmDiagVoltHighAlarmThreshold DisplayString, + ddmDiagVoltLowAlarmThreshold DisplayString, + ddmDiagVoltHighWarnThreshold DisplayString, + ddmDiagVoltLowWarnThreshold DisplayString, + ddmDiagnosisBias DisplayString, + ddmDiagBiasHighAlarmThreshold DisplayString, + ddmDiagBiasLowAlarmThreshold DisplayString, + ddmDiagBiasHighWarnThreshold DisplayString, + ddmDiagBiasLowWarnThreshold DisplayString, + ddmDiagnosisRXPower DisplayString, + ddmDiagRXPowerHighAlarmThreshold DisplayString, + ddmDiagRXPowerLowAlarmThreshold DisplayString, + ddmDiagRXPowerHighWarnThreshold DisplayString, + ddmDiagRXPowerLowWarnThreshold DisplayString, + ddmDiagnosisTXPower DisplayString, + ddmDiagTXPowerHighAlarmThreshold DisplayString, + ddmDiagTXPowerLowAlarmThreshold DisplayString, + ddmDiagTXPowerHighWarnThreshold DisplayString, + ddmDiagTXPowerLowWarnThreshold DisplayString + } +-- xxx.100.30.1.1.1 ddmDiagnosisIfIndex OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "interface NO." - ::= { ddmTranscDiagnosisEntry 1 } + SYNTAX INTEGER (10000..20000) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "interface NO." + ::= { ddmTranscDiagnosisEntry 1 } -- xxx.100.30.1.1.2 ddmDiagnosisTemperature OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..32)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "current Temperature of the port,and the unit is C." - ::= { ddmTranscDiagnosisEntry 2 } --- xxx.100.30.1.1.3 - ddmDiagTempHighAlarmThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "High alarm threshold of Temperature." - ::= { ddmTranscDiagnosisEntry 3 } - - ddmDiagTempLowAlarmThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "Low alarm threshold of Temperature." - ::= { ddmTranscDiagnosisEntry 4 } --- xxx.100.30.1.1.9 - ddmDiagTempHighWarnThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "High warn threshold of Temperature." - ::= { ddmTranscDiagnosisEntry 5 } --- xxx.100.30.1.1.10 - ddmDiagTempLowWarnThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "Low warn threshold of Temperature." - ::= { ddmTranscDiagnosisEntry 6} - - ddmDiagnosisVoltage OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..32)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "voltage of the port,and the unit is V." - ::= { ddmTranscDiagnosisEntry 7 } --- xxx.100.30.1.1.11 - ddmDiagVoltHighAlarmThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "High alarm threshold of Voltage." - ::= { ddmTranscDiagnosisEntry 8 } - - ddmDiagVoltLowAlarmThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "Low alarm threshold of Voltage." - ::= { ddmTranscDiagnosisEntry 9 } - + SYNTAX DisplayString(SIZE(1..32)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "current Temperature of the port,and the unit is C." + ::= { ddmTranscDiagnosisEntry 2 } +-- xxx.100.30.1.1.3 + ddmDiagTempHighAlarmThreshold OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "High alarm threshold of Temperature." + ::= { ddmTranscDiagnosisEntry 3 } + + ddmDiagTempLowAlarmThreshold OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Low alarm threshold of Temperature." + ::= { ddmTranscDiagnosisEntry 4 } +-- xxx.100.30.1.1.9 + ddmDiagTempHighWarnThreshold OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "High warn threshold of Temperature." + ::= { ddmTranscDiagnosisEntry 5 } +-- xxx.100.30.1.1.10 + ddmDiagTempLowWarnThreshold OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Low warn threshold of Temperature." + ::= { ddmTranscDiagnosisEntry 6} + + ddmDiagnosisVoltage OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..32)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "voltage of the port,and the unit is V." + ::= { ddmTranscDiagnosisEntry 7 } +-- xxx.100.30.1.1.11 + ddmDiagVoltHighAlarmThreshold OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "High alarm threshold of Voltage." + ::= { ddmTranscDiagnosisEntry 8 } + + ddmDiagVoltLowAlarmThreshold OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Low alarm threshold of Voltage." + ::= { ddmTranscDiagnosisEntry 9 } + ddmDiagVoltHighWarnThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "High warn threshold of Voltage." - ::= { ddmTranscDiagnosisEntry 10} + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "High warn threshold of Voltage." + ::= { ddmTranscDiagnosisEntry 10} -- xxx.100.30.1.1.14 ddmDiagVoltLowWarnThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "Low warn threshold of Voltage." - ::= { ddmTranscDiagnosisEntry 11 } - - ddmDiagnosisBias OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..32)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "bias of the port,the unit is mA." - ::= { ddmTranscDiagnosisEntry 12 } --- xxx.100.30.1.1.15 - ddmDiagBiasHighAlarmThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "High alarm threshold of Bias." - ::= { ddmTranscDiagnosisEntry 13 } --- xxx.100.30.1.1.16 - ddmDiagBiasLowAlarmThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "Low alarm threshold of Bias." - ::= { ddmTranscDiagnosisEntry 14 } --- xxx.100.30.1.1.17 - ddmDiagBiasHighWarnThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "High warn threshold of Bias." - ::= { ddmTranscDiagnosisEntry 15 } - - ddmDiagBiasLowWarnThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "Low warn threshold of Bias." - ::= { ddmTranscDiagnosisEntry 16 } - - ddmDiagnosisRXPower OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..32)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "RXPower of the port,and the unit is dBM,if the value of RXPower is infinitesimal,then set it to '-'." - ::= { ddmTranscDiagnosisEntry 17 } - - ddmDiagRXPowerHighAlarmThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "High alarm threshold of RXPower." - ::= { ddmTranscDiagnosisEntry 18 } --- xxx.100.30.1.1.20 - ddmDiagRXPowerLowAlarmThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "Low alarm threshold of RXPower." - ::= { ddmTranscDiagnosisEntry 19 } - --- xxx.100.30.1.1.21 - ddmDiagRXPowerHighWarnThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "High warn threshold of RXPower." - ::= { ddmTranscDiagnosisEntry 20 } --- xxx.100.30.1.1.22 - ddmDiagRXPowerLowWarnThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "Low warn threshold of RXPower." - ::= { ddmTranscDiagnosisEntry 21 } - - ddmDiagnosisTXPower OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..32)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "TXPower of the port,and the unit is dBM,if the value of TXPoweris infinitesimal,then set it to '-'." - ::= { ddmTranscDiagnosisEntry 22 } - - ddmDiagTXPowerHighAlarmThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "High alarm threshold of TXPower." - ::= { ddmTranscDiagnosisEntry 23 } - - ddmDiagTXPowerLowAlarmThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "k=Low alarm threshold of TXPower." - ::= { ddmTranscDiagnosisEntry 24 } --- xxx.100.30.1.1.25 - ddmDiagTXPowerHighWarnThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "High warn threshold of TXPower." - ::= { ddmTranscDiagnosisEntry 25 } --- xxx.100.30.1.1.26 - ddmDiagTXPowerLowWarnThreshold OBJECT-TYPE - SYNTAX DisplayString(SIZE(1..16)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "Low warn threshold of TXPower." - ::= { ddmTranscDiagnosisEntry 26 } - + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Low warn threshold of Voltage." + ::= { ddmTranscDiagnosisEntry 11 } + + ddmDiagnosisBias OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..32)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "bias of the port,the unit is mA." + ::= { ddmTranscDiagnosisEntry 12 } +-- xxx.100.30.1.1.15 + ddmDiagBiasHighAlarmThreshold OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "High alarm threshold of Bias." + ::= { ddmTranscDiagnosisEntry 13 } +-- xxx.100.30.1.1.16 + ddmDiagBiasLowAlarmThreshold OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Low alarm threshold of Bias." + ::= { ddmTranscDiagnosisEntry 14 } +-- xxx.100.30.1.1.17 + ddmDiagBiasHighWarnThreshold OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "High warn threshold of Bias." + ::= { ddmTranscDiagnosisEntry 15 } + + ddmDiagBiasLowWarnThreshold OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Low warn threshold of Bias." + ::= { ddmTranscDiagnosisEntry 16 } + + ddmDiagnosisRXPower OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..32)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "RXPower of the port,and the unit is dBM,if the value of RXPower is infinitesimal,then set it to '-'." + ::= { ddmTranscDiagnosisEntry 17 } + + ddmDiagRXPowerHighAlarmThreshold OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "High alarm threshold of RXPower." + ::= { ddmTranscDiagnosisEntry 18 } +-- xxx.100.30.1.1.20 + ddmDiagRXPowerLowAlarmThreshold OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Low alarm threshold of RXPower." + ::= { ddmTranscDiagnosisEntry 19 } + +-- xxx.100.30.1.1.21 + ddmDiagRXPowerHighWarnThreshold OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "High warn threshold of RXPower." + ::= { ddmTranscDiagnosisEntry 20 } +-- xxx.100.30.1.1.22 + ddmDiagRXPowerLowWarnThreshold OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Low warn threshold of RXPower." + ::= { ddmTranscDiagnosisEntry 21 } + + ddmDiagnosisTXPower OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..32)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "TXPower of the port,and the unit is dBM,if the value of TXPoweris infinitesimal,then set it to '-'." + ::= { ddmTranscDiagnosisEntry 22 } + + ddmDiagTXPowerHighAlarmThreshold OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "High alarm threshold of TXPower." + ::= { ddmTranscDiagnosisEntry 23 } + + ddmDiagTXPowerLowAlarmThreshold OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "k=Low alarm threshold of TXPower." + ::= { ddmTranscDiagnosisEntry 24 } +-- xxx.100.30.1.1.25 + ddmDiagTXPowerHighWarnThreshold OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "High warn threshold of TXPower." + ::= { ddmTranscDiagnosisEntry 25 } +-- xxx.100.30.1.1.26 + ddmDiagTXPowerLowWarnThreshold OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Low warn threshold of TXPower." + ::= { ddmTranscDiagnosisEntry 26 } + -- xxx.100.30.2 ddmTranscAlarmTable OBJECT-TYPE @@ -21269,36 +22739,133 @@ ddmTranscAlarmTable OBJECT-TYPE "A list of ddm transceiver alarm information." ::= { ddm 2} -- xxx.100.30.2.1 - ddmTranscAlarmEntry OBJECT-TYPE - SYNTAX DdmTranscAlarmEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "entry for ddm transceiver alarm information." - INDEX { ddmAlarmIfIndex } - ::= { ddmTranscAlarmTable 1 } - - - DdmTranscAlarmEntry ::= SEQUENCE { - ddmAlarmIfIndex INTEGER, - ddmAlarmInfo DisplayString - } + ddmTranscAlarmEntry OBJECT-TYPE + SYNTAX DdmTranscAlarmEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "entry for ddm transceiver alarm information." + INDEX { ddmAlarmIfIndex } + ::= { ddmTranscAlarmTable 1 } + + + DdmTranscAlarmEntry ::= SEQUENCE { + ddmAlarmIfIndex INTEGER, + ddmAlarmInfo DisplayString + } -- xxx.100.30.2.1.1 ddmAlarmIfIndex OBJECT-TYPE - SYNTAX INTEGER - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "interface NO." - ::= { ddmTranscAlarmEntry 1 } + SYNTAX INTEGER (10000..20000) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "interface NO." + ::= { ddmTranscAlarmEntry 1 } -- xxx.100.30.2.1.2 ddmAlarmInfo OBJECT-TYPE - SYNTAX DisplayString(SIZE(0..512)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "ddm transceiver alarm information." - ::= { ddmTranscAlarmEntry 2 } + SYNTAX DisplayString(SIZE(0..512)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ddm transceiver alarm information." + ::= { ddmTranscAlarmEntry 2 } + +-- xxx.100.30.3 + +ddmTranscBasicInfoTable OBJECT-TYPE + SYNTAX SEQUENCE OF DdmTranscBasicInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Basic info of ddm transceiver alarm information." + ::= { ddm 3} +-- xxx.100.30.3.1 +ddmTranscBasicInfoEntry OBJECT-TYPE + SYNTAX DdmTranscBasicInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "entry for ddm transceiver basic information." + INDEX { ddmAlarmIfIndex } + ::= { ddmTranscBasicInfoTable 1 } + + + DdmTranscBasicInfoEntry ::= SEQUENCE { + ddmTransSerialIndex INTEGER, + ddmTransSerialName DisplayString, + ddmTransSerialNo DisplayString, + ddmTransSerialVendorName DisplayString, + ddmTransSerialModelName DisplayString, + ddmTransSerialTypeName DisplayString, + ddmTransSerialBitRate DisplayString, + ddmTransSerialWaveLength DisplayString + } + -- xxx.100.30.3.1.1 + ddmTransSerialIndex OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ddm Trans Serial Index ." + ::= { ddmTranscBasicInfoEntry 1 } +-- xxx.100.30.3.1.2 + ddmTransSerialName OBJECT-TYPE + SYNTAX DisplayString(SIZE(0..512)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ddm Trans Serial Name." + ::= { ddmTranscBasicInfoEntry 2 } +-- xxx.100.30.3.1.3 + ddmTransSerialNo OBJECT-TYPE + SYNTAX DisplayString(SIZE(0..32)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ddm transceiver Serial number." + ::= { ddmTranscBasicInfoEntry 3 } +-- xxx.100.30.3.1.4 + ddmTransSerialVendorName OBJECT-TYPE + SYNTAX DisplayString(SIZE(0..32)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ddm transceiver Vendor Name." + ::= { ddmTranscBasicInfoEntry 4 } +-- xxx.100.30.3.1.5 + ddmTransSerialModelName OBJECT-TYPE + SYNTAX DisplayString(SIZE(0..32)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ddm transceiver Model Name:SFP,SFP+,QSFP+,QSFP,XFP,etc." + ::= { ddmTranscBasicInfoEntry 5 } +-- xxx.100.30.3.1.6 + ddmTransSerialTypeName OBJECT-TYPE + SYNTAX DisplayString(SIZE(0..32)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ddm transceiver Type Name:1000BASE-T,10GBASE-LR,etc." + ::= { ddmTranscBasicInfoEntry 6 } +-- xxx.100.30.3.1.7 + ddmTransSerialBitRate OBJECT-TYPE + SYNTAX DisplayString(SIZE(0..128)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ddm transceiver bit rate:1300Mbit/s,10300Mbit/s,etc." + ::= { ddmTranscBasicInfoEntry 7 } +-- xxx.100.30.3.1.8 + ddmTransSerialWaveLength OBJECT-TYPE + SYNTAX DisplayString(SIZE(0..64)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ddm transceiver Wave Length:1310nm,etc." + ::= { ddmTranscBasicInfoEntry 8 } + + --******************************************************************************************************** --******************************************************************************************************** @@ -21326,7 +22893,7 @@ priPppoeIaSelfDefinedCircuitID OBJECT-TYPE "If user does not configure the circuit-id of pppoe-ia explicitly on a port, then the user can self-designed format to generate the circuit-id, the format options include vlan, port, ID, self-designed string, the circuitId may be only one or any combination of them, - and is strictly generated according to the sequence of format options, the ID option includes + and is strictly generated according to the sequence of format options, the ID option includes switch ID and remote-mac, but the user just select only one of them, also In the swtich ID, it includes mac and hostname options, the user just select only one of two, the maximum length of self-designed striing is 64. If user input NULL, then delete the last configuration. @@ -21370,11 +22937,11 @@ priPppoeIaDelimiter OBJECT-TYPE SYNTAX INTEGER { default(0), - pound(1), + pound(1), dot(2), - comma(3), - semicolon(4), - colon(5), + comma(3), + semicolon(4), + colon(5), slash(6), space(7) } @@ -21417,7 +22984,7 @@ priPppoeIaRemoteIdFormat OBJECT-TYPE ::= { priPppoeIaMib 7 } --xxx.100.31.8 -priPppoeIaPortTable OBJECT-TYPE +priPppoeIaTable OBJECT-TYPE SYNTAX SEQUENCE OF PriPppoeIaEntry MAX-ACCESS not-accessible STATUS current @@ -21433,12 +23000,11 @@ priPppoeIaPortTable OBJECT-TYPE DESCRIPTION " Pppoe-ia configuration in port." INDEX { priPppoeIaPortID } - ::= { priPppoeIaPortTable 1 } + ::= { priPppoeIaTable 1 } - PriPppoeIaEntry - ::= SEQUENCE + PriPppoeIaEntry ::= SEQUENCE { - priPppoeIaPortID INTEGER, + priPppoeIaPortID INTEGER, priPppoeIaPortEnable INTEGER, priPppoeIaPortCircuitID DisplayString, priPppoeIaPortRemoteID DisplayString, @@ -21448,7 +23014,7 @@ priPppoeIaPortTable OBJECT-TYPE --xxx.100.31.8.1.1 priPppoeIaPortID OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..54) MAX-ACCESS not-accessible STATUS current DESCRIPTION "This value is port's ID." @@ -21457,10 +23023,10 @@ priPppoeIaPortTable OBJECT-TYPE --xxx.100.31.8.1.2 priPppoeIaPortEnable OBJECT-TYPE SYNTAX INTEGER - { - disable(0), - enable(1) - } + { + disable(0), + enable(1) + } MAX-ACCESS read-write STATUS current DESCRIPTION " Enable or disable the pppoe-ia function of the port in the switch. Default:0." @@ -21485,10 +23051,10 @@ priPppoeIaPortTable OBJECT-TYPE --xxx.100.31.8.1.5 priPppoeIaPortTrust OBJECT-TYPE SYNTAX INTEGER - { - disable(0), - enable(1) - } + { + disable(0), + enable(1) + } MAX-ACCESS read-write STATUS current DESCRIPTION " Enable or disable the pppoe-ia trust function of the port in the switch. Default:0" @@ -21497,10 +23063,10 @@ priPppoeIaPortTable OBJECT-TYPE --xxx.100.31.8.1.6 priPppoeIaPortVendorTagStrip OBJECT-TYPE SYNTAX INTEGER - { - disable(0), - enable(1) - } + { + disable(0), + enable(1) + } MAX-ACCESS read-write STATUS current DESCRIPTION " Enable or disable the pppoe-ia vendorTag strip function of the port in the switch. Default:0" @@ -21540,7 +23106,7 @@ NewPortSecurityEntry } --xxx.100.32.1.1.1 portSecurityPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -21549,10 +23115,10 @@ portSecurityPortIndex OBJECT-TYPE --xxx.100.32.1.1.2 portSecurityState OBJECT-TYPE SYNTAX INTEGER - { - enable(1), + { + enable(1), disable(0) - } + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -21561,16 +23127,16 @@ portSecurityState OBJECT-TYPE --xxx.100.32.1.1.3 portSecuritySticky OBJECT-TYPE SYNTAX INTEGER - { - enable(1), + { + enable(1), disable(0) - } + } MAX-ACCESS read-create STATUS current DESCRIPTION "enable or disable port security sticky on this port.If enable it,the port converts all the dynamic secure - MAC addresses, including those that were dynamically learned before sticky learning was enabled,to sticky - secure MAC addresses and adds all sticky secure MAC addresses to the running configuration" + MAC addresses, including those that were dynamically learned before sticky learning was enabled,to sticky + secure MAC addresses and adds all sticky secure MAC addresses to the running configuration" ::= { newPortSecurityEntry 3 } --xxx.100.32.1.1.4 portSecurityMaxMacNum OBJECT-TYPE @@ -21615,14 +23181,14 @@ portSecurityAgingTime OBJECT-TYPE --xxx.100.32.1.1.9 portSecurityAgingType OBJECT-TYPE SYNTAX INTEGER - { - default(0), - absolute(1), - inactivity(2), - static(4), - absolute-static (5), - inactivity-static (6) - } + { + default(0), + absolute(1), + inactivity(2), + static(4), + absolute-static (5), + inactivity-static (6) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -21631,11 +23197,11 @@ portSecurityAgingType OBJECT-TYPE --xxx.100.32.1.1.10 portSecurityVioMode OBJECT-TYPE SYNTAX INTEGER - { - protect(1), - restrict(2), - shutdown(3) - } + { + protect(1), + restrict(2), + shutdown(3) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -21644,19 +23210,19 @@ portSecurityVioMode OBJECT-TYPE ::= { newPortSecurityEntry 10 } --xxx.100.32.1.1.11 portSecurityVioShutRecoveryTime OBJECT-TYPE - SYNTAX INTEGER (0..3600) + SYNTAX INTEGER (0..3600) MAX-ACCESS read-create STATUS current DESCRIPTION - "The recovery time of violation shutdown mode, the recovery time range is <5>, the value 0 is to cancel recovery time, the value <1> is not allowed to config." - ::= { newPortSecurityEntry 11 } + "The recovery time of violation shutdown mode, the recovery time range is <5-3600>, the value 0 is to cancel recovery time, the value <1-4> is not allowed to config." + ::= { newPortSecurityEntry 11 } --xxx.100.32.1.1.12 portSecurityVioRestrictRecoveryTime OBJECT-TYPE - SYNTAX INTEGER (0..3600) + SYNTAX INTEGER (0..3600) MAX-ACCESS read-create STATUS current DESCRIPTION - "The recovery time of violation restrict mode, the recovery time range is <5>, the value 0 is to cancel recovery time, the value <1> is not allowed to config." + "The recovery time of violation restrict mode, the recovery time range is <5-3600>, the value 0 is to cancel recovery time, the value <1-4> is not allowed to config." ::= { newPortSecurityEntry 12 } --xxx.100.32.2 portSecurityVlanMaxNumTable OBJECT-TYPE @@ -21701,15 +23267,15 @@ portSecurityVlanMaxMacNum OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION "The maximum number of security mac can be set or learned in the vlan on the secure port, - the maximum range is <1>, the value 0 is to cancel maximum in this vlan, - and when you set the maximum number with one vlan the secure port must be on trunk mode." + the maximum range is <1-4096>, the value 0 is to cancel maximum in this vlan, + and when you set the maximum number with one vlan the secure port must be on trunk mode." ::= { portSecurityVlanMaxNumEntry 3 } --xxx.100.32.2.1.4 portSecurityVlanCurMacNum OBJECT-TYPE SYNTAX INTEGER(1..4096) MAX-ACCESS read-only STATUS current - DESCRIPTION "The current number of security mac set or learned in the vlan on the secure port." + DESCRIPTION "The current number of security mac set or learned in the vlan on the secure port." ::= { portSecurityVlanMaxNumEntry 4 } --xxx.100.32.3 portSecurityMacAddressTable OBJECT-TYPE @@ -21730,9 +23296,9 @@ PortSecurityMacAddressEntry ::= SEQUENCE { portSecurityMacAddressPortIndex INTEGER, portSecurityMacAddressVlanIndex INTEGER, - portSecurityMacAddress OCTET STRING (SIZE (6)) , + portSecurityMacAddress OCTET STRING, portSecurityMacType INTEGER, - portSecurityMacStatus INTEGER + portSecurityMacStatus INTEGER } --xxx.100.32.3.1.1 portSecurityMacAddressPortIndex OBJECT-TYPE @@ -21759,11 +23325,11 @@ portSecurityMacAddress OBJECT-TYPE --xxx.100.32.3.1.4 portSecurityMacType OBJECT-TYPE SYNTAX INTEGER - { - secured (16), - secures (32), - securec (64) - } + { + secured (16), + secures (32), + securec (64) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -21772,11 +23338,11 @@ portSecurityMacType OBJECT-TYPE --xxx.100.32.3.1.5 portSecurityMacStatus OBJECT-TYPE SYNTAX INTEGER - { - createAndGo(0), - active(1), - destroy(2) - } + { + createAndGo(0), + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -21818,14 +23384,14 @@ eeePortIndex OBJECT-TYPE STATUS current DESCRIPTION "The eee configuration port index." - ::= {prieeePortEntry 1 } + ::= {prieeePortEntry 1 } --xxx.100.34.1.1.2 eeePortStatus OBJECT-TYPE SYNTAX INTEGER - { - enable (1), - disable (0) - } + { + enable (1), + disable (0) + } MAX-ACCESS read-write STATUS current DESCRIPTION @@ -21868,14 +23434,14 @@ PortRateLimitEntry portRateLimitCurUnicastNum INTEGER, portRateLimitConfigAllNum INTEGER, portRateLimitCurAllNum INTEGER, - portRateLimitPacketsType INTEGER, - portRateLimitViolationMode INTEGER, - portRateLimitShutRecoveryTime INTEGER + portRateLimitPacketsType INTEGER, + portRateLimitViolationMode INTEGER, + portRateLimitShutRecoveryTime INTEGER } --xxx.100.35.1.1.1 portRateLimitPortIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..2048) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -21888,9 +23454,9 @@ portRateLimitConfigBroadcastNum OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "Configration of the max receiving rate of broadcast packets on the port,the value range is <200>. + "Configration of the max receiving rate of broadcast packets on the port,the value range is <200-2000000>. The value 0 means disable the rate limit of broadcast packets. - the value <1> is not allowed to config." + the value <1-199> is not allowed to config." ::= { portRateLimitEntry 2} --xxx.100.35.1.1.3 @@ -21908,9 +23474,9 @@ portRateLimitConfigMulticastNum OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "Configration of the max receiving rate of multicast packets on the port,the value range is <200>. + "Configration of the max receiving rate of multicast packets on the port,the value range is <200-2000000>. The value 0 means disable the rate limit of multicast packets. - the value <1> is not allowed to config." + the value <1-199> is not allowed to config." ::= { portRateLimitEntry 4} --xxx.100.35.1.1.5 @@ -21928,9 +23494,9 @@ portRateLimitConfigUnicastNum OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "Configration of the max receiving rate of unicast packets on the port,the value range is <200>. + "Configration of the max receiving rate of unicast packets on the port,the value range is <200-2000000>. The value 0 means disable the rate limit of unicast packets. - the value <1> is not allowed to config." + the value <1-199> is not allowed to config." ::= { portRateLimitEntry 6} --xxx.100.35.1.1.7 @@ -21948,9 +23514,9 @@ portRateLimitConfigAllNum OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION - "Configration of the max receiving rate of all packets on the port,the value range is <200>. + "Configration of the max receiving rate of all packets on the port,the value range is <200-2000000>. The value 0 means disable the rate limit of all packets. - the value <1> is not allowed to config." + the value <1-199> is not allowed to config." ::= { portRateLimitEntry 8} --xxx.100.35.1.1.9 @@ -21964,7 +23530,7 @@ portRateLimitCurAllNum OBJECT-TYPE --xxx.100.35.1.1.10 portRateLimitPacketsType OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER MAX-ACCESS read-only STATUS current DESCRIPTION @@ -21979,11 +23545,11 @@ portRateLimitPacketsType OBJECT-TYPE --xxx.100.35.1.1.11 portRateLimitViolationMode OBJECT-TYPE SYNTAX INTEGER - { + { nocontrol(0), - shutdown(1), - block(2) - } + shutdown(1), + block(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -21992,11 +23558,11 @@ portRateLimitViolationMode OBJECT-TYPE --xxx.100.35.1.1.12 portRateLimitShutRecoveryTime OBJECT-TYPE - SYNTAX INTEGER (0..86400) + SYNTAX INTEGER (0..86400) MAX-ACCESS read-create STATUS current DESCRIPTION - "The recovery time of violation shutdown mode, the recovery time range is <0>, + "The recovery time of violation shutdown mode, the recovery time range is <0-86400>, the value 0 means the port cann't be recovery forever, the default value is 300." ::= { portRateLimitEntry 12 } @@ -22054,11 +23620,11 @@ macAddress OBJECT-TYPE --xxx.100.36.1.1.3 macType OBJECT-TYPE SYNTAX INTEGER - { + { both(0), source(1), - destination(2) - } + destination(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION "Control the mac from both(0)/source(1)/destination(2).Default both(0)." @@ -22067,11 +23633,11 @@ macType OBJECT-TYPE --xxx.100.36.1.1.4 macStatus OBJECT-TYPE SYNTAX INTEGER - { - creat(0), - active(1), - destroy(2) - } + { + creat(0), + active(1), + destroy(2) + } MAX-ACCESS read-create STATUS current DESCRIPTION @@ -22086,11 +23652,11 @@ macStatus OBJECT-TYPE --*************************************** --cableTable --*************************************** ---priCableEntry +--PriCableEntry --*************************************** --xxx.100.37.1 -cableTable OBJECT-TYPE - SYNTAX SEQUENCE OF priCableEntry +priCableTable OBJECT-TYPE + SYNTAX SEQUENCE OF PriCableEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -22099,23 +23665,23 @@ cableTable OBJECT-TYPE --xxx.100.37.1.1 priCableEntry OBJECT-TYPE - SYNTAX priCableEntry + SYNTAX PriCableEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION " A port entry containing port information, status, and control." - INDEX { CableLengthInfo } - ::= { cableTable 1 } + INDEX { cableLengthInfo } + ::= { priCableTable 1 } - priCableEntry + PriCableEntry ::= SEQUENCE { - CableLengthInfo DisplayString + cableLengthInfo DisplayString } --xxx.100.37.1.1.1 - CableLengthInfo OBJECT-TYPE + cableLengthInfo OBJECT-TYPE SYNTAX DisplayString (SIZE(0..32)) MAX-ACCESS read-only STATUS current @@ -22132,7 +23698,7 @@ cableTable OBJECT-TYPE --xxx.100.38.1 priMrppRing priMrppRingTable OBJECT-TYPE - SYNTAX SEQUENCE OF priMrppRingEntry + SYNTAX SEQUENCE OF PriMrppRingEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION @@ -22141,20 +23707,20 @@ priMrppRingTable OBJECT-TYPE --xxx.100.38.1.1 priMrppRingEntry OBJECT-TYPE - SYNTAX priMrppRingEntry + SYNTAX PriMrppRingEntry MAX-ACCESS not-accessible STATUS current DESCRIPTION "The index of this table is RING index." INDEX { mrppRingIndex } ::= { priMrppRingTable 1 } -priMrppRingEntry +PriMrppRingEntry ::= SEQUENCE { mrppRingIndex INTEGER, mrppRingNodeMode INTEGER, mrppRingNodeState INTEGER, - mrppRingStatus INTEGER, + mrppRingStatus INTEGER, mrppRingPriPortName OCTET STRING, mrppRingPriPortBlockState INTEGER, mrppRingSecPortName OCTET STRING, @@ -22163,11 +23729,11 @@ priMrppRingEntry --xxx.100.38.1.1.1 mrppRingIndex OBJECT-TYPE - SYNTAX INTEGER + SYNTAX INTEGER (1..4096) MAX-ACCESS read-only STATUS current DESCRIPTION - "mrpp ring Index<1>." + "mrpp ring Index<1-4096>." ::= { priMrppRingEntry 1 } --xxx.100.38.1.1.2 mrppRingNodeMode OBJECT-TYPE @@ -22202,7 +23768,7 @@ mrppRingStatus OBJECT-TYPE --xxx.100.38.1.1.5 mrppRingPriPortName OBJECT-TYPE - SYNTAX DisplayString + SYNTAX OCTET STRING MAX-ACCESS read-only STATUS current DESCRIPTION @@ -22220,7 +23786,7 @@ mrppRingPriPortBlockState OBJECT-TYPE --xxx.100.38.1.1.7 mrppRingSecPortName OBJECT-TYPE - SYNTAX DisplayString + SYNTAX OCTET STRING MAX-ACCESS read-only STATUS current DESCRIPTION @@ -22237,70 +23803,1479 @@ mrppRingSecPortBlockState OBJECT-TYPE ::= { priMrppRingEntry 8} --weiyya end - - ---********************************************************************** ---Mac Notification Global Group ---********************************************************************** -macNotificationMibObjects OBJECT IDENTIFIER - ::= { macNotificationMib 1 } - --- MAC Notification MIB consists of the following groups --- [1] Mac Notification Global Group (cmnGlobalObjects). --- [2] Mac Notification Interface Group (cmnInterfaceObjects). -macNotificationGlobalObjects OBJECT IDENTIFIER - ::= { macNotificationMibObjects 1 } -macNotificationInterfaceObjects OBJECT IDENTIFIER - ::= { macNotificationMibObjects 2 } - -macNotificationGlobalFeatureEnabled OBJECT-TYPE - SYNTAX TruthValue - MAX-ACCESS read-write - STATUS current +--******************************************************************************************************** +--xxx.100.39 erpsMgt +--xxx.100.39.1 +erpsTcnPropagationConfig OBJECT-TYPE + SYNTAX INTEGER + { + none(0), + erps(1), + stp (2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Config Topology change propagation type." + ::= { erpsMgt 1 } +--******************************************************************************************************** +--xxx.100.39.2 +erpsRingConfigTable OBJECT-TYPE + SYNTAX SEQUENCE OF ErpsRingConfigEntry + MAX-ACCESS not-accessible + STATUS current DESCRIPTION - "Indicates whether the MAC notification feature is currently - running in the device. - - Setting this object to false(2) disables the MAC notification - feature globally thus disabling the feature at each interface. - - Setting this object to true(1) will start the MAC notification - feature running in the device. If the feature is already - running, setting to true(1) has no effect. Once the MAC - notification is enabled, whether the feature is running at each - interface is controlled by the macNotificationIfConfigTable." - ::= { macNotificationGlobalObjects 1 } - -macNotificationNotificationInterval OBJECT-TYPE - SYNTAX Counter32 - UNITS "seconds" - MAX-ACCESS read-only - STATUS current + "Erps Ring configration table." + ::= { erpsMgt 2 } +--xxx.100.39.2.1 +erpsRingConfigEntry OBJECT-TYPE + SYNTAX ErpsRingConfigEntry + MAX-ACCESS not-accessible + STATUS current DESCRIPTION - "This object specifies the maximum interval of time between - macNotificationMacChangedNotifications being generated by the device. - If the value of macNotificationNotificationsEnabled is true(1), the - device will send out the generated macNotificationMacChangedNotifications - and archive the MAC change notification events in the - macNotificationHistoryTable. If the value of macNotificationNotificationEnabled is - false(2), the device will not send out the generated - macNotificationMacChangedNotifications but it will archive these events - in the macNotificationHistoryTable. - - If the value of this object is equal to 0, the device will - generate macNotificationMacChangedNotifications and archive the MAC - change notification events in the macNotificationHistoryTable as soon as - there is MAC address learnt or removed by the device. - - If the value of this object is greater than 0, the device will - wait for a period of time equal to the value of this object - before generate the macNotificationMacChangedNotifications and archive - the MAC change notification events in the macNotificationHistoryTable." - ::= { macNotificationGlobalObjects 2 } + "Erps Ring configration entry." + INDEX {erpsRingNameIndex} + ::= { erpsRingConfigTable 1 } -macNotificationMacAddressesLearnt OBJECT-TYPE - SYNTAX Counter32 - MAX-ACCESS read-only +ErpsRingConfigEntry + ::= SEQUENCE + { + erpsRingNameIndex INTEGER, + erpsRingName DisplayString, + + erpsVersion INTEGER, + erpsOpenRing INTEGER, + erpsRapsVirtualChannel INTEGER, + erpsRingPort0 DisplayString, + erpsRingPort0Index INTEGER, + erpsRingPort1ExistFlag INTEGER, + erpsRingPort1 DisplayString, + erpsRingPort1Index INTEGER, + erpsRingRowStatus INTEGER, + erpsTrapEnabled INTEGER, + erpsLogEnabled INTEGER + } +--xxx.100.39.2.1.1 +erpsRingNameIndex OBJECT-TYPE + SYNTAX INTEGER (0..32) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "erps ring name index, the max number is 32." + ::= { erpsRingConfigEntry 1} +--xxx.100.39.2.1.2 +erpsRingName OBJECT-TYPE + SYNTAX DisplayString(SIZE (1..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "erps ring name." + ::= { erpsRingConfigEntry 2} +-- xxx.100.39.2.1.3 +erpsVersion OBJECT-TYPE + SYNTAX INTEGER + { + default(0), + v1(1), + v2(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Version Ethernet ring node running ITU-T G.8032." + ::= { erpsRingConfigEntry 3} +--xxx.100.39.2.1.4 +erpsOpenRing OBJECT-TYPE + SYNTAX INTEGER + { + none-open(0), + open(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "set Erps ring topolagy type ." + ::= { erpsRingConfigEntry 4} +--xxx.100.39.2.1.5 +erpsRapsVirtualChannel OBJECT-TYPE + SYNTAX INTEGER + { + without(0), + with(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "R-APS virtual channel configuration ." + ::= { erpsRingConfigEntry 5} +--xxx.100.39.2.1.6 +erpsRingPort0 OBJECT-TYPE + SYNTAX DisplayString(SIZE (1..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ERPS ring's member port0 ." + ::= { erpsRingConfigEntry 6} +--xxx.100.39.2.1.7 +erpsRingPort0Index OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS ring's member port0 index ." + ::= { erpsRingConfigEntry 7} +--xxx.100.39.2.1.8 +erpsRingPort1ExistFlag OBJECT-TYPE + SYNTAX INTEGER + { + none(0), + not-none(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ERPS ring's member port1 whether has been set none; + can not be set alone,must be set with erpsRingPort0 together." + ::= { erpsRingConfigEntry 8} +--xxx.100.39.2.1.9 +erpsRingPort1 OBJECT-TYPE + SYNTAX DisplayString(SIZE (1..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ERPS ring's member port1 ." + ::= { erpsRingConfigEntry 9} +--xxx.100.39.2.1.10 +erpsRingPort1Index OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS ring's member port1 index ." + ::= { erpsRingConfigEntry 10} +--xxx.100.39.2.1.11 +erpsRingRowStatus OBJECT-TYPE + SYNTAX INTEGER + { + unset(0), + set(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ERPS ring's row status ." + ::= { erpsRingConfigEntry 11} +--xxx.100.39.2.1.12 +erpsTrapEnabled OBJECT-TYPE + SYNTAX INTEGER + { + unset(0), + set(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ERPS trap configration." + ::= { erpsRingConfigEntry 12} +--xxx.100.39.2.1.13 +erpsLogEnabled OBJECT-TYPE + SYNTAX INTEGER + { + unset(0), + set(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ERPS log configration." + ::= { erpsRingConfigEntry 13} +--xxx.100.39.3 + +erpsInstanceConfigTable OBJECT-TYPE + SYNTAX SEQUENCE OF ErpsInstanceConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "erps Instance configration table." + ::= { erpsMgt 3 } +--xxx.100.39.3.1 +erpsInstanceConfigEntry OBJECT-TYPE + SYNTAX ErpsInstanceConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A set of configuration parameters for erps Instance." + INDEX {erpsRingNameIndex, erpsInstanceId} + ::= { erpsInstanceConfigTable 1 } + +ErpsInstanceConfigEntry + ::= SEQUENCE + { + --erpsRingName DisplayString, + erpsInstanceId INTEGER, + erpsDescription DisplayString, + erpsRingId INTEGER, + erpsRplPort0Role INTEGER, + erpsRplPort1Role INTEGER, + erpsRevertiveMode INTEGER, + erpsGuardTimer INTEGER, + erpsHoldoffTimer INTEGER, + erpsWtrTimer INTEGER, + erpsProtectedInstance DisplayString, + erpsRapsMel INTEGER, + erpsControlVlan INTEGER, + erpsForcedSwitch INTEGER, + erpsManualSwitch INTEGER, + erpsClearCommand INTEGER, + erpsClearPortStatistics INTEGER, + erpsInstanceRowStatus INTEGER + } + --erpsRingName OBJECT-TYPE +-- SYNTAX DisplayString(SIZE (1..64)) + -- MAX-ACCESS not-accessible + -- STATUS current + -- DESCRIPTION + -- "ERPS Ring Name." + -- ::= { erpsInstanceConfigEntry 18} + --xxx.100.39.3.1.1 +erpsInstanceId OBJECT-TYPE + SYNTAX INTEGER (1..48) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "erps instance id.scope:<1-48>" + ::= { erpsInstanceConfigEntry 1} +--xxx.100.39.3.1.2 +erpsDescription OBJECT-TYPE + SYNTAX DisplayString(SIZE (1..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ERPS instance description." + ::= { erpsInstanceConfigEntry 2} +--xxx.100.39.3.1.3 +erpsRingId OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set Ring ID that R-APS MAC address included.scope:<1-64>" + ::= { erpsInstanceConfigEntry 3} +--xxx.100.39.3.1.4 +erpsRplPort0Role OBJECT-TYPE + SYNTAX INTEGER + { + default(0), + owner(1), + neighbour(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set Ring membor port0's role." + ::= { erpsInstanceConfigEntry 4} +--xxx.100.39.3.1.5 +erpsRplPort1Role OBJECT-TYPE + SYNTAX INTEGER + { + default(0), + owner(1), + neighbour(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set Ring membor port1's role." + ::= { erpsInstanceConfigEntry 5} + +--xxx.100.39.3.1.6 +erpsRevertiveMode OBJECT-TYPE + SYNTAX INTEGER + { + default(0), + non-revertive(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set ERPS Ring working in non-revertive or revertive operation." + ::= { erpsInstanceConfigEntry 6} +--xxx.100.39.3.1.7 +erpsGuardTimer OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Guard timer configuration.scope:<1-200>" + ::= { erpsInstanceConfigEntry 7} +--xxx.100.39.3.1.8 +erpsHoldoffTimer OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Holdoff timer, scope:<0-10>" + ::= { erpsInstanceConfigEntry 8} +--xxx.100.39.3.1.9 +erpsWtrTimer OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Wait To Restore configuration.scope:<1-12>" + ::= { erpsInstanceConfigEntry 9} +--xxx.100.39.3.1.10 +erpsProtectedInstance OBJECT-TYPE + SYNTAX DisplayString(SIZE (1..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Protection vlan reference MSTP instance configuration" + ::= { erpsInstanceConfigEntry 10} +--xxx.100.39.3.1.11 +erpsRapsMel OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "R-APS Maintenance Entity Group Level configuration.scope:<0-7>" + ::= { erpsInstanceConfigEntry 11} +--xxx.100.39.3.1.12 +erpsControlVlan OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Control vlan configuration" + ::= { erpsInstanceConfigEntry 12} +--xxx.100.39.3.1.13 +erpsForcedSwitch OBJECT-TYPE + SYNTAX INTEGER + { + default(0), + port0-forced-switch(1), + port1-forced-switch(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Forces a block on the ring port" + ::= { erpsInstanceConfigEntry 13} +--xxx.100.39.3.1.14 +erpsManualSwitch OBJECT-TYPE + SYNTAX INTEGER + { + default(0), + port0-manual-switch(1), + port1-manual-switch(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Forces a block on the ring port in the absence of a failure or FS" + ::= { erpsInstanceConfigEntry 14} +--xxx.100.39.3.1.15 +erpsClearCommand OBJECT-TYPE + SYNTAX INTEGER + { + clear(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Clear an administrative command" + ::= { erpsInstanceConfigEntry 15} +--xxx.100.39.3.1.16 +erpsClearPortStatistics OBJECT-TYPE + SYNTAX INTEGER + { + clear(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Clear an administrative command" + ::= { erpsInstanceConfigEntry 16} +--xxx.100.39.3.1.17 +erpsInstanceRowStatus OBJECT-TYPE + SYNTAX INTEGER + { + unset(0), + set(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Clear an administrative command" + ::= { erpsInstanceConfigEntry 17} + +--xxx.100.39.4 +erpsStatus OBJECT IDENTIFIER ::= { erpsMgt 4 } +--xxx.100.39.4.1 +--erpsInstanceStatusTable OBJECT IDENTIFIER ::= { erpsStatus 1 } +--xxx.100.39.4.2 +--erpsPortStatusTable OBJECT IDENTIFIER ::= { erpsStatus 2 } + + +--xxx.100.39.4.1 +erpsInstanceStatusTable OBJECT-TYPE + SYNTAX SEQUENCE OF ErpsInstanceStatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "erps Instance status table." + ::= { erpsStatus 1 } +--xxx.100.39.4.1.1 +erpsInstanceStatusEntry OBJECT-TYPE + SYNTAX ErpsInstanceStatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "erps instance status." + INDEX {erpsRingNameIndex,erpsInstanceId} + ::= { erpsInstanceStatusTable 1 } + +ErpsInstanceStatusEntry + ::= SEQUENCE + { + erpsActiveStatus INTEGER, + erpsNodeState INTEGER + } + + --xxx.100.39.4.1.1.1 +erpsActiveStatus OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "erps instance active status." + ::= { erpsInstanceStatusEntry 1} + --xxx.100.39.4.1.1.2 +erpsNodeState OBJECT-TYPE + SYNTAX INTEGER + { + idle(1), + pretection(2), + manual-switch(3), + force-switch(4), + pending(5) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "erps instance node state." + ::= { erpsInstanceStatusEntry 2} + +------------------------------------------- +--xxx.100.39.4.2 +erpsPort0StatusTable OBJECT-TYPE + SYNTAX SEQUENCE OF ErpsPort0StatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "erps port status table." + ::= { erpsStatus 2 } +--xxx.100.39.4.2.1 +erpsPort0StatusEntry OBJECT-TYPE + SYNTAX ErpsPort0StatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "erps port0 status." + INDEX {erpsRingNameIndex, erpsInstanceId} + ::= { erpsPort0StatusTable 1 } + +ErpsPort0StatusEntry + ::= SEQUENCE + { + erpsPort0Name DisplayString, + erpsPort0Status INTEGER, + erpsPort0SignalStatus INTEGER, + erpsPort0RRapsNodeId DisplayString, + erpsPort0BPR INTEGER + } + --xxx.100.39.4.2.1.1 +erpsPort0Name OBJECT-TYPE + SYNTAX DisplayString(SIZE (1..64)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "erps port0's name." + ::= { erpsPort0StatusEntry 1} + --xxx.100.39.4.2.1.2 +erpsPort0Status OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "erps port0's block status." + ::= { erpsPort0StatusEntry 2} + --xxx.100.39.4.2.1.3 +erpsPort0SignalStatus OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "erps port0's siginal status." + ::= { erpsPort0StatusEntry 3} + --xxx.100.39.4.2.1.4 +erpsPort0RRapsNodeId OBJECT-TYPE + SYNTAX DisplayString(SIZE (1..64)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "erps port0's R-APS-NodeId." + ::= { erpsPort0StatusEntry 4} + --xxx.100.39.4.2.1.5 +erpsPort0BPR OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "erps port0's BPR value." + ::= { erpsPort0StatusEntry 5} + +--xxx.100.39.4.3 +erpsPort1StatusTable OBJECT-TYPE + SYNTAX SEQUENCE OF ErpsPort1StatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "erps port1 status table." + ::= { erpsStatus 3 } +--xxx.100.39.4.3.1 +erpsPort1StatusEntry OBJECT-TYPE + SYNTAX ErpsPort1StatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "erps port1 status." + INDEX {erpsRingNameIndex, erpsInstanceId} + ::= { erpsPort1StatusTable 1 } + +ErpsPort1StatusEntry + ::= SEQUENCE + { + erpsPort1Name DisplayString, + erpsPort1Status INTEGER, + erpsPort1SignalStatus INTEGER, + erpsPort1RRapsNodeId DisplayString, + erpsPort1BPR INTEGER + + } + --xxx.100.39.4.3.1.1 +erpsPort1Name OBJECT-TYPE + SYNTAX DisplayString(SIZE (1..64)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "erps port1's name." + ::= { erpsPort1StatusEntry 1} + --xxx.100.39.4.3.1.2 +erpsPort1Status OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "erps port1's block status." + ::= { erpsPort1StatusEntry 2} + --xxx.100.39.4.3.1.3 +erpsPort1SignalStatus OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "erps port1's siginal status." + ::= { erpsPort1StatusEntry 3} + --xxx.100.39.4.3.1.4 +erpsPort1RRapsNodeId OBJECT-TYPE + SYNTAX DisplayString(SIZE (1..64)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "erps port1's R-APS-NodeId." + ::= { erpsPort1StatusEntry 4} + --xxx.100.39.4.3.1.5 +erpsPort1BPR OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "erps port1's BPR value." + ::= { erpsPort1StatusEntry 5} +----------------------------------------------- +--xxx.100.39.5 +erpsPortTrackConfig OBJECT IDENTIFIER ::= { erpsMgt 5 } + +--xxx.100.39.5.1 +erpsPortTrackConfigTable OBJECT-TYPE + SYNTAX SEQUENCE OF ErpsPortTrackConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "erps port0 failure-detect table." + ::= { erpsPortTrackConfig 1 } +--xxx.100.39.5.2.1 +erpsPortTrackConfigEntry OBJECT-TYPE + SYNTAX ErpsPortTrackConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A set of configuration parameters for erps port1 failure-detect." + INDEX {erpsRingNameIndex, erpsRingPortIndex} + ::= { erpsPortTrackConfigTable 1 } + +ErpsPortTrackConfigEntry + ::= SEQUENCE + { + erpsRingPortIndex INTEGER, + erpsPortTrackProtocolType INTEGER, + erpsPortTrackCfmDomain DisplayString, + erpsPortTrackCfmMaName DisplayString, + erpsPortTrackCfmMaNum INTEGER, + erpsPortTrackCfmPvlanId INTEGER, + erpsPortTrackCfmMepId INTEGER, + erpsPortTrackCfmRmepId INTEGER, + erpsPortTrackRowStatus INTEGER + } +--xxx.100.39.5.2.1.1 +erpsRingPortIndex OBJECT-TYPE + SYNTAX INTEGER + { + port0(0), + port1(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Domain." + ::= { erpsPortTrackConfigEntry 1} + + --xxx.100.39.5.2.1.2 +erpsPortTrackProtocolType OBJECT-TYPE + SYNTAX INTEGER + { + cc(1), + physical-link-or-cc(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Failure type that ERPS ring's member port detect." + ::= { erpsPortTrackConfigEntry 2} +--xxx.100.39.5.2.1.3 +erpsPortTrackCfmDomain OBJECT-TYPE + SYNTAX DisplayString(SIZE (1..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Domain." + ::= { erpsPortTrackConfigEntry 3} +--xxx.100.39.5.2.1.4 +erpsPortTrackCfmMaName OBJECT-TYPE + SYNTAX DisplayString(SIZE (1..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Service name string <1-45> character." + ::= { erpsPortTrackConfigEntry 4} + --xxx.100.39.5.2.1.5 +erpsPortTrackCfmMaNum OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Service name by numbe." + ::= { erpsPortTrackConfigEntry 5} + --xxx.100.39.5.2.1.6 +erpsPortTrackCfmPvlanId OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Service name by primary vlan." + ::= { erpsPortTrackConfigEntry 6} +--xxx.100.39.5.2.1.7 +erpsPortTrackCfmMepId OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Local mep configuartion." + ::= { erpsPortTrackConfigEntry 7} +--xxx.100.39.5.2.1.8 +erpsPortTrackCfmRmepId OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Remote mep configuartion." + ::= { erpsPortTrackConfigEntry 8} +--xxx.100.39.5.2.1.9 +erpsPortTrackRowStatus OBJECT-TYPE + SYNTAX INTEGER + { + unset(0), + set(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "enable configuartion." + ::= { erpsPortTrackConfigEntry 9} +----------------------------------------------- +--xxx.100.39.6 +erpsPortStatistics OBJECT IDENTIFIER ::= { erpsMgt 6 } +--xxx.100.39.6.1 +--erpsPort0TrackConfigTable OBJECT IDENTIFIER ::= { erpsPortTrackConfig 1 } +--xxx.100.39.6.2 +--erpsPort1TrackConfigTable OBJECT IDENTIFIER ::= { erpsPortTrackConfig 2 } +--xxx.100.39.6.1 +erpsPort0StatisticsTable OBJECT-TYPE + SYNTAX SEQUENCE OF ErpsPort0StatisticsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "erps port0 Statistics table." + ::= { erpsPortStatistics 1 } +--xxx.100.39.6.1.1 +erpsPort0StatisticsEntry OBJECT-TYPE + SYNTAX ErpsPort0StatisticsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A set of results for erps port0 statistics." + INDEX {erpsRingNameIndex, erpsInstanceId} + ::= { erpsPort0StatisticsTable 1 } + +ErpsPort0StatisticsEntry + ::= SEQUENCE + { + erpsPort0TxRapsNrPktCnt INTEGER, + erpsPort0RxRapsNrPktCnt INTEGER, + erpsPort0TxRapsNrRbPktCnt INTEGER, + erpsPort0RxRapsNrRbPktCnt INTEGER, + erpsPort0TxRapsSfPktCnt INTEGER, + erpsPort0RxRapsSfPktCnt INTEGER, + erpsPort0TxRapsMsPktCnt INTEGER, + erpsPort0RxRapsMsPktCnt INTEGER, + erpsPort0TxRapsFsPktCnt INTEGER, + erpsPort0RxRapsFsPktCnt INTEGER, + erpsPort0TxRapsEventPktCnt INTEGER, + erpsPort0RxRapsEventPktCnt INTEGER, + erpsPort0TxRapsTotalPktCnt INTEGER, + erpsPort0RxRapsTotalPktCnt INTEGER + } + + --xxx.100.39.6.1.1.1 +erpsPort0TxRapsNrPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port0's Tx NR Packet Count." + ::= { erpsPort0StatisticsEntry 1} +--xxx.100.39.6.1.1.2 +erpsPort0RxRapsNrPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port0's Rx NR Packet Count." + ::= { erpsPort0StatisticsEntry 2} +--xxx.100.39.6.1.1.3 +erpsPort0TxRapsNrRbPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port0's Tx NR-RB Packet Count." + ::= { erpsPort0StatisticsEntry 3} +--xxx.100.39.6.1.1.4 +erpsPort0RxRapsNrRbPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port0's Rx NR-RB Packet Count." + ::= { erpsPort0StatisticsEntry 4} +--xxx.100.39.6.1.1.5 +erpsPort0TxRapsSfPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port0's Tx SF Packet Count." + ::= { erpsPort0StatisticsEntry 5} +--xxx.100.39.6.1.1.6 +erpsPort0RxRapsSfPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port0's Rx SF Packet Count." + ::= { erpsPort0StatisticsEntry 6} +--xxx.100.39.6.1.1.7 +erpsPort0TxRapsMsPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port0's Tx MS Packet Count." + ::= { erpsPort0StatisticsEntry 7} +--xxx.100.39.6.1.1.8 +erpsPort0RxRapsMsPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port0's Rx MS Packet Count." + ::= { erpsPort0StatisticsEntry 8} +--xxx.100.39.6.1.1.9 +erpsPort0TxRapsFsPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port0's Tx FS Packet Count." + ::= { erpsPort0StatisticsEntry 9} +--xxx.100.39.6.1.1.10 +erpsPort0RxRapsFsPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port0's Rx FS Packet Count." + ::= { erpsPort0StatisticsEntry 10} +--xxx.100.39.6.1.1.11 +erpsPort0TxRapsEventPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port0's Tx Event Packet Count." + ::= { erpsPort0StatisticsEntry 11} +--xxx.100.39.6.1.1.12 +erpsPort0RxRapsEventPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port0's Rx Event Packet Count." + ::= { erpsPort0StatisticsEntry 12} +--xxx.100.39.6.1.1.13 +erpsPort0TxRapsTotalPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port0's Tx Total Packet Count." + ::= { erpsPort0StatisticsEntry 13} +--xxx.100.39.6.1.1.14 +erpsPort0RxRapsTotalPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port0's Rx Total Packet Count." + ::= { erpsPort0StatisticsEntry 14} +---xxx.100.39.6.2 +erpsPort1StatisticsTable OBJECT-TYPE + SYNTAX SEQUENCE OF ErpsPort1StatisticsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "erps port1 Statistics table." + ::= { erpsPortStatistics 2 } +--xxx.100.39.6.2.1 +erpsPort1StatisticsEntry OBJECT-TYPE + SYNTAX ErpsPort1StatisticsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A set of results for erps port1 statistics." + INDEX {erpsRingNameIndex, erpsInstanceId} + ::= { erpsPort1StatisticsTable 1 } + +ErpsPort1StatisticsEntry + ::= SEQUENCE + { + erpsPort1TxRapsNrPktCnt INTEGER, + erpsPort1RxRapsNrPktCnt INTEGER, + erpsPort1TxRapsNrRbPktCnt INTEGER, + erpsPort1RxRapsNrRbPktCnt INTEGER, + erpsPort1TxRapsSfPktCnt INTEGER, + erpsPort1RxRapsSfPktCnt INTEGER, + erpsPort1TxRapsMsPktCnt INTEGER, + erpsPort1RxRapsMsPktCnt INTEGER, + erpsPort1TxRapsFsPktCnt INTEGER, + erpsPort1RxRapsFsPktCnt INTEGER, + erpsPort1TxRapsEventPktCnt INTEGER, + erpsPort1RxRapsEventPktCnt INTEGER, + erpsPort1TxRapsTotalPktCnt INTEGER, + erpsPort1RxRapsTotalPktCnt INTEGER + } + + --xxx.100.39.6.2.1.1 +erpsPort1TxRapsNrPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port1's Tx NR Packet Count." + ::= { erpsPort1StatisticsEntry 1} +--xxx.100.39.6.2.1.2 +erpsPort1RxRapsNrPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port1's Rx NR Packet Count." + ::= { erpsPort1StatisticsEntry 2} +--xxx.100.39.6.2.1.3 +erpsPort1TxRapsNrRbPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port1's Tx NR-RB Packet Count." + ::= { erpsPort1StatisticsEntry 3} +--xxx.100.39.6.2.1.4 +erpsPort1RxRapsNrRbPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port1's Rx NR-RB Packet Count." + ::= { erpsPort1StatisticsEntry 4} +--xxx.100.39.6.2.1.5 +erpsPort1TxRapsSfPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port1's Tx SF Packet Count." + ::= { erpsPort1StatisticsEntry 5} +--xxx.100.39.6.2.1.6 +erpsPort1RxRapsSfPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port1's Rx SF Packet Count." + ::= { erpsPort1StatisticsEntry 6} +--xxx.100.39.6.2.1.7 +erpsPort1TxRapsMsPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port1's Tx MS Packet Count." + ::= { erpsPort1StatisticsEntry 7} +--xxx.100.39.6.2.1.8 +erpsPort1RxRapsMsPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port1's Rx MS Packet Count." + ::= { erpsPort1StatisticsEntry 8} +--xxx.100.39.6.2.1.9 +erpsPort1TxRapsFsPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port1's Tx FS Packet Count." + ::= { erpsPort1StatisticsEntry 9} +--xxx.100.39.6.2.1.10 +erpsPort1RxRapsFsPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port1's Rx FS Packet Count." + ::= { erpsPort1StatisticsEntry 10} +--xxx.100.39.6.2.1.11 +erpsPort1TxRapsEventPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port1's Tx Event Packet Count." + ::= { erpsPort1StatisticsEntry 11} +--xxx.100.39.6.2.1.12 +erpsPort1RxRapsEventPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port1's Rx Event Packet Count." + ::= { erpsPort1StatisticsEntry 12} +--xxx.100.39.6.2.1.13 +erpsPort1TxRapsTotalPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port1's Tx Total Packet Count." + ::= { erpsPort1StatisticsEntry 13} +--xxx.100.39.6.2.1.14 +erpsPort1RxRapsTotalPktCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ERPS port1's Rx Total Packet Count." + ::= { erpsPort1StatisticsEntry 14} +--******************************************************************************************************** +----------------------------------------------------------------------------------- +--zhengmr 2017.9.19 +--xxx.100.40 fdbMacInfo +--*************************************** +--fdbMacInfoTable +--*************************************** + +--xxx.100.40.1 fdbMacInfo +fdbMacInfoTable OBJECT IDENTIFIER ::= { fdbMacInfo 1 } + +--xxx.100.40.1.1 +fdbMacMaxTotalNum OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "MAX total filter entry number." + ::= { fdbMacInfoTable 1 } + +--xxx.100.40.1.2 +fdbMacMaxStaticNum OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "MAX static filter entry number." + ::= { fdbMacInfoTable 2} +--xxx.100.40.1.3 +fdbMacMaxUnicastNum OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "MAX unicast filter entry number." + ::= { fdbMacInfoTable 3} +--xxx.100.40.1.4 +fdbMacMaxMulticastNum OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "MAX multicast filter entry number." + ::= { fdbMacInfoTable 4} + +--xxx.100.40.1.5 +fdbMacCurTotalNum OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "CURRENT total filter entry number." + ::= { fdbMacInfoTable 5} + +--xxx.100.40.1.6 +fdbMacCurStaticNum OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "CURRENT static filter entry number." + ::= { fdbMacInfoTable 6 } + +--xxx.100.40.1.7 +fdbMacCurUnicastNum OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "CURRENT unicast filter entry number." + ::= { fdbMacInfoTable 7} + +--xxx.100.40.1.8 +fdbMacCurHiddenNum OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "CURRENT hidden filter entry number." + ::= { fdbMacInfoTable 8} + +--xxx.100.40.1.9 +fdbMacCurMulticastInsertNum OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "CURRENT multicast insert filter entry number." + ::= { fdbMacInfoTable 9} + +--xxx.100.40.1.10 +fdbMacCurMulticastWaitNum OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "CURRENT multicast wait filter entry number." + ::= { fdbMacInfoTable 10} + +--xxx.100.40.1.11 +fdbMacCounterTimeStamp OBJECT-TYPE + SYNTAX TimeStamp + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The value of sysUpTime when the fdbMacInfo was generated." + ::= { fdbMacInfoTable 11} + +--zhengmr end + +----------------------------------------------------------------------------------- +--wangysn 2022.05.07 +--xxx.100.41 fdbMacQuery +--*************************************** +--fdbMacQuery +--*************************************** + +--xxx.100.41.1 fdbMacQueryIndexMacVlan +fdbMacQueryIndexMacVlan OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Config fdb mac query vlan index." + ::= { fdbMacQuery 1 } + + --xxx.100.41.2 fdbMacQueryIndexPortName +fdbMacQueryIndexPortName OBJECT-TYPE + SYNTAX DisplayString(SIZE (1..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Config fdb mac query portname index." + ::= { fdbMacQuery 2 } + +--xxx.100.41.3 fdbMacQueryTable +fdbMacQueryTable OBJECT-TYPE + SYNTAX SEQUENCE OF FdbMacQueryEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " Fdb mac address information table." + ::= { fdbMacQuery 3 } +--xxx.100.41.3.1 +fdbMacQueryEntry OBJECT-TYPE + SYNTAX FdbMacQueryEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Fdb mac address information entry." + INDEX {fdbMacQueryMacAddress} + ::= { fdbMacQueryTable 1 } + +FdbMacQueryEntry + ::= SEQUENCE + { + fdbMacQueryMacAddress DisplayString, + fdbMacQueryMacPort DisplayString, + fdbMacQueryMacVlan INTEGER + } + + +--xxx.100.41.3.1.1 +fdbMacQueryMacAddress OBJECT-TYPE + SYNTAX DisplayString(SIZE (1..64)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Fdb mac address." + ::= { fdbMacQueryEntry 1 } + +--xxx.100.41.3.1.2 +fdbMacQueryMacPort OBJECT-TYPE + SYNTAX DisplayString(SIZE (1..64)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Fdb mac port name." + ::= { fdbMacQueryEntry 2 } + +--xxx.100.41.3.1.3 +fdbMacQueryMacVlan OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Fdb mac vlan." + ::= { fdbMacQueryEntry 3 } + +--wangysn end + +--******************************************************************************************************** + +--******************************************************************************************************** +--wangysn 2023.03.13 +--xxx.100.42 vplsMacCntQuery +--*************************************** +--vplsMacCntQuery +--*************************************** + + --xxx.100.42.1 vplsMacCntQueryIndexName +vplsMacCntQueryIndexName OBJECT-TYPE + SYNTAX DisplayString(SIZE (1..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Config vpls mac count query vpnname index." + ::= { vplsMacCntQuery 1 } + +--xxx.100.42.2 vplsMacCntQueryTable +vplsMacCntQueryTable OBJECT-TYPE + SYNTAX SEQUENCE OF VplsMacCntQueryEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " vpls mac count information table." + ::= { vplsMacCntQuery 2 } +--xxx.100.42.2.1 +vplsMacCntQueryEntry OBJECT-TYPE + SYNTAX VplsMacCntQueryEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "vpls mac count information entry." + INDEX {vplsMacCntQueryVfiName} + ::= { vplsMacCntQueryTable 1 } + +VplsMacCntQueryEntry + ::= SEQUENCE + { + vplsMacCntQueryVfiName DisplayString, + vplsMacCntQueryVfiMacCnt INTEGER, + vplsMacCntQueryVfiLocalMacCnt INTEGER, + vplsMacCntQueryVfiRemoteMacCnt INTEGER + } + +--xxx.100.42.2.1.1 +vplsMacCntQueryVfiName OBJECT-TYPE + SYNTAX DisplayString(SIZE (1..64)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "vfi name." + ::= { vplsMacCntQueryEntry 1 } + +--xxx.100.42.2.1.2 +vplsMacCntQueryVfiMacCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Vfi total mac count." + ::= { vplsMacCntQueryEntry 2 } + +--xxx.100.42.2.1.3 +vplsMacCntQueryVfiLocalMacCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Vfi local mac count." + ::= { vplsMacCntQueryEntry 3 } + +--xxx.100.42.2.1.4 +vplsMacCntQueryVfiRemoteMacCnt OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Vfi remote mac count." + ::= { vplsMacCntQueryEntry 4 } + +--wangysn end +--******************************************************************************************************** + +--******************************************************************************************************** +--wangysn 2023.03.15 +--xxx.100.43 isolatePortCfgQuery +--*************************************** +--isolatePortCfgQuery +--*************************************** + + --xxx.100.43.1 isolatePortCfgQueryApply +isolatePortCfgQueryApply OBJECT-TYPE + SYNTAX INTEGER + { + all(1), + l2(2), + l3(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Config isolate-port isolate mode,default all." + ::= { isolatePortCfgQuery 1 } + +--xxx.100.43.2 isolatePortCfgQueryTable +isolatePortCfgQueryTable OBJECT-TYPE + SYNTAX SEQUENCE OF IsolatePortCfgQueryEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " isolate-port information table." + ::= { isolatePortCfgQuery 2 } +--xxx.100.43.2.1 +isolatePortCfgQueryEntry OBJECT-TYPE + SYNTAX IsolatePortCfgQueryEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "isolate-port information entry." + INDEX {isolatePortCfgQueryGroupIndex,isolatePortCfgQueryGroupPortIndex} + ::= { isolatePortCfgQueryTable 1 } + +IsolatePortCfgQueryEntry + ::= SEQUENCE + { + isolatePortCfgQueryGroupIndex INTEGER, + isolatePortCfgQueryGroupPortIndex INTEGER, + isolatePortCfgQueryGroupName DisplayString, + isolatePortCfgQueryGroupSwitchport DisplayString, + isolatePortCfgQueryGroupStatus INTEGER + } + +--xxx.100.43.2.1.1 +isolatePortCfgQueryGroupIndex OBJECT-TYPE + SYNTAX INTEGER (1..16) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "isolate-port group index " + ::= { isolatePortCfgQueryEntry 1 } + +--xxx.100.43.2.1.2 +isolatePortCfgQueryGroupPortIndex OBJECT-TYPE + SYNTAX INTEGER (1..2048) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "isolate-port group port index" + ::= { isolatePortCfgQueryEntry 2 } + +--xxx.100.43.2.1.3 +isolatePortCfgQueryGroupName OBJECT-TYPE + SYNTAX DisplayString(SIZE (1..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "isolate-port group name, name length 1-32." + ::= { isolatePortCfgQueryEntry 3 } + +--xxx.100.43.2.1.4 +isolatePortCfgQueryGroupSwitchport OBJECT-TYPE + SYNTAX DisplayString(SIZE (1..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "isolate-port group switchport." + ::= { isolatePortCfgQueryEntry 4 } + +--xxx.100.43.2.1.5 +isolatePortCfgQueryGroupStatus OBJECT-TYPE + SYNTAX INTEGER + { + active(1), + destroy(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "isolate-port group status." + ::= { isolatePortCfgQueryEntry 5 } + +--wangysn end +--******************************************************************************************************** + +--******************************************************************************************************** +--xxx.100.200 Private LLDP Info + +--xxx.100.200.1 +lldpGlobalEnable OBJECT-TYPE + SYNTAX INTEGER{ + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Enable or disable lldp global config." + ::= {lldpPrivateInfo 1 } + +--******************************************************************************************************** + +--********************************************************************** +--Mac Notification Global Group +--********************************************************************** +macNotificationMibObjects OBJECT IDENTIFIER + ::= { macNotificationMib 1 } + +-- MAC Notification MIB consists of the following groups +-- [1] Mac Notification Global Group (cmnGlobalObjects). +-- [2] Mac Notification Interface Group (cmnInterfaceObjects). +macNotificationGlobalObjects OBJECT IDENTIFIER + ::= { macNotificationMibObjects 1 } +macNotificationInterfaceObjects OBJECT IDENTIFIER + ::= { macNotificationMibObjects 2 } + +macNotificationGlobalFeatureEnabled OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Indicates whether the MAC notification feature is currently + running in the device. + + Setting this object to false(2) disables the MAC notification + feature globally thus disabling the feature at each interface. + + Setting this object to true(1) will start the MAC notification + feature running in the device. If the feature is already + running, setting to true(1) has no effect. Once the MAC + notification is enabled, whether the feature is running at each + interface is controlled by the macNotificationIfConfigTable." + ::= { macNotificationGlobalObjects 1 } + +macNotificationNotificationInterval OBJECT-TYPE + SYNTAX Counter32 + UNITS "seconds" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This object specifies the maximum interval of time between + macNotificationMacChangedNotifications being generated by the device. + If the value of macNotificationNotificationsEnabled is true(1), the + device will send out the generated macNotificationMacChangedNotifications + and archive the MAC change notification events in the + macNotificationHistoryTable. If the value of macNotificationNotificationEnabled is + false(2), the device will not send out the generated + macNotificationMacChangedNotifications but it will archive these events + in the macNotificationHistoryTable. + + If the value of this object is equal to 0, the device will + generate macNotificationMacChangedNotifications and archive the MAC + change notification events in the macNotificationHistoryTable as soon as + there is MAC address learnt or removed by the device. + + If the value of this object is greater than 0, the device will + wait for a period of time equal to the value of this object + before generate the macNotificationMacChangedNotifications and archive + the MAC change notification events in the macNotificationHistoryTable." + ::= { macNotificationGlobalObjects 2 } + +macNotificationMacAddressesLearnt OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only STATUS current DESCRIPTION "Indicates the number of MAC addresses learnt by the @@ -22456,7 +25431,7 @@ macNotificationIfConfigEntry OBJECT-TYPE "Each entry contains the configuration for enabling the MAC notification at each interface that supports this feature." - INDEX { ifIndex } + INDEX { portIndex } ::= { macNotificationIfConfigTable 1 } MacNotificationIfConfigEntry ::= SEQUENCE { @@ -22515,27 +25490,60 @@ macNotificationMacAddrRemovedEnable OBJECT-TYPE --******************************************************************************************************** --xxx.101.100.1 - prohibitPortOID OBJECT IDENTIFIER ::= { antiArpscan 1 } + prohibitPortOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "anti arp scan prohibit port." + ::= { antiArpscan 1 } --xxx.101.100.2 - recoverPortOID OBJECT IDENTIFIER ::= { antiArpscan 2 } + recoverPortOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "anti arp scan recover port." + ::= { antiArpscan 2 } --xxx.101.100.3 - prohibitIPOID OBJECT IDENTIFIER ::= { antiArpscan 3 } + prohibitIPOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "anti arp scan prohibit ip." + ::= { antiArpscan 3 } --xxx.101.100.4 - prohibitIPExceedSlimitOID OBJECT IDENTIFIER ::= { antiArpscan 4 } + prohibitIPExceedSlimitOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "anti arp scan prohibit ip exceed S limit." + ::= { antiArpscan 4 } --xxx.101.100.5 - prohibitIPExceedHlimitOID OBJECT IDENTIFIER ::= { antiArpscan 5 } + prohibitIPExceedHlimitOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "anti arp scan prohibit ip exceed H limit." + ::= { antiArpscan 5 } --xxx.101.100.6 - recoverIPOID OBJECT IDENTIFIER ::= { antiArpscan 6 } + recoverIPOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "anti arp scan recover ip." + ::= { antiArpscan 6 } --xxx.101.100.7 - ipAddress OBJECT IDENTIFIER ::= { antiArpscan 7 } + ipAddress NOTIFICATION-TYPE + STATUS current + DESCRIPTION "anti arp scan ip address." + ::= { antiArpscan 7 } --xxx.101.100.8 - arpSpeedLimitOID OBJECT IDENTIFIER ::= { antiArpscan 8 } + arpSpeedLimitOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "anti arp scan speed limit." + ::= { antiArpscan 8 } --xxx.101.100.9 - arpDiscardOID OBJECT IDENTIFIER ::= { antiArpscan 9 } + arpDiscardOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "anti arp scan discard arp." + ::= { antiArpscan 9 } --xxx.101.100.10 - recoverArpSpeedOID OBJECT IDENTIFIER ::= { antiArpscan 10 } + recoverArpSpeedOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "anti arp scan recover arp speed." + ::= { antiArpscan 10 } --xxx.101.100.11 - recoverArpDiscardOID OBJECT IDENTIFIER ::= { antiArpscan 11 } + recoverArpDiscardOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "anti arp scan recover arp discard." + ::= { antiArpscan 11 } --******************************************************************************************************** --******************************************************************************************************** @@ -22544,13 +25552,25 @@ macNotificationMacAddrRemovedEnable OBJECT-TYPE fan OBJECT IDENTIFIER ::= { notifications 101 } --******************************************************************************************************** --xxx.101.101.1 -fanAbnormalOID OBJECT IDENTIFIER ::= { fan 1 } +fanAbnormalOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "fan abnormal." + ::= { fan 1 } --xxx.101.101.2 -fanNormalOID OBJECT IDENTIFIER ::= { fan 2 } +fanNormalOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "fan normal." + ::= { fan 2 } --xxx.101.101.3 -fanInsertOID OBJECT IDENTIFIER ::= { fan 3 } +fanInsertOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "fan insert." + ::= { fan 3 } --xxx.101.101.4 -fanPullOutOID OBJECT IDENTIFIER ::= { fan 4 } +fanPullOutOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "fan pull out." + ::= { fan 4 } --******************************************************************************************************** --trap @@ -22558,13 +25578,25 @@ fanPullOutOID OBJECT IDENTIFIER ::= { fan 4 } power OBJECT IDENTIFIER ::= { notifications 102 } --******************************************************************************************************** --xxx.101.102.1 -powerAbnormalOID OBJECT IDENTIFIER ::= { power 1 } +powerAbnormalOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "sys power DC is working!" + ::= { power 1 } --xxx.101.102.2 -powerNormalOID OBJECT IDENTIFIER ::= { power 2 } +powerNormalOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "sys power AC is working!" + ::= { power 2 } --xxx.101.102.3 -powerInsertOID OBJECT IDENTIFIER ::= { power 3 } ---xxx.101.102.4 -powerPullOutOID OBJECT IDENTIFIER ::= { power 4 } +powerInsertOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "sys power insert!" + ::= { power 3 } +--xxx.101.102.4 +powerPullOutOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "sys power pull out!" + ::= { power 4 } --******************************************************************************************************** --trap @@ -22572,14 +25604,20 @@ powerPullOutOID OBJECT IDENTIFIER ::= { power 4 } slotTemperature OBJECT IDENTIFIER ::= { notifications 103 } --******************************************************************************************************** --xxx.101.103.1 -slotTemperatureHigherOID OBJECT IDENTIFIER ::= { slotTemperature 1 } ---xxx.101.103.2 -slotTemperatureLowerOID OBJECT IDENTIFIER ::= { slotTemperature 2 } +slotTemperatureHigherOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "Temperature breached high threshold" + ::= { slotTemperature 1 } +--xxx.101.103.2 +slotTemperatureLowerOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "Temperature breached low threshold" + ::= { slotTemperature 2 } --******************************************************************************************************** --trap --xxx.101.103 --- slotTemperature OBJECT IDENTIFIER ::= { notifications 103 } +-- slotTemperature OBJECT IDENTIFIER ::= { notifications 103 } --******************************************************************************************************** @@ -22589,13 +25627,30 @@ slotTemperatureLowerOID OBJECT IDENTIFIER ::= { slotTemperature 2 } dhcpsnooping OBJECT IDENTIFIER ::= { notifications 104 } --******************************************************************************************************** --xxx.101.104.1 - shutdownPort OBJECT IDENTIFIER ::= { dhcpsnooping 1 } + shutdownPort NOTIFICATION-TYPE + STATUS current + DESCRIPTION "dhcp snooping shutdown port." + ::= { dhcpsnooping 1 } --xxx.101.104.2 - noShutdownPort OBJECT IDENTIFIER ::= { dhcpsnooping 2 } + noShutdownPort NOTIFICATION-TYPE + STATUS current + DESCRIPTION "dhcp snooping no shutdown port." + ::= { dhcpsnooping 2 } --xxx.101.104.3 - addBlackhole OBJECT IDENTIFIER ::= { dhcpsnooping 3 } + addBlackhole NOTIFICATION-TYPE + STATUS current + DESCRIPTION "dhcp snooping add black hole." + ::= { dhcpsnooping 3 } --xxx.101.104.4 - delBlackhole OBJECT IDENTIFIER ::= { dhcpsnooping 4 } + delBlackhole NOTIFICATION-TYPE + STATUS current + DESCRIPTION "dhcp snooping delete black hole." + ::= { dhcpsnooping 4 } +--xxx.101.104.5 + addBlockedinfo NOTIFICATION-TYPE + STATUS current + DESCRIPTION "dhcp snooping add blocked information." + ::= { dhcpsnooping 5 } --******************************************************************************************************** --trap @@ -22603,9 +25658,15 @@ slotTemperatureLowerOID OBJECT IDENTIFIER ::= { slotTemperature 2 } rateViolation OBJECT IDENTIFIER ::= { notifications 105 } --******************************************************************************************************** --xxx.101.105.1 -rateViolationShutdownPort OBJECT IDENTIFIER ::= { rateViolation 1 } +rateViolationShutdownPort NOTIFICATION-TYPE + STATUS current + DESCRIPTION "rate violation shutdown port." + ::= { rateViolation 1 } --xxx.101.105.2 -rateViolationNoShutdownPort OBJECT IDENTIFIER ::= { rateViolation 2 } +rateViolationNoShutdownPort NOTIFICATION-TYPE + STATUS current + DESCRIPTION "rate violation no shutdown port." + ::= { rateViolation 2 } --******************************************************************************************************** --trap @@ -22613,90 +25674,299 @@ rateViolationNoShutdownPort OBJECT IDENTIFIER ::= { rateViolation 2 } portGroup OBJECT IDENTIFIER ::= { notifications 106 } --******************************************************************************************************** --xxx.101.106.1 - portGroupCreate OBJECT IDENTIFIER ::= { portGroup 1 } + portGroupCreate NOTIFICATION-TYPE + STATUS current + DESCRIPTION "port group create." + ::= { portGroup 1 } --xxx.101.106.2 - portGroupDelete OBJECT IDENTIFIER ::= { portGroup 2 } + portGroupDelete NOTIFICATION-TYPE + STATUS current + DESCRIPTION "port group delete." + ::= { portGroup 2 } --xxx.101.106.3 - portGroupUpdate OBJECT IDENTIFIER ::= { portGroup 2 } + portGroupUpdate NOTIFICATION-TYPE + STATUS current + DESCRIPTION "port group update." + ::= { portGroup 3 } --******************************************************************************************************** --trap --xxx.101.110 - transceiverMonitor OBJECT IDENTIFIER ::= { notifications 110 } + transceiverMonitor OBJECT IDENTIFIER ::= { notifications 110 } --******************************************************************************************************** --xxx.101.110.1 - transceiverMonitorAlarmEvent OBJECT IDENTIFIER ::= { transceiverMonitor 1 } + transceiverMonitorAlarmEvent NOTIFICATION-TYPE + STATUS current + DESCRIPTION "tranceiver monitor alarm event." + ::= { transceiverMonitor 1 } --xxx.101.110.2 - transceiverMonitorWarnEvent OBJECT IDENTIFIER ::= { transceiverMonitor 2 } + transceiverMonitorWarnEvent NOTIFICATION-TYPE + STATUS current + DESCRIPTION "transceiver monitor warn event." + ::= { transceiverMonitor 2 } --******************************************************************************************************** --trap --xxx.101.109 efmOam OBJECT IDENTIFIER ::= { notifications 109 } --******************************************************************************************************** --xxx.101.109.1 - efmOamDiscoverySuccess OBJECT IDENTIFIER ::= { efmOam 1 } + efmOamDiscoverySuccess NOTIFICATION-TYPE + STATUS current + DESCRIPTION "efm oam discovery success." + ::= { efmOam 1 } --xxx.101.109.2 - efmOamDiscoveryTimeout OBJECT IDENTIFIER ::= { efmOam 2 } + efmOamDiscoveryTimeout NOTIFICATION-TYPE + STATUS current + DESCRIPTION "efm oam discovery time out." + ::= { efmOam 2 } --xxx.101.109.3 - efmOamLocalErrSymbolPeriodEvent OBJECT IDENTIFIER ::= { efmOam 3 } + efmOamLocalErrSymbolPeriodEvent NOTIFICATION-TYPE + STATUS current + DESCRIPTION "efm oam local error symbol period event." + ::= { efmOam 3 } --xxx.101.109.4 - efmOamLocalErrFramePeriodEvent OBJECT IDENTIFIER ::= { efmOam 4 } + efmOamLocalErrFramePeriodEvent NOTIFICATION-TYPE + STATUS current + DESCRIPTION "efm oam local error frame period event." + ::= { efmOam 4 } --xxx.101.109.5 - efmOamLocalErrFrameEvent OBJECT IDENTIFIER ::= { efmOam 5 } + efmOamLocalErrFrameEvent NOTIFICATION-TYPE + STATUS current + DESCRIPTION "efm oam local error frame event." + ::= { efmOam 5 } --xxx.101.109.6 - efmOamLocalErrFrameSecondsSummaryEvent OBJECT IDENTIFIER ::= { efmOam 6 } + efmOamLocalErrFrameSecondsSummaryEvent NOTIFICATION-TYPE + STATUS current + DESCRIPTION "efm oam local error frame seconds summary event." + ::= { efmOam 6 } --xxx.101.109.7 - efmOamLocalLinkFault OBJECT IDENTIFIER ::= { efmOam 7 } + efmOamLocalLinkFault NOTIFICATION-TYPE + STATUS current + DESCRIPTION "efm oam local link fault." + ::= { efmOam 7 } --xxx.101.109.8 - efmOamLocalCriticalEvent OBJECT IDENTIFIER ::= { efmOam 8 } + efmOamLocalCriticalEvent NOTIFICATION-TYPE + STATUS current + DESCRIPTION "efm oam local critical event." + ::= { efmOam 8 } --xxx.101.109.9 - efmOamRemoteErrSymbolPeriodEvent OBJECT IDENTIFIER ::= { efmOam 9 } + efmOamRemoteErrSymbolPeriodEvent NOTIFICATION-TYPE + STATUS current + DESCRIPTION "efm oam remote error symbol period event." + ::= { efmOam 9 } --xxx.101.109.10 - efmOamRemoteErrFramePeriodEvent OBJECT IDENTIFIER ::= { efmOam 10 } + efmOamRemoteErrFramePeriodEvent NOTIFICATION-TYPE + STATUS current + DESCRIPTION "efm oam remote error frame period event." + ::= { efmOam 10 } --xxx.101.109.11 - efmOamRemoteErrFrameEvent OBJECT IDENTIFIER ::= { efmOam 11 } + efmOamRemoteErrFrameEvent NOTIFICATION-TYPE + STATUS current + DESCRIPTION "efm oam remote error frame event." + ::= { efmOam 11 } --xxx.101.109.12 - efmOamRemoteErrFrameSecondsSummaryEvent OBJECT IDENTIFIER ::= { efmOam 12 } + efmOamRemoteErrFrameSecondsSummaryEvent NOTIFICATION-TYPE + STATUS current + DESCRIPTION "efm oam remote error frame seconds summary event." + ::= { efmOam 12 } --xxx.101.109.13 - efmOamRemoteLinkFault OBJECT IDENTIFIER ::= { efmOam 13 } + efmOamRemoteLinkFault NOTIFICATION-TYPE + STATUS current + DESCRIPTION "efm oam remote link fault." + ::= { efmOam 13 } --xxx.101.109.14 - efmOamRemoteCriticalEvent OBJECT IDENTIFIER ::= { efmOam 14 } + efmOamRemoteCriticalEvent NOTIFICATION-TYPE + STATUS current + DESCRIPTION "efm oam remote critical event." + ::= { efmOam 14 } --xxx.101.109.15 - efmOamRemoteDyingGasp OBJECT IDENTIFIER ::= { efmOam 15 } + efmOamRemoteDyingGasp NOTIFICATION-TYPE + STATUS current + DESCRIPTION "efm oam remote dying gasp." + ::= { efmOam 15 } --xxx.101.109.16 - efmOamLoopBackSuccess OBJECT IDENTIFIER ::= { efmOam 16 } + efmOamLoopBackSuccess NOTIFICATION-TYPE + STATUS current + DESCRIPTION "efm oam loopback success." + ::= { efmOam 16 } --xxx.101.109.17 - efmOamLoopBackExit OBJECT IDENTIFIER ::= { efmOam 17 } + efmOamLoopBackExit NOTIFICATION-TYPE + STATUS current + DESCRIPTION "efm oam loopback exit." + ::= { efmOam 17 } --******************************************************************************************************** --trap --xxx.101.114 - dyingGasp OBJECT IDENTIFIER ::= { notifications 114 } + dyingGasp OBJECT IDENTIFIER ::= { notifications 114 } --******************************************************************************************************** ---xxx.101.110.1 - dyingGaspEvent OBJECT IDENTIFIER ::= { dyingGasp 1 } +--xxx.101.114.1 + dyingGaspEvent NOTIFICATION-TYPE + STATUS current + DESCRIPTION "dying gasp." + ::= { dyingGasp 1 } --xxx.101.116 - copyRunningConfig OBJECT IDENTIFIER ::= { notifications 116 } + copyRunningConfig OBJECT IDENTIFIER ::= { notifications 116 } --******************************************************************************************************** ---xxx.101.110.1 - copyRunningConfigEvent OBJECT IDENTIFIER ::= { copyRunningConfig 1 } +--xxx.101.116.1 + copyRunningConfigEvent NOTIFICATION-TYPE + STATUS current + DESCRIPTION "copy running config event." + ::= { copyRunningConfig 1 } + + --******************************************************************************************************** + --trap +--xxx.101.117 + cpuUsedPer OBJECT IDENTIFIER ::= { notifications 117 } +--******************************************************************************************************** +--xxx.101.117.1 + cpuUsedPerEvent NOTIFICATION-TYPE + STATUS current + DESCRIPTION "cpu Used Per." + ::= { cpuUsedPer 1 } + +--******************************************************************************************************** +--trap +--xxx.101.118 + memUsedPer OBJECT IDENTIFIER ::= { notifications 118 } +--******************************************************************************************************** +--xxx.101.118.1 + memUsedPerEvent NOTIFICATION-TYPE + STATUS current + DESCRIPTION "mem Used Per." + ::= { memUsedPer 1 } +--******************************************************************************************************** +--trap +--xxx.101.120 + stp OBJECT IDENTIFIER ::= { notifications 120 } +--******************************************************************************************************** +--xxx.101.120.1 +stpPortStateChangeEvent NOTIFICATION-TYPE + STATUS current + DESCRIPTION "stp,rstp,mstp port state change event." + ::= { stp 1 } + --******************************************************************************************************** --trap --xxx.101.121 mstp OBJECT IDENTIFIER ::= { notifications 121 } --******************************************************************************************************** --xxx.101.121.1 -mstpTcnTrapOID OBJECT IDENTIFIER ::= { mstp 1 } +mstpTcnTrapOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "mstp tcn." + ::= { mstp 1 } --trap --xxx.101.122 powerGroup OBJECT IDENTIFIER ::= { notifications 122 } --******************************************************************************************************** --xxx.101.106.1 - -- powerSupplyChassisTrap OBJECT IDENTIFIER ::= { powerGroup 1 } + -- powerSupplyChassisTrap NOTIFICATION-TYPE + -- STATUS current + -- DESCRIPTION "power supply chassis." + -- ::= { powerGroup 1 } --xxx.101.106.2 - powerSupplyTrap OBJECT IDENTIFIER ::= { powerGroup 2 } + powerSupplyTrap NOTIFICATION-TYPE + STATUS current + DESCRIPTION "power supply." + ::= { powerGroup 2 } --xxx.101.106.3 - -- powerPresentChassisTrap OBJECT IDENTIFIER ::= { powerGroup 3 } + -- powerPresentChassisTrap NOTIFICATION-TYPE + -- STATUS current + -- DESCRIPTION "power present chassis." + -- ::= { powerGroup 3 } --xxx.101.106.4 - powerPresentTrap OBJECT IDENTIFIER ::= { powerGroup 4 } - END - + powerPresentTrap NOTIFICATION-TYPE + STATUS current + DESCRIPTION "power present." + ::= { powerGroup 4 } +--******************************************************************************************************** +--trap +--xxx.101.125 + erpsGroup OBJECT IDENTIFIER ::= { notifications 125 } +--******************************************************************************************************** +--xxx.101.125.1 + swERPSSFDetectedTrap NOTIFICATION-TYPE + STATUS current + DESCRIPTION "ERPS SF deleted." + ::= { erpsGroup 1 } +--xxx.101.125.2 + swERPSSFClearedTrap NOTIFICATION-TYPE + STATUS current + DESCRIPTION "ERPS SF cleared." + ::= { erpsGroup 2 } +--******************************************************************************************************** +--trap +--xxx.101.126 + authLogGroup OBJECT IDENTIFIER ::= { notifications 126 } +--******************************************************************************************************** +--xxx.101.126.1 + authLogin NOTIFICATION-TYPE + STATUS current + DESCRIPTION "User Login." + ::= { authLogGroup 1 } +--xxx.101.126.2 + authLogout NOTIFICATION-TYPE + STATUS current + DESCRIPTION "User Logout." + ::= { authLogGroup 2 } + + +--******************************************************************************************************** +--vpls peer state change trap wangyangah 2019-06-04 +--xxx.101.127 + vpls OBJECT IDENTIFIER ::= { notifications 127 } +--xxx.101.127.1 +vplsPeerStateChangeTrapOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "Vpls peer state change." + ::= { vpls 1 } +--******************************************************************************************************** +--vpws peer state change trap +--xxx.101.128 + vpws OBJECT IDENTIFIER ::= { notifications 128 } +--xxx.101.128.1 +vpwsPeerStateChangeTrapOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "Vpws peer state change." + ::= { vpws 1 } + +--******************************************************************************************************** +--route alarm information +--xxx.101.130 + routeAlarm OBJECT IDENTIFIER ::= { notifications 130 } +--xxx.101.130.1 +routeAlarmTrapOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "route alarm information" + ::= { routeAlarm 1 } +--******************************************************************************************************** +--reload information +--xxx.101.131 + reloadInfo OBJECT IDENTIFIER ::= { notifications 131 } +--xxx.101.131.1 +reloadInfoTrapOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "reload information" + ::= { reloadInfo 1 } +--******************************************************************************************************** +--nqaalram information +--xxx.101.132 + nqaAlarm OBJECT IDENTIFIER ::= { notifications 132 } +--xxx.101.132.1 +nqaProbeOverthresoldTrapOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "nqa probe overthresold" + ::= { nqaAlarm 1 } +--xxx.101.132.2 +nqaProbeFailureTrapOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "nqa probe failure" + ::= { nqaAlarm 2 } +--xxx.101.132.3 +nqaProbeResultChgTrapOID NOTIFICATION-TYPE + STATUS current + DESCRIPTION "nqa probe result change" + ::= { nqaAlarm 3 } +--******************************************************************************************************** +END + \ No newline at end of file diff --git a/mibs/didactum/DIDACTUM-SYSTEM-MIB b/mibs/didactum/DIDACTUM-SYSTEM-MIB new file mode 100644 index 00000000000..9a0e88c57eb --- /dev/null +++ b/mibs/didactum/DIDACTUM-SYSTEM-MIB @@ -0,0 +1,3824 @@ + +DIDACTUM-SYSTEM-MIB DEFINITIONS ::= BEGIN + +IMPORTS + NOTIFICATION-TYPE, OBJECT-TYPE, MODULE-IDENTITY, + enterprises, Integer32 + FROM SNMPv2-SMI; + +didactum MODULE-IDENTITY + LAST-UPDATED "202601050000Z" + ORGANIZATION + "Didactum Security GmbH" + CONTACT-INFO + "support@didactum.de" + DESCRIPTION + "Didactum monitoring units" +::= { enterprises 46501 } + +ctlUnit OBJECT IDENTIFIER ::= { didactum 1 } +ctlNotifiers OBJECT IDENTIFIER ::= { didactum 2 } +ctlVirtualDevices OBJECT IDENTIFIER ::= { didactum 3 } +ctlHardwareDevices OBJECT IDENTIFIER ::= { didactum 4 } +ctIInternalSensors OBJECT IDENTIFIER ::= { didactum 5 } +ctlCANSensors OBJECT IDENTIFIER ::= { didactum 6 } +ctlLoRaSensors OBJECT IDENTIFIER ::= { didactum 7 } + +ctlUnitModulesTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlUnitModulesEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlUnit 1 } + +ctlUnitModulesEntry OBJECT-TYPE + SYNTAX CtlUnitModulesEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of module" + INDEX { ctlUnitModuleId } + ::= { ctlUnitModulesTable 1 } + +CtlUnitModulesEntry ::= SEQUENCE { + ctlUnitModuleId + Integer32, + ctlUnitModulePcode + Integer32, + ctlUnitModuleSN + Integer32, + ctlUnitModuleClass + OCTET STRING, + ctlUnitModuleType + OCTET STRING, + ctlUnitModuleName + OCTET STRING, + ctlUnitModuleState + OCTET STRING +} + +ctlUnitModuleId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of module" + ::= { ctlUnitModulesEntry 1 } + +ctlUnitModulePcode OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Product code of module" + ::= { ctlUnitModulesEntry 2 } + +ctlUnitModuleSN OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Serial number of module" + ::= { ctlUnitModulesEntry 3 } + +ctlUnitModuleClass OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Class of module" + ::= { ctlUnitModulesEntry 4 } + +ctlUnitModuleType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of module" + ::= { ctlUnitModulesEntry 5 } + +ctlUnitModuleName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of module" + ::= { ctlUnitModulesEntry 6 } + +ctlUnitModuleState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of module" + ::= { ctlUnitModulesEntry 7 } + +ctlUnitGroupsTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlUnitGroupsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlUnit 2 } + +ctlUnitGroupsEntry OBJECT-TYPE + SYNTAX CtlUnitGroupsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + INDEX { ctlUnitGroupId } + ::= { ctlUnitGroupsTable 1 } + +CtlUnitGroupsEntry ::= SEQUENCE { + ctlUnitGroupId + Integer32, + ctlUnitGroupName + OCTET STRING, + ctlUnitGroupDesc + OCTET STRING +} + +ctlUnitGroupId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of group" + ::= { ctlUnitGroupsEntry 1 } + +ctlUnitGroupName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of group" + ::= { ctlUnitGroupsEntry 2 } + +ctlUnitGroupDesc OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..256)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Description of group" + ::= { ctlUnitGroupsEntry 3 } + +ctlUnitElementsTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlUnitElementsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlUnit 3 } + +ctlUnitElementsEntry OBJECT-TYPE + SYNTAX CtlUnitElementsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + INDEX { ctlUnitElementId } + ::= { ctlUnitElementsTable 1 } + +CtlUnitElementsEntry ::= SEQUENCE { + ctlUnitElementId + Integer32, + ctlUnitElementGroup + Integer32, + ctlUnitElementModule + Integer32, + ctlUnitElementNum + Integer32, + ctlUnitElementClass + OCTET STRING, + ctlUnitElementType + OCTET STRING, + ctlUnitElementName + OCTET STRING, + ctlUnitElementState + OCTET STRING, + ctlUnitElementValue + OCTET STRING, + ctlUnitElementSpec + OCTET STRING +} + +ctlUnitElementId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of element" + ::= { ctlUnitElementsEntry 1 } + +ctlUnitElementGroup OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Group of element" + ::= { ctlUnitElementsEntry 2 } + +ctlUnitElementModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of element" + ::= { ctlUnitElementsEntry 3 } + +ctlUnitElementNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of elemnt's in module" + ::= { ctlUnitElementsEntry 4 } + +ctlUnitElementClass OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Class of element" + ::= { ctlUnitElementsEntry 5 } + +ctlUnitElementType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of element" + ::= { ctlUnitElementsEntry 6 } + +ctlUnitElementName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of element" + ::= { ctlUnitElementsEntry 7 } + +ctlUnitElementState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of element" + ::= { ctlUnitElementsEntry 8 } + +ctlUnitElementValue OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Value of element" + ::= { ctlUnitElementsEntry 9 } + +ctlUnitElementSpec OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Special parameters for element" + ::= { ctlUnitElementsEntry 10 } + +ctlUnitLogicsTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlUnitLogicsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlUnit 4 } + +ctlUnitLogicsEntry OBJECT-TYPE + SYNTAX CtlUnitLogicsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of logic" + INDEX { ctlUnitLogicId } + ::= { ctlUnitLogicsTable 1 } + +CtlUnitLogicsEntry ::= SEQUENCE { + ctlUnitLogicId + Integer32, + ctlUnitLogicName + OCTET STRING, + ctlUnitLogicDesc + OCTET STRING, + ctlUnitLogicDisable + Integer32, + ctlUnitLogicRowStatus + Integer32 +} + +-- Id of logic's + +ctlUnitLogicId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of logic scheme" + ::= { ctlUnitLogicsEntry 1 } + +ctlUnitLogicName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..64)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Name of logic scheme" + ::= { ctlUnitLogicsEntry 2 } + +ctlUnitLogicDesc OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..256)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Description of logic scheme" + ::= { ctlUnitLogicsEntry 3 } + +ctlUnitLogicDisable OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Disable of logic's in secs, 0 for enable " + ::= { ctlUnitLogicsEntry 4 } + +ctlUnitLogicRowStatus OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "" + ::= { ctlUnitLogicsEntry 5 } + + +ctlUnitTrapNotification NOTIFICATION-TYPE + OBJECTS { macroLogicDefinition, macroStateOfSensors, macroDateAndTime, + macroLogicName, macroSensorName, macroSensorState, macroSensorValue, + macroLastModifiedSensorID, trapID, trapName, trapSeverity } + STATUS current + DESCRIPTION + "SNMP trap notification." + ::= { ctlUnit 5 } + +-- The trap description objects + +macroLogicDefinition OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Description of the logic scheme that has triggered." + ::= { ctlUnitTrapNotification 1 } + +macroStateOfSensors OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Readings of sensors in the logic scheme." + ::= { ctlUnitTrapNotification 2 } + +macroDateAndTime OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Logic scheme response time." + ::= { ctlUnitTrapNotification 3 } + +macroLogicName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Name of logic scheme." + ::= { ctlUnitTrapNotification 4 } + +macroSensorName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Name of the sensor which triggered the logic scheme." + ::= { ctlUnitTrapNotification 5 } + +macroSensorState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of the sensor in the logic scheme that has triggered. + Maybe one of these: normal, warning, low warning, high warning, + alarm, low alarm, high alarm, on, off, not connected" + ::= { ctlUnitTrapNotification 6 } + +macroSensorValue OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The value measured by the sensor or logic level." + ::= { ctlUnitTrapNotification 7 } + +macroLastModifiedSensorID OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Sensor ID that triggered the operation of the logic circuit." + ::= { ctlUnitTrapNotification 8 } + +trapID OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ID of SNMP trap." + ::= { ctlUnitTrapNotification 20 } + +trapName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Name of SNMP trap." + ::= { ctlUnitTrapNotification 21 } + +trapSeverity OBJECT-TYPE + SYNTAX INTEGER { + emergency (0), + alert (1), + critical (2), + error (3), + warning (4), + notice (5), + informational (6), + debug (7) + } + ACCESS read-only + STATUS mandatory + DESCRIPTION + "Severity level of the message" + ::= { ctlUnitTrapNotification 22 } + + +ctlUnitSaveToFlash OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Save current setting to flash memory" + ::= { ctlUnit 6 } + + +-- System information entry + +ctlUnitSystem OBJECT IDENTIFIER ::= { ctlUnit 7 } + +systemDevType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Device type" + ::= { ctlUnitSystem 1 } + +systemFirmware OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Firmware version" + ::= { ctlUnitSystem 2 } + +systemKernel OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "System kernel version" + ::= { ctlUnitSystem 3 } + +systemOpTime OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Total operating time" + ::= { ctlUnitSystem 4 } + +systemUpTime OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Session time" + ::= { ctlUnitSystem 5 } + +systemCpuUsage OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "CPU usage (%)" + ::= { ctlUnitSystem 6 } + +systemMemUsage OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Memory usage (%)" + ::= { ctlUnitSystem 7 } + +systemState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "System state" + ::= { ctlUnitSystem 8 } + +systemHostname OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Network Hostname" + ::= { ctlUnitSystem 9 } + +systemDescSN OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Serial Number" + ::= { ctlUnitSystem 10 } + +systemDescContacts OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..1024)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Contacts" + ::= { ctlUnitSystem 11 } + +systemDescLocation OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..1024)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Location description" + ::= { ctlUnitSystem 12 } + +systemDescComment OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..1024)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Comment" + ::= { ctlUnitSystem 13 } + +systemMAC OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..32)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Ethernet MAC address of the unit" + ::= { ctlUnitSystem 14 } + + +ctlUnitReboot OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Reboot the unit" + ::= { ctlUnit 8 } + + +ctlNotifiersMailersTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlNotifiersMailersEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlNotifiers 1 } + +ctlNotifiersMailersEntry OBJECT-TYPE + SYNTAX CtlNotifiersMailersEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of email notify" + INDEX { ctlNotifiersMailerId } + ::= { ctlNotifiersMailersTable 1 } + +CtlNotifiersMailersEntry ::= SEQUENCE { + ctlNotifiersMailerId + Integer32, + ctlNotifiersMailerModule + Integer32, + ctlNotifiersMailerNum + Integer32, + ctlNotifiersMailerType + OCTET STRING, + ctlNotifiersMailerName + OCTET STRING, + ctlNotifiersMailerState + OCTET STRING, + ctlNotifiersMailerValue + OCTET STRING, + ctlNotifiersMailerServer + OCTET STRING, + ctlNotifiersMailerPort + Integer32, + ctlNotifiersMailerLogin + OCTET STRING, + ctlNotifiersMailerPassword + Integer32, + ctlNotifiersMailersTo + OCTET STRING, + ctlNotifiersMailersFrom + OCTET STRING, + ctlNotifiersMailerMessage + Integer32 +} + +ctlNotifiersMailerId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of mailer" + ::= { ctlNotifiersMailersEntry 1 } + +ctlNotifiersMailerModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of mailer" + ::= { ctlNotifiersMailersEntry 2 } + +ctlNotifiersMailerNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Logical number in module for mailer" + ::= { ctlNotifiersMailersEntry 3 } + +ctlNotifiersMailerType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of element" + ::= { ctlNotifiersMailersEntry 4 } + +ctlNotifiersMailerName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of mailer" + ::= { ctlNotifiersMailersEntry 5 } + +ctlNotifiersMailerState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of mailer" + ::= { ctlNotifiersMailersEntry 6 } + +ctlNotifiersMailerValue OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Value of mailer" + ::= { ctlNotifiersMailersEntry 7 } + +ctlNotifiersMailerServer OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..256)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Mailserver adress" + ::= { ctlNotifiersMailersEntry 8 } + +ctlNotifiersMailerPort OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Port of mailserver" + ::= { ctlNotifiersMailersEntry 9 } + +ctlNotifiersMailerLogin OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Login on mailserver" + ::= { ctlNotifiersMailersEntry 10 } + +ctlNotifiersMailerPassword OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Password for mailserver" + ::= { ctlNotifiersMailersEntry 11 } + +ctlNotifiersMailersTo OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "To" + ::= { ctlNotifiersMailersEntry 12 } + +ctlNotifiersMailersFrom OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..512)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "From" + ::= { ctlNotifiersMailersEntry 13 } + +ctlNotifiersMailerMessage OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Message" + ::= { ctlNotifiersMailersEntry 14 } + +ctlNotifiersTrapsTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlNotifiersTrapsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlNotifiers 2 } + +ctlNotifiersTrapsEntry OBJECT-TYPE + SYNTAX CtlNotifiersTrapsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of trap notify" + INDEX { ctlNotifiersTrapId } + ::= { ctlNotifiersTrapsTable 1 } + +CtlNotifiersTrapsEntry ::= SEQUENCE { + ctlNotifiersTrapId + Integer32, + ctlNotifiersTrapModule + Integer32, + ctlNotifiersTrapNum + Integer32, + ctlNotifiersTrapType + OCTET STRING, + ctlNotifiersTrapName + OCTET STRING, + ctlNotifiersTrapState + OCTET STRING, + ctlNotifiersTrapValue + OCTET STRING, + ctlNotifiersTrapServer + OCTET STRING, + ctlNotifiersTrapPort + Integer32, + ctlNotifiersTrapVersion + OCTET STRING, + ctlNotifiersTrapCommunity + OCTET STRING +} + +ctlNotifiersTrapId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of trap" + ::= { ctlNotifiersTrapsEntry 1 } + +ctlNotifiersTrapModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of trap" + ::= { ctlNotifiersTrapsEntry 2 } + +ctlNotifiersTrapNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Logical number in module for trap" + ::= { ctlNotifiersTrapsEntry 3 } + +ctlNotifiersTrapType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of element" + ::= { ctlNotifiersTrapsEntry 4 } + +ctlNotifiersTrapName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of trap" + ::= { ctlNotifiersTrapsEntry 5 } + +ctlNotifiersTrapState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of trap" + ::= { ctlNotifiersTrapsEntry 6 } + +ctlNotifiersTrapValue OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Value of trap" + ::= { ctlNotifiersTrapsEntry 7 } + +ctlNotifiersTrapServer OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Receiver address for trap" + ::= { ctlNotifiersTrapsEntry 8 } + +ctlNotifiersTrapPort OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Port of trap receiver" + ::= { ctlNotifiersTrapsEntry 9 } + +ctlNotifiersTrapVersion OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..4)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Version of trap" + ::= { ctlNotifiersTrapsEntry 10 } + +ctlNotifiersTrapCommunity OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..32)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Password for mailserver" + ::= { ctlNotifiersTrapsEntry 11 } + +ctlNotifiersSMSsTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlNotifiersSMSsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlNotifiers 3 } + +ctlNotifiersSMSsEntry OBJECT-TYPE + SYNTAX CtlNotifiersSMSsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of SMS notify" + INDEX { ctlNotifiersSMSId } + ::= { ctlNotifiersSMSsTable 1 } + +CtlNotifiersSMSsEntry ::= SEQUENCE { + ctlNotifiersSMSId + Integer32, + ctlNotifiersSMSModule + Integer32, + ctlNotifiersSMSNum + Integer32, + ctlNotifiersSMSType + OCTET STRING, + ctlNotifiersSMSName + OCTET STRING, + ctlNotifiersSMSState + OCTET STRING, + ctlNotifiersSMSValue + Integer32, + ctlNotifiersSMSTo + OCTET STRING, + ctlNotifiersSMSMessage + OCTET STRING +} + +ctlNotifiersSMSId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of SMS" + ::= { ctlNotifiersSMSsEntry 1 } + +ctlNotifiersSMSModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of SMS" + ::= { ctlNotifiersSMSsEntry 2 } + +ctlNotifiersSMSNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Logical number in module for SMS" + ::= { ctlNotifiersSMSsEntry 3 } + +ctlNotifiersSMSType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of SMS" + ::= { ctlNotifiersSMSsEntry 4 } + +ctlNotifiersSMSName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of SMS" + ::= { ctlNotifiersSMSsEntry 5 } + +ctlNotifiersSMSState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of SMS" + ::= { ctlNotifiersSMSsEntry 6 } + +ctlNotifiersSMSValue OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set '1' to send SMS" + ::= { ctlNotifiersSMSsEntry 7 } + +ctlNotifiersSMSTo OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(3..256)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Phone number" + ::= { ctlNotifiersSMSsEntry 8 } + +ctlNotifiersSMSMessage OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..512)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Text of SMS message" + ::= { ctlNotifiersSMSsEntry 9 } + +ctlNotifiersMessengersTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlNotifiersMessengersEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlNotifiers 7 } + +ctlNotifiersMessengersEntry OBJECT-TYPE + SYNTAX CtlNotifiersMessengersEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of Messenger notify" + INDEX { ctlNotifiersMessengerId } + ::= { ctlNotifiersMessengersTable 1 } + +CtlNotifiersMessengersEntry ::= SEQUENCE { + ctlNotifiersMessengerId + Integer32, + ctlNotifiersMessengerModule + Integer32, + ctlNotifiersMessengerNum + Integer32, + ctlNotifiersMessengerType + OCTET STRING, + ctlNotifiersMessengerName + OCTET STRING, + ctlNotifiersMessengerState + OCTET STRING, + ctlNotifiersMessengerValue + Integer32, + ctlNotifiersMessengerMessage + OCTET STRING +} + +ctlNotifiersMessengerId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of Messenger element" + ::= { ctlNotifiersMessengersEntry 1 } + +ctlNotifiersMessengerModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of Messenger" + ::= { ctlNotifiersMessengersEntry 2 } + +ctlNotifiersMessengerNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Logical number in module for Messenger" + ::= { ctlNotifiersMessengersEntry 3 } + +ctlNotifiersMessengerType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of Messenger" + ::= { ctlNotifiersMessengersEntry 4 } + +ctlNotifiersMessengerName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of Messenger" + ::= { ctlNotifiersMessengersEntry 5 } + +ctlNotifiersMessengerState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of Messenger" + ::= { ctlNotifiersMessengersEntry 6 } + +ctlNotifiersMessengerValue OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set '1' to send message" + ::= { ctlNotifiersMessengersEntry 7 } + +ctlNotifiersMessengerMessage OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..512)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Text of Messenger message" + ::= { ctlNotifiersMessengersEntry 8 } + +ctlVirtualDevicesTimersTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlVirtualDevicesTimersEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlVirtualDevices 1 } + +ctlVirtualDevicesTimersEntry OBJECT-TYPE + SYNTAX CtlVirtualDevicesTimersEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of timer" + INDEX { ctlVirtualDevicesTimerId } + ::= { ctlVirtualDevicesTimersTable 1 } + +CtlVirtualDevicesTimersEntry ::= SEQUENCE { + ctlVirtualDevicesTimerId + Integer32, + ctlVirtualDevicesTimerModule + Integer32, + ctlVirtualDevicesTimerNum + Integer32, + ctlVirtualDevicesTimerType + OCTET STRING, + ctlVirtualDevicesTimerName + OCTET STRING, + ctlVirtualDevicesTimerState + OCTET STRING, + ctlVirtualDevicesTimerValue + OCTET STRING, + ctlVirtualDevicesTimerBegin + OCTET STRING, + ctlVirtualDevicesTimerEnd + OCTET STRING, + ctlVirtualDevicesTimerDays + OCTET STRING, + ctlVirtualDevicesTimerMode + OCTET STRING, + ctlVirtualDevicesTimerDayPattern + OCTET STRING +} + +ctlVirtualDevicesTimerId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of timer" + ::= { ctlVirtualDevicesTimersEntry 1 } + +ctlVirtualDevicesTimerModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of tiimer" + ::= { ctlVirtualDevicesTimersEntry 2 } + +ctlVirtualDevicesTimerNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Logical number in module for timer" + ::= { ctlVirtualDevicesTimersEntry 3 } + +ctlVirtualDevicesTimerType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of timer" + ::= { ctlVirtualDevicesTimersEntry 4 } + +ctlVirtualDevicesTimerName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of timer" + ::= { ctlVirtualDevicesTimersEntry 5 } + +ctlVirtualDevicesTimerState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of timer" + ::= { ctlVirtualDevicesTimersEntry 6 } + +ctlVirtualDevicesTimerValue OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Value of timer" + ::= { ctlVirtualDevicesTimersEntry 7 } + +ctlVirtualDevicesTimerBegin OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Begin time for timer (Unix timestamp)" + ::= { ctlVirtualDevicesTimersEntry 8 } + +ctlVirtualDevicesTimerEnd OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "End time for timer (Unix timestamp)" + ::= { ctlVirtualDevicesTimersEntry 9 } + +ctlVirtualDevicesTimerDays OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Days for timer" + ::= { ctlVirtualDevicesTimersEntry 10 } + +ctlVirtualDevicesTimerMode OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Mode of timer" + ::= { ctlVirtualDevicesTimersEntry 11 } + +ctlVirtualDevicesTimerDayPattern OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Timer pattern for every day of week" + ::= { ctlVirtualDevicesTimersEntry 12 } + + +ctlVirtualDevicesPingsTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlVirtualDevicesPingsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlVirtualDevices 2 } + +ctlVirtualDevicesPingsEntry OBJECT-TYPE + SYNTAX CtlVirtualDevicesPingsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of ping" + INDEX { ctlVirtualDevicesPingId } + ::= { ctlVirtualDevicesPingsTable 1 } + +CtlVirtualDevicesPingsEntry ::= SEQUENCE { + ctlVirtualDevicesPingId + Integer32, + ctlVirtualDevicesPingModule + Integer32, + ctlVirtualDevicesPingNum + Integer32, + ctlVirtualDevicesPingType + OCTET STRING, + ctlVirtualDevicesPingName + OCTET STRING, + ctlVirtualDevicesPingState + OCTET STRING, + ctlVirtualDevicesPingValue + OCTET STRING, + ctlVirtualDevicesPingPeriod + Integer32, + ctlVirtualDevicesPingRTT + Integer32, + ctlVirtualDevicesPingServer + OCTET STRING, + ctlVirtualDevicesPingIP + OCTET STRING, + ctlVirtualDevicesPingSent + Integer32, + ctlVirtualDevicesPingReceived + Integer32, + ctlVirtualDevicesPingStatus + OCTET STRING +} + +ctlVirtualDevicesPingId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of ping" + ::= { ctlVirtualDevicesPingsEntry 1 } + +ctlVirtualDevicesPingModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of ping" + ::= { ctlVirtualDevicesPingsEntry 2 } + +ctlVirtualDevicesPingNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Logical number in module for ping" + ::= { ctlVirtualDevicesPingsEntry 3 } + +ctlVirtualDevicesPingType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of element" + ::= { ctlVirtualDevicesPingsEntry 4 } + +ctlVirtualDevicesPingName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of ping" + ::= { ctlVirtualDevicesPingsEntry 5 } + +ctlVirtualDevicesPingState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of ping" + ::= { ctlVirtualDevicesPingsEntry 6 } + +ctlVirtualDevicesPingValue OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Value of timer" + ::= { ctlVirtualDevicesPingsEntry 7 } + +ctlVirtualDevicesPingPeriod OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Period for ping" + ::= { ctlVirtualDevicesPingsEntry 8 } + +ctlVirtualDevicesPingRTT OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Round Trip Time of ping" + ::= { ctlVirtualDevicesPingsEntry 9 } + +ctlVirtualDevicesPingServer OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..256)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Server for ping" + ::= { ctlVirtualDevicesPingsEntry 10 } + +ctlVirtualDevicesPingIP OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Resolved IP for ping" + ::= { ctlVirtualDevicesPingsEntry 11 } + +ctlVirtualDevicesPingSent OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of sent pings" + ::= { ctlVirtualDevicesPingsEntry 12 } + +ctlVirtualDevicesPingReceived OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received pings" + ::= { ctlVirtualDevicesPingsEntry 13 } + +ctlVirtualDevicesPingStatus OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Status of ping" + ::= { ctlVirtualDevicesPingsEntry 14 } + +ctlVirtualDevicesTriggersTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlVirtualDevicesTriggersEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlVirtualDevices 3 } + +ctlVirtualDevicesTriggersEntry OBJECT-TYPE + SYNTAX CtlVirtualDevicesTriggersEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + INDEX { ctlVirtualDevicesTriggerId } + ::= { ctlVirtualDevicesTriggersTable 1 } + +CtlVirtualDevicesTriggersEntry ::= SEQUENCE { + ctlVirtualDevicesTriggerId + Integer32, + ctlVirtualDevicesTriggerModule + Integer32, + ctlVirtualDevicesTriggerNum + Integer32, + ctlVirtualDevicesTriggerType + OCTET STRING, + ctlVirtualDevicesTriggerName + OCTET STRING, + ctlVirtualDevicesTriggerState + OCTET STRING, + ctlVirtualDevicesTriggerValue + OCTET STRING, + ctlVirtualDevicesTriggerReverse + Integer32 +} + +ctlVirtualDevicesTriggerId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of trigger" + ::= { ctlVirtualDevicesTriggersEntry 1 } + +ctlVirtualDevicesTriggerModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of trigger" + ::= { ctlVirtualDevicesTriggersEntry 2 } + +ctlVirtualDevicesTriggerNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of trigger in module" + ::= { ctlVirtualDevicesTriggersEntry 3 } + +ctlVirtualDevicesTriggerType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of trigger" + ::= { ctlVirtualDevicesTriggersEntry 4 } + +ctlVirtualDevicesTriggerName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of trigger" + ::= { ctlVirtualDevicesTriggersEntry 5 } + +ctlVirtualDevicesTriggerState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of trigger" + ::= { ctlVirtualDevicesTriggersEntry 6 } + +ctlVirtualDevicesTriggerValue OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Value of timer" + ::= { ctlVirtualDevicesTriggersEntry 7 } + +ctlVirtualDevicesTriggerReverse OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Reverse of trigger" + ::= { ctlVirtualDevicesTriggersEntry 8 } + +ctlVirtualDevicesSnmpgetsTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlVirtualDevicesSnmpgetsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlVirtualDevices 4 } + +ctlVirtualDevicesSnmpgetsEntry OBJECT-TYPE + SYNTAX CtlVirtualDevicesSnmpgetsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + INDEX { ctlVirtualDevicesSnmpgetId } + ::= { ctlVirtualDevicesSnmpgetsTable 1 } + + +ctlVirtualDevicesAnalogsTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlVirtualDevicesAnalogsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlVirtualDevices 5 } + +ctlVirtualDevicesAnalogsEntry OBJECT-TYPE + SYNTAX CtlVirtualDevicesAnalogsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of analog" + INDEX { ctlVirtualDevicesAnalogId } + ::= { ctlVirtualDevicesAnalogsTable 1 } + +CtlVirtualDevicesAnalogsEntry ::= SEQUENCE { + ctlVirtualDevicesAnalogId + Integer32, + ctlVirtualDevicesAnalogModule + Integer32, + ctlVirtualDevicesAnalogNum + Integer32, + ctlVirtualDevicesAnalogType + OCTET STRING, + ctlVirtualDevicesAnalogName + OCTET STRING, + ctlVirtualDevicesAnalogState + OCTET STRING, + ctlVirtualDevicesAnalogValue + OCTET STRING, + ctlVirtualDevicesAnalogMin + OCTET STRING, + ctlVirtualDevicesAnalogMax + OCTET STRING, + ctlVirtualDevicesAnalogLowAlarm + OCTET STRING, + ctlVirtualDevicesAnalogLowWarning + OCTET STRING, + ctlVirtualDevicesAnalogHighWarning + OCTET STRING, + ctlVirtualDevicesAnalogHighAlarm + OCTET STRING, + ctlVirtualDevicesAnalogAt0 + OCTET STRING, + ctlVirtualDevicesAnalogAt75 + OCTET STRING, + ctlVirtualDevicesAnalogExpression + OCTET STRING, + ctlVirtualDevicesAnalogSpecific + OCTET STRING, + ctlVirtualDevicesAnalogHystType + OCTET STRING, + ctlVirtualDevicesAnalogHystValue + OCTET STRING, + ctlVirtualDevicesAnalogHystLowAlarm + Integer32, + ctlVirtualDevicesAnalogHystLowWarning + Integer32, + ctlVirtualDevicesAnalogHystNormal + Integer32, + ctlVirtualDevicesAnalogHystHighWarning + Integer32, + ctlVirtualDevicesAnalogHystHighAlarm + Integer32, + ctlVirtualDevicesAnalogValueInt + Integer32, + ctlVirtualDevicesAnalogStateInt + Integer32 +} + +ctlVirtualDevicesAnalogId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of sensor" + ::= { ctlVirtualDevicesAnalogsEntry 1 } + +ctlVirtualDevicesAnalogModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of sensor" + ::= { ctlVirtualDevicesAnalogsEntry 2 } + +ctlVirtualDevicesAnalogNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Logical number in module for sensor" + ::= { ctlVirtualDevicesAnalogsEntry 3 } + +ctlVirtualDevicesAnalogType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of sensor" + ::= { ctlVirtualDevicesAnalogsEntry 4 } + +ctlVirtualDevicesAnalogName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of sensor" + ::= { ctlVirtualDevicesAnalogsEntry 5 } + +ctlVirtualDevicesAnalogState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of sensor" + ::= { ctlVirtualDevicesAnalogsEntry 6 } + +ctlVirtualDevicesAnalogValue OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Value of sensor" + ::= { ctlVirtualDevicesAnalogsEntry 7 } + +ctlVirtualDevicesAnalogMin OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Minimum of sensor value range" + ::= { ctlVirtualDevicesAnalogsEntry 8 } + +ctlVirtualDevicesAnalogMax OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Maximum of sensor value range" + ::= { ctlVirtualDevicesAnalogsEntry 9 } + +ctlVirtualDevicesAnalogLowAlarm OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Low alarm level for sensor value" + ::= { ctlVirtualDevicesAnalogsEntry 10 } + +ctlVirtualDevicesAnalogLowWarning OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Low warning level for sensor value" + ::= { ctlVirtualDevicesAnalogsEntry 11 } + +ctlVirtualDevicesAnalogHighWarning OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "High warning level for sensor value" + ::= { ctlVirtualDevicesAnalogsEntry 12 } + +ctlVirtualDevicesAnalogHighAlarm OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "High alarm level for sensor value" + ::= { ctlVirtualDevicesAnalogsEntry 13 } + +ctlVirtualDevicesAnalogAt0 OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "At0 for sensor value" + ::= { ctlVirtualDevicesAnalogsEntry 14 } + +ctlVirtualDevicesAnalogAt75 OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "At75 for sensor value" + ::= { ctlVirtualDevicesAnalogsEntry 15 } + +ctlVirtualDevicesAnalogExpression OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..80)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Expression for sensor value" + ::= { ctlVirtualDevicesAnalogsEntry 16 } + +ctlVirtualDevicesAnalogSpecific OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Specific parameters for sensor" + ::= { ctlVirtualDevicesAnalogsEntry 17 } + +ctlVirtualDevicesAnalogHystType OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis type" + ::= { ctlVirtualDevicesAnalogsEntry 18 } + +ctlVirtualDevicesAnalogHystValue OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis value" + ::= { ctlVirtualDevicesAnalogsEntry 19 } + +ctlVirtualDevicesAnalogHystLowAlarm OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis Low Alarm time" + ::= { ctlVirtualDevicesAnalogsEntry 20 } + +ctlVirtualDevicesAnalogHystLowWarning OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis Low Warning time" + ::= { ctlVirtualDevicesAnalogsEntry 21 } + +ctlVirtualDevicesAnalogHystNormal OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis Normal time" + ::= { ctlVirtualDevicesAnalogsEntry 22 } + +ctlVirtualDevicesAnalogHystHighWarning OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis High Warning time" + ::= { ctlVirtualDevicesAnalogsEntry 23 } + +ctlVirtualDevicesAnalogHystHighAlarm OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis High Alarm time" + ::= { ctlVirtualDevicesAnalogsEntry 24 } + +ctlVirtualDevicesAnalogValueInt OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The integer value of the sensor with a multiplier of 100" + ::= { ctlVirtualDevicesAnalogsEntry 25 } + +ctlVirtualDevicesAnalogStateInt OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "An integer code that defines the state of sensor: 0-unknown, 1-normal, 2-low alarm, 3-high warning, 4-high alarm, 7-not connected, 9-low warning" + ::= { ctlVirtualDevicesAnalogsEntry 26 } + + +CtlVirtualDevicesSnmpgetsEntry ::= SEQUENCE { + ctlVirtualDevicesSnmpgetId + Integer32, + ctlVirtualDevicesSnmpgetModule + Integer32, + ctlVirtualDevicesSnmpgetNum + Integer32, + ctlVirtualDevicesSnmpgetType + OCTET STRING, + ctlVirtualDevicesSnmpgetName + OCTET STRING, + ctlVirtualDevicesSnmpgetState + OCTET STRING, + ctlVirtualDevicesSnmpgetValue + OCTET STRING, + ctlVirtualDevicesSnmpgetStatus + OCTET STRING, + ctlVirtualDevicesSnmpgetPeriod + Integer32, + ctlVirtualDevicesSnmpgetServer + OCTET STRING, + ctlVirtualDevicesSnmpgetPort + Integer32, + ctlVirtualDevicesSnmpgetCommunity + OCTET STRING, + ctlVirtualDevicesSnmpgetOid + OCTET STRING, + ctlVirtualDevicesSnmpgetVartype + OCTET STRING, + ctlVirtualDevicesSnmpgetLowAlarm + OCTET STRING, + ctlVirtualDevicesSnmpgetLowWarning + OCTET STRING, + ctlVirtualDevicesSnmpgetHighWarning + OCTET STRING, + ctlVirtualDevicesSnmpgetHighAlarm + OCTET STRING, + ctlVirtualDevicesSnmpgetExpression + OCTET STRING +} + +ctlVirtualDevicesSnmpgetId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of Snmpget" + ::= { ctlVirtualDevicesSnmpgetsEntry 1 } + +ctlVirtualDevicesSnmpgetModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of Snmpget" + ::= { ctlVirtualDevicesSnmpgetsEntry 2 } + +ctlVirtualDevicesSnmpgetNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of snmpget in module" + ::= { ctlVirtualDevicesSnmpgetsEntry 3 } + +ctlVirtualDevicesSnmpgetType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of Snmpget" + ::= { ctlVirtualDevicesSnmpgetsEntry 4 } + +ctlVirtualDevicesSnmpgetName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of Snmpget" + ::= { ctlVirtualDevicesSnmpgetsEntry 5 } + +ctlVirtualDevicesSnmpgetState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of Snmpget" + ::= { ctlVirtualDevicesSnmpgetsEntry 6 } + +ctlVirtualDevicesSnmpgetValue OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Value of Snmpget" + ::= { ctlVirtualDevicesSnmpgetsEntry 7 } + +ctlVirtualDevicesSnmpgetStatus OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Status of Snmpget" + ::= { ctlVirtualDevicesSnmpgetsEntry 8 } + +ctlVirtualDevicesSnmpgetPeriod OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Period of Snmpget" + ::= { ctlVirtualDevicesSnmpgetsEntry 9 } + +ctlVirtualDevicesSnmpgetServer OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Server of Snmpget" + ::= { ctlVirtualDevicesSnmpgetsEntry 10 } + +ctlVirtualDevicesSnmpgetPort OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Server port of Snmpget" + ::= { ctlVirtualDevicesSnmpgetsEntry 11 } + +ctlVirtualDevicesSnmpgetCommunity OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Community of Snmpget" + ::= { ctlVirtualDevicesSnmpgetsEntry 12 } + +ctlVirtualDevicesSnmpgetOid OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Oid of Snmpget" + ::= { ctlVirtualDevicesSnmpgetsEntry 13 } + +ctlVirtualDevicesSnmpgetVartype OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Vartype of Snmpget" + ::= { ctlVirtualDevicesSnmpgetsEntry 14 } + +ctlVirtualDevicesSnmpgetLowAlarm OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Low alarm level of Snmpget" + ::= { ctlVirtualDevicesSnmpgetsEntry 15 } + +ctlVirtualDevicesSnmpgetLowWarning OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Low warning level of Snmpget" + ::= { ctlVirtualDevicesSnmpgetsEntry 16 } + +ctlVirtualDevicesSnmpgetHighWarning OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "High warning level of Snmpget" + ::= { ctlVirtualDevicesSnmpgetsEntry 17 } + +ctlVirtualDevicesSnmpgetHighAlarm OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "High alarm level of Snmpget" + ::= { ctlVirtualDevicesSnmpgetsEntry 18 } + +ctlVirtualDevicesSnmpgetExpression OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Expression for Snmpget" + ::= { ctlVirtualDevicesSnmpgetsEntry 19 } + +ctlHardwareDevicesCamerasTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlHardwareDevicesCamerasEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlHardwareDevices 1 } + +ctlHardwareDevicesCamerasEntry OBJECT-TYPE + SYNTAX CtlHardwareDevicesCamerasEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of camera" + INDEX { ctlHardwareDevicesCameraId } + ::= { ctlHardwareDevicesCamerasTable 1 } + +CtlHardwareDevicesCamerasEntry ::= SEQUENCE { + ctlHardwareDevicesCameraId + Integer32, + ctlHardwareDevicesCameraModule + Integer32, + ctlHardwareDevicesCameraNum + Integer32, + ctlHardwareDevicesCameraType + OCTET STRING, + ctlHardwareDevicesCameraName + OCTET STRING, + ctlHardwareDevicesCameraState + OCTET STRING, + ctlHardwareDevicesCameraValue + OCTET STRING, + ctlHardwareDevicesCameraURL + OCTET STRING, + ctlHardwareDevicesCameraFPS + OCTET STRING, + ctlHardwareDevicesCameraResolution + OCTET STRING +} + +ctlHardwareDevicesCameraId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of camera" + ::= { ctlHardwareDevicesCamerasEntry 1 } + +ctlHardwareDevicesCameraModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of camera" + ::= { ctlHardwareDevicesCamerasEntry 2 } + +ctlHardwareDevicesCameraNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Logical number in module for camera" + ::= { ctlHardwareDevicesCamerasEntry 3 } + +ctlHardwareDevicesCameraType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of element" + ::= { ctlHardwareDevicesCamerasEntry 4 } + +ctlHardwareDevicesCameraName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of camera" + ::= { ctlHardwareDevicesCamerasEntry 5 } + +ctlHardwareDevicesCameraState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of camera" + ::= { ctlHardwareDevicesCamerasEntry 6 } + +ctlHardwareDevicesCameraValue OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set '1' for start clip" + ::= { ctlHardwareDevicesCamerasEntry 7 } + +ctlHardwareDevicesCameraURL OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..256)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IP camera URL (or device path for USB)" + ::= { ctlHardwareDevicesCamerasEntry 8 } + +ctlHardwareDevicesCameraFPS OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "FPS of camera" + ::= { ctlHardwareDevicesCamerasEntry 9 } + +ctlHardwareDevicesCameraResolution OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Resolution of camera" + ::= { ctlHardwareDevicesCamerasEntry 10 } + + +ctlHardwareDevicesModemsTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlHardwareDevicesModemsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlHardwareDevices 2 } + +ctlHardwareDevicesModemsEntry OBJECT-TYPE + SYNTAX CtlHardwareDevicesModemsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of system modem" + INDEX { ctlHardwareDevicesModemState } + ::= { ctlHardwareDevicesModemsTable 1 } + +CtlHardwareDevicesModemsEntry ::= SEQUENCE { + ctlHardwareDevicesModemState + OCTET STRING, + ctlHardwareDevicesModemStatus + OCTET STRING, + ctlHardwareDevicesModemSignal + Integer32, + ctlHardwareDevicesModemOperator + OCTET STRING, + ctlHardwareDevicesModemPosition + OCTET STRING +} + +ctlHardwareDevicesModemState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Modem state" + ::= { ctlHardwareDevicesModemsEntry 1 } + +ctlHardwareDevicesModemStatus OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Modem network registration status" + ::= { ctlHardwareDevicesModemsEntry 2 } + +ctlHardwareDevicesModemSignal OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Modem signal level in percent" + ::= { ctlHardwareDevicesModemsEntry 3 } + +ctlHardwareDevicesModemOperator OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Network operator name" + ::= { ctlHardwareDevicesModemsEntry 4 } + +ctlHardwareDevicesModemPosition OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "GPS coordinates in degrees" + ::= { ctlHardwareDevicesModemsEntry 5 } + + +ctlInternalSensorsDiscretsTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlInternalSensorsDiscretsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctIInternalSensors 1 } + +ctlInternalSensorsDiscretsEntry OBJECT-TYPE + SYNTAX CtlInternalSensorsDiscretsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of discret" + INDEX { ctlInternalSensorsDiscretId } + ::= { ctlInternalSensorsDiscretsTable 1 } + +CtlInternalSensorsDiscretsEntry ::= SEQUENCE { + ctlInternalSensorsDiscretId + Integer32, + ctlInternalSensorsDiscretModule + Integer32, + ctlInternalSensorsDiscretNum + Integer32, + ctlInternalSensorsDiscretType + OCTET STRING, + ctlInternalSensorsDiscretName + OCTET STRING, + ctlInternalSensorsDiscretState + OCTET STRING, + ctlInternalSensorsDiscretValue + Integer32, + ctlInternalSensorsDiscretReset + Integer32, + ctlInternalSensorsDiscretLevel + Integer32, + ctlInternalSensorsDiscretReverse + Integer32, + ctlInternalSensorsDiscretSpecific + OCTET STRING, + ctlInternalSensorsDiscretStateInt + Integer32 +} + +ctlInternalSensorsDiscretId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of sensor" + ::= { ctlInternalSensorsDiscretsEntry 1 } + +ctlInternalSensorsDiscretModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of sensor" + ::= { ctlInternalSensorsDiscretsEntry 2 } + +ctlInternalSensorsDiscretNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Logical number in module for sensor" + ::= { ctlInternalSensorsDiscretsEntry 3 } + +ctlInternalSensorsDiscretType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of sensor" + ::= { ctlInternalSensorsDiscretsEntry 4 } + +ctlInternalSensorsDiscretName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of sensor" + ::= { ctlInternalSensorsDiscretsEntry 5 } + +ctlInternalSensorsDiscretState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of sensor" + ::= { ctlInternalSensorsDiscretsEntry 6 } + +ctlInternalSensorsDiscretValue OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Value of sensor" + ::= { ctlInternalSensorsDiscretsEntry 7 } + +ctlInternalSensorsDiscretReset OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Reset of sensor" + ::= { ctlInternalSensorsDiscretsEntry 8 } + +ctlInternalSensorsDiscretLevel OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Level of sensor" + ::= { ctlInternalSensorsDiscretsEntry 9 } + +ctlInternalSensorsDiscretReverse OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Reverse of sensor" + ::= { ctlInternalSensorsDiscretsEntry 10 } + +ctlInternalSensorsDiscretSpecific OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Specific parameters for sensor" + ::= { ctlInternalSensorsDiscretsEntry 11 } + +ctlInternalSensorsDiscretStateInt OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "An integer code that defines the state of sensor: 0-unknown, 1-normal, 4-alarm, 7-not connected" + ::= { ctlInternalSensorsDiscretsEntry 12 } + +ctlInternalSensorsAnalogsTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlInternalSensorsAnalogsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctIInternalSensors 2 } + +ctlInternalSensorsAnalogsEntry OBJECT-TYPE + SYNTAX CtlInternalSensorsAnalogsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of analog" + INDEX { ctlInternalSensorsAnalogId } + ::= { ctlInternalSensorsAnalogsTable 1 } + +CtlInternalSensorsAnalogsEntry ::= SEQUENCE { + ctlInternalSensorsAnalogId + Integer32, + ctlInternalSensorsAnalogModule + Integer32, + ctlInternalSensorsAnalogNum + Integer32, + ctlInternalSensorsAnalogType + OCTET STRING, + ctlInternalSensorsAnalogName + OCTET STRING, + ctlInternalSensorsAnalogState + OCTET STRING, + ctlInternalSensorsAnalogValue + OCTET STRING, + ctlInternalSensorsAnalogMin + OCTET STRING, + ctlInternalSensorsAnalogMax + OCTET STRING, + ctlInternalSensorsAnalogLowAlarm + OCTET STRING, + ctlInternalSensorsAnalogLowWarning + OCTET STRING, + ctlInternalSensorsAnalogHighWarning + OCTET STRING, + ctlInternalSensorsAnalogHighAlarm + OCTET STRING, + ctlInternalSensorsAnalogAt0 + OCTET STRING, + ctlInternalSensorsAnalogAt75 + OCTET STRING, + ctlInternalSensorsAnalogExpression + OCTET STRING, + ctlInternalSensorsAnalogSpecific + OCTET STRING, + ctlInternalSensorsAnalogHystType + OCTET STRING, + ctlInternalSensorsAnalogHystValue + OCTET STRING, + ctlInternalSensorsAnalogHystLowAlarm + Integer32, + ctlInternalSensorsAnalogHystLowWarning + Integer32, + ctlInternalSensorsAnalogHystNormal + Integer32, + ctlInternalSensorsAnalogHystHighWarning + Integer32, + ctlInternalSensorsAnalogHystHighAlarm + Integer32, + ctlInternalSensorsAnalogValueInt + Integer32, + ctlInternalSensorsAnalogStateInt + Integer32 +} + +ctlInternalSensorsAnalogId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of sensor" + ::= { ctlInternalSensorsAnalogsEntry 1 } + +ctlInternalSensorsAnalogModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of sensor" + ::= { ctlInternalSensorsAnalogsEntry 2 } + +-- Num in modules for mailer + +ctlInternalSensorsAnalogNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Logical number in module for sensor" + ::= { ctlInternalSensorsAnalogsEntry 3 } + +ctlInternalSensorsAnalogType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of sensor" + ::= { ctlInternalSensorsAnalogsEntry 4 } + +ctlInternalSensorsAnalogName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of sensor" + ::= { ctlInternalSensorsAnalogsEntry 5 } + +ctlInternalSensorsAnalogState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of sensor" + ::= { ctlInternalSensorsAnalogsEntry 6 } + +ctlInternalSensorsAnalogValue OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Value of sensor" + ::= { ctlInternalSensorsAnalogsEntry 7 } + +ctlInternalSensorsAnalogMin OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Minimum of sensor value range" + ::= { ctlInternalSensorsAnalogsEntry 8 } + +ctlInternalSensorsAnalogMax OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Maximum of sensor value range" + ::= { ctlInternalSensorsAnalogsEntry 9 } + +ctlInternalSensorsAnalogLowAlarm OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Low alarm level for sensor value" + ::= { ctlInternalSensorsAnalogsEntry 10 } + +ctlInternalSensorsAnalogLowWarning OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Low warning level for sensor value" + ::= { ctlInternalSensorsAnalogsEntry 11 } + +ctlInternalSensorsAnalogHighWarning OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "High warning level for sensor value" + ::= { ctlInternalSensorsAnalogsEntry 12 } + +ctlInternalSensorsAnalogHighAlarm OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "High alarm level for sensor value" + ::= { ctlInternalSensorsAnalogsEntry 13 } + +ctlInternalSensorsAnalogAt0 OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "At0 for sensor value" + ::= { ctlInternalSensorsAnalogsEntry 14 } + +ctlInternalSensorsAnalogAt75 OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "At75 for sensor value" + ::= { ctlInternalSensorsAnalogsEntry 15 } + +ctlInternalSensorsAnalogExpression OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..80)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Expression for sensor value" + ::= { ctlInternalSensorsAnalogsEntry 16 } + +ctlInternalSensorsAnalogSpecific OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Specific parameters for sensor" + ::= { ctlInternalSensorsAnalogsEntry 17 } + +ctlInternalSensorsAnalogHystType OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis type" + ::= { ctlInternalSensorsAnalogsEntry 18 } + +ctlInternalSensorsAnalogHystValue OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis value" + ::= { ctlInternalSensorsAnalogsEntry 19 } + +ctlInternalSensorsAnalogHystLowAlarm OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis Low Alarm time" + ::= { ctlInternalSensorsAnalogsEntry 20 } + +ctlInternalSensorsAnalogHystLowWarning OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis Low Warning time" + ::= { ctlInternalSensorsAnalogsEntry 21 } + +ctlInternalSensorsAnalogHystNormal OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis Normal time" + ::= { ctlInternalSensorsAnalogsEntry 22 } + +ctlInternalSensorsAnalogHystHighWarning OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis High Warning time" + ::= { ctlInternalSensorsAnalogsEntry 23 } + +ctlInternalSensorsAnalogHystHighAlarm OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis High Alarm time" + ::= { ctlInternalSensorsAnalogsEntry 24 } + +ctlInternalSensorsAnalogValueInt OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The integer value of the sensor with a multiplier of 100" + ::= { ctlInternalSensorsAnalogsEntry 25 } + +ctlInternalSensorsAnalogStateInt OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "An integer code that defines the state of sensor: 0-unknown, 1-normal, 2-low alarm, 3-high warning, 4-high alarm, 7-not connected, 9-low warning" + ::= { ctlInternalSensorsAnalogsEntry 26 } + + +ctlInternalSensorsOutletsTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlInternalSensorsOutletsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctIInternalSensors 3 } + +ctlInternalSensorsOutletsEntry OBJECT-TYPE + SYNTAX CtlInternalSensorsOutletsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of outlet" + INDEX { ctlInternalSensorsOutletId } + ::= { ctlInternalSensorsOutletsTable 1 } + +CtlInternalSensorsOutletsEntry ::= SEQUENCE { + ctlInternalSensorsOutletId + Integer32, + ctlInternalSensorsOutletModule + Integer32, + ctlInternalSensorsOutletNum + Integer32, + ctlInternalSensorsOutletType + OCTET STRING, + ctlInternalSensorsOutletName + OCTET STRING, + ctlInternalSensorsOutletState + OCTET STRING, + ctlInternalSensorsOutletValue + Integer32, + ctlInternalSensorsOutletInitial + OCTET STRING, + ctlInternalSensorsDiscretPulse + Integer32, + ctlInternalSensorsOutletStateInt + Integer32 +} + +ctlInternalSensorsOutletId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of outlet" + ::= { ctlInternalSensorsOutletsEntry 1 } + +ctlInternalSensorsOutletModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of outlet" + ::= { ctlInternalSensorsOutletsEntry 2 } + +ctlInternalSensorsOutletNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Logical number in module for outlet" + ::= { ctlInternalSensorsOutletsEntry 3 } + +ctlInternalSensorsOutletType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of outlet" + ::= { ctlInternalSensorsOutletsEntry 4 } + +ctlInternalSensorsOutletName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of outlet" + ::= { ctlInternalSensorsOutletsEntry 5 } + +ctlInternalSensorsOutletState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of outlet" + ::= { ctlInternalSensorsOutletsEntry 6 } + +ctlInternalSensorsOutletValue OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Value of outlet: 0 to off, 1 to on, write 8 to make a pulse" + ::= { ctlInternalSensorsOutletsEntry 7 } + +ctlInternalSensorsOutletInitial OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Initial state for outlet" + ::= { ctlInternalSensorsOutletsEntry 8 } + +ctlInternalSensorsDiscretPulse OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Pulse duration for outlet" + ::= { ctlInternalSensorsOutletsEntry 9 } + +ctlInternalSensorsOutletStateInt OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "An integer code that defines the state of sensor: 0-unknown, 5-on, 6-off, 7-not connected, 8-pulse" + ::= { ctlInternalSensorsOutletsEntry 10 } + + +ctlCANSensorsDiscretsTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlCANSensorsDiscretsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlCANSensors 1 } + +ctlCANSensorsDiscretsEntry OBJECT-TYPE + SYNTAX CtlCANSensorsDiscretsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of discret sensor" + INDEX { ctlCANSensorsDiscretId } + ::= { ctlCANSensorsDiscretsTable 1 } + +CtlCANSensorsDiscretsEntry ::= SEQUENCE { + ctlCANSensorsDiscretId + Integer32, + ctlCANSensorsDiscretModule + Integer32, + ctlCANSensorsDiscretNum + Integer32, + ctlCANSensorsDiscretType + OCTET STRING, + ctlCANSensorsDiscretName + OCTET STRING, + ctlCANSensorsDiscretState + OCTET STRING, + ctlCANSensorsDiscretValue + OCTET STRING, + ctlCANSensorsDiscretReset + Integer32, + ctlCANSensorsDiscretLevel + Integer32, + ctlCANSensorsDiscretReverse + Integer32, + ctlCANSensorsDiscretSpecific + OCTET STRING, + ctlCANSensorsDiscretStateInt + Integer32 +} + +ctlCANSensorsDiscretId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of sensor" + ::= { ctlCANSensorsDiscretsEntry 1 } + +ctlCANSensorsDiscretModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of sensor" + ::= { ctlCANSensorsDiscretsEntry 2 } + +ctlCANSensorsDiscretNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Logical number in module for sensor" + ::= { ctlCANSensorsDiscretsEntry 3 } + +ctlCANSensorsDiscretType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of sensor's" + ::= { ctlCANSensorsDiscretsEntry 4 } + +ctlCANSensorsDiscretName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of sensor" + ::= { ctlCANSensorsDiscretsEntry 5 } + +ctlCANSensorsDiscretState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of sensor" + ::= { ctlCANSensorsDiscretsEntry 6 } + +ctlCANSensorsDiscretValue OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Value of sensor" + ::= { ctlCANSensorsDiscretsEntry 7 } + +ctlCANSensorsDiscretReset OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Reset of sensor" + ::= { ctlCANSensorsDiscretsEntry 8 } + +ctlCANSensorsDiscretLevel OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Level of sensor" + ::= { ctlCANSensorsDiscretsEntry 9 } + +ctlCANSensorsDiscretReverse OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Reverse of sensor" + ::= { ctlCANSensorsDiscretsEntry 10 } + +ctlCANSensorsDiscretSpecific OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set 'reset smoke' for reset smoke detectors" + ::= { ctlCANSensorsDiscretsEntry 11 } + +ctlCANSensorsDiscretStateInt OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "An integer code that defines the state of sensor: 0-unknown, 1-normal, 4-alarm, 7-not connected" + ::= { ctlCANSensorsDiscretsEntry 12 } + + +ctlCANSensorsAnalogsTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlCANSensorsAnalogsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlCANSensors 2 } + +ctlCANSensorsAnalogsEntry OBJECT-TYPE + SYNTAX CtlCANSensorsAnalogsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of analog sensor" + INDEX { ctlCANSensorsAnalogId } + ::= { ctlCANSensorsAnalogsTable 1 } + +CtlCANSensorsAnalogsEntry ::= SEQUENCE { + ctlCANSensorsAnalogId + Integer32, + ctlCANSensorsAnalogModule + Integer32, + ctlCANSensorsAnalogNum + Integer32, + ctlCANSensorsAnalogType + OCTET STRING, + ctlCANSensorsAnalogName + OCTET STRING, + ctlCANSensorsAnalogState + OCTET STRING, + ctlCANSensorsAnalogValue + OCTET STRING, + ctlCANSensorsAnalogMin + OCTET STRING, + ctlCANSensorsAnalogMax + OCTET STRING, + ctlCANSensorsAnalogLowAlarm + OCTET STRING, + ctlCANSensorsAnalogLowWarning + OCTET STRING, + ctlCANSensorsAnalogHighWarning + OCTET STRING, + ctlCANSensorsAnalogHighAlarm + OCTET STRING, + ctlCANSensorsAnalogAt0 + OCTET STRING, + ctlCANSensorsAnalogAt75 + OCTET STRING, + ctlCANSensorsAnalogExpression + OCTET STRING, + ctlCANSensorsAnalogSpecific + OCTET STRING, + ctlCANSensorsAnalogHystType + OCTET STRING, + ctlCANSensorsAnalogHystValue + OCTET STRING, + ctlCANSensorsAnalogHystLowAlarm + Integer32, + ctlCANSensorsAnalogHystLowWarning + Integer32, + ctlCANSensorsAnalogHystNormal + Integer32, + ctlCANSensorsAnalogHystHighWarning + Integer32, + ctlCANSensorsAnalogHystHighAlarm + Integer32, + ctlCANSensorsAnalogValueInt + Integer32, + ctlCANSensorsAnalogStateInt + Integer32 +} + +ctlCANSensorsAnalogId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of sensor" + ::= { ctlCANSensorsAnalogsEntry 1 } + +ctlCANSensorsAnalogModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of sensor" + ::= { ctlCANSensorsAnalogsEntry 2 } + +-- Num in modules for mailer + +ctlCANSensorsAnalogNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Logical number in module for sensor" + ::= { ctlCANSensorsAnalogsEntry 3 } + +ctlCANSensorsAnalogType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of sensor" + ::= { ctlCANSensorsAnalogsEntry 4 } + +ctlCANSensorsAnalogName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of sensor" + ::= { ctlCANSensorsAnalogsEntry 5 } + +ctlCANSensorsAnalogState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of sensor" + ::= { ctlCANSensorsAnalogsEntry 6 } + +ctlCANSensorsAnalogValue OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Value of sensor" + ::= { ctlCANSensorsAnalogsEntry 7 } + +ctlCANSensorsAnalogMin OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Minimum of sensor value range" + ::= { ctlCANSensorsAnalogsEntry 8 } + +ctlCANSensorsAnalogMax OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Maximum of sensor value range" + ::= { ctlCANSensorsAnalogsEntry 9 } + +ctlCANSensorsAnalogLowAlarm OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Low alarm level for sensor value" + ::= { ctlCANSensorsAnalogsEntry 10 } + +ctlCANSensorsAnalogLowWarning OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Low warning level for sensor value" + ::= { ctlCANSensorsAnalogsEntry 11 } + +ctlCANSensorsAnalogHighWarning OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "High warning level for sensor value" + ::= { ctlCANSensorsAnalogsEntry 12 } + +ctlCANSensorsAnalogHighAlarm OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "High alarm level for sensor value" + ::= { ctlCANSensorsAnalogsEntry 13 } + +ctlCANSensorsAnalogAt0 OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "At0 for sensor value" + ::= { ctlCANSensorsAnalogsEntry 14 } + +ctlCANSensorsAnalogAt75 OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "At75 for sensor value" + ::= { ctlCANSensorsAnalogsEntry 15 } + +ctlCANSensorsAnalogExpression OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..80)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Expression for sensor value" + ::= { ctlCANSensorsAnalogsEntry 16 } + +ctlCANSensorsAnalogSpecific OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Specific parameters for sensor" + ::= { ctlCANSensorsAnalogsEntry 17 } + +ctlCANSensorsAnalogHystType OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis type" + ::= { ctlCANSensorsAnalogsEntry 18 } + +ctlCANSensorsAnalogHystValue OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis value" + ::= { ctlCANSensorsAnalogsEntry 19 } + +ctlCANSensorsAnalogHystLowAlarm OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis Low Alarm time" + ::= { ctlCANSensorsAnalogsEntry 20 } + +ctlCANSensorsAnalogHystLowWarning OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis Low Warning time" + ::= { ctlCANSensorsAnalogsEntry 21 } + +ctlCANSensorsAnalogHystNormal OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis Normal time" + ::= { ctlCANSensorsAnalogsEntry 22 } + +ctlCANSensorsAnalogHystHighWarning OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis High Warning time" + ::= { ctlCANSensorsAnalogsEntry 23 } + +ctlCANSensorsAnalogHystHighAlarm OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis High Alarm time" + ::= { ctlCANSensorsAnalogsEntry 24 } + +ctlCANSensorsAnalogValueInt OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The integer value of the sensor with a multiplier of 100" + ::= { ctlCANSensorsAnalogsEntry 25 } + +ctlCANSensorsAnalogStateInt OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "An integer code that defines the state of sensor: 0-unknown, 1-normal, 2-low alarm, 3-high warning, 4-high alarm, 7-not connected, 9-low warning" + ::= { ctlCANSensorsAnalogsEntry 26 } + + +ctlCANSensorsOutletsTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlCANSensorsOutletsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlCANSensors 3 } + +ctlCANSensorsOutletsEntry OBJECT-TYPE + SYNTAX CtlCANSensorsOutletsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of outlet" + INDEX { ctlCANSensorsOutletId } + ::= { ctlCANSensorsOutletsTable 1 } + +CtlCANSensorsOutletsEntry ::= SEQUENCE { + ctlCANSensorsOutletId + Integer32, + ctlCANSensorsOutletModule + Integer32, + ctlCANSensorsOutletNum + Integer32, + ctlCANSensorsOutletType + OCTET STRING, + ctlCANSensorsOutletName + OCTET STRING, + ctlCANSensorsOutletState + OCTET STRING, + ctlCANSensorsOutletValue + OCTET STRING, + ctlCANSensorsOutletInitial + OCTET STRING, + ctlCANSensorsOutletPulse + Integer32, + ctlCANSensorsOutletStateInt + Integer32 +} + +ctlCANSensorsOutletId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of outlet" + ::= { ctlCANSensorsOutletsEntry 1 } + +ctlCANSensorsOutletModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of outlet" + ::= { ctlCANSensorsOutletsEntry 2 } + +ctlCANSensorsOutletNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Logical number in module for outlet" + ::= { ctlCANSensorsOutletsEntry 3 } + +ctlCANSensorsOutletType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of outlet" + ::= { ctlCANSensorsOutletsEntry 4 } + +ctlCANSensorsOutletName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of outlet" + ::= { ctlCANSensorsOutletsEntry 5 } + +ctlCANSensorsOutletState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of outlet" + ::= { ctlCANSensorsOutletsEntry 6 } + +ctlCANSensorsOutletValue OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Value of outlet" + ::= { ctlCANSensorsOutletsEntry 7 } + +ctlCANSensorsOutletInitial OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Initial state for outlet" + ::= { ctlCANSensorsOutletsEntry 8 } + +ctlCANSensorsOutletPulse OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Pulse duration for outlet" + ::= { ctlCANSensorsOutletsEntry 9 } + +ctlCANSensorsOutletStateInt OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "An integer code that defines the state of sensor: 0-unknown, 5-on, 6-off, 7-not connected, 8-pulse" + ::= { ctlCANSensorsOutletsEntry 10 } + + +ctlLoRaSensorsDiscretsTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlLoRaSensorsDiscretsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlLoRaSensors 1 } + +ctlLoRaSensorsDiscretsEntry OBJECT-TYPE + SYNTAX CtlLoRaSensorsDiscretsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of discret sensor" + INDEX { ctlLoRaSensorsDiscretId } + ::= { ctlLoRaSensorsDiscretsTable 1 } + +CtlLoRaSensorsDiscretsEntry ::= SEQUENCE { + ctlLoRaSensorsDiscretId + Integer32, + ctlLoRaSensorsDiscretModule + Integer32, + ctlLoRaSensorsDiscretNum + Integer32, + ctlLoRaSensorsDiscretType + OCTET STRING, + ctlLoRaSensorsDiscretName + OCTET STRING, + ctlLoRaSensorsDiscretState + OCTET STRING, + ctlLoRaSensorsDiscretValue + OCTET STRING, + ctlLoRaSensorsDiscretReset + Integer32, + ctlLoRaSensorsDiscretLevel + Integer32, + ctlLoRaSensorsDiscretReverse + Integer32, + ctlLoRaSensorsDiscretSpecific + OCTET STRING, + ctlLoRaSensorsDiscretStateInt + Integer32 +} + +ctlLoRaSensorsDiscretId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of sensor" + ::= { ctlLoRaSensorsDiscretsEntry 1 } + +ctlLoRaSensorsDiscretModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of sensor" + ::= { ctlLoRaSensorsDiscretsEntry 2 } + +ctlLoRaSensorsDiscretNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Logical number in module for sensor" + ::= { ctlLoRaSensorsDiscretsEntry 3 } + +ctlLoRaSensorsDiscretType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of sensor's" + ::= { ctlLoRaSensorsDiscretsEntry 4 } + +ctlLoRaSensorsDiscretName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of sensor" + ::= { ctlLoRaSensorsDiscretsEntry 5 } + +ctlLoRaSensorsDiscretState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of sensor" + ::= { ctlLoRaSensorsDiscretsEntry 6 } + +ctlLoRaSensorsDiscretValue OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Value of sensor" + ::= { ctlLoRaSensorsDiscretsEntry 7 } + +ctlLoRaSensorsDiscretReset OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Reset of sensor" + ::= { ctlLoRaSensorsDiscretsEntry 8 } + +ctlLoRaSensorsDiscretLevel OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Level of sensor" + ::= { ctlLoRaSensorsDiscretsEntry 9 } + +ctlLoRaSensorsDiscretReverse OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Reverse of sensor" + ::= { ctlLoRaSensorsDiscretsEntry 10 } + +ctlLoRaSensorsDiscretSpecific OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set 'reset smoke' for reset smoke detectors" + ::= { ctlLoRaSensorsDiscretsEntry 11 } + +ctlLoRaSensorsDiscretStateInt OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "An integer code that defines the state of sensor: 0-unknown, 1-normal, 4-alarm, 7-not connected" + ::= { ctlLoRaSensorsDiscretsEntry 12 } + + +ctlLoRaSensorsAnalogsTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlLoRaSensorsAnalogsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlLoRaSensors 2 } + +ctlLoRaSensorsAnalogsEntry OBJECT-TYPE + SYNTAX CtlLoRaSensorsAnalogsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of analog sensor" + INDEX { ctlLoRaSensorsAnalogId } + ::= { ctlLoRaSensorsAnalogsTable 1 } + +CtlLoRaSensorsAnalogsEntry ::= SEQUENCE { + ctlLoRaSensorsAnalogId + Integer32, + ctlLoRaSensorsAnalogModule + Integer32, + ctlLoRaSensorsAnalogNum + Integer32, + ctlLoRaSensorsAnalogType + OCTET STRING, + ctlLoRaSensorsAnalogName + OCTET STRING, + ctlLoRaSensorsAnalogState + OCTET STRING, + ctlLoRaSensorsAnalogValue + OCTET STRING, + ctlLoRaSensorsAnalogMin + OCTET STRING, + ctlLoRaSensorsAnalogMax + OCTET STRING, + ctlLoRaSensorsAnalogLowAlarm + OCTET STRING, + ctlLoRaSensorsAnalogLowWarning + OCTET STRING, + ctlLoRaSensorsAnalogHighWarning + OCTET STRING, + ctlLoRaSensorsAnalogHighAlarm + OCTET STRING, + ctlLoRaSensorsAnalogAt0 + OCTET STRING, + ctlLoRaSensorsAnalogAt75 + OCTET STRING, + ctlLoRaSensorsAnalogExpression + OCTET STRING, + ctlLoRaSensorsAnalogSpecific + OCTET STRING, + ctlLoRaSensorsAnalogHystType + OCTET STRING, + ctlLoRaSensorsAnalogHystValue + OCTET STRING, + ctlLoRaSensorsAnalogHystLowAlarm + Integer32, + ctlLoRaSensorsAnalogHystLowWarning + Integer32, + ctlLoRaSensorsAnalogHystNormal + Integer32, + ctlLoRaSensorsAnalogHystHighWarning + Integer32, + ctlLoRaSensorsAnalogHystHighAlarm + Integer32, + ctlLoRaSensorsAnalogValueInt + Integer32, + ctlLoRaSensorsAnalogStateInt + Integer32 +} + +ctlLoRaSensorsAnalogId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of sensor" + ::= { ctlLoRaSensorsAnalogsEntry 1 } + +ctlLoRaSensorsAnalogModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of sensor" + ::= { ctlLoRaSensorsAnalogsEntry 2 } + +-- Num in modules for mailer + +ctlLoRaSensorsAnalogNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Logical number in module for sensor" + ::= { ctlLoRaSensorsAnalogsEntry 3 } + +ctlLoRaSensorsAnalogType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of sensor" + ::= { ctlLoRaSensorsAnalogsEntry 4 } + +ctlLoRaSensorsAnalogName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of sensor" + ::= { ctlLoRaSensorsAnalogsEntry 5 } + +ctlLoRaSensorsAnalogState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of sensor" + ::= { ctlLoRaSensorsAnalogsEntry 6 } + +ctlLoRaSensorsAnalogValue OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Value of sensor" + ::= { ctlLoRaSensorsAnalogsEntry 7 } + +ctlLoRaSensorsAnalogMin OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Minimum of sensor value range" + ::= { ctlLoRaSensorsAnalogsEntry 8 } + +ctlLoRaSensorsAnalogMax OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Maximum of sensor value range" + ::= { ctlLoRaSensorsAnalogsEntry 9 } + +ctlLoRaSensorsAnalogLowAlarm OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Low alarm level for sensor value" + ::= { ctlLoRaSensorsAnalogsEntry 10 } + +ctlLoRaSensorsAnalogLowWarning OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Low warning level for sensor value" + ::= { ctlLoRaSensorsAnalogsEntry 11 } + +ctlLoRaSensorsAnalogHighWarning OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "High warning level for sensor value" + ::= { ctlLoRaSensorsAnalogsEntry 12 } + +ctlLoRaSensorsAnalogHighAlarm OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "High alarm level for sensor value" + ::= { ctlLoRaSensorsAnalogsEntry 13 } + +ctlLoRaSensorsAnalogAt0 OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "At0 for sensor value" + ::= { ctlLoRaSensorsAnalogsEntry 14 } + +ctlLoRaSensorsAnalogAt75 OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "At75 for sensor value" + ::= { ctlLoRaSensorsAnalogsEntry 15 } + +ctlLoRaSensorsAnalogExpression OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..80)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Expression for sensor value" + ::= { ctlLoRaSensorsAnalogsEntry 16 } + +ctlLoRaSensorsAnalogSpecific OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Specific parameters for sensor" + ::= { ctlLoRaSensorsAnalogsEntry 17 } + +ctlLoRaSensorsAnalogHystType OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis type" + ::= { ctlLoRaSensorsAnalogsEntry 18 } + +ctlLoRaSensorsAnalogHystValue OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(1..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis value" + ::= { ctlLoRaSensorsAnalogsEntry 19 } + +ctlLoRaSensorsAnalogHystLowAlarm OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis Low Alarm time" + ::= { ctlLoRaSensorsAnalogsEntry 20 } + +ctlLoRaSensorsAnalogHystLowWarning OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis Low Warning time" + ::= { ctlLoRaSensorsAnalogsEntry 21 } + +ctlLoRaSensorsAnalogHystNormal OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis Normal time" + ::= { ctlLoRaSensorsAnalogsEntry 22 } + +ctlLoRaSensorsAnalogHystHighWarning OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis High Warning time" + ::= { ctlLoRaSensorsAnalogsEntry 23 } + +ctlLoRaSensorsAnalogHystHighAlarm OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hysteresis High Alarm time" + ::= { ctlLoRaSensorsAnalogsEntry 24 } + +ctlLoRaSensorsAnalogValueInt OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The integer value of the sensor with a multiplier of 100" + ::= { ctlLoRaSensorsAnalogsEntry 25 } + +ctlLoRaSensorsAnalogStateInt OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "An integer code that defines the state of sensor: 0-unknown, 1-normal, 2-low alarm, 3-high warning, 4-high alarm, 7-not connected, 9-low warning" + ::= { ctlLoRaSensorsAnalogsEntry 26 } + + +ctlLoRaSensorsOutletsTable OBJECT-TYPE + SYNTAX SEQUENCE OF CtlLoRaSensorsOutletsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { ctlLoRaSensors 3 } + +ctlLoRaSensorsOutletsEntry OBJECT-TYPE + SYNTAX CtlLoRaSensorsOutletsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry of outlet" + INDEX { ctlLoRaSensorsOutletId } + ::= { ctlLoRaSensorsOutletsTable 1 } + +CtlLoRaSensorsOutletsEntry ::= SEQUENCE { + ctlLoRaSensorsOutletId + Integer32, + ctlLoRaSensorsOutletModule + Integer32, + ctlLoRaSensorsOutletNum + Integer32, + ctlLoRaSensorsOutletType + OCTET STRING, + ctlLoRaSensorsOutletName + OCTET STRING, + ctlLoRaSensorsOutletState + OCTET STRING, + ctlLoRaSensorsOutletValue + OCTET STRING, + ctlLoRaSensorsOutletInitial + OCTET STRING, + ctlLoRaSensorsOutletPulse + Integer32, + ctlLoRaSensorsOutletStateInt + Integer32 +} + +ctlLoRaSensorsOutletId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Id of outlet" + ::= { ctlLoRaSensorsOutletsEntry 1 } + +ctlLoRaSensorsOutletModule OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module of outlet" + ::= { ctlLoRaSensorsOutletsEntry 2 } + +ctlLoRaSensorsOutletNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Logical number in module for outlet" + ::= { ctlLoRaSensorsOutletsEntry 3 } + +ctlLoRaSensorsOutletType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of outlet" + ::= { ctlLoRaSensorsOutletsEntry 4 } + +ctlLoRaSensorsOutletName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(2..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of outlet" + ::= { ctlLoRaSensorsOutletsEntry 5 } + +ctlLoRaSensorsOutletState OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "State of outlet" + ::= { ctlLoRaSensorsOutletsEntry 6 } + +ctlLoRaSensorsOutletValue OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Value of outlet" + ::= { ctlLoRaSensorsOutletsEntry 7 } + +ctlLoRaSensorsOutletInitial OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Initial state for outlet" + ::= { ctlLoRaSensorsOutletsEntry 8 } + +ctlLoRaSensorsOutletPulse OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Pulse duration for outlet" + ::= { ctlLoRaSensorsOutletsEntry 9 } + +ctlLoRaSensorsOutletStateInt OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "An integer code that defines the state of sensor: 0-unknown, 5-on, 6-off, 7-not connected, 8-pulse" + ::= { ctlLoRaSensorsOutletsEntry 10 } + +END diff --git a/mibs/equallogic/EQL-DCB-MIB b/mibs/equallogic/EQL-DCB-MIB index 7d996cbb467..c3bf53211d9 100644 --- a/mibs/equallogic/EQL-DCB-MIB +++ b/mibs/equallogic/EQL-DCB-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) EQL-DCB-MIB DEFINITIONS ::= BEGIN @@ -23,7 +23,7 @@ IMPORTS ; eqlDcbMib MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO "Contact: Customer Support diff --git a/mibs/equallogic/EQL-LLDP-MIB b/mibs/equallogic/EQL-LLDP-MIB index 8a7fb5c195e..32dbb78c792 100644 --- a/mibs/equallogic/EQL-LLDP-MIB +++ b/mibs/equallogic/EQL-LLDP-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) EQL-LLDP-MIB DEFINITIONS ::= BEGIN @@ -24,7 +24,7 @@ IMPORTS ; eqlLldpMib MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO "Contact: Customer Support diff --git a/mibs/equallogic/EQLACCESS-MIB b/mibs/equallogic/EQLACCESS-MIB index 04da80727cb..6f473eb9c85 100644 --- a/mibs/equallogic/EQLACCESS-MIB +++ b/mibs/equallogic/EQLACCESS-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) EQLACCESS-MIB DEFINITIONS ::= BEGIN IMPORTS @@ -18,7 +18,7 @@ IMPORTS FROM EQLVOLUME-MIB; eqlAccessModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "Dell Inc." CONTACT-INFO "Contact: Customer Support @@ -83,7 +83,8 @@ EqlAccessGroupEntry ::= SEQUENCE { eqlAccessGroupDescription UTFString, eqlAccessGroupAdminKey Unsigned32, eqlAccessGroupType INTEGER, - eqlAccessGroupPrivacyFlag INTEGER + eqlAccessGroupPrivacyFlag INTEGER, + eqlAccessGroupTypeThinimport INTEGER } @@ -175,6 +176,17 @@ eqlAccessGroupPrivacyFlag OBJECT-TYPE DEFVAL { private } ::= { eqlAccessGroupEntry 9 } +eqlAccessGroupTypeThinimport OBJECT-TYPE + SYNTAX INTEGER { + non-thinimport(1), + thinimport(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This field is used to mark if an access group is non-thinimport + or thinimport." + DEFVAL { non-thinimport } + ::= { eqlAccessGroupEntry 10 } ---------------------------------------------------------------------- -- Access Group by Type Table -- @@ -321,7 +333,8 @@ EqlAccessPointEntry ::= SEQUENCE { eqlAccessPointRowStatus RowStatus, eqlAccessPointInitiatorName UTFString, eqlAccessPointInitiatorCHAPUserName UTFString, - eqlAccessPointDescription UTFString + eqlAccessPointDescription UTFString, + eqlAccessPointTypeThinimport INTEGER } eqlAccessPointIndex OBJECT-TYPE @@ -363,6 +376,17 @@ eqlAccessPointDescription OBJECT-TYPE DEFVAL { "" } ::= { eqlAccessPointEntry 5 } +eqlAccessPointTypeThinimport OBJECT-TYPE + SYNTAX INTEGER { + non-thinimport(1), + thinimport(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This field is used to mark if an access group is non-thinimport + or thinimport." + DEFVAL { non-thinimport } + ::= { eqlAccessPointEntry 6 } ---------------------------------------------------------------------- -- Access Point IP Address Table @@ -393,7 +417,8 @@ EqlAccessPointAddrEntry ::= SEQUENCE { eqlAccessPointAddrInitiatorAddrType InetAddressType, eqlAccessPointAddrInitiatorAddr InetAddress, eqlAccessPointAddrInitiatorAddrWildcardType InetAddressType, - eqlAccessPointAddrInitiatorAddrWildcard InetAddress + eqlAccessPointAddrInitiatorAddrWildcard InetAddress, + eqlAccessPointAddrTypeThinimport INTEGER } eqlAccessPointAddrIndex OBJECT-TYPE @@ -446,6 +471,18 @@ eqlAccessPointAddrInitiatorAddrWildcard OBJECT-TYPE When x is 0, then that portion of the initiator's ip address does not have to match. " ::= { eqlAccessPointAddrEntry 6 } +eqlAccessPointAddrTypeThinimport OBJECT-TYPE + SYNTAX INTEGER { + non-thinimport(1), + thinimport(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This field is used to mark if an access point is non-thinimport + or thinimport." + DEFVAL { non-thinimport } + ::= { eqlAccessPointAddrEntry 7 } + ---------------------------------------------------------------------- -- Access Group Object Association Table -- diff --git a/mibs/equallogic/EQLAGENT-MIB b/mibs/equallogic/EQLAGENT-MIB index 80d3acb6bea..2995110373e 100644 --- a/mibs/equallogic/EQLAGENT-MIB +++ b/mibs/equallogic/EQLAGENT-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) EQLAGENT-MIB DEFINITIONS ::= BEGIN IMPORTS @@ -19,7 +19,7 @@ IMPORTS eqlAgentModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO "Contact: Customer Support diff --git a/mibs/equallogic/EQLAPPLIANCE-MIB b/mibs/equallogic/EQLAPPLIANCE-MIB index 7426d051c99..794a8230a8e 100644 --- a/mibs/equallogic/EQLAPPLIANCE-MIB +++ b/mibs/equallogic/EQLAPPLIANCE-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) -- -- Appliances that equallogic firmware supports @@ -24,7 +24,7 @@ IMPORTS eqlGroupId FROM EQLGROUP-MIB; eqlApplianceModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO "Contact: Customer Support @@ -37,7 +37,7 @@ eqlApplianceModule MODULE-IDENTITY DESCRIPTION "Appliances information. - Copyright (c) 2004-2013 by Dell Inc. + Copyright (c) 2004-2014 by Dell Inc. All rights reserved. This software may not be copied, disclosed, transferred, or used except in accordance with a license granted @@ -81,34 +81,35 @@ eqlApplianceEntry OBJECT-TYPE EqlApplianceEntry ::= SEQUENCE { - eqlApplianceIndex Unsigned32, - eqlApplianceRowStatus RowStatus, - eqlApplianceName OCTET STRING, - eqlApplianceType INTEGER, - eqlApplianceState INTEGER, - eqlApplianceDescription DisplayString, - eqlApplianceMgmtAddressType InetAddressType, - eqlApplianceMgmtAddress InetAddress, - eqlApplianceMgmtPort Unsigned32, - eqlApplianceMajorVersion Unsigned32, - eqlApplianceMinorVersion Unsigned32, - eqlApplianceMaintVersion Unsigned32, - eqlApplianceVendorId OCTET STRING, - eqlApplianceSharedSecret OCTET STRING, - eqlApplianceUserName UTFString, - eqlApplianceNumberOfNodes Unsigned32, - eqlApplianceUniqueID Unsigned32, - eqlApplianceConfigStatus Unsigned32, - eqlApplianceAction INTEGER, - eqlApplianceAdminStatus INTEGER, - eqlApplianceGatewayAddrType InetAddressType, - eqlApplianceGatewayAddr InetAddress, - eqlApplianceLastScheduleIndex Unsigned32, - eqlApplianceMPV Unsigned32, - eqlApplianceEnableFTP INTEGER, - eqlApplianceDesiredServiceMode INTEGER, - eqlApplianceServiceModeStatus INTEGER, - eqlApplianceRequestId Counter64 + eqlApplianceIndex Unsigned32, + eqlApplianceRowStatus RowStatus, + eqlApplianceName OCTET STRING, + eqlApplianceType INTEGER, + eqlApplianceState INTEGER, + eqlApplianceDescription DisplayString, + eqlApplianceMgmtAddressType InetAddressType, + eqlApplianceMgmtAddress InetAddress, + eqlApplianceMgmtPort Unsigned32, + eqlApplianceMajorVersion Unsigned32, + eqlApplianceMinorVersion Unsigned32, + eqlApplianceMaintVersion Unsigned32, + eqlApplianceVendorId OCTET STRING, + eqlApplianceSharedSecret OCTET STRING, + eqlApplianceUserName UTFString, + eqlApplianceNumberOfNodes Unsigned32, + eqlApplianceUniqueID Unsigned32, + eqlApplianceConfigStatus Unsigned32, + eqlApplianceAction INTEGER, + eqlApplianceAdminStatus INTEGER, + eqlApplianceGatewayAddrType InetAddressType, + eqlApplianceGatewayAddr InetAddress, + eqlApplianceLastScheduleIndex Unsigned32, + eqlApplianceMPV Unsigned32, + eqlApplianceEnableFTP INTEGER, + eqlApplianceDesiredServiceMode INTEGER, + eqlApplianceServiceModeStatus INTEGER, + eqlApplianceRequestId Counter64, + eqlApplianceSanClientNetworkOverlap TruthValue } eqlApplianceIndex OBJECT-TYPE @@ -166,7 +167,8 @@ eqlApplianceState OBJECT-TYPE cluster-name(1015), start-nas-appliance-create(1016), nas-appliance-create-in-progress(1017), - start-volume-discovery(1018) + start-volume-discovery(1018), + send-nas-eula-approval(1019) } MAX-ACCESS read-create STATUS current @@ -376,6 +378,17 @@ eqlApplianceRequestId OBJECT-TYPE DESCRIPTION "This field represents the operation request identifier." ::= { eqlApplianceEntry 28 } + +eqlApplianceSanClientNetworkOverlap OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This field indicates that if there is an overlap in the SAN and Client network. + Customer should be warned if there is an overlap as these network should be + segregated from each other." + DEFVAL { false } + ::= { eqlApplianceEntry 29 } + -------------------------------------------------------------------------------------------- eqlApplianceUniqueIDTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlApplianceUniqueIDEntry @@ -714,7 +727,8 @@ eqlApplianceNodeConfigState OBJECT-TYPE client-network-complete(1004), gateway-config-complete(1005), configured(1006), - detached(1007) + detached(1007), + client-secondary-network-complete(1008) } MAX-ACCESS read-create STATUS current @@ -808,14 +822,16 @@ EqlApplianceNetworksEntry ::= eqlApplianceNetworkType INTEGER, eqlApplianceNetworkID Unsigned32, eqlApplianceNetworkName OCTET STRING, - eqlApplianceNetworkBlockIPAddressType InetAddressType, - eqlApplianceNetworkBlockIPAddress InetAddress, - eqlApplianceNetworkBlockNetmaskAddrType InetAddressType, - eqlApplianceNetworkBlockNetmaskAddr InetAddress, + eqlApplianceNetworkBlockIPAddressType InetAddressType, + eqlApplianceNetworkBlockIPAddress InetAddress, + eqlApplianceNetworkBlockNetmaskAddrType InetAddressType, + eqlApplianceNetworkBlockNetmaskAddr InetAddress, eqlApplianceNetworkVLANTag Unsigned32, eqlApplianceNetworkAdminState INTEGER, eqlApplianceNetworkMTUSize Unsigned32, - eqlApplianceNetworkBondingMode INTEGER + eqlApplianceNetworkBondingMode INTEGER, + eqlApplianceNetworkGeneratedName OCTET STRING, + eqlApplianceNetworkGeneratedNameNew OCTET STRING } eqlApplianceNetworkRowStatus OBJECT-TYPE @@ -830,7 +846,8 @@ eqlApplianceNetworkType OBJECT-TYPE internal(1), san(2), client(3), - backplane(4) + backplane(4), + client-secondary(5) } MAX-ACCESS not-accessible STATUS current @@ -889,8 +906,9 @@ eqlApplianceNetworkVLANTag OBJECT-TYPE eqlApplianceNetworkAdminState OBJECT-TYPE SYNTAX INTEGER { creating(1), - modifying(2), - done(3) + modifying(2), + done(3), + deleting(4) } MAX-ACCESS read-create STATUS current @@ -915,6 +933,19 @@ eqlApplianceNetworkBondingMode OBJECT-TYPE For spartan, only client network supports modifying the bonding mode.Default mode is ALB (adaptive load balancing) for client network. User can change this mode to LACP(802.3 ad) later." ::= { eqlApplianceNetworksEntry 12 } +eqlApplianceNetworkGeneratedName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..12)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the autogenerated name for a network. This is only applicable for client and client secondary subnets" + ::= { eqlApplianceNetworksEntry 13 } + +eqlApplianceNetworkGeneratedNameNew OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..128)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the autogenerated name for a network. This is only applicable for client and client secondary subnets. This is used from V4 onwards because of size limitation." + ::= { eqlApplianceNetworksEntry 14 } -------------------------------------------------------------------------------------------- eqlApplianceIPTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlApplianceIPEntry @@ -1074,7 +1105,8 @@ eqlApplianceOpsType OBJECT-TYPE nas-cluster-update(16), restore-config(17), service-mode-change(18), - container-cfg-modify(19) + container-cfg-modify(19), + nas-cluster-post-upgrade-validation(20) } MAX-ACCESS not-accessible STATUS current @@ -1478,7 +1510,6 @@ eqlApplianceStatsEntry OBJECT-TYPE EqlApplianceStatsEntry ::= SEQUENCE { - eqlApplianceStatsTotalCapacity Counter64, eqlApplianceStatsTotalAllocated Counter64, eqlApplianceStatsTotalUsed Counter64, @@ -1488,7 +1519,11 @@ EqlApplianceStatsEntry ::= eqlApplianceStatsNumberOfNfsExports Counter64, eqlApplianceStatsNumberOfCifsShares Counter64, eqlApplianceStatsNumberOfSnapshots Counter64, - eqlApplianceStatsTotalOptimizationSpaceSavings Counter64 + eqlApplianceStatsTotalOptimizationSpaceSavings Counter64, + eqlApplianceStatsTotalFreeReserved Counter64, + eqlApplianceStatsTotalFreeUnreserved Counter64, + eqlApplianceStatsTotalOverCommitted Counter64, + eqlApplianceStatsNumberOfClonedContainers Counter64 } @@ -1576,6 +1611,35 @@ eqlApplianceStatsTotalOptimizationSpaceSavings OBJECT-TYPE ::= { eqlApplianceStatsEntry 10 } +eqlApplianceStatsTotalFreeReserved OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field indicates the total mega bytes of free space reserved." + ::= { eqlApplianceStatsEntry 11 } + + +eqlApplianceStatsTotalFreeUnreserved OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field indicates the total mega bytes of free space unreserved ." + ::= { eqlApplianceStatsEntry 12 } + +eqlApplianceStatsTotalOverCommitted OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field indeicates the total mega bytes of over committed space." + ::= { eqlApplianceStatsEntry 13 } + +eqlApplianceStatsNumberOfClonedContainers OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Total number of cloned containers" + ::= { eqlApplianceStatsEntry 14 } + -------------------------------------------------------------------------------------------- eqlApplianceNodeStatusTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlApplianceNodeStatusEntry @@ -1648,7 +1712,8 @@ EqlApplianceMultiStateOpsEntry ::= eqlApplianceMultiStateOpsAction INTEGER, eqlApplianceMultiStateOpsCurNodeIndex Unsigned32, eqlApplianceMultiStateOpsLongRunningOp TruthValue, - eqlApplianceMultiStateOpsRequestId Counter64 + eqlApplianceMultiStateOpsRequestId Counter64, + eqlApplianceMultiStateOpsGenericParam OCTET STRING } eqlApplianceMultiStateOpsIndex OBJECT-TYPE @@ -1775,6 +1840,7 @@ eqlApplianceMultiStateOpsState OBJECT-TYPE add-pair-start-volume-discovery(1522), add-pair-start-nas-appliance-join(1523), add-pair-nas-appliance-join-inprogress(1524), + add-pair-cluster-client-secondary-network(1525), -- 1601 to 1699 are for delete operation delete-inprogress(1601), local-delete-inprogress(1602), @@ -1793,6 +1859,7 @@ eqlApplianceMultiStateOpsState OBJECT-TYPE rename-cluster(1712), cifs-operation(1713), nas-cluster-update-start(1714), + modify-client-secondary-network(1715), -- 1801 to 1899 are for NAS Diagnostics nas-diags-init(1801), nas-diags-start-general(1802), @@ -1824,7 +1891,11 @@ eqlApplianceMultiStateOpsState OBJECT-TYPE restore-done (2016), -- 2101 to 2199 for service mode change operation service-mode-change-inprogress (2101), - container-cfg-modify-inprogress (2200) + container-cfg-modify-inprogress (2200), + cluster-connection-check (2201), + -- v4 update new labels + nas-cluster-update-inprogress-install (2300), + nas-cluster-update-inprogress-start-new-version (2301) } MAX-ACCESS read-create STATUS current @@ -1873,6 +1944,13 @@ eqlApplianceMultiStateOpsRequestId OBJECT-TYPE DESCRIPTION "This field represents the the operation request identifier." ::= { eqlApplianceMultiStateOpsEntry 14 } +eqlApplianceMultiStateOpsGenericParam OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Additional data for NAS cluster diagnostics and nas pool resize." + ::= { eqlApplianceMultiStateOpsEntry 15 } + -------------------------------------------------------------------------------------------- eqlApplianceNdmpTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlApplianceNdmpEntry @@ -2196,15 +2274,22 @@ eqlApplianceCredentialsDatabaseEntry OBJECT-TYPE EqlApplianceCredentialsDatabaseEntry ::= SEQUENCE { - eqlApplianceCredentialsDatabaseRowStatus RowStatus, - eqlApplianceCredentialsDatabaseType INTEGER, - eqlApplianceCredentialsDatabaseLdapBaseDn OCTET STRING, - eqlApplianceCredentialsDatabaseLdapServerAddress OCTET STRING, - eqlApplianceCredentialsDatabaseNisDomain OCTET STRING, - eqlApplianceCredentialsDatabaseNisServerAddress OCTET STRING - } + eqlApplianceCredentialsDatabaseRowStatus RowStatus, + eqlApplianceCredentialsDatabaseType INTEGER, + eqlApplianceCredentialsDatabaseLdapBaseDn OCTET STRING, + eqlApplianceCredentialsDatabaseLdapServerAddress OCTET STRING, + eqlApplianceCredentialsDatabaseNisDomain OCTET STRING, + eqlApplianceCredentialsDatabaseNisServerAddress OCTET STRING, + eqlApplianceCredentialsDatabaseLDAPServerAnonymousAccessDisabled TruthValue, + eqlApplianceCredentialsDatabaseLDAPServerBindDN OCTET STRING, + eqlApplianceCredentialsDatabaseLDAPServerBindPassword OCTET STRING, + eqlApplianceCredentialsDatabaseLDAPServerSecureProtocol INTEGER, + eqlApplianceCredentialsDatabaseLDAPServerExtendedSchema TruthValue, + eqlApplianceCredentialsDatabaseLDAPCertificateFileName OCTET STRING, + eqlApplianceCredentialsDatabaseLDAPServerIpOrFqdn OCTET STRING + } + - eqlApplianceCredentialsDatabaseRowStatus OBJECT-TYPE SYNTAX RowStatus MAX-ACCESS read-create @@ -2235,8 +2320,8 @@ eqlApplianceCredentialsDatabaseLdapBaseDn OBJECT-TYPE eqlApplianceCredentialsDatabaseLdapServerAddress OBJECT-TYPE SYNTAX OCTET STRING(SIZE(1..64)) - MAX-ACCESS read-create - STATUS current + MAX-ACCESS read-create + STATUS deprecated DESCRIPTION "The IP address as a string" ::= { eqlApplianceCredentialsDatabaseEntry 4 } @@ -2254,7 +2339,80 @@ eqlApplianceCredentialsDatabaseNisServerAddress OBJECT-TYPE DESCRIPTION "A comma separated list of NIS server IP addresses" ::= { eqlApplianceCredentialsDatabaseEntry 6 } ----------------------- +eqlApplianceCredentialsDatabaseLDAPServerAnonymousAccessDisabled OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies whether an anonymous bind can be done, + in which case the bind DN and bind password are not needed. + The default is anonymous access." + DEFVAL { false } + ::= {eqlApplianceCredentialsDatabaseEntry 7 } + +eqlApplianceCredentialsDatabaseLDAPServerBindDN OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..512)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field contains the LDAP bind DN (username) for this client. + It can be set but it returns a zero-length strings upon read." + ::= {eqlApplianceCredentialsDatabaseEntry 8 } + +eqlApplianceCredentialsDatabaseLDAPServerBindPassword OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..64)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field contains the LDAP bind DN password for this client. + It can be set but it returns a zero-length strings upon read." + --DEFAULT cookie "secure" + ::= {eqlApplianceCredentialsDatabaseEntry 9 } + + +eqlApplianceCredentialsDatabaseLDAPServerSecureProtocol OBJECT-TYPE + SYNTAX INTEGER { + none (0), + tls (1), + tls-with-certificate (2) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field represent the security protocol between NAS cluster + and LDAP server. Default value is none which does not encode + user credentials and are sent over the network in plain text." + DEFVAL { none } + ::= {eqlApplianceCredentialsDatabaseEntry 10 } + +eqlApplianceCredentialsDatabaseLDAPServerExtendedSchema OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies whether extended schema is used for LDAP + over Active Directory. UNIX user stored on Active Directory used + as an LDAP server. If the Administrator is keeping the UNIX users + on Active directory using the AD extended schema, then NAS cluster + needs to be aware of it since a different flow is being used to + retrieve the UNIX users details." + DEFVAL { false } + ::= {eqlApplianceCredentialsDatabaseEntry 11 } + +eqlApplianceCredentialsDatabaseLDAPCertificateFileName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..256)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field is used for storing the client certificate file + name. This field will be used if tls-with-certificate option + is selected for secure protocol." + ::= {eqlApplianceCredentialsDatabaseEntry 12 } + +eqlApplianceCredentialsDatabaseLDAPServerIpOrFqdn OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..256)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field is used for entering LDAP Server's FQDN or ip address. + This field deprecates the use of eqlApplianceCredentialsDatabaseLdapServerAddress + which only takes ip address for LDAP server." + ::= {eqlApplianceCredentialsDatabaseEntry 13 } + +----------------------------------------------------------------------------------- eqlApplianceActiveDirectoryAccessTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlApplianceActiveDirectoryAccessEntry MAX-ACCESS not-accessible @@ -2289,7 +2447,8 @@ EqlApplianceActiveDirectoryAccessEntry ::= eqlApplianceActiveDirectoryMemberOfDomain OCTET STRING, eqlApplianceActiveDirectoryStatus INTEGER, eqlApplianceActiveDirectoryAccessibleControllers OCTET STRING, - eqlApplianceActiveDirectoryPreferredControllers OCTET STRING + eqlApplianceActiveDirectoryPreferredControllers OCTET STRING, + eqlApplianceActiveDirectoryPreferredControllersNameList OCTET STRING } @@ -2388,13 +2547,18 @@ eqlApplianceActiveDirectoryDomainControllers OBJECT-TYPE MAX-ACCESS read-create STATUS current DESCRIPTION "Truth value if it's member of domain" - ::= { eqlApplianceActiveDirectoryAccessEntry 12 } + ::= { eqlApplianceActiveDirectoryAccessEntry 12 } -eqlApplianceActiveDirectoryStatus OBJECT-TYPE +eqlApplianceActiveDirectoryStatus OBJECT-TYPE SYNTAX INTEGER { unused(0), enabled(1), - disabled(2) + disabled(2), + notjoined(3), + unknown(4), + offline(5), + problematic(6), + optimal(7) } MAX-ACCESS read-create STATUS current @@ -2413,9 +2577,17 @@ eqlApplianceActiveDirectoryPreferredControllers OBJECT-TYPE SYNTAX OCTET STRING(SIZE(1..128)) MAX-ACCESS read-create STATUS current - DESCRIPTION "Comman separated list of preferred Active Directory controllers." + DESCRIPTION "Comma separated list of preferred Active Directory controllers." ::= { eqlApplianceActiveDirectoryAccessEntry 15 } +eqlApplianceActiveDirectoryPreferredControllersNameList OBJECT-TYPE + SYNTAX OCTET STRING(SIZE(1..200)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Comma separated list of preferred Active Directory + controllers names." + ::= { eqlApplianceActiveDirectoryAccessEntry 16 } + -------------- eqlApplianceManualMappingTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlApplianceManualMappingEntry @@ -2816,7 +2988,8 @@ eqlApplianceSyncedDataType OBJECT-TYPE timezone(3), traprecipient(4), trapcommunity(5), - cluster-san-vip(6) + cluster-san-vip(6), + cluster-name(7) } MAX-ACCESS read-only STATUS current @@ -3290,7 +3463,7 @@ EqlApplianceVolumeDiscoveryEntry ::= eqlApplianceVolumeDiscoveryRowStatus RowStatus, eqlApplianceVolumeDiscoveryVolumeNodeAccessibleStatus INTEGER, eqlApplianceVolumeDiscoveryVolumeStatus INTEGER, - eqlApplianceVolumeDiscoveryVolumeLunNumber Unsigned32 + eqlApplianceVolumeDiscoveryVolumeLunNumber Unsigned32 } eqlApplianceVolumeDiscoveryRowStatus OBJECT-TYPE @@ -3829,6 +4002,87 @@ eqlApplianceGroupQueryGroupSource OBJECT-TYPE DESCRIPTION "The credential source of the group referenced by this row." ::= { eqlApplianceGroupQueryEntry 11 } +----------------------------------------------------------------------------------- +eqlApplianceActiveDirectoryTrustedDomainListTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlApplianceActiveDirectoryTrustedDomainListEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic Appliance Trusted Domain Table + This table is used to store the list of trusted domain + controllers. TimeoutAll:60" + ::= { eqlApplianceObjects 43 } +eqlApplianceActiveDirectoryTrustedDomainListEntry OBJECT-TYPE + SYNTAX EqlApplianceActiveDirectoryTrustedDomainListEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing an operation." + INDEX { eqlApplianceIndex, eqlApplianceActiveDirectoryTrustedDomainName } + + ::= { eqlApplianceActiveDirectoryTrustedDomainListTable 1 } + +EqlApplianceActiveDirectoryTrustedDomainListEntry ::= + SEQUENCE { + eqlApplianceActiveDirectoryTrustedDomainRowStatus RowStatus, + eqlApplianceActiveDirectoryTrustedDomainName OCTET STRING, + eqlApplianceActiveDirectoryTrustedDomainDcName OCTET STRING, + eqlApplianceActiveDirectoryTrustedDomainDcIp OCTET STRING, + eqlApplianceActiveDirectoryTrustedDomainDcTrust INTEGER, + eqlApplianceActiveDirectoryTrustedDomainDcStatus INTEGER + } + +eqlApplianceActiveDirectoryTrustedDomainRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field is used to manage operations." + ::= { eqlApplianceActiveDirectoryTrustedDomainListEntry 1} + +eqlApplianceActiveDirectoryTrustedDomainName OBJECT-TYPE + SYNTAX OCTET STRING(SIZE(1..256)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Trusted domain names." + ::= { eqlApplianceActiveDirectoryTrustedDomainListEntry 2 } + +eqlApplianceActiveDirectoryTrustedDomainDcName OBJECT-TYPE + SYNTAX OCTET STRING(SIZE(1..256)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Trusted domain's domain controllers names." + ::= { eqlApplianceActiveDirectoryTrustedDomainListEntry 3 } + +eqlApplianceActiveDirectoryTrustedDomainDcIp OBJECT-TYPE + SYNTAX OCTET STRING(SIZE(1..256)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Trusted domain's domain controllers IP addresses." + ::= { eqlApplianceActiveDirectoryTrustedDomainListEntry 4 } + +eqlApplianceActiveDirectoryTrustedDomainDcTrust OBJECT-TYPE + SYNTAX INTEGER { + unused(0), + unknown(1), + inbound(2), + outbound(3), + two-way(4), + primary(5) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Domain's domain controllers trust state." + ::= { eqlApplianceActiveDirectoryTrustedDomainListEntry 5 } + +eqlApplianceActiveDirectoryTrustedDomainDcStatus OBJECT-TYPE + SYNTAX INTEGER { + unused(0), + online(1), + offline(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Trusted domain's domain controllers online status." + ::= { eqlApplianceActiveDirectoryTrustedDomainListEntry 6 } +------------------------------------------------------------------------------ END diff --git a/mibs/equallogic/EQLCONTROLLER-MIB b/mibs/equallogic/EQLCONTROLLER-MIB index aa4b84306cb..694e573fc23 100644 --- a/mibs/equallogic/EQLCONTROLLER-MIB +++ b/mibs/equallogic/EQLCONTROLLER-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) EQLCONTROLLER-MIB DEFINITIONS ::= BEGIN @@ -17,7 +17,7 @@ IMPORTS eqlcontrollerModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO "Contact: Customer Support @@ -120,7 +120,8 @@ EqlControllerEntry ::= eqlControllerNVRAMBattery INTEGER, eqlControllerSerialNumber2 DisplayString, eqlControllerType DisplayString, - eqlControllerBootTime Counter32 + eqlControllerBootTime Counter32, + eqlControllerCompressionPct INTEGER } eqlControllerIndex OBJECT-TYPE @@ -431,6 +432,15 @@ eqlControllerBootTime OBJECT-TYPE DESCRIPTION "This variable specifies time at which the controller was booted expressed as seconds since epoch." ::= { eqlControllerEntry 35} +eqlControllerCompressionPct OBJECT-TYPE + SYNTAX INTEGER (0..100) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This variable specifies the percentage of total disk space that may be used for compressed pages within this member." + DEFVAL {0} + ::= { eqlControllerEntry 36 } + + -- *************************************************************************************** eqlBackplaneTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlBackplaneEntry diff --git a/mibs/equallogic/EQLDISK-MIB b/mibs/equallogic/EQLDISK-MIB index 49912377931..e667115fff5 100644 --- a/mibs/equallogic/EQLDISK-MIB +++ b/mibs/equallogic/EQLDISK-MIB @@ -1,8 +1,8 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) EQLDISK-MIB DEFINITIONS ::= BEGIN IMPORTS - MODULE-IDENTITY, OBJECT-TYPE, Integer32,enterprises, Counter32, Counter64 + MODULE-IDENTITY, OBJECT-TYPE, Integer32,enterprises, Counter32, Counter64, Gauge32 FROM SNMPv2-SMI TEXTUAL-CONVENTION, DisplayString FROM SNMPv2-TC @@ -14,8 +14,8 @@ IMPORTS FROM EQLMEMBER-MIB; eqldiskModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" - ORGANIZATION "EqualLogic Inc." + LAST-UPDATED "201906190531Z" + ORGANIZATION "Dell Inc." CONTACT-INFO "Contact: Customer Support Postal: Dell Inc @@ -25,9 +25,9 @@ eqldiskModule MODULE-IDENTITY WEB: www.equallogic.com" DESCRIPTION - "Equallogic Inc Peer Storage Array disk table information + "Dell Inc. Peer Storage Array disk table information - Copyright (c) 2002-2009 by Dell, Inc. + Copyright (c) 2002-2013 by Dell, Inc. All rights reserved. This software may not be copied, disclosed, transferred, or used except in accordance with a license granted @@ -37,6 +37,8 @@ eqldiskModule MODULE-IDENTITY -- Revision history, in reverse chronological order + REVISION "201309200000Z" -- 20-Sep-2013 + DESCRIPTION "Corrected eqlDiskStatusNumIOs from a Counter32 to a Gauge32" REVISION "200209060000Z" -- 02-Sep-06 DESCRIPTION "Initial revision" ::= { enterprises equalLogic(12740) 3 } @@ -300,7 +302,7 @@ EqlDiskStatusEntry ::= eqlDiskStatusBytesRead Counter64, eqlDiskStatusBytesWritten Counter64, eqlDiskStatusBusyTime Counter64, - eqlDiskStatusNumIOs Counter32, + eqlDiskStatusNumIOs Gauge32, eqlDiskStatusFailXfers Counter32, eqlDiskStatusNumResets Counter32, eqlDiskStatusTotalQD Counter64, @@ -336,9 +338,9 @@ eqlDiskStatusBusyTime OBJECT-TYPE ::= { eqlDiskStatusEntry 4 } eqlDiskStatusNumIOs OBJECT-TYPE - SYNTAX Counter32 - MAX-ACCESS read-only - STATUS current + SYNTAX Gauge32 + MAX-ACCESS read-only + STATUS current DESCRIPTION "This variable specifies number of IO operations currently outstanding." ::= { eqlDiskStatusEntry 5 } diff --git a/mibs/equallogic/EQLGROUP-MIB b/mibs/equallogic/EQLGROUP-MIB index f5ca51a9f6a..1a2799c0354 100644 --- a/mibs/equallogic/EQLGROUP-MIB +++ b/mibs/equallogic/EQLGROUP-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) EQLGROUP-MIB DEFINITIONS ::= BEGIN IMPORTS @@ -12,7 +12,7 @@ IMPORTS FROM INET-ADDRESS-MIB; -- RFC2851 eqlgroupModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO "Contact: Customer Support @@ -25,7 +25,7 @@ eqlgroupModule MODULE-IDENTITY DESCRIPTION "Equallogic Inc. group information - Copyright (c) 2002-2013 by Dell Inc. + Copyright (c) 2002-2017 by Dell Inc. All rights reserved. This software may not be copied, disclosed, transferred, or used except in accordance with a license granted @@ -45,9 +45,6 @@ eqlgroupNotifications OBJECT IDENTIFIER ::= { eqlgroupModule 2 } eqlgroupConformance OBJECT IDENTIFIER ::= { eqlgroupModule 3 } - - - --********************************************************************************* --*********************************************************************************** -- Textual conventions @@ -110,7 +107,7 @@ UTFString ::= TEXTUAL-CONVENTION Note that the size of an SnmpAdminString object is measured in octets, not characters. " - SYNTAX OCTET STRING (SIZE (0..255)) + SYNTAX OCTET STRING (SIZE (0..1000)) AdminAccountPrivilegeType ::= TEXTUAL-CONVENTION @@ -128,7 +125,13 @@ AdminAccountPrivilegeType ::= TEXTUAL-CONVENTION global-admin (0), pool-admin (1), pool-admin-group-read (2), - volume-admin (3) + volume-admin (3), + pool-admin-config (4), + pool-admin-diag (5), + pool-admin-diag-config (6), + read-only-config (7), + read-only-diag (8), + read-only-diag-config (9) } AdminAccountType ::= TEXTUAL-CONVENTION @@ -149,6 +152,19 @@ AdminAccountType ::= TEXTUAL-CONVENTION read-only (2) } +BinaryUUID ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION "Used to represent binary data that is 16 bytes long (UUID/PSVID)" + SYNTAX OCTET STRING (SIZE(16)) + +Unsigned64 ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION + "A non-negative 64-bit bit integer, without counter + semantics." + SYNTAX Counter64 + + --******************************* @@ -252,7 +268,13 @@ EqlStorageGroupEntry ::= eqlGroupDefaultSectorSize INTEGER, eqlGroupCompressionScanFreq Integer32, eqlGroupRunCompressionScan INTEGER, - eqlGroupMonitorReminderTimestamp Unsigned32 + eqlGroupMonitorReminderTimestamp Unsigned32, + eqlGroupDefaultThinWarnSoftThreshold INTEGER, + eqlGroupDefaultThinWarnHardThreshold INTEGER, + eqlGroupCreateDefaultTags INTEGER, + eqlGroupFastVacate TruthValue, + eqlGroupSecureDelete TruthValue, + eqlGroupVolumeMigration INTEGER } @@ -826,7 +848,31 @@ EqlStorageGroupEntry ::= america-Creston(452), asia-Khandyga(453), europe-Busingen(454), - asia-Ust-Nera(455) + asia-Ust-Nera(455), + antarctica-Troll(456), + america-Coral-Harbour(457), + america-Ensenada(458), + asia-Srednekolymsk(459), + europe-Belfast(460), + asia-Tel-Aviv(461), + america-Argentina-ComodRivadavia(462), + asia-Hanoi(463), + asia-Chita(464), + america-Rosario(465), + pacific-Bougainville(466), + africa-Timbuktu(467), + america-Fort-Nelson(468), + europe-Astrakhan(469), + asia-Barnaul(470), + europe-Ulyanovsk(471), + asia-Tomsk(472), + europe-Kirov(473), + asia-Yangon(474), + asia-Famagusta(475), + america-Punta-Arenas(476), + europe-Saratov(477), + asia-Atyrau(478), + asia-Qostanay(479) } MAX-ACCESS read-write STATUS current @@ -1288,7 +1334,31 @@ EqlStorageGroupEntry ::= America/Creston, Asia/Khandyga, Europe/Busingen, - Asia/Ust-Nera " + Asia/Ust-Nera, + Antarctica/Troll, + America/Coral_Harbour, + America/Ensenada, + Asia/Srednekolymsk, + Europe/Belfast, + Asia/Tel_Aviv, + America/Argentina/ComodRivadavia, + Asia/Hanoi, + Asia/Chita, + America/Rosario, + Pacific/Bougainville, + Africa/Timbuktu, + America/Fort_Nelson, + Europe/Astrakhan, + Asia/Barnaul, + Europe/Ulyanovsk, + Asia/Tomsk, + Europe/Kirov, + Asia/Yangon, + Asia/Famagusta, + America/Punta_Arenas, + Europe/Saratov, + Asia/Atyrau, + Asia/Qostanay " DEFVAL { est } ::= { eqlStorageGroupEntry 13 } @@ -1642,7 +1712,7 @@ EqlStorageGroupEntry ::= array-restart-flag(2), -- array restart flag repl-use-jumbos(3), -- use jumbo frames for replication 0-yes 1-no force-SCSI-QErr-OldBehavior(4), -- deprecated by per-volume QErr settings - dcb-disable(5), -- set to disable the switch from Data Center Bridging Mode + dcb-disable(5), -- set to disable the switch from Data Center Bridging Mode. deprecated lldp-vlanidneg-disable(6), -- set to disable vlan id negotiation via LLDP mpio-dynamic-scaling-mask0(7), -- Set in combination with -mask1... unmap-disable(8), -- set to disable the unmap feature @@ -2010,7 +2080,81 @@ EqlStorageGroupEntry ::= display immediately. 0x7fffffff to never display." DEFVAL { 0 } ::= { eqlStorageGroupEntry 82 } - + + eqlGroupDefaultThinWarnSoftThreshold OBJECT-TYPE + SYNTAX INTEGER { + disabled (0), + enabled (1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This field enables/disables the default setting for the soft warning when + creating a thin provisioned volume. When this setting is combined with + eqlGroupDefaultThinWarnHardThreshold, four different eqliscsiVolumeThinWarnMode + are possible, warnWithIscsi (both are enabled), warnWithHardOnly (only hard is enabled), + warnWtihSoftOnly (only soft is enabled), + and warnWithOffline (default, and when neither are enabled)." + DEFVAL { disabled } + ::= { eqlStorageGroupEntry 83 } + + eqlGroupDefaultThinWarnHardThreshold OBJECT-TYPE + SYNTAX INTEGER { + disabled (0), + enabled (1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This field enables/disables the default setting for the hard warning when + creating a thin provisioned volume. When this setting is combined with + eqlGroupDefaultThinWarnSoftThreshold, four different eqliscsiVolumeThinWarnMode + are possible, warnWithIscsi (both are enabled), warnWithHardOnly (only hard is enabled), + warnWtihSoftOnly (only soft is enabled), + and warnWithOffline (default, and when neither are enabled)." + DEFVAL { disabled } + ::= { eqlStorageGroupEntry 84 } + + eqlGroupCreateDefaultTags OBJECT-TYPE + SYNTAX INTEGER { + never-created (0), + previously-created (1) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION "A flag used internally to determine if the Default Tags have ever + been created. The Default Tags may subsequently be deleted by + the user." + DEFVAL { never-created } + ::= { eqlStorageGroupEntry 85 } + + eqlGroupFastVacate OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Specifies whether fast vacate is enabled for the group." + DEFVAL { true } + ::= { eqlStorageGroupEntry 86 } + + eqlGroupSecureDelete OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Specifies whether secure delete is enabled for the group" + DEFVAL { false } + ::= { eqlStorageGroupEntry 87 } + + eqlGroupVolumeMigration OBJECT-TYPE + SYNTAX INTEGER{ + enabled(0), + disabled(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Specifies if volume migration is allowed for the group. default is enabled always." + DEFVAL { enabled } + ::= { eqlStorageGroupEntry 88 } + +-- Do not add more columns to this MIB. There is a 2k limit due to the size of mbuf extension! + --*********************************************************************************** eqlStorageGroupStatusTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlStorageGroupStatusEntry @@ -2069,7 +2213,9 @@ EqlStorageGroupStatusEntry ::= eqlStorageGroupStatusCompressedSpaceUsed Counter64, eqlStorageGroupStatusVirtualSpaceSize Counter64, eqlStorageGroupStatusReplicationSnapCount Unsigned32, - eqlStorageGroupStatusStorageContainerVolumesBound Integer32 + eqlStorageGroupStatusStorageContainerVolumesBound Integer32, + eqlStorageGroupStatusSnapVirtualSpaceUsed Counter64, + eqlStorageGroupStatusSnapPhysicalSpaceUsed Counter64 } eqlStorageGroupStatusPoolSpace OBJECT-TYPE @@ -2332,8 +2478,9 @@ eqlStorageGroupStatusVirtualVolumesInUse OBJECT-TYPE UNITS "MB" MAX-ACCESS read-only STATUS current - DESCRIPTION "This field specifies the total amount of borrowing against other volume's free snapshot reserve - and pool free space. This includes snapshots and recoverable volumes." + DESCRIPTION "This field specifies the total amount of borrowing against reserves + and pool free space. This includes snapshots, recoverable volumes, + and other objects that borrow space." ::= { eqlStorageGroupStatusEntry 32 } eqlStorageGroupStatusStorageContainerCount OBJECT-TYPE @@ -2408,6 +2555,22 @@ eqlStorageGroupStatusStorageContainerVolumesBound OBJECT-TYPE DESCRIPTION "This field specifies the total number of bound volume across all storage containers." ::= { eqlStorageGroupStatusEntry 42 } +eqlStorageGroupStatusSnapVirtualSpaceUsed OBJECT-TYPE + SYNTAX Counter64 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the total amount of space in MB that would be utilized by snapshot data if there was no compression." + ::= { eqlStorageGroupStatusEntry 43 } + +eqlStorageGroupStatusSnapPhysicalSpaceUsed OBJECT-TYPE + SYNTAX Counter64 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the total amount of space in MB utilized by snapshot data including compression-reduced space." + ::= { eqlStorageGroupStatusEntry 44 } + --********************************************************************************** eqlStorageGroupSiteTable OBJECT-TYPE @@ -3835,7 +3998,8 @@ EqlStorageGroupProfileEntry ::= eqlStorageGroupProfileMaxConnections Unsigned32, eqlStorageGroupProfileMaxPartners Unsigned32, eqlStorageGroupProfileMaxConnWarning Unsigned32, - eqlStorageGroupProfileMaxSyncReplVolumes Unsigned32 + eqlStorageGroupProfileMaxSyncReplVolumes Unsigned32, + eqlStorageGroupProfileMaxOnlineSnaps Unsigned32 } @@ -3922,6 +4086,13 @@ eqlStorageGroupProfileMaxSyncReplVolumes OBJECT-TYPE DESCRIPTION "This field specifies the maximum number of Sync Repl volumes allowed in the group." ::= { eqlStorageGroupProfileEntry 12 } +eqlStorageGroupProfileMaxOnlineSnaps OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the maximum number of online user-created snapshots allowed in the group. This number excludes snapshots temporarily set online for replication." + ::= { eqlStorageGroupProfileEntry 13 } + --****************************************************************** eqlStorageGroupAdminAccountKeyTable OBJECT-TYPE @@ -4048,7 +4219,9 @@ EqlLDAPServerEntry ::= eqlLDAPServerAnonymousAccess TruthValue, eqlLDAPServerBindDN OCTET STRING, eqlLDAPServerBindPassword OCTET STRING, - eqlLDAPServerRowStatus RowStatus + eqlLDAPServerRowStatus RowStatus, + eqlLDAPServerUserSearchDN OCTET STRING, + eqlLDAPServerGroupSearchDN OCTET STRING } eqlLDAPServerIndex OBJECT-TYPE @@ -4137,6 +4310,20 @@ eqlLDAPServerRowStatus OBJECT-TYPE DESCRIPTION "row status" ::= { eqlLDAPServerEntry 10 } +eqlLDAPServerUserSearchDN OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..255)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field contains the LDAP DN used for AD User LDAP search queries." + ::= { eqlLDAPServerEntry 11 } + +eqlLDAPServerGroupSearchDN OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..255)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field contains the LDAP DN used for AD Group LDAP search queries." + ::= { eqlLDAPServerEntry 12 } + --************************************************************************************* eqlLdapLoginAccessTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlLdapLoginAccessEntry @@ -4360,7 +4547,7 @@ eqlGroupSessionBannerEntry OBJECT-TYPE EqlGroupSessionBannerEntry ::= SEQUENCE { eqlGroupSessionBannerRowStatus RowStatus, - eqlGroupSessionBannerText OCTET STRING + eqlGroupSessionBannerText UTFString } eqlGroupSessionBannerRowStatus OBJECT-TYPE @@ -4371,7 +4558,7 @@ eqlGroupSessionBannerRowStatus OBJECT-TYPE ::= { eqlGroupSessionBannerEntry 1 } eqlGroupSessionBannerText OBJECT-TYPE - SYNTAX OCTET STRING (SIZE (0..1000)) + SYNTAX UTFString (SIZE (0..1000)) MAX-ACCESS read-create STATUS current DESCRIPTION "Up to 1000 bytes of UTF-8 string to display at the beginning of any session" @@ -4570,7 +4757,384 @@ eqlEULAAcceptInfoTimestamp OBJECT-TYPE DESCRIPTION "The timestamp when the EULA was accepted.." ::= { eqlEULAAcceptInfoEntry 5 } +--****************************************************************** + +eqlDefaultSnapshotSchedTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlDefaultSnapshotSchedEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Persistent Table for storing extra default snapshot schedule settings." + ::= { eqlgroupObjects 33 } + +eqlDefaultSnapshotSchedEntry OBJECT-TYPE + SYNTAX EqlDefaultSnapshotSchedEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing additional global default snapshot schedule settings." + INDEX { eqlDefaultSnapshotSchedInstanceId } + + ::= { eqlDefaultSnapshotSchedTable 1 } + +EqlDefaultSnapshotSchedEntry ::= + SEQUENCE { + eqlDefaultSnapshotSchedInstanceId Unsigned32, + eqlDefaultSnapshotSchedRowStatus RowStatus, + eqlDefaultSnapshotSchedDegradePoolSpaceThreshold Unsigned32, + eqlDefaultSnapshotSchedStagger Unsigned32, + eqlDefaultSnapshotSchedNumOfVolsSkippedBeforeYield Unsigned32 + } + +eqlDefaultSnapshotSchedInstanceId OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "This index identifies the default snapshot shcedule index. + This index should always be 1." + ::= { eqlDefaultSnapshotSchedEntry 1 } + + eqlDefaultSnapshotSchedRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Rowstatus" + ::= { eqlDefaultSnapshotSchedEntry 2 } + +eqlDefaultSnapshotSchedDegradePoolSpaceThreshold OBJECT-TYPE + SYNTAX Unsigned32(0..100) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "The minimum percentage of actual free space that must be in + every pool in the group in order to run in regular mode, with + the default snapshot scheduler honoring the default snapshot + schedule's eqliscsiVolumeSnapshotPolicyMaxKeep. If any of the + pools drop below this percentage, the schedular runs in degraded + mode, only keeping one snapshot. Setting to 0 means that + default snapshot schedule will never run in degraded mode." + DEFVAL { 15 } + ::= { eqlDefaultSnapshotSchedEntry 3 } + + +eqlDefaultSnapshotSchedStagger OBJECT-TYPE + SYNTAX Unsigned32(0..30) + UNITS "seconds" + MAX-ACCESS read-create + STATUS current + DESCRIPTION "The number of seconds that the default snapshot schedular delays + between subsequent snapshots in order to reduce load on the system + and allow other snapshot schedules to run. Set to 0 to disable." + DEFVAL { 5 } + ::= { eqlDefaultSnapshotSchedEntry 4 } + +eqlDefaultSnapshotSchedNumOfVolsSkippedBeforeYield OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "The number of inelligible volumes that can be skipped in succession before default scheduler + resubmits itself to the scheduler, yielding by at least + eqlDefaultSnapshotSchedStagger seconds. Set to 0 to disable." + DEFVAL { 10 } + ::= { eqlDefaultSnapshotSchedEntry 5 } + +--*********************************************************************************** + +eqlStorageGroupVVolTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlStorageGroupVVolEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic Group VVol Table" + ::= { eqlgroupObjects 34} + +eqlStorageGroupVVolEntry OBJECT-TYPE + SYNTAX EqlStorageGroupVVolEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing Group VVol information." + INDEX { eqlGroupId} + ::= { eqlStorageGroupVVolTable 1 } + +EqlStorageGroupVVolEntry ::= + SEQUENCE { + eqlStorageGroupVVolCount Unsigned32, + eqlStorageGroupVVolSnapshotCount Unsigned32, + eqlStorageGroupVVolLinkedCloneCount Unsigned32 + } + +eqlStorageGroupVVolCount OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of VVols." + DEFVAL { 0 } + ::= { eqlStorageGroupVVolEntry 1 } + +eqlStorageGroupVVolSnapshotCount OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of VVol snapshots." + DEFVAL { 0 } + ::= { eqlStorageGroupVVolEntry 2 } + +eqlStorageGroupVVolLinkedCloneCount OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of VVol linked clones." + DEFVAL { 0 } + ::= { eqlStorageGroupVVolEntry 3 } + +--*********************************************************************************** + +eqlCrossPlatReplTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlCrossPlatReplEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Persistent Table for for cross-platform replication settings." + ::= { eqlgroupObjects 35 } + +eqlCrossPlatReplEntry OBJECT-TYPE + SYNTAX EqlCrossPlatReplEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing attributes used in cross-platform replication." + AUGMENTS { eqlStorageGroupEntry } + + ::= { eqlCrossPlatReplTable 1 } + +EqlCrossPlatReplEntry ::= + SEQUENCE { + eqlCrossPlatReplTransId Unsigned64, + eqlCrossPlatReplGroupSystemUUID DisplayString, + eqlCrossPlatReplTTLFeatureStatus TruthValue, + eqlCrossPlatReplTTLScrubberFrequency Unsigned32, + eqlCrossPlatReplTTLScrubberBailoutTime Unsigned32, + eqlCrossPlatReplTTLScrubberSnapCount Unsigned32 + } + +eqlCrossPlatReplTransId OBJECT-TYPE + SYNTAX Unsigned64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The starting transaction ID used by Cross-Platform Replication." + DEFVAL { 1 } + ::= { eqlCrossPlatReplEntry 1 } + +eqlCrossPlatReplGroupSystemUUID OBJECT-TYPE + SYNTAX DisplayString(SIZE(0..37)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "System UUID used for XPR. This UUID conforms to RFC 4122 version 1." + ::= { eqlCrossPlatReplEntry 2 } +eqlCrossPlatReplTTLFeatureStatus OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Specifies if XPR replica TTL(Time-to-Live) functionality is enabled/disabled. By default this is enabled, Enabled(1) and disabled(2)." + DEFVAL { true } + ::= { eqlCrossPlatReplEntry 3 } + +eqlCrossPlatReplTTLScrubberFrequency OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "seconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This field sets the frequency value of the TTL-scrubber for checking the expired replica snapshots and snapshots of XPR promoted volumes." + DEFVAL { 120 } + ::= { eqlCrossPlatReplEntry 4 } + +eqlCrossPlatReplTTLScrubberBailoutTime OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This field specifies the bailout time (in msecs) for TTL scrubber for XPR." + DEFVAL { 5 } + ::= { eqlCrossPlatReplEntry 5 } + +eqlCrossPlatReplTTLScrubberSnapCount OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This field indicates maximmum number of replica snapshots or failover volume's snapshots that TTL scrubber will iterate + through in one invocation in Cross-Platform Replication." + DEFVAL { 50 } + ::= { eqlCrossPlatReplEntry 6 } + + +--************************************************************************************* + +eqlStorageGroupAdminAccountPublicKeyTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlStorageGroupAdminAccountPublicKeyEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Persistent Storage Group Administration + Account Public Key table. This table contains a collection of + SSH Public Key records. It is indexed by group id and administration + account record index." + ::= { eqlgroupObjects 36 } + +eqlStorageGroupAdminAccountPublicKeyEntry OBJECT-TYPE + SYNTAX EqlStorageGroupAdminAccountPublicKeyEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing administration + Account Public Key settings." + + INDEX { eqlGroupId, eqlStorageGroupAdminAccountIndex } + + ::= { eqlStorageGroupAdminAccountPublicKeyTable 1 } + +EqlStorageGroupAdminAccountPublicKeyEntry ::= + SEQUENCE { + eqlStorageGroupAdminAccountPublicKeyRowStatus RowStatus, + eqlStorageGroupAdminAccountPublicKeyUserName DisplayString, + eqlStorageGroupAdminAccountPublicKeyValue OCTET STRING, + eqlStorageGroupAdminAccountPublicKeyDescription DisplayString + } + +eqlStorageGroupAdminAccountPublicKeyRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This value is used to manage the conceptual row." + ::= { eqlStorageGroupAdminAccountPublicKeyEntry 1 } + +eqlStorageGroupAdminAccountPublicKeyUserName OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..64)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "The name of the administration account." + ::= { eqlStorageGroupAdminAccountPublicKeyEntry 2 } + +eqlStorageGroupAdminAccountPublicKeyValue OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..1024)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "An octet string containing the SSH Public Key for this + account." + ::= { eqlStorageGroupAdminAccountPublicKeyEntry 3 } + +eqlStorageGroupAdminAccountPublicKeyDescription OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..64)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Description string for the SSH Public Key." + ::= { eqlStorageGroupAdminAccountPublicKeyEntry 4 } + +--************************************************************************************* + eqlStorageGroupGrpAdminLoginStatusTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlStorageGroupGrpAdminLoginStatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic Storage Group grpadmin login/logout status Table" + ::= { eqlgroupObjects 37} + +eqlStorageGroupGrpAdminLoginStatusEntry OBJECT-TYPE + SYNTAX EqlStorageGroupGrpAdminLoginStatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing group grpadmin login/logout status info." + INDEX { eqlGroupId} + ::= { eqlStorageGroupGrpAdminLoginStatusTable 1 } + +EqlStorageGroupGrpAdminLoginStatusEntry ::= + SEQUENCE { + eqlStorageGroupGrpadminLoginStatusIndex Integer32, + eqlStorageGroupGrpadminName DisplayString, + eqlStorageGroupGrpadminLoginStatus INTEGER, + eqlStorageGroupServerIpAddr DisplayString, + eqlStoragGroupGrpadminLoginStatusRowStatus RowStatus + } + +eqlStorageGroupGrpadminLoginStatusIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "This field specifies an index that uniquely identifies the grpadmin user login status " + ::= { eqlStorageGroupGrpAdminLoginStatusEntry 1 } + +eqlStorageGroupGrpadminName OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..64)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies the account name of the grpadmin" + ::= { eqlStorageGroupGrpAdminLoginStatusEntry 2 } + +eqlStorageGroupGrpadminLoginStatus OBJECT-TYPE + SYNTAX INTEGER { + login-stat-success(0), + login-stat-logout(1), + login-stat-failed(2) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Grpadmin account login status" + ::= { eqlStorageGroupGrpAdminLoginStatusEntry 3 } + +eqlStorageGroupServerIpAddr OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This is the IP address, from the user attempted login/logout" + ::= { eqlStorageGroupGrpAdminLoginStatusEntry 4 } + +eqlStoragGroupGrpadminLoginStatusRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This value is used to manage the conceptual row." + ::= { eqlStorageGroupGrpAdminLoginStatusEntry 5 } + +--************************************************************************************* +-- +-- SNMP TRAPS -- +eqlgroupMgmtNotifications OBJECT IDENTIFIER ::= {eqlgroupNotifications 1} + +eqlgroupIPv4AddrChanged NOTIFICATION-TYPE + OBJECTS{ + eqlGroupName, + eqlGroupInetAddrType, + eqlGroupInetAddr + } + STATUS current + DESCRIPTION + "The Group IPv4 address has changed. Contact the group administrator." + ::= { eqlgroupMgmtNotifications 1 } + +eqlgroupIPv6AddrChanged NOTIFICATION-TYPE + OBJECTS{ + eqlGroupName, + eqlGroupInet6AddrType, + eqlGroupInet6Addr + } + STATUS current + DESCRIPTION + "The Group IPv6 address has changed. Contact the group administrator." + ::= { eqlgroupMgmtNotifications 2 } + +eqlMWKAChangeNotification NOTIFICATION-TYPE + OBJECTS{ + eqlGroupName, + eqlGroupInetAddrType, + eqlGroupInetAddr + } + STATUS current + DESCRIPTION + "The MWKA of the Equallogic array has changed. Contact the group administrator." +::= { eqlgroupMgmtNotifications 3 } + +eqlgroupAdminLoginStatus NOTIFICATION-TYPE + OBJECTS{ + eqlStorageGroupGrpadminName, + eqlStorageGroupGrpadminLoginStatus, + eqlStorageGroupServerIpAddr + } + STATUS current + DESCRIPTION + "Sent when a Grpadmin account status is modified +(login/logout/login-failed)" + ::= { eqlgroupMgmtNotifications 4 } + END diff --git a/mibs/equallogic/EQLINTERNAL-MIB b/mibs/equallogic/EQLINTERNAL-MIB index 3ca158a164a..3f231e3f974 100644 --- a/mibs/equallogic/EQLINTERNAL-MIB +++ b/mibs/equallogic/EQLINTERNAL-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) EQLINTERNAL-MIB DEFINITIONS ::= BEGIN IMPORTS @@ -15,7 +15,7 @@ IMPORTS eqlInternalModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "Dell Inc." CONTACT-INFO "Contact: Customer Support diff --git a/mibs/equallogic/EQLIPADDR-MIB b/mibs/equallogic/EQLIPADDR-MIB index c735a0e9746..60641722fe9 100644 --- a/mibs/equallogic/EQLIPADDR-MIB +++ b/mibs/equallogic/EQLIPADDR-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) @@ -21,7 +21,7 @@ IMPORTS eqlipaddrModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO "Contact: Customer Support @@ -34,12 +34,12 @@ IMPORTS DESCRIPTION "Equallogic Inc. Storage Array IP address table mib - Copyright (c) 2002-2010 by Dell, Inc. + Copyright (c) 2002-2016 by Dell Inc. All rights reserved. This software may not be copied, disclosed, transferred, or used except in accordance with a license granted - by Dell, Inc. This software embodies proprietary information - and trade secrets of Dell, Inc. + by Dell Inc. This software embodies proprietary information + and trade secrets of Dell Inc. " @@ -300,7 +300,8 @@ EqlifStatusEntry ::= SEQUENCE { eqlifStatusMgmtRolePolicy INTEGER, eqlifStatusConfigurationFlags BITS, - eqlifOperStatus INTEGER + eqlifOperStatus INTEGER, + eqlifStatusPortFailover INTEGER } eqlifStatusMgmtRolePolicy OBJECT-TYPE @@ -385,7 +386,23 @@ eqlifOperStatus OBJECT-TYPE from going to the up(1) state." ::= { eqlifStatusEntry 3 } - +eqlifStatusPortFailover OBJECT-TYPE + SYNTAX INTEGER { + no(0), -- Vertical failover hasn't happened for the port + yes(1), -- Vertical failover has happened + unknown(2) -- Status can not be determined + -- for some reason. + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The current state indicating if this interface has vertically + failed over.No(0) means this interface has not failed over and + is using primary controller's network port. + Yes(1) means this interface has failed over and is + currently using secondary controller's network port.Unknown(2) + means the port failover status can not be determined." + ::= { eqlifStatusEntry 4 } --**************************************************** @@ -524,4 +541,19 @@ eqlifOperStatus OBJECT-TYPE " ::= { eqlinetAddrEntry 8 } + +-- SNMP Traps +eqlipAddrMgmtNotifications OBJECT IDENTIFIER ::= { eqlipaddrModule 6 } + +eqlEthNetmaskChangeNotification NOTIFICATION-TYPE + OBJECTS{ + eqlInetAddrEntIfName, + eqlInetAddrEntNetMask + } + STATUS current + DESCRIPTION + "The netmask of the interface has changed. Contact the group administrator." +::= { eqlipAddrMgmtNotifications 1 } + + END diff --git a/mibs/equallogic/EQLIPSEC-MIB b/mibs/equallogic/EQLIPSEC-MIB index 5052e6a2fc1..2d802ee9920 100644 --- a/mibs/equallogic/EQLIPSEC-MIB +++ b/mibs/equallogic/EQLIPSEC-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) EQLIPSEC-MIB DEFINITIONS ::= BEGIN @@ -31,7 +31,7 @@ IMPORTS -- eqlIpsecModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO "Contact: Customer Support diff --git a/mibs/equallogic/EQLISCSI-MIB b/mibs/equallogic/EQLISCSI-MIB index a4c0a8964d8..29d36ae24a4 100644 --- a/mibs/equallogic/EQLISCSI-MIB +++ b/mibs/equallogic/EQLISCSI-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) EQLISCSI-MIB DEFINITIONS ::= BEGIN @@ -22,7 +22,7 @@ EQLISCSI-MIB DEFINITIONS ::= BEGIN ; eqliscsiExtModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO "Contact: Customer Support diff --git a/mibs/equallogic/EQLMEMBER-MIB b/mibs/equallogic/EQLMEMBER-MIB index 1003a0ada44..677bb2c3615 100644 --- a/mibs/equallogic/EQLMEMBER-MIB +++ b/mibs/equallogic/EQLMEMBER-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) EQLMEMBER-MIB DEFINITIONS ::= BEGIN IMPORTS @@ -15,7 +15,7 @@ IMPORTS FROM EQLGROUP-MIB; eqlmemberModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO "Contact: Customer Support @@ -28,7 +28,7 @@ eqlmemberModule MODULE-IDENTITY DESCRIPTION "Dell Inc. Storage Array member information - Copyright (c) 2002-2012 by Dell Inc. + Copyright (c) 2002-2016 by Dell Inc. All rights reserved. This software may not be copied, disclosed, transferred, or used except in accordance with a license granted @@ -101,7 +101,8 @@ EqlMemberEntry ::= eqlMemberControllerMajorVersion Unsigned32, eqlMemberControllerMinorVersion Unsigned32, eqlMemberControllerMaintenanceVersion Unsigned32, - eqlMemberCompressionCapable TruthValue + eqlMemberCompressionCapable TruthValue, + eqlMemberEightTBQAR TruthValue } eqlMemberIndex OBJECT-TYPE @@ -371,7 +372,15 @@ eqlMemberCompressionCapable OBJECT-TYPE STATUS current DESCRIPTION "This variable specifies if the member is capable of supporting compression." DEFVAL { false } - ::= { eqlMemberEntry 24 } + ::= { eqlMemberEntry 24 } + +eqlMemberEightTBQAR OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This variable is set to True if the member is 8TB and a QAR member." + ::= { eqlMemberEntry 25 } + --************************************************************************** @@ -836,7 +845,9 @@ eqlMemberHealthCriticalConditions OBJECT-TYPE smartBatteryFailure (28), -- Smart Battery failure critbit29 (29), -- available nandFailure (30), -- NAND chip on control module failed to restore persistent data. - batteryEndOfLife (31) + batteryEndOfLife (31), -- Battery has reached its end of life. + raidSsdRaidsetRebuildDelayed (32), -- SSD RAIDset rebuild is being delayed because no suitable spare + raidSsdRaidsetCopyToSpareDelayed (33) -- SSD RAIDset Copy-to-Spare is being delayed because no suitable spare } MAX-ACCESS read-only STATUS current @@ -896,28 +907,47 @@ eqlMemberHealthDetailsTempSensorIndex OBJECT-TYPE cemi1(16), controlModule0batteryThermistor(17), controlModule1batteryThermistor(18), - subExpanderModule0(19), - subExpanderModule1(20), - subExpanderModule2(21), - subExpanderModule3(22), - bottomplane0d0(23), - bottomplane0d1(24), - bottomplane0d2(25), - bottomplane0d3(26), - bottomplane0d4(27), - bottomplane1d0(28), - bottomplane1d1(29), - bottomplane1d2(30), - bottomplane1d3(31), - bottomplane1d4(32), - subExpanderModule0expander0(33), - subExpanderModule0expander1(34), - subExpanderModule1expander0(35), - subExpanderModule1expander1(36), - subExpanderModule2expander0(37), - subExpanderModule2expander1(38), - subExpanderModule3expander0(39), - subExpanderModule3expander1(40) + controlModule0ExhaustLeft(19), + controlModule0ExhaustRight(20), + controlModule1ExhaustLeft(21), + controlModule1ExhaustRight(22), + sideplaneAmbient0(23), + sideplaneAmbient1(24), + sideplaneAmbient2(25), + sideplaneAmbient3(26), + baseplane0DriveTray0(27), + baseplane1DriveTray0(28), + baseplane0DriveTray3(29), + baseplane1DriveTray3(30), + baseplane0DriveTray1(31), + baseplane1DriveTray1(32), + baseplane0DriveTray4(33), + baseplane1DriveTray4(34), + baseplane0DriveTray2(35), + baseplane1DriveTray2(36), + baseplane0DriveTray5(37), + baseplane1DriveTray5(38), + sideplane0Electronics0(39), + sideplane0Electronics1(40), + sideplane0Electronics2(41), + sideplane0Electronics3(42), + sideplane1Electronics0(43), + sideplane1Electronics1(44), + sideplane1Electronics2(45), + sideplane1Electronics3(46), + midplane0(47), + midplane1(48), + midplane2(49), + midplane3(50), + fanControlModule0(51), + fanControlModule1(52), + fanControlModule2(53), + fanControlModule3(54), + fanControlModule4(55), + powerModule0Inlet0(56), + powerModule0Hotspot1(57), + powerModule1Inlet0(58), + powerModule1Hotspot1(59) } MAX-ACCESS not-accessible STATUS current @@ -1039,7 +1069,9 @@ eqlMemberHealthDetailsFanIndex OBJECT-TYPE emm2fan0(5), emm2fan1(6), emm3fan0(7), - emm3fan1(8) + emm3fan1(8), + emm4fan0(9), + emm4fan1(10) } MAX-ACCESS not-accessible STATUS current @@ -1274,12 +1306,17 @@ eqlMemberStorageEntry OBJECT-TYPE EqlMemberStorageEntry ::= SEQUENCE { - eqlMemberTotalStorage Integer32, - eqlMemberUsedStorage Integer32, - eqlMemberSnapStorage Integer32, - eqlMemberReplStorage Integer32, - eqlMemberVirtualStorage Counter64, - eqlMemberCompressionStackStorage Counter64 + eqlMemberTotalStorage Integer32, + eqlMemberUsedStorage Integer32, + eqlMemberSnapStorage Integer32, + eqlMemberReplStorage Integer32, + eqlMemberVirtualStorage Counter64, + eqlMemberCompressionStackStorage Counter64, + eqlMemberCompressedSnapStorage Counter64, + eqlMemberPhysicalCompressedSnapStorage Counter64, + eqlMemberCompressionVolStackStorage Counter64, + eqlMemberCompressedVolStorage Counter64, + eqlMemberPhysicalCompressedVolStorage Counter64 } eqlMemberTotalStorage OBJECT-TYPE @@ -1324,6 +1361,41 @@ eqlMemberCompressionStackStorage OBJECT-TYPE DESCRIPTION "The amount of space (MB) used to store compressed data on this member." ::= { eqlMemberStorageEntry 6} +eqlMemberCompressedSnapStorage OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The amount of space (MB) represented by compressed data on this member." + ::= { eqlMemberStorageEntry 7} + +eqlMemberPhysicalCompressedSnapStorage OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The amount of space (MB) consumed on disk by compress-able data on this member." + ::= { eqlMemberStorageEntry 8} + +eqlMemberCompressionVolStackStorage OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The amount of space (MB) used to store compressed data on this member." + ::= { eqlMemberStorageEntry 9} + +eqlMemberCompressedVolStorage OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The amount of space (MB) represented by compressed data on this member." + ::= { eqlMemberStorageEntry 10} + +eqlMemberPhysicalCompressedVolStorage OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The amount of space (MB) consumed on disk by compress-able data on this member." + ::= { eqlMemberStorageEntry 11} + --************************************************************************** eqlMemberChassisTable OBJECT-TYPE @@ -1420,8 +1492,8 @@ eqlMemberChassisType OBJECT-TYPE tDELLSBB2u2425(5), tDELLSBB4u2435(6), tDELL2WB1425V1(7), - tDELLSBB5u6035(8) - + tDELLSBB5u6035(8), + tDELLQAR5u8435(9) } MAX-ACCESS read-only STATUS current @@ -2009,6 +2081,32 @@ eqlMemberHealthsumoChannelBothFailed NOTIFICATION-TYPE "Sent when both the Sumo Channel cards go into failed state." ::= { eqlMemberEnclosureMgmtNotifications 25 } +-- traps related to member IP Address, netmask, etc + +eqlMemberIPAddressChangeNotifications OBJECT IDENTIFIER ::= {eqlmemberNotifications 2} + + +eqlMemberGatewayIPAddrChanged NOTIFICATION-TYPE + OBJECTS{ + eqlMemberDefaultInetRouteType, + eqlMemberDefaultInetRoute + } + STATUS current + DESCRIPTION + "The member gateway IP address has changed. Contact the group administrator." +::= { eqlMemberIPAddressChangeNotifications 1 } + +eqlMemberStatusChangeNotifications OBJECT IDENTIFIER ::= {eqlmemberNotifications 3} + +eqlMemberStatusChanged NOTIFICATION-TYPE + OBJECTS{ + eqlMemberName, + eqlMemberState + } + STATUS current + DESCRIPTION + "Sent when a member of a multi-member group changes its state (offline/online)" +::= { eqlMemberStatusChangeNotifications 2 } --************************************************************************** @@ -2242,7 +2340,8 @@ eqlDriveGroupOpsStatusEntry OBJECT-TYPE EqlDriveGroupOpsStatusEntry ::= SEQUENCE { - eqlDriveGroupOpsStatusCompletePct Unsigned32 + eqlDriveGroupOpsStatusCompletePct Unsigned32, + eqlDriveGroupOpsSecureZeroing INTEGER } eqlDriveGroupOpsStatusCompletePct OBJECT-TYPE @@ -2252,6 +2351,16 @@ eqlDriveGroupOpsStatusCompletePct OBJECT-TYPE DESCRIPTION "The percentage complete an ongoing move or bind operation is" ::= {eqlDriveGroupOpsStatusEntry 1 } +eqlDriveGroupOpsSecureZeroing OBJECT-TYPE + SYNTAX INTEGER { + false(0), -- secure zeroing operation is not in progress. + true(1) -- secure zeroing operation is in progress. + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This field spicifies if secure zeroing operation is in progress." + ::= {eqlDriveGroupOpsStatusEntry 2 } + --****************************************************************** eqlMemberOpsTable OBJECT-TYPE @@ -2279,7 +2388,7 @@ EqlMemberOpsEntry ::= eqlMemberOpsOperationArg DisplayString, eqlMemberOpsOperationStatus INTEGER, eqlMemberOpsStartTime Unsigned32, - eqlMemberOpsOperationArg1 DisplayString + eqlMemberOpsOperationArg1 DisplayString } eqlMemberOpsIndex OBJECT-TYPE @@ -2326,7 +2435,8 @@ eqlMemberOpsExec OBJECT-TYPE SYNTAX INTEGER { none(0), cancel(1), - failed(2) + failed(2), + migration-inprogress(3) } MAX-ACCESS read-create STATUS current @@ -2470,7 +2580,10 @@ EqlMemberDynamicInfoEntry ::= SEQUENCE { eqlMemberDynamicInfoPendingUpdateVersion DisplayString, eqlMemberDynamicInfoIsRestartRunning INTEGER, - eqlMemberDynamicInfoIsUpdateRunning INTEGER + eqlMemberDynamicInfoIsUpdateRunning INTEGER, + eqlMemberRaidRebuildDelayEnable INTEGER, + eqlMemberRaidRebuildDelayStatus INTEGER, + eqlMemberRaidRebuildDelayRemaining Counter32 } eqlMemberDynamicInfoPendingUpdateVersion OBJECT-TYPE @@ -2505,6 +2618,45 @@ eqlMemberDynamicInfoIsUpdateRunning OBJECT-TYPE DEFVAL {not-running} ::= { eqlMemberDynamicInfoEntry 3 } +eqlMemberRaidRebuildDelayEnable OBJECT-TYPE + SYNTAX INTEGER { + enable(1), + disable(2) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field enables or disables a 24 hour delay before RAID rebuild on + supported Hybrid SSD platforms." + DEFVAL { disable } + ::= { eqlMemberDynamicInfoEntry 4 } + +eqlMemberRaidRebuildDelayStatus OBJECT-TYPE + SYNTAX INTEGER { + enabled (1), + disabled (2), + active (3), + error (4) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field reflects the status of the extra 24 hour delay before RAID rebuild on + supported Hybrid SSD platforms." + DEFVAL { enabled } + ::= { eqlMemberDynamicInfoEntry 5 } + +eqlMemberRaidRebuildDelayRemaining OBJECT-TYPE + SYNTAX Counter32 + UNITS "seconds" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Time remaining time of extra Raid rebuild delay on supported Hybrid SSD + platform. This field only has meaning on supported platforms + when eqlMemberRaidRebuildDelayEnable is enabled as shown via + eqlMemberRaidRebuildDelayStatus." + DEFVAL { 0 } + ::= { eqlMemberDynamicInfoEntry 6 } + + --************************************************************************** eqlMemberCacheStatisticsTable OBJECT-TYPE @@ -2807,8 +2959,10 @@ eqlMemberFirmwareInfoEntry OBJECT-TYPE EqlMemberFirmwareInfoEntry ::= SEQUENCE { - eqlMemberLanguageVersion DisplayString, - eqlMemberFirmwareInfoDataReduction INTEGER + eqlMemberLanguageVersion DisplayString, + eqlMemberFirmwareInfoDataReduction INTEGER, + eqlMemberFirmwareInfoCompressionCommand INTEGER, + eqlMemberFirmwareInfoVolumeCompressionCommand INTEGER } eqlMemberLanguageVersion OBJECT-TYPE @@ -2822,19 +2976,45 @@ eqlMemberLanguageVersion OBJECT-TYPE eqlMemberFirmwareInfoDataReduction OBJECT-TYPE SYNTAX INTEGER { unknown(0), -- Current state of data reduction support is unknown. - disabled(1), -- Member is capable of some form of data-reduction, but it has never been enabled. + not-started(1), -- Member is capable of some form of data-reduction, but it has never been enabled. no-capable-hardware(2), -- Current member does not support data-reduction. no-capable-raid(3), -- Data reduction is supported, but the RAID type is not correct. compression-running(4), -- Member is actively compressing data. - compression-paused(5) -- Compression of new data has been paused. + compression-suspended(5) -- Compression of new data has been stopped. } - MAX-ACCESS read-write + MAX-ACCESS read-only STATUS current DESCRIPTION "Current form of data reduction to be used on the member. The member must support the requested value in order for it to be set." DEFVAL { unknown } ::= { eqlMemberFirmwareInfoEntry 2 } +eqlMemberFirmwareInfoCompressionCommand OBJECT-TYPE + SYNTAX INTEGER { + ready(0), -- Returned on read. + start(1), -- Begin compression for the first time on the member. + suspend(2), -- Suspend compression on the member. + resume(3) -- Resume previously suspended compression. + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Current form of data reduction to be used on the member. + The member must support the requested value in order for it to be set." + DEFVAL { ready } + ::= { eqlMemberFirmwareInfoEntry 3 } + +eqlMemberFirmwareInfoVolumeCompressionCommand OBJECT-TYPE + SYNTAX INTEGER { + disable(0), -- Disable the base vol compression. + enable(1) -- Enable the base vol compression. + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Current form of data reduction to be used on the member. + The member must support the requested value in order for it to be set." + DEFVAL { disable } + ::= { eqlMemberFirmwareInfoEntry 4 } + --************************************************************************** eqlDriveGroupHeatProfileInfoTable OBJECT-TYPE @@ -3337,5 +3517,158 @@ EqlMemberPerTCPConnectionStatsEntry ::= --************************************************************************** +eqlMemberCompressionTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlMemberCompressionEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Persistent Member Compression Table." + ::= { eqlmemberObjects 34 } + +eqlMemberCompressionEntry OBJECT-TYPE + SYNTAX EqlMemberCompressionEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing member info" + INDEX { eqlGroupId, eqlMemberIndex } + ::= { eqlMemberCompressionTable 1 } + +EqlMemberCompressionEntry ::= + SEQUENCE { + eqlMemberCompressionForcePoolPages Counter64, + eqlMemberCompressionForceCapable TruthValue, + eqlMemberCompressionInitialized TruthValue + } + +eqlMemberCompressionForcePoolPages OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of pages forced to be available to compression for this member. + A value of 0 means system defaults for the compression pool size are in use." + ::= { eqlMemberCompressionEntry 1 } + +eqlMemberCompressionForceCapable OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This variable forces a member capable of supporting compression. + True means this member will be treated as a compression capable member." + DEFVAL { false } + ::= { eqlMemberCompressionEntry 2 } + +eqlMemberCompressionInitialized OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This variable specifies whether compression has ever been started on this member. + This value treated persistently." + DEFVAL { false } + ::= { eqlMemberCompressionEntry 3 } + + +--************************************************************************** + +eqlMemberSideplaneExpanderTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlMemberSideplaneExpanderEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic Member Hardware sideplane expander table. This table holds data on the sideplane expanders." + ::= { eqlmemberObjects 35 } + +eqlMemberSideplaneExpanderEntry OBJECT-TYPE + SYNTAX EqlMemberSideplaneExpanderEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing sideplane expander info" + INDEX { eqlGroupId, eqlMemberIndex, eqlMemberSideplaneExpanderIndex } + ::= { eqlMemberSideplaneExpanderTable 1 } + +EqlMemberSideplaneExpanderEntry ::= + SEQUENCE { + eqlMemberSideplaneExpanderIndex INTEGER, + eqlMemberSideplaneExpanderName DisplayString, + eqlMemberSideplaneExpanderFirmwareRev DisplayString, + eqlMemberSideplaneExpanderStatus INTEGER + } + +eqlMemberSideplaneExpanderIndex OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "A unique integer that identifies the sideplane expander that the + corresponding entry refers to." + ::= { eqlMemberSideplaneExpanderEntry 1 } + +eqlMemberSideplaneExpanderName OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..64)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the name of the sideplane expander." + ::= { eqlMemberSideplaneExpanderEntry 2 } + +eqlMemberSideplaneExpanderFirmwareRev OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..64)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the firmware revision of the sideplane expander." + ::= { eqlMemberSideplaneExpanderEntry 3 } + +eqlMemberSideplaneExpanderStatus OBJECT-TYPE + SYNTAX INTEGER { + unknown(0), + not-present(1), + failed(2), + good(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the status of the sideplane expander." + DEFVAL {unknown} + ::= { eqlMemberSideplaneExpanderEntry 4 } + + +--************************************************************************** + +eqlMemberDynamicInfoExtTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlMemberDynamicInfoExtEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic Member Info Extended Table" + ::= { eqlmemberObjects 36 } + +eqlMemberDynamicInfoExtEntry OBJECT-TYPE + SYNTAX EqlMemberDynamicInfoExtEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing dynamic member info " + INDEX { eqlGroupId, eqlMemberIndex } + ::= { eqlMemberDynamicInfoExtTable 1 } + +EqlMemberDynamicInfoExtEntry ::= + SEQUENCE { + eqlMemberDynamicInfoExtRowStatus RowStatus, + eqlMemberDynamicInfoExtRaidExpansionStatus INTEGER + } + +eqlMemberDynamicInfoExtRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field is used indicate the status of this entry." + ::= { eqlMemberDynamicInfoExtEntry 1 } + +eqlMemberDynamicInfoExtRaidExpansionStatus OBJECT-TYPE + SYNTAX INTEGER { + enabled(1), + disabled(2) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies raid expansion status when new drives are added." + DEFVAL { enabled } + ::= { eqlMemberDynamicInfoExtEntry 2 } + +--************************************************************************** + -- NOTE: DESCRIPTION strings for *Table entries are parsed. END diff --git a/mibs/equallogic/EQLNAS-MIB b/mibs/equallogic/EQLNAS-MIB index 0539febf30c..d419a5c3c6f 100644 --- a/mibs/equallogic/EQLNAS-MIB +++ b/mibs/equallogic/EQLNAS-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) -- These are from draft-ietf-ops-rfc2851-update-00.txt -- You will have to work out the details with your own @@ -18,11 +18,11 @@ IMPORTS -- FROM EQLGROUP-MIB eqlApplianceIndex, eqlApplianceNetworkType, eqlApplianceNetworkID FROM EQLAPPLIANCE-MIB - StatusDisabledDefault, SiteIndex, SiteIndexOrZero, eqliscsiVolumeReplSiteIndex + StatusDisabledDefault, SiteIndex, SiteIndexOrZero, eqliscsiVolumeReplSiteIndex FROM EQLVOLUME-MIB; eqlNASModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO "Contact: Customer Support @@ -35,7 +35,7 @@ eqlNASModule MODULE-IDENTITY DESCRIPTION "Appliances information. - Copyright (c) 2004-2011 by Dell, Inc. + Copyright (c) 2004-2014 by Dell, Inc. All rights reserved. This software may not be copied, disclosed, transferred, or used except in accordance with a license granted @@ -85,7 +85,21 @@ NASContainerNameType ::= TEXTUAL-CONVENTION DISPLAY-HINT "t" STATUS current DESCRIPTION "Name used to identify NAS Container. Contains only letters, digits and underscores. Must begin with either letter or an underscore." - SYNTAX OCTET STRING (SIZE (1..230)) + SYNTAX OCTET STRING (SIZE (1..230)) + + +NASStatisticsPeriodType ::= TEXTUAL-CONVENTION + DISPLAY-HINT "t" + STATUS current + DESCRIPTION "Time period desired when requesting statistics" + SYNTAX INTEGER { unknown(0), now(1), lastDay(2), lastWeek(3), lastMonth(4), lastYear(5) } + +NASComparisonToAverageType ::= TEXTUAL-CONVENTION + DISPLAY-HINT "t" + STATUS current + DESCRIPTION "Used to compare traffic rate to average" + SYNTAX INTEGER { unknown(0), below(1), above(2), equals(3) } + --*********************************************************************************** @@ -114,7 +128,8 @@ EqlNASApplianceEntry ::= eqlNASAppliancePoolSize Unsigned32, eqlNASApplianceEQLPoolIndex Unsigned32, eqlNASApplianceReplRemoteUserName OCTET STRING, - eqlNASApplianceNFSv4Mode INTEGER + eqlNASApplianceNFSv4Mode INTEGER, + eqlNASApplianceMaxClientSecondaryNetworks INTEGER } eqlNASApplianceRowStatus OBJECT-TYPE @@ -148,15 +163,24 @@ eqlNASApplianceReplRemoteUserName OBJECT-TYPE eqlNASApplianceNFSv4Mode OBJECT-TYPE SYNTAX INTEGER { - disabled (0), - enabled (1) + nfsv3(0), + nfsv40(1), + nfsv41(2) } MAX-ACCESS read-write STATUS current - DESCRIPTION "This field enables or disables NFSv4 Access NAS appliance." - DEFVAL { disabled } + DESCRIPTION "Maximum supported NFS version on NAS appliance.The possible options are nfs-v3 or nfs-v4 or nfs-v4-1." + DEFVAL { nfsv3 } ::= { eqlNASApplianceEntry 5 } +eqlNASApplianceMaxClientSecondaryNetworks OBJECT-TYPE + SYNTAX INTEGER (1 .. 399) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Maximum number of client secondary networks supported. Valid values are 1 to 399. Default value is 8" + DEFVAL { 8 } + ::= { eqlNASApplianceEntry 6 } + ----------------------------------------------------------------------------------------------- eqlNASContainerTable OBJECT-TYPE @@ -181,7 +205,7 @@ EqlNASContainerEntry ::= SEQUENCE { eqlNASContainerIndex Unsigned32, eqlNASContainerRowStatus RowStatus, - eqlNASContainerName OCTET STRING, + eqlNASContainerName NASContainerNameType, eqlNASContainerCapacity Unsigned32, eqlNASContainerUsedSpaceAlert Unsigned32, eqlNASContainerSnapshotHardQuota Unsigned32, @@ -198,12 +222,21 @@ EqlNASContainerEntry ::= eqlNASContainerAccessTimeFilter INTEGER, eqlNASContainerExcludeFilesByNamePattern OCTET STRING, eqlNASContainerAction INTEGER, - eqlNASContainerDefaultUserQuota Unsigned32, - eqlNASContainerDefaultUserQuotaAlert Unsigned32, - eqlNASContainerDefaultGroupQuota Unsigned32, - eqlNASContainerDefaultGroupQuotaAlert Unsigned32, - eqlNASContainerOptimizationFilterMode INTEGER, - eqlNASContainerRehydrateOnReadEnabled TruthValue + eqlNASContainerDefaultUserQuota Unsigned32, + eqlNASContainerDefaultUserQuotaAlert Unsigned32, + eqlNASContainerDefaultGroupQuota Unsigned32, + eqlNASContainerDefaultGroupQuotaAlert Unsigned32, + eqlNASContainerOptimizationFilterMode INTEGER, + eqlNASContainerRehydrateOnReadEnabled TruthValue, + eqlNASContainerSpaceProvisioning INTEGER, + eqlNASContainerThinReserve Unsigned32, + eqlNASContainerAvailableSpaceAlert Unsigned32, + eqlNASContainerIsClone INTEGER, + eqlNASContainerBaseContainerFSID Unsigned32, + eqlNASContainerBaseSnapshotId Unsigned32, + eqlNASContainerBaseContainerName NASContainerNameType, + eqlNASContainerBaseSnapshotName NASContainerNameType, + eqlNASContainerFewWriters StatusDisabledDefault } eqlNASContainerIndex OBJECT-TYPE @@ -221,7 +254,7 @@ eqlNASContainerRowStatus OBJECT-TYPE ::= { eqlNASContainerEntry 2 } eqlNASContainerName OBJECT-TYPE - SYNTAX OCTET STRING (SIZE (1..230)) + SYNTAX NASContainerNameType MAX-ACCESS read-create STATUS current DESCRIPTION "Name used to identify NAS Container. Contains only letters, digits and underscores. Must begin with either letter or an underscore. " @@ -334,18 +367,18 @@ eqlNASContainerCompressionEnabled OBJECT-TYPE ::= { eqlNASContainerEntry 15 } eqlNASContainerModificationTimeFilter OBJECT-TYPE - SYNTAX INTEGER (30..365) + SYNTAX INTEGER (5..365) MAX-ACCESS read-create STATUS current - DESCRIPTION "Exclude files modified less than the specified number of days before. 30 to 365 days" + DESCRIPTION "Exclude files modified less than the specified number of days before. Ranges from 5 to 365 days, default is 30 days." DEFVAL {30} ::= { eqlNASContainerEntry 16 } eqlNASContainerAccessTimeFilter OBJECT-TYPE - SYNTAX INTEGER (30..365) + SYNTAX INTEGER (5..365) MAX-ACCESS read-create STATUS current - DESCRIPTION "Exclude files accessed less than the specified number of days before. 30 to 365 days" + DESCRIPTION "Exclude files accessed less than the specified number of days before. Ranges from 5 to 365 days, default is 30 days." DEFVAL {30} ::= { eqlNASContainerEntry 17 } @@ -431,7 +464,89 @@ eqlNASContainerRehydrateOnReadEnabled OBJECT-TYPE ::= { eqlNASContainerEntry 25 } ----------------------------------------- +eqlNASContainerSpaceProvisioning OBJECT-TYPE + SYNTAX INTEGER { + thick(0), + thin(1) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Space Provisioning thin or thick for nas container." + DEFVAL {thick} + ::= { eqlNASContainerEntry 26 } + + +eqlNASContainerThinReserve OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "%" + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Minimum Space reserved for the thin provision enabled container." + DEFVAL {0} + ::= { eqlNASContainerEntry 27 } + + +eqlNASContainerAvailableSpaceAlert OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "%" + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Specified as a percentage of container space free space, this is the amount of available physical space + which triggers the user alert when thin provisioned containers physical available space falls below this threshold." + DEFVAL { 10 } + ::= { eqlNASContainerEntry 28 } + +eqlNASContainerIsClone OBJECT-TYPE + SYNTAX INTEGER { + no(0), + yes(1) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "True if container is a clone. False if it is not." + DEFVAL {no} + ::= { eqlNASContainerEntry 29 } + +eqlNASContainerBaseContainerFSID OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "File System ID for the base NAS container" + ::= { eqlNASContainerEntry 30 } + +eqlNASContainerBaseSnapshotId OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "File System ID for the base snapshot" + ::= { eqlNASContainerEntry 31 } + +eqlNASContainerBaseContainerName OBJECT-TYPE + SYNTAX NASContainerNameType + MAX-ACCESS read-create + STATUS current + DESCRIPTION "String containing NAS container name. This is mainly neeeded so auditing can + describe the base of the clone." + ::= { eqlNASContainerEntry 32 } + +eqlNASContainerBaseSnapshotName OBJECT-TYPE + SYNTAX NASContainerNameType + MAX-ACCESS read-create + STATUS current + DESCRIPTION "String containing NAS snapshot name. This is mainly neeeded so auditing can + describe the base of the clone." + ::= { eqlNASContainerEntry 33 } + +eqlNASContainerFewWriters OBJECT-TYPE + SYNTAX StatusDisabledDefault + MAX-ACCESS read-create + STATUS current + DESCRIPTION "When enable, optimize the container for few writer's + workloads." + DEFVAL {disabled} + ::= { eqlNASContainerEntry 34 } + +------------------------------------------------------------------------------- eqlNASContainerUniqueIDTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlNASContainerUniqueIDEntry MAX-ACCESS not-accessible @@ -533,7 +648,11 @@ EqlNASApplianceDefaultCfgEntry ::= eqlNASApplianceDefaultCIFSAntivirusExcludeDirPaths OCTET STRING, eqlNASApplianceDefaultCIFSAntivirusLargeFileSize Unsigned32, eqlNASApplianceDefaultCIFSAntivirusLargeFileOpen INTEGER, - eqlNASApplianceDefaultNFSExportsFileId32bit INTEGER + eqlNASApplianceDefaultNFSExportsFileId32bit INTEGER, + eqlNASApplianceDefaultCIFSAccessBasedEnumeration INTEGER, + eqlNASApplianceDefaultContainerSpaceProvision INTEGER, + eqlNASApplianceDefaultContainerThinReserve Unsigned32, + eqlNASApplianceDefaultContainerAvailableSpaceAlert Unsigned32 } eqlNASApplianceConfigUsedSpaceAlert OBJECT-TYPE @@ -730,18 +849,18 @@ eqlNASApplianceCompressionEnabled OBJECT-TYPE ::= { eqlNASApplianceDefaultCfgEntry 19 } eqlNASApplianceModificationTimeFilter OBJECT-TYPE - SYNTAX INTEGER (30..365) + SYNTAX INTEGER (5..365) MAX-ACCESS read-create STATUS current - DESCRIPTION "Exclude files modified less than the specified number of days before. 30 to 365 days." + DESCRIPTION "Exclude files modified less than the specified number of days before. Ranges from 5 to 365 days, default is 30 days." DEFVAL {30} ::= { eqlNASApplianceDefaultCfgEntry 20 } eqlNASApplianceAccessTimeFilter OBJECT-TYPE - SYNTAX INTEGER (30..365) + SYNTAX INTEGER (5..365) MAX-ACCESS read-create STATUS current - DESCRIPTION "Exclude files accessed less than the specified number of days before. 30 to 365 days." + DESCRIPTION "Exclude files accessed less than the specified number of days before. Ranges from 5 to 365 days, default is 30 days." DEFVAL {30} ::= { eqlNASApplianceDefaultCfgEntry 21 } @@ -838,6 +957,53 @@ eqlNASApplianceDefaultNFSExportsFileId32bit OBJECT-TYPE DEFVAL { enabled } ::= { eqlNASApplianceDefaultCfgEntry 30 } +eqlNASApplianceDefaultCIFSAccessBasedEnumeration OBJECT-TYPE + SYNTAX INTEGER { + disabled (0), + enabled (1) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This feature controls access based enumeration of CIFS shares. If access based enumeration is enabled, then the user who logged into the shares will only see the files he/she has permission to view/edit based on the ACL's." + DEFVAL { disabled } + ::= { eqlNASApplianceDefaultCfgEntry 31 } + + +eqlNASApplianceDefaultContainerSpaceProvision OBJECT-TYPE + SYNTAX INTEGER { + thick(0), + thin(1) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Default space provisioning for container thin or thick. By default all the containers will be + created as thick-provisioned containers." + DEFVAL { thick } + ::= { eqlNASApplianceDefaultCfgEntry 32 } + + +eqlNASApplianceDefaultContainerThinReserve OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "%" + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Specified as a percentage of container capacity in this nas-group. + This is the default amount of space reserved for the thin provisioned containers." + DEFVAL { 0 } --- 0% + ::= { eqlNASApplianceDefaultCfgEntry 33 } + + +eqlNASApplianceDefaultContainerAvailableSpaceAlert OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "%" + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Specified as a available physical space as percentage of container capacity in this nas-group. + This is the default amount of available physical space which triggers the + user alert when thin provisioned containers available space falls below this threshold." + DEFVAL { 10 } --- 10% + ::= { eqlNASApplianceDefaultCfgEntry 34 } + -------------------------------------------------------------------------------------------- eqlNASContainerStatusTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlNASContainerStatusEntry @@ -868,9 +1034,13 @@ EqlNASContainerStatusEntry ::= eqlNASContainerStatusFreeSpace Unsigned32, eqlNASContainerStatusNumOfSnapshots Unsigned32, eqlNASContainerStatusOptimizationSpaceSavings Unsigned32, - eqlNASContainerStatusOptimized TruthValue, + eqlNASContainerStatusOptimized TruthValue, eqlNASContainerStatusReplState INTEGER, - eqlNASContainerStatusNextSnapshotID Unsigned32 + eqlNASContainerStatusNextSnapshotID Unsigned32, + eqlNASContainerStatusFreeReservedSpace Unsigned32, + eqlNASContainerStatusFreeUnReservedSpace Unsigned32, + eqlNASContainerStatusOverCommittedSpace Unsigned32, + eqlNASContainerStatusCloneBaseUUID Unsigned32 } eqlNASContainerStatusConnections OBJECT-TYPE @@ -953,7 +1123,7 @@ eqlNASContainerStatusReplState OBJECT-TYPE source(1), destination(2), promoted(3), - not-available(4) + not-available(4) } MAX-ACCESS read-only STATUS current @@ -975,6 +1145,34 @@ eqlNASContainerStatusNextSnapshotID OBJECT-TYPE ::= { eqlNASContainerStatusEntry 12 } +eqlNASContainerStatusFreeReservedSpace OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Amount of Free reserved space in MB allocated for NAS Container" + ::= { eqlNASContainerStatusEntry 13 } + + +eqlNASContainerStatusFreeUnReservedSpace OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Amount of Free unreserved space in MB for NAS Container" + ::= { eqlNASContainerStatusEntry 14 } + +eqlNASContainerStatusOverCommittedSpace OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Amount of over committed space in MB for NAS Container" + ::= { eqlNASContainerStatusEntry 15 } + +eqlNASContainerStatusCloneBaseUUID OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "For replication, the UUID on a source snapshot should match that for a replication destination snapshot." + ::= { eqlNASContainerStatusEntry 16 } -------------------------------------------------------------------------------------------- eqlNASApplianceNFSExportsTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlNASApplianceNFSExportsEntry @@ -1005,7 +1203,9 @@ EqlNASApplianceNFSExportsEntry ::= eqlNASApplianceNFSAccessClientNetmaskType InetAddressType, eqlNASApplianceNFSAccessClientNetmask InetAddress, eqlNASApplianceNFSTrustUsers INTEGER, - eqlNASApplianceNFSExportsFileId32bit INTEGER + eqlNASApplianceNFSExportsFileId32bit INTEGER, + eqlNASApplianceNFSSecurityMethod BITS, + eqlNASApplianceNFSExportNetGroup OCTET STRING } eqlNASApplianceNFSExportName OBJECT-TYPE @@ -1101,6 +1301,55 @@ eqlNASApplianceNFSExportsFileId32bit OBJECT-TYPE DEFVAL { enabled } ::= { eqlNASApplianceNFSExportsEntry 11 } +eqlNASApplianceNFSSecurityMethod OBJECT-TYPE + SYNTAX BITS { + unix-style(0), + kerberos-v5(1), + kerberos-v5-integrity(2), + kerberos-v5-privacy(3), + flag4(4), + flag5(5), + flag6(6), + flag7(7), + flag8(8), + flag9(9), + flag10(10), + flag11(11), + flag12(12), + flag13(13), + flag14(14), + flag15(15), + flag16(16), + flag17(17), + flag18(18), + flag19(19), + flag20(20), + flag21(21), + flag22(22), + flag23(23), + flag24(24), + flag25(25), + flag26(26), + flag27(27), + flag28(28), + flag29(29), + flag30(30), + flag31(31) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "NFS exports security methods. Each bit in the 32 bit integer represent the security method + enabled on the nfs export. User should specify atleast one of the security method. + If not specified by default all the security methods are enabled. " + ::= { eqlNASApplianceNFSExportsEntry 12 } + +eqlNASApplianceNFSExportNetGroup OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..255)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Contains the netgroup name." + ::= { eqlNASApplianceNFSExportsEntry 13 } + -------------------------------------------------------------------------------------------- -- -- *** SW: Not yet supported by Exanet *** @@ -1208,7 +1457,10 @@ EqlNASApplianceCIFSEntry ::= eqlNASApplianceCIFSAntivirusExtensionsPolicy INTEGER, eqlNASApplianceCIFSAntivirusExcludeDirPaths OCTET STRING, eqlNASApplianceCIFSAntivirusLargeFileSize Unsigned32, - eqlNASApplianceCIFSAntivirusLargeFileOpen INTEGER + eqlNASApplianceCIFSAntivirusLargeFileOpen INTEGER, + eqlNASApplianceCIFSAccessBasedEnumeration INTEGER, + eqlNASApplianceCIFSContinuousAvailability StatusDisabledDefault, + eqlNASApplianceCIFSMessageEncryption StatusDisabledDefault } eqlNASApplianceCIFSShareName OBJECT-TYPE @@ -1317,6 +1569,33 @@ eqlNASApplianceCIFSAntivirusLargeFileOpen OBJECT-TYPE DEFVAL { deny } ::= { eqlNASApplianceCIFSEntry 12 } +eqlNASApplianceCIFSAccessBasedEnumeration OBJECT-TYPE + SYNTAX INTEGER { + disabled (0), + enabled (1) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This feature controls access based enumeration of CIFS shares. If access based enumeration is enabled on a CIFS share, then the user who logged into the share will only see the files he/she has permission to view/edit based on the ACL's." + DEFVAL { disabled } + ::= { eqlNASApplianceCIFSEntry 13 } + +eqlNASApplianceCIFSContinuousAvailability OBJECT-TYPE + SYNTAX StatusDisabledDefault + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Indicates whether continuous availability is enabled or disabled on the share." + DEFVAL { disabled } + ::= { eqlNASApplianceCIFSEntry 14 } + +eqlNASApplianceCIFSMessageEncryption OBJECT-TYPE + SYNTAX StatusDisabledDefault + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Defines whether traffic connected to this share must be encrypted." + DEFVAL { disabled } + ::= { eqlNASApplianceCIFSEntry 15 } + -------------------------------------------------------------------------------------------- eqlNASContainerDirectoryOpsTable OBJECT-TYPE @@ -1399,11 +1678,14 @@ EqlNASSnapshotEntry ::= eqlNASSnapshotIndex Unsigned32, eqlNASSnapshotRowStatus RowStatus, eqlNASSnapshotName OCTET STRING, - eqlNASSnapshotSize Integer32, -- does exanet return this or do we have to ask for it on each snapshot?(like in the gui) - -- if its not provided by default do we want to even show it? since its prob the delta size + eqlNASSnapshotSize Integer32, -- This comes from the SnapshotStatus XML request. eqlNASSnapshotTimestamp Counter32, eqlNASSnapshotRollBack TruthValue, - eqlNASSnapshotPolicyIdx Integer32 + eqlNASSnapshotPolicyIdx Integer32, + eqlNASSnapshotIsCloneBase INTEGER, + eqlNASSnapshotCloneCount Unsigned32, + eqlNASSnapshotIsReplicationSnap INTEGER, + eqlNASSnapshotUUID Unsigned32 } eqlNASSnapshotIndex OBJECT-TYPE @@ -1464,6 +1746,42 @@ eqlNASSnapshotPolicyIdx OBJECT-TYPE DEFVAL { 0 } ::= { eqlNASSnapshotEntry 7 } +eqlNASSnapshotIsCloneBase OBJECT-TYPE + SYNTAX INTEGER { + no(0), + yes(1) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "1 if this snapshot is the base for a clone container. Otherwise 0" + DEFVAL { no } + ::= { eqlNASSnapshotEntry 8 } + +eqlNASSnapshotCloneCount OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Number of clones based on this snapshot" + ::= { eqlNASSnapshotEntry 9 } + +eqlNASSnapshotIsReplicationSnap OBJECT-TYPE + SYNTAX INTEGER { + no(0), + yes(1) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Zero for normal snapshot. One for replication snapshot" + DEFVAL { 0 } + ::= { eqlNASSnapshotEntry 10 } + +eqlNASSnapshotUUID OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "UUID for replication snapshot. Zero for source. Nonzero for destination." + DEFVAL { 0 } + ::= { eqlNASSnapshotEntry 11 } ---********************************************************************* @@ -2079,7 +2397,8 @@ eqlNASReplSiteAction OBJECT-TYPE SYNTAX INTEGER { none(0), configure(1), - delete(2) + delete(2), + upgrade-protocol-version-v3(3) } MAX-ACCESS read-write STATUS current @@ -3595,7 +3914,7 @@ eqlNASDiagsTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlNASDiagsEntry MAX-ACCESS not-accessible STATUS current - DESCRIPTION "EqualLogic-Dynamic table controlling the NAS diags." + DESCRIPTION "EqualLogic-Dynamic(semi) table controlling the NAS diags." ::= { eqlNASObjects 21 } eqlNASDiagsEntry OBJECT-TYPE @@ -3611,9 +3930,15 @@ EqlNASDiagsEntry ::= SEQUENCE { eqlNASDiagsStart INTEGER, eqlNASDiagsCaseNumber OCTET STRING, - eqlNASDiagsStatus INTEGER + eqlNASDiagsStatus INTEGER, + eqlNASDiagsClientIp OCTET STRING, + eqlNASDiagsPath OCTET STRING, + eqlNASDiagsGenParam1 OCTET STRING, + eqlNASDiagsGenParam2 OCTET STRING, + eqlNASDiagsSMBHomeShareUser OCTET STRING } +-- "fileaccessibility" and "logs" are not used. There is no XML to run them separately. eqlNASDiagsStart OBJECT-TYPE SYNTAX INTEGER { general(1), @@ -3623,11 +3948,15 @@ eqlNASDiagsStart OBJECT-TYPE clientconnectivity(5), fileaccessibility(6), protocolslog(7), - logs(8) + logs(8), + nfsfileaccessibility(9), + cifsfileaccessibility(10), + smbhomesharefileaccessibility(11) } MAX-ACCESS read-write STATUS current DESCRIPTION "This field selects the diagnostic to start." + DEFVAL { general } ::= { eqlNASDiagsEntry 1 } eqlNASDiagsCaseNumber OBJECT-TYPE @@ -3649,6 +3978,46 @@ eqlNASDiagsStatus OBJECT-TYPE operation." ::= { eqlNASDiagsEntry 3 } +eqlNASDiagsClientIp OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..64)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "IPv4 address for client IP interface, but make it big enough for future use" + ::= { eqlNASDiagsEntry 4 } + +eqlNASDiagsPath OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..512)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Directory path for CIFS share or NFS export. For performance, or NFS + accessibility, this holds NAS container name." + ::= { eqlNASDiagsEntry 5 } + +eqlNASDiagsGenParam1 OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Generic param. The usage depends on the diagnostic. For performance, or NFS + accessibility, this holds NAS container FSID, For Protocols diag, this holds + 'NFS' or 'CIFS'." + ::= { eqlNASDiagsEntry 6 } + +eqlNASDiagsGenParam2 OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..64)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Generic param. The usage depends on the diagnostic. For NFS accessibility, this contains + the export name. For CIFS accessibility, this contains the share name." + ::= { eqlNASDiagsEntry 7 } + +eqlNASDiagsSMBHomeShareUser OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..256)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Home share user name. Full user name (in the form DOMAIN\username) of the owner + of home directory." + ::= { eqlNASDiagsEntry 8 } + --------------------------------------------------------------------------------------------------- eqlNASClientStaticRouteTable OBJECT-TYPE @@ -3981,10 +4350,12 @@ eqlNASReplPartnerConfigEntry OBJECT-TYPE EqlNASReplPartnerConfigEntry ::= SEQUENCE { - eqlNASReplPartnerConfigRowStatus RowStatus, - eqlNASReplPartnerConfigCertificate CertificateType, - eqlNASReplPartnerConfigInetAddrType InetAddressType, - eqlNASReplPartnerConfigInetAddr InetAddress + eqlNASReplPartnerConfigRowStatus RowStatus, + eqlNASReplPartnerConfigCertificate CertificateType, + eqlNASReplPartnerConfigInetAddrType InetAddressType, + eqlNASReplPartnerConfigInetAddr InetAddress, + eqlNASReplPartnerConfigProtocolVersion INTEGER, + eqlNASReplPartnerConfigStatus INTEGER } eqlNASReplPartnerConfigRowStatus OBJECT-TYPE @@ -4020,6 +4391,30 @@ eqlNASReplPartnerConfigInetAddr OBJECT-TYPE "The RemoteCluster SAN VIP" ::= { eqlNASReplPartnerConfigEntry 4 } +eqlNASReplPartnerConfigProtocolVersion OBJECT-TYPE + SYNTAX INTEGER { + none(0), + v3(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Protocol version for the partnership trust" +::= { eqlNASReplPartnerConfigEntry 5 } + +eqlNASReplPartnerConfigStatus OBJECT-TYPE + SYNTAX INTEGER { + none(0), + unavailable(1), + available(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Trust configuration status" +::= { eqlNASReplPartnerConfigEntry 6 } + + ----------------------------------------------------------------------------------------------- eqlNASReplTable OBJECT-TYPE @@ -4613,7 +5008,8 @@ eqlNASClientUserName OBJECT-TYPE eqlNASClientProtocol OBJECT-TYPE SYNTAX INTEGER { - cifs(1) + cifs(1), + nfs(0) } MAX-ACCESS read-only STATUS current @@ -4649,8 +5045,8 @@ eqlNASClientIsGuest OBJECT-TYPE DESCRIPTION "True if the client initiating this connection is a guest." ::= { eqlNASClientEntry 9 } ------------------------------------------------------------------------------------------------ - +----------------------------------------------------------------------------------------------- +-- Only used for Springbank. Not used for Springbankplus eqlNASStatsClusterTrafficRateTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlNASStatsClusterTrafficRateEntry MAX-ACCESS not-accessible @@ -4853,6 +5249,7 @@ eqlNASStatsClusterTrafficRateTotalSecondaryMBsPerSec OBJECT-TYPE ----------------------------------------------------------------------------------------------- +-- Only used for Springbank. Not used for Springbankplus eqlNASStatsControllerTrafficRateTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlNASStatsControllerTrafficRateEntry MAX-ACCESS not-accessible @@ -5074,6 +5471,7 @@ eqlNASStatsControllerTrafficRateTotalSecondaryMBsPerSec OBJECT-TYPE -------------------------------------------------------------------------------------------- +-- Only used for Springbank. Not used for Springbankplus eqlNASStatsControllerLoadBalancingTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlNASStatsControllerLoadBalancingEntry MAX-ACCESS not-accessible @@ -5558,7 +5956,7 @@ eqlNASLostContainerEntry OBJECT-TYPE EqlNASLostContainerEntry ::= SEQUENCE { eqlNASLostContainerRowStatus RowStatus, - eqlNASLostContainerName OCTET STRING, + eqlNASLostContainerName NASContainerNameType, eqlNASLostContainerCapacity Unsigned32, eqlNASLostContainerUsedSpaceAlert Unsigned32, eqlNASLostContainerSnapshotUsedSpaceAlert Unsigned32 @@ -5572,7 +5970,7 @@ eqlNASLostContainerRowStatus OBJECT-TYPE ::= { eqlNASLostContainerEntry 1 } eqlNASLostContainerName OBJECT-TYPE - SYNTAX OCTET STRING (SIZE (1..230)) + SYNTAX NASContainerNameType MAX-ACCESS read-create STATUS current DESCRIPTION "Name used to identify NAS Container. Contains only letters, digits and underscores. Must begin with either letter or an underscore. " @@ -5693,4 +6091,1594 @@ eqlNASSanStaticRouteGatewayAddr OBJECT-TYPE route (e.g., 10.127.20.30)" ::= { eqlNASSanStaticRouteEntry 7 } +-------------------------------------------------------------------------------------------- + +eqlNASStatsClusterTrafficRateHistoryTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlNASStatsClusterTrafficRateHistoryEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic + This table contains current and historical NAS traffic rate statistics for the NAS cluster. + TimeoutAll:60" + ::= { eqlNASObjects 46 } + +eqlNASStatsClusterTrafficRateHistoryEntry OBJECT-TYPE + SYNTAX EqlNASStatsClusterTrafficRateHistoryEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "NAS cluster traffic rate statistics." + INDEX { eqlApplianceIndex, eqlNASStatsClusterTrafficRateHistoryPeriod, eqlNASStatsClusterTrafficRateHistoryTimestamp } + + ::= { eqlNASStatsClusterTrafficRateHistoryTable 1} + +EqlNASStatsClusterTrafficRateHistoryEntry ::= + SEQUENCE { + eqlNASStatsClusterTrafficRateHistoryPeriod NASStatisticsPeriodType, + eqlNASStatsClusterTrafficRateHistoryTimestamp Counter32, + eqlNASStatsClusterTrafficRateHistoryNfsReadMBsPerSec Unsigned32, + eqlNASStatsClusterTrafficRateHistoryNfsWriteMBsPerSec Unsigned32, + eqlNASStatsClusterTrafficRateHistoryNdmpReadMBsPerSec Unsigned32, + eqlNASStatsClusterTrafficRateHistoryNdmpWriteMBsPerSec Unsigned32, + eqlNASStatsClusterTrafficRateHistoryCifsReadMBsPerSec Unsigned32, + eqlNASStatsClusterTrafficRateHistoryCifsWriteMBsPerSec Unsigned32, + eqlNASStatsClusterTrafficRateHistoryReplicationReadMBsPerSec Unsigned32, + eqlNASStatsClusterTrafficRateHistoryReplicationWriteMBsPerSec Unsigned32, + eqlNASStatsClusterTrafficRateHistoryStorageSubSystemReadMBsPerSec Unsigned32, + eqlNASStatsClusterTrafficRateHistoryStorageSubSystemWriteMBsPerSec Unsigned32, + eqlNASStatsClusterTrafficRateHistoryNetworkOverheadReadMBsPerSec Unsigned32, + eqlNASStatsClusterTrafficRateHistoryNetworkOverheadWriteMBsPerSec Unsigned32, + eqlNASStatsClusterTrafficRateHistoryNetworkPacketDropsPerSec Unsigned32, + eqlNASStatsClusterTrafficRateHistoryNfsIOPSRead Unsigned32, + eqlNASStatsClusterTrafficRateHistoryNfsIOPSWrite Unsigned32, + eqlNASStatsClusterTrafficRateHistoryNfsIOPSOther Unsigned32, + eqlNASStatsClusterTrafficRateHistoryCifsIOPSRead Unsigned32, + eqlNASStatsClusterTrafficRateHistoryCifsIOPSWrite Unsigned32, + eqlNASStatsClusterTrafficRateHistoryCifsIOPSOther Unsigned32, + eqlNASStatsClusterTrafficRateHistoryTotalPrimaryMBsPerSec Unsigned32, + eqlNASStatsClusterTrafficRateHistoryTotalSecondaryMBsPerSec Unsigned32 + } + +eqlNASStatsClusterTrafficRateHistoryPeriod OBJECT-TYPE + SYNTAX NASStatisticsPeriodType + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Selects desired time period for statistics" + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 1 } + +eqlNASStatsClusterTrafficRateHistoryTimestamp OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the date/time when the statistics were collected. + Time is represented as the time in seconds since 00:00:00 UTC, 1970-01-01." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 2 } + +eqlNASStatsClusterTrafficRateHistoryNfsReadMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of MBs read per second via NFS per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 3 } + + +eqlNASStatsClusterTrafficRateHistoryNfsWriteMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of MBs written per second via NFS per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 4 } + +eqlNASStatsClusterTrafficRateHistoryNdmpReadMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of MBs read per second via NDMP per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 5 } + +eqlNASStatsClusterTrafficRateHistoryNdmpWriteMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of MBs written per second via NDMP per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 6 } + +eqlNASStatsClusterTrafficRateHistoryCifsReadMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of MBs read per second via CIFS per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 7 } + +eqlNASStatsClusterTrafficRateHistoryCifsWriteMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of MBs written per second via CIFS per second per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 8 } + +eqlNASStatsClusterTrafficRateHistoryReplicationReadMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of replication MBs read per second per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 9 } + +eqlNASStatsClusterTrafficRateHistoryReplicationWriteMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of replication MBs written per second per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 10 } + +eqlNASStatsClusterTrafficRateHistoryStorageSubSystemReadMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of storage subsystem MBs read per second per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 11 } + +eqlNASStatsClusterTrafficRateHistoryStorageSubSystemWriteMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of storage subsystem MBs written per second per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 12 } + +eqlNASStatsClusterTrafficRateHistoryNetworkOverheadReadMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of network overhead MBs read per second per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 13 } + +eqlNASStatsClusterTrafficRateHistoryNetworkOverheadWriteMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of network overhead MBs written per second per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 14 } + +eqlNASStatsClusterTrafficRateHistoryNetworkPacketDropsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of network packet drops per second per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 15 } + +eqlNASStatsClusterTrafficRateHistoryNfsIOPSRead OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of NFS IO read operations per second per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 16 } + +eqlNASStatsClusterTrafficRateHistoryNfsIOPSWrite OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of NFS IO write operations per second per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 17 } + +eqlNASStatsClusterTrafficRateHistoryNfsIOPSOther OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of NFS IO other operations per second per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 18 } + +eqlNASStatsClusterTrafficRateHistoryCifsIOPSRead OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of CIFS IO read operations per second per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 19 } + +eqlNASStatsClusterTrafficRateHistoryCifsIOPSWrite OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of CIFS IO write operations per second per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 20 } + +eqlNASStatsClusterTrafficRateHistoryCifsIOPSOther OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of CIFS IO other operations per second per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 21 } + +eqlNASStatsClusterTrafficRateHistoryTotalPrimaryMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The total number of primary MBs per second per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 22 } + +eqlNASStatsClusterTrafficRateHistoryTotalSecondaryMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The total number of secondary MBs per second per cluster." + ::= { eqlNASStatsClusterTrafficRateHistoryEntry 23 } + + +----------------------------------------------------------------------------------------------- + +eqlNASStatsControllerTrafficRateHistoryTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlNASStatsControllerTrafficRateHistoryEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic + This table contains NAS traffic rate statistics for the NAS controller. + TimeoutAll:60" + ::= { eqlNASObjects 47 } + +eqlNASStatsControllerTrafficRateHistoryEntry OBJECT-TYPE + SYNTAX EqlNASStatsControllerTrafficRateHistoryEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing NAS controller traffic rate statistics." + INDEX { eqlApplianceIndex, eqlNASChassisControllerIndex, eqlNASStatsControllerTrafficRateHistoryPeriod, eqlNASStatsControllerTrafficRateHistoryTimestamp } + + ::= { eqlNASStatsControllerTrafficRateHistoryTable 1} + +EqlNASStatsControllerTrafficRateHistoryEntry ::= + SEQUENCE { + eqlNASStatsControllerTrafficRateHistoryNode Unsigned32, + eqlNASStatsControllerTrafficRateHistoryPeriod NASStatisticsPeriodType, + eqlNASStatsControllerTrafficRateHistoryTimestamp Counter32, + eqlNASStatsControllerTrafficRateHistoryNfsReadMBsPerSec Unsigned32, + eqlNASStatsControllerTrafficRateHistoryNfsWriteMBsPerSec Unsigned32, + eqlNASStatsControllerTrafficRateHistoryNdmpReadMBsPerSec Unsigned32, + eqlNASStatsControllerTrafficRateHistoryNdmpWriteMBsPerSec Unsigned32, + eqlNASStatsControllerTrafficRateHistoryCifsReadMBsPerSec Unsigned32, + eqlNASStatsControllerTrafficRateHistoryCifsWriteMBsPerSec Unsigned32, + eqlNASStatsControllerTrafficRateHistoryReplicationReadMBsPerSec Unsigned32, + eqlNASStatsControllerTrafficRateHistoryReplicationWriteMBsPerSec Unsigned32, + eqlNASStatsControllerTrafficRateHistoryStorageSubSystemReadMBsPerSec Unsigned32, + eqlNASStatsControllerTrafficRateHistoryStorageSubSystemWriteMBsPerSec Unsigned32, + eqlNASStatsControllerTrafficRateHistoryNetworkOverheadReadMBsPerSec Unsigned32, + eqlNASStatsControllerTrafficRateHistoryNetworkOverheadWriteMBsPerSec Unsigned32, + eqlNASStatsControllerTrafficRateHistoryNetworkPacketDropsPerSec Unsigned32, + eqlNASStatsControllerTrafficRateHistoryNfsIOPSRead Unsigned32, + eqlNASStatsControllerTrafficRateHistoryNfsIOPSWrite Unsigned32, + eqlNASStatsControllerTrafficRateHistoryNfsIOPSOther Unsigned32, + eqlNASStatsControllerTrafficRateHistoryCifsIOPSRead Unsigned32, + eqlNASStatsControllerTrafficRateHistoryCifsIOPSWrite Unsigned32, + eqlNASStatsControllerTrafficRateHistoryCifsIOPSOther Unsigned32, + eqlNASStatsControllerTrafficRateHistoryTotalPrimaryMBsPerSec Unsigned32, + eqlNASStatsControllerTrafficRateHistoryTotalPrimaryMBsPerSecToAverage NASComparisonToAverageType, + eqlNASStatsControllerTrafficRateHistoryTotalSecondaryMBsPerSec Unsigned32 + } + +eqlNASStatsControllerTrafficRateHistoryNode OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Controller/Node number 1, 2, ..." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 1 } + +eqlNASStatsControllerTrafficRateHistoryPeriod OBJECT-TYPE + SYNTAX NASStatisticsPeriodType + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Selects desired time period for statistics" + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 2 } + +eqlNASStatsControllerTrafficRateHistoryTimestamp OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the date/time when the statistics were collected. + Time is represented as the time in seconds since 00:00:00 UTC, 1970-01-01." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 3 } + +eqlNASStatsControllerTrafficRateHistoryNfsReadMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of MBs read per second via NFS per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 4 } + +eqlNASStatsControllerTrafficRateHistoryNfsWriteMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of MBs written per second via NFS per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 5 } + +eqlNASStatsControllerTrafficRateHistoryNdmpReadMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of MBs read per second via NDMP per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 6 } + +eqlNASStatsControllerTrafficRateHistoryNdmpWriteMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of MBs written per second via NDMP per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 7 } + +eqlNASStatsControllerTrafficRateHistoryCifsReadMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of MBs read per second via CIFS per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 8 } + +eqlNASStatsControllerTrafficRateHistoryCifsWriteMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of MBs written per second via CIFS per controller" + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 9 } + +eqlNASStatsControllerTrafficRateHistoryReplicationReadMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of replication MBs read per second per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 10 } + +eqlNASStatsControllerTrafficRateHistoryReplicationWriteMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of replication MBs written per second per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 11 } + +eqlNASStatsControllerTrafficRateHistoryStorageSubSystemReadMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of storage subsytem MBs read per second per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 12 } + +eqlNASStatsControllerTrafficRateHistoryStorageSubSystemWriteMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of storage subsystem MBs written per second per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 13 } + +eqlNASStatsControllerTrafficRateHistoryNetworkOverheadReadMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of network overhead MBs per second per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 14 } + +eqlNASStatsControllerTrafficRateHistoryNetworkOverheadWriteMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of network overhead MBs per second per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 15 } + +eqlNASStatsControllerTrafficRateHistoryNetworkPacketDropsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of network packet drops per second per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 16 } + +eqlNASStatsControllerTrafficRateHistoryNfsIOPSRead OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of NFS IO read operations per second per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 17 } + +eqlNASStatsControllerTrafficRateHistoryNfsIOPSWrite OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of NFS IO write operations per second per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 18 } + +eqlNASStatsControllerTrafficRateHistoryNfsIOPSOther OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of NFS IO other operations per second per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 19 } + +eqlNASStatsControllerTrafficRateHistoryCifsIOPSRead OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of CIFS IO read operations per second per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 20 } + +eqlNASStatsControllerTrafficRateHistoryCifsIOPSWrite OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of CIFS IO write operations per second per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 21 } + +eqlNASStatsControllerTrafficRateHistoryCifsIOPSOther OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of CIFS IO other operations per second per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 22 } + +eqlNASStatsControllerTrafficRateHistoryTotalPrimaryMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The total primary MBs per second per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 23 } + +eqlNASStatsControllerTrafficRateHistoryTotalPrimaryMBsPerSecToAverage OBJECT-TYPE + SYNTAX NASComparisonToAverageType + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The total primary MBs per second compared to average for this controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 24 } + +eqlNASStatsControllerTrafficRateHistoryTotalSecondaryMBsPerSec OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The total secondary MBs per second per controller." + ::= { eqlNASStatsControllerTrafficRateHistoryEntry 25 } + +-------------------------------------------------------------------------------------------- + +eqlNASStatsControllerLoadBalancingHistoryTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlNASStatsControllerLoadBalancingHistoryEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic + NAS controller load balancing statistics table. + TimeoutAll:60" + ::= { eqlNASStatsControllerTrafficRateHistoryTable 2 } + +eqlNASStatsControllerLoadBalancingHistoryEntry OBJECT-TYPE + SYNTAX EqlNASStatsControllerLoadBalancingHistoryEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing controller load balancing statistics." + INDEX { eqlApplianceIndex, eqlNASChassisControllerIndex, eqlNASStatsControllerLoadBalancingHistoryPeriod, eqlNASStatsControllerLoadBalancingHistoryTimestamp } + + ::= { eqlNASStatsControllerLoadBalancingHistoryTable 1 } + +EqlNASStatsControllerLoadBalancingHistoryEntry ::= + SEQUENCE { + eqlNASStatsControllerLoadBalancingHistoryNode Unsigned32, + eqlNASStatsControllerLoadBalancingHistoryPeriod NASStatisticsPeriodType, + eqlNASStatsControllerLoadBalancingHistoryTimestamp Counter32, + eqlNASStatsControllerLoadBalancingHistoryCPULoadPercent Unsigned32, + eqlNASStatsControllerLoadBalancingHistoryTotalCifsConnections Unsigned32 + } + +eqlNASStatsControllerLoadBalancingHistoryNode OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Node number 1, 2, ..." + ::= { eqlNASStatsControllerLoadBalancingHistoryEntry 1 } + +eqlNASStatsControllerLoadBalancingHistoryPeriod OBJECT-TYPE + SYNTAX NASStatisticsPeriodType + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Selects desired time period for statistics" + ::= { eqlNASStatsControllerLoadBalancingHistoryEntry 2 } + +eqlNASStatsControllerLoadBalancingHistoryTimestamp OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the date/time when the statistics were collected. + Time is represented as the time in seconds since 00:00:00 UTC, 1970-01-01." + ::= { eqlNASStatsControllerLoadBalancingHistoryEntry 3 } + +eqlNASStatsControllerLoadBalancingHistoryCPULoadPercent OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "%" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The percentage of time the CPU is executing instructions." + ::= { eqlNASStatsControllerLoadBalancingHistoryEntry 4 } + +eqlNASStatsControllerLoadBalancingHistoryTotalCifsConnections OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The total number of CIFS connections terminated on the controller." + ::= { eqlNASStatsControllerLoadBalancingHistoryEntry 5 } + +----------------------------------------------------------------------------------------------- + +eqlNASApplianceCifsHomeShareTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlNASApplianceCifsHomeShareEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic table used to store information of the cifs home share for a NAS appliance. + TimeoutAll:60" + ::= { eqlNASObjects 48 } + +eqlNASApplianceCifsHomeShareEntry OBJECT-TYPE + SYNTAX EqlNASApplianceCifsHomeShareEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry contains the cifs home share information for a NAS appliance." + INDEX { eqlApplianceIndex, eqlNASApplianceCifsHomeShareIndex } + ::= { eqlNASApplianceCifsHomeShareTable 1 } + +EqlNASApplianceCifsHomeShareEntry ::= + SEQUENCE { + eqlNASApplianceCifsHomeShareIndex Unsigned32, + eqlNASApplianceCifsHomeShareRowStatus RowStatus, + eqlNASApplianceCifsHomeShareContainerIdentifier Unsigned32, + eqlNASApplianceCifsHomeShareContainerName NASContainerNameType, + eqlNASApplianceCifsHomeSharePathPrefix OCTET STRING, + eqlNASApplianceCifsHomeSharePathTemplate INTEGER, + eqlNASApplianceCifsHomeShareEnabled StatusDisabledDefault, + eqlNASApplianceCifsHomeShareAccessBasedEnumeration StatusDisabledDefault, + eqlNASApplianceCifsHomeShareAntivirusEnabled StatusDisabledDefault, + eqlNASApplianceCifsHomeShareAntivirusExtensions OCTET STRING, + eqlNASApplianceCifsHomeShareAntivirusExcludeDirPaths OCTET STRING, + eqlNASApplianceCifsHomeShareAntivirusLargeFileSize Unsigned32, + eqlNASApplianceCifsHomeShareAntivirusLargeFileOpen INTEGER, + eqlNASApplianceCifsHomeShareHomeFolderAutoCreate StatusDisabledDefault + } + +eqlNASApplianceCifsHomeShareIndex OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "This field specifies an index that uniquely identifies the cifs home share entry." + ::= { eqlNASApplianceCifsHomeShareEntry 1 } + +eqlNASApplianceCifsHomeShareRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field is used to manage the conceptual row entry." + ::= { eqlNASApplianceCifsHomeShareEntry 2 } + +eqlNASApplianceCifsHomeShareContainerIdentifier OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "The FSID of the nas container that contains the CIFS Home Share." + ::= { eqlNASApplianceCifsHomeShareEntry 3 } + +eqlNASApplianceCifsHomeShareContainerName OBJECT-TYPE + SYNTAX NASContainerNameType + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The name of the container used for the CIFS home share." + ::= { eqlNASApplianceCifsHomeShareEntry 4 } + +eqlNASApplianceCifsHomeSharePathPrefix OBJECT-TYPE + SYNTAX OCTET STRING(SIZE(1..256)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "The path prefix of the CIFS home share." + ::= { eqlNASApplianceCifsHomeShareEntry 5 } + +eqlNASApplianceCifsHomeSharePathTemplate OBJECT-TYPE + SYNTAX INTEGER { + domain-user(0), + user(1) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Use this column to set the cifs home share behavior for users on a domain or for regular users." +::= { eqlNASApplianceCifsHomeShareEntry 6 } + +eqlNASApplianceCifsHomeShareEnabled OBJECT-TYPE + SYNTAX StatusDisabledDefault + MAX-ACCESS read-create + STATUS current + DESCRIPTION "When set to enable, the CIFS home share becomes accessible." + ::= { eqlNASApplianceCifsHomeShareEntry 7 } + +eqlNASApplianceCifsHomeShareAccessBasedEnumeration OBJECT-TYPE + SYNTAX StatusDisabledDefault + MAX-ACCESS read-create + STATUS current + DESCRIPTION "When set to enable, the CIFS home share allows access-based enumeration." + ::= { eqlNASApplianceCifsHomeShareEntry 8 } + +eqlNASApplianceCifsHomeShareAntivirusEnabled OBJECT-TYPE + SYNTAX StatusDisabledDefault + MAX-ACCESS read-create + STATUS current + DESCRIPTION "When set to enable, cifs home share files are scanned for viruses." + ::= { eqlNASApplianceCifsHomeShareEntry 9 } + +eqlNASApplianceCifsHomeShareAntivirusExtensions OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..255)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Default which determines which files should be / should not be scanned for viruses. This is a comma-separated list. The value of the next field determines if the files with the corresponding extensions will be scanned or not for viruses. Cannot contain wild characters * and ?. Extensions are case-insensitive." + DEFVAL {""} + ::= { eqlNASApplianceCifsHomeShareEntry 10 } + +eqlNASApplianceCifsHomeShareAntivirusExcludeDirPaths OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..512)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Default which determines the list of the directory paths which should not be scanned for viruses. It is a comma-separated list. Paths can contain wildcards * and ?. NOTE: * will not match several path components. " + DEFVAL {""} + ::= { eqlNASApplianceCifsHomeShareEntry 11 } + +eqlNASApplianceCifsHomeShareAntivirusLargeFileSize OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "The threshold for the largest file size in MB that is accepted for on-the-fly antivirus scanning." + DEFVAL { 1500 } + ::= { eqlNASApplianceCifsHomeShareEntry 12 } + +eqlNASApplianceCifsHomeShareAntivirusLargeFileOpen OBJECT-TYPE + SYNTAX INTEGER { + deny (0), + allow (1) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "When set to deny, do not scan files larger than the value in eqlNASApplianceCifsHomeShareAntivirusLargeFileSize." + ::= { eqlNASApplianceCifsHomeShareEntry 13 } + +eqlNASApplianceCifsHomeShareHomeFolderAutoCreate OBJECT-TYPE + SYNTAX StatusDisabledDefault + MAX-ACCESS read-create + STATUS current + DESCRIPTION "To enable or disable the home folder auto create option." + ::= { eqlNASApplianceCifsHomeShareEntry 14 } + +-------------------------------------------------------------------------------------------------- + + +eqlNASClientLoadBalanceTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlNASClientLoadBalanceEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic + This table contains information about the client load balance information. + TimeoutAll:60" + ::= { eqlNASObjects 49 } + +eqlNASClientLoadBalanceEntry OBJECT-TYPE + SYNTAX EqlNASClientLoadBalanceEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing client load balance information." + INDEX { eqlApplianceIndex, eqlNASClientLoadBalanceLocalIPAddressType, eqlNASClientLoadBalanceLocalIPAddress, eqlNASClientLoadBalanceAccessIPAddressType, eqlNASClientLoadBalanceAccessIPAddress } + + ::= { eqlNASClientLoadBalanceTable 1 } + +EqlNASClientLoadBalanceEntry ::= + SEQUENCE { + eqlNASClientLoadBalanceLocalIPAddressType InetAddressType, + eqlNASClientLoadBalanceLocalIPAddress InetAddress, + eqlNASClientLoadBalanceAccessIPAddressType InetAddressType, + eqlNASClientLoadBalanceAccessIPAddress InetAddress, + eqlNASClientLoadBalanceCurrentControllerIndex Integer32, + eqlNASClientLoadBalanceAssignedControllerIndex Integer32, + eqlNASClientLoadBalancePinnedControllerIndex Integer32, + eqlNASClientLoadBalanceCurrentInferfaceIndex Integer32, + eqlNASClientLoadBalancePinnedInferfaceIndex Integer32, + eqlNASClientLoadBalanceProtocol INTEGER, + eqlNASClientLoadBalanceManualFailbackRequired TruthValue + } + + +eqlNASClientLoadBalanceLocalIPAddressType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Local client IP address type" + ::= { eqlNASClientLoadBalanceEntry 1 } + +eqlNASClientLoadBalanceLocalIPAddress OBJECT-TYPE + SYNTAX InetAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION "IP address of the local client." + ::= { eqlNASClientLoadBalanceEntry 2 } + +eqlNASClientLoadBalanceAccessIPAddressType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Cluster VIP address type." + ::= { eqlNASClientLoadBalanceEntry 3 } + +eqlNASClientLoadBalanceAccessIPAddress OBJECT-TYPE + SYNTAX InetAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Cluster VIP address." + ::= { eqlNASClientLoadBalanceEntry 4 } + + +eqlNASClientLoadBalanceCurrentControllerIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Current controller number 0,1, 2, ... this client connection is on." + ::= { eqlNASClientLoadBalanceEntry 5 } + +eqlNASClientLoadBalanceAssignedControllerIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Assigned controller index for this local client." + ::= { eqlNASClientLoadBalanceEntry 6 } + + +eqlNASClientLoadBalancePinnedControllerIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Controller number this local client is pinned to." + ::= { eqlNASClientLoadBalanceEntry 7 } + +eqlNASClientLoadBalanceCurrentInferfaceIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Current interface index for this local client." + ::= { eqlNASClientLoadBalanceEntry 8 } + + +eqlNASClientLoadBalancePinnedInferfaceIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Pinned interface index for this local client." + ::= { eqlNASClientLoadBalanceEntry 9 } + +eqlNASClientLoadBalanceProtocol OBJECT-TYPE + SYNTAX INTEGER { + cifs(1), + nfs(2), + other(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Client portocol used for the file sharing." + ::= { eqlNASClientLoadBalanceEntry 10 } + + +eqlNASClientLoadBalanceManualFailbackRequired OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field indicates if manual intervention is required for load balance failback operation." + ::= { eqlNASClientLoadBalanceEntry 11 } + +-------------------------------------------------------------------------------------------------- + +eqlNASClientLoadBalanceActionTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlNASClientLoadBalanceActionEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic + This table is used to set the action for client load balancing. + TimeoutAll:60" + ::= { eqlNASClientLoadBalanceTable 2 } + + + +eqlNASClientLoadBalanceActionEntry OBJECT-TYPE + SYNTAX EqlNASClientLoadBalanceActionEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing client action for load balance." + INDEX { eqlApplianceIndex, eqlNASClientLoadBalanceActionType } + + ::= { eqlNASClientLoadBalanceActionTable 1 } + + +EqlNASClientLoadBalanceActionEntry ::= + SEQUENCE { + eqlNASClientLoadBalanceActionType INTEGER, + eqlNASClientLoadBalanceActionRowStatus RowStatus, + eqlNASClientLoadBalanceActionLocalIPAddressType InetAddressType, + eqlNASClientLoadBalanceActionLocalIPAddress InetAddress, + eqlNASClientLoadBalanceActionAccessIPAddressType InetAddressType, + eqlNASClientLoadBalanceActionAccessIPAddress InetAddress, + eqlNASClientLoadBalanceActionControllerIndex Integer32, + eqlNASClientLoadBalanceActionInferfaceIndex Integer32 + } + + +eqlNASClientLoadBalanceActionType OBJECT-TYPE + SYNTAX INTEGER { + move(1), + pin(2), + unpin(3) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field indicates action type move/pin for the load-balancing." + ::= { eqlNASClientLoadBalanceActionEntry 1 } + + +eqlNASClientLoadBalanceActionRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field indicates the row status of this row. Only row create action will be supported." + ::= { eqlNASClientLoadBalanceActionEntry 2 } + +eqlNASClientLoadBalanceActionLocalIPAddressType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Local IP address type (ipv4/ipv6)for load balancing." + ::= { eqlNASClientLoadBalanceActionEntry 3 } + + +eqlNASClientLoadBalanceActionLocalIPAddress OBJECT-TYPE + SYNTAX InetAddress + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Local IP address for load balancing." + ::= { eqlNASClientLoadBalanceActionEntry 4 } + + +eqlNASClientLoadBalanceActionAccessIPAddressType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-create + STATUS current + DESCRIPTION "NAS Cluster IP address type (ipv4/ipv6)for load balancing." + ::= { eqlNASClientLoadBalanceActionEntry 5 } + + +eqlNASClientLoadBalanceActionAccessIPAddress OBJECT-TYPE + SYNTAX InetAddress + MAX-ACCESS read-create + STATUS current + DESCRIPTION "NAS Cluster IP address for load balancing." + ::= { eqlNASClientLoadBalanceActionEntry 6 } + + +eqlNASClientLoadBalanceActionControllerIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Assigned controller id for this action.." + ::= { eqlNASClientLoadBalanceActionEntry 7 } + + +eqlNASClientLoadBalanceActionInferfaceIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Assigned interface index for this action.." + ::= { eqlNASClientLoadBalanceActionEntry 8 } + + +-------------------------------------------------------------------------------------------- +eqlNASApplianceNFSExportsAccessTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlNASApplianceNFSExportsAccessEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "Equallogic-Dynamic NAS NFS Exports Access Table. + This table contains a list of NFS exports acces configuration entry. + TimeoutAll:60" + ::= { eqlNASObjects 50 } + +eqlNASApplianceNFSExportsAccessEntry OBJECT-TYPE + SYNTAX EqlNASApplianceNFSExportsAccessEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing NFS exports access configuration." + INDEX { eqlApplianceIndex, eqlNASContainerIndex, eqlNASApplianceNFSExportName, eqlNASApplianceNFSExportsACLIndex } + ::= { eqlNASApplianceNFSExportsAccessTable 1 } + +EqlNASApplianceNFSExportsAccessEntry ::= + SEQUENCE { + eqlNASApplianceNFSExportsACLIndex Unsigned32, + eqlNASApplianceNFSExportsAccessRowStatus RowStatus, + eqlNASApplianceNFSExportsACLAccess INTEGER, + eqlNASApplianceNFSExportsACLClientIPType InetAddressType, + eqlNASApplianceNFSExportsACLClientIP InetAddress, + eqlNASApplianceNFSExportsACLClientNetmaskType InetAddressType, + eqlNASApplianceNFSExportsACLClientNetmask InetAddress, + eqlNASApplianceNFSExportsACLTrustUsers INTEGER, + eqlNASApplianceNFSExportsACLNetGroup OCTET STRING + } + +eqlNASApplianceNFSExportsACLIndex OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "This field specifies a unique index for identifing a NFS Export Access." + ::= { eqlNASApplianceNFSExportsAccessEntry 1 } + + +eqlNASApplianceNFSExportsAccessRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field indicates the row status of this row." + ::= { eqlNASApplianceNFSExportsAccessEntry 2 } + +eqlNASApplianceNFSExportsACLAccess OBJECT-TYPE + SYNTAX INTEGER { + read-write(1), + read-only(2) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Provides read-write access to the NFS Export." + DEFVAL { read-write } + ::= { eqlNASApplianceNFSExportsAccessEntry 3 } + +eqlNASApplianceNFSExportsACLClientIPType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Type of eqlNASApplianceNFSExportsACLClientIP field." + ::= { eqlNASApplianceNFSExportsAccessEntry 4 } + +eqlNASApplianceNFSExportsACLClientIP OBJECT-TYPE + SYNTAX InetAddress + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Value of this column along with eqlNASApplianceNFSExportsACLClientNetmask will determine access policy for clients." + ::= { eqlNASApplianceNFSExportsAccessEntry 5 } + +eqlNASApplianceNFSExportsACLClientNetmaskType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Type of eqlNASApplianceNFSExportsACLClientNetmask field. This value must match with eqlNASApplianceNFSExportsACLClientIPType field." + ::= { eqlNASApplianceNFSExportsAccessEntry 6 } + +eqlNASApplianceNFSExportsACLClientNetmask OBJECT-TYPE + SYNTAX InetAddress + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Value of this column along with eqlNASApplianceNFSExportsACLClientIP will determine access policy for clients." + ::= { eqlNASApplianceNFSExportsAccessEntry 7 } + +eqlNASApplianceNFSExportsACLTrustUsers OBJECT-TYPE + SYNTAX INTEGER { + all-except-root(1), + none(2), + all(3) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION " Trusted users who can access the NFS Export." + DEFVAL { all-except-root } + ::= { eqlNASApplianceNFSExportsAccessEntry 8 } + +eqlNASApplianceNFSExportsACLNetGroup OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..255)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Contains the netgroup name." + ::= { eqlNASApplianceNFSExportsAccessEntry 9 } + + +---------------------------------------------------------------------------------- + +eqlNASAppliancePoolAlertsTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlNASAppliancePoolAlertsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic Appliance alerts table + This table is used to retrieve and set alerts related to an appliance nas pool. + TimeoutAll:60" + ::= { eqlNASObjects 51 } + +eqlNASAppliancePoolAlertsEntry OBJECT-TYPE + SYNTAX EqlNASAppliancePoolAlertsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing the alerts." + INDEX { eqlApplianceIndex } + + ::= { eqlNASAppliancePoolAlertsTable 1 } + +EqlNASAppliancePoolAlertsEntry ::= + SEQUENCE { + eqlNASAppliancePoolAlertsUsedSpaceThreshold Unsigned32, + eqlNASAppliancePoolAlertsAvailableSpaceThreshold Unsigned32 + } + + +eqlNASAppliancePoolAlertsUsedSpaceThreshold OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "%" + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field represents the used space threshold as a percentage of total nas reserve + capacity which triggers the user alert if the used space goes over this threshold." + DEFVAL { 80 } + ::= { eqlNASAppliancePoolAlertsEntry 1 } + + +eqlNASAppliancePoolAlertsAvailableSpaceThreshold OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "MB" + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field represents the available space threshold configured in MB + which triggers the user alert if the available space goes below this threshold." + ::= { eqlNASAppliancePoolAlertsEntry 2 } + +-------------------------------------------------------------------------------------------- +eqlNASSnapshotActionTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlNASSnapshotActionEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic Used by source partner in NAS replication + to check with partner before enabling replication, deleting a snapshot + or restoring back to an older snapshot + TimeoutAll:60" + ::= { eqlNASObjects 52 } + +eqlNASSnapshotActionEntry OBJECT-TYPE + SYNTAX EqlNASSnapshotActionEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "One row per request/response. The container index is for the source partner" + INDEX { eqlApplianceIndex, eqlNASContainerIndex } + + ::= { eqlNASSnapshotActionTable 1 } + +EqlNASSnapshotActionEntry ::= + SEQUENCE { + eqlNASSnapshotActionRowStatus RowStatus, + eqlNASSnapshotActionType INTEGER, + eqlNASSnapshotActionPartnerSiteIndex INTEGER, + eqlNASSnapshotActionRemoteReplicaFSId Unsigned32, + eqlNASSnapshotActionRemoteSnapshotId Unsigned32, + +-- We don't look at snapshot ids because the source and destination might use the same snapshot +-- id for different snapshots. Therefore the snapshot id is unreliable to use when comparing +-- snapshots on the source and destination. +-- The snapshot name may not match between replication source and destination if a user renamed a snapshot. + +-- The 4 parameters which can be used to match source and destination are: +-- 1. creation time, 2. size, 3. is UUID 4 SnapshotName + + eqlNASSnapshotActionCreationTimestamp Unsigned32, + eqlNASSnapshotActionSnapshotSize Unsigned32, + eqlNASSnapshotActionUUID Unsigned32, + eqlNASSnapshotActionSnapshotName NASContainerNameType + } + +eqlNASSnapshotActionRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field is used indicate the status of this entry." + ::= { eqlNASSnapshotActionEntry 1 } + +eqlNASSnapshotActionType OBJECT-TYPE + SYNTAX INTEGER { + snapshotDelete(0), + replicationEnable(1), + restore(2), + demote(3) + } + UNITS "Enumerated type" + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Defines type of confirmation check to be done" + DEFVAL { 0 } + ::= { eqlNASSnapshotActionEntry 2 } + +eqlNASSnapshotActionPartnerSiteIndex OBJECT-TYPE + SYNTAX INTEGER + UNITS "Index into volume repl site table" + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Index into volume repl site table" + DEFVAL { 0 } + ::= { eqlNASSnapshotActionEntry 3 } + + +eqlNASSnapshotActionRemoteReplicaFSId OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "N/A" + MAX-ACCESS read-create + STATUS current + DESCRIPTION "FS ID for replica container" + DEFVAL { 0 } + ::= { eqlNASSnapshotActionEntry 4 } + + +eqlNASSnapshotActionRemoteSnapshotId OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "N/A" + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Base snapshot ID of the clone on destination returned in response." + DEFVAL { 0 } + ::= { eqlNASSnapshotActionEntry 5 } + + +eqlNASSnapshotActionCreationTimestamp OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "32 bit int defining the date/time" + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Encoded in date/time the way Unix/Linux encode time. + The entry should be the snapshot timestap to be queried." + DEFVAL { 0 } + ::= { eqlNASSnapshotActionEntry 6 } + +eqlNASSnapshotActionSnapshotSize OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "Megabytes" + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Snapshot size in megabytes" + DEFVAL { 0 } + ::= { eqlNASSnapshotActionEntry 7 } + + +eqlNASSnapshotActionUUID OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "Id #" + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Unique ID. Should match on replication source and destination." + DEFVAL { 0 } + ::= { eqlNASSnapshotActionEntry 8 } + + +eqlNASSnapshotActionSnapshotName OBJECT-TYPE + SYNTAX NASContainerNameType + MAX-ACCESS read-create + STATUS current + DESCRIPTION "String containing NAS snapshot name. Should match on replication source and destination." + ::= { eqlNASSnapshotActionEntry 9 } + +-------------------------------------------------------------------------------------------- +eqlNASSMBProtocolTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlNASSMBProtocolEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic table used to store information of the SMB protocol configuration + TimeoutAll:60" + ::= { eqlNASObjects 53 } + +eqlNASSMBProtocolEntry OBJECT-TYPE + SYNTAX EqlNASSMBProtocolEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry contains the SMB protocol information for a NAS appliance." + INDEX { eqlApplianceIndex } + + ::= { eqlNASSMBProtocolTable 1 } + +EqlNASSMBProtocolEntry ::= + SEQUENCE { + eqlNASSMBProtocolRowStatus RowStatus, + eqlNASSMBProtocolMaxSupportedVersion INTEGER, + eqlNASSMBMessageSigning StatusDisabledDefault, + eqlNASSMBMessageEncryption StatusDisabledDefault + } + +eqlNASSMBProtocolRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field is used to manage the conceptual row entry." + ::= { eqlNASSMBProtocolEntry 1 } + +eqlNASSMBProtocolMaxSupportedVersion OBJECT-TYPE + SYNTAX INTEGER { + smb-v1(1), + smb-v2(2), + smb-v3(3) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This column is used to set the maximum SMB protocol version supported." + DEFVAL { smb-v3 } + ::= { eqlNASSMBProtocolEntry 2 } + +eqlNASSMBMessageSigning OBJECT-TYPE + SYNTAX StatusDisabledDefault + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This column defines whether SMB3 traffic connected to any share must be signed." + ::= { eqlNASSMBProtocolEntry 3 } + +eqlNASSMBMessageEncryption OBJECT-TYPE + SYNTAX StatusDisabledDefault + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This column defines whether SMB3 traffic connected to any share must be encrypted." + ::= { eqlNASSMBProtocolEntry 4 } + +---------------------------------------------------------------------------------------------- +eqlNASQuotaDirTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlNASQuotaDirEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic table used to store information of quota directory information for NAS + TimeoutAll:60" + ::= { eqlNASObjects 54 } + +eqlNASQuotaDirEntry OBJECT-TYPE + SYNTAX EqlNASQuotaDirEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "Entry contains quota directory information for a NAS appliance." + INDEX { eqlApplianceIndex, eqlNASContainerIndex, eqlNASQuotaDirName } + ::= { eqlNASQuotaDirTable 1 } + +EqlNASQuotaDirEntry ::= + SEQUENCE { + eqlNASQuotaDirName OCTET STRING, + eqlNASQuotaDirRowStatus RowStatus, + eqlNASQuotaDirSoftLimit INTEGER, + eqlNASQuotaDirHardLimit INTEGER, + eqlNASQuotaDirUsage INTEGER + } + +eqlNASQuotaDirName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..113)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Name of the quota directory." + ::= { eqlNASQuotaDirEntry 1 } + +eqlNASQuotaDirRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Manages the conceptual row entry of the quota directory." + ::= { eqlNASQuotaDirEntry 2 } + +eqlNASQuotaDirSoftLimit OBJECT-TYPE + SYNTAX INTEGER + UNITS "MB" + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Soft limit (in MB) of the quota directory." + DEFVAL { 0 } + ::= { eqlNASQuotaDirEntry 3 } + +eqlNASQuotaDirHardLimit OBJECT-TYPE + SYNTAX INTEGER + UNITS "MB" + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Hard limit (in MB) of the quota directory." + DEFVAL { 0 } + ::= { eqlNASQuotaDirEntry 4 } + +eqlNASQuotaDirUsage OBJECT-TYPE + SYNTAX INTEGER + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Quota usage (in MB) of the quota directory." + DEFVAL { 0 } + ::= { eqlNASQuotaDirEntry 5 } +-------------------------------------------------------------------------------------------- +eqlNASNTLMConfigTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlNASNTLMConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic table used to store information for the + NTLM configuration TimeoutAll:60" + ::= { eqlNASObjects 55 } + +eqlNASNTLMConfigEntry OBJECT-TYPE + SYNTAX EqlNASNTLMConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "Entry contains NTLM configuration information for a NAS + appliance." + INDEX { eqlApplianceIndex } + + ::= { eqlNASNTLMConfigTable 1 } + +EqlNASNTLMConfigEntry ::= + SEQUENCE { + eqlNASNTLMConfigRowStatus RowStatus, + eqlNASNTLMConfigNtlmCtxComputerName INTEGER + } + +eqlNASNTLMConfigRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Manages the conceptual row entry." + ::= { eqlNASNTLMConfigEntry 1 } + +eqlNASNTLMConfigNtlmCtxComputerName OBJECT-TYPE + SYNTAX INTEGER { + controller-name(1), + cluster-name(2) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Sets the cluster name or controller name as the NetBIOS server name in NTLM SSP authentication. + Possible options include are: controller-name or cluster-name." + DEFVAL { controller-name } + ::= { eqlNASNTLMConfigEntry 2 } +---------------------------------------------------------------------------------------------- + +eqlNASNFSClientTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlNASNFSClientEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic + This table contains NAS NFS Client information. + TimeoutAll:60" + ::= { eqlNASObjects 56 } + +eqlNASNFSClientEntry OBJECT-TYPE + SYNTAX EqlNASNFSClientEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing NAS client information." + INDEX { eqlApplianceIndex, + eqlNASNFSClientSessionId } + + ::= { eqlNASNFSClientTable 1 } + +EqlNASNFSClientEntry ::= + SEQUENCE { + eqlNASNFSClientSessionId OCTET STRING, + eqlNASNFSClientRowStatus RowStatus, + eqlNASNFSClientNodeIndex Unsigned32, + eqlNASNFSClientIPAddressType InetAddressType, + eqlNASNFSClientIPAddress InetAddress, + eqlNASNFSClientUserName OCTET STRING, + eqlNASNFSClientProtocol INTEGER, + eqlNASNFSClientConnectedTime Counter32, + eqlNASNFSClientIdleTime Counter32, + eqlNASNFSClientNumOpenFiles Unsigned32, + eqlNASNFSClientIsGuest TruthValue + } + +eqlNASNFSClientSessionId OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..256)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "NFS client session id." + ::= { eqlNASNFSClientEntry 1 } + +eqlNASNFSClientRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Manages the conceptual row entry." + ::= { eqlNASNFSClientEntry 2 } + +eqlNASNFSClientNodeIndex OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "NFS client node index." + ::= { eqlNASNFSClientEntry 3 } + +eqlNASNFSClientIPAddressType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the type of address (v4/v6) of this IP address entry." + ::= { eqlNASNFSClientEntry 4 } + +eqlNASNFSClientIPAddress OBJECT-TYPE + SYNTAX InetAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION "NFS client IPv4 address." + ::= { eqlNASNFSClientEntry 5 } + +eqlNASNFSClientUserName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..85)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "NFS client user name." + ::= { eqlNASNFSClientEntry 6 } + +eqlNASNFSClientProtocol OBJECT-TYPE + SYNTAX INTEGER { + nfs(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "NAS client protocol." + ::= { eqlNASNFSClientEntry 7 } + +eqlNASNFSClientConnectedTime OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The time in seconds that has elapsed since this NFS client connection was first + established with the NAS controller." + ::= { eqlNASNFSClientEntry 8 } + +eqlNASNFSClientIdleTime OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The time in seconds that has elapsed since this NFS client connection is idle." + ::= { eqlNASNFSClientEntry 9 } + +eqlNASNFSClientNumOpenFiles OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of open files from this NFS client connection." + ::= { eqlNASNFSClientEntry 10 } + +eqlNASNFSClientIsGuest OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DESCRIPTION "True if the client initiating this NFS connection is a guest." + ::= { eqlNASNFSClientEntry 11 } +----------------------------------------------------------------------------------------------- + +eqlNASSMBClientTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlNASSMBClientEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic + This table contains NAS SMB Client information. + TimeoutAll:60" + ::= { eqlNASObjects 57 } + +eqlNASSMBClientEntry OBJECT-TYPE + SYNTAX EqlNASSMBClientEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing NAS client information." + INDEX { eqlApplianceIndex, eqlNASSMBClientNodeIndex, + eqlNASSMBClientIPAddressType, eqlNASSMBClientIPAddress, + eqlNASSMBClientUserName, eqlNASSMBClientProtocol, + eqlNASSMBClientDynamicIndex } + + ::= { eqlNASSMBClientTable 1 } + +EqlNASSMBClientEntry ::= + SEQUENCE { + eqlNASSMBClientRowStatus RowStatus, + eqlNASSMBClientNodeIndex Unsigned32, + eqlNASSMBClientIPAddressType InetAddressType, + eqlNASSMBClientIPAddress InetAddress, + eqlNASSMBClientUserName OCTET STRING, + eqlNASSMBClientProtocol INTEGER, + eqlNASSMBClientConnectedTime Counter32, + eqlNASSMBClientIdleTime Counter32, + eqlNASSMBClientNumOpenFiles Unsigned32, + eqlNASSMBClientIsGuest TruthValue, + eqlNASSMBClientDynamicIndex Unsigned32 + } + +eqlNASSMBClientRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Manages the conceptual row entry." + ::= { eqlNASSMBClientEntry 1 } + +eqlNASSMBClientNodeIndex OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "SMB client node index." + ::= { eqlNASSMBClientEntry 2 } + +eqlNASSMBClientIPAddressType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the type of address (v4/v6) of this IP address entry." + ::= { eqlNASSMBClientEntry 3 } + +eqlNASSMBClientIPAddress OBJECT-TYPE + SYNTAX InetAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION "SMB client IPv4 address." + ::= { eqlNASSMBClientEntry 4 } + +eqlNASSMBClientUserName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..85)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "SMB client user name." + ::= { eqlNASSMBClientEntry 5 } + +eqlNASSMBClientProtocol OBJECT-TYPE + SYNTAX INTEGER { + cifs(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION "NAS client protocol." + ::= { eqlNASSMBClientEntry 6 } + +eqlNASSMBClientConnectedTime OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The time in seconds that has elapsed since this SMB client connection was first + established with the NAS controller." + ::= { eqlNASSMBClientEntry 7 } + +eqlNASSMBClientIdleTime OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The time in seconds that has elapsed since this SMB client connection is idle." + ::= { eqlNASSMBClientEntry 8 } + +eqlNASSMBClientNumOpenFiles OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of open files from this SMB client connection." + ::= { eqlNASSMBClientEntry 9 } + +eqlNASSMBClientIsGuest OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DESCRIPTION "True if the client initiating this SMB connection is a guest." + ::= { eqlNASSMBClientEntry 10 } + +eqlNASSMBClientDynamicIndex OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "SMB client dynamic index." + ::= { eqlNASSMBClientEntry 11 } +----------------------------------------------------------------------------------------------- +eqlNASEulaTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlNASEulaEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic table is for storing the NAS EULA +Approval state. TimeoutAll:60" + ::= { eqlNASObjects 58 } + +eqlNASEulaEntry OBJECT-TYPE + SYNTAX EqlNASEulaEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "This describes the table entry of NAS EULA" + INDEX { eqlApplianceIndex } + ::= { eqlNASEulaTable 1 } + +EqlNASEulaEntry ::= SEQUENCE { + eqlNASEulaRowStatus RowStatus, + eqlNASEulaVersion Unsigned32 + } + +eqlNASEulaRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "The status of the row" + ::= { eqlNASEulaEntry 1 } + +eqlNASEulaVersion OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION "Contains NAS EULA Version." + DEFVAL { 2 } + ::= { eqlNASEulaEntry 2 } +---------------------------------------------------------------------------------------------- + END diff --git a/mibs/equallogic/EQLRAID-MIB b/mibs/equallogic/EQLRAID-MIB index 980dad9dbba..fdcde16a9e8 100644 --- a/mibs/equallogic/EQLRAID-MIB +++ b/mibs/equallogic/EQLRAID-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) EQLRAID-MIB DEFINITIONS ::= BEGIN @@ -20,7 +20,7 @@ IMPORTS eqlRAIDModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO "Contact: Customer Support diff --git a/mibs/equallogic/EQLREPLPARTNER-MIB b/mibs/equallogic/EQLREPLPARTNER-MIB index 37474b74dba..d7be9cccc86 100644 --- a/mibs/equallogic/EQLREPLPARTNER-MIB +++ b/mibs/equallogic/EQLREPLPARTNER-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) --FROM SNMP-FRAMEWORK-MIB; -- RFC 2571 @@ -21,7 +21,7 @@ IMPORTS FROM EQLVOLUME-MIB; eqlReplPartnerModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO "Contact: Customer Support @@ -72,22 +72,25 @@ EqlReplPartnerTestStatus ::= INTEGER { unknown(0), valid(1), invalid(2), - remote-partner-not-configured(3) + remote-partner-not-configured(3), + not-supported(4) } EqlReplPartnerTestEntry ::= SEQUENCE { - eqlReplPartnerTestRowStatus RowStatus, - eqlReplPartnerTestIPAddrStatus EqlReplPartnerTestStatus, - eqlReplPartnerTestAuthStatus EqlReplPartnerTestStatus, - eqlReplPartnerTestAction INTEGER, - eqlReplPartnerTestState INTEGER, - eqlReplPartnerTestMajorVersion INTEGER, - eqlReplPartnerTestMinorVersion INTEGER, - eqlReplPartnerTestMaintVersion INTEGER, - eqlReplPartnerTestDelegatedSpace Counter64, - eqlReplPartnerTestDelegatedSpaceUsed Counter64, - eqlReplPartnerTestTimestamp Counter32 + eqlReplPartnerTestRowStatus RowStatus, + eqlReplPartnerTestIPAddrStatus EqlReplPartnerTestStatus, + eqlReplPartnerTestAuthStatus EqlReplPartnerTestStatus, + eqlReplPartnerTestAction INTEGER, + eqlReplPartnerTestState INTEGER, + eqlReplPartnerTestMajorVersion INTEGER, + eqlReplPartnerTestMinorVersion INTEGER, + eqlReplPartnerTestMaintVersion INTEGER, + eqlReplPartnerTestDelegatedSpace Counter64, + eqlReplPartnerTestDelegatedSpaceUsed Counter64, + eqlReplPartnerTestTimestamp Counter32, + eqlReplPartnerTestPoolMapStatus EqlReplPartnerTestStatus, + eqlReplPartnerTestPoolMapValidPoolNames OCTET STRING } @@ -195,4 +198,24 @@ eqlReplPartnerTestTimestamp OBJECT-TYPE Time is represented as the time in seconds since 00:00:00 UTC, 1970-01-01." ::= { eqlReplPartnerTestEntry 11 } +eqlReplPartnerTestPoolMapStatus OBJECT-TYPE + SYNTAX EqlReplPartnerTestStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "The replication partner storage pool map test status. This test checks if + all the primary-site storage pool names that are mapped to secondary-site pools for + replicaset placement, i.e., the entries in eqliscsiReplicantSiteStoragePoolMapTable, + match the actual pool names on the primary site. This test will fail on a secondary + site if storage pool mapping is configured and any mapping entry exists on the + secondary site for which there is no corresponding pool name on the primary site." + ::= { eqlReplPartnerTestEntry 12 } + +eqlReplPartnerTestPoolMapValidPoolNames OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..260)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "A comma separated list of the pool names received from the + partner. These are the valid names to be used in storage pool + mapping (eqliscsiReplicantSiteStoragePoolMapTable) entries." + ::= { eqlReplPartnerTestEntry 13 } END diff --git a/mibs/equallogic/EQLSTORAGECONTAINER-MIB b/mibs/equallogic/EQLSTORAGECONTAINER-MIB index 126183e44cb..c1e7a8ab842 100644 --- a/mibs/equallogic/EQLSTORAGECONTAINER-MIB +++ b/mibs/equallogic/EQLSTORAGECONTAINER-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) --FROM SNMP-FRAMEWORK-MIB; -- RFC 2571 @@ -21,13 +21,13 @@ IMPORTS FROM EQUALLOGIC-SMI UTFString FROM EQLGROUP-MIB - eqliscsiLocalMemberId, EQL2PartRowPointerStr + eqliscsiLocalMemberId, EQL2PartRowPointerStr, StatusEnabledDefault, BinaryUUID FROM EQLVOLUME-MIB eqlStoragePoolIndex FROM EQLSTORAGEPOOL-MIB; eqlStorageContainerModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO "Contact: Customer Support @@ -100,7 +100,9 @@ EqlStorageContainerEntry ::= eqlStorageContainerName UTFString, eqlStorageContainerLookupName UTFString, eqlStorageContainerDescription UTFString, - eqlStorageContainerLogicalLimit Unsigned64 + eqlStorageContainerLogicalLimit Unsigned64, + eqlStorageContainerReplicationEnabled StatusEnabledDefault, + eqlStorageContainerExternalId BinaryUUID } eqlStorageContainerIndex OBJECT-TYPE @@ -160,11 +162,29 @@ eqlStorageContainerLogicalLimit OBJECT-TYPE UNITS "MB" MAX-ACCESS read-create STATUS current - DESCRIPTION "This field specifies the Storage Container *logical* limit in MB. There is no default. - It should be larger than the physical size, as configured for this Storage Container." - DEFVAL {8589934592} - ::= { eqlStorageContainerEntry 7 } - + DESCRIPTION "UNUSED. The user cannot set the logical limit of a storage container. To get the logical limit + of a storage container, do a get on eqlStorageContainerStatisticsLogicalLimit" + DEFVAL {0} + ::= { eqlStorageContainerEntry 7 } + + eqlStorageContainerReplicationEnabled OBJECT-TYPE + SYNTAX StatusEnabledDefault + MAX-ACCESS read-write + STATUS current + DESCRIPTION "The state of this storage container for replication." + DEFVAL { enabled } + ::= { eqlStorageContainerEntry 8 } + + eqlStorageContainerExternalId OBJECT-TYPE + SYNTAX BinaryUUID + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This field is used for vvol replication. The VMs in vmware expect the storage container uuid to be + the same on the replica site. However, each storage container must also have a unique id. This id is + used by VSM as the storage container uuid if it is non-zero" + ::= { eqlStorageContainerEntry 9 } + + --*********************************************************************************** eqlStorageContainerStatisticsTable OBJECT-TYPE @@ -196,7 +216,8 @@ EqlStorageContainerStatisticsEntry ::= eqlStorageContainerStatisticsSVCount Counter32, eqlStorageContainerStatisticsSVSCount Counter32, eqlStorageContainerStatisticsThinProvisioned TruthValue, - eqlStorageContainerStatisticsVvolsOnline Counter32 + eqlStorageContainerStatisticsVvolsOnline Counter32, + eqlStorageContainerStatisticsLogicalLimit Unsigned64 } eqlStorageContainerStatisticsLogicalUsed OBJECT-TYPE @@ -286,6 +307,14 @@ eqlStorageContainerStatisticsVvolsOnline OBJECT-TYPE the storage container that are online." ::= { eqlStorageContainerStatisticsEntry 10 } +eqlStorageContainerStatisticsLogicalLimit OBJECT-TYPE + SYNTAX Unsigned64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the logical limit of the storage container. + The limit is equal to 10 times the physical size of all storage buckets." + ::= { eqlStorageContainerStatisticsEntry 11 } + --*********************************************************************************** @@ -591,4 +620,46 @@ eqlStorageBucketStatisticsVvolsOnline OBJECT-TYPE the storage container that are online." ::= { eqlStorageBucketStatisticsEntry 7 } +--*********************************************************************************** + +eqlStorageContainerVVolTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlStorageContainerVVolEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic Storage Container VVol Table" + ::= { eqlStorageContainerObjects 6 } + +eqlStorageContainerVVolEntry OBJECT-TYPE + SYNTAX EqlStorageContainerVVolEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing storage container VVol information." + AUGMENTS { eqlStorageContainerEntry } + + ::= { eqlStorageContainerVVolTable 1 } + +EqlStorageContainerVVolEntry ::= + SEQUENCE { + eqlStorageContainerVVolSnapshotCount Unsigned32, + eqlStorageContainerVVolLinkedCloneCount Unsigned32 + } + +eqlStorageContainerVVolSnapshotCount OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of VVol snapshots in the storage container." + DEFVAL { 0 } + ::= { eqlStorageContainerVVolEntry 1 } + +eqlStorageContainerVVolLinkedCloneCount OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of VVol linked clones in the storage container." + DEFVAL { 0 } + ::= { eqlStorageContainerVVolEntry 2 } + +-- + END diff --git a/mibs/equallogic/EQLSTORAGEPOOL-MIB b/mibs/equallogic/EQLSTORAGEPOOL-MIB index f84cce8df89..fc68c20d72a 100644 --- a/mibs/equallogic/EQLSTORAGEPOOL-MIB +++ b/mibs/equallogic/EQLSTORAGEPOOL-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) --FROM SNMP-FRAMEWORK-MIB; -- RFC 2571 @@ -24,7 +24,7 @@ IMPORTS FROM EQLGROUP-MIB; eqlStoragePoolModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO "Contact: Customer Support @@ -37,7 +37,7 @@ eqlStoragePoolModule MODULE-IDENTITY DESCRIPTION "Equallogic Inc. Storage Array volume information - Copyright (c) 2002-2011 by Dell, Inc. + Copyright (c) 2002-2014 by Dell, Inc. All rights reserved. This software may not be copied, disclosed, transferred, or used except in accordance with a license granted @@ -148,15 +148,17 @@ EqlStoragePoolEntry ::= eqlStoragePoolUUID OCTET STRING, eqlStoragePoolExecMergeTo Unsigned32, eqlStoragePoolBorrow StatusEnabledDefault, - eqlStoragePoolSnapTrimThreshold Unsigned32, - eqlStoragePoolSnapTrimBuffer Counter64, + eqlStoragePoolSnapTrimThreshold Unsigned32, + eqlStoragePoolSnapTrimBuffer Counter64, eqlStoragePoolSnapTrimmerHWMLifeTime Integer32, eqlStoragePoolSnapTrimmerBorrowInfoRefreshInterval Integer32, eqlStoragePoolDefaultCompressionStrategy INTEGER, eqlStoragePoolDefaultCompressionMinSnapDelay Integer32, eqlStoragePoolDefaultCompressionMinSnapAge Integer32, eqlStoragePoolSnapMemberTrimThresholdAmount Counter64, - eqlStoragePoolSnapTrimRecheckTimer Unsigned32 + eqlStoragePoolSnapTrimRecheckTimer Unsigned32, + eqlStoragePoolMaintenanceFlag TruthValue, + eqlStoragePoolFSTStatus INTEGER } eqlStoragePoolIndex OBJECT-TYPE @@ -357,6 +359,27 @@ eqlStoragePoolSnapTrimRecheckTimer OBJECT-TYPE DEFVAL { 20 } ::= { eqlStoragePoolEntry 21 } +eqlStoragePoolMaintenanceFlag OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies if this storage pool is the maintenance pool. TRUE == maintenance pool." + DEFVAL { false } + ::= { eqlStoragePoolEntry 22 } + +eqlStoragePoolFSTStatus OBJECT-TYPE + SYNTAX INTEGER { + passed(0), + failed-vol-migr-active(1) + } + + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies if FST is passed or failed. + FST passed if there is NO FST failed. + FST failed due to active volume migration." + DEFVAL { passed } + ::= { eqlStoragePoolEntry 23 } ---************************************************************* @@ -419,7 +442,15 @@ EqlStoragePoolStatsEntry ::= eqlStoragePoolStatsVirtualSpaceSize Counter64, eqlStoragePoolStatsStorageContainerVolumeCount Integer32, eqlStoragePoolStatsStorageContainerSnapCount Integer32, - eqlStoragePoolStatsStorageContainerVolumesOnline Integer32 + eqlStoragePoolStatsStorageContainerVolumesOnline Integer32, + eqlStoragePoolStatsOtherSpaceBorrowing Counter64, + eqlStoragePoolStatsReplicantSiteFreeSpace Counter64, + eqlStoragePoolStatsReplicantSiteBorrowing Counter64, + eqlStoragePoolStatsSnapshotVirtualSpaceUsed Counter64, + eqlStoragePoolStatsSnapshotPhysicalSpaceUsed Counter64, + eqlStoragePoolStatsReplicationBorrowing Counter64, + eqlStoragePoolStatsVolumeVirtualSpaceUsed Counter64, + eqlStoragePoolStatsVolumePhysicalSpaceUsed Counter64 } eqlStoragePoolStatsSpace OBJECT-TYPE @@ -643,9 +674,8 @@ eqlStoragePoolStatsSnapshotResvBorrowing OBJECT-TYPE SYNTAX Counter64 UNITS "MB" MAX-ACCESS read-only - STATUS current - DESCRIPTION "This field specifies the amount of free snapshot reserve that is being borrowed against by other volumes - for either Recoverable Volumes or snapshots" + STATUS deprecated + DESCRIPTION "This field is deprecated and is superceded by eqlStoragePoolStatsOtherSpaceBorrowing." ::= { eqlStoragePoolStatsEntry 28 } eqlStoragePoolStatsFreeSpaceBorrowing OBJECT-TYPE @@ -653,8 +683,8 @@ eqlStoragePoolStatsFreeSpaceBorrowing OBJECT-TYPE UNITS "MB" MAX-ACCESS read-only STATUS current - DESCRIPTION "This field specifies the amount of free space that is being borrowed against by volumes for - either Recoverable Volumes or snapshots" + DESCRIPTION "This field specifies the amount of free space that is being borrowed against for + Recoverable Volumes, snapshots, replicas, and other objects that borrow space." ::= { eqlStoragePoolStatsEntry 29 } eqlStoragePoolStatsAvailableForBorrowing OBJECT-TYPE @@ -693,7 +723,7 @@ eqlStoragePoolStatsTotalSpaceBorrowing OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION "This field specifies the total space used for borrowing and includes - Recoverable Volumes and Snapshots" + Recoverable Volumes, Snapshots, and other objects that borrow space." ::= { eqlStoragePoolStatsEntry 33 } eqlStoragePoolStatsSnapShotBorrowing OBJECT-TYPE @@ -760,6 +790,72 @@ eqlStoragePoolStatsVirtualSpaceSize OBJECT-TYPE pool. This is a dynamic value, it is not Administrator setable." ::= { eqlStoragePoolStatsEntry 41 } +eqlStoragePoolStatsOtherSpaceBorrowing OBJECT-TYPE + SYNTAX Counter64 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the amount of other space that is being borrowed against for + Recoverable Volumes, snapshots, and other objects that borrow space." + ::= { eqlStoragePoolStatsEntry 42 } + +eqlStoragePoolStatsReplicantSiteFreeSpace OBJECT-TYPE + SYNTAX Counter64 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies how many MB of space is available to remote replicas in this storage pool. + This is a dynamic value, it is not Administrator setable." + ::= { eqlStoragePoolStatsEntry 43 } + +eqlStoragePoolStatsReplicantSiteBorrowing OBJECT-TYPE + SYNTAX Counter64 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the total amount of borrowing for just remote replicas" + ::= { eqlStoragePoolStatsEntry 44 } + +eqlStoragePoolStatsSnapshotVirtualSpaceUsed OBJECT-TYPE + SYNTAX Counter64 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies how many MB of space would be utilized by snapshots if there was no compression." + ::= { eqlStoragePoolStatsEntry 45 } + +eqlStoragePoolStatsSnapshotPhysicalSpaceUsed OBJECT-TYPE + SYNTAX Counter64 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies how many MB of space is utilized by snapshots, including compression savings" + ::= { eqlStoragePoolStatsEntry 46 } + +eqlStoragePoolStatsReplicationBorrowing OBJECT-TYPE + SYNTAX Counter64 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the total amount of borrowing for just local replication." + ::= { eqlStoragePoolStatsEntry 47 } + +eqlStoragePoolStatsVolumeVirtualSpaceUsed OBJECT-TYPE + SYNTAX Counter64 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies how many MB of space would be utilized by volumes if there was no compression." + ::= { eqlStoragePoolStatsEntry 48 } + +eqlStoragePoolStatsVolumePhysicalSpaceUsed OBJECT-TYPE + SYNTAX Counter64 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies how many MB of space is utilized by volumes, including compression savings" + ::= { eqlStoragePoolStatsEntry 49 } + ---************************************************************* eqlStoragePoolAdminAccountTable OBJECT-TYPE diff --git a/mibs/equallogic/EQLTAG-MIB b/mibs/equallogic/EQLTAG-MIB index 06ad97bdadf..8f64c24e2a0 100644 --- a/mibs/equallogic/EQLTAG-MIB +++ b/mibs/equallogic/EQLTAG-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) EQLTAG-MIB DEFINITIONS ::= BEGIN IMPORTS @@ -15,7 +15,7 @@ IMPORTS FROM EQLVOLUME-MIB; eqltagModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO "Contact: Customer Support @@ -48,10 +48,10 @@ eqltagNotifications OBJECT IDENTIFIER ::= { eqltagModule 2 } eqltagConformance OBJECT IDENTIFIER ::= { eqltagModule 3 } ----------------------------------------------------------------------- - +------------------------------------------------------------------------------- -- Tag table -- +------------------------------------------------------------------------------- eqlTagTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlTagEntry @@ -85,12 +85,14 @@ EqlTagEntry ::= SEQUENCE { eqlTagRowStatus RowStatus, eqlTagValue UTFString, eqlTagAdminAccountKey Unsigned32, - eqlTagValueDescription UTFString + eqlTagValueDescription UTFString, + eqlTagKeyValue UTFString } eqlTagType OBJECT-TYPE SYNTAX INTEGER { - folder(1) + folder(1), + application(2) } MAX-ACCESS not-accessible STATUS current @@ -145,12 +147,22 @@ eqlTagValueDescription OBJECT-TYPE DESCRIPTION "This field specifies a descriptive string that provides details about this tag. The description can be up to 127 characters plus NULL." DEFVAL { "" } - ::= { eqlTagEntry 6 } - ----------------------------------------------------------------------- + ::= { eqlTagEntry 6 } + +eqlTagKeyValue OBJECT-TYPE + SYNTAX UTFString (SIZE (0..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "EQL-SECONDARY-KEY + This field specifies the iSCSI profile sysprep version + of eqlTagValue. It is populated by the backend on a row-create." + DEFVAL { "" } + ::= { eqlTagEntry 7 } +------------------------------------------------------------------------------ -- Tag Object table -- +------------------------------------------------------------------------------- eqlTagObjectTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlTagObjectEntry @@ -202,8 +214,10 @@ eqlTagObjectRowStatus OBJECT-TYPE "Row status used to manage this row." ::= { eqlTagObjectEntry 3 } +------------------------------------------------------------------------------- -- Admin Account Tag table -- +------------------------------------------------------------------------------- eqlAdminAccountTagTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlAdminAccountTagEntry @@ -242,10 +256,10 @@ eqlAdminAccountTagAccess OBJECT-TYPE DESCRIPTION "The administrative permission to a tag." ::= { eqlAdminAccountTagEntry 1 } ---****************************************************************** - +------------------------------------------------------------------------------- -- Volume Tag table -- +------------------------------------------------------------------------------- eqlVolumeTagTable OBJECT-TYPE SYNTAX SEQUENCE OF EqlVolumeTagEntry @@ -269,7 +283,8 @@ eqlVolumeTagEntry OBJECT-TYPE EqlVolumeTagEntry ::= SEQUENCE { - eqlVolumeTagValue UTFString + eqlVolumeTagValue UTFString, + eqlVolumeTagName UTFString } eqlVolumeTagValue OBJECT-TYPE @@ -281,8 +296,254 @@ eqlVolumeTagValue OBJECT-TYPE The tag value can be up to 63 characters plus NULL." ::= { eqlVolumeTagEntry 1 } ---****************************************************************** - +eqlVolumeTagName OBJECT-TYPE + SYNTAX UTFString (SIZE (0..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This field specifies the name of the tag, for instance, + if this is a folder tag then the name would be 'folder' + The tag name can be up to 63 characters plus NULL." + ::= { eqlVolumeTagEntry 2 } + +------------------------------------------------------------------------------- +-- User Defined Tag Type Table +-- +------------------------------------------------------------------------------- + +eqlUserDefinedTagTypeTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlUserDefinedTagTypeEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "EqualLogic-Persistent + This table maintains a set of all of the user defined tag types within + the system." + ::= { eqltagObjects 5 } + +eqlUserDefinedTagTypeEntry OBJECT-TYPE + SYNTAX EqlUserDefinedTagTypeEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry in the tag object table." + INDEX {eqlTagType} + ::= { eqlUserDefinedTagTypeTable 1 } + +EqlUserDefinedTagTypeEntry ::= SEQUENCE { + eqlUserDefinedTagTypeRowStatus RowStatus, + eqlUserDefinedTagTypeName UTFString, + eqlUserDefinedTagTypeKeyName UTFString, + eqlUserDefinedTagTypeAdminAccountKey Unsigned32, + eqlUserDefinedTagTypeDescription UTFString +} + +eqlUserDefinedTagTypeRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Row status used to manage this row." + ::= { eqlUserDefinedTagTypeEntry 1 } + +eqlUserDefinedTagTypeName OBJECT-TYPE + SYNTAX UTFString (SIZE (0..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "The name of this tag type." + DEFVAL { "" } + ::= { eqlUserDefinedTagTypeEntry 2 } + +eqlUserDefinedTagTypeKeyName OBJECT-TYPE + SYNTAX UTFString (SIZE (0..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "EQL-SECONDARY-KEY + This field specifies the iSCSI profile sysprep version + of eqlUserDefinedTagTypeName. It is populated by the backend on a row-create." + DEFVAL { "" } + ::= { eqlUserDefinedTagTypeEntry 3 } + +eqlUserDefinedTagTypeAdminAccountKey OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This field specifies the unique key for identifying a volume administrator + that owns this tag. If no account has this value as its + eqlStorageGroupAdminAccountKey, then the tag is unassigned." + DEFVAL {0} + ::= { eqlUserDefinedTagTypeEntry 4 } + +eqlUserDefinedTagTypeDescription OBJECT-TYPE + SYNTAX UTFString (SIZE (0..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This field specifies a descriptive string that provides details about this tag. + The description can be up to 127 characters plus NULL." + DEFVAL { "" } + ::= { eqlUserDefinedTagTypeEntry 5 } + + +------------------------------------------------------------------------------- +-- Tag Type Table +-- +------------------------------------------------------------------------------- + +eqlTagTypeTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlTagTypeEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "EqualLogic-Dynamic + This table maintains a set of all of the current tag types defined + in the system. This is a combination of system defined tag types, as well + as user defined tag types." + ::= { eqltagObjects 6 } + +eqlTagTypeEntry OBJECT-TYPE + SYNTAX EqlTagTypeEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry in the tag object table." + INDEX {eqlTagType} + ::= { eqlTagTypeTable 1 } + +EqlTagTypeEntry ::= SEQUENCE { + eqlTagTypeRowStatus RowStatus, + eqlTagTypeName UTFString, + eqlTagTypeAdminAccountKey Unsigned32, + eqlTagTypeUserDefined TruthValue, + eqlTagTypeDescription UTFString +} + +eqlTagTypeRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Row status used to manage this row." + ::= { eqlTagTypeEntry 1 } + +eqlTagTypeName OBJECT-TYPE + SYNTAX UTFString (SIZE (0..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "The name of this tag type." + DEFVAL { "" } + ::= { eqlTagTypeEntry 2 } + +eqlTagTypeAdminAccountKey OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This field specifies the unique key for identifying a volume administrator + that owns this tag type. If no account has this value as its + eqlStorageGroupAdminAccountKey, then the tag is unassigned." + DEFVAL {0} + ::= { eqlTagTypeEntry 3 } + +eqlTagTypeUserDefined OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-write + STATUS current + DESCRIPTION "A value that indicates if the tag type is a system tag + or a user defined tag. True indicates a system defined + tag, and False indicates a user defined tag." + DEFVAL {false} + ::= { eqlTagTypeEntry 4 } + +eqlTagTypeDescription OBJECT-TYPE + SYNTAX UTFString (SIZE (0..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This field specifies a descriptive string that provides details about this tag type. + The description can be up to 127 characters plus NULL." + DEFVAL { "" } + ::= { eqlTagTypeEntry 5 } + + +------------------------------------------------------------------------------- +-- User Defined Dynamic Tag Type Table +-- +------------------------------------------------------------------------------- + +eqlUserDefinedTagLookupTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlUserDefinedTagLookupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic + This table allows for a faster lookup of the eqlTagType + for a user defined tag name, by utilizing the + eqlUserDefinedTagTypeKeyName secondary key." + ::= { eqltagObjects 7 } + +eqlUserDefinedTagLookupEntry OBJECT-TYPE + SYNTAX EqlUserDefinedTagLookupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry(row) which uses the eqlUserDefinedTagTypeKeyName + secondary key to lookup an eqlTagType." + INDEX { eqlUserDefinedTagTypeKeyName, eqlTagType } + + ::= { eqlUserDefinedTagLookupTable 1 } + +EqlUserDefinedTagLookupEntry ::= + SEQUENCE { + eqlUserDefinedTagLookupIndex Unsigned32 + } + +eqlUserDefinedTagLookupIndex OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field is the value of the eqlTagType of the + corresponding entry matching the + eqlUserDefinedTagTypeKeyName in the eqlUserDefinedTagTypeTable" + + ::= { eqlUserDefinedTagLookupEntry 1 } + + +------------------------------------------------------------------------------- +-- Dynamic Tag Usage Count Table +-- +------------------------------------------------------------------------------- + +eqlTagUsageCountTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqlTagUsageCountEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic + This table retrieves the usage count for a tag, based on + the admin access level of the user and the status of + the volume with the tag applied. A tag applied to a volume + that is not visible is not counted, such as a volume in the + recovery bin, or a replicated volume that is not in the + primary or failover state. A Tag applied to a non-active + sync-rep volume is not counted." + ::= { eqltagObjects 8 } + +eqlTagUsageCountEntry OBJECT-TYPE + SYNTAX EqlTagUsageCountEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry(row) which uses the eqlTagType and eqlTagIndex of + the tag to lookup the usage count." + INDEX { eqlTagType, eqlTagIndex } + + ::= { eqlTagUsageCountTable 1 } + + EqlTagUsageCountEntry ::= + SEQUENCE { + eqlTagUsageCount Unsigned32 + } + + eqlTagUsageCount OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field is the usage count for tag." + + ::= { eqlTagUsageCountEntry 1 } END diff --git a/mibs/equallogic/EQLVOLBALANCER-MIB b/mibs/equallogic/EQLVOLBALANCER-MIB index 1fc64e75361..f902fc638f0 100644 --- a/mibs/equallogic/EQLVOLBALANCER-MIB +++ b/mibs/equallogic/EQLVOLBALANCER-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) --FROM SNMP-FRAMEWORK-MIB; -- RFC 2571 @@ -34,7 +34,7 @@ IMPORTS FROM RFC1213-MIB; eqlvolbalancerModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO "Contact: Customer Support @@ -694,7 +694,8 @@ eqlVolBalPlanEntryStatus OBJECT-TYPE eqlVolBalPlanFlags OBJECT-TYPE SYNTAX INTEGER { - mixedModeBit(1) + mixedModeBit(1), + fastModeBit(2) } MAX-ACCESS read-create STATUS current @@ -1581,7 +1582,9 @@ eqlPageMoveHistoryType OBJECT-TYPE vacate-pool(5), move-volume(6), move-site(7), - performance-trouble(8) + performance-trouble(8), + archive(9), + fast(65536) } MAX-ACCESS read-create STATUS current diff --git a/mibs/equallogic/EQLVOLUME-MIB b/mibs/equallogic/EQLVOLUME-MIB index b23376be9c9..7d67105b530 100644 --- a/mibs/equallogic/EQLVOLUME-MIB +++ b/mibs/equallogic/EQLVOLUME-MIB @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) --FROM SNMP-FRAMEWORK-MIB; -- RFC 2571 @@ -27,10 +27,10 @@ IMPORTS FROM EQLSTORAGEPOOL-MIB; eqliscsiModule MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO - "Contact: Customer Support + "Contact: Customer SupportFlags Postal: Dell Inc 300 Innovative Way, Suite 301, Nashua, NH 03062 Tel: +1 603-579-9762 @@ -40,12 +40,12 @@ eqliscsiModule MODULE-IDENTITY DESCRIPTION "Storage Array volume information - Copyright (c) 2004-2011 by Dell, Inc. + Copyright (c) 2004-2017 by Dell Inc. All rights reserved. This software may not be copied, disclosed, transferred, or used except in accordance with a license granted - by Dell, Inc. This software embodies proprietary information - and trade secrets of Dell, Inc. + by Dell Inc. This software embodies proprietary information + and trade secrets of Dell Inc. " -- Revision history, in reverse chronological order @@ -157,7 +157,9 @@ VirtualVolumeType ::= TEXTUAL-CONVENTION unknown(0), config-VVol(1), data-VVol(2), - swap-VVol(3) + swap-VVol(3), + memory-VVol(4), + other-VVol(5) } @@ -244,6 +246,63 @@ VirtualVolumeCreatedAs ::= TEXTUAL-CONVENTION snapshot (2), fast-clone (3) } +SharedVolumeGroupRole ::= TEXTUAL-CONVENTION + DISPLAY-HINT "d" + STATUS current + DESCRIPTION "This textual convention defines the possible roles of an + SV in a Shared Volume Group" + SYNTAX INTEGER { + unknown (0), + member (1), + dependent (2), + readonly-shared-dependent (3) + } + + +BinaryUUID ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION "Used to represent binary data that is 16 bytes long (UUID/PSVID)" + SYNTAX OCTET STRING (SIZE(16)) + +BinaryVendorId ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION "Used to represent binary data that is 16 bytes long" + SYNTAX OCTET STRING (SIZE(16)) + +VirtualVolumeBitMap ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION "Some vvol functions require a bitmap to be returned. The bitmap is 4096 bits, + which is 512 bytes" + SYNTAX OCTET STRING (SIZE(512)) + +VirtualVolumeBitMapType ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION "This textual convention defines the possible values for virtual volume bitmap type + none - Do not generate a bitmap + unshared - bitmap for unsharedChunksVirtualVolume + allocated - bitmap for allocatedBitmapVirtualVolume" + SYNTAX INTEGER { + none(0), + unshared(1), + allocated(2) + } + +VirtualVolumeAllocationPolicy ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION "This textual convention defines the possible values for virtual volume allocation type + thin - no pages are allocated during vvol creation + thick - all pages are allocated during vvol creation, or a failure is returned" + SYNTAX INTEGER { + thin(0), + thick(1) + } + +Unsigned64 ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION + "A non-negative 64-bit bit integer, without counter + semantics." + SYNTAX Counter64 --*********************************************************************************** @@ -310,7 +369,11 @@ EqliscsiVolumeEntry ::= eqliscsiVolumeAdminAccountKey Unsigned32, eqliscsiVolumeSCSIQErr INTEGER, eqliscsiVolumeBorrow StatusAutoDefault, - eqliscsiVolumeSectorSize INTEGER + eqliscsiVolumeSectorSize INTEGER, + eqliscsiVolumeReplRollbackPsvId OCTET STRING, + eqliscsiVolumeUUID BinaryUUID, + eqliscsiVolumeMigrationState INTEGER, + eqliscsiVolumeMigrationCookie Unsigned64 } eqliscsiVolumeIndex OBJECT-TYPE @@ -534,7 +597,8 @@ eqliscsiVolumeReplService OBJECT-TYPE replica-control-target(4), host-control-target(5), failover(6), - pe-control-target(7) + pe-control-target(7), + xpr-control-target(8) } MAX-ACCESS read-write STATUS current @@ -815,6 +879,43 @@ eqliscsiVolumeSectorSize OBJECT-TYPE DEFVAL { sector-size-512-bytes } ::= { eqliscsiVolumeEntry 42 } +eqliscsiVolumeReplRollbackPsvId OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the psvId of snap from which this volume was rolled back as part of demote or as part of replicaset rollback." + ::= { eqliscsiVolumeEntry 43 } + +eqliscsiVolumeUUID OBJECT-TYPE + SYNTAX BinaryUUID + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Snapshot UUID used in XPR. This UUID conforms to RFC 4122 version 1." + ::= { eqliscsiVolumeEntry 44 } + +eqliscsiVolumeMigrationState OBJECT-TYPE + SYNTAX INTEGER { + none(0), + normal(1), + prep-for-migration(2), + source-disabled-for-io(3), + source-migration-in-progress(4), + source-migration-done(5), + source-aborted(6) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies migration state of volume. migration state 0/1 means same i.e. volume is not in migration." + DEFVAL {normal} + ::= { eqliscsiVolumeEntry 45 } + +eqliscsiVolumeMigrationCookie OBJECT-TYPE + SYNTAX Unsigned64 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies the Cookie." + ::= { eqliscsiVolumeEntry 46 } + ---************************************************************* eqliscsiSnapshotTable OBJECT-TYPE @@ -861,7 +962,11 @@ EqliscsiSnapshotEntry ::= eqliscsiSnapshotMultInitiator INTEGER, eqliscsiSnapshotFlags BITS, eqliscsiSnapshotCompressionDelay Unsigned32, - eqliscsiSnapshotLifeExpectancy Unsigned32 + eqliscsiSnapshotLifeExpectancy Unsigned32, + eqliscsiSnapshotOriginalUUID OCTET STRING, + eqliscsiSnapshotParentOrigUUID OCTET STRING, + eqliscsiSnapshotUUID BinaryUUID, + eqliscsiSnapshotExpirationTime Unsigned32 } eqliscsiSnapshotIndex OBJECT-TYPE @@ -1040,7 +1145,9 @@ eqliscsiSnapshotType OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION "Specifies the type of snapshot. Snapshot is of type of replica-site when - the parent volume is of type replica-site. + the parent volume is of type replica-site. The type default(5) indicates + that this snapshot was generated by the default snapshot schedule -- NOT + that 5 is the default value for a snapshot type. " DEFVAL { 1 } ::= {eqliscsiSnapshotEntry 18 } @@ -1093,7 +1200,7 @@ eqliscsiSnapshotFlags OBJECT-TYPE iSNSDiscoverable(0), -- is the snapshot iSNS discoverable? externalPauseReplication(1), -- Allow us to create replica snapshot in the paused state compressible(2), -- Allow snapshot to be compressed - flag3(3), + createdByDefaultSched(3), -- Created by default snapshot schedule flag4(4), flag5(5), flag6(6), @@ -1134,18 +1241,59 @@ eqliscsiSnapshotCompressionDelay OBJECT-TYPE SYNTAX Unsigned32 UNITS "minutes" MAX-ACCESS read-write - STATUS current - DESCRIPTION "The minimum amount of time (minutes) to wait before allowing this snapshot to be compressed." + STATUS deprecated + DESCRIPTION "This field is deprecated and will not be used." ::= { eqliscsiSnapshotEntry 25 } eqliscsiSnapshotLifeExpectancy OBJECT-TYPE SYNTAX Unsigned32 UNITS "minutes" MAX-ACCESS read-write - STATUS current - DESCRIPTION "The amount of time (minutes) this snapshot is estimated to be around." + STATUS deprecated + DESCRIPTION "This field is deprecated and will not be used." ::= { eqliscsiSnapshotEntry 26 } +eqliscsiSnapshotOriginalUUID OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field contains the UUID of the original snapshot associated with this local snapshot through + replication. This could be the UUID of the local snapshot or the snapshot on the remote partner, + depending on where the replicated data originated from. If this snapshot is the source of the replicated + data then this column will match eqliscsiSnapshotUUID in this row. + If this snapshot is the target of the replicated data then this field will contain the UUID of the + remote snapshot (the source of the replicated data). This field is only used for Cross Platform + Replication (XPR)." + ::= { eqliscsiSnapshotEntry 27 } + +eqliscsiSnapshotParentOrigUUID OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field contains the original UUID (eqliscsiSnapshotOriginalUUID) of the parent(i.e., previous) + replication snapshot. This field is used for replica snaps created for XPR partners. This field + represents the original snapshot that was previously replicated. The current snapshot (i.e., this + snapshot entry) is considered a delta from the parent snapshot represented by this field. This field + is only populated for replicas. This field is only used for Cross Platform Replication (XPR)" + ::= { eqliscsiSnapshotEntry 28 } + +eqliscsiSnapshotUUID OBJECT-TYPE + SYNTAX BinaryUUID + MAX-ACCESS read-only + STATUS current + DESCRIPTION "Snapshot UUID used in XPR. This UUID conforms to RFC 4122 version 1." + ::= { eqliscsiSnapshotEntry 29 } + +eqliscsiSnapshotExpirationTime OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "seconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This field indicates the Time to live (in seconds) i.e expiration time of the replica snapshot as sent + by the XPR partner.This field is used only in cross-platform Replication(XPR).By default the value is 0 + which indicates no expiry" + DEFVAL { 0 } + ::= { eqliscsiSnapshotEntry 30 } ---************************************************************ eqliscsiVolumeMemberTable OBJECT-TYPE SYNTAX SEQUENCE OF EqliscsiVolumeMemberEntry @@ -1621,7 +1769,8 @@ EqliscsiVolumeACLEntry ::= eqliscsiVolumeACLInitiatorInetAddressType InetAddressType, eqliscsiVolumeACLInitiatorInetAddress InetAddress, eqliscsiVolumeACLInitiatorInetWildcardType InetAddressType, - eqliscsiVolumeACLInitiatorInetWildcard InetAddress + eqliscsiVolumeACLInitiatorInetWildcard InetAddress, + eqliscsiVolumeACLInitiatorDescription UTFString } eqliscsiVolumeACLIndex OBJECT-TYPE SYNTAX Integer32 @@ -1784,6 +1933,15 @@ eqliscsiVolumeACLInitiatorInetWildcard OBJECT-TYPE address must match exactly unless this variable is specified." ::= { eqliscsiVolumeACLEntry 15} +eqliscsiVolumeACLInitiatorDescription OBJECT-TYPE + SYNTAX UTFString (SIZE (0..128)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies a descriptive string that provides + details of the access point. The description can be up + to 127 bytes plus NULL." + DEFVAL { "" } + ::= { eqliscsiVolumeACLEntry 16 } --************************************************************************* @@ -1826,7 +1984,15 @@ EqliscsiVolumeStatusEntry ::= eqliscsiVolumeStatusPagesSharedWithParent Unsigned32, eqliscsiVolumeStatusExternalConnections Integer32, eqliscsiVolumeStatusSpaceBorrowing Integer32, - eqliscsiVolumeStatusBorrow INTEGER + eqliscsiVolumeStatusBorrow INTEGER, + eqliscsiVolumeStatusVirtualSnapUsage Counter32, + eqliscsiVolumeStatusPhysicalSnapUsage Counter32, + eqliscsiVolumeStatusCompressedSnapData Counter32, + eqliscsiVolumeStatusPhysicalCompressedSnapDataSize Counter32, + eqliscsiVolumeStatusVirtualVolUsage Counter32, + eqliscsiVolumeStatusPhysicalVolUsage Counter32, + eqliscsiVolumeStatusCompressedVolData Counter32, + eqliscsiVolumeStatusPhysicalCompressedVolDataSize Counter32 } eqliscsiVolumeStatusPsvId OBJECT-TYPE @@ -2032,6 +2198,70 @@ eqliscsiVolumeStatusBorrow OBJECT-TYPE DESCRIPTION "This field specifies operational status of borrowing." ::= { eqliscsiVolumeStatusEntry 20 } +eqliscsiVolumeStatusVirtualSnapUsage OBJECT-TYPE + SYNTAX Counter32 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies how many MB of space would be utilized by compressed pages in this pool if there was no compression." + ::= { eqliscsiVolumeStatusEntry 21 } + +eqliscsiVolumeStatusPhysicalSnapUsage OBJECT-TYPE + SYNTAX Counter32 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies how many MB of space is currently utilized for compressed pages in this storage pool. This is a dynamic value and cannot be set." + ::= { eqliscsiVolumeStatusEntry 22 } + +eqliscsiVolumeStatusCompressedSnapData OBJECT-TYPE + SYNTAX Counter32 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "TBD" + ::= { eqliscsiVolumeStatusEntry 23 } + +eqliscsiVolumeStatusPhysicalCompressedSnapDataSize OBJECT-TYPE + SYNTAX Counter32 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "TBD" + ::= { eqliscsiVolumeStatusEntry 24 } + +eqliscsiVolumeStatusVirtualVolUsage OBJECT-TYPE + SYNTAX Counter32 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies how many MB of space would be utilized by compressed pages in this pool if there was no compression." + ::= { eqliscsiVolumeStatusEntry 25 } + +eqliscsiVolumeStatusPhysicalVolUsage OBJECT-TYPE + SYNTAX Counter32 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies how many MB of space is currently utilized for compressed pages in this storage pool. This is a dynamic value and cannot be set." + ::= { eqliscsiVolumeStatusEntry 26 } + +eqliscsiVolumeStatusCompressedVolData OBJECT-TYPE + SYNTAX Counter32 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "TBD" + ::= { eqliscsiVolumeStatusEntry 27 } + +eqliscsiVolumeStatusPhysicalCompressedVolDataSize OBJECT-TYPE + SYNTAX Counter32 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "TBD" + ::= { eqliscsiVolumeStatusEntry 28 } + --************************************************************************* eqliscsiSnapshotStatusTable OBJECT-TYPE @@ -2497,7 +2727,14 @@ EqliscsiVolumeReplSiteEntry ::= SEQUENCE { eqliscsiVolumeReplSiteNASPartnershipId Unsigned32, eqliscsiVolumeReplSiteBlockState StatusEnabledDefault, eqliscsiVolumeReplSiteNASState StatusDisabledDefault, - eqliscsiVolumeReplSiteType INTEGER + eqliscsiVolumeReplSiteType INTEGER, + eqliscsiVolumeReplSiteSpaceAvail Unsigned32, + eqliscsiVolumeReplSiteSpaceBorrowing Unsigned32, + eqliscsiVolumeReplSiteSpaceTimeStamp Unsigned32, + eqliscsiVolumeReplControlTargetLun Unsigned32, + eqliscsiVolumeReplSiteSystemUUID DisplayString, + eqliscsiVolumeReplSiteBiDirControlCredentials RowPointer, + eqliscsiVolumeReplSiteCHAPType INTEGER } eqliscsiVolumeReplSiteIndex OBJECT-TYPE @@ -2720,13 +2957,93 @@ eqliscsiVolumeReplSiteNASState OBJECT-TYPE eqliscsiVolumeReplSiteType OBJECT-TYPE SYNTAX INTEGER{ normal(0), - external(1) + external(1), + grpPartner(2), + compellent(3) } MAX-ACCESS read-create STATUS current - DESCRIPTION "This field represents the site type. 0 is normal aka regular repl site. 1 is external site that is not an EQL array." + DESCRIPTION "This field represents the site type. + 0 is EQL IPC based replication partner. + 1 is external site that is not an EQL array. + 2 is a Generic Replication Protocol Partner. + 3 is a Compellent replication partner." DEFVAL { normal } ::= { eqliscsiVolumeReplSiteEntry 24 } + +eqliscsiVolumeReplSiteSpaceAvail OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies how many MB of reserved + space on the site are unused by the replicated volumes." + ::= { eqliscsiVolumeReplSiteEntry 25 } + +eqliscsiVolumeReplSiteSpaceBorrowing OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies how many MB of space + replicated volumes on the site are borrowing." + ::= { eqliscsiVolumeReplSiteEntry 26 } + +eqliscsiVolumeReplSiteSpaceTimeStamp OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This is the timestamp that the ReplSiteSpace in-use information + (avail/borrowing/allocated/used) was last modified. If the timestamp is zero + it means the available and borrowing values are not valid." + ::= { eqliscsiVolumeReplSiteEntry 27 } + +eqliscsiVolumeReplControlTargetLun OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field represent the Remote Control Target Lun, + which is used when eqliscsiVolumeReplSiteType is compellent." + ::= { eqliscsiVolumeReplSiteEntry 28 } + +eqliscsiVolumeReplSiteSystemUUID OBJECT-TYPE + SYNTAX DisplayString(SIZE(0..37)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "String representation of the Partner's System UUID used + for Compellent replication. + This UUID conforms to RFC 4122 version 1." + ::= { eqliscsiVolumeReplSiteEntry 29 } + +eqliscsiVolumeReplSiteBiDirControlCredentials OBJECT-TYPE + SYNTAX RowPointer + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "EQL-SECONDARY-KEY + A pointer to the corresponding IPS-AUTH MIB + ipsAuthCredChapAttributesEntry that contains the + chap credentials which this PSA will use to + verify the response received from the target + when the PSA, acting as an initiator, has sent + a CHAP challenge." + REFERENCE + "IPS-AUTH MIB" +::= { eqliscsiVolumeReplSiteEntry 30 } + +eqliscsiVolumeReplSiteCHAPType OBJECT-TYPE + SYNTAX INTEGER{ + none(0), + single(1), + mutual(2) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field represents the site type. + 0 is no CHAP authentication + 1 is single CHAP authentication (target issues challenge). + 2 is mutual CHAP authentication " + DEFVAL { mutual } + ::= { eqliscsiVolumeReplSiteEntry 31 } + -- -- Volume Replication Table @@ -2776,7 +3093,9 @@ EqliscsiVolumeReplicationEntry ::= SEQUENCE { eqliscsiVolumeReplSyncAdminStatus INTEGER, eqliscsiVolumeReplSyncOperStatus INTEGER, eqliscsiVolumeReplTemplateReplicated TruthValue, - eqliscsiVolumeReplThinClone TruthValue + eqliscsiVolumeReplThinClone TruthValue, + eqliscsiVolumeReplLSRSnapPsvId OCTET STRING, + eqliscsiVolumeReplReplicaTimeToLiveSecs Unsigned32 } eqliscsiVolumeReplRowStatus OBJECT-TYPE @@ -2824,7 +3143,7 @@ eqliscsiVolumeReplRemoteIscsiPort OBJECT-TYPE eqliscsiVolumeReplRemotePsvId OBJECT-TYPE SYNTAX OCTET STRING (SIZE (16)) - MAX-ACCESS read-only + MAX-ACCESS read-create STATUS current DESCRIPTION "EQL-SECONDARY-KEY A 16 byte, universally unique identifier for @@ -3071,6 +3390,30 @@ eqliscsiVolumeReplThinClone OBJECT-TYPE DEFVAL {false} ::= { eqliscsiVolumeReplicationEntry 26 } + +eqliscsiVolumeReplLSRSnapPsvId OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "A 16 byte universally unique identifier for + the most recent snapshot that was successfully + replicated to the partner." +::= { eqliscsiVolumeReplicationEntry 27 } + +eqliscsiVolumeReplReplicaTimeToLiveSecs OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION " + This field specifies the time-to-live parameter of replica snapshots made + for this volume in the PSG to Compellent Storage Center replication only. + In the Storage Center to PSG direction, this field is not used and given a + default of never-delete or 0. + " + DEFVAL { 0 } + +::= { eqliscsiVolumeReplicationEntry 28 } + -- -- Volume Replication Status Table -- @@ -3218,7 +3561,8 @@ EqliscsiRemoteReplicaEntry ::= SEQUENCE { eqliscsiRemoteReplTimeStamp Counter32, eqliscsiRemoteReplSnapColIndex Unsigned32, eqliscsiRemoteReplScheduleIndex Unsigned32, - eqliscsiRemoteReplLocalMemberId Unsigned32 + eqliscsiRemoteReplLocalMemberId Unsigned32, + eqliscsiRemoteReplLun Unsigned32 } eqliscsiRemoteVolumeIndex OBJECT-TYPE @@ -3327,6 +3671,14 @@ eqliscsiRemoteReplLocalMemberId OBJECT-TYPE This field represents eqliscsiLocalMemberId field of the snapshot index of the replica on secondary site." ::= { eqliscsiRemoteReplicaEntry 10 } +eqliscsiRemoteReplLun OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field represents the LUN for the remote replica. + This field is used when replicating to compellent." + ::= { eqliscsiRemoteReplicaEntry 11 } + ---------------------------------------------------------------------- -- -- Replica Site Volume replication control MIBs @@ -3372,7 +3724,10 @@ EqliscsiReplicaSetEntry ::= SEQUENCE { eqliscsiReplicaSetSyncAdminStatus INTEGER, eqliscsiReplicaSetTemplateReplicated TruthValue, eqliscsiReplicaSetThinClone TruthValue, - eqliscsiReplicaSetRemotePsvId OCTET STRING + eqliscsiReplicaSetRemotePsvId OCTET STRING, + eqliscsiReplicaSetPriStoragePoolName UTFString, + eqliscsiReplicaSetDynamicThinReserve Unsigned32, + eqliscsiReplicaSetLSRSnapshotIndex Unsigned32 } @@ -3568,6 +3923,30 @@ eqliscsiReplicaSetRemotePsvId OBJECT-TYPE by the array where the volume is located." ::= { eqliscsiReplicaSetEntry 25 } +eqliscsiReplicaSetPriStoragePoolName OBJECT-TYPE + SYNTAX UTFString (SIZE (1..64)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "EQL-SECONDARY-KEY + This field specifies the pool name for this replica set's primary volume." + DEFVAL { "default" } + ::= { eqliscsiReplicaSetEntry 26 } + +eqliscsiReplicaSetDynamicThinReserve OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The value of this column represents the eqliscsiVolumeReplDynamicThinReserve + of the corresponding volume on the primary site." +::= { eqliscsiReplicaSetEntry 27 } + +eqliscsiReplicaSetLSRSnapshotIndex OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The index of the last successful replication snapshot in this replicaset." +::= { eqliscsiReplicaSetEntry 28 } + -- -- ReplicaSet status table -- @@ -3663,7 +4042,8 @@ EqliscsiReplicantSiteEntry ::= SEQUENCE { eqliscsiReplicantSiteInetAddrType InetAddressType, eqliscsiReplicantSiteInetAddr InetAddress, eqliscsiReplicantSiteUnmanagedSpace Unsigned32, - eqliscsiReplicantSiteReplType INTEGER + eqliscsiReplicantSiteReplType INTEGER, + eqliscsiReplicantSiteBiDirControlCredentials RowPointer } eqliscsiReplicantSiteIndex OBJECT-TYPE @@ -3879,13 +4259,36 @@ eqliscsiReplicantSiteUnmanagedSpace OBJECT-TYPE eqliscsiReplicantSiteReplType OBJECT-TYPE SYNTAX INTEGER{ normal(0), - external(1) + external(1), + grpPartner(2), + compellent(3) } MAX-ACCESS read-create STATUS current - DESCRIPTION "This field represents the site type. 0 is normal aka regular repl site. 1 is external site that is not EQL." + DESCRIPTION "This field represents the site type. + 0 is EQL IPC based replication partner. + 1 is external site that is not an EQL array. + 2 is a Generic Replication Protocol Partner. + 3 is a Compellent replication partner." DEFVAL { normal } ::= { eqliscsiReplicantSiteEntry 23 } + +eqliscsiReplicantSiteBiDirControlCredentials OBJECT-TYPE + SYNTAX RowPointer + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "EQL-SECONDARY-KEY + A pointer to the corresponding IPS-AUTH MIB + ipsAuthCredChapAttributesEntry that contains the + chap credentials which this PSA will use to + verify the response received from the target + when the PSA, acting as an initiator, has sent + a CHAP challenge." + REFERENCE + "IPS-AUTH MIB" +::= { eqliscsiReplicantSiteEntry 24 } + ---------------------------------------------------------------------- -- Volume collection objects table @@ -6217,7 +6620,13 @@ EqliscsiReplicantSiteStatusEntry ::= SEQUENCE { eqliscsiReplicantSiteStatusAvailable INTEGER, eqliscsiReplicantSiteStatusMajorVersion Unsigned32, eqliscsiReplicantSiteStatusMinorVersion Unsigned32, - eqliscsiReplicantSiteStatusMaintVersion Unsigned32 + eqliscsiReplicantSiteStatusMaintVersion Unsigned32, + eqliscsiReplicantSiteStatusSpaceAvail Unsigned32, + eqliscsiReplicantSiteStatusSpaceBorrowing Unsigned32, + eqliscsiReplicantSiteStatusVirtualSpaceUsed Unsigned32, + eqliscsiReplicantSiteStatusPhysicalSpaceUsed Unsigned32, + eqliscsiReplicantSiteStatusCompressedSpaceUsed Unsigned32, + eqliscsiReplicantSiteStatusPhysicalCompressedSpaceUsed Unsigned32 } eqliscsiReplicantSiteStatusAvailable OBJECT-TYPE @@ -6260,6 +6669,60 @@ eqliscsiReplicantSiteStatusMaintVersion OBJECT-TYPE DEFVAL { 0 } ::= { eqliscsiReplicantSiteStatusEntry 4 } +eqliscsiReplicantSiteStatusSpaceAvail OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The amount of delegated space that is not reserved, plus + any unused remote replica reserves within the delegated + space. The value is an aggregate across all pools in which + this site has delegated space." + DEFVAL { 0 } + ::= { eqliscsiReplicantSiteStatusEntry 5 } + +eqliscsiReplicantSiteStatusSpaceBorrowing OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The amount of space the replica sets for this site are + borrowing beyond their remote replica reserves. The value + is an aggregate across all pools in which this site has + delegated space." + DEFVAL { 0 } + ::= { eqliscsiReplicantSiteStatusEntry 6 } + +eqliscsiReplicantSiteStatusVirtualSpaceUsed OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The amount of storage data within the replicaset" + DEFVAL { 0 } + ::= { eqliscsiReplicantSiteStatusEntry 7 } + +eqliscsiReplicantSiteStatusPhysicalSpaceUsed OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The amount of storage taken up by the virtual space used, due to compression." + DEFVAL { 0 } + ::= { eqliscsiReplicantSiteStatusEntry 8 } + +eqliscsiReplicantSiteStatusCompressedSpaceUsed OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The amount of snapshot (replica) data that was sent to the compression engine" + DEFVAL { 0 } + ::= { eqliscsiReplicantSiteStatusEntry 9 } + +eqliscsiReplicantSiteStatusPhysicalCompressedSpaceUsed OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The amount of storage required for the snapshot (replica) data that was compressed." + DEFVAL { 0 } + ::= { eqliscsiReplicantSiteStatusEntry 10 } + --****************************************************************** eqliscsiVolumeTaskStatusTable OBJECT-TYPE SYNTAX SEQUENCE OF EqliscsiVolumeTaskStatusEntry @@ -7006,7 +7469,8 @@ EqliscsiVolumeSyncReplVirtualStatusEntry ::= eqliscsiVolumeSyncReplVirtualStatusConnections Integer32, eqliscsiVolumeSyncReplVirtualStatusAllocatedSpace Unsigned32, eqliscsiVolumeSyncReplVirtualStatusVolReserveSpace Unsigned32, - eqliscsiVolumeSyncReplVirtualStatusExtConnections Integer32 + eqliscsiVolumeSyncReplVirtualStatusExtConnections Integer32, + eqliscsiVolumeSyncReplVirtualStatusSpaceBorrowing Integer32 } eqliscsiVolumeSyncReplVirtualStatusReservedSpace OBJECT-TYPE @@ -7097,6 +7561,17 @@ eqliscsiVolumeSyncReplVirtualStatusExtConnections OBJECT-TYPE connections to this volume, not counting EQL generated connections. " ::= { eqliscsiVolumeSyncReplVirtualStatusEntry 8 } + +eqliscsiVolumeSyncReplVirtualStatusSpaceBorrowing OBJECT-TYPE + SYNTAX Integer32 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + " + This field specifies how many MB of space that this volume is borrowing. + " + ::= { eqliscsiVolumeSyncReplVirtualStatusEntry 9 } ---************************************************************* @@ -8116,7 +8591,10 @@ EqliscsiSharedVolumeEntry ::= eqliscsiSharedVolumeSharedVolumeSet EQL2PartRowPointerStr, eqliscsiSharedVolumeDescription UTFString, eqliscsiSharedVolumeFlags BITS, - eqliscsiSharedVolumeSecondaryLunId Unsigned32 + eqliscsiSharedVolumeSecondaryLunId Unsigned32, + eqliscsiSharedVolumeSVG OCTET STRING, + eqliscsiSharedVolumeExternalSVId OCTET STRING, + eqliscsiSharedVolumeAllocationPolicy VirtualVolumeAllocationPolicy } eqliscsiSharedVolumeIndex OBJECT-TYPE @@ -8207,7 +8685,9 @@ eqliscsiSharedVolumeDescription OBJECT-TYPE eqliscsiSharedVolumeFlags OBJECT-TYPE SYNTAX BITS { - isVvol(0) + isVvol(0), + isReadOnly(1), -- is this sv created as read-only + isDeleted(2) -- is sv deleted but still referenced in a recovery point } MAX-ACCESS read-only STATUS current @@ -8224,7 +8704,30 @@ eqliscsiSharedVolumeSecondaryLunId OBJECT-TYPE This is an auto-generated field for internal use only." ::= { eqliscsiSharedVolumeEntry 11 } +eqliscsiSharedVolumeSVG OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "If this shared volume is a member of a shared volume group, this field is the + unique universal identifier of the corresponding Shared Volume Group that contains this member." + ::= { eqliscsiSharedVolumeEntry 12 } + +eqliscsiSharedVolumeExternalSVId OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the SV PsvId used to + create external access (NAAID) to the shared volume." + ::= { eqliscsiSharedVolumeEntry 13 } +eqliscsiSharedVolumeAllocationPolicy OBJECT-TYPE + SYNTAX VirtualVolumeAllocationPolicy + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the Allocation type of the vvol" + ::= { eqliscsiSharedVolumeEntry 14 } + --****************************************************************** @@ -8254,7 +8757,8 @@ EqlVmwareVirtualVolumeEntry ::= eqlVmwareVirtualVolumeRowStatus RowStatus, eqlVmwareVirtualVolumeType VirtualVolumeType, - eqlVmWareVirtualVolumeIfSnapshotCreateDate Counter32 + eqlVmWareVirtualVolumeIfSnapshotCreateDate Counter32, + eqlVmwareVirtualVolumeLastBoundActivity Integer32 } eqlVmwareVirtualVolumeRowStatus OBJECT-TYPE @@ -8281,6 +8785,12 @@ eqlVmWareVirtualVolumeIfSnapshotCreateDate OBJECT-TYPE in-progress snapshots that were never completed by VMware" ::= { eqlVmwareVirtualVolumeEntry 3 } +eqlVmwareVirtualVolumeLastBoundActivity OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION "This field specifies the time at which the bound status of the vvol last changed" + ::= { eqlVmwareVirtualVolumeEntry 4 } --****************************************************************** @@ -8333,7 +8843,8 @@ eqliscsiSharedVolumeStatusOperStatus OBJECT-TYPE not-available-due-to-thin-max-growth-met(5), not-available-due-to-nospace-for-auto-grow(7), not-available-due-to-missing-pages(8), - not-available-due-to-internal-error(9) + not-available-due-to-internal-error(9), + available-lost-cached-blocks(10) } MAX-ACCESS read-only STATUS current @@ -8381,7 +8892,8 @@ EqliscsiDynVVolEntry ::= eqliscsiDynVVolCreateDerivedType INTEGER, eqliscsiDynVVolCreateDerivedFromParent EQL2PartRowPointerStr, eqliscsiDynVVolIfSnapshotMyStatus VirtualVolumeSnapshotStatus, - eqliscsiDynVVolPsvid OCTET STRING + eqliscsiDynVVolPsvid OCTET STRING, + eqliscsiDynVVolAllocationPolicy VirtualVolumeAllocationPolicy } eqliscsiDynVVolRowStatus OBJECT-TYPE @@ -8490,6 +9002,14 @@ eqliscsiDynVVolPsvid OBJECT-TYPE Virtual volume. " ::= { eqliscsiDynVVolEntry 13 } +eqliscsiDynVVolAllocationPolicy OBJECT-TYPE + SYNTAX VirtualVolumeAllocationPolicy + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Specifies the allocation policy for the vvol" + ::= { eqliscsiDynVVolEntry 14 } + + ---************************************************************* eqlDynamicSharedVolumeCopyTable OBJECT-TYPE @@ -8785,8 +9305,8 @@ eqlDynamicSharedVolumeDiffTable OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION "EqualLogic-Dynamic shared volume difference table - This write-only table is a dynamic table used by clients to perform a difference - between 2 volumes" + This create-only table is a dynamic table used by clients to perform a difference + between 2 volumes. Generates an entry in the table eqlDynamicSharedVolumeDiffChunkTable" ::= { eqliscsiTarget 91 } @@ -8802,11 +9322,11 @@ eqlDynamicSharedVolumeDiffEntry OBJECT-TYPE EqlDynamicSharedVolumeDiffEntry ::= SEQUENCE { eqlDynamicSharedVolumeDiffRowStatus RowStatus, - eqlDynamicSharedVolumeDiffBaseIndex EQL2PartRowPointerStr, - eqlDynamicSharedVolumeDiffAdmin INTEGER, - eqlDynamicSharedVolumeDiffStartSegmentOffset Counter64, - eqlDynamicSharedVolumeDiffSegmentsLength Counter64, - eqlDynamicSharedVolumeDiffChunkSize Unsigned32 + eqlDynamicSharedVolumeDiffParentIndex EQL2PartRowPointerStr, + eqlDynamicSharedVolumeDiffBitMapType VirtualVolumeBitMapType, + eqlDynamicSharedVolumeDiffStartByteOffset Counter64, + eqlDynamicSharedVolumeDiffByteCount Counter64, + eqlDynamicSharedVolumeDiffChunkSize Counter64 } eqlDynamicSharedVolumeDiffRowStatus OBJECT-TYPE @@ -8816,25 +9336,24 @@ eqlDynamicSharedVolumeDiffRowStatus OBJECT-TYPE DESCRIPTION "This field is used indicate the status of this entry." ::= { eqlDynamicSharedVolumeDiffEntry 1 } -eqlDynamicSharedVolumeDiffBaseIndex OBJECT-TYPE +eqlDynamicSharedVolumeDiffParentIndex OBJECT-TYPE SYNTAX EQL2PartRowPointerStr MAX-ACCESS read-create STATUS current DESCRIPTION "This field specifies the base shared volume index associated with the shared volume." ::= { eqlDynamicSharedVolumeDiffEntry 2} -eqlDynamicSharedVolumeDiffAdmin OBJECT-TYPE - SYNTAX INTEGER { - unSharedBitMap (1), - allocatedBitMap (2), - unsharedChunks (3) - } +eqlDynamicSharedVolumeDiffBitMapType OBJECT-TYPE + SYNTAX VirtualVolumeBitMapType MAX-ACCESS read-create STATUS current - DESCRIPTION "This field identifes the type of diff ooperation" + DESCRIPTION "The type of bitmap to generate. + none - Do not generate a bitmap + unshared - bitmap for unsharedChunksVirtualVolume + allocated - bitmap for allocatedBitmapVirtualVolume" ::= { eqlDynamicSharedVolumeDiffEntry 3 } -eqlDynamicSharedVolumeDiffStartSegmentOffset OBJECT-TYPE +eqlDynamicSharedVolumeDiffStartByteOffset OBJECT-TYPE SYNTAX Counter64 MAX-ACCESS read-create STATUS current @@ -8842,7 +9361,7 @@ eqlDynamicSharedVolumeDiffStartSegmentOffset OBJECT-TYPE "This value represents the starting segment for the diff operation" ::= { eqlDynamicSharedVolumeDiffEntry 4 } -eqlDynamicSharedVolumeDiffSegmentsLength OBJECT-TYPE +eqlDynamicSharedVolumeDiffByteCount OBJECT-TYPE SYNTAX Counter64 MAX-ACCESS read-create STATUS current @@ -8851,7 +9370,7 @@ eqlDynamicSharedVolumeDiffSegmentsLength OBJECT-TYPE ::= { eqlDynamicSharedVolumeDiffEntry 5 } eqlDynamicSharedVolumeDiffChunkSize OBJECT-TYPE - SYNTAX Unsigned32 + SYNTAX Counter64 MAX-ACCESS read-create STATUS current DESCRIPTION @@ -8863,17 +9382,17 @@ eqlDynamicSharedVolumeDiffChunkSize OBJECT-TYPE eqliscsiVolumeCompressionConfigurationTable OBJECT-TYPE SYNTAX SEQUENCE OF EqliscsiVolumeCompressionConfigurationEntry MAX-ACCESS not-accessible - STATUS current + STATUS deprecated DESCRIPTION "EqualLogic-Persistent This table defines volume specific compression paramters. - " + This table is deprecated and will not be used." ::= { eqliscsiTarget 92 } eqliscsiVolumeCompressionConfigurationEntry OBJECT-TYPE SYNTAX EqliscsiVolumeCompressionConfigurationEntry MAX-ACCESS not-accessible - STATUS current + STATUS deprecated DESCRIPTION "An entry in the volume compression configuration table." INDEX { eqliscsiLocalMemberId , eqliscsiVolumeIndex } @@ -8888,7 +9407,7 @@ EqliscsiVolumeCompressionConfigurationEntry ::= SEQUENCE { eqliscsiVolumeCompressionConfigurationRowStatus OBJECT-TYPE SYNTAX RowStatus MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION "This field is used indicate the status of this table entry." ::= { eqliscsiVolumeCompressionConfigurationEntry 1 } @@ -8900,7 +9419,7 @@ eqliscsiVolumeCompressionConfigurationPolicy OBJECT-TYPE never(3) -- Never mark snapshots created by this schedule as compressible } MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION "Specify how this volume's snapshots should be compressed." DEFVAL { automatic } ::= { eqliscsiVolumeCompressionConfigurationEntry 2 } @@ -8909,7 +9428,7 @@ eqliscsiVolumeCompressionConfigurationSnapDelay OBJECT-TYPE SYNTAX Integer32 UNITS "minutes" MAX-ACCESS read-create - STATUS current + STATUS deprecated DESCRIPTION " The value of this object represents how long to wait prior @@ -8929,7 +9448,10 @@ eqlDynamicSharedVolumeDiffChunkTable OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION - "EqualLogic-Dynamic. This table exposes the vvol as number of chunks." + "EqualLogic-Dynamic. This table exposes the vvol as number of chunks. An entry in this + table is generated when you write to the eqlDynamicSharedVolumeDiffTable. + When a successful get is performed on this table, the entry is deleted from the + cache in MgmtExec" ::= { eqliscsiTarget 93 } eqlDynamicSharedVolumeDiffChunkEntry OBJECT-TYPE @@ -8937,50 +9459,60 @@ eqlDynamicSharedVolumeDiffChunkEntry OBJECT-TYPE MAX-ACCESS not-accessible STATUS current DESCRIPTION "Information related to each chunk." - INDEX { eqliscsiLocalMemberId , eqliscsiSharedVolumeIndex, eqlDynamicSharedVolumeDiffChunkIndex } + INDEX { eqliscsiLocalMemberId , eqliscsiSharedVolumeIndex } ::= { eqlDynamicSharedVolumeDiffChunkTable 1 } EqlDynamicSharedVolumeDiffChunkEntry ::= SEQUENCE { - eqlDynamicSharedVolumeDiffChunkIndex Unsigned32, - eqlDynamicSharedVolumeDiffChunkSegmentSize Unsigned32, - eqlDynamicSharedVolumeDiffNumChunkSegments Unsigned32, - eqlDynamicSharedVolumeDiffChunkModified OCTET STRING + eqlDynamicSharedVolumeDiffChunkSizeUsed Counter64, + eqlDynamicSharedVolumeDiffChunkNumAllocated Counter64, + eqlDynamicSharedVolumeDiffChunkNumUnshared Counter64, + eqlDynamicSharedVolumeDiffChunkBitMap VirtualVolumeBitMap, + eqlDynamicSharedVolumeDiffChunkBitMapType VirtualVolumeBitMapType } -eqlDynamicSharedVolumeDiffChunkIndex OBJECT-TYPE - SYNTAX Unsigned32 - MAX-ACCESS not-accessible +eqlDynamicSharedVolumeDiffChunkSizeUsed OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only STATUS current DESCRIPTION - "This value represents index of the chunk. " + "The chunk size used to generate the bitmap and for scanning the volume" ::= { eqlDynamicSharedVolumeDiffChunkEntry 1 } -eqlDynamicSharedVolumeDiffChunkSegmentSize OBJECT-TYPE - SYNTAX Unsigned32 - UNITS "KB" +eqlDynamicSharedVolumeDiffChunkNumAllocated OBJECT-TYPE + SYNTAX Counter64 MAX-ACCESS read-only STATUS current DESCRIPTION - "This value represents the size of a segment. This is passed in to the row create of the eqlDynamicSharedVolumeDiffChunkTable" + "The number of allocated chunks" ::= { eqlDynamicSharedVolumeDiffChunkEntry 2 } -eqlDynamicSharedVolumeDiffNumChunkSegments OBJECT-TYPE - SYNTAX Unsigned32 - UNITS "segments" +eqlDynamicSharedVolumeDiffChunkNumUnshared OBJECT-TYPE + SYNTAX Counter64 MAX-ACCESS read-only STATUS current DESCRIPTION - "This value represents the size of the chunk expressed as number of segments. " + "The number of unshared chunks" ::= { eqlDynamicSharedVolumeDiffChunkEntry 3 } -eqlDynamicSharedVolumeDiffChunkModified OBJECT-TYPE - SYNTAX OCTET STRING (SIZE(1024)) +eqlDynamicSharedVolumeDiffChunkBitMap OBJECT-TYPE + SYNTAX VirtualVolumeBitMap MAX-ACCESS read-only STATUS current DESCRIPTION - "This value represents a bit mask of modified segments in the given chunk." + "The bitmap. The meaning of the bitmap is defined by the type" ::= { eqlDynamicSharedVolumeDiffChunkEntry 4 } +eqlDynamicSharedVolumeDiffChunkBitMapType OBJECT-TYPE + SYNTAX VirtualVolumeBitMapType + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The type of bitmap returned. + none - Bitmap is empty + unshared - bitmap for unsharedChunksVirtualVolume + allocated - bitmap for allocatedBitmapVirtualVolume" +::= { eqlDynamicSharedVolumeDiffChunkEntry 5 } + --****************************************************************** eqliscsiVolumeMetadataTable OBJECT-TYPE @@ -9320,4 +9852,1461 @@ eqliscsiSharedVolumeStatsMisAlignedIO OBJECT-TYPE ---************************************************************* +eqliscsiDynVVolLookupTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiDynVVolLookupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic" + ::= { eqliscsiTarget 98 } + +eqliscsiDynVVolLookupEntry OBJECT-TYPE + SYNTAX EqliscsiDynVVolLookupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) which uses the eqliscsiDynVVolName + secondary key to lookup a eqliscsiSharedVolumeIndex." + INDEX { eqliscsiDynVVolName, eqliscsiLocalMemberId, eqliscsiSharedVolumeIndex } + + ::= { eqliscsiDynVVolLookupTable 1 } + +EqliscsiDynVVolLookupEntry ::= + SEQUENCE { + eqliscsiDynVVolLookupIndex Unsigned32 + } + +eqliscsiDynVVolLookupIndex OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field is the value of the eqliscsiSharedVolumeIndex + of the corresponding entry in the eqliscsiDynVVolTable" + + ::= { eqliscsiDynVVolLookupEntry 1 } + +-- Skip { eqliscsitarget 99 }. The opcodes that are generated for this entry conflict +-- with the opcodes generated by eqliscsitarget 9. This is because the mib compiler +-- appends a 9 to opcodes if the oid is short enough (which it is for eqliscsitarget 9) + +eqliscsiDoNotUse99 OBJECT IDENTIFIER ::= { eqliscsiTarget 99 } + +--****************************************************************** + +eqliscsiVMTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiVMEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "This table contains a list of VMs" + ::= { eqliscsiTarget 100 } + +eqliscsiVMEntry OBJECT-TYPE + SYNTAX EqliscsiVMEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) which contains the name of the VM and some other information about the VM" + INDEX {eqliscsiVMIndex} + ::= { eqliscsiVMTable 1 } + +EqliscsiVMEntry ::= + SEQUENCE { + eqliscsiVMIndex Unsigned32, + eqliscsiVMRowStatus RowStatus, + eqliscsiVMName UTFString, + eqliscsiVMGuestOS UTFString, + eqliscsiVMDescription UTFString, + eqliscsiVMUUID BinaryUUID + } + +eqliscsiVMIndex OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The index for the eqliscsiVMEntry. Used in the index for eqliscsiVMVVolEntry" + ::= { eqliscsiVMEntry 1 } + +eqliscsiVMRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field is used indicate the status of this entry." + ::= { eqliscsiVMEntry 2 } + +eqliscsiVMName OBJECT-TYPE + SYNTAX UTFString (SIZE (1..64)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field is the same as the name of the VM from the VVol metadata. + This field is set at creation and is not populated automatically from the metadata" + ::= { eqliscsiVMEntry 3 } + +eqliscsiVMGuestOS OBJECT-TYPE + SYNTAX UTFString (SIZE (1..64)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field is the same as the guest OS of the VM from the VVol metadata. + This field is set at creation and is not populated automatically from the metadata" + ::= { eqliscsiVMEntry 4 } + +eqliscsiVMDescription OBJECT-TYPE + SYNTAX UTFString (SIZE (1..128)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field is the same as the description OS of the VM from the VVol metadata. + This field is set at creation and is not populated automatically from the metadata" + ::= { eqliscsiVMEntry 5 } + +eqliscsiVMUUID OBJECT-TYPE + SYNTAX BinaryUUID + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field is the same as the UUID of the VM from the VVol metadata. + This field is set at creation and is not populated automatically from the metadata" + ::= { eqliscsiVMEntry 6 } + + +--****************************************************************** + +eqliscsiVMVVolBindingTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiVMVVolBindingEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "This table contains vvols that are associated with VMs" + ::= { eqliscsiTarget 101 } + +eqliscsiVMVVolBindingEntry OBJECT-TYPE + SYNTAX EqliscsiVMVVolBindingEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) which contains the index of the vvol and the VM the vmvvol belongs to" + INDEX {eqliscsiVMIndex, eqliscsiLocalMemberId, eqliscsiSharedVolumeIndex} + ::= { eqliscsiVMVVolBindingTable 1 } + +EqliscsiVMVVolBindingEntry ::= + SEQUENCE { + eqliscsiVMVVolBindingRowStatus RowStatus + } + +eqliscsiVMVVolBindingRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field is used indicate the status of this entry." + ::= { eqliscsiVMVVolBindingEntry 1 } + +--****************************************************************** + +eqliscsiSharedVolumeSetStatusTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiSharedVolumeSetStatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic table for status used to display vvols in the group manager" + ::= { eqliscsiTarget 102 } + +eqliscsiSharedVolumeSetStatusEntry OBJECT-TYPE + SYNTAX EqliscsiSharedVolumeSetStatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) which contains stats of the vvol" + AUGMENTS { eqliscsiSharedVolumeSetEntry } + ::= { eqliscsiSharedVolumeSetStatusTable 1 } + +EqliscsiSharedVolumeSetStatusEntry ::= + SEQUENCE { + eqliscsiSharedVolumeSetStatusNumSnaps Unsigned32, + eqliscsiSharedVolumeSetStatusNumFastClones Unsigned32, + eqliscsiSharedVolumeSetStatusAllocatedSpace Unsigned32 + } + +eqliscsiSharedVolumeSetStatusNumSnaps OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "number of snapshots for a specific shared volume set" + ::= { eqliscsiSharedVolumeSetStatusEntry 1 } + +eqliscsiSharedVolumeSetStatusNumFastClones OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "number of fast clones for a specific shared volume set" + ::= { eqliscsiSharedVolumeSetStatusEntry 2 } + +eqliscsiSharedVolumeSetStatusAllocatedSpace OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "allocated space (in MB) for a specific shared volume set" + ::= { eqliscsiSharedVolumeSetStatusEntry 3 } + +--****************************************************************** + +eqliscsiVMStatusTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiVMStatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic table for status used to display vvols in the group manager" + ::= { eqliscsiTarget 103 } + +eqliscsiVMStatusEntry OBJECT-TYPE + SYNTAX EqliscsiVMStatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) which contains stats of the vvol" + AUGMENTS { eqliscsiVMEntry } + ::= { eqliscsiVMStatusTable 1 } + +EqliscsiVMStatusEntry ::= + SEQUENCE { + eqliscsiVMStatusOnline Unsigned32, + eqliscsiVMStatusAllocatedSpace Unsigned32 + } + +eqliscsiVMStatusOnline OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "1 if the Vm is online, 0 otherwise. A VM is considered online + if all the vvols assigned to that vm are online" + ::= { eqliscsiVMStatusEntry 1 } + +eqliscsiVMStatusAllocatedSpace OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Allocated space used by the VM" + ::= { eqliscsiVMStatusEntry 2 } + +--****************************************************************** + +eqliscsiVolumeReplicationUsageTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiVolumeReplicationUsageEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic Volume Replication Usage Table" +::= { eqliscsiTarget 104 } + +eqliscsiVolumeReplicationUsageEntry OBJECT-TYPE + SYNTAX EqliscsiVolumeReplicationUsageEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + INDEX { eqliscsiLocalMemberId, eqliscsiVolumeIndex, eqliscsiVolumeReplSiteIndex } +::= { eqliscsiVolumeReplicationUsageTable 1 } + +EqliscsiVolumeReplicationUsageEntry ::= SEQUENCE { + eqliscsiVolumeReplUsageTimeStamp Unsigned32, + eqliscsiVolumeReplUsageInfoValid TruthValue, + eqliscsiVolumeReplUsageSpaceAvail Integer32, + eqliscsiVolumeReplUsageSpaceBorrowing Integer32 +} + +eqliscsiVolumeReplUsageTimeStamp OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The timestamp is set on the secondary so the structure can be transmitted + as a complete MIB entry. This timestamp is re-written on the primary so + that the time of collection on the primary is based off the primary's + clock. Time is represented as the time in seconds since + 00:00:00 UTC, 1970-01-01." + ::= { eqliscsiVolumeReplicationUsageEntry 1 } + +eqliscsiVolumeReplUsageInfoValid OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies whether the usage values in this entry are valid. + This field will indicate the values are not valid if an error occurs + when trying to obtain the values from the partner." + ::= { eqliscsiVolumeReplicationUsageEntry 2 } + +eqliscsiVolumeReplUsageSpaceAvail OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies how many MB of reserved space that is unused + by the replica set on the partner." + ::= { eqliscsiVolumeReplicationUsageEntry 3 } + +eqliscsiVolumeReplUsageSpaceBorrowing OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies how many MB of space is being borrowed + by the replica set on the partner." + ::= { eqliscsiVolumeReplicationUsageEntry 4 } + + +--************************************************************************** +-- VVol Replication Tables - Begin +--************************************************************************** + +--************************************************************************** +-- Shared Volume Group Table + +eqliscsiSharedVolumeGroupTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiSharedVolumeGroupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Persistent Table" + ::= { eqliscsiTarget 111 } + +eqliscsiSharedVolumeGroupEntry OBJECT-TYPE + SYNTAX EqliscsiSharedVolumeGroupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing shared volume group (SVG) info. + The SVG maps to a VMware consistency group. + Index definition: + - member id of the group lead on row create + - monotonically increasing index value for SVG table type" + INDEX { eqliscsiSharedVolumeGroupMemberId, eqliscsiSharedVolumeGroupIndex } + ::= { eqliscsiSharedVolumeGroupTable 1 } + +EqliscsiSharedVolumeGroupEntry ::= + SEQUENCE { + eqliscsiSharedVolumeGroupMemberId Unsigned32, + eqliscsiSharedVolumeGroupIndex Unsigned32, + eqliscsiSharedVolumeGroupRowStatus RowStatus, + eqliscsiSharedVolumeGroupId OCTET STRING, + eqliscsiSharedVolumeGroupDescription UTFString, + eqliscsiSharedVolumeGroupVendorId BinaryVendorId, + eqliscsiSharedVolumeGroupReplicationPartner SiteIndexOrZero, + eqliscsiSharedVolumeGroupReplicationAdminStatus INTEGER, + eqliscsiSharedVolumeGroupReplicationOperStatus INTEGER, + eqliscsiSharedVolumeGroupLastRPId OCTET STRING, + eqliscsiSharedVolumeGroupActiveRPId OCTET STRING, + eqliscsiSharedVolumeGroupIdText UTFString + } + +eqliscsiSharedVolumeGroupMemberId OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "This field specifies the member id of the group lead + member when the SVG entry was created." + ::= { eqliscsiSharedVolumeGroupEntry 1 } + +eqliscsiSharedVolumeGroupIndex OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "This field specifies a unique index for identifing a + shared volume group." + ::= { eqliscsiSharedVolumeGroupEntry 2 } + +eqliscsiSharedVolumeGroupRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field indicates whether the shared volume group + is active or not." + ::= { eqliscsiSharedVolumeGroupEntry 3 } + + +eqliscsiSharedVolumeGroupId OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies a UUID generated by the system + to uniquely identify this SVG across all PSS groups." + ::= { eqliscsiSharedVolumeGroupEntry 4 } + +eqliscsiSharedVolumeGroupVendorId OBJECT-TYPE + SYNTAX BinaryVendorId + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies an id which is optionally provided + by the vendor to map a vendor specific id to an SVG. If + no vendor id is provided then the eqliscsiSharedVolumeGroupId + value is returned when this object is requested." + ::= { eqliscsiSharedVolumeGroupEntry 5 } + +eqliscsiSharedVolumeGroupDescription OBJECT-TYPE + SYNTAX UTFString (SIZE (0..128)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "An optional description field for this SVG." + ::= { eqliscsiSharedVolumeGroupEntry 6 } + +eqliscsiSharedVolumeGroupReplicationPartner OBJECT-TYPE + SYNTAX SiteIndexOrZero + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies the site index for the remote + replication partner or zero if undefined. A non zero + value indicates that replication has successfully been + enabled for this SVG." + ::= { eqliscsiSharedVolumeGroupEntry 7 } + +eqliscsiSharedVolumeGroupReplicationAdminStatus OBJECT-TYPE + SYNTAX INTEGER { + ready (0), + sync (1), + pause (2), + resume (3), + cancel (4), + reprotect (5), + revert (6) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies the administrative actions that + can be initiated for this SVG. The current valid actions + are dependent upon the current operational status of + replication for this SVG as follows: + ready - returned by a get operation - never a valid action + resume - resumes a paused replication + cancel - cancels a paused replication + sync - initiates replication if replication status + is enabled or failed" + ::= { eqliscsiSharedVolumeGroupEntry 8 } + +eqliscsiSharedVolumeGroupReplicationOperStatus OBJECT-TYPE + SYNTAX INTEGER { + quiescent (0), + enabled (1), + in-progress (2), + paused (3), + failed (4), + failover (5) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the operational status of replication + for an SVG. + quiescent - On initial SVG create to allow SV membership. + On disable from enabled status or failover + status or failed status. + enabled - On enable replication from quiescent status or + failover status. On replication completion from + in-progress status. + in-progress - On create recovery point initiation from + enabled status or failed status. + On recovery point resume from paused status. + paused - On replication failure from in-progress status. + failed - On recovery point cancel from paused status. + failover - On create of an SVG during failover." + ::= { eqliscsiSharedVolumeGroupEntry 9 } + +eqliscsiSharedVolumeGroupLastRPId OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the UUID which uniquely identifies the + most recent completed recovery point if one exists. On the primary + this refers to the fast failback recovery point. After + failover to a recovery point this references the recovery + point used for the failover on what is now the new primary." + ::= { eqliscsiSharedVolumeGroupEntry 10 } + +eqliscsiSharedVolumeGroupActiveRPId OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the UUID which uniquely identifies + a recovery point that is in progress or paused." + ::= { eqliscsiSharedVolumeGroupEntry 11 } + +eqliscsiSharedVolumeGroupIdText OBJECT-TYPE + SYNTAX UTFString (SIZE (0..36)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "EQL-SECONDARY-KEY + This field specifies a ascii text version of the eqliscsiSharedVolumeGroupId." + ::= { eqliscsiSharedVolumeGroupEntry 12 } + +--****************************************************************** +-- Shared Volume Group Membership Table + +eqliscsiSVGMembershipTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiSVGMembershipEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Persistent Table" + ::= { eqliscsiTarget 112 } + +eqliscsiSVGMembershipEntry OBJECT-TYPE + SYNTAX EqliscsiSVGMembershipEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing shared volume group (SVG) membership info. + Index definition: + - SVG table index from the eqliscsiSharedVolumeGroupTable + - SVG member id + - SVG index + - SV table index from the eqliscsiSharedVolumeTable + - SV member id + - SV index" + INDEX { eqliscsiSharedVolumeGroupMemberId, eqliscsiSharedVolumeGroupIndex, + eqliscsiLocalMemberId, eqliscsiSharedVolumeIndex } + ::= { eqliscsiSVGMembershipTable 1 } + +EqliscsiSVGMembershipEntry ::= + SEQUENCE { + eqliscsiSVGMembershipRowStatus RowStatus, + eqliscsiSVGMembershipRole SharedVolumeGroupRole, + eqliscsiSVGMembershipRemoteSCId BinaryUUID, + eqliscsiSVGMembershipRemoteSVId OCTET STRING, + eqliscsiSVGMembershipFlags BITS + } + +eqliscsiSVGMembershipRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field indicates whether the SVG membership row + is active or not." + ::= { eqliscsiSVGMembershipEntry 1 } + +eqliscsiSVGMembershipRole OBJECT-TYPE + SYNTAX SharedVolumeGroupRole + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies this sv's membership role within + the shared volume group." + ::= { eqliscsiSVGMembershipEntry 2 } + +eqliscsiSVGMembershipRemoteSCId OBJECT-TYPE + SYNTAX BinaryUUID + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies the UUID of the storage container + to be used for replication of this SV on the remote replication + partner." + ::= { eqliscsiSVGMembershipEntry 3} + +eqliscsiSVGMembershipRemoteSVId OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the PsvId of the paired + SV on the replication partner site." + ::= { eqliscsiSVGMembershipEntry 4 } + +eqliscsiSVGMembershipFlags OBJECT-TYPE + SYNTAX BITS { + isRoot(0) -- is sv the root SV within an SVS for this SVG + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This fields defines the common place holder for SVGMembership operational flags. " + DEFVAL { {} } + ::= { eqliscsiSVGMembershipEntry 5 } + +--************************************************************************** +-- SVG Recovery Point Table + +eqliscsiSVGRecoveryPointTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiSVGRecoveryPointEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Persistent Table" + ::= { eqliscsiTarget 113 } + +eqliscsiSVGRecoveryPointEntry OBJECT-TYPE + SYNTAX EqliscsiSVGRecoveryPointEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing shared volume group (SVG) + recovery point info. Entries exist on the primary site to + represent a fast failback option. Entries exist on the + remote replica site to represent the available recovery + points for an SVG that can be targeted for failover operations. + Index Definition: + - remote partner index or 0 for local + - SVG index to be used to create an SVG table entry from + this recovery point. All recovery points for this SVG + will use this same index on row entry create + - current group lead member id when this entry is created + - monotonically increasing index value using the SVG table type + - monotonically increasing index value to distinguish this + recovery point using the SVGRP table type" + INDEX { eqliscsiReplicantSiteIndex, + eqliscsiSharedVolumeGroupMemberId, eqliscsiSharedVolumeGroupIndex, + eqliscsiSVGRecoveryPointIndex } + ::= { eqliscsiSVGRecoveryPointTable 1 } + +EqliscsiSVGRecoveryPointEntry ::= + SEQUENCE { + eqliscsiSVGRecoveryPointIndex Unsigned32, + eqliscsiSVGRecoveryPointRowStatus RowStatus, + eqliscsiSVGRecoveryPointReplicationStatus INTEGER, + eqliscsiSVGRecoveryPointAdminStatus INTEGER, + eqliscsiSVGRecoveryPointReplicationId OCTET STRING, + eqliscsiSVGRecoveryPointTimestamp Unsigned32, + eqliscsiSVGRecoveryPointSVGId OCTET STRING, + eqliscsiSVGRecoveryPointVendorId BinaryVendorId, + eqliscsiSVGRecoveryPointReplicationIdText UTFString, + eqliscsiSVGRecoveryPointType INTEGER + } + +eqliscsiSVGRecoveryPointIndex OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "This field specifies a unique index used to distinguish + recovery points for a given SVG on the primary and + the remote replica sites." + ::= { eqliscsiSVGRecoveryPointEntry 1 } + +eqliscsiSVGRecoveryPointRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field indicates whether the shared volume group + is active or not." + ::= { eqliscsiSVGRecoveryPointEntry 2 } + +eqliscsiSVGRecoveryPointReplicationStatus OBJECT-TYPE + SYNTAX INTEGER { + unknown (0), + in-progress (1), + paused (2), + failed (3), + complete (4) + + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the current replication status for the + SVG. An entry is created prior to the start of replication + with an in-progress status. If replication is terminated with + an error then status transitions to paused. When replication + successfully completes then status transitions to completed. + If a paused replication is cancelled then this entry is removed." + ::= { eqliscsiSVGRecoveryPointEntry 3 } + +eqliscsiSVGRecoveryPointAdminStatus OBJECT-TYPE + SYNTAX INTEGER { + ready (0), + failover (1), + rollback (2), + clone (3) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies the administrative actions that + can be initiated for this recovery point. The current + valid actions are dependent upon the current replication + status of this recovery point as follows: + ready - returned by a get operation - never a valid set action + failover - fails over to this recovery point on the remote replica site + rollback - rolls back to a local recovery point" + ::= { eqliscsiSVGRecoveryPointEntry 4 } + +eqliscsiSVGRecoveryPointReplicationId OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the UUID used to uniquely identify + this recovery point. This is set at row create prior + to initiating the replication with IOM." + ::= { eqliscsiSVGRecoveryPointEntry 5 } + +eqliscsiSVGRecoveryPointTimestamp OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the creation time for a recovery point + for this SVG. Time is represented as the time in seconds + since 00:00:00 UTC, 1970-01-01." + ::= { eqliscsiSVGRecoveryPointEntry 6 } + +eqliscsiSVGRecoveryPointSVGId OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the original SVG uuid assigned + on the primary site when this SVG was first created. + This field provides an alternate lookup for + recovery points associated with this SVG. It is also + set as the value of the SVG Id if failover occurs to + this recovery point and a new SVG entry is created." + ::= { eqliscsiSVGRecoveryPointEntry 7 } + +eqliscsiSVGRecoveryPointVendorId OBJECT-TYPE + SYNTAX BinaryVendorId + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies an id which is optionally provided + by the vendor to map a vendor specific id to an SVG. If + no vendor id is provided then the eqliscsiSharedVolumeGroupId + value is returned when this object is requested." + ::= { eqliscsiSVGRecoveryPointEntry 8 } + +eqliscsiSVGRecoveryPointReplicationIdText OBJECT-TYPE + SYNTAX UTFString (SIZE (0..36)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "EQL-SECONDARY-KEY + This field specifies a ascii text version of the + eqliscsiSVGRecoveryPointReplicationId." + ::= { eqliscsiSVGRecoveryPointEntry 9 } + +eqliscsiSVGRecoveryPointType OBJECT-TYPE + SYNTAX INTEGER { + unknown(0), + recovery-point(1), + fast-failback(2), + post-rollback(3) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This fields represents the type of recovery point. + recovery-point indicates a completed recovery point on the + remote replica site; post-rollback identifies a recovery point + taken prior to a rollback operation; and, fast-failover identifies + a recovery point constructed on the primary site during + replication." + ::= { eqliscsiSVGRecoveryPointEntry 10 } + +--****************************************************************** +-- SVG Recovery Point SV Membership Table + +eqliscsiSVGRPMembershipTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiSVGRPMembershipEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Persistent Table" + ::= { eqliscsiTarget 114 } + +eqliscsiSVGRPMembershipEntry OBJECT-TYPE + SYNTAX EqliscsiSVGRPMembershipEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing SVG recovery point SV membership info. + Index definition: + - remote partner index or 0 for local + - SVG index from eqliscsiSVGRecoveryPointTable + - RP SVG member id + - RP SVG index + - monotonically increasing index value to distinguish this + recovery point + - SV table index from the local eqliscsiSharedVolumeTable + - SV member id + - SV index" + INDEX { eqliscsiReplicantSiteIndex, + eqliscsiSharedVolumeGroupMemberId, eqliscsiSharedVolumeGroupIndex, + eqliscsiSVGRecoveryPointIndex, + eqliscsiLocalMemberId, eqliscsiSharedVolumeIndex } + ::= { eqliscsiSVGRPMembershipTable 1 } + +EqliscsiSVGRPMembershipEntry ::= + SEQUENCE { + eqliscsiSVGRPMembershipRowStatus RowStatus, + eqliscsiSVGRPMembershipRole SharedVolumeGroupRole, + eqliscsiSVGRPMembershipRemoteSCId BinaryUUID, + eqliscsiSVGRPMembershipRemoteSVId OCTET STRING, + eqliscsiSVGRPMembershipSVSize Integer32 + } + + +eqliscsiSVGRPMembershipRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field indicates whether the entry + is active or not." + ::= { eqliscsiSVGRPMembershipEntry 1 } + + +eqliscsiSVGRPMembershipRole OBJECT-TYPE + SYNTAX SharedVolumeGroupRole + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies this sv's membership role within + the shared volume group." + ::= { eqliscsiSVGRPMembershipEntry 2 } + +eqliscsiSVGRPMembershipRemoteSCId OBJECT-TYPE + SYNTAX BinaryUUID + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies the UUID of the storage container + to be used for replication of this SV on the remote replication + partner." + ::= { eqliscsiSVGRPMembershipEntry 3 } + +eqliscsiSVGRPMembershipRemoteSVId OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (16)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the PsvId of the paired + SV on the replication partner site." + ::= { eqliscsiSVGRPMembershipEntry 4 } + +eqliscsiSVGRPMembershipSVSize OBJECT-TYPE + SYNTAX Integer32 + UNITS "MB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field specifies the shared volume advertized + size in MB at the time the SV was replicated for this + recovery point." + ::= { eqliscsiSVGRPMembershipEntry 5 } + +--****************************************************************** +-- SVG Lookup Table + +eqliscsiSVGLookupTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiSVGLookupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic" + ::= { eqliscsiTarget 115 } + +eqliscsiSVGLookupEntry OBJECT-TYPE + SYNTAX EqliscsiSVGLookupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) which uses the eqliscsiSharedVolumeGroupId + secondary key to lookup a eqliscsiSharedVolumeGroupIndex." + INDEX { eqliscsiSharedVolumeGroupIdText, eqliscsiSharedVolumeGroupMemberId, eqliscsiSharedVolumeGroupIndex } + + ::= { eqliscsiSVGLookupTable 1 } + +EqliscsiSVGLookupEntry ::= + SEQUENCE { + eqliscsiSVGLookupIndex Unsigned32 + } + +eqliscsiSVGLookupIndex OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field is the value of the eqliscsiSharedVolumeGroupIndex + of the corresponding entry in the eqliscsiSharedVolumeGroupTable" + + ::= { eqliscsiSVGLookupEntry 1 } + +--****************************************************************** +-- Recovery Point Lookup Table + +eqliscsiRecoveryPointLookupTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiRecoveryPointLookupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic" + ::= { eqliscsiTarget 116 } + +eqliscsiRecoveryPointLookupEntry OBJECT-TYPE + SYNTAX EqliscsiRecoveryPointLookupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) which uses the eqliscsiSVGRecoveryPointReplicationId + secondary key to lookup a eqliscsiSVGRecoveryPointIndex." + INDEX { eqliscsiSVGRecoveryPointReplicationIdText, eqliscsiReplicantSiteIndex, + eqliscsiSharedVolumeGroupMemberId, eqliscsiSharedVolumeGroupIndex, + eqliscsiSVGRecoveryPointIndex } + ::= { eqliscsiRecoveryPointLookupTable 1 } + +EqliscsiRecoveryPointLookupEntry ::= + SEQUENCE { + eqliscsiRecoveryPointLookupIndex Unsigned32 + } + +eqliscsiRecoveryPointLookupIndex OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field is the value of the eqliscsiSVGRecoveryPointIndex + of the corresponding entry in the eqliscsiSVGRecoveryPointTable" + + ::= { eqliscsiRecoveryPointLookupEntry 1 } + +--****************************************************************** +-- Recovery Point Statistics Table + +eqliscsiSVGRecoveryPointStatusTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiSVGRecoveryPointStatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic table for recovery point replication status" + ::= { eqliscsiTarget 117 } + +eqliscsiSVGRecoveryPointStatusEntry OBJECT-TYPE + SYNTAX EqliscsiSVGRecoveryPointStatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) which contains stats of the vvol" + INDEX { eqliscsiReplicantSiteIndex, + eqliscsiSharedVolumeGroupMemberId, eqliscsiSharedVolumeGroupIndex, + eqliscsiSVGRecoveryPointIndex } + ::= { eqliscsiSVGRecoveryPointStatusTable 1 } + +EqliscsiSVGRecoveryPointStatusEntry ::= + SEQUENCE { + eqliscsiSVGRecoveryPointStatusOperStatus INTEGER, + eqliscsiSVGRecoveryPointStatusMBRemaining Counter64, + eqliscsiSVGRecoveryPointStatusMBCompleted Counter64, + eqliscsiSVGRecoveryPointStatusSVRemaining Counter64, + eqliscsiSVGRecoveryPointStatusSVCompleted Counter64 + } + +eqliscsiSVGRecoveryPointStatusOperStatus OBJECT-TYPE + SYNTAX INTEGER { + unknown (0), + in-progress (1), + paused (2), + replicated (3), + failed (4), + cancelled (5) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION "This field represents the status of replication for this recovery point. + The status is based on all the members of the RP. + not-replicated - If any RPM in this RP is in the not-replicated state + in-progress - If all RPMs in this RP are in one of the states: queued, in-progress, replicated + paused - If any RPM in this RP are in the paused state + replicated - If all RPMs in this RP are in the replicated state + failed - If any RPM in this RP is in the failed state + cancelled - If any RPM in this RP is in the cancelled state" + ::= { eqliscsiSVGRecoveryPointStatusEntry 1 } + +eqliscsiSVGRecoveryPointStatusMBRemaining OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "If a transfer of data is in progress, the + count of MB successfully transferred to the + replica site. If no transfer is in + progress, this object will read zero (0)." + ::= { eqliscsiSVGRecoveryPointStatusEntry 2 } + +eqliscsiSVGRecoveryPointStatusMBCompleted OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "If a transfer of data is in progress, the + count of MB successfully transferred to the + remote site. If no transfer is in + progress, this object will read zero (0)." + ::= { eqliscsiSVGRecoveryPointStatusEntry 3 } + +eqliscsiSVGRecoveryPointStatusSVRemaining OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "If a transfer of data is in progress, the + count of shared volumes reamining to be transferred to the + remote site. If no transfer is in + progress, this object will read zero (0)." + ::= { eqliscsiSVGRecoveryPointStatusEntry 4 } + +eqliscsiSVGRecoveryPointStatusSVCompleted OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION "If a transfer of data is in progress, the + count of shared volumes successfully transferred to the + replica site. If no transfer is in + progress, this object will read zero (0)." + ::= { eqliscsiSVGRecoveryPointStatusEntry 5 } + + +--************************************************************************** +-- VVol Replication Tables - End +--************************************************************************** + + +eqliscsiReplicantSiteStoragePoolTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiReplicantSiteStoragePoolEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic Replicant Site Storage Pool Table. + This table contains a list of delegated space allocated + and used in storage pools for a replicant site." + ::= { eqliscsiTarget 121 } + +eqliscsiReplicantSiteStoragePoolEntry OBJECT-TYPE + SYNTAX EqliscsiReplicantSiteStoragePoolEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing delegated space statistics of a + replicant site" + INDEX { eqliscsiReplicantSiteIndex, eqlStoragePoolIndex } + ::= { eqliscsiReplicantSiteStoragePoolTable 1 } + +EqliscsiReplicantSiteStoragePoolEntry ::= + SEQUENCE { + eqliscsiReplicantSiteStoragePoolRowStatus RowStatus, + eqliscsiReplicantSiteStoragePoolSpaceAllocated Unsigned32, + eqliscsiReplicantSiteStoragePoolSpaceUsed Unsigned32 + } + +eqliscsiReplicantSiteStoragePoolRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field is used indicate the status of this entry." + ::= { eqliscsiReplicantSiteStoragePoolEntry 1 } + +eqliscsiReplicantSiteStoragePoolSpaceAllocated OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "The total amount of pool space reserved, for use by the site, + in the designated storage pool." + ::= { eqliscsiReplicantSiteStoragePoolEntry 2 } + +eqliscsiReplicantSiteStoragePoolSpaceUsed OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "The amount of reserve space, in the designated storage pool + This value may not exceed the corresponding value + for eqliscsiReplicantSiteStoragePoolSpaceAllocated" + ::= { eqliscsiReplicantSiteStoragePoolEntry 3 } + +---****************************************************************** + +eqliscsiReplicantSiteStoragePoolMapTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiReplicantSiteStoragePoolMapEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Persistent Replicant Site Storage Pool Map Table. + This table contains a mapping of primary pool names to + secondary pools. Volumes enabled for replication in + a primary pool are mapped to a secondary pool, where the + replica set will be initially placed." + ::= { eqliscsiTarget 122 } + +eqliscsiReplicantSiteStoragePoolMapEntry OBJECT-TYPE + SYNTAX EqliscsiReplicantSiteStoragePoolMapEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing a replication mapping of a primary + pool to a secondary pool" + INDEX { eqliscsiReplicantSiteIndex, eqliscsiReplicantSiteStoragePoolMapPriPoolName } + ::= { eqliscsiReplicantSiteStoragePoolMapTable 1 } + +EqliscsiReplicantSiteStoragePoolMapEntry ::= + SEQUENCE { + eqliscsiReplicantSiteStoragePoolMapPriPoolName UTFString, + eqliscsiReplicantSiteStoragePoolMapRowStatus RowStatus, + eqliscsiReplicantSiteStoragePoolMapPoolIndex Unsigned32 + } + +eqliscsiReplicantSiteStoragePoolMapPriPoolName OBJECT-TYPE + SYNTAX UTFString (SIZE (1..64)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies the primary pool name for this mapping + record." + ::= { eqliscsiReplicantSiteStoragePoolMapEntry 1 } + +eqliscsiReplicantSiteStoragePoolMapRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field is used to indicate the status of this entry." + ::= { eqliscsiReplicantSiteStoragePoolMapEntry 2 } + +eqliscsiReplicantSiteStoragePoolMapPoolIndex OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field is the index of a mapped secondary pool." + + ::= { eqliscsiReplicantSiteStoragePoolMapEntry 3 } + +---****************************************************************** + +eqliscsiReplDestVolTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiReplDestVolEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic Repl Dest Volume Table. + This table is a dynamic table used by clients to CREATE or DELETE a + destination volume on the EQL array that serves as a target volume for + replication from a non Equallogic partner. A successful CREATE on this + table will result in CREATION of rows in eqliscsiVolumeTable and xxx. + A successful DELETE on this table will result in DELETION of rows in + eqliscsiVolumeTable and xxx. + TimeoutCreate:60" + ::= { eqliscsiTarget 123 } + +eqliscsiReplDestVolEntry OBJECT-TYPE + SYNTAX EqliscsiReplDestVolEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "An entry (row) containing the Dynamic Repl Dest Volume Information." + INDEX { eqliscsiLocalMemberId , eqliscsiVolumeIndex } + ::= { eqliscsiReplDestVolTable 1} + +EqliscsiReplDestVolEntry ::= + SEQUENCE { + eqliscsiReplDestVolRowStatus RowStatus, + eqliscsiReplDestVolSiteIndex SiteIndex, + eqliscsiReplDestVolPresentedSize Integer32, + eqliscsiReplDestVolName UTFString, + eqliscsiReplDestVolSourceUUID BinaryUUID, + eqliscsiReplDestVolSectorSize INTEGER, + eqliscsiReplDestVolTargetIscsiName OCTET STRING, + eqliscsiReplDestVolSourceNaaid BinaryUUID, + eqliscsiReplDestVolUUID BinaryUUID, + eqliscsiReplDestVolReserve Unsigned32 + } +eqliscsiReplDestVolRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field indicates whether the xxx row is ACTIVE or not." + ::= { eqliscsiReplDestVolEntry 1} + +eqliscsiReplDestVolSiteIndex OBJECT-TYPE + SYNTAX SiteIndex + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Represents the value of eqliscsiReplicantSiteIndex that + corresponds to the site to which this volume belongs." +::= { eqliscsiReplDestVolEntry 2 } + +eqliscsiReplDestVolPresentedSize OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies the VVol size in MB. There is no default. + Note: VVol size is round to a multiple of 15MB." + ::= { eqliscsiReplDestVolEntry 3 } + +eqliscsiReplDestVolName OBJECT-TYPE + SYNTAX UTFString (SIZE (1..64)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies a user friendly name for a xxx. + The name must be unique within a group. + The name must not contain spaces or special characters. + The name can be up to 64 characters in length. There is no default." + ::= { eqliscsiReplDestVolEntry 4 } + +eqliscsiReplDestVolSourceUUID OBJECT-TYPE + SYNTAX BinaryUUID + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This is stores the unique universal identifier for this + source volume. " + ::= { eqliscsiReplDestVolEntry 5 } + +eqliscsiReplDestVolSectorSize OBJECT-TYPE + SYNTAX INTEGER { + sector-size-512-bytes(0), + sector-size-4096-bytes(1) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies, in bytes, the sector size of this volume." + ::= { eqliscsiReplDestVolEntry 6 } + +eqliscsiReplDestVolTargetIscsiName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..223)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field specifies the iSCSI target name for the volume." + ::= { eqliscsiReplDestVolEntry 7 } + + +eqliscsiReplDestVolSourceNaaid OBJECT-TYPE + SYNTAX BinaryUUID + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field stores the unique universal identifier for the + source volume. " + ::= { eqliscsiReplDestVolEntry 8 } + +eqliscsiReplDestVolUUID OBJECT-TYPE + SYNTAX BinaryUUID + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This field stores the RFC 4122 v1 unique universal identifier + for this volume. " + ::= { eqliscsiReplDestVolEntry 9 } + +eqliscsiReplDestVolReserve OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This value represents the percentage of space reserved for + a replicaset. This value is written to eqliscsiReplicaSetReserve + field of the replicaset corresponding to this row." + DEFVAL { 200 } + ::= { eqliscsiReplDestVolEntry 10 } + + +---****************************************************************** + +eqliscsiVolumeReplSiteXprTargetTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiVolumeReplSiteXprTargetEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Persistent + This table contains ISCSI target information for a replication site. + This table is used when replicating to non-Equallogic (cross-platform + replication, XPR) partners that require persistent ISCSI sessions. An + example of such partners is the Compellent SC array. An Equallogic group + logs in to these targets and maintains ISCSI sessions to these targets + even when there is no active replication in progress." + ::= { eqliscsiTarget 124 } + +eqliscsiVolumeReplSiteXprTargetEntry OBJECT-TYPE + SYNTAX EqliscsiVolumeReplSiteXprTargetEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + INDEX { eqliscsiVolumeReplSiteIndex, eqliscsiVolumeReplSiteXprTargetIndex } + ::= { eqliscsiVolumeReplSiteXprTargetTable 1 } + +EqliscsiVolumeReplSiteXprTargetEntry ::= SEQUENCE { + eqliscsiVolumeReplSiteXprTargetIndex Unsigned32, + eqliscsiVolumeReplSiteXprTargetRowStatus RowStatus, + eqliscsiVolumeReplSiteXprTargetIscsiName OCTET STRING, + eqliscsiVolumeReplSiteXprTargetInetAddrType InetAddressType, + eqliscsiVolumeReplSiteXprTargetInetAddr InetAddress, + eqliscsiVolumeReplSiteXprTargetIscsiCookie Unsigned32 +} +eqliscsiVolumeReplSiteXprTargetIndex OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A unique 32 bit identifier for this row" +::= { eqliscsiVolumeReplSiteXprTargetEntry 1 } + +eqliscsiVolumeReplSiteXprTargetRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The status of the row" +::= { eqliscsiVolumeReplSiteXprTargetEntry 2 } + +eqliscsiVolumeReplSiteXprTargetIscsiName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..223)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "The iSCSI name of the target to which a persistent + connection will be maintained" +::= { eqliscsiVolumeReplSiteXprTargetEntry 3 } + +eqliscsiVolumeReplSiteXprTargetInetAddrType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-create + STATUS current + DESCRIPTION "The type of the IP address to connect to this target" +::= { eqliscsiVolumeReplSiteXprTargetEntry 4 } + +eqliscsiVolumeReplSiteXprTargetInetAddr OBJECT-TYPE + SYNTAX InetAddress + MAX-ACCESS read-create + STATUS current + DESCRIPTION "The IP address to connect to this target" +::= { eqliscsiVolumeReplSiteXprTargetEntry 5 } + +eqliscsiVolumeReplSiteXprTargetIscsiCookie OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION "This is cookie value of last connection." + DEFVAL { 0 } +::= { eqliscsiVolumeReplSiteXprTargetEntry 6 } + +---****************************************************************** + +eqliscsiVolumeOfflineStatusforSnmpTrapTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiVolumeOfflineStatusforSnmpTrapEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic + This dummy table relates an iscsi offline volume to the + reason for going offline and sends SNMP trap to the subscribers." + ::= { eqliscsiTarget 125 } + +eqliscsiVolumeOfflineStatusforSnmpTrapEntry OBJECT-TYPE + SYNTAX EqliscsiVolumeOfflineStatusforSnmpTrapEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + INDEX { eqliscsiLocalMemberId , eqliscsiVolumeIndex } + ::= { eqliscsiVolumeOfflineStatusforSnmpTrapTable 1 } + +EqliscsiVolumeOfflineStatusforSnmpTrapEntry ::= SEQUENCE { + eqliscsiVolumeOfflineStatusIndex Unsigned32, + eqliscsiVolumeiOfflineStatusRowStatus RowStatus, + eqliscsiVolumeOfflineStatusVolumeName DisplayString, + eqliscsiVolumeOfflineStatusReason INTEGER +} + +eqliscsiVolumeOfflineStatusIndex OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A unique 32 bit identifier for this row" +::= { eqliscsiVolumeOfflineStatusforSnmpTrapEntry 1 } + +eqliscsiVolumeiOfflineStatusRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The status of the row" +::= { eqliscsiVolumeOfflineStatusforSnmpTrapEntry 2 } + +eqliscsiVolumeOfflineStatusVolumeName OBJECT-TYPE + SYNTAX DisplayString(SIZE(1..64)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "The iSCSI name of the target which has gone offline" +::= { eqliscsiVolumeOfflineStatusforSnmpTrapEntry 3 } + +eqliscsiVolumeOfflineStatusReason OBJECT-TYPE + SYNTAX INTEGER { + available(0), + snap-reserve-met(1), + members-offline(2), + repl-over-commit-not-allowed-cancel-replication(3), + repl-over-commit-no-free-pages-cancel-replication(4), + repl-over-commit-have-free-space(5), + thin-max-grow-met(6), + thin-no-space-for-auto-grow(7), + missing-pages(8), + thin-max-grow(9), + thin-auto-grow-failure(10), + sync-rep-not-ready-for-io(11) + } + + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Reason the volume has gone offline" +::= { eqliscsiVolumeOfflineStatusforSnmpTrapEntry 4 } + +--************************************************************************** +--Keep this comment at the end of the file +--Because of the way opcodes are created (incorrectly) the lower number entries +--in this mib sometimes have a 9 appended to their opcode. This opcode will conflict +--with later opcodes in this file, starting at 99, 109, 119, 129 etc... +--These numbers should be avoided. If these numbers are used, there is a chance +--agent will permacore because of duplicate opcodes. +--************************************************************************** +-- +-- SNMP TRAPS +-- + +eqliscsiVolumeNotifications OBJECT IDENTIFIER ::= {eqliscsiNotifications 1} + + +eqliscsiVolumeMultiInitiatorAttributeChanged NOTIFICATION-TYPE + OBJECTS{ + eqliscsiVolumeName, + eqliscsiVolumeMultInitiator + } + STATUS current + DESCRIPTION + "Sent when the volume iscsi multi inititor access is modified." + ::= { eqliscsiVolumeNotifications 1 } + + +eqliscsiVolumeOfflineStatusAlert NOTIFICATION-TYPE + OBJECTS{ + eqliscsiVolumeOfflineStatusVolumeName, + eqliscsiVolumeOfflineStatusReason + } + STATUS current + DESCRIPTION + "Sent when a volume goes offline." + ::= { eqliscsiVolumeNotifications 2 } + +eqliscsiVolumeReplRemoteReservLow NOTIFICATION-TYPE + OBJECTS{ + eqliscsiVolumeName + } + STATUS current + DESCRIPTION + "Sent when the remote replica reserve of a volume goes low" + ::= { eqliscsiVolumeNotifications 3 } + +eqliscsiVolumeReplReplicaNoProgress NOTIFICATION-TYPE + OBJECTS{ + eqliscsiVolumeName + } + STATUS current + DESCRIPTION + "Sent when there is no progress in replicating the volume" + ::= { eqliscsiVolumeNotifications 4 } + +eqliscsiVolumeReplRemoteReplicaSetNotFound NOTIFICATION-TYPE + OBJECTS{ + eqliscsiVolumeName + } + STATUS current + DESCRIPTION + "Sent when the remote replica is does not exist. Perhaps has been promoted" + ::= { eqliscsiVolumeNotifications 5 } + +eqliscsiVolumeReplRemoteResizeFailed NOTIFICATION-TYPE + OBJECTS{ + eqliscsiVolumeName + } + STATUS current + DESCRIPTION + "Sent when the replication is paused due to insufficient delegated space + on partner" + ::= { eqliscsiVolumeNotifications 6 } + +---****************************************************************** + +eqliscsiVolumePRKeysFullStatusTable OBJECT-TYPE + SYNTAX SEQUENCE OF EqliscsiVolumePRKeysFullStatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "EqualLogic-Dynamic + This table contains pr reservation info. + " + ::= { eqliscsiTarget 126 } + +eqliscsiVolumePRKeysFullStatusEntry OBJECT-TYPE + SYNTAX EqliscsiVolumePRKeysFullStatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + INDEX { eqliscsiLocalMemberId , eqliscsiVolumeIndex, + eqliscsiVolumePRKeysFullStatusIndex } + ::= { eqliscsiVolumePRKeysFullStatusTable 1 } + +EqliscsiVolumePRKeysFullStatusEntry ::= SEQUENCE { + eqliscsiVolumePRKeysFullStatusIndex Unsigned32, + eqliscsiVolumePRKeysFullStatusRowStatus RowStatus, + eqliscsiVolumePRKeysFullStatusKeyList OCTET STRING +} + +eqliscsiVolumePRKeysFullStatusIndex OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION "This field specifies a unique index for identifing a Key." + ::= { eqliscsiVolumePRKeysFullStatusEntry 1} + +eqliscsiVolumePRKeysFullStatusRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The status of the row." +::= { eqliscsiVolumePRKeysFullStatusEntry 2 } + +eqliscsiVolumePRKeysFullStatusKeyList OBJECT-TYPE + SYNTAX OCTET STRING (SIZE(0..1024)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION "Comma separated list of PR info." +::= { eqliscsiVolumePRKeysFullStatusEntry 3 } + +---****************************************************************** + END diff --git a/mibs/equallogic/EQUALLOGIC-SMI b/mibs/equallogic/EQUALLOGIC-SMI index 342ac7283b2..96684a63da7 100644 --- a/mibs/equallogic/EQUALLOGIC-SMI +++ b/mibs/equallogic/EQUALLOGIC-SMI @@ -1,4 +1,4 @@ --- Mib files packaged on Tue Mar 17 11:28:59 EDT 2015 for Storage Array Firmware V7.1.5 (R408054) +-- Mib files packaged on Wed Jun 19 01:31:39 EDT 2019 for Storage Array Firmware V10.0.3 (R469188) EQUALLOGIC-SMI DEFINITIONS ::= BEGIN IMPORTS @@ -8,7 +8,7 @@ IMPORTS FROM SNMPv2-SMI; equalLogic MODULE-IDENTITY - LAST-UPDATED "201503171528Z" + LAST-UPDATED "201906190531Z" ORGANIZATION "EqualLogic Inc." CONTACT-INFO "Contact: Customer Support diff --git a/mibs/exeltech/EXELTECH-XFRESW b/mibs/exeltech/EXELTECH-XFERSW similarity index 100% rename from mibs/exeltech/EXELTECH-XFRESW rename to mibs/exeltech/EXELTECH-XFERSW diff --git a/mibs/fs/PIM-BSR-MIB b/mibs/fs/PIM-BSR-MIB deleted file mode 100644 index 978c00f00f4..00000000000 --- a/mibs/fs/PIM-BSR-MIB +++ /dev/null @@ -1,699 +0,0 @@ -PIM-BSR-MIB DEFINITIONS ::= BEGIN - -IMPORTS - MODULE-IDENTITY, OBJECT-TYPE, - NOTIFICATION-TYPE, - mib-2, Unsigned32, TimeTicks FROM SNMPv2-SMI - RowStatus, TruthValue, - StorageType FROM SNMPv2-TC - MODULE-COMPLIANCE, OBJECT-GROUP, - NOTIFICATION-GROUP FROM SNMPv2-CONF - InetAddressType, - InetAddressPrefixLength, - InetAddress, - InetZoneIndex FROM INET-ADDRESS-MIB; - -pimBsrMIB MODULE-IDENTITY - LAST-UPDATED "200805280000Z" -- 28 May 2008 - ORGANIZATION - "IETF Protocol Independent Multicast (PIM) Working Group" - CONTACT-INFO - "Email: pim@ietf.org - WG charter: - http://www.ietf.org/html.charters/pim-charter.html" - DESCRIPTION - "The MIB module for management of the Bootstrap Router - (BSR) mechanism for PIM routers. - - Copyright (C) The IETF Trust (2008). This version - of this MIB module is part of RFC 5240; see the RFC - itself for full legal notices." - REVISION "200805280000Z" -- 28 May 2008 - DESCRIPTION "Initial version, published as RFC 5240." - ::= { mib-2 172 } - --- --- Top-level structure --- - -pimBsrNotifications OBJECT IDENTIFIER ::= { pimBsrMIB 0 } -pimBsrObjects OBJECT IDENTIFIER ::= { pimBsrMIB 1 } - --- --- Conformance Information --- - -pimBsrConformance OBJECT IDENTIFIER ::= { pimBsrMIB 2 } -pimBsrCompliances OBJECT IDENTIFIER ::= { pimBsrConformance 1 } -pimBsrGroups OBJECT IDENTIFIER ::= { pimBsrConformance 2 } - --- --- The BSR Candidate-RP Table --- - -pimBsrCandidateRPTable OBJECT-TYPE - SYNTAX SEQUENCE OF PimBsrCandidateRPEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The (conceptual) table listing the IP multicast group - prefixes for which the local router is to advertise - itself as a Candidate-RP." - ::= { pimBsrObjects 1 } - -pimBsrCandidateRPEntry OBJECT-TYPE - SYNTAX PimBsrCandidateRPEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "An entry (conceptual row) in the - pimBsrCandidateRPTable." - INDEX { pimBsrCandidateRPAddressType, - pimBsrCandidateRPAddress, - pimBsrCandidateRPGroupAddress, - pimBsrCandidateRPGroupPrefixLength } - ::= { pimBsrCandidateRPTable 1 } - -PimBsrCandidateRPEntry ::= SEQUENCE { - pimBsrCandidateRPAddressType InetAddressType, - pimBsrCandidateRPAddress InetAddress, - pimBsrCandidateRPGroupAddress InetAddress, - pimBsrCandidateRPGroupPrefixLength InetAddressPrefixLength, - pimBsrCandidateRPBidir TruthValue, - pimBsrCandidateRPAdvTimer TimeTicks, - pimBsrCandidateRPPriority Unsigned32, - pimBsrCandidateRPAdvInterval Unsigned32, - pimBsrCandidateRPHoldtime Unsigned32, - pimBsrCandidateRPStatus RowStatus, - pimBsrCandidateRPStorageType StorageType -} - -pimBsrCandidateRPAddressType OBJECT-TYPE - SYNTAX InetAddressType - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The Inet address type of the Candidate-RP." - ::= { pimBsrCandidateRPEntry 1 } - -pimBsrCandidateRPAddress OBJECT-TYPE - SYNTAX InetAddress (SIZE (4|8|16|20)) - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The (unicast) address that will be advertised as a - Candidate-RP. The InetAddressType is given by the - pimBsrCandidateRPAddressType object." - ::= { pimBsrCandidateRPEntry 2 } - -pimBsrCandidateRPGroupAddress OBJECT-TYPE - SYNTAX InetAddress (SIZE (4|8|16|20)) - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The IP multicast group address that, when combined with - the corresponding value of - pimBsrCandidateRPGroupPrefixLength, identifies a group - prefix for which the local router will advertise itself - as a Candidate-RP. The InetAddressType is given by the - pimBsrCandidateRPAddressType object. - - This address object is only significant up to - pimBsrCandidateRPGroupPrefixLength bits. The - remainder of the address bits are zero. This is - especially important for this field, which is part of - the index of this entry. Any non-zero bits would - signify an entirely different entry." - ::= { pimBsrCandidateRPEntry 3 } - -pimBsrCandidateRPGroupPrefixLength OBJECT-TYPE - SYNTAX InetAddressPrefixLength (4..128) - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The multicast group address mask that, when combined - with the corresponding value of - pimBsrCandidateRPGroupAddress, identifies a group prefix - for which the local router will advertise itself as a - Candidate-RP. The InetAddressType is given by the - - pimBsrCandidateRPAddressType object." - ::= { pimBsrCandidateRPEntry 4 } - -pimBsrCandidateRPBidir OBJECT-TYPE - SYNTAX TruthValue - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "If this object is set to TRUE, this group range is - advertised with this RP as a BIDIR-PIM group range. If - it is set to FALSE, it is advertised as a PIM-SM group - range." - DEFVAL { false } - ::= { pimBsrCandidateRPEntry 5 } - -pimBsrCandidateRPAdvTimer OBJECT-TYPE - SYNTAX TimeTicks - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The time remaining before the local router next sends - a Candidate-RP-Advertisement to the elected BSR for - this zone." - ::= { pimBsrCandidateRPEntry 6 } - -pimBsrCandidateRPPriority OBJECT-TYPE - SYNTAX Unsigned32 (0..255) - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "The priority for this Candidate-RP advertised in - Candidate-RP-Advertisements." - REFERENCE "RFC 5059, section 3.2" - DEFVAL { 192 } - ::= { pimBsrCandidateRPEntry 7 } - -pimBsrCandidateRPAdvInterval OBJECT-TYPE - SYNTAX Unsigned32 (1..26214) - UNITS "seconds" - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "A Candidate-RP generates Candidate-RP-Advertisements - periodically. This object represents the time interval - in seconds between two consecutive advertisements." - REFERENCE "RFC 5059, sections 3.2 and 5" - DEFVAL { 60 } - ::= { pimBsrCandidateRPEntry 8 } - -pimBsrCandidateRPHoldtime OBJECT-TYPE - SYNTAX Unsigned32 (0..65535) - UNITS "seconds" - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "Holdtime for this Candidate-RP. The amount of time (in - seconds) this Candidate-RP entry is valid. - - This object's value can be zero only when this C-RP is - shutting down." - REFERENCE "RFC 5059, section 4.2" - DEFVAL { 150 } - ::= { pimBsrCandidateRPEntry 9 } - -pimBsrCandidateRPStatus OBJECT-TYPE - SYNTAX RowStatus - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "The status of this row, by which new entries may be - created, or old entries deleted from this table. - - This status object can be set to active(1) without - setting any other columnar objects in this entry. - - All writable objects in this entry can be modified - when the status of this entry is active(1)." - ::= { pimBsrCandidateRPEntry 10 } - -pimBsrCandidateRPStorageType OBJECT-TYPE - SYNTAX StorageType - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "The storage type for this row. Rows having the value - 'permanent' need not allow write-access to any columnar - objects in the row." - DEFVAL { nonVolatile } - ::= { pimBsrCandidateRPEntry 11 } - --- - --- The BSR Elected BSR RP-Set Table --- - -pimBsrElectedBSRRPSetTable OBJECT-TYPE - SYNTAX SEQUENCE OF PimBsrElectedBSRRPSetEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The (conceptual) table listing BSR-specific information - about PIM group mappings learned via C-RP advertisements - or created locally using configurations. This table is - maintained only on the Elected BSR. - - An Elected BSR uses this table to create Bootstrap - messages after applying a local policy to include some - or all of the group mappings in this table." - ::= { pimBsrObjects 2 } - -pimBsrElectedBSRRPSetEntry OBJECT-TYPE - SYNTAX PimBsrElectedBSRRPSetEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "An entry (conceptual row) in the - pimBsrElectedBSRRPSetTable." - INDEX { pimBsrElectedBSRGrpMappingAddrType, - pimBsrElectedBSRGrpMappingGrpAddr, - pimBsrElectedBSRGrpMappingGrpPrefixLen, - pimBsrElectedBSRGrpMappingRPAddr } - ::= { pimBsrElectedBSRRPSetTable 1 } - -PimBsrElectedBSRRPSetEntry ::= SEQUENCE { - pimBsrElectedBSRGrpMappingAddrType InetAddressType, - pimBsrElectedBSRGrpMappingGrpAddr InetAddress, - pimBsrElectedBSRGrpMappingGrpPrefixLen InetAddressPrefixLength, - pimBsrElectedBSRGrpMappingRPAddr InetAddress, - pimBsrElectedBSRRPSetPriority Unsigned32, - pimBsrElectedBSRRPSetHoldtime Unsigned32, - pimBsrElectedBSRRPSetExpiryTime TimeTicks, - pimBsrElectedBSRRPSetGrpBidir TruthValue -} - -pimBsrElectedBSRGrpMappingAddrType OBJECT-TYPE - SYNTAX InetAddressType - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The Inet address type of the IP multicast group - prefix." - ::= { pimBsrElectedBSRRPSetEntry 2 } - -pimBsrElectedBSRGrpMappingGrpAddr OBJECT-TYPE - SYNTAX InetAddress (SIZE (4|8|16|20)) - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The IP multicast group address that, when combined - with pimBsrElectedBSRGrpMappingGrpPrefixLen, gives the - group prefix for this mapping. The InetAddressType is - given by the pimBsrElectedBSRGrpMappingAddrType object. - - This address object is only significant up to - pimBsrElectedBSRGrpMappingGrpPrefixLen bits. The - remainder of the address bits are zero. This is - especially important for this field, which is part of - the index of this entry. Any non-zero bits would - signify an entirely different entry." - ::= { pimBsrElectedBSRRPSetEntry 3 } - -pimBsrElectedBSRGrpMappingGrpPrefixLen OBJECT-TYPE - SYNTAX InetAddressPrefixLength (4..128) - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The multicast group prefix length that, when combined - with pimBsrElectedBSRGrpMappingGrpAddr, gives the group - prefix for this mapping. The InetAddressType is given by - the pimBsrElectedBSRGrpMappingAddrType object. If - pimBsrElectedBSRGrpMappingAddrType is 'ipv4' or 'ipv4z', - this object must be in the range 4..32. If - pimBsrElectedBSRGrpMappingAddrType is 'ipv6' or 'ipv6z', - this object must be in the range 8..128." - ::= { pimBsrElectedBSRRPSetEntry 4 } - -pimBsrElectedBSRGrpMappingRPAddr OBJECT-TYPE - SYNTAX InetAddress (SIZE (4|8|16|20)) - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The IP address of the RP to be used for groups within - this group prefix. The InetAddressType is given by the - pimBsrElectedBSRGrpMappingAddrType object." - ::= { pimBsrElectedBSRRPSetEntry 5 } - -pimBsrElectedBSRRPSetPriority OBJECT-TYPE - SYNTAX Unsigned32 (0..255) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The priority for RP. Numerically higher values for - this object indicate lower priorities, with the value - zero denoting the highest priority." - REFERENCE "RFC 5059, section 4.1" - ::= { pimBsrElectedBSRRPSetEntry 6 } - -pimBsrElectedBSRRPSetHoldtime OBJECT-TYPE - SYNTAX Unsigned32 (0..65535) - UNITS "seconds" - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The holdtime for RP" - REFERENCE "RFC 5059, section 4.1" - ::= { pimBsrElectedBSRRPSetEntry 7 } - -pimBsrElectedBSRRPSetExpiryTime OBJECT-TYPE - SYNTAX TimeTicks - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The minimum time remaining before this entry will be - aged out. The value zero indicates that this entry will - never be aged out." - ::= { pimBsrElectedBSRRPSetEntry 8 } - -pimBsrElectedBSRRPSetGrpBidir OBJECT-TYPE - SYNTAX TruthValue - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "If this object is TRUE, this group range with this - RP is a BIDIR-PIM group range. If it is set to FALSE, - it is a PIM-SM group range." - ::= { pimBsrElectedBSRRPSetEntry 9 } - --- --- The BSR Candidate-BSR Table --- - -pimBsrCandidateBSRTable OBJECT-TYPE - SYNTAX SEQUENCE OF PimBsrCandidateBSREntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The (conceptual) table containing Candidate-BSR - configuration for the local router. The table contains - one row for each zone for which the local router is - to advertise itself as a Candidate-BSR." - ::= { pimBsrObjects 3 } - -pimBsrCandidateBSREntry OBJECT-TYPE - SYNTAX PimBsrCandidateBSREntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "An entry (conceptual row) in the - pimBsrCandidateBSRTable." - INDEX { pimBsrCandidateBSRZoneIndex } - ::= { pimBsrCandidateBSRTable 1 } - -PimBsrCandidateBSREntry ::= SEQUENCE { - pimBsrCandidateBSRZoneIndex InetZoneIndex, - pimBsrCandidateBSRAddressType InetAddressType, - pimBsrCandidateBSRAddress InetAddress, - pimBsrCandidateBSRPriority Unsigned32, - pimBsrCandidateBSRHashMaskLength Unsigned32, - pimBsrCandidateBSRElectedBSR TruthValue, - pimBsrCandidateBSRBootstrapTimer TimeTicks, - pimBsrCandidateBSRStatus RowStatus, - pimBsrCandidateBSRStorageType StorageType -} - -pimBsrCandidateBSRZoneIndex OBJECT-TYPE - SYNTAX InetZoneIndex (1..4294967295) - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The zone index uniquely identifies the zone on a - device to which this Candidate-BSR is attached. There is - one entry for each zone in ipMcastZoneTable. Scope-level - information for this zone can be extracted from - ipMcastZoneTable in IP Multicast MIB [RFC5132]. - - Zero is a special value used to request the default zone - for a given scope. Zero is not a valid value for this - object." - ::= { pimBsrCandidateBSREntry 1 } - -pimBsrCandidateBSRAddressType OBJECT-TYPE - SYNTAX InetAddressType - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "The address type of the Candidate-BSR." - ::= { pimBsrCandidateBSREntry 2 } - -pimBsrCandidateBSRAddress OBJECT-TYPE - SYNTAX InetAddress - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "The (unicast) address that the local router will - use to advertise itself as a Candidate-BSR. The - InetAddressType is given by the - pimBsrCandidateBSRAddressType object." - ::= { pimBsrCandidateBSREntry 3 } - -pimBsrCandidateBSRPriority OBJECT-TYPE - SYNTAX Unsigned32 (0..255) - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "The priority value for the local router as a - Candidate-BSR for this zone. Numerically higher - values for this object indicate higher priorities." - DEFVAL { 0 } - ::= { pimBsrCandidateBSREntry 4 } - -pimBsrCandidateBSRHashMaskLength OBJECT-TYPE - SYNTAX Unsigned32 (0..128) - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "The hash mask length (used in the RP hash function) - that the local router will advertise in its Bootstrap - messages for this zone. This object defaults - to 30 if pimBsrCandidateBSRAddressType is 'ipv4' or - 'ipv4z' , and defaults to 126 if - pimBsrCandidateBSRAddressType is 'ipv6' or 'ipv6z'." - ::= { pimBsrCandidateBSREntry 5 } - -pimBsrCandidateBSRElectedBSR OBJECT-TYPE - SYNTAX TruthValue - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "Whether the local router is the elected BSR for this - zone." - ::= { pimBsrCandidateBSREntry 6 } - -pimBsrCandidateBSRBootstrapTimer OBJECT-TYPE - SYNTAX TimeTicks - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The time remaining before the local router next - originates a Bootstrap message for this zone. - Value of this object is zero if - pimBsrCandidateBSRElectedBSR is 'FALSE'." - ::= { pimBsrCandidateBSREntry 7 } - -pimBsrCandidateBSRStatus OBJECT-TYPE - SYNTAX RowStatus - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "The status of this row, by which new entries may - be created or old entries deleted from this table. - - This status object can be set to active(1) without - setting any other columnar objects in this entry. - - All writable objects in this entry can be modified - when the status of this entry is active(1)." - ::= { pimBsrCandidateBSREntry 8 } - -pimBsrCandidateBSRStorageType OBJECT-TYPE - SYNTAX StorageType - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "The storage type for this row. Rows having the value - 'permanent' need not allow write-access to any columnar - objects in the row." - DEFVAL { nonVolatile } - ::= { pimBsrCandidateBSREntry 9 } - --- --- The BSR Elected-BSR Table --- - -pimBsrElectedBSRTable OBJECT-TYPE - SYNTAX SEQUENCE OF PimBsrElectedBSREntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The (conceptual) table containing information about - elected BSRs. The table contains one row for each - zone for which there is an elected BSR." - ::= { pimBsrObjects 4 } - -pimBsrElectedBSREntry OBJECT-TYPE - SYNTAX PimBsrElectedBSREntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "An entry (conceptual row) in the - pimBsrElectedBSRTable." - INDEX { pimBsrElectedBSRZoneIndex } - ::= { pimBsrElectedBSRTable 1 } - -PimBsrElectedBSREntry ::= SEQUENCE { - pimBsrElectedBSRZoneIndex InetZoneIndex, - pimBsrElectedBSRAddressType InetAddressType, - pimBsrElectedBSRAddress InetAddress, - pimBsrElectedBSRPriority Unsigned32, - pimBsrElectedBSRHashMaskLength Unsigned32, - pimBsrElectedBSRExpiryTime TimeTicks -} - -pimBsrElectedBSRZoneIndex OBJECT-TYPE - SYNTAX InetZoneIndex (1..4294967295) - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The zone index uniquely identifies the zone on a - device to which this Elected BSR is attached. There - is one entry for each zone in ipMcastZoneTable. - Scope-level information for this zone can be extracted - from ipMcastZoneTable in IP Multicast MIB [RFC5132]. - - Zero is a special value used to request the default zone - for a given scope. Zero is not a valid value for this - object." - ::= { pimBsrElectedBSREntry 1 } - -pimBsrElectedBSRAddressType OBJECT-TYPE - SYNTAX InetAddressType - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The address type of the elected BSR." - ::= { pimBsrElectedBSREntry 2 } - -pimBsrElectedBSRAddress OBJECT-TYPE - SYNTAX InetAddress (SIZE (4|8|16|20)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The (unicast) address of the elected BSR. The - InetAddressType is given by the - pimBsrElectedBSRAddressType object." - ::= { pimBsrElectedBSREntry 3 } - -pimBsrElectedBSRPriority OBJECT-TYPE - SYNTAX Unsigned32 (0..255) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The priority value for the elected BSR for this address - type. Numerically higher values for this object indicate - higher priorities." - ::= { pimBsrElectedBSREntry 4 } - -pimBsrElectedBSRHashMaskLength OBJECT-TYPE - SYNTAX Unsigned32 (0..128) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The hash mask length (used in the RP hash function) - advertised by the elected BSR for this zone." - ::= { pimBsrElectedBSREntry 5 } - -pimBsrElectedBSRExpiryTime OBJECT-TYPE - SYNTAX TimeTicks - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The minimum time remaining before the elected BSR for - this zone will be declared down." - ::= { pimBsrElectedBSREntry 6 } - --- --- PIM BSR Notifications --- - -pimBsrElectedBSRLostElection NOTIFICATION-TYPE - OBJECTS { pimBsrElectedBSRAddressType, - pimBsrElectedBSRAddress, - pimBsrElectedBSRPriority } - STATUS current - DESCRIPTION - "A pimBsrElectedBSRLostElection notification should be - generated when current E-BSR lost election to a new - Candidate-BSR. Only an E-BSR should generate this - notification. - - This notification is generated when - pimBsrCandidateBSRElectedBSR becomes FALSE." - REFERENCE "RFC 5059, section 3.1" - ::= { pimBsrNotifications 1 } - -pimBsrCandidateBSRWinElection NOTIFICATION-TYPE - OBJECTS { pimBsrCandidateBSRElectedBSR } - STATUS current - DESCRIPTION - "A pimBsrCandidateBSRWinElection notification should be - generated when a C-BSR wins BSR Election. Only an - E-BSR should generate this notification. - - This notification is generated when - pimBsrCandidateBSRElectedBSR becomes TRUE." - REFERENCE "RFC 5059, section 3.1" - ::= { pimBsrNotifications 2 } - --- --- Compliance Statements --- - -pimBsrCompliance MODULE-COMPLIANCE - STATUS current - DESCRIPTION - "The compliance statement for PIM routers that implement - the Bootstrap Router (BSR) mechanism." - MODULE -- this module - MANDATORY-GROUPS { pimBsrObjectGroup } - - GROUP pimBsrDiagnosticsGroup - DESCRIPTION - "This group is optional." - ::= { pimBsrCompliances 1 } - --- --- Units of Conformance --- - -pimBsrObjectGroup OBJECT-GROUP - - OBJECTS { pimBsrCandidateRPBidir, - pimBsrCandidateRPAdvTimer, - pimBsrCandidateRPPriority, - pimBsrCandidateRPAdvInterval, - pimBsrCandidateRPHoldtime, - pimBsrCandidateRPStatus, - pimBsrCandidateRPStorageType, - pimBsrElectedBSRRPSetPriority, - pimBsrElectedBSRRPSetHoldtime, - pimBsrElectedBSRRPSetExpiryTime, - pimBsrElectedBSRRPSetGrpBidir, - pimBsrCandidateBSRAddress, - pimBsrCandidateBSRAddressType, - pimBsrCandidateBSRPriority, - pimBsrCandidateBSRHashMaskLength, - pimBsrCandidateBSRElectedBSR, - pimBsrCandidateBSRBootstrapTimer, - pimBsrCandidateBSRStatus, - pimBsrCandidateBSRStorageType, - pimBsrElectedBSRAddress, - pimBsrElectedBSRAddressType, - pimBsrElectedBSRPriority, - pimBsrElectedBSRHashMaskLength, - pimBsrElectedBSRExpiryTime } - STATUS current - DESCRIPTION - "A collection of objects for managing the Bootstrap - Router (BSR) mechanism for PIM routers." - ::= { pimBsrGroups 1 } - -pimBsrDiagnosticsGroup NOTIFICATION-GROUP - NOTIFICATIONS { pimBsrElectedBSRLostElection, - pimBsrCandidateBSRWinElection } - STATUS current - DESCRIPTION - "Objects providing additional diagnostics related to - the Bootstrap Router (BSR) mechanism for PIM routers." - ::= { pimBsrGroups 2 } - -END diff --git a/mibs/hubersuhner/CUBO-MINI b/mibs/hubersuhner/CUBO-MINI-MIB similarity index 100% rename from mibs/hubersuhner/CUBO-MINI rename to mibs/hubersuhner/CUBO-MINI-MIB diff --git a/mibs/ihse-draco/TERACPU-MIB b/mibs/ihse-draco/TERACPU-MIB new file mode 100644 index 00000000000..b210ad78478 --- /dev/null +++ b/mibs/ihse-draco/TERACPU-MIB @@ -0,0 +1,878 @@ +TERACPU-MIB DEFINITIONS ::= BEGIN + +IMPORTS + enterprises FROM RFC1155-SMI + OBJECT-TYPE, Integer32 FROM SNMPv2-SMI; + + +ihse OBJECT IDENTIFIER ::= {enterprises 38034} +teracpu OBJECT IDENTIFIER ::= {ihse 1} +teraoem OBJECT IDENTIFIER ::= {teracpu 1} +teraconf OBJECT IDENTIFIER ::= {teracpu 2} +teratab OBJECT IDENTIFIER ::= {teracpu 3} +teravar OBJECT IDENTIFIER ::= {teracpu 4} +teratrap OBJECT IDENTIFIER ::= {teracpu 5} + +DisplayString ::= OCTET STRING + + +teraCPU MODULE-IDENTITY + LAST-UPDATED "201602100000Z" + ORGANIZATION "IHSE GmbH" + CONTACT-INFO "support@ihse.de" + DESCRIPTION "The MIB module for managing the Draco tera devices" + + REVISION "201602100000Z" + DESCRIPTION "Implementation of firmware version 3.02" + + REVISION "201312020000Z" + DESCRIPTION "Implementation of firmware version 3.00" + + REVISION "201305030000Z" + DESCRIPTION "Range of object teraSlotIndex changed from (0..65) to (0..64)" + + REVISION "201301100000Z" + DESCRIPTION "Implementation of objects teraFan*, teraTrapFan*, teraPower* and teraTrapPower*" + + REVISION "201211260000Z" + DESCRIPTION "Implementation of objects teraSwitch* and teraTrapSwitch" + + REVISION "201211160000Z" + DESCRIPTION "Object teraTaskStatus extended" + + REVISION "201211150000Z" + DESCRIPTION "Added support for Extender, CPU and CON data tables" + + REVISION "201211140000Z" + DESCRIPTION "The initial relase" + ::= {teracpu 10} + + +-- +-- teraoem group +-- + +teraManufacturer OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + ACCESS read-only + STATUS mandatory + DESCRIPTION "Company name" + ::= {teraoem 1} + +teraFamily OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + ACCESS read-only + STATUS mandatory + DESCRIPTION "Product family" + ::= {teraoem 2} + +teraType OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + ACCESS read-only + STATUS mandatory + DESCRIPTION "Product type" + ::= {teraoem 3} + + + +-- +-- teraconf group +-- + +teraName OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + ACCESS read-only + STATUS mandatory + DESCRIPTION "Name of the configuration" + ::= {teraconf 1} + +teraInfo OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + ACCESS read-only + STATUS mandatory + DESCRIPTION "Description of the configuration" + ::= {teraconf 2} + +teraDevice OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + ACCESS read-only + STATUS mandatory + DESCRIPTION "Device name" + ::= {teraconf 3} + + + +-- +-- teratab group +-- + +-- task data table + +teraTaskTable OBJECT-TYPE + SYNTAX SEQUENCE OF teraTaskEntry + ACCESS not-accessible + STATUS mandatory + DESCRIPTION "Task data table" + ::= {teratab 1} + +teraTaskEntry OBJECT-TYPE + SYNTAX teraTaskEntry + ACCESS not-accessible + STATUS mandatory + DESCRIPTION "An entry of the task data table" + INDEX { teraTaskIndex } + ::= {teraTaskTable 1} + +teraTaskEntry ::= + SEQUENCE { + teraTaskIndex Integer32, + teraTaskName DisplayString, + teraTaskStatus INTEGER, + teraTaskCounter Integer32, + teraTaskCycle Integer32} + +teraTaskIndex OBJECT-TYPE + SYNTAX Integer32(0..6) + ACCESS read-only + STATUS mandatory + DESCRIPTION "Task index (0..6)" + ::= {teraTaskEntry 1} + +teraTaskName OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + ACCESS read-only + STATUS mandatory + DESCRIPTION "Task name" + ::= {teraTaskEntry 2} + +teraTaskStatus OBJECT-TYPE + SYNTAX INTEGER { + unknown(0), + starting(1), + active(2), + busy(3), + waiting(4), + stopped(5), + error(6) + } + ACCESS read-only + STATUS mandatory + DESCRIPTION "Status information" + ::= {teraTaskEntry 3} + +teraTaskCounter OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Performance counter" + ::= {teraTaskEntry 4} + +teraTaskCycle OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Cycle time in microseconds" + ::= {teraTaskEntry 5} + + +-- slot data table + +teraSlotTable OBJECT-TYPE + SYNTAX SEQUENCE OF teraSlotEntry + ACCESS not-accessible + STATUS mandatory + DESCRIPTION "Slot data table" + ::= {teratab 2} + +teraSlotEntry OBJECT-TYPE + SYNTAX teraSlotEntry + ACCESS not-accessible + STATUS mandatory + DESCRIPTION "An entry of the slot data table" + INDEX { teraSlotIndex } + ::= {teraSlotTable 1} + +teraSlotEntry ::= + SEQUENCE { + teraSlotIndex Integer32, + teraSlotStatus Unsigned32, + teraSlotVersion DisplayString} + +teraSlotIndex OBJECT-TYPE + SYNTAX Integer32(0..64) + ACCESS read-only + STATUS mandatory + DESCRIPTION "Slot index, 0 = CPU-Card, 1..64 = IO-Card" + ::= {teraSlotEntry 1} + +teraSlotStatus OBJECT-TYPE + SYNTAX Unsigned32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Slot status + Bit 1 - 3 set: ready + Bit 4 set: active + Bit 27 set: error + Bit 31 set: module is on hold + Bit 32 set: module is invalid" + ::= {teraSlotEntry 2} + +teraSlotVersion OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + ACCESS read-only + STATUS mandatory + DESCRIPTION "Type and firmware information" + ::= {teraSlotEntry 3} + + +-- port data table + +teraPortTable OBJECT-TYPE + SYNTAX SEQUENCE OF teraPortEntry + ACCESS not-accessible + STATUS mandatory + DESCRIPTION "Port data table" + ::= {teratab 3} + +teraPortEntry OBJECT-TYPE + SYNTAX teraPortEntry + ACCESS not-accessible + STATUS mandatory + DESCRIPTION "An entry of the port data table" + INDEX { teraPortIndex } + ::= {teraPortTable 1} + +teraPortEntry ::= + SEQUENCE { + teraPortIndex Integer32, + teraPortStatus Unsigned32, + teraPortOutput Integer32, + teraPortExtenderIndex Integer32, + teraPortExtenderID Integer32} + +teraPortIndex OBJECT-TYPE + SYNTAX Integer32(1..2032) + ACCESS read-only + STATUS mandatory + DESCRIPTION "Port index (1..2032)" + ::= {teraPortEntry 1} + +teraPortStatus OBJECT-TYPE + SYNTAX Unsigned32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Port status + Bit 1-3 set: available but not in use + Bit 1-7 set: port connected + Bit 16 set: error" + ::= {teraPortEntry 2} + +teraPortOutput OBJECT-TYPE + SYNTAX Integer32(1..2032) + ACCESS read-only + STATUS mandatory + DESCRIPTION "Index of the port connected (0=not connected)" + ::= {teraPortEntry 3} + +teraPortExtenderIndex OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Index of the extender connected" + ::= {teraPortEntry 4} + +teraPortExtenderID OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "ID of the extender connected" + ::= {teraPortEntry 5} + + +-- extender data table + +teraExtenderTable OBJECT-TYPE + SYNTAX SEQUENCE OF teraExtenderEntry + ACCESS not-accessible + STATUS mandatory + DESCRIPTION "Extender data table" + ::= {teratab 4} + +teraExtenderEntry OBJECT-TYPE + SYNTAX teraExtenderEntry + ACCESS not-accessible + STATUS mandatory + DESCRIPTION "An entry of the extender data table" + INDEX { teraExtenderIndex } + ::= {teraExtenderTable 1} + +teraExtenderEntry ::= + SEQUENCE { + teraExtenderIndex Integer32, + teraExtenderStatus OCTET STRING, + teraExtenderID Integer32, + teraExtenderType Unsigned32, + teraExtenderPort Integer32, + teraExtenderSPort Integer32, + teraExtenderCpuConIndex Integer32, + teraExtenderCpuConID Integer32, + teraExtenderCpuConType INTEGER} + +teraExtenderIndex OBJECT-TYPE + SYNTAX Integer32(1..2048) + ACCESS read-only + STATUS mandatory + DESCRIPTION "Extender index (1..2048)" + ::= {teraExtenderEntry 1} + +teraExtenderStatus OBJECT-TYPE + SYNTAX OCTET STRING + ACCESS read-only + STATUS mandatory + DESCRIPTION "Extender status + Bit0=KVM1 + Bit1=KVM2 + Bit2=HID active + Bit3=HID1 device + Bit4=HID2 device + Bit5=HID sync + Bit6=Video1 + Bit7=Video2" + ::= {teraExtenderEntry 2} + +teraExtenderID OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Extender ID" + ::= {teraExtenderEntry 3} + +teraExtenderType OBJECT-TYPE + SYNTAX Unsigned32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Extender type" + ::= {teraExtenderEntry 4} + +teraExtenderPort OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Primary port index (0=not connected)" + ::= {teraExtenderEntry 5} + +teraExtenderSPort OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Secondary port index (0=not connected)" + ::= {teraExtenderEntry 6} + +teraExtenderCpuConIndex OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Index of the CPU/CON device assigned (0=not assigned)" + ::= {teraExtenderEntry 7} + +teraExtenderCpuConID OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "ID of the CPU/CON device assigned (0=not assigned)" + ::= {teraExtenderEntry 8} + +teraExtenderCpuConType OBJECT-TYPE + SYNTAX INTEGER { + unknown(0), + CPU(1), + CON(2) + } + ACCESS read-only + STATUS mandatory + DESCRIPTION "Device type information 1=CPU 2=CON" + ::= {teraExtenderEntry 9} + + +-- cpu data table + +teraCpuTable OBJECT-TYPE + SYNTAX SEQUENCE OF teraCpuEntry + ACCESS not-accessible + STATUS mandatory + DESCRIPTION "CPU data table" + ::= {teratab 5} + +teraCpuEntry OBJECT-TYPE + SYNTAX teraCpuEntry + ACCESS not-accessible + STATUS mandatory + DESCRIPTION "An entry of the CPU data table" + INDEX { teraCpuIndex } + ::= {teraCpuTable 1} + +teraCpuEntry ::= + SEQUENCE { + teraCpuIndex Integer32, + teraCpuStatus Unsigned32, + teraCpuID Integer32, + teraCpuRealCpuIndex Integer32, + teraCpuRealCpuID Integer32, + teraCpuConIndex Integer32, + teraCpuConID Integer32} + +teraCpuIndex OBJECT-TYPE + SYNTAX Integer32(1..512) + ACCESS read-only + STATUS mandatory + DESCRIPTION "CPU index (1..512)" + ::= {teraCpuEntry 1} + +teraCpuStatus OBJECT-TYPE + SYNTAX Unsigned32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "CPU status + Bit 2 set: private mode connection + Bit 32 set: device has been defined" + ::= {teraCpuEntry 2} + +teraCpuID OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "CPU ID" + ::= {teraCpuEntry 3} + +teraCpuRealCpuIndex OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "For a virtual/real CPU device the index of the real/virtual CPU assigned" + ::= {teraCpuEntry 4} + +teraCpuRealCpuID OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "For a virtual/real CPU device the ID of the real/virtual CPU assigned" + ::= {teraCpuEntry 5} + +teraCpuConIndex OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Index of the CON device connected (0=not connected)" + ::= {teraCpuEntry 6} + +teraCpuConID OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "ID of the CON device connected (0=not connected)" + ::= {teraCpuEntry 7} + + +-- con data table + +teraConTable OBJECT-TYPE + SYNTAX SEQUENCE OF teraConEntry + ACCESS not-accessible + STATUS mandatory + DESCRIPTION "CON data table" + ::= {teratab 6} + +teraConEntry OBJECT-TYPE + SYNTAX teraConEntry + ACCESS not-accessible + STATUS mandatory + DESCRIPTION "An entry of the CON data table" + INDEX { teraConIndex } + ::= {teraConTable 1} + +teraConEntry ::= + SEQUENCE { + teraConIndex Integer32, + teraConStatus Unsigned32, + teraConID Integer32, + teraConVirtualConIndex Integer32, + teraConVirtualConID Integer32, + teraConCpuIndex Integer32, + teraConCpuID Integer32} + +teraConIndex OBJECT-TYPE + SYNTAX Integer32(1..512) + ACCESS read-only + STATUS mandatory + DESCRIPTION "CON index (1..512)" + ::= {teraConEntry 1} + +teraConStatus OBJECT-TYPE + SYNTAX Unsigned32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "CON status + Bit 2 set: private mode connection + Bit 3 set: video only connection + Bit 32 set: device has been defined" + ::= {teraConEntry 2} + +teraConID OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "CON ID" + ::= {teraConEntry 3} + +teraConVirtualConIndex OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "For a real CON device the index of the virtual CON assigned" + ::= {teraConEntry 4} + +teraConVirtualConID OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "For a real CON device the ID of the virtual CON assigned" + ::= {teraConEntry 5} + +teraConCpuIndex OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Index of the CPU device connected (0=not connected)" + ::= {teraConEntry 6} + +teraConCpuID OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "ID of the CPU device connected (0=not connected)" + ::= {teraConEntry 7} + + + +-- +-- teravar group +-- + +teraStatus OBJECT-TYPE + SYNTAX INTEGER { + unknown(0), + active(1), + disabled(2) + } + ACCESS read-only + STATUS mandatory + DESCRIPTION "Status of the matrix chip" + ::= {teravar 1} + +teraTemperature OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Temperature of the matrix chip + recommended temperature: < 110°C + maximum temperature: 130°C" + ::= {teravar 2} + +teraInsertSlot OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Last slot inserted" + ::= {teravar 10} + +teraRemoveSlot OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Last slot removed" + ::= {teravar 11} + +teraInvalidSlot OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Last slot marked as invalid" + ::= {teravar 12} + +teraInsertExtender OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Last extender inserted" + ::= {teravar 20} + +teraRemoveExtender OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Last extender removed" + ::= {teravar 21} + +teraSwitchFromUser OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "User ID" + ::= {teravar 30} + +teraSwitchFromCon OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "CON ID" + ::= {teravar 31} + +teraSwitchCpu OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "CPU ID to connect" + ::= {teravar 32} + +teraSwitchCon OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "CON ID to connect" + ::= {teravar 33} + +teraSwitchMode OBJECT-TYPE + SYNTAX INTEGER { + Standard(0), + VideoOnly(1), + Private(2), + ControlOnly(3) + } + ACCESS read-only + STATUS mandatory + DESCRIPTION "Mode how to connect" + ::= {teravar 34} + +teraFan1Status OBJECT-TYPE + SYNTAX INTEGER { + unknown(0), + okay(1), + faulty(2) + } + ACCESS read-only + STATUS mandatory + DESCRIPTION "Status of fan tray #1" + ::= {teravar 40} + +teraFan1Speed OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Speed of fan tray #1 in steps + min: 0, max: 15" + ::= {teravar 41} + +teraFan2Status OBJECT-TYPE + SYNTAX INTEGER { + unknown(0), + okay(1), + faulty(2) + } + ACCESS read-only + STATUS mandatory + DESCRIPTION "Status of fan tray #2" + ::= {teravar 42} + +teraFan2Speed OBJECT-TYPE + SYNTAX Integer32 + ACCESS read-only + STATUS mandatory + DESCRIPTION "Speed of fan tray #2 in steps + min: 0, max: 15" + ::= {teravar 43} + +teraPower1Status OBJECT-TYPE + SYNTAX INTEGER { + unknown(0), + available(1), + power(3), + faulty(4) + } + ACCESS read-only + STATUS mandatory + DESCRIPTION "Status of power supply #1" + ::= {teravar 50} + +teraPower2Status OBJECT-TYPE + SYNTAX INTEGER { + unknown(0), + available(1), + power(3), + faulty(4) + } + ACCESS read-only + STATUS mandatory + DESCRIPTION "Status of power supply #2" + ::= {teravar 51} + +teraPower3Status OBJECT-TYPE + SYNTAX INTEGER { + unknown(0), + available(1), + power(3), + faulty(4) + } + ACCESS read-only + STATUS mandatory + DESCRIPTION "Status of power supply #3" + ::= {teravar 52} + +teraPower4Status OBJECT-TYPE + SYNTAX INTEGER { + unknown(0), + available(1), + power(3), + faulty(4) + } + ACCESS read-only + STATUS mandatory + DESCRIPTION "Status of power supply #4" + ::= {teravar 53} + +teraExtenderPort OBJECT-TYPE + SYNTAX INTEGER + ACCESS read-only + STATUS mandatory + DESCRIPTION "Extender port" + ::= {teravar 60} + +teraExtenderID OBJECT-TYPE + SYNTAX INTEGER + ACCESS read-only + STATUS mandatory + DESCRIPTION "Extender ID" + ::= {teravar 61} +-- +teraExtenderStatus OBJECT-TYPE + SYNTAX OCTET STRING + ACCESS read-only + STATUS mandatory + DESCRIPTION "Extender status" + ::= {teravar 62} + +-- teratrap group +-- + +teraTrapList OBJECT-IDENTITY + STATUS current + DESCRIPTION "Notification objects" + ::= {teratrap 0} + +teraTrapStatus NOTIFICATION-TYPE + OBJECTS { teraStatus } + STATUS current + DESCRIPTION "Status of the matrix" + ::= {teraTrapList 1} + +teraTrapTemperature NOTIFICATION-TYPE + OBJECTS { teraTemperature } + STATUS current + DESCRIPTION "Temperature of the matrix chip + recommended temperature: <110°C + maximum temperature: 130°C" + ::= {teraTrapList 2} + +teraTrapInsertSlot NOTIFICATION-TYPE + OBJECTS { teraInsertSlot } + STATUS current + DESCRIPTION "Last slot inserted" + ::= {teraTrapList 10} + +teraTrapRemoveSlot NOTIFICATION-TYPE + OBJECTS { teraRemoveSlot } + STATUS current + DESCRIPTION "Last slot removed" + ::= {teraTrapList 11} + +teraTrapInvalidSlot NOTIFICATION-TYPE + OBJECTS { teraInvalidSlot } + STATUS current + DESCRIPTION "Last slot marked as invalid" + ::= {teraTrapList 12} + +teraTrapInsertExtender NOTIFICATION-TYPE + OBJECTS { teraInsertExtender } + STATUS current + DESCRIPTION "Last extender inserted" + ::= {teraTrapList 20} + +teraTrapRemoveExtender NOTIFICATION-TYPE + OBJECTS { teraRemoveExtender } + STATUS current + DESCRIPTION "Last extender removed" + ::= {teraTrapList 21} + +teraTrapSwitch NOTIFICATION-TYPE + OBJECTS { teraSwitchFromUser, + teraSwitchFromCon, + teraSwitchCpu, + teraSwitchCon, + teraSwitchMode } + STATUS current + DESCRIPTION "Switch command" + ::= {teraTrapList 30} + +teraTrapFan1 NOTIFICATION-TYPE + OBJECTS { teraFan1Status, + teraFan1Speed } + STATUS current + DESCRIPTION "Status and speed of fan tray #1" + ::= {teraTrapList 40} + +teraTrapFan2 NOTIFICATION-TYPE + OBJECTS { teraFan2Status, + teraFan2Speed } + STATUS current + DESCRIPTION "Status and speed of fan tray #2" + ::= {teraTrapList 41} + +teraTrapPower1 NOTIFICATION-TYPE + OBJECTS { teraPower1Status } + STATUS current + DESCRIPTION "Status of power supply #1" + ::= {teraTrapList 50} + +teraTrapPower2 NOTIFICATION-TYPE + OBJECTS { teraPower2Status } + STATUS current + DESCRIPTION "Status of power supply #2" + ::= {teraTrapList 51} + +teraTrapPower3 NOTIFICATION-TYPE + OBJECTS { teraPower3Status } + STATUS current + DESCRIPTION "Status of power supply #3" + ::= {teraTrapList 52} + +teraTrapPower4 NOTIFICATION-TYPE + OBJECTS { teraPower4Status } + STATUS current + DESCRIPTION "Status of power supply #4" + ::= {teraTrapList 53} + +teraTrapExtenderStatus NOTIFICATION-TYPE + OBJECTS { teraExtenderPort, + teraExtenderID, + teraExtenderStatus } + STATUS current + DESCRIPTION "Extender status + Bit0=KVM1 + Bit1=KVM2 + Bit2=HID active + Bit3=HID1 device + Bit4=HID2 device + Bit5=HID sync + Bit6=Video1 + Bit7=Video2" + ::= {teraTrapList 60} +END diff --git a/mibs/kontron/ISKRATEL-MSAN-MIB b/mibs/kontron/ISKRATEL-MSAN-MIB new file mode 100644 index 00000000000..d2bbd2b5539 --- /dev/null +++ b/mibs/kontron/ISKRATEL-MSAN-MIB @@ -0,0 +1,31313 @@ +-- +-- ISKRATEL-MSAN-MIB.mib +-- MIB generated by MG-SOFT Visual MIB Builder Version 7.0 Build 220 +-- Thursday, March 27, 2025 at 15:22:07 +-- + + ISKRATEL-MSAN-MIB DEFINITIONS ::= BEGIN + + IMPORTS + dot1dBasePort + FROM BRIDGE-MIB + ifIndex, ifDescr, ifAdminStatus, ifOperStatus, InterfaceIndex + FROM IF-MIB + InetAddressType, InetAddress, InetAddressIPv6, InetAddressIPv4 + FROM INET-ADDRESS-MIB + dot1qVlanIndex, VlanIndex + FROM Q-BRIDGE-MIB + enterprises + FROM RFC1155-SMI + SnmpAdminString + FROM SNMP-FRAMEWORK-MIB + TimeTicks, IpAddress, Integer32, Unsigned32, Gauge32, + Counter32, Counter64, BITS, OBJECT-TYPE, MODULE-IDENTITY, + NOTIFICATION-TYPE + FROM SNMPv2-SMI + DisplayString, RowStatus, MacAddress, TruthValue, TEXTUAL-CONVENTION + FROM SNMPv2-TC + vdslLineConfProfileName + FROM VDSL-LINE-MIB + xdsl2LineConfTemplateEntry, xdsl2LineAlarmConfTemplateEntry + FROM VDSL2-LINE-MIB; + + + -- 1.3.6.1.4.1.1332.1.1.5 + msan MODULE-IDENTITY + LAST-UPDATED "201006221233Z" -- June 22, 2010 at 12:33 GMT + ORGANIZATION + "Iskratel" + CONTACT-INFO + "Contact-info." + DESCRIPTION + "Description." + ::= { products 5 } + + + +-- +-- Textual conventions +-- + + VlanList ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION + "Each octet within this value specifies a set of eight + vlans, with the first octet specifying vlans 1 through + 8, the second octet specifying vlans 9 through 16, etc. + Within each octet, the most significant bit represents + the lowest numbered vlan, and the least significant bit + represents the highest numbered vlan. Thus, each vlan + supported is represented by a single bit within the + value of this object. If that bit has a value of '1' + then the associated port is in that vlan; the port is + not included if the vlans bit has a value of '0'." + SYNTAX OCTET STRING + + Xdsl2PsdMaskDs ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION + "This is a structure that represents up to 32 PSD mask + breakpoints. + Each breakpoint occupies 3 octets: The first + two octets hold the index of the subcarrier associated with the + breakpoint. The third octet holds the PSD reduction at the + breakpoint from 0 (0 dBm/Hz) to 255 (-127.5 dBm/Hz) using units + of 0.5 dBm/Hz. + The subcarrier index is an unsigned number in the range 0 to + NSCds-1." + SYNTAX OCTET STRING (SIZE (0..96)) + + Xdsl2PsdMaskUs ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION + "This is a structure that represents up to 16 PSD mask breakpoints. + Each breakpoint occupies 3 octets: The first two octets hold the + index of the subcarrier associated with the breakpoint. + The third octet holds the PSD reduction at the breakpoint from + 0(0 dBm/Hz) to 255 (-127.5 dBm/Hz) using units of 0.5 dBm/Hz. + The subcarrier index is an unsigned number in the range 0 to NSCus-1." + SYNTAX OCTET STRING (SIZE (0..48)) + + PortMask ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION + "Each octet within this value specifies a set of eight + ports, with the first octet specifying ports 1 through + 8, the second octet specifying ports 9 through 16, etc. + Within each octet, the most significant bit represents + the lowest numbered port, and the least significant bit + represents the highest numbered port. Thus, each port + of the bridge is represented by a single bit within the + value of this object. If that bit has a value of '1' + then that port is included in the set of ports; the port + is not included if its bit has a value of '0' + + When setting this value, the system will ignore + configuration for ports not between the first and last + valid ports. Configuration of any port numbers between + this range that are not valid ports return a failure + message, but will still apply configuration for valid + ports." + SYNTAX OCTET STRING + + PercentByFives ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION + "An unsigned integer representing a value expressed + as a percentage with five percent increments." + SYNTAX Unsigned32 (0 | 5 | 10 | 15 | 20 | 25 | 30 | 35 | 40 | 45 | 50 | 55 | 60 | 65 | 70 | 75 | 80 | 85 | 90 | 95 | 100) + + +-- +-- Node definitions +-- + + -- 1.3.6.1.4.1.1332 + iskratel OBJECT IDENTIFIER ::= { enterprises 1332 } + + + -- 1.3.6.1.4.1.1332.1 + si2000 OBJECT IDENTIFIER ::= { iskratel 1 } + + + -- 1.3.6.1.4.1.1332.1.1 + products OBJECT IDENTIFIER ::= { si2000 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1 + msanInfo OBJECT IDENTIFIER ::= { msan 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.1 + msanShelfInfo OBJECT IDENTIFIER ::= { msanInfo 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.1.1 + msanShelfId OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "MSAN shelf ID." + ::= { msanShelfInfo 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.1.2 + msanShelfType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "MSAN shelf type." + ::= { msanShelfInfo 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.1.3 + msanShelfSize OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Size of MSAN shelf (in number of slots)." + ::= { msanShelfInfo 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.2 + msanBoardInfo OBJECT IDENTIFIER ::= { msanInfo 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.2.1 + msanBoardTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanBoardEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + ::= { msanBoardInfo 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.2.1.1 + msanBoardEntry OBJECT-TYPE + SYNTAX MsanBoardEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + INDEX { msanBoardNr } + ::= { msanBoardTable 1 } + + + MsanBoardEntry ::= + SEQUENCE { + msanBoardNr + INTEGER, + msanBoardParentNr + INTEGER, + msanBoardPosition + INTEGER, + msanBoardType + OCTET STRING, + msanBoardId + OCTET STRING, + msanBoardSerialNr + OCTET STRING, + msanBoardDescription + OCTET STRING + } + + -- 1.3.6.1.4.1.1332.1.1.5.1.2.1.1.1 + msanBoardNr OBJECT-TYPE + SYNTAX INTEGER (1..1000) + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Unique identification of a board." + ::= { msanBoardEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.2.1.1.2 + msanBoardParentNr OBJECT-TYPE + SYNTAX INTEGER (1..1000) + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "Unique identification of a parent board." + ::= { msanBoardEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.2.1.1.3 + msanBoardPosition OBJECT-TYPE + SYNTAX INTEGER (1..1000) + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "Position of the board on the parent board." + ::= { msanBoardEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.2.1.1.4 + msanBoardType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "Type of physical board (e.g. IDC, SGO, SFA, ...)" + ::= { msanBoardEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.2.1.1.5 + msanBoardId OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "Name (actual identification) of a board." + ::= { msanBoardEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.2.1.1.6 + msanBoardSerialNr OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "Serial number of a board." + ::= { msanBoardEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.2.1.1.7 + msanBoardDescription OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Description of the board." + ::= { msanBoardEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.3 + msanSwInfo OBJECT IDENTIFIER ::= { msanInfo 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.3.1 + msanSwSteerVersion OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The unique steer code for this software. " + ::= { msanSwInfo 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.3.2 + msanSwBuildDirectory OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The directory where software was build on. " + ::= { msanSwInfo 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.3.3 + msanSwBuildTime OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The time when the software was built. (DateAndTime textual convention, from SNMPv2-TC)" + ::= { msanSwInfo 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.3.4 + msanSwBranch OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The repository branch where the software was built from." + ::= { msanSwInfo 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.3.5 + msanSwBuildReference OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The repository reference number of the software build branch. " + ::= { msanSwInfo 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.3.6 + msanSwILVersion OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The unique IL steer code for this software. " + ::= { msanSwInfo 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.3.7 + msanSwIpmiVersion OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The major version.minor version/IPMI version supported(HEX) number of the IPMI currently running on the switch. + For example, if the major version was 1 and the minor version was 2, the format would be '1.2/0'." + ::= { msanSwInfo 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.3.8 + msanSwBspVersion OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The release.version/id number of the BSP software currently running on the switch. + For example, if the release was 1 and the version was 2, the format would be '1.2/0'." + ::= { msanSwInfo 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.3.9 + msanSwCPLDVersion OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "CPLD (Complex Programmable Logic Device) SW version" + ::= { msanSwInfo 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.3.10 + msanReservePackage OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Name of the reserve package on disk if it exists. " + ::= { msanSwInfo 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.3.11 + msanSwComponentTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanSwComponentEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanSwInfo 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.3.11.1 + msanSwComponentEntry OBJECT-TYPE + SYNTAX MsanSwComponentEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanSwComponentId } + ::= { msanSwComponentTable 1 } + + + MsanSwComponentEntry ::= + SEQUENCE { + msanSwComponentId + Integer32, + msanSwComponentName + DisplayString, + msanSwComponentSteerVersion + DisplayString, + msanSwComponentType + INTEGER, + msanSwComponentExternalVersion + DisplayString + } + + -- 1.3.6.1.4.1.1332.1.1.5.1.3.11.1.1 + msanSwComponentId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Unique index of SW component." + ::= { msanSwComponentEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.3.11.1.2 + msanSwComponentName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Name of software component (e.g. ES, EV, EF, EA)." + ::= { msanSwComponentEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.3.11.1.3 + msanSwComponentSteerVersion OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Code version for this software component." + ::= { msanSwComponentEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.3.11.1.4 + msanSwComponentType OBJECT-TYPE + SYNTAX INTEGER + { + application(1), + platform(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of SW component." + ::= { msanSwComponentEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.3.11.1.5 + msanSwComponentExternalVersion OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "External code version of this software component." + ::= { msanSwComponentEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.4 + msanOtherInfo OBJECT IDENTIFIER ::= { msanInfo 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.4.1 + msanSnmpSetErrorReason OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Last error description of SNMP set command." + ::= { msanOtherInfo 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5 + msanLicense OBJECT IDENTIFIER ::= { msanInfo 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.1 + msanLicenseGlobal OBJECT IDENTIFIER ::= { msanLicense 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.1.1 + msanLicenseId OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "License ID." + ::= { msanLicenseGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.1.2 + msanLicenseCreationDate OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "Licence creation date." + ::= { msanLicenseGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.1.3 + msanLicenseExpirationDate OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "Licence expiration date." + ::= { msanLicenseGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.1.4 + msanLicenseCustomerId OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "License customer ID." + ::= { msanLicenseGlobal 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.1.5 + msanLicenseActivate OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Activate licence files from local disk." + DEFVAL { disable } + ::= { msanLicenseGlobal 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.1.6 + msanLicenseFileGet OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "msanLicenseFileGet parameter is used to start transfer of license file (extension .lic) from external tftp or ftp server to local file. + Next syntax must be used for tftp or ftp transfer: + tftp://|[:]/[/] [] + ftp://[:]@|[:]/[/] [] + " + DEFVAL { ''b } + ::= { msanLicenseGlobal 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.2 + msanLicenseOnuTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanLicenseOnuEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanLicense 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.2.1 + msanLicenseOnuEntry OBJECT-TYPE + SYNTAX MsanLicenseOnuEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " " + INDEX { msanLicenseOnuVendorId } + ::= { msanLicenseOnuTable 1 } + + + MsanLicenseOnuEntry ::= + SEQUENCE { + msanLicenseOnuVendorId + DisplayString + } + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.2.1.1 + msanLicenseOnuVendorId OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Licensed ONU vendor ID." + ::= { msanLicenseOnuEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.3 + msanLicenseFileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanLicenseFileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanLicense 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.3.1 + msanLicenseFileEntry OBJECT-TYPE + SYNTAX MsanLicenseFileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanLicenseFileName } + ::= { msanLicenseFileTable 1 } + + + MsanLicenseFileEntry ::= + SEQUENCE { + msanLicenseFileName + DisplayString, + msanLicenseFileRowStatus + RowStatus, + msanLicenseFileActivate + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.3.1.1 + msanLicenseFileName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "License file name (extension .lic)" + ::= { msanLicenseFileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.3.1.2 + msanLicenseFileRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanLicenseFileEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.3.1.3 + msanLicenseFileActivate OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Activate licence file from local disk." + ::= { msanLicenseFileEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.4 + msanActiveLicenseTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanActiveLicenseEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanLicense 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.4.1 + msanActiveLicenseEntry OBJECT-TYPE + SYNTAX MsanActiveLicenseEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanActiveLicenseType } + ::= { msanActiveLicenseTable 1 } + + + MsanActiveLicenseEntry ::= + SEQUENCE { + msanActiveLicenseType + INTEGER, + msanActiveLicenceFileName + DisplayString, + msanActiveLicenseId + DisplayString, + msanActiveLicenseCreationDate + DisplayString, + msanActiveLicenseExpirationDate + DisplayString, + msanActiveLicenseCustomerId + DisplayString, + msanActiveLicenseNodeId + DisplayString, + msanActiveLicenseNodeMaxOltPorts + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.4.1.2 + msanActiveLicenseType OBJECT-TYPE + SYNTAX INTEGER + { + generalLicense(1), + nodeLicense(2) + } + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "License type." + ::= { msanActiveLicenseEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.4.1.3 + msanActiveLicenceFileName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "License file name (extension .lic)" + ::= { msanActiveLicenseEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.4.1.5 + msanActiveLicenseId OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "License ID." + ::= { msanActiveLicenseEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.4.1.6 + msanActiveLicenseCreationDate OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Licence creation date." + ::= { msanActiveLicenseEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.4.1.7 + msanActiveLicenseExpirationDate OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Licence expiration date." + ::= { msanActiveLicenseEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.4.1.8 + msanActiveLicenseCustomerId OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "License customer ID." + DEFVAL { ''b } + ::= { msanActiveLicenseEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.4.1.9 + msanActiveLicenseNodeId OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Node ID." + DEFVAL { ''b } + ::= { msanActiveLicenseEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.5.4.1.10 + msanActiveLicenseNodeMaxOltPorts OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Maximum number of supported OLT ports." + ::= { msanActiveLicenseEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6 + msanResources OBJECT IDENTIFIER ::= { msanInfo 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.1 + msanCpu OBJECT IDENTIFIER ::= { msanResources 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.1.1 + msanCpuCurUsage OBJECT-TYPE + SYNTAX INTEGER (0..100) + UNITS "Percent" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current CPU Usage in the last 10 sec." + ::= { msanCpu 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.1.2 + msanCpuMaxUsage OBJECT-TYPE + SYNTAX INTEGER (0..100) + UNITS "Percent" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Maximum CPU Usage." + ::= { msanCpu 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.1.3 + msanCpuMinUsage OBJECT-TYPE + SYNTAX INTEGER (0..100) + UNITS "Percent" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Minimum CPU Usage." + ::= { msanCpu 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.1.4 + msanCpuAvgUsage OBJECT-TYPE + SYNTAX INTEGER (0..100) + UNITS "Percent" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Average CPU Usage." + ::= { msanCpu 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.1.10 + msanCpuDetailTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanCpuDetailEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanCpu 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.1.10.1 + msanCpuDetailEntry OBJECT-TYPE + SYNTAX MsanCpuDetailEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanCpuDetailId } + ::= { msanCpuDetailTable 1 } + + + MsanCpuDetailEntry ::= + SEQUENCE { + msanCpuDetailId + Integer32, + msanCpuDetailCurUsage + INTEGER, + msanCpuDetailMaxUsage + INTEGER, + msanCpuDetailMinUsage + INTEGER, + msanCpuDetailAvgUsage + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.1.10.1.1 + msanCpuDetailId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "CPU unit ID." + ::= { msanCpuDetailEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.1.10.1.2 + msanCpuDetailCurUsage OBJECT-TYPE + SYNTAX INTEGER + UNITS "Percent" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current Usage of specified CPU in the last 10 sec." + ::= { msanCpuDetailEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.1.10.1.3 + msanCpuDetailMaxUsage OBJECT-TYPE + SYNTAX INTEGER + UNITS "Percent" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Maximum Usage of specified CPU." + ::= { msanCpuDetailEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.1.10.1.4 + msanCpuDetailMinUsage OBJECT-TYPE + SYNTAX INTEGER + UNITS "Percent" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Minimum Usage of specified CPU." + ::= { msanCpuDetailEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.1.10.1.5 + msanCpuDetailAvgUsage OBJECT-TYPE + SYNTAX INTEGER + UNITS "Percent" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Average Usage of specified CPU." + ::= { msanCpuDetailEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.2 + msanDisk OBJECT IDENTIFIER ::= { msanResources 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.2.1 + msanDiskTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDiskEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanDisk 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.2.1.1 + msanDiskEntry OBJECT-TYPE + SYNTAX MsanDiskEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanDiskType } + ::= { msanDiskTable 1 } + + + MsanDiskEntry ::= + SEQUENCE { + msanDiskType + INTEGER, + msanDiskTotalSpace + Unsigned32, + msanDiskFreeSpace + Unsigned32, + msanDiskUsedSpace + Unsigned32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.2.1.1.1 + msanDiskType OBJECT-TYPE + SYNTAX INTEGER + { + activeDisk(1), + backupDisk(2), + logDisk(3) + } + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Disk type." + ::= { msanDiskEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.2.1.1.2 + msanDiskTotalSpace OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "kB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Total disk space of selected type." + ::= { msanDiskEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.2.1.1.3 + msanDiskFreeSpace OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "kB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Free disk space of selected type." + ::= { msanDiskEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.2.1.1.4 + msanDiskUsedSpace OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "kB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Used disk space of selected type." + ::= { msanDiskEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.3 + msanMemory OBJECT IDENTIFIER ::= { msanResources 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.3.1 + msanMemoryTotal OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "kB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Description." + ::= { msanMemory 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.3.2 + msanMemoryFree OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "kB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Description." + ::= { msanMemory 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.1.6.3.3 + msanMemoryAllocated OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "kB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Description." + ::= { msanMemory 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3 + msanAdditionalConf OBJECT IDENTIFIER ::= { msan 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1 + msanSystem OBJECT IDENTIFIER ::= { msanAdditionalConf 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.1 + msanDateTime OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Board date and time in format: dd/MM/yyyy HH:mm:ss." + ::= { msanSystem 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.2 + msanShelfIdConf OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "MSAN Shelf ID." + ::= { msanSystem 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.3 + msanConfData OBJECT-TYPE + SYNTAX INTEGER + { + saved(1), + notSaved(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Configured data saved or not saved to file on local file system." + ::= { msanSystem 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.4 + msanSwUpgrade OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "msanSWUpgrade parameetr is used to start SW upgrade from external http or ftp server. + User must set the next string value: [|reboot|] + + = http|ftp://|[:]/[/] + + + Procedure uses anonymous type of identification. + If a non standard port is used, this port must be also specified in the repository URL. + 'reboot' option is used only on boards with multiple SW packages support." + ::= { msanSystem 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.5 + msanCliScriptCreate OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..32)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "When set with a non-empty string, current configuration will be saved to script file with that name + (name must end with .scr). + If file already exists it's overwritten. + On Get request this object will always return an empty string." + ::= { msanSystem 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.6 + msanCliScriptTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanCliScriptEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanSystem 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.6.1 + msanCliScriptEntry OBJECT-TYPE + SYNTAX MsanCliScriptEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanCliScriptName } + ::= { msanCliScriptTable 1 } + + + MsanCliScriptEntry ::= + SEQUENCE { + msanCliScriptName + OCTET STRING, + msanCliScriptApply + INTEGER, + msanCliScriptApplyStatus + INTEGER, + msanCliScriptRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.6.1.1 + msanCliScriptName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..32)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "CLI script name" + ::= { msanCliScriptEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.6.1.2 + msanCliScriptApply OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "When set to enable(1) selected selected CLI script is applied." + ::= { msanCliScriptEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.6.1.3 + msanCliScriptApplyStatus OBJECT-TYPE + SYNTAX INTEGER + { + notInitiated(1), + inProcess(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Status of CLI script apply request" + ::= { msanCliScriptEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.6.1.4 + msanCliScriptRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanCliScriptEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.7 + msanCliPrompt OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "CLI prompt value." + ::= { msanSystem 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.8 + msanChassisId OBJECT-TYPE + SYNTAX Integer32 (1..99) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "MSAN Chassis ID." + ::= { msanSystem 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.9 + msanSwBootPackageTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanSwBootPackageEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanSystem 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.9.1 + msanSwBootPackageEntry OBJECT-TYPE + SYNTAX MsanSwBootPackageEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanSwBootPackageName } + ::= { msanSwBootPackageTable 1 } + + + MsanSwBootPackageEntry ::= + SEQUENCE { + msanSwBootPackageName + DisplayString, + msanSwBootPackageStatus + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.9.1.1 + msanSwBootPackageName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "SW package name on local disk." + ::= { msanSwBootPackageEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.9.1.2 + msanSwBootPackageStatus OBJECT-TYPE + SYNTAX INTEGER + { + currentActive(1), + nextActive(2), + backup(3), + none(4), + fail(5) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "SW package status. + You can set only nextActive(2) value. Other values are read-only." + ::= { msanSwBootPackageEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.10 + msanSystemSwUpgrade OBJECT IDENTIFIER ::= { msanSystem 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.10.1 + msanSystemSwUpgradeStart OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Control of SW upgrade procedure. + When set to enable(1) transfer of SW package from defined server is started." + DEFVAL { disable } + ::= { msanSystemSwUpgrade 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.10.2 + msanSystemSwUpgradeStatus OBJECT-TYPE + SYNTAX INTEGER + { + inprogress(1), + successful(2), + failed(3), + notInitiated(4) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The SW upgrade status info." + DEFVAL { notInitiated } + ::= { msanSystemSwUpgrade 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.10.3 + msanSystemSwUpgradeServerIpAddressType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the type of the upgrade server address: ipv4[1], ipv6[2]." + DEFVAL { ipv4 } + ::= { msanSystemSwUpgrade 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.10.4 + msanSystemSwUpgradeServerIpAddress OBJECT-TYPE + SYNTAX InetAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The remote SW upgrade server IP address." + ::= { msanSystemSwUpgrade 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.10.5 + msanSystemSwUpgradeServerDnsName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The remote SW upgrade server dns name." + DEFVAL { ''b } + ::= { msanSystemSwUpgrade 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.10.6 + msanSystemSwUpgradeProtocol OBJECT-TYPE + SYNTAX INTEGER + { + tftp(1), + ftp(2), + sftp(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The SW upgrade protocol." + DEFVAL { tftp } + ::= { msanSystemSwUpgrade 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.10.7 + msanSystemSwUpgradeProtocolPortId OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The SW upgrade protocol port number. + If value is set to -1, standard protocol number is used." + DEFVAL { -1 } + ::= { msanSystemSwUpgrade 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.10.8 + msanSystemSwUpgradeUserName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The username used in SW upgrade protocol. + + When sftp upgrade protocol is used, username must be set." + DEFVAL { ''b } + ::= { msanSystemSwUpgrade 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.10.9 + msanSystemSwUpgradeUserPassword OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The user password used in SW upgrade protocol. + + When sftp upgrade protocol is used, username must be set." + DEFVAL { ''b } + ::= { msanSystemSwUpgrade 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.10.10 + msanSystemSwUpgradePath OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The path to the SW package location." + DEFVAL { ''b } + ::= { msanSystemSwUpgrade 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.10.11 + msanSystemSwUpgradePackageName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The SW package name" + DEFVAL { ''b } + ::= { msanSystemSwUpgrade 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.10.20 + msanSystemSwUpgradeStatusAddInfo OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "SW upgrade status additional info." + ::= { msanSystemSwUpgrade 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.11 + msanSystemLogsUpload OBJECT IDENTIFIER ::= { msanSystem 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.11.1 + msanSystemLogsUploadStart OBJECT-TYPE + SYNTAX INTEGER + { + enableActive(1), + disable(2), + enableStandby(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Control of system logs upload procedure. + When set to enable_active(1) transfer of file from active board to defined server is started. + When set to enable_standby(3) transfer of file from standby (peer) board to defined server is started. + " + DEFVAL { disable } + ::= { msanSystemLogsUpload 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.11.2 + msanSystemLogsUploadStatus OBJECT-TYPE + SYNTAX INTEGER + { + inprogress(1), + successful(2), + failed(3), + notInitiated(4) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The system logs upload status info." + DEFVAL { notInitiated } + ::= { msanSystemLogsUpload 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.11.3 + msanSystemLogsUploadServerIpAddressType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the type of the system logs upload server address: ipv4[1], ipv6[2]." + DEFVAL { ipv4 } + ::= { msanSystemLogsUpload 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.11.4 + msanSystemLogsUploadServerIpAddress OBJECT-TYPE + SYNTAX InetAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The remote system logs upload server IP address." + ::= { msanSystemLogsUpload 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.11.5 + msanSystemLogsUploadServerDnsName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The remote system logs upload server dns name." + DEFVAL { ''b } + ::= { msanSystemLogsUpload 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.11.6 + msanSystemLogsUploadProtocol OBJECT-TYPE + SYNTAX INTEGER + { + tftp(1), + ftp(2), + sftp(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The system logs upload protocol." + DEFVAL { tftp } + ::= { msanSystemLogsUpload 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.11.7 + msanSystemLogsUploadProtocolPortId OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The system logs upload protocol port number. + If value is set to -1, standard protocol number is used." + DEFVAL { -1 } + ::= { msanSystemLogsUpload 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.11.8 + msanSystemLogsUploadUserName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The username used in system logs upload protocol. + + When sftp upgrade protocol is used, username must be set." + DEFVAL { ''b } + ::= { msanSystemLogsUpload 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.11.9 + msanSystemLogsUploadUserPassword OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The user password used in system logs upload protocol. + + When sftp upgrade protocol is used, username must be set." + DEFVAL { ''b } + ::= { msanSystemLogsUpload 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.11.10 + msanSystemLogsUploadPath OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The path to the system logs file location." + DEFVAL { ''b } + ::= { msanSystemLogsUpload 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.11.11 + msanSystemLogsUploadFileName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The system logs file name" + DEFVAL { ''b } + ::= { msanSystemLogsUpload 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.12 + msanSystemAutoSaveConfig OBJECT IDENTIFIER ::= { msanSystem 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.12.1 + msanSystemAutoSaveConfigStatus OBJECT-TYPE + SYNTAX INTEGER + { + active(1), + inactive(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Description." + ::= { msanSystemAutoSaveConfig 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.12.2 + msanSystemAutoSaveConfigMaxTimeout OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Initial (max) number of seconds until timer for automatic saveconfig elapses." + ::= { msanSystemAutoSaveConfig 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.12.3 + msanSystemAutoSaveConfigCurrTimeout OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current number of seconds until timer for automatic saveconfig elapses." + ::= { msanSystemAutoSaveConfig 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.13 + msanConfFileType OBJECT-TYPE + SYNTAX INTEGER + { + automatic(1), + manual(2), + notExists(3), + manualMns(4) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Last saved configuration status – denotes whether current configuration file + has been built by automatic or manual cli/snmp or manual mns procedure. " + ::= { msanSystem 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.1.14 + msanHttpServer OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "HTTP server activity." + DEFVAL { disable } + ::= { msanSystem 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3 + msanProfiles OBJECT IDENTIFIER ::= { msanAdditionalConf 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.1 + msanVDSLProfileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanVDSLProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanProfiles 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.1.1 + msanVDSLProfileEntry OBJECT-TYPE + SYNTAX MsanVDSLProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { vdslLineConfProfileName } + ::= { msanVDSLProfileTable 1 } + + + MsanVDSLProfileEntry ::= + SEQUENCE { + msanVDSLProfileType + INTEGER, + msanVDSL2LineProfile + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.1.1.1 + msanVDSLProfileType OBJECT-TYPE + SYNTAX INTEGER + { + other(1), + default(2), + local(3), + global(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Profile type: + - other ~ none of the following + - defaut ~ default profile + - local ~ local configured profile type + - global ~ global configured profile type" + ::= { msanVDSLProfileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.1.1.2 + msanVDSL2LineProfile OBJECT-TYPE + SYNTAX INTEGER + { + vdsl2profile8c(1), + vdsl2profile8d(2), + vdsl2profile12a(3), + vdsl2profile12b(4), + vdsl2profile17a(5) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "VDSL2 profile" + ::= { msanVDSLProfileEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2 + msanServiceProfile OBJECT IDENTIFIER ::= { msanProfiles 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1 + msanServiceProfileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanServiceProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Service Profile table " + ::= { msanServiceProfile 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1 + msanServiceProfileEntry OBJECT-TYPE + SYNTAX MsanServiceProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Service Profile table entry." + INDEX { msanServiceProfileName } + ::= { msanServiceProfileTable 1 } + + + MsanServiceProfileEntry ::= + SEQUENCE { + msanServiceProfileName + DisplayString, + msanServiceProfileProtection + INTEGER, + msanServiceProfileStatus + INTEGER, + msanServiceProfileServiceFlowProfileName + DisplayString, + msanServiceProfileMulticastProfileName + DisplayString, + msanServiceProfileVlanProfileName + DisplayString, + msanServiceProfileL2cpProfileName + DisplayString, + msanServiceProfileSecurityProfileName + DisplayString, + msanServiceProfileAtmVpi + Integer32, + msanServiceProfileAtmVci + Integer32, + msanServiceProfileDhcpRa + INTEGER, + msanServiceProfileDhcpRaTrustClients + INTEGER, + msanServiceProfileDhcpRaOpt82UnicastExtension + INTEGER, + msanServiceProfileDhcpRaOpt82Insert + INTEGER, + msanServiceProfileDhcpRaRemoteId + OCTET STRING, + msanServiceProfileDhcpRaRateLimit + Unsigned32, + msanServiceProfilePppoeIA + INTEGER, + msanServiceProfilePppoeIARateLimit + Unsigned32, + msanServiceProfileDescription + DisplayString, + msanServiceProfileRowStatus + RowStatus, + msanServiceProfileDhcpRaInterfaceIdStandard + INTEGER, + msanServiceProfileDhcpv6Ra + INTEGER, + msanServiceProfileDhcpv6RaTrustClients + INTEGER, + msanServiceProfileDhcpv6RaInterfaceIdStandard + INTEGER, + msanServiceProfileDhcpv6RaRemoteId + OCTET STRING, + msanServiceProfileDhcpv6RaRemoteIdEnterpriseNum + INTEGER, + msanServiceProfileDhcpRaCircuitIdType + INTEGER, + msanServiceProfilePPPoeIACircuitIdType + INTEGER, + msanServiceProfileDhcpRaCircuitIdCustomFormat + DisplayString, + msanServiceProfileDhcpRaRemoteIdCustomFormat + DisplayString, + msanServiceProfilePPPoeIACircuitIdCustomFormat + DisplayString, + msanServiceProfilePPPoeIARemoteIdCustomFormat + DisplayString, + msanServiceProfileDhcpv6RaInterfaceIdType + INTEGER, + msanServiceProfileDhcpv6RaInterfaceIdCustomFormat + DisplayString, + msanServiceProfileDhcpv6RaRemoteIdCustomFormat + DisplayString, + msanServiceProfileOnuFlowProfileName + DisplayString, + msanServiceProfileOnuVlanProfileName + DisplayString, + msanServiceProfileOnuMulticastProfileName + DisplayString, + msanServiceProfileOnuTcontProfileName + DisplayString, + msanServiceProfileOnuVirtGemPortId + Integer32, + msanServiceProfileOnuTpType + INTEGER, + msanServiceProfileOnuTpUniBitMap + OCTET STRING, + msanServiceProfileUsage + INTEGER, + msanServiceProfileOnuAcsServerProfileName + DisplayString, + msanServiceProfileOnuAcsServerVeipId + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.1 + msanServiceProfileName OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..64)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Name for service profile." + ::= { msanServiceProfileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.2 + msanServiceProfileProtection OBJECT-TYPE + SYNTAX INTEGER + { + unprotected(0), + protected(1) + } + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "If protection flag is set to protected (1), other profile values cannot be edited. + + Protection flag is always protected (1) and it can't be changed if profile is assigned as dynamic: + msanServiceProfileStatus = dynamic(2)" + DEFVAL { unprotected } + ::= { msanServiceProfileEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.3 + msanServiceProfileStatus OBJECT-TYPE + SYNTAX INTEGER + { + static(1), + dynamic(2) + } + MAX-ACCESS read-only + STATUS obsolete + DESCRIPTION + "Profile status. + If status is dynamic, profile values can't be edited." + ::= { msanServiceProfileEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.4 + msanServiceProfileServiceFlowProfileName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Index of used service flow profile (this profile must be set before), which indicates + row in msanServiceFlowProfileTable. + Empty string indicates that parameter has not been defined." + ::= { msanServiceProfileEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.5 + msanServiceProfileMulticastProfileName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Index of used multicast profile (this profile must be set before), which indicates + row in msanMulticastProfileTable. + Empty string indicates that parameter has not been defined." + ::= { msanServiceProfileEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.6 + msanServiceProfileVlanProfileName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Index of used vlan profile (this profile must be set before), which indicates + row in msanVlanProfileTable. + Empty string indicates that parameter has not been defined." + ::= { msanServiceProfileEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.7 + msanServiceProfileL2cpProfileName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Index of used L2CP profile (this profile must be set before), which indicates + row in msanL2cpProfileTable. + Empty string indicates that parameter has not been defined." + ::= { msanServiceProfileEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.8 + msanServiceProfileSecurityProfileName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Index of used security profile (this profile must be set before), which indicates + row in msanSecurityProfileTable. + Empty string indicates that parameter has not been defined." + ::= { msanServiceProfileEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.9 + msanServiceProfileAtmVpi OBJECT-TYPE + SYNTAX Integer32 (-1..255) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Virtual Path Identifier. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceProfileEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.10 + msanServiceProfileAtmVci OBJECT-TYPE + SYNTAX Integer32 (-1 | 32..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Virtual Channel Identifier. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceProfileEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.11 + msanServiceProfileDhcpRa OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + allowClients(1), + allowServers(2), + allowAll(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Dynamic Host Configuration Protocol Relay Agent. + DHCP RA and PPPoE IA can not be included simultaneously." + DEFVAL { disable } + ::= { msanServiceProfileEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.12 + msanServiceProfileDhcpRaTrustClients OBJECT-TYPE + SYNTAX INTEGER + { + notTrust(0), + trust(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCP RA Trust Clients. + Effective only if DHCP-RA is in either allow-all or allow-client mode." + DEFVAL { notTrust } + ::= { msanServiceProfileEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.13 + msanServiceProfileDhcpRaOpt82UnicastExtension OBJECT-TYPE + SYNTAX INTEGER + { + notUsed(0), + used(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCP RA option82 unicast extension. + Effective only if DHCP-RA is in either allow-all or allow-client mode." + DEFVAL { notUsed } + ::= { msanServiceProfileEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.14 + msanServiceProfileDhcpRaOpt82Insert OBJECT-TYPE + SYNTAX INTEGER + { + notInsert(0), + insert(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCP Relay Agent Insert Option 82. + Effective only if DHCP-RA is in either allow-all or allow-client mode." + DEFVAL { notInsert } + ::= { msanServiceProfileEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.15 + msanServiceProfileDhcpRaRemoteId OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..63)) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "DHCP Relay Agent Remote Identification. + Effective only if DHCP-RA is in either allow-all or allow-client mode." + DEFVAL { "" } + ::= { msanServiceProfileEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.16 + msanServiceProfileDhcpRaRateLimit OBJECT-TYPE + SYNTAX Unsigned32 (0..1000) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Max rate for DHCP Relay Agent. + " + DEFVAL { 5 } + ::= { msanServiceProfileEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.17 + msanServiceProfilePppoeIA OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Point-to-Point Protocol over Ethernet Intermediate Agent. + DHCP RA and PPPoE IA can not be included simultaneously." + DEFVAL { disable } + ::= { msanServiceProfileEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.18 + msanServiceProfilePppoeIARateLimit OBJECT-TYPE + SYNTAX Unsigned32 (0..1000) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Max rate for PPPoE IA. + " + DEFVAL { 5 } + ::= { msanServiceProfileEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.19 + msanServiceProfileDescription OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Attribute specifies text which describes the associated object." + ::= { msanServiceProfileEntry 19 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.20 + msanServiceProfileRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5). + Value active(1) will activate and value destroy(6) will remove this entry. + Other values are currently not supported. + + Row can be activated only if msanServiceProfileServiceFlowProfileName is specified." + ::= { msanServiceProfileEntry 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.21 + msanServiceProfileDhcpRaInterfaceIdStandard OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "DHCP RA Standard Interface Id (Circuit Id) syntax mode." + DEFVAL { disable } + ::= { msanServiceProfileEntry 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.22 + msanServiceProfileDhcpv6Ra OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + allowClients(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "State of DHCPv6 Relay Agent on the port." + DEFVAL { enable } + ::= { msanServiceProfileEntry 22 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.23 + msanServiceProfileDhcpv6RaTrustClients OBJECT-TYPE + SYNTAX INTEGER + { + notTrust(0), + trust(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCPv6 Relay Agent Trust Clients. + Effective only if DHCPv6-RA is in allow-client mode." + DEFVAL { notTrust } + ::= { msanServiceProfileEntry 23 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.24 + msanServiceProfileDhcpv6RaInterfaceIdStandard OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "DHCPv6 RA Standard Interface Id syntax mode." + DEFVAL { enable } + ::= { msanServiceProfileEntry 24 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.25 + msanServiceProfileDhcpv6RaRemoteId OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "DHCPv6 Remote Id value. + " + DEFVAL { "" } + ::= { msanServiceProfileEntry 25 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.26 + msanServiceProfileDhcpv6RaRemoteIdEnterpriseNum OBJECT-TYPE + SYNTAX INTEGER (1..999999) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCPv6 Remote Id enterprise number. + " + DEFVAL { 1332 } + ::= { msanServiceProfileEntry 26 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.27 + msanServiceProfileDhcpRaCircuitIdType OBJECT-TYPE + SYNTAX INTEGER + { + iskratel(1), + standard(2), + atm(3), + custom(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCP Circuit Id syntax mode." + DEFVAL { iskratel } + ::= { msanServiceProfileEntry 27 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.28 + msanServiceProfilePPPoeIACircuitIdType OBJECT-TYPE + SYNTAX INTEGER + { + iskratel(1), + atm(3), + custom(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "PPPoE Circuit Id syntax mode per port." + ::= { msanServiceProfileEntry 28 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.29 + msanServiceProfileDhcpRaCircuitIdCustomFormat OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCP Circuit Id Custom format definition composed of arbitrary characters and variable macros. + + Use '$[h][[0|s]][d[]]' format to specify: + h HEX variable format + 0|s left padding with zeroes or spaces + - maximum variable length + d use custom delimiter for MAC/IP + - delimiting character + variable macro + + Supported macros: + $SHELF - A string variable representing the shelf name as configured + or acquired by this device. + $CHASSIS - A numeric variable ranging [0..99] and representing numerical + identification of shelf. + $PANEL - Panel indicator: 0 front panel, 1 back panel. + $INTF_TYPE - Interface type: eth, dsl, gpon, mng, lag, atm, etc. + $AGENT_BOARD - Local board position (slot number) of DHCP Relay Agent. + $PORT - ID of local port the DHCP packet is received on. + $PORT_REM_ID - Complete remoteID string is inserted, as configured per + pertaining interface. + $INTF - ID of local interface the DHCP packet is received on in form + as used in interface configuration (e.g.: 1/2/1). + $INTF_DSCR - Interface description string taken exactly as configured + using 'description' command. + $PVC_INTF - ID of PVC interface the DHCP packet is received from (ADSL only). + $VPI - ID of ATM VPI the DHCP packet is received in (ADSL only). + $VCI - ID of ATM VCI the DHCP packet is received in (ADSL only). + $CLNT_MAC - MAC address of DHCP client sending the packet. + $AGENT_MAC - Local DHCP Relay Agent MAC address. If this is a switching device + MNG address is used. If this is a routing device MAC address + of the receiving interface is used. + $AGENT_IPV4 - Local DHCP Relay Agent IP address. Management IPv4 address + is used if this is a switching device, or IPv4 address of + receiving interface is used if this is a routing device. + $VLAN - Outermost VLAN ID in which the DHCP packet has been received. + In case of single tagged frame this is VLAN ID of the frame. + In case of double (QinQ) tagged frame, this is service + provider VLAN ID. + $VLAN_NAME - The VLAN name, as it has been configured by user, + of outermost VLAN in which the DHCP packet is received. + $CVID - Valid only for double (QinQ) tagged frames. Customer (inner) + VLAN ID in which the DHCP packet has been received. + $SYSNAME - System name as configured in SNMP agent on this device. + $LOCATION - Location as configured in SNMP agent on this device. + $CONTACT - Contact as configured in SNMP agent on this device. + $HEX - Arbitrary array of hexadecimal values. + Format: $HEX + " + DEFVAL { "" } + ::= { msanServiceProfileEntry 29 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.30 + msanServiceProfileDhcpRaRemoteIdCustomFormat OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCP Remote Id Custom format definition composed of arbitrary characters and variable macros. + + Use '$[h][[0|s]][d[]]' format to specify: + h HEX variable format + 0|s left padding with zeroes or spaces + - maximum variable length + d use custom delimiter for MAC/IP + - delimiting character + variable macro + + Supported macros: + $SHELF - A string variable representing the shelf name as configured + or acquired by this device. + $CHASSIS - A numeric variable ranging [0..99] and representing numerical + identification of shelf. + $PANEL - Panel indicator: 0 front panel, 1 back panel. + $INTF_TYPE - Interface type: eth, dsl, gpon, mng, lag, atm, etc. + $AGENT_BOARD - Local board position (slot number) of DHCP Relay Agent. + $PORT - ID of local port the DHCP packet is received on. + $PORT_REM_ID - Complete remoteID string is inserted, as configured per + pertaining interface. + $INTF - ID of local interface the DHCP packet is received on in form + as used in interface configuration (e.g.: 1/2/1). + $INTF_DSCR - Interface description string taken exactly as configured + using 'description' command. + $PVC_INTF - ID of PVC interface the DHCP packet is received from (ADSL only). + $VPI - ID of ATM VPI the DHCP packet is received in (ADSL only). + $VCI - ID of ATM VCI the DHCP packet is received in (ADSL only). + $CLNT_MAC - MAC address of DHCP client sending the packet. + $AGENT_MAC - Local DHCP Relay Agent MAC address. If this is a switching device + MNG address is used. If this is a routing device MAC address + of the receiving interface is used. + $AGENT_IPV4 - Local DHCP Relay Agent IP address. Management IPv4 address + is used if this is a switching device, or IPv4 address of + receiving interface is used if this is a routing device. + $VLAN - Outermost VLAN ID in which the DHCP packet has been received. + In case of single tagged frame this is VLAN ID of the frame. + In case of double (QinQ) tagged frame, this is service + provider VLAN ID. + $VLAN_NAME - The VLAN name, as it has been configured by user, + of outermost VLAN in which the DHCP packet is received. + $CVID - Valid only for double (QinQ) tagged frames. Customer (inner) + VLAN ID in which the DHCP packet has been received. + $SYSNAME - System name as configured in SNMP agent on this device. + $LOCATION - Location as configured in SNMP agent on this device. + $CONTACT - Contact as configured in SNMP agent on this device. + $HEX - Arbitrary array of hexadecimal values. + Format: $HEX + " + DEFVAL { "" } + ::= { msanServiceProfileEntry 30 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.31 + msanServiceProfilePPPoeIACircuitIdCustomFormat OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "PPPoE Circuit Id Custom format definition composed of arbitrary characters and variable macros. + + Use '$[h][[0|s]][d[]]' format to specify: + h HEX variable format + 0|s left padding with zeroes or spaces + - maximum variable length + d use custom delimiter for MAC/IP + - delimiting character + variable macro + + Supported macros: + $SHELF - A string variable representing the shelf name as configured + or acquired by this device. + $CHASSIS - A numeric variable ranging [0..99] and representing numerical + identification of shelf. + $PANEL - Panel indicator: 0 front panel, 1 back panel. + $INTF_TYPE - Interface type: eth, dsl, gpon, mng, lag, atm, etc. + $AGENT_BOARD - Local board position (slot number) of DHCP Relay Agent. + $PORT - ID of local port the DHCP packet is received on. + $PORT_REM_ID - Complete remoteID string is inserted, as configured per + pertaining interface. + $INTF - ID of local interface the DHCP packet is received on in form + as used in interface configuration (e.g.: 1/2/1). + $INTF_DSCR - Interface description string taken exactly as configured + using 'description' command. + $PVC_INTF - ID of PVC interface the DHCP packet is received from (ADSL only). + $VPI - ID of ATM VPI the DHCP packet is received in (ADSL only). + $VCI - ID of ATM VCI the DHCP packet is received in (ADSL only). + $CLNT_MAC - MAC address of DHCP client sending the packet. + $AGENT_MAC - Local DHCP Relay Agent MAC address. If this is a switching device + MNG address is used. If this is a routing device MAC address + of the receiving interface is used. + $AGENT_IPV4 - Local DHCP Relay Agent IP address. Management IPv4 address + is used if this is a switching device, or IPv4 address of + receiving interface is used if this is a routing device. + $VLAN - Outermost VLAN ID in which the DHCP packet has been received. + In case of single tagged frame this is VLAN ID of the frame. + In case of double (QinQ) tagged frame, this is service + provider VLAN ID. + $VLAN_NAME - The VLAN name, as it has been configured by user, + of outermost VLAN in which the DHCP packet is received. + $CVID - Valid only for double (QinQ) tagged frames. Customer (inner) + VLAN ID in which the DHCP packet has been received. + $SYSNAME - System name as configured in SNMP agent on this device. + $LOCATION - Location as configured in SNMP agent on this device. + $CONTACT - Contact as configured in SNMP agent on this device. + $HEX - Arbitrary array of hexadecimal values. + Format: $HEX + " + DEFVAL { "" } + ::= { msanServiceProfileEntry 31 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.32 + msanServiceProfilePPPoeIARemoteIdCustomFormat OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "PPPoE Remote Id Custom format definition composed of arbitrary characters and variable macros. + + Use '$[h][[0|s]][d[]]' format to specify: + h HEX variable format + 0|s left padding with zeroes or spaces + - maximum variable length + d use custom delimiter for MAC/IP + - delimiting character + variable macro + + Supported macros: + $SHELF - A string variable representing the shelf name as configured + or acquired by this device. + $CHASSIS - A numeric variable ranging [0..99] and representing numerical + identification of shelf. + $PANEL - Panel indicator: 0 front panel, 1 back panel. + $INTF_TYPE - Interface type: eth, dsl, gpon, mng, lag, atm, etc. + $AGENT_BOARD - Local board position (slot number) of DHCP Relay Agent. + $PORT - ID of local port the DHCP packet is received on. + $PORT_REM_ID - Complete remoteID string is inserted, as configured per + pertaining interface. + $INTF - ID of local interface the DHCP packet is received on in form + as used in interface configuration (e.g.: 1/2/1). + $INTF_DSCR - Interface description string taken exactly as configured + using 'description' command. + $PVC_INTF - ID of PVC interface the DHCP packet is received from (ADSL only). + $VPI - ID of ATM VPI the DHCP packet is received in (ADSL only). + $VCI - ID of ATM VCI the DHCP packet is received in (ADSL only). + $CLNT_MAC - MAC address of DHCP client sending the packet. + $AGENT_MAC - Local DHCP Relay Agent MAC address. If this is a switching device + MNG address is used. If this is a routing device MAC address + of the receiving interface is used. + $AGENT_IPV4 - Local DHCP Relay Agent IP address. Management IPv4 address + is used if this is a switching device, or IPv4 address of + receiving interface is used if this is a routing device. + $VLAN - Outermost VLAN ID in which the DHCP packet has been received. + In case of single tagged frame this is VLAN ID of the frame. + In case of double (QinQ) tagged frame, this is service + provider VLAN ID. + $VLAN_NAME - The VLAN name, as it has been configured by user, + of outermost VLAN in which the DHCP packet is received. + $CVID - Valid only for double (QinQ) tagged frames. Customer (inner) + VLAN ID in which the DHCP packet has been received. + $SYSNAME - System name as configured in SNMP agent on this device. + $LOCATION - Location as configured in SNMP agent on this device. + $CONTACT - Contact as configured in SNMP agent on this device. + $HEX - Arbitrary array of hexadecimal values. + Format: $HEX + " + DEFVAL { "" } + ::= { msanServiceProfileEntry 32 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.33 + msanServiceProfileDhcpv6RaInterfaceIdType OBJECT-TYPE + SYNTAX INTEGER + { + iskratel(1), + standard(2), + custom(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCPv6 Interface Id syntax mode." + DEFVAL { standard } + ::= { msanServiceProfileEntry 33 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.34 + msanServiceProfileDhcpv6RaInterfaceIdCustomFormat OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCPv6 Interface Id Custom format definition composed of arbitrary characters and variable macros. + + Use '$[h][[0|s]][d[]]' format to specify: + h HEX variable format + 0|s left padding with zeroes or spaces + - maximum variable length + d use custom delimiter for MAC/IP + - delimiting character + variable macro + + Supported macros: + $SHELF - A string variable representing the shelf name as configured + or acquired by this device. + $CHASSIS - A numeric variable ranging [0..99] and representing numerical + identification of shelf. + $PANEL - Panel indicator: 0 front panel, 1 back panel. + $INTF_TYPE - Interface type: eth, dsl, gpon, mng, lag, atm, etc. + $AGENT_BOARD - Local board position (slot number) of DHCP Relay Agent. + $PORT - ID of local port the DHCP packet is received on. + $PORT_REM_ID - Complete remoteID string is inserted, as configured per + pertaining interface. + $INTF - ID of local interface the DHCP packet is received on in form + as used in interface configuration (e.g.: 1/2/1). + $INTF_DSCR - Interface description string taken exactly as configured + using 'description' command. + $PVC_INTF - ID of PVC interface the DHCP packet is received from (ADSL only). + $VPI - ID of ATM VPI the DHCP packet is received in (ADSL only). + $VCI - ID of ATM VCI the DHCP packet is received in (ADSL only). + $CLNT_MAC - MAC address of DHCP client sending the packet. + $AGENT_MAC - Local DHCP Relay Agent MAC address. If this is a switching device + MNG address is used. If this is a routing device MAC address + of the receiving interface is used. + $AGENT_IPV4 - Local DHCP Relay Agent IP address. Management IPv4 address + is used if this is a switching device, or IPv4 address of + receiving interface is used if this is a routing device. + $VLAN - Outermost VLAN ID in which the DHCP packet has been received. + In case of single tagged frame this is VLAN ID of the frame. + In case of double (QinQ) tagged frame, this is service + provider VLAN ID. + $VLAN_NAME - The VLAN name, as it has been configured by user, + of outermost VLAN in which the DHCP packet is received. + $CVID - Valid only for double (QinQ) tagged frames. Customer (inner) + VLAN ID in which the DHCP packet has been received. + $SYSNAME - System name as configured in SNMP agent on this device. + $LOCATION - Location as configured in SNMP agent on this device. + $CONTACT - Contact as configured in SNMP agent on this device. + $HEX - Arbitrary array of hexadecimal values. + Format: $HEX + " + DEFVAL { "" } + ::= { msanServiceProfileEntry 34 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.35 + msanServiceProfileDhcpv6RaRemoteIdCustomFormat OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCPv6 Remote Id Custom format definition composed of arbitrary characters and variable macros. + + Use '$[h][[0|s]][d[]]' format to specify: + h HEX variable format + 0|s left padding with zeroes or spaces + - maximum variable length + d use custom delimiter for MAC/IP + - delimiting character + variable macro + + Supported macros: + $SHELF - A string variable representing the shelf name as configured + or acquired by this device. + $CHASSIS - A numeric variable ranging [0..99] and representing numerical + identification of shelf. + $PANEL - Panel indicator: 0 front panel, 1 back panel. + $INTF_TYPE - Interface type: eth, dsl, gpon, mng, lag, atm, etc. + $AGENT_BOARD - Local board position (slot number) of DHCP Relay Agent. + $PORT - ID of local port the DHCP packet is received on. + $PORT_REM_ID - Complete remoteID string is inserted, as configured per + pertaining interface. + $INTF - ID of local interface the DHCP packet is received on in form + as used in interface configuration (e.g.: 1/2/1). + $INTF_DSCR - Interface description string taken exactly as configured + using 'description' command. + $PVC_INTF - ID of PVC interface the DHCP packet is received from (ADSL only). + $VPI - ID of ATM VPI the DHCP packet is received in (ADSL only). + $VCI - ID of ATM VCI the DHCP packet is received in (ADSL only). + $CLNT_MAC - MAC address of DHCP client sending the packet. + $AGENT_MAC - Local DHCP Relay Agent MAC address. If this is a switching device + MNG address is used. If this is a routing device MAC address + of the receiving interface is used. + $AGENT_IPV4 - Local DHCP Relay Agent IP address. Management IPv4 address + is used if this is a switching device, or IPv4 address of + receiving interface is used if this is a routing device. + $VLAN - Outermost VLAN ID in which the DHCP packet has been received. + In case of single tagged frame this is VLAN ID of the frame. + In case of double (QinQ) tagged frame, this is service + provider VLAN ID. + $VLAN_NAME - The VLAN name, as it has been configured by user, + of outermost VLAN in which the DHCP packet is received. + $CVID - Valid only for double (QinQ) tagged frames. Customer (inner) + VLAN ID in which the DHCP packet has been received. + $SYSNAME - System name as configured in SNMP agent on this device. + $LOCATION - Location as configured in SNMP agent on this device. + $CONTACT - Contact as configured in SNMP agent on this device. + $HEX - Arbitrary array of hexadecimal values. + Format: $HEX + " + DEFVAL { "" } + ::= { msanServiceProfileEntry 35 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.50 + msanServiceProfileOnuFlowProfileName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Index of used ONU Flow profile (this profile must be set before), which indicates + row in msanOnuFlowProfileTable. + Empty string indicates that parameter has not been defined." + ::= { msanServiceProfileEntry 50 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.51 + msanServiceProfileOnuVlanProfileName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Index of used ONU Vlan profile (this profile must be set before), which indicates + row in msanOnuVlanProfileTable. + Empty string indicates that parameter has not been defined." + ::= { msanServiceProfileEntry 51 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.52 + msanServiceProfileOnuMulticastProfileName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Index of used ONU Multicast profile (this profile must be set before), which indicates + row in msanOnuMulticastProfileTable. + Empty string indicates that parameter has not been defined." + ::= { msanServiceProfileEntry 52 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.53 + msanServiceProfileOnuTcontProfileName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Index of used ONU T-CONT profile (this profile must be set before), which indicates + row in msanOnuTcontProfileTable. + Empty string indicates that parameter has not been defined." + ::= { msanServiceProfileEntry 53 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.54 + msanServiceProfileOnuVirtGemPortId OBJECT-TYPE + SYNTAX Integer32 (1..32) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Virtual GEM Port ID." + DEFVAL { 1 } + ::= { msanServiceProfileEntry 54 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.55 + msanServiceProfileOnuTpType OBJECT-TYPE + SYNTAX INTEGER + { + veip(1), + ipHost(2), + ethernetUni(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU termination point type." + ::= { msanServiceProfileEntry 55 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.56 + msanServiceProfileOnuTpUniBitMap OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..2)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU Ethernet UNI ports bitmap (max 16 ports). This parameter can be set only + when msanServiceProfileOnuTpType has value ethernetUni(3)." + ::= { msanServiceProfileEntry 56 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.57 + msanServiceProfileUsage OBJECT-TYPE + SYNTAX INTEGER + { + attached(1), + notAttached(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Profile usage. + If profile is attached, profile values can't be edited." + ::= { msanServiceProfileEntry 57 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.58 + msanServiceProfileOnuAcsServerProfileName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Index of used ONU ACS Server profile (this profile must be set before), which indicates + row in msanOnuAcsServerProfileTable. + Empty string indicates that parameter has not been defined." + ::= { msanServiceProfileEntry 58 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.1.1.59 + msanServiceProfileOnuAcsServerVeipId OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "ONU Veip ID which is used for ACS Server configuration defined in + relevant msanServiceProfileOnuAcsServerProfileTable instance." + ::= { msanServiceProfileEntry 59 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.2 + msanServicePortProfileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanServicePortProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A connection between service profiles and device ports" + ::= { msanServiceProfile 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.2.1 + msanServicePortProfileEntry OBJECT-TYPE + SYNTAX MsanServicePortProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Service Profile Port table entry. + + In case of GPON access blade, ifIndex for ONU interface (ifDescr=0/x/y) is calculated with formula: + ifIndex=max_olt_port_number(8 or 16)+(x-1)*128+y " + INDEX { ifIndex, msanServiceProfileName } + ::= { msanServicePortProfileTable 1 } + + + MsanServicePortProfileEntry ::= + SEQUENCE { + msanServicePortProfileRowStatus + RowStatus, + msanServicePortProfileOnuTpUniBitMap + OCTET STRING, + msanServicePortDataCVid + Integer32, + msanServicePortDataSVid + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.2.1.1 + msanServicePortProfileRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndGo(4) or createAndWait(5). + Setting this object to destroy(6) will remove this entry. + When row is created you can't change values of parameters in this row. + Read values: active(1). + Other values are currently not supported. + + In case of GPON access blade, ifIndex for ONU interface (ifDescr=0/x/y) is calculated with formula: + ifIndex=max_olt_port_number(8 or 16)+(x-1)*128+y " + ::= { msanServicePortProfileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.2.1.2 + msanServicePortProfileOnuTpUniBitMap OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..2)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "ONU Ethernet UNI ports bitmap (max 16 ports). " + ::= { msanServicePortProfileEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.2.1.3 + msanServicePortDataCVid OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "C-VLAN Id. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServicePortProfileEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.2.2.1.4 + msanServicePortDataSVid OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "S-VLAN Id. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServicePortProfileEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3 + msanServiceFlowProfile OBJECT IDENTIFIER ::= { msanProfiles 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1 + msanServiceFlowProfileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanServiceFlowProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Service Flow Profile table " + ::= { msanServiceFlowProfile 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1 + msanServiceFlowProfileEntry OBJECT-TYPE + SYNTAX MsanServiceFlowProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Service Flow Profile table entry." + INDEX { msanServiceFlowProfileName } + ::= { msanServiceFlowProfileTable 1 } + + + MsanServiceFlowProfileEntry ::= + SEQUENCE { + msanServiceFlowProfileName + DisplayString, + msanServiceFlowProfileProtection + INTEGER, + msanServiceFlowProfileStatus + INTEGER, + msanServiceFlowProfileMatchUsAny + INTEGER, + msanServiceFlowProfileMatchUsMacDestAddr + MacAddress, + msanServiceFlowProfileMatchUsMacDestMask + MacAddress, + msanServiceFlowProfileMatchUsMacSrcAddr + MacAddress, + msanServiceFlowProfileMatchUsMacSrcMask + MacAddress, + msanServiceFlowProfileMatchUsCPcp + Integer32, + msanServiceFlowProfileMatchUsSPcp + Integer32, + msanServiceFlowProfileMatchUsVlanProfile + INTEGER, + msanServiceFlowProfileMatchUsCVlanIdRange + OCTET STRING, + msanServiceFlowProfileMatchUsSVlanIdRange + OCTET STRING, + msanServiceFlowProfileMatchUsEthertype + Integer32, + msanServiceFlowProfileMatchUsIpProtocol + Integer32, + msanServiceFlowProfileMatchUsIpSrcAddr + IpAddress, + msanServiceFlowProfileMatchUsIpSrcMask + IpAddress, + msanServiceFlowProfileMatchUsIpDestAddr + IpAddress, + msanServiceFlowProfileMatchUsIpDestMask + IpAddress, + msanServiceFlowProfileMatchUsIpDscp + Integer32, + msanServiceFlowProfileMatchUsIpCsc + Integer32, + msanServiceFlowProfileMatchUsIpDropPrecedence + INTEGER, + msanServiceFlowProfileMatchUsTcpSrcPort + Integer32, + msanServiceFlowProfileMatchUsTcpDestPort + Integer32, + msanServiceFlowProfileMatchUsUdpSrcPort + Integer32, + msanServiceFlowProfileMatchUsUdpDstPort + Integer32, + msanServiceFlowProfileMatchDsAny + INTEGER, + msanServiceFlowProfileMatchDsMacDestAddr + MacAddress, + msanServiceFlowProfileMatchDsMacDestMask + MacAddress, + msanServiceFlowProfileMatchDsMacSrcAddr + MacAddress, + msanServiceFlowProfileMatchDsMacSrcMask + MacAddress, + msanServiceFlowProfileMatchDsCPcp + Integer32, + msanServiceFlowProfileMatchDsSPcp + Integer32, + msanServiceFlowProfileMatchDsVlanProfile + INTEGER, + msanServiceFlowProfileMatchDsCVlanIdRange + OCTET STRING, + msanServiceFlowProfileMatchDsSVlanIdRange + OCTET STRING, + msanServiceFlowProfileMatchDsEthertype + Integer32, + msanServiceFlowProfileMatchDsIpProtocol + Integer32, + msanServiceFlowProfileMatchDsIpSrcAddr + IpAddress, + msanServiceFlowProfileMatchDsIpSrcMask + IpAddress, + msanServiceFlowProfileMatchDsIpDestAddr + IpAddress, + msanServiceFlowProfileMatchDsIpDestMask + IpAddress, + msanServiceFlowProfileMatchDsIpDscp + Integer32, + msanServiceFlowProfileMatchDsIpCsc + Integer32, + msanServiceFlowProfileMatchDsIpDropPrecedence + INTEGER, + msanServiceFlowProfileMatchDsTcpSrcPort + Integer32, + msanServiceFlowProfileMatchDsTcpDestPort + Integer32, + msanServiceFlowProfileMatchDsUdpSrcPort + Integer32, + msanServiceFlowProfileMatchDsUdpDstPort + Integer32, + msanServiceFlowProfileUsCdr + Integer32, + msanServiceFlowProfileUsCdrBurstSize + Integer32, + msanServiceFlowProfileUsPdr + Integer32, + msanServiceFlowProfileUsPdrBurstSize + Integer32, + msanServiceFlowProfileUsMarkPcp + INTEGER, + msanServiceFlowProfileUsMarkPcpValue + INTEGER, + msanServiceFlowProfileUsMarkDscp + INTEGER, + msanServiceFlowProfileUsMarkDscpValue + INTEGER, + msanServiceFlowProfileDsCdr + Integer32, + msanServiceFlowProfileDsCdrBurstSize + Integer32, + msanServiceFlowProfileDsPdr + Integer32, + msanServiceFlowProfileDsPdrBurstSize + Integer32, + msanServiceFlowProfileDsMarkPcp + INTEGER, + msanServiceFlowProfileDsMarkPcpValue + INTEGER, + msanServiceFlowProfileDsMarkDscp + INTEGER, + msanServiceFlowProfileDsMarkDscpValue + INTEGER, + msanServiceFlowProfileDsQueuingPriority + INTEGER, + msanServiceFlowProfileDsSchedulingMode + INTEGER, + msanServiceFlowProfileDescription + DisplayString, + msanServiceFlowProfileRowStatus + RowStatus, + msanServiceFlowProfileMatchUsIpv6SrcAddr + InetAddressIPv6, + msanServiceFlowProfileMatchUsIpv6SrcAddrMaskLen + Integer32, + msanServiceFlowProfileMatchUsIpv6DestAddr + InetAddressIPv6, + msanServiceFlowProfileMatchUsIpv6DestAddrMaskLen + Integer32, + msanServiceFlowProfileMatchDsIpv6SrcAddr + InetAddressIPv6, + msanServiceFlowProfileMatchDsIpv6SrcAddrMaskLen + Integer32, + msanServiceFlowProfileMatchDsIpv6DestAddr + InetAddressIPv6, + msanServiceFlowProfileMatchDsIpv6DestAddrMaskLen + Integer32, + msanServiceFlowProfileUsage + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.1 + msanServiceFlowProfileName OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..32)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Service Flow Profile Name." + ::= { msanServiceFlowProfileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.2 + msanServiceFlowProfileProtection OBJECT-TYPE + SYNTAX INTEGER + { + unprotected(0), + protected(1) + } + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "If protection flag is set to protected (1), other profile values cannot be edited. + + Protection flag is always protected (1) and it can't be changed if profile is assigned as dynamic: + msanServiceFlowProfileStatus = dynamic(2)" + DEFVAL { unprotected } + ::= { msanServiceFlowProfileEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.3 + msanServiceFlowProfileStatus OBJECT-TYPE + SYNTAX INTEGER + { + static(1), + dynamic(2) + } + MAX-ACCESS read-only + STATUS obsolete + DESCRIPTION + "Profile status. + If status is dynamic, profile values can't be edited." + ::= { msanServiceFlowProfileEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.4 + msanServiceFlowProfileMatchUsAny OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match every upstream packet frame." + DEFVAL { disable } + ::= { msanServiceFlowProfileEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.5 + msanServiceFlowProfileMatchUsMacDestAddr OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified destination MAC address. + Empty string indicates that parameter has not been defined" + DEFVAL { ''b } + ::= { msanServiceFlowProfileEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.6 + msanServiceFlowProfileMatchUsMacDestMask OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanServiceFlowProfileMatchUsMacDestAddr + that is compared with upstream packet. + Empty string indicates that parameter has not been defined" + DEFVAL { ''b } + ::= { msanServiceFlowProfileEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.7 + msanServiceFlowProfileMatchUsMacSrcAddr OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified source MAC address. + Empty string indicates that parameter has not been defined" + DEFVAL { ''b } + ::= { msanServiceFlowProfileEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.8 + msanServiceFlowProfileMatchUsMacSrcMask OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanServiceFlowProfileMatchUsMacSrcAddr + that is compared with upstream packet. + Empty string indicates that parameter has not been defined" + DEFVAL { ''b } + ::= { msanServiceFlowProfileEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.9 + msanServiceFlowProfileMatchUsCPcp OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified Customer PCP (Priority Code Point) - + PCP is also known as class of service (CoS) bits. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.10 + msanServiceFlowProfileMatchUsSPcp OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified Service PCP (Priority Code Point). + PCP is also known as class of service (CoS) bits. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.11 + msanServiceFlowProfileMatchUsVlanProfile OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with VLAN Id values from VLAN Service Profile (msanVlanProfileTable). + " + DEFVAL { disable } + ::= { msanServiceFlowProfileEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.12 + msanServiceFlowProfileMatchUsCVlanIdRange OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..512)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified list (bitmask) of Customer VLAN Id. + An empty string indicates that parameter has not been defined." + DEFVAL { ''b } + ::= { msanServiceFlowProfileEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.13 + msanServiceFlowProfileMatchUsSVlanIdRange OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..512)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified list (bitmask) of Service VLAN Id. + An empty string indicates that parameter has not been defined." + DEFVAL { ''b } + ::= { msanServiceFlowProfileEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.14 + msanServiceFlowProfileMatchUsEthertype OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified EtherType value. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.15 + msanServiceFlowProfileMatchUsIpProtocol OBJECT-TYPE + SYNTAX Integer32 (-1..255) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified IP protocol value. + A value of -1 indicates that parameter has not been defined. + Some of standard protocol values: + icmp - 1 + igmp - 2 + ip - 4 (ip in ip encapsulation) + tcp - 6 + udp - 17" + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.16 + msanServiceFlowProfileMatchUsIpSrcAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified source IP address. + Empty string indicates that parameter has not been defined." + DEFVAL { ''h } + ::= { msanServiceFlowProfileEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.17 + msanServiceFlowProfileMatchUsIpSrcMask OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanServiceFlowProfileMatchUsIpSrcAddr + that is compared with upstream packet. + Empty string indicates that parameter has not been defined" + DEFVAL { ''h } + ::= { msanServiceFlowProfileEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.18 + msanServiceFlowProfileMatchUsIpDestAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified destination IP address. + Empty string indicates that parameter has not been defined." + DEFVAL { ''h } + ::= { msanServiceFlowProfileEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.19 + msanServiceFlowProfileMatchUsIpDestMask OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanServiceFlowProfileMatchUsIpDestAddr + that is compared with upstream packet. + Empty string indicates that parameter has not been defined" + DEFVAL { ''h } + ::= { msanServiceFlowProfileEntry 19 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.20 + msanServiceFlowProfileMatchUsIpDscp OBJECT-TYPE + SYNTAX Integer32 (-1..63) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified CSC (Class Selector Code Point) = IP precedence (part of TOS field) value. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.21 + msanServiceFlowProfileMatchUsIpCsc OBJECT-TYPE + SYNTAX Integer32 (-1..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified IP precedence (part of TOS field) value. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.22 + msanServiceFlowProfileMatchUsIpDropPrecedence OBJECT-TYPE + SYNTAX INTEGER + { + notDefined(-1), + noDrop(0), + lowDrop(1), + mediumDrop(2), + highDrop(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified Drop precedence two bits value: + noDrop(0) -> 00 + lowDrop(1) -> 01 + mediumDrop(2) -> 10 + highDrop(3) -> 11 + + A value of -1 indicates that parameter has not been defined." + DEFVAL { notDefined } + ::= { msanServiceFlowProfileEntry 22 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.23 + msanServiceFlowProfileMatchUsTcpSrcPort OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified source TCP port number. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 23 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.24 + msanServiceFlowProfileMatchUsTcpDestPort OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified destination TCP port number. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 24 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.25 + msanServiceFlowProfileMatchUsUdpSrcPort OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified source UDP port number. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 25 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.26 + msanServiceFlowProfileMatchUsUdpDstPort OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified destination UDP port number. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 26 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.27 + msanServiceFlowProfileMatchDsAny OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match every downstream packet frame." + DEFVAL { disable } + ::= { msanServiceFlowProfileEntry 27 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.28 + msanServiceFlowProfileMatchDsMacDestAddr OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified destination MAC address. + Empty string indicates that parameter has not been defined" + DEFVAL { ''b } + ::= { msanServiceFlowProfileEntry 28 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.29 + msanServiceFlowProfileMatchDsMacDestMask OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanServiceFlowProfileMatchDsMacDestAddr + that is compared with downstream packet. + Empty string indicates that parameter has not been defined" + DEFVAL { ''b } + ::= { msanServiceFlowProfileEntry 29 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.30 + msanServiceFlowProfileMatchDsMacSrcAddr OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified source MAC address. + Empty string indicates that parameter has not been defined" + DEFVAL { ''b } + ::= { msanServiceFlowProfileEntry 30 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.31 + msanServiceFlowProfileMatchDsMacSrcMask OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanServiceFlowProfileMatchDsMacSrcAddr + that is compared with downstream packet. + Empty string indicates that parameter has not been defined" + DEFVAL { ''b } + ::= { msanServiceFlowProfileEntry 31 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.32 + msanServiceFlowProfileMatchDsCPcp OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified Customer PCP (Priority Code Point) - + PCP is also known as class of service (CoS) bits. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 32 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.33 + msanServiceFlowProfileMatchDsSPcp OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified Service PCP (Priority Code Point). + PCP is also known as class of service (CoS) bits. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 33 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.34 + msanServiceFlowProfileMatchDsVlanProfile OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with VLAN Id values from VLAN Service Profile (msanVlanProfileTable). + " + DEFVAL { disable } + ::= { msanServiceFlowProfileEntry 34 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.35 + msanServiceFlowProfileMatchDsCVlanIdRange OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..512)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified list (bitmask) of Customer VLAN Id. + An emptya string indicates that parameter has not been defined." + DEFVAL { ''b } + ::= { msanServiceFlowProfileEntry 35 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.36 + msanServiceFlowProfileMatchDsSVlanIdRange OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..512)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified list (bitmask) of Service VLAN Id. + An empty string indicates that parameter has not been defined." + DEFVAL { ''b } + ::= { msanServiceFlowProfileEntry 36 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.37 + msanServiceFlowProfileMatchDsEthertype OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified EtherType value. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 37 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.38 + msanServiceFlowProfileMatchDsIpProtocol OBJECT-TYPE + SYNTAX Integer32 (-1..255) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified IP protocol value. + A value of -1 indicates that parameter has not been defined. + Some of standard protocol values: + icmp - 1 + igmp - 2 + ip - 4 (ip in ip encapsulation) + tcp - 6 + udp - 17" + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 38 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.39 + msanServiceFlowProfileMatchDsIpSrcAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified source IP address. + Empty string indicates that parameter has not been defined." + DEFVAL { ''h } + ::= { msanServiceFlowProfileEntry 39 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.40 + msanServiceFlowProfileMatchDsIpSrcMask OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanServiceFlowProfileMatchDsIpSrcAddr + that is compared with downstream packet. + Empty string indicates that parameter has not been defined" + DEFVAL { ''h } + ::= { msanServiceFlowProfileEntry 40 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.41 + msanServiceFlowProfileMatchDsIpDestAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified destination IP address. + Empty string indicates that parameter has not been defined." + DEFVAL { ''h } + ::= { msanServiceFlowProfileEntry 41 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.42 + msanServiceFlowProfileMatchDsIpDestMask OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanServiceFlowProfileMatchDsIpDestAddr + that is compared with downstream packet. + Empty string indicates that parameter has not been defined" + DEFVAL { ''h } + ::= { msanServiceFlowProfileEntry 42 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.43 + msanServiceFlowProfileMatchDsIpDscp OBJECT-TYPE + SYNTAX Integer32 (-1..63) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified IP DSCP value. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 43 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.44 + msanServiceFlowProfileMatchDsIpCsc OBJECT-TYPE + SYNTAX Integer32 (-1..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified CSC (Class Selector Code Point) = IP precedence (part of TOS field) value. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 44 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.45 + msanServiceFlowProfileMatchDsIpDropPrecedence OBJECT-TYPE + SYNTAX INTEGER + { + notDefined(-1), + noDrop(0), + lowDrop(1), + mediumDrop(2), + highDrop(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified Drop precedence two bits value: + noDrop(0) -> 00 + lowDrop(1) -> 01 + mediumDrop(2) -> 10 + highDrop(3) -> 11 + + A value of -1 indicates that parameter has not been defined." + DEFVAL { notDefined } + ::= { msanServiceFlowProfileEntry 45 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.46 + msanServiceFlowProfileMatchDsTcpSrcPort OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified source TCP port number. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 46 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.47 + msanServiceFlowProfileMatchDsTcpDestPort OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified destination TCP port number. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 47 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.48 + msanServiceFlowProfileMatchDsUdpSrcPort OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified source UDP port number. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 48 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.49 + msanServiceFlowProfileMatchDsUdpDstPort OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified destination UDP port number. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 49 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.50 + msanServiceFlowProfileUsCdr OBJECT-TYPE + SYNTAX Integer32 (0..1000000) + UNITS "kbps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Upstream committed data rate (E-CDR) in kbps (0 – 1000000)." + DEFVAL { 0 } + ::= { msanServiceFlowProfileEntry 50 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.51 + msanServiceFlowProfileUsCdrBurstSize OBJECT-TYPE + SYNTAX Integer32 (0..16384) + UNITS "kB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Upstream committed data rate burst size in kB (0 – 16384). + + When parameter is set to 0 (default), it's automatically updated to default + burst size in according with current msanQoSProfileInCdr value." + DEFVAL { 0 } + ::= { msanServiceFlowProfileEntry 51 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.52 + msanServiceFlowProfileUsPdr OBJECT-TYPE + SYNTAX Integer32 (0..1000000) + UNITS "kbps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Upstream peak data rate (E-PDR) in kbps (0 – 1000000)." + DEFVAL { 0 } + ::= { msanServiceFlowProfileEntry 52 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.53 + msanServiceFlowProfileUsPdrBurstSize OBJECT-TYPE + SYNTAX Integer32 (0..16384) + UNITS "kB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Upstream peak data rate burst size in kB (0 – 16384). + + When parameter is set to 0 (default), it's automatically updated to default + burst size in according with current msanQoSProfileInPdr value." + DEFVAL { 0 } + ::= { msanServiceFlowProfileEntry 53 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.54 + msanServiceFlowProfileUsMarkPcp OBJECT-TYPE + SYNTAX INTEGER + { + none(1), + copyFromCsc(2), + userValue(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Type of upstrem PCP marking. + If set to userValue(3), parameter msanServiceFlowProfileUsMarkPcpValue is used. + A value of none(1) indicates that parameter has not been defined" + DEFVAL { none } + ::= { msanServiceFlowProfileEntry 54 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.55 + msanServiceFlowProfileUsMarkPcpValue OBJECT-TYPE + SYNTAX INTEGER (-1..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Mark upstream packets with specified PCP (Priority Code Point) value (0-7) = CoS. + A value of -1 indicates that parameter has not been defined" + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 55 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.56 + msanServiceFlowProfileUsMarkDscp OBJECT-TYPE + SYNTAX INTEGER + { + none(1), + copyFromPcp(2), + userValue(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Type of upstrem DSCP marking. + If set to userValue(3), parameter msanServiceFlowProfileUsMarkDscpValue is used. + A value of none(1) indicates that parameter has not been defined" + DEFVAL { none } + ::= { msanServiceFlowProfileEntry 56 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.57 + msanServiceFlowProfileUsMarkDscpValue OBJECT-TYPE + SYNTAX INTEGER (-1..63) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Mark upstream packets with specified DSCP (Diffserv Code Point) value (0-63). + A value of -1 indicates that parameter has not been defined" + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 57 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.58 + msanServiceFlowProfileDsCdr OBJECT-TYPE + SYNTAX Integer32 (0..1000000) + UNITS "kbps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Downstream committed data rate (E-CDR) in kbps (0 – 1000000)." + DEFVAL { 0 } + ::= { msanServiceFlowProfileEntry 58 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.59 + msanServiceFlowProfileDsCdrBurstSize OBJECT-TYPE + SYNTAX Integer32 (0..16384) + UNITS "kB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Downstream committed data rate burst size in kB (0 – 16384). + + When parameter is set to 0 (default), it's automatically updated to default + burst size in according with current msanQoSProfileOutCdr value." + DEFVAL { 0 } + ::= { msanServiceFlowProfileEntry 59 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.60 + msanServiceFlowProfileDsPdr OBJECT-TYPE + SYNTAX Integer32 (0..1000000) + UNITS "kbps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Downstream peak data rate (E-PDR) in kbps (0 – 1000000)." + DEFVAL { 0 } + ::= { msanServiceFlowProfileEntry 60 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.61 + msanServiceFlowProfileDsPdrBurstSize OBJECT-TYPE + SYNTAX Integer32 (0..16384) + UNITS "kB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Downstream peak data rate burst size in kB (0 – 16384). + + When parameter is set to 0 (default), it's automatically updated to default + burst size in according with current msanQoSProfileOutCdr value. + " + DEFVAL { 0 } + ::= { msanServiceFlowProfileEntry 61 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.62 + msanServiceFlowProfileDsMarkPcp OBJECT-TYPE + SYNTAX INTEGER + { + none(1), + copyFromCsc(2), + userValue(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Type of downstream PCP marking. + If set to userValue(3), parameter msanServiceFlowProfileDsMarkPcpValue is used. + A value of none(1) indicates that parameter has not been defined" + DEFVAL { none } + ::= { msanServiceFlowProfileEntry 62 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.63 + msanServiceFlowProfileDsMarkPcpValue OBJECT-TYPE + SYNTAX INTEGER (-1..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Mark downstream packets with specified PCP (Priority Code Point) value (0-7) = CoS. + A value of -1 indicates that parameter has not been defined" + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 63 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.64 + msanServiceFlowProfileDsMarkDscp OBJECT-TYPE + SYNTAX INTEGER + { + none(1), + copyFromPcp(2), + userValue(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Type of downstrem DSCP marking. + If set to userValue(3), parameter msanServiceFlowProfileDsMarkDscpValue is used. + A value of none(1) indicates that parameter has not been defined" + DEFVAL { none } + ::= { msanServiceFlowProfileEntry 64 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.65 + msanServiceFlowProfileDsMarkDscpValue OBJECT-TYPE + SYNTAX INTEGER (-1..63) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Mark downstream packets with specified DSCP (Diffserv Code Point) value (0-63). + A value of -1 indicates that parameter has not been defined" + DEFVAL { -1 } + ::= { msanServiceFlowProfileEntry 65 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.66 + msanServiceFlowProfileDsQueuingPriority OBJECT-TYPE + SYNTAX INTEGER (0..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Queuing Priority of Service Flow Profile. + " + DEFVAL { 0 } + ::= { msanServiceFlowProfileEntry 66 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.67 + msanServiceFlowProfileDsSchedulingMode OBJECT-TYPE + SYNTAX INTEGER + { + weighted(1), + strict(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Scheduling Mode" + DEFVAL { weighted } + ::= { msanServiceFlowProfileEntry 67 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.68 + msanServiceFlowProfileDescription OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Attribute specifies text which describes the associated object." + ::= { msanServiceFlowProfileEntry 68 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.69 + msanServiceFlowProfileRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanServiceFlowProfileEntry 69 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.70 + msanServiceFlowProfileMatchUsIpv6SrcAddr OBJECT-TYPE + SYNTAX InetAddressIPv6 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified source IPv6 address. + Empty string indicates that parameter has not been defined." + DEFVAL { ''b } + ::= { msanServiceFlowProfileEntry 70 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.71 + msanServiceFlowProfileMatchUsIpv6SrcAddrMaskLen OBJECT-TYPE + SYNTAX Integer32 (0..128) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanServiceFlowProfileMatchUsIpv6SrcAddr + that is compared with upstream packet. + " + DEFVAL { 0 } + ::= { msanServiceFlowProfileEntry 71 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.72 + msanServiceFlowProfileMatchUsIpv6DestAddr OBJECT-TYPE + SYNTAX InetAddressIPv6 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match upstream packet frame with specified destination IPv6 address. + Empty string indicates that parameter has not been defined. + " + DEFVAL { ''b } + ::= { msanServiceFlowProfileEntry 72 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.73 + msanServiceFlowProfileMatchUsIpv6DestAddrMaskLen OBJECT-TYPE + SYNTAX Integer32 (0..128) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanServiceFlowProfileMatchUsIpv6DestAddr + that is compared with upstream packet. + " + DEFVAL { 0 } + ::= { msanServiceFlowProfileEntry 73 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.74 + msanServiceFlowProfileMatchDsIpv6SrcAddr OBJECT-TYPE + SYNTAX InetAddressIPv6 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified source IPv6 address. + Empty string indicates that parameter has not been defined." + DEFVAL { ''b } + ::= { msanServiceFlowProfileEntry 74 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.75 + msanServiceFlowProfileMatchDsIpv6SrcAddrMaskLen OBJECT-TYPE + SYNTAX Integer32 (0..128) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanServiceFlowProfileMatchDsIpv6SrcAddr + that is compared with downstream packet. + " + DEFVAL { 0 } + ::= { msanServiceFlowProfileEntry 75 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.76 + msanServiceFlowProfileMatchDsIpv6DestAddr OBJECT-TYPE + SYNTAX InetAddressIPv6 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match downstream packet frame with specified destination IPv6 address. + Empty string indicates that parameter has not been defined. + " + DEFVAL { ''b } + ::= { msanServiceFlowProfileEntry 76 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.77 + msanServiceFlowProfileMatchDsIpv6DestAddrMaskLen OBJECT-TYPE + SYNTAX Integer32 (0..128) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanServiceFlowProfileMatchDsIpv6DestAddr + that is compared with downstrem packet. + " + DEFVAL { 0 } + ::= { msanServiceFlowProfileEntry 77 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.3.1.1.78 + msanServiceFlowProfileUsage OBJECT-TYPE + SYNTAX INTEGER + { + attached(1), + notAttached(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Profile usage. + If profile is attached, profile values can't be edited." + ::= { msanServiceFlowProfileEntry 78 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4 + msanVlanProfile OBJECT IDENTIFIER ::= { msanProfiles 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.1 + msanVlanProfileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanVlanProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Vlan Profile table " + ::= { msanVlanProfile 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.1.1 + msanVlanProfileEntry OBJECT-TYPE + SYNTAX MsanVlanProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Vlan Profile table entry." + INDEX { msanVlanProfileName } + ::= { msanVlanProfileTable 1 } + + + MsanVlanProfileEntry ::= + SEQUENCE { + msanVlanProfileName + DisplayString, + msanVlanProfileProtection + INTEGER, + msanVlanProfileStatus + INTEGER, + msanVlanProfileCVid + OCTET STRING, + msanVlanProfileCVidNative + Integer32, + msanVlanProfileCVidRemark + Integer32, + msanVlanProfileSVid + Integer32, + msanVlanProfileSEtherType + Integer32, + msanVlanProfileDescription + DisplayString, + msanVlanProfileRowStatus + RowStatus, + msanVlanProfileNetworkPortCTag + INTEGER, + msanVlanProfileUsage + INTEGER, + msanVlanProfileCVidExternal + INTEGER, + msanVlanProfileCVidNativeExternal + INTEGER, + msanVlanProfileCVidRemarkExternal + INTEGER, + msanVlanProfileSVidExternal + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.1.1.1 + msanVlanProfileName OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..32)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Name for the VLAN profile." + ::= { msanVlanProfileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.1.1.2 + msanVlanProfileProtection OBJECT-TYPE + SYNTAX INTEGER + { + unprotected(0), + protected(1) + } + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "If protection flag is set to protected (1), other profile values cannot be edited. + + Protection flag is always protected (1) and it can't be changed if profile is assigned as dynamic: + msanVlanProfileStatus = dynamic(2)" + DEFVAL { unprotected } + ::= { msanVlanProfileEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.1.1.3 + msanVlanProfileStatus OBJECT-TYPE + SYNTAX INTEGER + { + static(1), + dynamic(2) + } + MAX-ACCESS read-only + STATUS obsolete + DESCRIPTION + "Profile status. + If status is dynamic, profile values can't be edited." + ::= { msanVlanProfileEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.1.1.4 + msanVlanProfileCVid OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..512)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Customer VLANs Identification (bit mask)." + DEFVAL { "" } + ::= { msanVlanProfileEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.1.1.5 + msanVlanProfileCVidNative OBJECT-TYPE + SYNTAX Integer32 (-1..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Nativ C-VLAN Id. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanVlanProfileEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.1.1.6 + msanVlanProfileCVidRemark OBJECT-TYPE + SYNTAX Integer32 (-1..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Remark C-VLAN Id. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanVlanProfileEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.1.1.7 + msanVlanProfileSVid OBJECT-TYPE + SYNTAX Integer32 (-1..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "S-VLAN Id. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanVlanProfileEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.1.1.8 + msanVlanProfileSEtherType OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Ether Type value. " + DEFVAL { '88a8'h } + ::= { msanVlanProfileEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.1.1.10 + msanVlanProfileDescription OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Attribute specifies text which describes the associated object." + ::= { msanVlanProfileEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.1.1.11 + msanVlanProfileRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanVlanProfileEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.1.1.12 + msanVlanProfileNetworkPortCTag OBJECT-TYPE + SYNTAX INTEGER + { + use(1), + notUse(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Usage of C-VLAN tag on network port. + If assigned as notUse(2) in upstream direction, C-VLAN tag is removed." + DEFVAL { use } + ::= { msanVlanProfileEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.1.1.13 + msanVlanProfileUsage OBJECT-TYPE + SYNTAX INTEGER + { + attached(1), + notAttached(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Profile usage. + If profile is attached, profile values can't be edited." + ::= { msanVlanProfileEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.1.1.14 + msanVlanProfileCVidExternal OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Use external parameter msanProfilePortDataCVid as C-VLAN Id." + DEFVAL { disable } + ::= { msanVlanProfileEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.1.1.15 + msanVlanProfileCVidNativeExternal OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Use external parameter msanProfilePortDataCVid as Native C-VLAN Id." + DEFVAL { disable } + ::= { msanVlanProfileEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.1.1.16 + msanVlanProfileCVidRemarkExternal OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Use external parameter msanProfilePortDataCVid as Remark C-VLAN Id." + DEFVAL { disable } + ::= { msanVlanProfileEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.1.1.17 + msanVlanProfileSVidExternal OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Use external parameter msanProfilePortDataSVid as S-VLAN Id." + DEFVAL { disable } + ::= { msanVlanProfileEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.2 + msanVlanPortProfileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanVlanPortProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A connection between VLAN profiles and device ports" + ::= { msanVlanProfile 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.2.1 + msanVlanPortProfileEntry OBJECT-TYPE + SYNTAX MsanVlanPortProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Service Profile Port table entry. + + In case of GPON access blade, ifIndex for ONU interface (ifDescr=0/x/y) is calculated with formula: + ifIndex=max_olt_port_number(8 or 16)+(x-1)*128+y " + INDEX { ifIndex, msanVlanProfileName } + ::= { msanVlanPortProfileTable 1 } + + + MsanVlanPortProfileEntry ::= + SEQUENCE { + msanVlanPortProfileRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.4.2.1.1 + msanVlanPortProfileRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported. + + In case of GPON access blade, ifIndex for ONU interface (ifDescr=0/x/y) is calculated with formula: + ifIndex=max_olt_port_number(8 or 16)+(x-1)*128+y " + ::= { msanVlanPortProfileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5 + msanMulticastProfile OBJECT IDENTIFIER ::= { msanProfiles 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.1 + msanMulticastProfileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMulticastProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Multicast Profile table " + ::= { msanMulticastProfile 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.1.1 + msanMulticastProfileEntry OBJECT-TYPE + SYNTAX MsanMulticastProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Multicast Profile table entry." + INDEX { msanMulticastProfileName } + ::= { msanMulticastProfileTable 1 } + + + MsanMulticastProfileEntry ::= + SEQUENCE { + msanMulticastProfileName + DisplayString, + msanMulticastProfileProtection + INTEGER, + msanMulticastProfileStatus + INTEGER, + msanMulticastProfileIgmpSnooping + INTEGER, + msanMulticastProfileIgmpSnoopingFastLeave + INTEGER, + msanMulticastProfileIgmpSnoopingSuppression + INTEGER, + msanMulticastProfileIgmpProxy + INTEGER, + msanMulticastProfileIgmpProxyIpAddress + IpAddress, + msanMulticastProfileIgmpFiltering + INTEGER, + msanMulticastProfileMulticastGroupLimit + Unsigned32, + msanMulticastProfileMvr + INTEGER, + msanMulticastProfileDescription + DisplayString, + msanMulticastProfileRowStatus + RowStatus, + msanMulticastProfileIgmpProxyProtocolVersion + INTEGER, + msanMulticastProfileUsage + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.1.1.1 + msanMulticastProfileName OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..32)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Name for the Multicast profile." + ::= { msanMulticastProfileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.1.1.2 + msanMulticastProfileProtection OBJECT-TYPE + SYNTAX INTEGER + { + unprotected(0), + protected(1) + } + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "If protection flag is set to protected (1), other profile values cannot be edited. + + Protection flag is always protected (1) and it can't be changed if profile is assigned as dynamic: + msanMulticastProfileStatus = dynamic(2)" + DEFVAL { unprotected } + ::= { msanMulticastProfileEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.1.1.3 + msanMulticastProfileStatus OBJECT-TYPE + SYNTAX INTEGER + { + static(1), + dynamic(2) + } + MAX-ACCESS read-only + STATUS obsolete + DESCRIPTION + "Profile status. + If status is dynamic, profile values can't be edited." + ::= { msanMulticastProfileEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.1.1.4 + msanMulticastProfileIgmpSnooping OBJECT-TYPE + SYNTAX INTEGER + { + disableAndDiscard(0), + enable(1), + enableAndUnknownGroupFlood(2), + disableAndBroadcast(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IGMP snnoping" + DEFVAL { disableAndDiscard } + ::= { msanMulticastProfileEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.1.1.5 + msanMulticastProfileIgmpSnoopingFastLeave OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IGMP Snooping Fast Leave." + DEFVAL { disable } + ::= { msanMulticastProfileEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.1.1.6 + msanMulticastProfileIgmpSnoopingSuppression OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IGMP Snooping Suppression." + DEFVAL { disable } + ::= { msanMulticastProfileEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.1.1.7 + msanMulticastProfileIgmpProxy OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IGMP proxy." + DEFVAL { disable } + ::= { msanMulticastProfileEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.1.1.8 + msanMulticastProfileIgmpProxyIpAddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IGMP proxy IP address." + ::= { msanMulticastProfileEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.1.1.9 + msanMulticastProfileIgmpFiltering OBJECT-TYPE + SYNTAX INTEGER + { + allowAll(0), + allowReports(1), + allowQueries(2), + dropAll(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IGMP filtering." + DEFVAL { allowReports } + ::= { msanMulticastProfileEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.1.1.10 + msanMulticastProfileMulticastGroupLimit OBJECT-TYPE + SYNTAX Unsigned32 (0..30) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Multicast group limit. + A value of 0 indicates not limit." + ::= { msanMulticastProfileEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.1.1.11 + msanMulticastProfileMvr OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Multicast VLAN Registration." + DEFVAL { disable } + ::= { msanMulticastProfileEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.1.1.12 + msanMulticastProfileDescription OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Attribute specifies text which describes the associated object." + ::= { msanMulticastProfileEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.1.1.13 + msanMulticastProfileRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanMulticastProfileEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.1.1.14 + msanMulticastProfileIgmpProxyProtocolVersion OBJECT-TYPE + SYNTAX INTEGER + { + useGlobalIgmpSettings(1), + igmpv2(2), + igmpv3(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IGMP version of IGMP message sent by Proxy in downstream direction." + DEFVAL { useGlobalIgmpSettings } + ::= { msanMulticastProfileEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.1.1.15 + msanMulticastProfileUsage OBJECT-TYPE + SYNTAX INTEGER + { + attached(1), + notAttached(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Profile usage. + If profile is attached, profile values can't be edited." + ::= { msanMulticastProfileEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.2 + msanMulticastProfileStaticGroupTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMulticastProfileStaticGroupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Connection between + multicast_profile and multicast_static_group table " + ::= { msanMulticastProfile 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.2.1 + msanMulticastProfileStaticGroupEntry OBJECT-TYPE + SYNTAX MsanMulticastProfileStaticGroupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Multicast Profile Group table entry." + INDEX { msanMulticastProfileName, msanMulticastProfileStaticGroupIpAddr } + ::= { msanMulticastProfileStaticGroupTable 1 } + + + MsanMulticastProfileStaticGroupEntry ::= + SEQUENCE { + msanMulticastProfileStaticGroupIpAddr + IpAddress, + msanMulticastProfileStaticGroupRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.2.1.1 + msanMulticastProfileStaticGroupIpAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanMulticastProfileStaticGroupEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.5.2.1.9 + msanMulticastProfileStaticGroupRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanMulticastProfileStaticGroupEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6 + msanSecurityProfile OBJECT IDENTIFIER ::= { msanProfiles 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1 + msanSecurityProfileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanSecurityProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Security Profile table " + ::= { msanSecurityProfile 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1 + msanSecurityProfileEntry OBJECT-TYPE + SYNTAX MsanSecurityProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Security Profile table entry." + INDEX { msanSecurityProfileName } + ::= { msanSecurityProfileTable 1 } + + + MsanSecurityProfileEntry ::= + SEQUENCE { + msanSecurityProfileName + DisplayString, + msanSecurityProfileProtection + INTEGER, + msanSecurityProfileStatus + INTEGER, + msanSecurityProfileProtectedPort + INTEGER, + msanSecurityProfileMacSg + INTEGER, + msanSecurityProfileMacLimit + Unsigned32, + msanSecurityProfilePortSecurity + INTEGER, + msanSecurityProfileIpSg + INTEGER, + msanSecurityProfileIpSgBindingLimit + Unsigned32, + msanSecurityProfileIpSgFilteringMode + INTEGER, + msanSecurityProfileArpInspec + INTEGER, + msanSecurityProfileMacForward + INTEGER, + msanSecurityProfileDescription + DisplayString, + msanSecurityProfileRowStatus + RowStatus, + msanSecurityProfileIpSgIpv6 + INTEGER, + msanSecurityProfileIpSgBindingLimitDhcpv6 + Unsigned32, + msanSecurityProfileIpSgBindingLimitND + Unsigned32, + msanSecurityProfileStormControlBroadcast + Integer32, + msanSecurityProfileStormControlMulticast + Integer32, + msanSecurityProfileStormControlUnicast + Integer32, + msanSecurityProfileAppRateLimitDhcp + Integer32, + msanSecurityProfileAppRateLimitIgmp + Integer32, + msanSecurityProfileAppRateLimitPppoe + Integer32, + msanSecurityProfileAppRateLimitStp + Integer32, + msanSecurityProfileAppRateLimitMn + Integer32, + msanSecurityProfileUsage + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.1 + msanSecurityProfileName OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..32)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Name of the security profile." + ::= { msanSecurityProfileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.2 + msanSecurityProfileProtection OBJECT-TYPE + SYNTAX INTEGER + { + unprotected(0), + protected(1) + } + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "If protection flag is set to protected (1), other profile values cannot be edited. + + Protection flag is always protected (1) and it can't be changed if profile is assigned as dynamic: + msanSecurityProfileStatus = dynamic(2)" + DEFVAL { unprotected } + ::= { msanSecurityProfileEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.3 + msanSecurityProfileStatus OBJECT-TYPE + SYNTAX INTEGER + { + static(1), + dynamic(2) + } + MAX-ACCESS read-only + STATUS obsolete + DESCRIPTION + "Profile status. + If status is dynamic, profile values can't be edited." + ::= { msanSecurityProfileEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.4 + msanSecurityProfileProtectedPort OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Security profile protected port" + DEFVAL { disable } + ::= { msanSecurityProfileEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.5 + msanSecurityProfileMacSg OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Mac source guard" + DEFVAL { disable } + ::= { msanSecurityProfileEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.6 + msanSecurityProfileMacLimit OBJECT-TYPE + SYNTAX Unsigned32 (0..64) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "MAC limit + A value of 0 indicates that parameter has not been defined." + DEFVAL { 0 } + ::= { msanSecurityProfileEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.7 + msanSecurityProfilePortSecurity OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Port security" + DEFVAL { disable } + ::= { msanSecurityProfileEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.8 + msanSecurityProfileIpSg OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IP source guard" + DEFVAL { disable } + ::= { msanSecurityProfileEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.9 + msanSecurityProfileIpSgBindingLimit OBJECT-TYPE + SYNTAX Unsigned32 (0..15) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IP source guard binding limit. + Value 0 defines there is no limit. + " + DEFVAL { 4 } + ::= { msanSecurityProfileEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.10 + msanSecurityProfileIpSgFilteringMode OBJECT-TYPE + SYNTAX INTEGER + { + ipSourceAddress(1), + ipAndMacSourceAddress(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IP source guard filtering mode" + DEFVAL { ipAndMacSourceAddress } + ::= { msanSecurityProfileEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.12 + msanSecurityProfileArpInspec OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Dynamic ARP inspection" + DEFVAL { disable } + ::= { msanSecurityProfileEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.13 + msanSecurityProfileMacForward OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "MAC forwarding" + DEFVAL { disable } + ::= { msanSecurityProfileEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.14 + msanSecurityProfileDescription OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Attribute specifies text which describes the associated object." + ::= { msanSecurityProfileEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.15 + msanSecurityProfileRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanSecurityProfileEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.16 + msanSecurityProfileIpSgIpv6 OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IPv6 source guard" + DEFVAL { disable } + ::= { msanSecurityProfileEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.17 + msanSecurityProfileIpSgBindingLimitDhcpv6 OBJECT-TYPE + SYNTAX Unsigned32 (0..15) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IPSG binding limit for DHCPv6 (IPv6 DHCP). + Value 0 defines there is no limit. + " + DEFVAL { 4 } + ::= { msanSecurityProfileEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.18 + msanSecurityProfileIpSgBindingLimitND OBJECT-TYPE + SYNTAX Unsigned32 (0..15) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IPSG binding limit for ND (IPv6 Neighbor Discovery). + Value 0 defines there is no limit. + " + DEFVAL { 4 } + ::= { msanSecurityProfileEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.19 + msanSecurityProfileStormControlBroadcast OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + UNITS "pps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Max data rate (pps) of broadcast packets on port at which storm control drops them. + Value -1 defines that functionality is disabled." + DEFVAL { -1 } + ::= { msanSecurityProfileEntry 19 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.20 + msanSecurityProfileStormControlMulticast OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + UNITS "pps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Max data rate (pps) of multicast packets on port at which storm control drops them. + Value -1 defines that functionality is disabled." + DEFVAL { -1 } + ::= { msanSecurityProfileEntry 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.21 + msanSecurityProfileStormControlUnicast OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + UNITS "pps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Max data rate (pps) of unicast packets on port at which storm control drops them. + Value -1 defines that functionality is disabled." + DEFVAL { -1 } + ::= { msanSecurityProfileEntry 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.22 + msanSecurityProfileAppRateLimitDhcp OBJECT-TYPE + SYNTAX Integer32 (-1..1000) + UNITS "pps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Max data rate (pps) of DHCP packets on port at which application rate limit drops them. + Value -1 defines that functionality is disabled. + " + DEFVAL { -1 } + ::= { msanSecurityProfileEntry 22 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.23 + msanSecurityProfileAppRateLimitIgmp OBJECT-TYPE + SYNTAX Integer32 (-1..1000) + UNITS "pps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Max data rate (pps) of IGMP packets on port at which application rate limit drops them. + Value -1 defines that functionality is disabled. + " + DEFVAL { -1 } + ::= { msanSecurityProfileEntry 23 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.24 + msanSecurityProfileAppRateLimitPppoe OBJECT-TYPE + SYNTAX Integer32 (-1..1000) + UNITS "pps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Max data rate (pps) of PPPoE packets on port at which application rate limit drops them. + Value -1 defines that functionality is disabled. + " + DEFVAL { -1 } + ::= { msanSecurityProfileEntry 24 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.25 + msanSecurityProfileAppRateLimitStp OBJECT-TYPE + SYNTAX Integer32 (-1..1000) + UNITS "pps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Max data rate (pps) of STP packets on port at which application rate limit drops them. + Value -1 defines that functionality is disabled. + " + DEFVAL { -1 } + ::= { msanSecurityProfileEntry 25 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.26 + msanSecurityProfileAppRateLimitMn OBJECT-TYPE + SYNTAX Integer32 (-1..1000) + UNITS "pps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Max data rate (pps) of IP packets on MN CPU port at which application rate limit drops them. + Value -1 defines that functionality is disabled. + " + DEFVAL { -1 } + ::= { msanSecurityProfileEntry 26 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.1.1.27 + msanSecurityProfileUsage OBJECT-TYPE + SYNTAX INTEGER + { + attached(1), + notAttached(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Profile usage. + If profile is attached, profile values can't be edited." + ::= { msanSecurityProfileEntry 27 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.3 + msanSecurityAclProfileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanSecurityAclProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A connection between security profiles and access lists" + ::= { msanSecurityProfile 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.3.1 + msanSecurityAclProfileEntry OBJECT-TYPE + SYNTAX MsanSecurityAclProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Service Profile Port table entry." + INDEX { msanSecurityProfileName, msanSecurityAclProfileAclDirection, msanSecurityAclProfileSequence, msanSecurityAclProfileAclType, msanSecurityAclProfileAclId + } + ::= { msanSecurityAclProfileTable 1 } + + + MsanSecurityAclProfileEntry ::= + SEQUENCE { + msanSecurityAclProfileAclDirection + INTEGER, + msanSecurityAclProfileSequence + Unsigned32, + msanSecurityAclProfileAclType + INTEGER, + msanSecurityAclProfileAclId + Unsigned32, + msanSecurityAclProfileRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.3.1.1 + msanSecurityAclProfileAclDirection OBJECT-TYPE + SYNTAX INTEGER + { + inbound(1), + outbound(2) + } + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The direction to which this ACL instance applies." + ::= { msanSecurityAclProfileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.3.1.2 + msanSecurityAclProfileSequence OBJECT-TYPE + SYNTAX Unsigned32 (1..2147483647) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The relative evaluation sequence of this ACL for this + interface and direction. When multiple ACLs are allowed + for a given interface and direction, the sequence number + determines the order in which the list of ACLs are evaluated, + with lower sequence numbers given higher precedence. The + sequence number value is arbitrary, but must be a unique + non-zero value for a given interface and direction. + + Setting this object to an existing sequence number + value for a given interface and direction causes the + ACL corresponding to that value to be replaced with this ACL." + ::= { msanSecurityAclProfileEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.3.1.3 + msanSecurityAclProfileAclType OBJECT-TYPE + SYNTAX INTEGER + { + ip(1), + mac(2) + } + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The type of this ACL, which is used to interpret the + aclIfId object value." + ::= { msanSecurityAclProfileEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.3.1.4 + msanSecurityAclProfileAclId OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The ACL identifier value. + For the IP ACLs, the actual ACL number is its identifier + as follows: IP standard ranges from 1-99, IP extended + ranges from 100-199, and IP advanced ranges 200-299." + ::= { msanSecurityAclProfileEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.6.3.1.5 + msanSecurityAclProfileRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanSecurityAclProfileEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7 + msanL2cpProfile OBJECT IDENTIFIER ::= { msanProfiles 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.1 + msanL2cpProfileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanL2cpProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "L2CP (Layer 2 Control Protocol) Profile table " + ::= { msanL2cpProfile 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.1.1 + msanL2cpProfileEntry OBJECT-TYPE + SYNTAX MsanL2cpProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "L2cp Profile table entry." + INDEX { msanL2cpProfileName } + ::= { msanL2cpProfileTable 1 } + + + MsanL2cpProfileEntry ::= + SEQUENCE { + msanL2cpProfileName + DisplayString, + msanL2cpProfileProtection + INTEGER, + msanL2cpProfileStatus + INTEGER, + msanL2cpProfileDescription + DisplayString, + msanL2cpProfileRowStatus + RowStatus, + msanL2cpProfileUsage + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.1.1.1 + msanL2cpProfileName OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..32)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Name of the L2CP profile." + ::= { msanL2cpProfileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.1.1.2 + msanL2cpProfileProtection OBJECT-TYPE + SYNTAX INTEGER + { + unprotected(0), + protected(1) + } + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "If protection flag is set to protected (1), other profile values cannot be edited. + + Protection flag is always protected (1) and it can't be changed if profile is assigned as dynamic: + msanL2cpProfileStatus = dynamic(2)" + DEFVAL { unprotected } + ::= { msanL2cpProfileEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.1.1.3 + msanL2cpProfileStatus OBJECT-TYPE + SYNTAX INTEGER + { + static(1), + dynamic(2) + } + MAX-ACCESS read-only + STATUS obsolete + DESCRIPTION + "Profile status. + If status is dynamic, profile values can't be edited." + ::= { msanL2cpProfileEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.1.1.4 + msanL2cpProfileDescription OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Attribute specifies text which describes the associated object." + ::= { msanL2cpProfileEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.1.1.5 + msanL2cpProfileRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanL2cpProfileEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.1.1.6 + msanL2cpProfileUsage OBJECT-TYPE + SYNTAX INTEGER + { + attached(1), + notAttached(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Profile usage. + If profile is attached, profile values can't be edited." + ::= { msanL2cpProfileEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.2 + msanL2cpProtocolTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanL2cpProtocolEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Table with list of L2CP protocols" + ::= { msanL2cpProfile 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.2.1 + msanL2cpProtocolEntry OBJECT-TYPE + SYNTAX MsanL2cpProtocolEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanL2cpProtocolName } + ::= { msanL2cpProtocolTable 1 } + + + MsanL2cpProtocolEntry ::= + SEQUENCE { + msanL2cpProtocolName + DisplayString, + msanL2cpProtocolMacDestAddr + MacAddress, + msanL2cpProtocolEthertype + Integer32, + msanL2cpProtocolSubtype + Integer32, + msanL2cpProtocolRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.2.1.1 + msanL2cpProtocolName OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..32)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "L2CP protocol name" + ::= { msanL2cpProtocolEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.2.1.2 + msanL2cpProtocolMacDestAddr OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "MAC destination address of L2CP protocol. + Empty string indicates that protocol is related to any MAC address." + DEFVAL { ''b } + ::= { msanL2cpProtocolEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.2.1.3 + msanL2cpProtocolEthertype OBJECT-TYPE + SYNTAX Integer32 (0..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "L2CP protocol Ethertype. + A value of 65535 indicates that parameter has not been defined." + DEFVAL { 65535 } + ::= { msanL2cpProtocolEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.2.1.4 + msanL2cpProtocolSubtype OBJECT-TYPE + SYNTAX Integer32 (0..255) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "L2CP protocol subtype. + A value of 255 indicates that parameter has not been defined." + DEFVAL { 255 } + ::= { msanL2cpProtocolEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.2.1.5 + msanL2cpProtocolRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5). + Value active(1) will activate and value destroy(6) will remove this entry. + Other values are currently not supported." + ::= { msanL2cpProtocolEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.3 + msanL2cpProfileProtocolTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanL2cpProfileProtocolEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Table with connection between profiles and protocols" + ::= { msanL2cpProfile 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.3.1 + msanL2cpProfileProtocolEntry OBJECT-TYPE + SYNTAX MsanL2cpProfileProtocolEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanL2cpProfileName, msanL2cpProtocolName } + ::= { msanL2cpProfileProtocolTable 1 } + + + MsanL2cpProfileProtocolEntry ::= + SEQUENCE { + msanL2cpProfileProtocolRule + INTEGER, + msanL2cpProfileProtocolRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.3.1.1 + msanL2cpProfileProtocolRule OBJECT-TYPE + SYNTAX INTEGER + { + discard(1), + peer(2), + tunnel(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "L2CP protocol rule." + ::= { msanL2cpProfileProtocolEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.3.1.2 + msanL2cpProfileProtocolRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5). + Value active(1) will activate and value destroy(6) will remove this entry. + Other values are currently not supported. + + Row can be activated only when msanL2cpProfileProtocolRule is set." + ::= { msanL2cpProfileProtocolEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.4 + msanL2cpProfileVlanTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanL2cpProfileVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Table is used for connecting l2cp profile with vlan_id." + ::= { msanL2cpProfile 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.4.1 + msanL2cpProfileVlanEntry OBJECT-TYPE + SYNTAX MsanL2cpProfileVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanL2cpProfileName, dot1qVlanIndex } + ::= { msanL2cpProfileVlanTable 1 } + + + MsanL2cpProfileVlanEntry ::= + SEQUENCE { + msanL2cpProfileVlanRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.7.4.1.1 + msanL2cpProfileVlanRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanL2cpProfileVlanEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.8 + msanXdslProfile OBJECT IDENTIFIER ::= { msanProfiles 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.8.1 + msanXdsl2LineConfTemplateTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanXdsl2LineConfTemplateEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanXdslProfile 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.8.1.1 + msanXdsl2LineConfTemplateEntry OBJECT-TYPE + SYNTAX MsanXdsl2LineConfTemplateEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + AUGMENTS { xdsl2LineConfTemplateEntry } + ::= { msanXdsl2LineConfTemplateTable 1 } + + + MsanXdsl2LineConfTemplateEntry ::= + SEQUENCE { + msanXdsl2LineConfTempProtection + INTEGER, + msanXdsl2LineConfTempStatus + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.8.1.1.1 + msanXdsl2LineConfTempProtection OBJECT-TYPE + SYNTAX INTEGER + { + unprotected(0), + protected(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "If protection flag is set to protected (1), other profile values cannot be edited. + + Protection flag is always protected (1) and it can't be changed if profile is assigned as dynamic: + msanAclProfileStatus = dynamic(2)" + DEFVAL { unprotected } + ::= { msanXdsl2LineConfTemplateEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.8.1.1.2 + msanXdsl2LineConfTempStatus OBJECT-TYPE + SYNTAX INTEGER + { + static(1), + dynamic(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Profile status. + If status is dynamic, profile values can't be edited." + ::= { msanXdsl2LineConfTemplateEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.8.2 + msanXdsl2LineAlarmConfTemplateTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanXdsl2LineAlarmConfTemplateEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanXdslProfile 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.8.2.1 + msanXdsl2LineAlarmConfTemplateEntry OBJECT-TYPE + SYNTAX MsanXdsl2LineAlarmConfTemplateEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + AUGMENTS { xdsl2LineAlarmConfTemplateEntry } + ::= { msanXdsl2LineAlarmConfTemplateTable 1 } + + + MsanXdsl2LineAlarmConfTemplateEntry ::= + SEQUENCE { + msanXdsl2LineAlarmConfTempProtection + INTEGER, + msanXdsl2LineAlarmConfTempStatus + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.8.2.1.1 + msanXdsl2LineAlarmConfTempProtection OBJECT-TYPE + SYNTAX INTEGER + { + unprotected(0), + protected(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "If protection flag is set to protected (1), other profile values cannot be edited. + + Protection flag is always protected (1) and it can't be changed if profile is assigned as dynamic: + msanAclProfileStatus = dynamic(2)" + DEFVAL { unprotected } + ::= { msanXdsl2LineAlarmConfTemplateEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.8.2.1.2 + msanXdsl2LineAlarmConfTempStatus OBJECT-TYPE + SYNTAX INTEGER + { + static(1), + dynamic(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Profile status. + If status is dynamic, profile values can't be edited." + ::= { msanXdsl2LineAlarmConfTemplateEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.20 + msanOnuFlowProfile OBJECT IDENTIFIER ::= { msanProfiles 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.20.1 + msanOnuFlowProfileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuFlowProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOnuFlowProfile 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.20.1.1 + msanOnuFlowProfileEntry OBJECT-TYPE + SYNTAX MsanOnuFlowProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOnuFlowProfileName } + ::= { msanOnuFlowProfileTable 1 } + + + MsanOnuFlowProfileEntry ::= + SEQUENCE { + msanOnuFlowProfileName + DisplayString, + msanOnuFlowProfileMatchUsCVlanIdRange + OCTET STRING, + msanOnuFlowProfileMatchUsCPcp + Integer32, + msanOnuFlowProfileUsCdr + Integer32, + msanOnuFlowProfileUsPdr + Integer32, + msanOnuFlowProfileUsFlowPriority + INTEGER, + msanOnuFlowProfileDsFlowPriority + INTEGER, + msanOnuFlowProfileRowStatus + RowStatus, + msanOnuFlowProfileUsage + INTEGER, + msanOnuFlowProfileDsOnuScheduling + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.20.1.1.1 + msanOnuFlowProfileName OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..64)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ONU Flow Profile Name." + ::= { msanOnuFlowProfileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.20.1.1.10 + msanOnuFlowProfileMatchUsCVlanIdRange OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..512)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match ONU upstream packet frame with specified list (bitmask) of Customer VLAN Id. + An empty string indicates that parameter has not been defined." + DEFVAL { ''b } + ::= { msanOnuFlowProfileEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.20.1.1.11 + msanOnuFlowProfileMatchUsCPcp OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match ONU upstream packet frame with specified Customer PCP (Priority Code Point) - + PCP is also known as class of service (CoS) bits. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanOnuFlowProfileEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.20.1.1.12 + msanOnuFlowProfileUsCdr OBJECT-TYPE + SYNTAX Integer32 (128..2500000) + UNITS "kbps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU upstream committed data rate (E-CDR) in kbps. + Any rate value can be entered, but is rounded up to the multiple of 64 kbps. + + Limitation: Commited rate cannot be higher than peak rate." + ::= { msanOnuFlowProfileEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.20.1.1.13 + msanOnuFlowProfileUsPdr OBJECT-TYPE + SYNTAX Integer32 (128..2500000) + UNITS "kbps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU upstream peak data rate (E-PDR) in kbps. + Any rate value can be entered, but is rounded up to the multiple of 64 kbps. + + Limitation: Peak rate cannot be lower than guaranteed rate." + ::= { msanOnuFlowProfileEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.20.1.1.14 + msanOnuFlowProfileUsFlowPriority OBJECT-TYPE + SYNTAX INTEGER (0..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU upstream flow priority ." + ::= { msanOnuFlowProfileEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.20.1.1.15 + msanOnuFlowProfileDsFlowPriority OBJECT-TYPE + SYNTAX INTEGER (0..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU downstream flow priority ." + ::= { msanOnuFlowProfileEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.20.1.1.50 + msanOnuFlowProfileRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanOnuFlowProfileEntry 50 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.20.1.1.51 + msanOnuFlowProfileUsage OBJECT-TYPE + SYNTAX INTEGER + { + attached(1), + notAttached(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Profile usage. + If profile is attached, profile values can't be edited." + ::= { msanOnuFlowProfileEntry 51 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.20.1.1.52 + msanOnuFlowProfileDsOnuScheduling OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU downstream onu scheduling" + DEFVAL { disable } + ::= { msanOnuFlowProfileEntry 52 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21 + msanOnuVlanProfile OBJECT IDENTIFIER ::= { msanProfiles 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.1 + msanOnuVlanProfileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuVlanProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "description" + ::= { msanOnuVlanProfile 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.1.1 + msanOnuVlanProfileEntry OBJECT-TYPE + SYNTAX MsanOnuVlanProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Row Description" + INDEX { msanOnuVlanProfileName } + ::= { msanOnuVlanProfileTable 1 } + + + MsanOnuVlanProfileEntry ::= + SEQUENCE { + msanOnuVlanProfileName + DisplayString, + msanOnuVlanProfileDownstreamMode + INTEGER, + msanOnuVlanProfileInputTPID + Unsigned32, + msanOnuVlanProfileOutputTPID + Unsigned32, + msanOnuVlanProfileRowStatus + RowStatus, + msanOnuVlanProfileUsage + INTEGER, + msanOnuVlanProfileDscpPcpMap + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.1.1.1 + msanOnuVlanProfileName OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..64)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ONU Vlan Profile Name." + ::= { msanOnuVlanProfileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.1.1.2 + msanOnuVlanProfileDownstreamMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Enable maping in downstream direction also. + + When enabled, downstream tagging operation is performed + in inverse order of that in upstream direction. + + When disabled, all downstream frames are forwarded unmodified." + DEFVAL { enable } + ::= { msanOnuVlanProfileEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.1.1.3 + msanOnuVlanProfileInputTPID OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Input TPID (Tag Protocol Identifier). + Default value is 0x8100." + DEFVAL { '8100'h } + ::= { msanOnuVlanProfileEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.1.1.4 + msanOnuVlanProfileOutputTPID OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Output TPID (Tag Protocol Identifier). + Default value is 0x88A8." + DEFVAL { '88A8'h } + ::= { msanOnuVlanProfileEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.1.1.50 + msanOnuVlanProfileRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanOnuVlanProfileEntry 50 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.1.1.51 + msanOnuVlanProfileUsage OBJECT-TYPE + SYNTAX INTEGER + { + attached(1), + notAttached(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Profile usage. + If profile is attached, profile values can't be edited." + ::= { msanOnuVlanProfileEntry 51 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.1.1.52 + msanOnuVlanProfileDscpPcpMap OBJECT-TYPE + SYNTAX INTEGER + { + disable(1), + ipPrecedenceToPcp(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DSCP to PCP mapping" + DEFVAL { disable } + ::= { msanOnuVlanProfileEntry 52 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2 + msanOnuVlanProfileRuleTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuVlanProfileRuleEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "description" + ::= { msanOnuVlanProfile 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1 + msanOnuVlanProfileRuleEntry OBJECT-TYPE + SYNTAX MsanOnuVlanProfileRuleEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Row Description" + INDEX { msanOnuVlanProfileName, msanOnuVlanProfileRuleId } + ::= { msanOnuVlanProfileRuleTable 1 } + + + MsanOnuVlanProfileRuleEntry ::= + SEQUENCE { + msanOnuVlanProfileRuleId + Integer32, + msanOnuVlanProfileRuleMatchSVlanId + Integer32, + msanOnuVlanProfileRuleMatchSPcp + Integer32, + msanOnuVlanProfileRuleMatchSTPID + INTEGER, + msanOnuVlanProfileRuleMatchCVlanId + Integer32, + msanOnuVlanProfileRuleMatchCPcp + Integer32, + msanOnuVlanProfileRuleMatchCTPID + INTEGER, + msanOnuVlanProfileRuleMatchEthertype + INTEGER, + msanOnuVlanProfileRuleRemoveTags + INTEGER, + msanOnuVlanProfileRuleAddSTag + INTEGER, + msanOnuVlanProfileRuleAddSPcp + INTEGER, + msanOnuVlanProfileRuleAddSVlanId + Integer32, + msanOnuVlanProfileRuleAddSTPID + INTEGER, + msanOnuVlanProfileRuleAddCTag + INTEGER, + msanOnuVlanProfileRuleAddCPcp + INTEGER, + msanOnuVlanProfileRuleAddCVlanId + Integer32, + msanOnuVlanProfileRuleAddCTPID + INTEGER, + msanOnuVlanProfileRuleRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1.1 + msanOnuVlanProfileRuleId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ONU Vlan Rule Index." + ::= { msanOnuVlanProfileRuleEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1.4 + msanOnuVlanProfileRuleMatchSVlanId OBJECT-TYPE + SYNTAX Integer32 (-1..4096) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match frames with selected S-VLAN (outer) ID: + 0 .. 4094 Match received frames with this S-VLAN ID. + 4096 Match received frames without S-TAG. + -1 Do not match by S-VLAN ID (Default). + " + DEFVAL { 4096 } + ::= { msanOnuVlanProfileRuleEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1.5 + msanOnuVlanProfileRuleMatchSPcp OBJECT-TYPE + SYNTAX Integer32 (-1..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match frames with selected S-PCP (outer) value: + 0..7 Match received frames on this S-PCP priority (P bit) value. + -1 Do not match on S-PCP (default). + " + DEFVAL { -1 } + ::= { msanOnuVlanProfileRuleEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1.6 + msanOnuVlanProfileRuleMatchSTPID OBJECT-TYPE + SYNTAX INTEGER + { + do-not-match(0), + match-value-8100(1), + match-input-tpid(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match frames with selected S-TPID (outer): + 0 do not match on S-TPID + 1 match on S-TPID value 0x8100 + 2 match on value of parameter msanOnuVlanProfileInputTPID" + DEFVAL { do-not-match } + ::= { msanOnuVlanProfileRuleEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1.7 + msanOnuVlanProfileRuleMatchCVlanId OBJECT-TYPE + SYNTAX Integer32 (-1..4096) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match frames with selected C-VLAN (inner) ID: + 0 .. 4094 Match received frames with this C-VLAN ID. + 4096 Match received frames without C-TAG. + -1 Do not match by C-VLAN ID (Default). + " + DEFVAL { 4096 } + ::= { msanOnuVlanProfileRuleEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1.8 + msanOnuVlanProfileRuleMatchCPcp OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match frames with selected C-PCP (inner) value: + 0..7 Match received frames on this C-PCP priority (P bit) value. + -1 Do not match on C-PCP (default). + " + ::= { msanOnuVlanProfileRuleEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1.9 + msanOnuVlanProfileRuleMatchCTPID OBJECT-TYPE + SYNTAX INTEGER + { + do-not-match(0), + match-value-8100(1), + match-input-tpid(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match frames with selected C-TPID (inner): + 0 do not match on C-TPID + 1 match on C-TPID value 0x8100 + 2 match on value of parameter msanOnuVlanProfileInputTPID" + DEFVAL { do-not-match } + ::= { msanOnuVlanProfileRuleEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1.11 + msanOnuVlanProfileRuleMatchEthertype OBJECT-TYPE + SYNTAX INTEGER + { + do-not-match(0), + ipoe(1), + pppoe(2), + arp(3), + ipv6(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match frames with selected Ethertype value. + Standard values: + IPoE(1) 0x0800 + PPPoE(2) 0x8863 or 0x8864 + ARP(3) 0x0806 + IPv6(4) 0x86DD + + A value 0 indicates that parameter is not used for match criteria. + + " + DEFVAL { do-not-match } + ::= { msanOnuVlanProfileRuleEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1.12 + msanOnuVlanProfileRuleRemoveTags OBJECT-TYPE + SYNTAX INTEGER + { + do-not-remove(1), + remove-outer(2), + remove-both(3), + discard-frame(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "VLAN tags to remove. + " + DEFVAL { do-not-remove } + ::= { msanOnuVlanProfileRuleEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1.13 + msanOnuVlanProfileRuleAddSTag OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Add a S-TAG." + DEFVAL { disable } + ::= { msanOnuVlanProfileRuleEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1.14 + msanOnuVlanProfileRuleAddSPcp OBJECT-TYPE + SYNTAX INTEGER (0..10) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set priority in added S-TAG: + 0..7 insert this priority value to the S-TAG + 8 copy the C-TAG priority value of the received frame. + 9 copy the S-TAG priority value of the received frame. + 10 copy the DSCP value of the received frame." + DEFVAL { 0 } + ::= { msanOnuVlanProfileRuleEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1.15 + msanOnuVlanProfileRuleAddSVlanId OBJECT-TYPE + SYNTAX Integer32 (0..4097) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set VID in added S-TAG: + 000..4094 Use this value as the VID in the added S-TAG. + 4096 copy the C-VID value of the received frame. + 4097 copy the S-VID value of the received frame. + + " + DEFVAL { 0 } + ::= { msanOnuVlanProfileRuleEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1.16 + msanOnuVlanProfileRuleAddSTPID OBJECT-TYPE + SYNTAX INTEGER + { + set-value-0x8100(1), + use-output-tpid(2), + copy-c-tpid(3), + copy-s-tpid(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set TPID in added S-TAG: + 0 do not change (use default value) + 1 set to value 0x8100 + 2 copy the value of parameter msanOnuVlanProfileOutputTPID + 3 copy the C-TPID value of the received frame. + 4 copy the S-TPID value of the received frame. + + " + DEFVAL { copy-c-tpid } + ::= { msanOnuVlanProfileRuleEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1.17 + msanOnuVlanProfileRuleAddCTag OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Add a S-TAG. + " + DEFVAL { disable } + ::= { msanOnuVlanProfileRuleEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1.18 + msanOnuVlanProfileRuleAddCPcp OBJECT-TYPE + SYNTAX INTEGER (0..10) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set priority in added C-TAG: + 0..7 insert this priority value to the C-TAG + 8 copy the C-TAG priority value of the received frame. + 9 copy the S-TAG priority value of the received frame. + 10 copy the DSCP value of the received frame." + DEFVAL { 0 } + ::= { msanOnuVlanProfileRuleEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1.19 + msanOnuVlanProfileRuleAddCVlanId OBJECT-TYPE + SYNTAX Integer32 (0..4097) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set VID in added C-TAG: + 000..4094 Use this value as the VID in the added C-TAG. + 4096 copy the C-VID value of the received frame. + 4097 copy the S-VID value of the received frame. + + " + DEFVAL { 0 } + ::= { msanOnuVlanProfileRuleEntry 19 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1.20 + msanOnuVlanProfileRuleAddCTPID OBJECT-TYPE + SYNTAX INTEGER + { + set-value-0x8100(1), + use-output-tpid(2), + copy-c-tpid(3), + copy-s-tpid(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set TPID in added S-TAG: + 0 do not change (use default value) + 1 set to value 0x8100 + 2 copy the value of parameter msanOnuVlanProfileOutputTPID + 3 copy the C-TPID value of the received frame. + 4 copy the S-TPID value of the received frame. + + " + DEFVAL { copy-c-tpid } + ::= { msanOnuVlanProfileRuleEntry 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.21.2.1.50 + msanOnuVlanProfileRuleRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5). + For row activation use active(1). + For row deletion use destroy(6) ). + + Other values are currently not supported." + ::= { msanOnuVlanProfileRuleEntry 50 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.22 + msanOnuMulticastProfile OBJECT IDENTIFIER ::= { msanProfiles 22 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.22.1 + msanOnuMulticastProfileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuMulticastProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOnuMulticastProfile 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.22.1.1 + msanOnuMulticastProfileEntry OBJECT-TYPE + SYNTAX MsanOnuMulticastProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOnuMulticastProfileName } + ::= { msanOnuMulticastProfileTable 1 } + + + MsanOnuMulticastProfileEntry ::= + SEQUENCE { + msanOnuMulticastProfileName + DisplayString, + msanOnuMulticastProfileIgmpMode + INTEGER, + msanOnuMulticastProfileIgmpProxy + INTEGER, + msanOnuMulticastProfileIgmpSnoopingFastLeave + INTEGER, + msanOnuMulticastProfileUsIgmpTciVlanId + INTEGER, + msanOnuMulticastProfileUsIgmpTciPcpValue + Integer32, + msanOnuMulticastProfileUsIgmpTciCtrlMode + INTEGER, + msanOnuMulticastProfileDsVlanTagging + INTEGER, + msanOnuMulticastProfileDsGemPort + Integer32, + msanOnuMulticastProfileRowStatus + RowStatus, + msanOnuMulticastProfileUsage + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.22.1.1.1 + msanOnuMulticastProfileName OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..64)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ONU Multicast Profile Name." + ::= { msanOnuMulticastProfileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.22.1.1.10 + msanOnuMulticastProfileIgmpMode OBJECT-TYPE + SYNTAX INTEGER + { + flooding(1), + snooping(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU IGMP Mode." + DEFVAL { flooding } + ::= { msanOnuMulticastProfileEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.22.1.1.11 + msanOnuMulticastProfileIgmpProxy OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU IGMP Proxy admin state." + DEFVAL { disable } + ::= { msanOnuMulticastProfileEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.22.1.1.12 + msanOnuMulticastProfileIgmpSnoopingFastLeave OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU IGMP Snooping Fast Leave admin state." + DEFVAL { enable } + ::= { msanOnuMulticastProfileEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.22.1.1.13 + msanOnuMulticastProfileUsIgmpTciVlanId OBJECT-TYPE + SYNTAX INTEGER (0..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU Upstream IGMP TCI (Tag Control Information) VLAN ID. + + Value 0 means that parameter is not defined." + ::= { msanOnuMulticastProfileEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.22.1.1.14 + msanOnuMulticastProfileUsIgmpTciPcpValue OBJECT-TYPE + SYNTAX Integer32 (-1..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU Upstream IGMP TCI (Tag Control Information) PCP (Priority Code Point) value (0-7) = CoS. + " + DEFVAL { 0 } + ::= { msanOnuMulticastProfileEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.22.1.1.15 + msanOnuMulticastProfileUsIgmpTciCtrlMode OBJECT-TYPE + SYNTAX INTEGER + { + transparent(1), + add(2), + replace(3), + replace-vid-only(4), + smart(5) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU Upstream IGMP TCI (Tag Control Information) Control mode." + DEFVAL { smart } + ::= { msanOnuMulticastProfileEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.22.1.1.16 + msanOnuMulticastProfileDsVlanTagging OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU Downstream tagging of multicast traffic." + ::= { msanOnuMulticastProfileEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.22.1.1.17 + msanOnuMulticastProfileDsGemPort OBJECT-TYPE + SYNTAX Integer32 (3800..4000) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Downstream multicast GEM port number. + Standard values are 3800 - 3999. + Default value is 4000 (Undefined)." + DEFVAL { 4000 } + ::= { msanOnuMulticastProfileEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.22.1.1.50 + msanOnuMulticastProfileRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanOnuMulticastProfileEntry 50 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.22.1.1.51 + msanOnuMulticastProfileUsage OBJECT-TYPE + SYNTAX INTEGER + { + attached(1), + notAttached(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Profile usage. + If profile is attached, profile values can't be edited." + ::= { msanOnuMulticastProfileEntry 51 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.23 + msanOnuTcontProfile OBJECT IDENTIFIER ::= { msanProfiles 23 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.23.1 + msanOnuTcontProfileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuTcontProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOnuTcontProfile 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.23.1.1 + msanOnuTcontProfileEntry OBJECT-TYPE + SYNTAX MsanOnuTcontProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOnuTcontProfileName } + ::= { msanOnuTcontProfileTable 1 } + + + MsanOnuTcontProfileEntry ::= + SEQUENCE { + msanOnuTcontProfileName + DisplayString, + msanOnuTcontProfileTcontId + INTEGER, + msanOnuTcontProfileTcontType + INTEGER, + msanOnuTcontProfileFixedDataRate + Integer32, + msanOnuTcontProfileAssuredDataRate + Integer32, + msanOnuTcontProfileMaxDataRate + Integer32, + msanOnuTcontProfileRowStatus + RowStatus, + msanOnuTcontProfileUsage + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.23.1.1.1 + msanOnuTcontProfileName OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..64)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ONU T-CONT Profile Name." + ::= { msanOnuTcontProfileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.23.1.1.10 + msanOnuTcontProfileTcontId OBJECT-TYPE + SYNTAX INTEGER (1..8) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU T-CONT index." + DEFVAL { 1 } + ::= { msanOnuTcontProfileEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.23.1.1.11 + msanOnuTcontProfileTcontType OBJECT-TYPE + SYNTAX INTEGER (1..5) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU T-CONT type." + DEFVAL { 5 } + ::= { msanOnuTcontProfileEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.23.1.1.12 + msanOnuTcontProfileFixedDataRate OBJECT-TYPE + SYNTAX Integer32 (128..2500000) + UNITS "kbps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU T-CONT Fixed data rate. + Any rate value can be entered, but is rounded up to the multiple of 64 kbps. + + Limitation: Maximum rate cannot be lower than the sum of fixed and assured rates." + DEFVAL { 128 } + ::= { msanOnuTcontProfileEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.23.1.1.13 + msanOnuTcontProfileAssuredDataRate OBJECT-TYPE + SYNTAX Integer32 (0..2500000) + UNITS "kbps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU T-CONT Assured data rate (256 - 2500000 kbps). + Default value is 0, meaning that no rate is configured. + Any rate value can be entered, but is rounded up to the multiple of 64 kbps. + + Limitation: Maximum rate cannot be lower than the sum of fixed and assured rates." + DEFVAL { 0 } + ::= { msanOnuTcontProfileEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.23.1.1.14 + msanOnuTcontProfileMaxDataRate OBJECT-TYPE + SYNTAX Integer32 (128..2500000) + UNITS "kbps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU T-CONT Maximum data rate. + Any rate value can be entered, but is rounded up to the multiple of 64 kbps. + + Limitation: Maximum rate cannot be lower than the sum of fixed and assured rates" + DEFVAL { 1024 } + ::= { msanOnuTcontProfileEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.23.1.1.50 + msanOnuTcontProfileRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanOnuTcontProfileEntry 50 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.23.1.1.51 + msanOnuTcontProfileUsage OBJECT-TYPE + SYNTAX INTEGER + { + attached(1), + notAttached(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Profile usage. + If profile is attached, profile values can't be edited." + ::= { msanOnuTcontProfileEntry 51 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.24 + msanOnuAcsServerProfile OBJECT IDENTIFIER ::= { msanProfiles 24 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.24.1 + msanOnuAcsServerProfileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuAcsServerProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOnuAcsServerProfile 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.24.1.1 + msanOnuAcsServerProfileEntry OBJECT-TYPE + SYNTAX MsanOnuAcsServerProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOnuAcsServerProfileName } + ::= { msanOnuAcsServerProfileTable 1 } + + + MsanOnuAcsServerProfileEntry ::= + SEQUENCE { + msanOnuAcsServerProfileName + DisplayString, + msanOnuAcsServerProfileUrl + DisplayString, + msanOnuAcsServerProfileUserName + DisplayString, + msanOnuAcsServerProfilePassword + DisplayString, + msanOnuAcsServerProfileAddressType + InetAddressType, + msanOnuAcsServerProfileAddress + InetAddress, + msanOnuAcsServerProfilePortId + Integer32, + msanOnuAcsServerProfileProtocol + INTEGER, + msanOnuAcsServerProfileRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.24.1.1.1 + msanOnuAcsServerProfileName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Name of ONU ACS Server Profile" + ::= { msanOnuAcsServerProfileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.24.1.1.2 + msanOnuAcsServerProfileUrl OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..32)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "URL of the ACS server in form: + ://|[:][/]" + DEFVAL { ''b } + ::= { msanOnuAcsServerProfileEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.24.1.1.3 + msanOnuAcsServerProfileUserName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Username used for ACS Server connection." + DEFVAL { ''b } + ::= { msanOnuAcsServerProfileEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.24.1.1.4 + msanOnuAcsServerProfilePassword OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..32)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Username used for ACS Server connection." + DEFVAL { ''b } + ::= { msanOnuAcsServerProfileEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.24.1.1.5 + msanOnuAcsServerProfileAddressType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "Specifies the type of the ACS Server IP address: + unknown(0), + ipv4(1), + ipv6(2), + dns(16) + " + DEFVAL { ipv4 } + ::= { msanOnuAcsServerProfileEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.24.1.1.6 + msanOnuAcsServerProfileAddress OBJECT-TYPE + SYNTAX InetAddress + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "ACS Server IP address (or hostname)" + ::= { msanOnuAcsServerProfileEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.24.1.1.7 + msanOnuAcsServerProfilePortId OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "ACS Service Port number + If value is set to -1, standard protocol number is used." + DEFVAL { -1 } + ::= { msanOnuAcsServerProfileEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.24.1.1.8 + msanOnuAcsServerProfileProtocol OBJECT-TYPE + SYNTAX INTEGER + { + tcp(1), + ssl(2), + tsl(3) + } + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "ACS Service Protocol + " + DEFVAL { tcp } + ::= { msanOnuAcsServerProfileEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.24.1.1.9 + msanOnuAcsServerProfileRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5). + Value active(1) will activate and value destroy(6) will remove this entry. + Other values are currently not supported. + + Row can be created only when all required parameters are set: + - msanOnuAcsServerProfileUrl + - msanOnuAcsServerProfileUserName + - msanOnuAcsServerProfilePassword" + ::= { msanOnuAcsServerProfileEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.50 + msanProfilePortDataTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanProfilePortDataEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanProfiles 50 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.50.1 + msanProfilePortDataEntry OBJECT-TYPE + SYNTAX MsanProfilePortDataEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "In case of GPON access blade, ifIndex for ONU interface (ifDescr=0/x/y) is calculated with formula: + ifIndex=max_olt_port_number(8 or 16)+(x-1)*128+y " + INDEX { ifIndex } + ::= { msanProfilePortDataTable 1 } + + + MsanProfilePortDataEntry ::= + SEQUENCE { + msanProfilePortDataCVid + Integer32, + msanProfilePortDataSVid + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.50.1.1 + msanProfilePortDataCVid OBJECT-TYPE + SYNTAX Integer32 (-1..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "C-VLAN Id. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanProfilePortDataEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.50.1.2 + msanProfilePortDataSVid OBJECT-TYPE + SYNTAX Integer32 (-1..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "S-VLAN Id. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanProfilePortDataEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.3.100 + msanProfileConfigStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Profile configuration status." + DEFVAL { disable } + ::= { msanProfiles 100 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4 + msanDhcpRelay OBJECT IDENTIFIER ::= { msanAdditionalConf 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.1 + msanDhcpRaGlobal OBJECT IDENTIFIER ::= { msanDhcpRelay 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.1.1 + msanDhcpRaStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCP Relay Agent status." + ::= { msanDhcpRaGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.1.2 + msanDhcpRaMode OBJECT-TYPE + SYNTAX INTEGER + { + full(1), + simplified(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies if the DHCP Relay Agent mode is to be Simple or Full. Default value is Full." + ::= { msanDhcpRaGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.1.3 + msanDhcpRaCircuitType OBJECT-TYPE + SYNTAX INTEGER + { + trusted(1), + untrusted(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies DHCP RA Circuit type as trusted(1) or untrusted(2)." + ::= { msanDhcpRaGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.1.4 + msanDhcpRaOpt82 OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies DHCP Relay Agent general option 82 insertion status . + + " + ::= { msanDhcpRaGlobal 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.1.5 + msanDhcpRaOpt82ReplyMode OBJECT-TYPE + SYNTAX INTEGER + { + keep(1), + remove(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies DHCP Relay Agent keep/remove option 82 in replies. " + ::= { msanDhcpRaGlobal 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.1.6 + msanDhcpRaOpt82CircuitIdStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the disable/enable inserting Circuit ID suboption. Default value is Enable." + ::= { msanDhcpRaGlobal 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.1.7 + msanDhcpRaOpt82RemoteIdStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the disable/enable inserting Remote ID suboption. Default value is Enable." + ::= { msanDhcpRaGlobal 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.1.8 + msanDhcpRaOpt82UnicastExtStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The desired state of insertion of option 82 in unicast frames." + DEFVAL { disable } + ::= { msanDhcpRaGlobal 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.1.9 + msanDhcpRaFullModeSrvIpAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The IP address of default DHCP Server for VLANs where DHCP RA is enabled + in full mode (parameter msanDhcpRaVlanMode)." + ::= { msanDhcpRaGlobal 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.1.10 + msanDhcpRaOpt82CircuitIdInnerVlan OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Include Inner VLAN (C-VLAN) in Circuit Id when port is in DVLAN Tunneling mode (msanPortDVlanTagMode = enable)." + DEFVAL { disable } + ::= { msanDhcpRaGlobal 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.1.11 + msanDhcpRaCircuitIdCustomFormat OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCP Circuit Id Custom format definition composed of arbitrary characters and variable macros. + + Use '$[h][[0|s]][d[]]' format to specify: + h HEX variable format + 0|s left padding with zeroes or spaces + - maximum variable length + d use custom delimiter for MAC/IP + - delimiting character + variable macro + + Supported macros: + $SHELF - A string variable representing the shelf name as configured + or acquired by this device. + $CHASSIS - A numeric variable ranging [0..99] and representing numerical + identification of shelf. + $PANEL - Panel indicator: 0 front panel, 1 back panel. + $INTF_TYPE - Interface type: eth, dsl, gpon, mng, lag, atm, etc. + $AGENT_BOARD - Local board position (slot number) of DHCP Relay Agent. + $PORT - ID of local port the DHCP packet is received on. + $PORT_REM_ID - Complete remoteID string is inserted, as configured per + pertaining interface. + $INTF - ID of local interface the DHCP packet is received on in form + as used in interface configuration (e.g.: 1/2/1). + $INTF_DSCR - Interface description string taken exactly as configured + using 'description' command. + $PVC_INTF - ID of PVC interface the DHCP packet is received from (ADSL only). + $VPI - ID of ATM VPI the DHCP packet is received in (ADSL only). + $VCI - ID of ATM VCI the DHCP packet is received in (ADSL only). + $CLNT_MAC - MAC address of DHCP client sending the packet. + $AGENT_MAC - Local DHCP Relay Agent MAC address. If this is a switching device + MNG address is used. If this is a routing device MAC address + of the receiving interface is used. + $AGENT_IPV4 - Local DHCP Relay Agent IP address. Management IPv4 address + is used if this is a switching device, or IPv4 address of + receiving interface is used if this is a routing device. + $VLAN - Outermost VLAN ID in which the DHCP packet has been received. + In case of single tagged frame this is VLAN ID of the frame. + In case of double (QinQ) tagged frame, this is service + provider VLAN ID. + $VLAN_NAME - The VLAN name, as it has been configured by user, + of outermost VLAN in which the DHCP packet is received. + $CVID - Valid only for double (QinQ) tagged frames. Customer (inner) + VLAN ID in which the DHCP packet has been received. + $SYSNAME - System name as configured in SNMP agent on this device. + $LOCATION - Location as configured in SNMP agent on this device. + $CONTACT - Contact as configured in SNMP agent on this device. + $HEX - Arbitrary array of hexadecimal values. + Format: $HEX + " + DEFVAL { "" } + ::= { msanDhcpRaGlobal 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.1.12 + msanDhcpRaRemoteIdCustomFormat OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCP Remote Id Custom format definition composed of arbitrary characters and variable macros. + + Use '$[h][[0|s]][d[]]' format to specify: + h HEX variable format + 0|s left padding with zeroes or spaces + - maximum variable length + d use custom delimiter for MAC/IP + - delimiting character + variable macro + + Supported macros: + $SHELF - A string variable representing the shelf name as configured + or acquired by this device. + $CHASSIS - A numeric variable ranging [0..99] and representing numerical + identification of shelf. + $PANEL - Panel indicator: 0 front panel, 1 back panel. + $INTF_TYPE - Interface type: eth, dsl, gpon, mng, lag, atm, etc. + $AGENT_BOARD - Local board position (slot number) of DHCP Relay Agent. + $PORT - ID of local port the DHCP packet is received on. + $PORT_REM_ID - Complete remoteID string is inserted, as configured per + pertaining interface. + $INTF - ID of local interface the DHCP packet is received on in form + as used in interface configuration (e.g.: 1/2/1). + $INTF_DSCR - Interface description string taken exactly as configured + using 'description' command. + $PVC_INTF - ID of PVC interface the DHCP packet is received from (ADSL only). + $VPI - ID of ATM VPI the DHCP packet is received in (ADSL only). + $VCI - ID of ATM VCI the DHCP packet is received in (ADSL only). + $CLNT_MAC - MAC address of DHCP client sending the packet. + $AGENT_MAC - Local DHCP Relay Agent MAC address. If this is a switching device + MNG address is used. If this is a routing device MAC address + of the receiving interface is used. + $AGENT_IPV4 - Local DHCP Relay Agent IP address. Management IPv4 address + is used if this is a switching device, or IPv4 address of + receiving interface is used if this is a routing device. + $VLAN - Outermost VLAN ID in which the DHCP packet has been received. + In case of single tagged frame this is VLAN ID of the frame. + In case of double (QinQ) tagged frame, this is service + provider VLAN ID. + $VLAN_NAME - The VLAN name, as it has been configured by user, + of outermost VLAN in which the DHCP packet is received. + $CVID - Valid only for double (QinQ) tagged frames. Customer (inner) + VLAN ID in which the DHCP packet has been received. + $SYSNAME - System name as configured in SNMP agent on this device. + $LOCATION - Location as configured in SNMP agent on this device. + $CONTACT - Contact as configured in SNMP agent on this device. + $HEX - Arbitrary array of hexadecimal values. + Format: $HEX + " + DEFVAL { "$PORT_REM_ID" } + ::= { msanDhcpRaGlobal 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.2 + msanDhcpRaPortConfigTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDhcpRaPortConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Table od DHCP RA parameters per port." + ::= { msanDhcpRelay 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.2.1 + msanDhcpRaPortConfigEntry OBJECT-TYPE + SYNTAX MsanDhcpRaPortConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanDhcpRaPortConfigTable 1 } + + + MsanDhcpRaPortConfigEntry ::= + SEQUENCE { + msanDhcpRaPortState + INTEGER, + msanDhcpRaPortCircuitId + OCTET STRING, + msanDhcpRaPortRemoteId + OCTET STRING, + msanDhcpRaPortMeter + INTEGER, + msanDhcpRaPortMaxDataRate + Integer32, + msanDhcpRaPortCircuitType + INTEGER, + msanDhcpRaPortOpt82 + INTEGER, + msanDhcpRaPortOpt82ReplyMode + INTEGER, + msanDhcpRaPortOpt82UnicastExtStatus + INTEGER, + msanDhcpRaPortCircuitIdType + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.2.1.1 + msanDhcpRaPortState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + enableCli(2), + enableSrv(3), + disable(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "State of DHCP Relay Agent on the port (enable, disable, enable-client, enable-server) " + ::= { msanDhcpRaPortConfigEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.2.1.2 + msanDhcpRaPortCircuitId OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Option 82 Circuit Id for the port." + ::= { msanDhcpRaPortConfigEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.2.1.3 + msanDhcpRaPortRemoteId OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Option 82 Remote Id for the port." + ::= { msanDhcpRaPortConfigEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.2.1.4 + msanDhcpRaPortMeter OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Enable or disable DHCP metering on port." + ::= { msanDhcpRaPortConfigEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.2.1.5 + msanDhcpRaPortMaxDataRate OBJECT-TYPE + SYNTAX Integer32 + UNITS "kb/s" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Allowed throughput of incoming DHCP traffic on a port (kb/s)" + ::= { msanDhcpRaPortConfigEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.2.1.6 + msanDhcpRaPortCircuitType OBJECT-TYPE + SYNTAX INTEGER + { + trusted(1), + untrusted(2), + notConfigured(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies DHCP RA Circuit type per port as trusted(1) or untrusted(2)." + DEFVAL { notConfigured } + ::= { msanDhcpRaPortConfigEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.2.1.7 + msanDhcpRaPortOpt82 OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2), + notConfigured(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies DHCP Relay Agent option 82 insertion status per port." + DEFVAL { notConfigured } + ::= { msanDhcpRaPortConfigEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.2.1.8 + msanDhcpRaPortOpt82ReplyMode OBJECT-TYPE + SYNTAX INTEGER + { + keep(1), + remove(2), + notConfigured(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies DHCP Relay Agent keep/remove option 82 in replies per port." + DEFVAL { notConfigured } + ::= { msanDhcpRaPortConfigEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.2.1.9 + msanDhcpRaPortOpt82UnicastExtStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2), + notConfigured(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The desired state of insertion of option 82 in unicast frames per port." + DEFVAL { notConfigured } + ::= { msanDhcpRaPortConfigEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.2.1.10 + msanDhcpRaPortCircuitIdType OBJECT-TYPE + SYNTAX INTEGER + { + iskratel(1), + standard(2), + atm(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Circuit Id syntax mode per port." + DEFVAL { iskratel } + ::= { msanDhcpRaPortConfigEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.3 + msanDhcpRaFullModeVlanTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDhcpRaFullModeVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanDhcpRelay 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.3.1 + msanDhcpRaFullModeVlanEntry OBJECT-TYPE + SYNTAX MsanDhcpRaFullModeVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanDhcpRaFullModeVlanId, msanDhcpRaFullModeVlanSrvIpAddr } + ::= { msanDhcpRaFullModeVlanTable 1 } + + + MsanDhcpRaFullModeVlanEntry ::= + SEQUENCE { + msanDhcpRaFullModeVlanId + Integer32, + msanDhcpRaFullModeVlanSrvIpAddr + IpAddress, + msanDhcpRaFullModeVlanRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.3.1.1 + msanDhcpRaFullModeVlanId OBJECT-TYPE + SYNTAX Integer32 (1..4094) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The VLAN identifier (refers to dot1qVlanIndex) where DHCP Client resides." + ::= { msanDhcpRaFullModeVlanEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.3.1.2 + msanDhcpRaFullModeVlanSrvIpAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The IP address of DHCP Server for specified VLAN." + ::= { msanDhcpRaFullModeVlanEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.3.1.3 + msanDhcpRaFullModeVlanRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanDhcpRaFullModeVlanEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.4 + msanDhcpRaStatGlobal OBJECT IDENTIFIER ::= { msanDhcpRelay 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.4.1 + msanDhcpRaStatGlobalDiscover OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of DHCP DISCOVER packets. " + ::= { msanDhcpRaStatGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.4.2 + msanDhcpRaStatGlobalRequest OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of DHCP REQUEST packets." + ::= { msanDhcpRaStatGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.4.3 + msanDhcpRaStatGlobalOffer OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of DHCP OFFER packets." + ::= { msanDhcpRaStatGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.4.4 + msanDhcpRaStatGlobalACK OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of DHCP ACKNOWLAGE (ACK) packets." + ::= { msanDhcpRaStatGlobal 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.4.5 + msanDhcpRaStatGlobalNAK OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of NOT ACKNOWLAGE (NAK) packets." + ::= { msanDhcpRaStatGlobal 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.4.6 + msanDhcpRaStatGlobalDecline OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of DHCP DECLINE packets." + ::= { msanDhcpRaStatGlobal 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.4.7 + msanDhcpRaStatGlobalMaxPacketSizeExceeded OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of DHCP packets with max. packet size exceeded. " + ::= { msanDhcpRaStatGlobal 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.4.8 + msanDhcpRaStatGlobalFrameErr OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of DHCP packets with errors in frames. " + ::= { msanDhcpRaStatGlobal 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.4.9 + msanDhcpRaStatGlobalOpt82Present OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of DHCP packets with Option 82 or giaddr present. " + ::= { msanDhcpRaStatGlobal 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.4.10 + msanDhcpRaStatGlobalFrameUnsync OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of packets with frames not synchronized with state machines." + ::= { msanDhcpRaStatGlobal 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.4.11 + msanDhcpRaStatGlobalStatRelease OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCP RELEASE packets." + ::= { msanDhcpRaStatGlobal 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.4.12 + msanDhcpRaStatGlobalStatInform OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCP INFORM packets." + ::= { msanDhcpRaStatGlobal 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.5 + msanDhcpRaStatTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDhcpRaStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanDhcpRelay 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.5.1 + msanDhcpRaStatEntry OBJECT-TYPE + SYNTAX MsanDhcpRaStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanDhcpRaStatTable 1 } + + + MsanDhcpRaStatEntry ::= + SEQUENCE { + msanDhcpRaStatDiscover + Counter32, + msanDhcpRaStatRequest + Counter32, + msanDhcpRaStatOffer + Counter32, + msanDhcpRaStatACK + Counter32, + msanDhcpRaStatNAK + Counter32, + msanDhcpRaStatDecline + Counter32, + msanDhcpRaStatMaxPacketSizeExceeded + Counter32, + msanDhcpRaStatFrameErr + Counter32, + msanDhcpRaStatOpt82Present + Counter32, + msanDhcpRaStatFrameUnsync + Counter32, + msanDhcpRaStatRelease + Counter32, + msanDhcpRaStatInform + Counter32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.5.1.1 + msanDhcpRaStatDiscover OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCP DISCOVER packets." + ::= { msanDhcpRaStatEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.5.1.2 + msanDhcpRaStatRequest OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCP REQUEST packets." + ::= { msanDhcpRaStatEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.5.1.3 + msanDhcpRaStatOffer OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCP OFFER packets." + ::= { msanDhcpRaStatEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.5.1.4 + msanDhcpRaStatACK OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCP ACKNOWLAGE (ACK) packets." + ::= { msanDhcpRaStatEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.5.1.5 + msanDhcpRaStatNAK OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCP NOT ACKNOWLAGE (NAK) packets." + ::= { msanDhcpRaStatEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.5.1.6 + msanDhcpRaStatDecline OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCP DECLINE packets." + ::= { msanDhcpRaStatEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.5.1.7 + msanDhcpRaStatMaxPacketSizeExceeded OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCP packets with max. packet size exceeded. " + ::= { msanDhcpRaStatEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.5.1.8 + msanDhcpRaStatFrameErr OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCP packets with errors in frames. " + ::= { msanDhcpRaStatEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.5.1.9 + msanDhcpRaStatOpt82Present OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCP packets with Option 82 or giaddr present. " + ::= { msanDhcpRaStatEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.5.1.10 + msanDhcpRaStatFrameUnsync OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received packets with frames not synchronized with state machines." + ::= { msanDhcpRaStatEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.5.1.11 + msanDhcpRaStatRelease OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCP RELEASE packets." + ::= { msanDhcpRaStatEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.5.1.12 + msanDhcpRaStatInform OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCP INFORM packets." + ::= { msanDhcpRaStatEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.6 + msanDhcpRaVlanConfigTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDhcpRaVlanConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Table od DHCP RA parameters per Vlan." + ::= { msanDhcpRelay 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.6.1 + msanDhcpRaVlanConfigEntry OBJECT-TYPE + SYNTAX MsanDhcpRaVlanConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { dot1qVlanIndex } + ::= { msanDhcpRaVlanConfigTable 1 } + + + MsanDhcpRaVlanConfigEntry ::= + SEQUENCE { + msanDhcpRaVlanState + INTEGER, + msanDhcpRaVlanMode + INTEGER, + msanDhcpRaVlanOpt82 + INTEGER, + msanDhcpRaVlanOpt82ReplyMode + INTEGER, + msanDhcpRaVlanOpt82UnicastExtStatus + INTEGER, + msanDhcpRaVlanCircuitIdType + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.6.1.1 + msanDhcpRaVlanState OBJECT-TYPE + SYNTAX INTEGER + { + disable(1), + notConfigured(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCP RA state for specified VLAN ID. Value notConfigured(2) means, that + global setting is used(msanDhcpRaStatus)." + DEFVAL { notConfigured } + ::= { msanDhcpRaVlanConfigEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.6.1.2 + msanDhcpRaVlanMode OBJECT-TYPE + SYNTAX INTEGER + { + full(1), + simplified(2), + notConfigured(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCP RA mode for specified VLAN ID. Value notConfigured(1) means, that + global setting is used(msanDhcpRaMode)." + DEFVAL { notConfigured } + ::= { msanDhcpRaVlanConfigEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.6.1.3 + msanDhcpRaVlanOpt82 OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2), + notConfigured(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies DHCP Relay Agent option 82 insertion status per vlan." + DEFVAL { notConfigured } + ::= { msanDhcpRaVlanConfigEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.6.1.4 + msanDhcpRaVlanOpt82ReplyMode OBJECT-TYPE + SYNTAX INTEGER + { + keep(1), + remove(2), + notConfigured(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies DHCP Relay Agent keep/remove option 82 in replies per vlan." + DEFVAL { notConfigured } + ::= { msanDhcpRaVlanConfigEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.6.1.5 + msanDhcpRaVlanOpt82UnicastExtStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2), + notConfigured(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The desired state of insertion of option 82 in unicast frames per vlan." + DEFVAL { notConfigured } + ::= { msanDhcpRaVlanConfigEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.6.1.6 + msanDhcpRaVlanCircuitIdType OBJECT-TYPE + SYNTAX INTEGER + { + iskratel(1), + standard(2), + notConfigured(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Circuit Id syntax mode per vlan." + DEFVAL { notConfigured } + ::= { msanDhcpRaVlanConfigEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.7 + msanDhcpRaPortVlanConfigTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDhcpRaPortVlanConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanDhcpRelay 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.7.1 + msanDhcpRaPortVlanConfigEntry OBJECT-TYPE + SYNTAX MsanDhcpRaPortVlanConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, dot1qVlanIndex } + ::= { msanDhcpRaPortVlanConfigTable 1 } + + + MsanDhcpRaPortVlanConfigEntry ::= + SEQUENCE { + msanDhcpRaPortVlanRemoteId + OCTET STRING, + msanDhcpRaPortVlanConfigRowStatus + RowStatus, + msanDhcpRaPortVlanCircuitIdType + INTEGER, + msanDhcpRaPortVlanCircuitId + DisplayString + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.7.1.1 + msanDhcpRaPortVlanRemoteId OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The VLAN identifier (refers to dot1qVlanIndex) where DHCP Client resides." + DEFVAL { "" } + ::= { msanDhcpRaPortVlanConfigEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.7.1.2 + msanDhcpRaPortVlanConfigRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + For row creation use createAndWait(5) [createAndGo(4) is not supported]." + ::= { msanDhcpRaPortVlanConfigEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.7.1.3 + msanDhcpRaPortVlanCircuitIdType OBJECT-TYPE + SYNTAX INTEGER + { + iskratel(1), + standard(2), + notConfigured(3), + custom(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Circuit Id syntax mode per vlan per port." + DEFVAL { notConfigured } + ::= { msanDhcpRaPortVlanConfigEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.7.1.4 + msanDhcpRaPortVlanCircuitId OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Option 82 Circuit Id per vlan per port." + ::= { msanDhcpRaPortVlanConfigEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.100 + msanDhcpv6RaGlobal OBJECT IDENTIFIER ::= { msanDhcpRelay 100 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.100.1 + msanDhcpv6RaState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCPv6 Relay Agent status." + DEFVAL { disable } + ::= { msanDhcpv6RaGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.100.2 + msanDhcpv6RaMode OBJECT-TYPE + SYNTAX INTEGER { ldra(1) } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCPv6 Relay Agent mode. + ldra = Lightweight DHCPRv6" + DEFVAL { ldra } + ::= { msanDhcpv6RaGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.100.3 + msanDhcpv6RaInterfaceIdStandard OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCPv6 RA Standard Interface Id type." + DEFVAL { enable } + ::= { msanDhcpv6RaGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.100.4 + msanDhcpv6RaInterfaceIdInnerVlan OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Include Inner VLAN (C-VLAN) in Circuit Id when port is in DVLAN Tunneling mode (msanPortDVlanTagMode = enable)." + ::= { msanDhcpv6RaGlobal 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.100.5 + msanDhcpv6RaInterfaceIdCustomFormat OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCPv6 Interface Id Custom format definition composed of arbitrary characters and variable macros. + + Use '$[h][[0|s]][d[]]' format to specify: + h HEX variable format + 0|s left padding with zeroes or spaces + - maximum variable length + d use custom delimiter for MAC/IP + - delimiting character + variable macro + + Supported macros: + $SHELF - A string variable representing the shelf name as configured + or acquired by this device. + $CHASSIS - A numeric variable ranging [0..99] and representing numerical + identification of shelf. + $PANEL - Panel indicator: 0 front panel, 1 back panel. + $INTF_TYPE - Interface type: eth, dsl, gpon, mng, lag, atm, etc. + $AGENT_BOARD - Local board position (slot number) of DHCP Relay Agent. + $PORT - ID of local port the DHCP packet is received on. + $PORT_REM_ID - Complete remoteID string is inserted, as configured per + pertaining interface. + $INTF - ID of local interface the DHCP packet is received on in form + as used in interface configuration (e.g.: 1/2/1). + $INTF_DSCR - Interface description string taken exactly as configured + using 'description' command. + $PVC_INTF - ID of PVC interface the DHCP packet is received from (ADSL only). + $VPI - ID of ATM VPI the DHCP packet is received in (ADSL only). + $VCI - ID of ATM VCI the DHCP packet is received in (ADSL only). + $CLNT_MAC - MAC address of DHCP client sending the packet. + $AGENT_MAC - Local DHCP Relay Agent MAC address. If this is a switching device + MNG address is used. If this is a routing device MAC address + of the receiving interface is used. + $AGENT_IPV4 - Local DHCP Relay Agent IP address. Management IPv4 address + is used if this is a switching device, or IPv4 address of + receiving interface is used if this is a routing device. + $VLAN - Outermost VLAN ID in which the DHCP packet has been received. + In case of single tagged frame this is VLAN ID of the frame. + In case of double (QinQ) tagged frame, this is service + provider VLAN ID. + $VLAN_NAME - The VLAN name, as it has been configured by user, + of outermost VLAN in which the DHCP packet is received. + $CVID - Valid only for double (QinQ) tagged frames. Customer (inner) + VLAN ID in which the DHCP packet has been received. + $SYSNAME - System name as configured in SNMP agent on this device. + $LOCATION - Location as configured in SNMP agent on this device. + $CONTACT - Contact as configured in SNMP agent on this device. + $HEX - Arbitrary array of hexadecimal values. + Format: $HEX + " + DEFVAL { "" } + ::= { msanDhcpv6RaGlobal 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.100.6 + msanDhcpv6RaRemoteIdCustomFormat OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCPv6 Remote Id Custom format definition composed of arbitrary characters and variable macros. + + Use '$[h][[0|s]][d[]]' format to specify: + h HEX variable format + 0|s left padding with zeroes or spaces + - maximum variable length + d use custom delimiter for MAC/IP + - delimiting character + variable macro + + Supported macros: + $SHELF - A string variable representing the shelf name as configured + or acquired by this device. + $CHASSIS - A numeric variable ranging [0..99] and representing numerical + identification of shelf. + $PANEL - Panel indicator: 0 front panel, 1 back panel. + $INTF_TYPE - Interface type: eth, dsl, gpon, mng, lag, atm, etc. + $AGENT_BOARD - Local board position (slot number) of DHCP Relay Agent. + $PORT - ID of local port the DHCP packet is received on. + $PORT_REM_ID - Complete remoteID string is inserted, as configured per + pertaining interface. + $INTF - ID of local interface the DHCP packet is received on in form + as used in interface configuration (e.g.: 1/2/1). + $INTF_DSCR - Interface description string taken exactly as configured + using 'description' command. + $PVC_INTF - ID of PVC interface the DHCP packet is received from (ADSL only). + $VPI - ID of ATM VPI the DHCP packet is received in (ADSL only). + $VCI - ID of ATM VCI the DHCP packet is received in (ADSL only). + $CLNT_MAC - MAC address of DHCP client sending the packet. + $AGENT_MAC - Local DHCP Relay Agent MAC address. If this is a switching device + MNG address is used. If this is a routing device MAC address + of the receiving interface is used. + $AGENT_IPV4 - Local DHCP Relay Agent IP address. Management IPv4 address + is used if this is a switching device, or IPv4 address of + receiving interface is used if this is a routing device. + $VLAN - Outermost VLAN ID in which the DHCP packet has been received. + In case of single tagged frame this is VLAN ID of the frame. + In case of double (QinQ) tagged frame, this is service + provider VLAN ID. + $VLAN_NAME - The VLAN name, as it has been configured by user, + of outermost VLAN in which the DHCP packet is received. + $CVID - Valid only for double (QinQ) tagged frames. Customer (inner) + VLAN ID in which the DHCP packet has been received. + $SYSNAME - System name as configured in SNMP agent on this device. + $LOCATION - Location as configured in SNMP agent on this device. + $CONTACT - Contact as configured in SNMP agent on this device. + $HEX - Arbitrary array of hexadecimal values. + Format: $HEX + " + DEFVAL { "$PORT_REM_ID" } + ::= { msanDhcpv6RaGlobal 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101 + msanDhcpv6RaStatistics OBJECT IDENTIFIER ::= { msanDhcpRelay 101 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.1 + msanDhcpv6RaPortStatTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDhcpv6RaPortStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanDhcpv6RaStatistics 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.1.1 + msanDhcpv6RaPortStatEntry OBJECT-TYPE + SYNTAX MsanDhcpv6RaPortStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanDhcpv6RaPortStatTable 1 } + + + MsanDhcpv6RaPortStatEntry ::= + SEQUENCE { + msanDhcpv6PortRaStatSolicit + Integer32, + msanDhcpv6PortRaStatAdvertise + Integer32, + msanDhcpv6PortRaStatRequest + Integer32, + msanDhcpv6PortRaStatReply + Integer32, + msanDhcpv6PortRaStatRenew + Integer32, + msanDhcpv6PortRaStatRebind + Integer32, + msanDhcpv6PortRaStatDecline + Integer32, + msanDhcpv6PortRaStatReconfigure + Integer32, + msanDhcpv6PortRaStatRelease + Integer32, + msanDhcpv6PortRaStatInformRequest + Integer32, + msanDhcpv6PortRaStatRelayForward + Integer32, + msanDhcpv6PortRaStatRelayReply + Integer32, + msanDhcpv6PortRaStatOversizeError + Integer32, + msanDhcpv6PortRaStatFrameError + Integer32, + msanDhcpv6PortRaStatFrameUnsyncError + Integer32, + msanDhcpv6PortRaStatSysError + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.1.1.1 + msanDhcpv6PortRaStatSolicit OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 solicit packets." + ::= { msanDhcpv6RaPortStatEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.1.1.2 + msanDhcpv6PortRaStatAdvertise OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 advertise packets." + ::= { msanDhcpv6RaPortStatEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.1.1.3 + msanDhcpv6PortRaStatRequest OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 request packets." + ::= { msanDhcpv6RaPortStatEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.1.1.4 + msanDhcpv6PortRaStatReply OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 reply packets." + ::= { msanDhcpv6RaPortStatEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.1.1.5 + msanDhcpv6PortRaStatRenew OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 renew packets." + ::= { msanDhcpv6RaPortStatEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.1.1.6 + msanDhcpv6PortRaStatRebind OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 rebind packets." + ::= { msanDhcpv6RaPortStatEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.1.1.7 + msanDhcpv6PortRaStatDecline OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 decline packets." + ::= { msanDhcpv6RaPortStatEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.1.1.8 + msanDhcpv6PortRaStatReconfigure OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 reconfigure packets." + ::= { msanDhcpv6RaPortStatEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.1.1.9 + msanDhcpv6PortRaStatRelease OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 release packets." + ::= { msanDhcpv6RaPortStatEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.1.1.10 + msanDhcpv6PortRaStatInformRequest OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 inform request packets." + ::= { msanDhcpv6RaPortStatEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.1.1.11 + msanDhcpv6PortRaStatRelayForward OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 relay forward packets." + ::= { msanDhcpv6RaPortStatEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.1.1.12 + msanDhcpv6PortRaStatRelayReply OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 relay reply packets." + ::= { msanDhcpv6RaPortStatEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.1.1.100 + msanDhcpv6PortRaStatOversizeError OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of discarded packets because max packet size exceeded." + ::= { msanDhcpv6RaPortStatEntry 100 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.1.1.101 + msanDhcpv6PortRaStatFrameError OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of discarded packets because frame error." + ::= { msanDhcpv6RaPortStatEntry 101 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.1.1.102 + msanDhcpv6PortRaStatFrameUnsyncError OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received packets with frames not synchronized with state machines." + ::= { msanDhcpv6RaPortStatEntry 102 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.1.1.103 + msanDhcpv6PortRaStatSysError OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of discarded packets because system error." + ::= { msanDhcpv6RaPortStatEntry 103 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.100 + msanDhcpv6RaStatSolicit OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 solicit packets." + ::= { msanDhcpv6RaStatistics 100 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.101 + msanDhcpv6RaStatAdvertise OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 advertise packets." + ::= { msanDhcpv6RaStatistics 101 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.102 + msanDhcpv6RaStatRequest OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 request packets." + ::= { msanDhcpv6RaStatistics 102 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.103 + msanDhcpv6RaStatReply OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 reply packets." + ::= { msanDhcpv6RaStatistics 103 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.104 + msanDhcpv6RaStatRenew OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 renew packets." + ::= { msanDhcpv6RaStatistics 104 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.105 + msanDhcpv6RaStatRebind OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 rebind packets." + ::= { msanDhcpv6RaStatistics 105 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.106 + msanDhcpv6RaStatDecline OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 decline packets." + ::= { msanDhcpv6RaStatistics 106 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.107 + msanDhcpv6RaStatReconfigure OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 reconfigure packets." + ::= { msanDhcpv6RaStatistics 107 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.108 + msanDhcpv6RaStatRelease OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 reconfigure packets." + ::= { msanDhcpv6RaStatistics 108 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.109 + msanDhcpv6RaStatInformRequest OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 inform request packets." + ::= { msanDhcpv6RaStatistics 109 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.110 + msanDhcpv6RaStatRelayForward OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 Relay Forward packets." + ::= { msanDhcpv6RaStatistics 110 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.112 + msanDhcpv6RaStatRelayReply OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received DHCPv6 Relay Reply packets." + ::= { msanDhcpv6RaStatistics 112 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.200 + msanDhcpv6RaStatOversizeError OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of discarded packets because max packet size exceeded." + ::= { msanDhcpv6RaStatistics 200 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.201 + msanDhcpv6RaStatFrameError OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of discareded packets because errors in frame." + ::= { msanDhcpv6RaStatistics 201 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.202 + msanDhcpv6RaStatFrameUnsyncError OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received packets with frames not synchronized with state machines." + ::= { msanDhcpv6RaStatistics 202 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.101.203 + msanDhcpv6RaStatSysError OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of discared packets because system error." + ::= { msanDhcpv6RaStatistics 203 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.102 + msanDhcpv6RaPortConfigTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDhcpv6RaPortConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Table od DHCP RA parameters per port." + ::= { msanDhcpRelay 102 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.102.1 + msanDhcpv6RaPortConfigEntry OBJECT-TYPE + SYNTAX MsanDhcpv6RaPortConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanDhcpv6RaPortConfigTable 1 } + + + MsanDhcpv6RaPortConfigEntry ::= + SEQUENCE { + msanDhcpv6RaPortState + INTEGER, + msanDhcpv6RaPortTrusted + INTEGER, + msanDhcpv6RaPortInterfaceIdStandard + INTEGER, + msanDhcpv6RaPortInterfaceId + OCTET STRING, + msanDhcpv6RaPortRemoteId + OCTET STRING, + msanDhcpv6RaPortRemoteIdEnterpriseNum + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.102.1.1 + msanDhcpv6RaPortState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + enableCli(2), + enableSrv(3), + disable(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "State of DHCPv6 Relay Agent on the port (enable, disable, enable-client, enable-server) " + DEFVAL { enable } + ::= { msanDhcpv6RaPortConfigEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.102.1.2 + msanDhcpv6RaPortTrusted OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies DHCP RA Circuit type per port as trusted(1) or untrusted(2). + Default value for user ports is untrusted(2) and for network ports trusted(1). + " + ::= { msanDhcpv6RaPortConfigEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.102.1.3 + msanDhcpv6RaPortInterfaceIdStandard OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCPv6 RA Standard Interface Id syntax mode." + DEFVAL { enable } + ::= { msanDhcpv6RaPortConfigEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.102.1.4 + msanDhcpv6RaPortInterfaceId OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DHCPv6 Interface Id." + ::= { msanDhcpv6RaPortConfigEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.102.1.5 + msanDhcpv6RaPortRemoteId OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCPv6 Remote Id value for the port. + If empty string, remote id is not added to DHCPv6 package." + DEFVAL { "" } + ::= { msanDhcpv6RaPortConfigEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.102.1.6 + msanDhcpv6RaPortRemoteIdEnterpriseNum OBJECT-TYPE + SYNTAX INTEGER (1..999999) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCPv6 Remote Id enterprise number for the port. + " + DEFVAL { 1332 } + ::= { msanDhcpv6RaPortConfigEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.103 + msanDhcpv6RaVlanConfigTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDhcpv6RaVlanConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Table od DHCP RA parameters per Vlan." + ::= { msanDhcpRelay 103 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.103.1 + msanDhcpv6RaVlanConfigEntry OBJECT-TYPE + SYNTAX MsanDhcpv6RaVlanConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { dot1qVlanIndex } + ::= { msanDhcpv6RaVlanConfigTable 1 } + + + MsanDhcpv6RaVlanConfigEntry ::= + SEQUENCE { + msanDhcpv6RaVlanState + INTEGER, + msanDhcpv6RaVlanInterfaceIdStandard + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.103.1.1 + msanDhcpv6RaVlanState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCP RA state for specified VLAN ID. " + DEFVAL { enable } + ::= { msanDhcpv6RaVlanConfigEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.103.1.2 + msanDhcpv6RaVlanInterfaceIdStandard OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCPv6 RA Standard Interface Id syntax mode." + DEFVAL { enable } + ::= { msanDhcpv6RaVlanConfigEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.104 + msanDhcpv6RaPortVlanConfigTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDhcpv6RaPortVlanConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanDhcpRelay 104 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.104.1 + msanDhcpv6RaPortVlanConfigEntry OBJECT-TYPE + SYNTAX MsanDhcpv6RaPortVlanConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, dot1qVlanIndex } + ::= { msanDhcpv6RaPortVlanConfigTable 1 } + + + MsanDhcpv6RaPortVlanConfigEntry ::= + SEQUENCE { + msanDhcpv6RaPortVlanRemoteId + OCTET STRING, + msanDhcpv6RaPortVlanRemoteIdEnterpriseNum + INTEGER, + msanDhcpv6RaPortVlanRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.104.1.1 + msanDhcpv6RaPortVlanRemoteId OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCPv6 Remote Id value for specified vlan_id per port. + " + DEFVAL { "" } + ::= { msanDhcpv6RaPortVlanConfigEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.104.1.2 + msanDhcpv6RaPortVlanRemoteIdEnterpriseNum OBJECT-TYPE + SYNTAX INTEGER (1..999999) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCPv6 Remote Id enterprise number for specified vlan_id per port. + " + DEFVAL { 1332 } + ::= { msanDhcpv6RaPortVlanConfigEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.4.104.1.3 + msanDhcpv6RaPortVlanRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + For row creation use createAndWait(5) [createAndGo(4) is not supported]." + ::= { msanDhcpv6RaPortVlanConfigEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.5 + msanSntp OBJECT IDENTIFIER ::= { msanAdditionalConf 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.5.1 + msanSntpGlobal OBJECT IDENTIFIER ::= { msanSntp 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.5.1.1 + msanSntpTzOffset OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the time zone offset time in format hh:mm. Allowed range is -12 to 13." + ::= { msanSntpGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.5.1.2 + msanSntpTzName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..32)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Time Zone name." + ::= { msanSntpGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.5.1.3 + msanSntpTzDstOffset OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the daylight saving time offset time in format hh:mm. Allowed range is -12 to 13." + ::= { msanSntpGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.5.1.4 + msanSntpTzDstStartMonth OBJECT-TYPE + SYNTAX Integer32 (1..12) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the daylight saving time start month. " + ::= { msanSntpGlobal 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.5.1.5 + msanSntpTzDstStartWeek OBJECT-TYPE + SYNTAX Integer32 (1..5) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the daylight saving time start week." + ::= { msanSntpGlobal 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.5.1.6 + msanSntpTzDstStartDayInWeek OBJECT-TYPE + SYNTAX INTEGER + { + monday(1), + tuesday(2), + wednesday(3), + thursday(4), + friday(5), + saturday(6), + sunday(7) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the daylight saving time start day in week." + ::= { msanSntpGlobal 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.5.1.7 + msanSntpTzDstStartTime OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the daylight saving time start time. Allowed range is 00:00 to 23:59." + ::= { msanSntpGlobal 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.5.1.8 + msanSntpTzDstEndMonth OBJECT-TYPE + SYNTAX Integer32 (1..12) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the daylight saving time end month." + ::= { msanSntpGlobal 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.5.1.9 + msanSntpTzDstEndWeek OBJECT-TYPE + SYNTAX Integer32 (1..5) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the daylight saving time end week." + ::= { msanSntpGlobal 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.5.1.10 + msanSntpTzDstEndDayInWeek OBJECT-TYPE + SYNTAX INTEGER + { + monday(1), + tuesday(2), + wednesday(3), + thursday(4), + friday(5), + saturday(6), + sunday(7) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the daylight saving time end start day in week." + ::= { msanSntpGlobal 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.5.1.11 + msanSntpTzDstEndTime OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the daylight saving time end time. Allowed range is 00:00 to 23:59" + ::= { msanSntpGlobal 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.7 + msanSnmp OBJECT IDENTIFIER ::= { msanAdditionalConf 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.7.1 + msanSnmpGlobal OBJECT IDENTIFIER ::= { msanSnmp 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.7.1.1 + msanSnmpTrapRecvUdpPort OBJECT-TYPE + SYNTAX Unsigned32 (0..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The UDP Port where SNMP traps are to be sent." + ::= { msanSnmpGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.7.1.2 + msanIfOperStatusChangeCnt OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Interface operational status change counter." + ::= { msanSnmpGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.7.2 + msanSnmpNotifications OBJECT IDENTIFIER ::= { msanSnmp 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.7.2.1 + msanSnmpOnuIfStatusChanged NOTIFICATION-TYPE + OBJECTS { ifDescr, ifAdminStatus, ifOperStatus, msanOnuInfoSerialNumber, msanOnuInfoVersion, + msanOnuInfoEquipmentId, msanOnuInfoOnuHardwareType, msanOnuInfoOnuImageInstance0Version, msanOnuInfoOnuImageInstance0Valid, msanOnuInfoOnuImageInstance0Activate, + msanOnuInfoOnuImageInstance1Version, msanOnuInfoOnuImageInstance1Valid, msanOnuInfoOnuImageInstance1Activate, msanOnuInfoOnuMacAddress, msanOnuIfOperStatusChangeCnt + } + STATUS current + DESCRIPTION + "ONU interface status changed notification." + ::= { msanSnmpNotifications 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.7.2.2 + msanSnmpOnuBlackListAdded NOTIFICATION-TYPE + OBJECTS { ifDescr, msanOnuBlackListSerialNumber, msanOnuBlackListPassword, msanOnuBlackListCause, msanOnuBlackListChangeCnt + } + STATUS current + DESCRIPTION + "ONU added to Blacklist notification." + ::= { msanSnmpNotifications 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.7.2.3 + msanSnmpOnuBlackListRemoved NOTIFICATION-TYPE + OBJECTS { ifDescr, msanOnuBlackListSerialNumber, msanOnuBlackListChangeCnt } + STATUS current + DESCRIPTION + "ONU removed from Blacklist notification." + ::= { msanSnmpNotifications 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.7.2.4 + msanSnmpIfStatusChanged NOTIFICATION-TYPE + OBJECTS { ifDescr, ifAdminStatus, ifOperStatus, msanIfOperStatusChangeCnt } + STATUS current + DESCRIPTION + "Interface status changed notification." + ::= { msanSnmpNotifications 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8 + msanIgmpSnooping OBJECT IDENTIFIER ::= { msanAdditionalConf 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.1 + msanIgmpSnoopingGlobal OBJECT IDENTIFIER ::= { msanIgmpSnooping 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.1.1 + msanIgmpSnoopingReportSuppression OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Report suppression mode for IGMP Snooping for the switch. + " + ::= { msanIgmpSnoopingGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.1.2 + msanIgmpSnoopingAdminState OBJECT-TYPE + SYNTAX INTEGER + { + disableAndDiscard(0), + disableAndBroadcast(1), + enable(2), + enableAndUnknownGroupFlood(3), + enableAndMrouterFlood(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IGMP snooping global state. + + Values enableAndUnknownGroupFlood(3) and enableAndMrouterFlood(4) are relevant only + for MSAN Ethernet switch (ES) products, where enableAndUnknownGroupFlood(3) is supported + only on IDC board." + ::= { msanIgmpSnoopingGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.1.3 + msanIgmpSnoopingLoggingVlanId OBJECT-TYPE + SYNTAX Integer32 (0..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "VLAN Id on which IGMP snooping logging is performed. Value 0 means that logging is disabled. " + ::= { msanIgmpSnoopingGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.1.4 + msanIgmpSnoopingViolationAction OBJECT-TYPE + SYNTAX INTEGER + { + remove(1), + discard(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Removing one of the existing (the oldest) multicast group membership, or + discarding a new group membership request. + " + ::= { msanIgmpSnoopingGlobal 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.1.5 + msanIgmpSnoopingFastLeaveAdminMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This enables or disables IGMP Snooping Fast-Leave on user ports." + DEFVAL { enable } + ::= { msanIgmpSnoopingGlobal 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.1.6 + msanIgmpSnoopingGroupMembershipInterval OBJECT-TYPE + SYNTAX Integer32 (2..3600) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The amount of time in seconds that a switch will wait for a report + from a particular group on the selected interface before deleting the + interface from the entry. + This value must be greater than msanIgmpSnoopingMaxResponseTime + " + DEFVAL { 260 } + ::= { msanIgmpSnoopingGlobal 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.1.7 + msanIgmpSnoopingMaxResponseTime OBJECT-TYPE + SYNTAX Integer32 (1..3599) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The amount of time in seconds a switch will wait on a report after sending + a query on the selected interface. + This value must be less than msanIgmpSnoopingGroupMembershipInterval + " + DEFVAL { '10'b } + ::= { msanIgmpSnoopingGlobal 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.1.8 + msanIgmpVersion OBJECT-TYPE + SYNTAX INTEGER + { + igmpAll(1), + igmpVersion2(2), + igmpVersion3(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Version of processed IGMP frames." + DEFVAL { igmpAll } + ::= { msanIgmpSnoopingGlobal 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.1.9 + msanIgmpClear OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Clear all IGMP snooping entries." + ::= { msanIgmpSnoopingGlobal 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.2 + msanIgmpSnoopingTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanIgmpSnoopingEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanIgmpSnooping 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.2.1 + msanIgmpSnoopingEntry OBJECT-TYPE + SYNTAX MsanIgmpSnoopingEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanIgmpSnoopingTable 1 } + + + MsanIgmpSnoopingEntry ::= + SEQUENCE { + msanIgmpSnoopingIntfStandaloneQuerier + Integer32, + msanIgmpSnoopingIntfFilter + INTEGER, + msanIgmpSnoopingGroupLimit + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.2.1.1 + msanIgmpSnoopingIntfStandaloneQuerier OBJECT-TYPE + SYNTAX Integer32 + UNITS "seconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specify the period of time in seconds you want the IGMP Standalone Querier generate IGMP query packets. Value must be higher than + msanIgmpSnoopingMaxResponseTime and lower than msanIgmpSnoopingGroupMembershipInterval or 0. + The default is 0. A value of zero indicates that standalone querier is disabled. + IGMP SA Querier can be activated only on one interface at the same time. " + ::= { msanIgmpSnoopingEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.2.1.2 + msanIgmpSnoopingIntfFilter OBJECT-TYPE + SYNTAX INTEGER + { + allowAll(0), + allowReports(1), + allowQueries(2), + dropAll(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Filtering of IGMP join/leave reports or queries frames. " + ::= { msanIgmpSnoopingEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.2.1.3 + msanIgmpSnoopingGroupLimit OBJECT-TYPE + SYNTAX INTEGER (0..10) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "A maximum numbers of IGMP groups per interface. + Value 0 means no limits." + ::= { msanIgmpSnoopingEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.3 + msanSwitchIGMPVlanCurrentMrouterTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanSwitchIGMPVlanCurrentMrouterEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanIgmpSnooping 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.3.1 + msanSwitchIGMPVlanCurrentMrouterEntry OBJECT-TYPE + SYNTAX MsanSwitchIGMPVlanCurrentMrouterEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, dot1qVlanIndex } + ::= { msanSwitchIGMPVlanCurrentMrouterTable 1 } + + + MsanSwitchIGMPVlanCurrentMrouterEntry ::= + SEQUENCE { + msanSwitchIGMPVlanCurrentMrouterEnableState + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.3.1.1 + msanSwitchIGMPVlanCurrentMrouterEnableState OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Returns per-interface per-vlan pairs where IGMP Mrouter is enabled. " + ::= { msanSwitchIGMPVlanCurrentMrouterEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.4 + msanSwitchIGMPSnoopingStaticIntfMulticastRouterTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanSwitchIGMPSnoopingStaticIntfMulticastRouterEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + REFERENCE + "agentSwitchIGMPSnoopingIntfTable - 1.3.6.1.4.1.6132.1.1.1.2.8.7.1" + ::= { msanIgmpSnooping 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.4.1 + msanSwitchIGMPSnoopingStaticIntfMulticastRouterEntry OBJECT-TYPE + SYNTAX MsanSwitchIGMPSnoopingStaticIntfMulticastRouterEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanSwitchIGMPSnoopingStaticIntfMulticastRouterTable 1 } + + + MsanSwitchIGMPSnoopingStaticIntfMulticastRouterEntry ::= + SEQUENCE { + msanSwitchIGMPSnoopingIntfIndex + Unsigned32, + msanSwitchIGMPSnoopingIntfAdminMode + INTEGER, + msanSwitchIGMPSnoopingIntfGroupMembershipInterval + Integer32, + msanSwitchIGMPSnoopingIntfMaxResponseTime + Integer32, + msanSwitchIGMPSnoopingIntfMRPExpirationTime + Integer32, + msanSwitchIGMPSnoopingIntfFastLeaveAdminMode + INTEGER, + msanSwitchIGMPSnoopingStaticIntfMulticastRouterMode + INTEGER, + msanSwitchIGMPSnoopingIntfVlanIDs + VlanList + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.4.1.1 + msanSwitchIGMPSnoopingIntfIndex OBJECT-TYPE + SYNTAX Unsigned32 (1..65535) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The port number to be selected. Each port maps to an interface." + ::= { msanSwitchIGMPSnoopingStaticIntfMulticastRouterEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.4.1.2 + msanSwitchIGMPSnoopingIntfAdminMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "This enables or disables IGMP Snooping on a selected interface." + DEFVAL { disable } + ::= { msanSwitchIGMPSnoopingStaticIntfMulticastRouterEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.4.1.3 + msanSwitchIGMPSnoopingIntfGroupMembershipInterval OBJECT-TYPE + SYNTAX Integer32 (2..3600) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "The amount of time in seconds that a switch will wait for a report + from a particular group on the selected interface before deleting the + interface from the entry. This value must be greater than + agentSwitchIGMPSnoopingIntfMaxResponseTime." + DEFVAL { 260 } + ::= { msanSwitchIGMPSnoopingStaticIntfMulticastRouterEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.4.1.4 + msanSwitchIGMPSnoopingIntfMaxResponseTime OBJECT-TYPE + SYNTAX Integer32 (1..3599) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "The amount of time in seconds a switch will wait after sending + a query on the selected interface because it did not receive a report for + a particular group in that interface. This value must be less + than agentSwitchIGMPSnoopingIntfGroupMembershipInterval." + DEFVAL { 10 } + ::= { msanSwitchIGMPSnoopingStaticIntfMulticastRouterEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.4.1.5 + msanSwitchIGMPSnoopingIntfMRPExpirationTime OBJECT-TYPE + SYNTAX Integer32 (0..3600) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "The amount of time in seconds that a switch will wait for a query to be + received on the selected interface before the interface is removed from + the list of interfaces with multicast routers attached." + DEFVAL { 0 } + ::= { msanSwitchIGMPSnoopingStaticIntfMulticastRouterEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.4.1.6 + msanSwitchIGMPSnoopingIntfFastLeaveAdminMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "This enables or disables IGMP Snooping Fast-Leave on specified interface." + DEFVAL { disable } + ::= { msanSwitchIGMPSnoopingStaticIntfMulticastRouterEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.4.1.7 + msanSwitchIGMPSnoopingStaticIntfMulticastRouterMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Mode of static IGMP Mrouter on selected interface." + ::= { msanSwitchIGMPSnoopingStaticIntfMulticastRouterEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.4.1.8 + msanSwitchIGMPSnoopingIntfVlanIDs OBJECT-TYPE + SYNTAX VlanList + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "This field lists all the VlanIDs which include the selected interface." + ::= { msanSwitchIGMPSnoopingStaticIntfMulticastRouterEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.5 + msanSwitchIGMPVlanStaticMrouterTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanSwitchIGMPVlanStaticMrouterEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + ::= { msanIgmpSnooping 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.5.1 + msanSwitchIGMPVlanStaticMrouterEntry OBJECT-TYPE + SYNTAX MsanSwitchIGMPVlanStaticMrouterEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + INDEX { ifIndex, dot1qVlanIndex } + ::= { msanSwitchIGMPVlanStaticMrouterTable 1 } + + + MsanSwitchIGMPVlanStaticMrouterEntry ::= + SEQUENCE { + msanSwitchIGMPVlanStaticMrouterEnableState + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.5.1.1 + msanSwitchIGMPVlanStaticMrouterEnableState OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "Object used to create a new row or modify or destroy an existing row in manner described in the definition of the RowStatus textual. + Supported states are Active(1), CreateAndGo(4) and Destroy(6). + + Row is created with CreateAndGo(4). This enables IGMP Mrouter on a per-interface per-vlan basis and + the row goes to Active(1). The row is removed with Destroy(6) and IGMP Mrouter on this interface/VLAN pair is disabled. + + Values NotInService(2), NotReady(3) and CreateAndWait(5) are not supported." + ::= { msanSwitchIGMPVlanStaticMrouterEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.6 + msanSwitchIGMPSnoopingVlanTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanSwitchIGMPSnoopingVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A table of the IGMP Snooping Vlan configuration entries." + REFERENCE + "agentSwitchIGMPSnoopingVlanTable - 1.3.6.1.4.1.6132.1.1.1.2.8.8.1" + ::= { msanIgmpSnooping 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.6.1 + msanSwitchIGMPSnoopingVlanEntry OBJECT-TYPE + SYNTAX MsanSwitchIGMPSnoopingVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Represents entry for a IGMP Snooping Vlan." + INDEX { dot1qVlanIndex } + ::= { msanSwitchIGMPSnoopingVlanTable 1 } + + + MsanSwitchIGMPSnoopingVlanEntry ::= + SEQUENCE { + msanSwitchIGMPSnoopingVlanAdminMode + INTEGER, + msanSwitchIGMPSnoopingVlanGroupMembershipInterval + Integer32, + msanSwitchIGMPSnoopingVlanMaxResponseTime + Integer32, + msanSwitchIGMPSnoopingVlanFastLeaveAdminMode + INTEGER, + msanSwitchIGMPSnoopingVlanMRPExpirationTime + Integer32, + msanSwitchIGMPSnoopingVlanAdminState + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.6.1.1 + msanSwitchIGMPSnoopingVlanAdminMode OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "This enables or disables IGMP Snooping on a selected Vlan interface." + DEFVAL { disable } + ::= { msanSwitchIGMPSnoopingVlanEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.6.1.2 + msanSwitchIGMPSnoopingVlanGroupMembershipInterval OBJECT-TYPE + SYNTAX Integer32 (2..3600) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "The amount of time in seconds that a switch will wait for a report + from a particular group on the selected vlan before deleting the + interface participating in the vlan from the entry. This value must + be greater than agentSwitchIGMPSnoopingIntfMaxResponseTime." + DEFVAL { 260 } + ::= { msanSwitchIGMPSnoopingVlanEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.6.1.3 + msanSwitchIGMPSnoopingVlanMaxResponseTime OBJECT-TYPE + SYNTAX Integer32 (1..3599) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "The amount of time in seconds a switch will wait after sending + a query on the selected vlan because it did not receive a report for + a particular group in the interface participating in the vlan. + This value must be less than + agentSwitchIGMPSnoopingIntfGroupMembershipInterval." + DEFVAL { 10 } + ::= { msanSwitchIGMPSnoopingVlanEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.6.1.4 + msanSwitchIGMPSnoopingVlanFastLeaveAdminMode OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "This enables or disables IGMP Snooping on the selected vlan." + DEFVAL { disable } + ::= { msanSwitchIGMPSnoopingVlanEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.6.1.5 + msanSwitchIGMPSnoopingVlanMRPExpirationTime OBJECT-TYPE + SYNTAX Integer32 (0..3600) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "The amount of time in seconds that a switch will wait for a query to be + received on the selected interface participating in the vlan before the + interface is removed from the list of interfaces with multicast routers + attached. This parameter is configurable only for exisiting Vlans." + DEFVAL { 0 } + ::= { msanSwitchIGMPSnoopingVlanEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.6.1.6 + msanSwitchIGMPSnoopingVlanAdminState OBJECT-TYPE + SYNTAX INTEGER + { + disableAndDiscard(0), + disableAndBroadcast(1), + enable(2), + enableAndUnknownGroupFlood(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IGMP Snooping state on a selected Vlan interface. + + This parameter is ignored if global msanIgmpSnoopingAdminState value + is disableAndDiscard(0) or disableAndBroadcast(1)." + DEFVAL { disableAndDiscard } + ::= { msanSwitchIGMPSnoopingVlanEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.7 + msanSwitchIGMPProxyVlanTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanSwitchIGMPProxyVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A table of the IGMP Proxy Vlan configuration entries." + ::= { msanIgmpSnooping 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.7.1 + msanSwitchIGMPProxyVlanEntry OBJECT-TYPE + SYNTAX MsanSwitchIGMPProxyVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " " + INDEX { dot1qVlanIndex, msanSwitchIGMPProxyVlanIpAddr } + ::= { msanSwitchIGMPProxyVlanTable 1 } + + + MsanSwitchIGMPProxyVlanEntry ::= + SEQUENCE { + msanSwitchIGMPProxyVlanIpAddr + IpAddress, + msanSwitchIGMPProxyVlanRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.7.1.1 + msanSwitchIGMPProxyVlanIpAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "IGMP Proxy IP address. If set to 0.0.0.0, default IP address is + used (IP address of MN interface -> msanNetworkIPAddress)." + ::= { msanSwitchIGMPProxyVlanEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.7.1.2 + msanSwitchIGMPProxyVlanRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanSwitchIGMPProxyVlanEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8 + msanIgmpStatistics OBJECT IDENTIFIER ::= { msanIgmpSnooping 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.1 + msanIgmpStatGlobal OBJECT IDENTIFIER ::= { msanIgmpStatistics 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.1.1 + msanIgmpStatRxV1 OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received IGMP v1 packets." + ::= { msanIgmpStatGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.1.2 + msanIgmpStatRxV2Join OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received IGMP v2 join packets." + ::= { msanIgmpStatGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.1.3 + msanIgmpStatRxV2Leave OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received IGMP v2 leave packets." + ::= { msanIgmpStatGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.1.4 + msanIgmpStatRxV3Report OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received IGMP v3 report packets." + ::= { msanIgmpStatGlobal 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.1.5 + msanIgmpStatRxQuery OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received IGMP query packets." + ::= { msanIgmpStatGlobal 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.1.6 + msanIgmpStatRxError OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received corrupted or unknown IGMP packets." + ::= { msanIgmpStatGlobal 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.1.7 + msanIgmpStatRxBlockByIgmpFilter OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received IGMP packets blocked by IGMP filter." + ::= { msanIgmpStatGlobal 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.1.8 + msanIgmpStatRxBlockByMcastAcl OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received IGMP packets blocked by Multicast ACL." + ::= { msanIgmpStatGlobal 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.1.9 + msanIgmpStatRxBlockByMcastCac OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received IGMP packets blocked by Multicast CAC." + ::= { msanIgmpStatGlobal 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.1.10 + msanIgmpStatRxBlockByIgmpVersion OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received IGMP packets blocked by IGMP Version Control." + ::= { msanIgmpStatGlobal 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.2 + msanIgmpPortStatTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanIgmpPortStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanIgmpStatistics 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.2.1 + msanIgmpPortStatEntry OBJECT-TYPE + SYNTAX MsanIgmpPortStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanIgmpPortStatTable 1 } + + + MsanIgmpPortStatEntry ::= + SEQUENCE { + msanIgmpPortStatRxV1 + Counter32, + msanIgmpPortStatTxV1 + Counter32, + msanIgmpPortStatRxV2Join + Counter32, + msanIgmpPortStatTxV2Join + Counter32, + msanIgmpPortStatRxV2Leave + Counter32, + msanIgmpPortStatTxV2Leave + Counter32, + msanIgmpPortStatRxV3Report + Counter32, + msanIgmpPortStatTxV3Report + Counter32, + msanIgmpPortStatRxQuery + Counter32, + msanIgmpPortStatRxError + Counter32, + msanIgmpPortStatRxBlockByIgmpFilter + Counter32, + msanIgmpPortStatRxBlockByMcastAcl + Counter32, + msanIgmpPortStatRxBlockByMcastCac + Counter32, + msanIgmpPortStatTxQuery + Counter32, + msanIgmpPortStatRxBlockByIgmpVersion + Counter32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.2.1.1 + msanIgmpPortStatRxV1 OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received IGMP v1 packets." + ::= { msanIgmpPortStatEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.2.1.2 + msanIgmpPortStatTxV1 OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of transmitted IGMP v1 packets." + ::= { msanIgmpPortStatEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.2.1.3 + msanIgmpPortStatRxV2Join OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received IGMP v2 join packets." + ::= { msanIgmpPortStatEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.2.1.4 + msanIgmpPortStatTxV2Join OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of transmitted IGMP v2 join packets." + ::= { msanIgmpPortStatEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.2.1.5 + msanIgmpPortStatRxV2Leave OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received IGMP v2 leave packets." + ::= { msanIgmpPortStatEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.2.1.6 + msanIgmpPortStatTxV2Leave OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of transmitted IGMP v2 leave packets." + ::= { msanIgmpPortStatEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.2.1.7 + msanIgmpPortStatRxV3Report OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received IGMP v3 report packets." + ::= { msanIgmpPortStatEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.2.1.8 + msanIgmpPortStatTxV3Report OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of transmitted IGMP v3 report packets." + ::= { msanIgmpPortStatEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.2.1.9 + msanIgmpPortStatRxQuery OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received IGMP query packets." + ::= { msanIgmpPortStatEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.2.1.10 + msanIgmpPortStatRxError OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received corrupted or unknown IGMP packets." + ::= { msanIgmpPortStatEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.2.1.11 + msanIgmpPortStatRxBlockByIgmpFilter OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received IGMP packets blocked by IGMP filter." + ::= { msanIgmpPortStatEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.2.1.12 + msanIgmpPortStatRxBlockByMcastAcl OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received IGMP packets blocked by Multicast ACL." + ::= { msanIgmpPortStatEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.2.1.13 + msanIgmpPortStatRxBlockByMcastCac OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received IGMP packets blocked by Multicast CAC." + ::= { msanIgmpPortStatEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.2.1.14 + msanIgmpPortStatTxQuery OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of transmitted IGMP query packets." + ::= { msanIgmpPortStatEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.8.8.2.1.15 + msanIgmpPortStatRxBlockByIgmpVersion OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received IGMP packets blocked by IGMP Version." + ::= { msanIgmpPortStatEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.10 + msanPort OBJECT IDENTIFIER ::= { msanAdditionalConf 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.10.1 + msanPortGlobal OBJECT IDENTIFIER ::= { msanPort 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.10.2 + msanPortTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanPort 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.10.2.1 + msanPortEntry OBJECT-TYPE + SYNTAX MsanPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanPortTable 1 } + + + MsanPortEntry ::= + SEQUENCE { + msanPortMNFlag + INTEGER, + msanPortMasterSlave + INTEGER, + msanPortNegCapAdvertisedBits + BITS, + msanPortSpeedDuplex + INTEGER, + msanPortStpP2PAutoState + INTEGER, + msanPortUsageType + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.10.2.1.1 + msanPortMNFlag OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This object determines whether to allow or not allow management access to a specific link. The factory default is enabled. " + DEFVAL { enable } + ::= { msanPortEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.10.2.1.6 + msanPortMasterSlave OBJECT-TYPE + SYNTAX INTEGER + { + none(1), + master(2), + slave(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This object determines whether Gb port should be master or slave. Set to none when + auto-negotiation and for non-Gb ports." + DEFVAL { none } + ::= { msanPortEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.10.2.1.7 + msanPortNegCapAdvertisedBits OBJECT-TYPE + SYNTAX BITS + { + bOther(0), + b10baseT(1), + b10baseTFD(2), + b100baseT4(3), + b100baseTX(4), + b100baseTXFD(5), + b100baseT2(6), + b100baseT2FD(7), + bFdxPause(8), + bFdxAPause(9), + bFdxSPause(10), + bFdxBPause(11), + b1000baseX(12), + b1000baseXFD(13), + b1000baseT(14), + b1000baseTFD(15) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "A value that uniquely identifies the set of capabilities advertised by + the local auto-negotiation entity. + + Note that the local auto-negotiation entity may advertise some capabilities + beyond the scope of this MIB. This is indicated by returning the bit value + bOther in addition to any bit values for capabilities that are listed above. + + Only b1000baseXFD(13) and b1000baseTFD(15) are currently supported." + REFERENCE + "[IEEE 802.3 Std], 30.6.1.1.6, aAutoNegAdvertisedTechnologyAbility; + ifMauAutoNegCapAdvertisedBits (OID 1.3.6.1.2.1.26.5.1.1.11)" + ::= { msanPortEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.10.2.1.8 + msanPortSpeedDuplex OBJECT-TYPE + SYNTAX INTEGER + { + speed10MbpsHD(10), + speed10MbpsFD(11), + speed100MbpsHD(15), + speed100MbpsFD(16), + speed100MbpsFDFiber(18), + speed1000MbpsFDFiber(26), + speed1000MbpsFD(30), + speed10GbpsFDFiber(31) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Speed and duplex mode of the interface." + ::= { msanPortEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.10.2.1.20 + msanPortStpP2PAutoState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The field extends ISKRATEL-MSAN-BASICCONF-MIB.agentStpCstPortOperPointToPoint by the value." + DEFVAL { enable } + ::= { msanPortEntry 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.10.2.1.21 + msanPortUsageType OBJECT-TYPE + SYNTAX INTEGER + { + uplink(1), + access(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This object specifies the type of an interface whether it is an uplink or access port. + If you change this value you must save configuration and restart network element. + " + ::= { msanPortEntry 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11 + msanPppoeIA OBJECT IDENTIFIER ::= { msanAdditionalConf 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.1 + msanPppoeIAGlobal OBJECT IDENTIFIER ::= { msanPppoeIA 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.1.1 + msanPppoeIAStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies if the PPPOE Intermadiate Agent Service is to be Enabled or Disabled." + ::= { msanPppoeIAGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.1.2 + msanPppoeIAVsaReplyMode OBJECT-TYPE + SYNTAX INTEGER + { + keep(1), + remove(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies PPPOE Intermadiate Agent keep/remove option 82 in replies." + ::= { msanPppoeIAGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.1.3 + msanPppoeIACircuitIdStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the disable/enable inserting Circuit ID suboption." + ::= { msanPppoeIAGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.1.4 + msanPppoeIARemoteIdStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the disable/enable inserting Remote ID suboption." + ::= { msanPppoeIAGlobal 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.1.5 + msanPppoeIACircuitIdInnerVlan OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Include Inner VLAN (C-VLAN) in Circuit Id when port is in DVLAN Tunneling mode (msanPortDVlanTagMode = enable)." + DEFVAL { disable } + ::= { msanPppoeIAGlobal 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.1.6 + msanPppoeIACircuitIdCustomFormat OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "PPPoE Circuit Id Custom format definition composed of arbitrary characters and variable macros. + + Use '$[h][[0|s]][d[]]' format to specify: + h HEX variable format + 0|s left padding with zeroes or spaces + - maximum variable length + d use custom delimiter for MAC/IP + - delimiting character + variable macro + + Supported macros: + $SHELF - A string variable representing the shelf name as configured + or acquired by this device. + $CHASSIS - A numeric variable ranging [0..99] and representing numerical + identification of shelf. + $PANEL - Panel indicator: 0 front panel, 1 back panel. + $INTF_TYPE - Interface type: eth, dsl, gpon, mng, lag, atm, etc. + $AGENT_BOARD - Local board position (slot number) of DHCP Relay Agent. + $PORT - ID of local port the DHCP packet is received on. + $PORT_REM_ID - Complete remoteID string is inserted, as configured per + pertaining interface. + $INTF - ID of local interface the DHCP packet is received on in form + as used in interface configuration (e.g.: 1/2/1). + $INTF_DSCR - Interface description string taken exactly as configured + using 'description' command. + $PVC_INTF - ID of PVC interface the DHCP packet is received from (ADSL only). + $VPI - ID of ATM VPI the DHCP packet is received in (ADSL only). + $VCI - ID of ATM VCI the DHCP packet is received in (ADSL only). + $CLNT_MAC - MAC address of DHCP client sending the packet. + $AGENT_MAC - Local DHCP Relay Agent MAC address. If this is a switching device + MNG address is used. If this is a routing device MAC address + of the receiving interface is used. + $AGENT_IPV4 - Local DHCP Relay Agent IP address. Management IPv4 address + is used if this is a switching device, or IPv4 address of + receiving interface is used if this is a routing device. + $VLAN - Outermost VLAN ID in which the DHCP packet has been received. + In case of single tagged frame this is VLAN ID of the frame. + In case of double (QinQ) tagged frame, this is service + provider VLAN ID. + $VLAN_NAME - The VLAN name, as it has been configured by user, + of outermost VLAN in which the DHCP packet is received. + $CVID - Valid only for double (QinQ) tagged frames. Customer (inner) + VLAN ID in which the DHCP packet has been received. + $SYSNAME - System name as configured in SNMP agent on this device. + $LOCATION - Location as configured in SNMP agent on this device. + $CONTACT - Contact as configured in SNMP agent on this device. + $HEX - Arbitrary array of hexadecimal values. + Format: $HEX + " + DEFVAL { "" } + ::= { msanPppoeIAGlobal 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.1.7 + msanPppoeIARemoteIdCustomFormat OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "PPPoE Remote Id Custom format definition composed of arbitrary characters and variable macros. + + Use '$[h][[0|s]][d[]]' format to specify: + h HEX variable format + 0|s left padding with zeroes or spaces + - maximum variable length + d use custom delimiter for MAC/IP + - delimiting character + variable macro + + Supported macros: + $SHELF - A string variable representing the shelf name as configured + or acquired by this device. + $CHASSIS - A numeric variable ranging [0..99] and representing numerical + identification of shelf. + $PANEL - Panel indicator: 0 front panel, 1 back panel. + $INTF_TYPE - Interface type: eth, dsl, gpon, mng, lag, atm, etc. + $AGENT_BOARD - Local board position (slot number) of DHCP Relay Agent. + $PORT - ID of local port the DHCP packet is received on. + $PORT_REM_ID - Complete remoteID string is inserted, as configured per + pertaining interface. + $INTF - ID of local interface the DHCP packet is received on in form + as used in interface configuration (e.g.: 1/2/1). + $INTF_DSCR - Interface description string taken exactly as configured + using 'description' command. + $PVC_INTF - ID of PVC interface the DHCP packet is received from (ADSL only). + $VPI - ID of ATM VPI the DHCP packet is received in (ADSL only). + $VCI - ID of ATM VCI the DHCP packet is received in (ADSL only). + $CLNT_MAC - MAC address of DHCP client sending the packet. + $AGENT_MAC - Local DHCP Relay Agent MAC address. If this is a switching device + MNG address is used. If this is a routing device MAC address + of the receiving interface is used. + $AGENT_IPV4 - Local DHCP Relay Agent IP address. Management IPv4 address + is used if this is a switching device, or IPv4 address of + receiving interface is used if this is a routing device. + $VLAN - Outermost VLAN ID in which the DHCP packet has been received. + In case of single tagged frame this is VLAN ID of the frame. + In case of double (QinQ) tagged frame, this is service + provider VLAN ID. + $VLAN_NAME - The VLAN name, as it has been configured by user, + of outermost VLAN in which the DHCP packet is received. + $CVID - Valid only for double (QinQ) tagged frames. Customer (inner) + VLAN ID in which the DHCP packet has been received. + $SYSNAME - System name as configured in SNMP agent on this device. + $LOCATION - Location as configured in SNMP agent on this device. + $CONTACT - Contact as configured in SNMP agent on this device. + $HEX - Arbitrary array of hexadecimal values. + Format: $HEX + " + DEFVAL { "$PORT_REM_ID" } + ::= { msanPppoeIAGlobal 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.2 + msanPppoeIAPortTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanPppoeIAPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanPppoeIA 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.2.1 + msanPppoeIAPortEntry OBJECT-TYPE + SYNTAX MsanPppoeIAPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanPppoeIAPortTable 1 } + + + MsanPppoeIAPortEntry ::= + SEQUENCE { + msanPppoeIAPortStatus + INTEGER, + msanPppoeIAPortRemoteId + OCTET STRING, + msanPppoeIAPortCircuitType + INTEGER, + msanPppoeIAPortCircuitIdType + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.2.1.1 + msanPppoeIAPortStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2), + enableClient(3), + enableServer(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "State of PPPoE Intermadiate Agent on the port" + ::= { msanPppoeIAPortEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.2.1.2 + msanPppoeIAPortRemoteId OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Remote Id for the port." + ::= { msanPppoeIAPortEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.2.1.3 + msanPppoeIAPortCircuitType OBJECT-TYPE + SYNTAX INTEGER + { + trusted(1), + untrusted(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "PPPoE IA Circuit type per port." + DEFVAL { untrusted } + ::= { msanPppoeIAPortEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.2.1.4 + msanPppoeIAPortCircuitIdType OBJECT-TYPE + SYNTAX INTEGER + { + iskratel(1), + atm(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Circuit Id syntax mode per port." + ::= { msanPppoeIAPortEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3 + msanPppoeIaStatistics OBJECT IDENTIFIER ::= { msanPppoeIA 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3.1 + msanPppoeIaStatPADI OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of PADI packets." + ::= { msanPppoeIaStatistics 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3.2 + msanPppoeIaStatPADR OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of PADR packets." + ::= { msanPppoeIaStatistics 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3.3 + msanPppoeIaStatPADO OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of PADO packets." + ::= { msanPppoeIaStatistics 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3.4 + msanPppoeIaStatPADS OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of PADS packets." + ::= { msanPppoeIaStatistics 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3.5 + msanPppoeIaStatPADT OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of PADT packets." + ::= { msanPppoeIaStatistics 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3.6 + msanPppoeIaStatUnsutableFrames OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of packets with unsutable frame." + ::= { msanPppoeIaStatistics 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3.7 + msanPppoeIaStatUnknownFrames OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of packets with unknown frame." + ::= { msanPppoeIaStatistics 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3.8 + msanPppoeIaStatInvalidFrames OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of packets with invalid frame." + ::= { msanPppoeIaStatistics 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3.9 + msanPppoeIaPortStatisticsTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanPppoeIaPortStatisticsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanPppoeIaStatistics 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3.9.1 + msanPppoeIaPortStatisticsEntry OBJECT-TYPE + SYNTAX MsanPppoeIaPortStatisticsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanPppoeIaPortStatisticsTable 1 } + + + MsanPppoeIaPortStatisticsEntry ::= + SEQUENCE { + msanPppoeIaPortStatPADI + Counter32, + msanPppoeIaPortStatPADR + Counter32, + msanPppoeIaPortStatPADO + Counter32, + msanPppoeIaPortStatPADS + Counter32, + msanPppoeIaPortStatPADT + Counter32, + msanPppoeIaPortStatUnsutableFrames + Counter32, + msanPppoeIaPortStatUnknownFrames + Counter32, + msanPppoeIaPortStatInvalidFrames + Counter32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3.9.1.1 + msanPppoeIaPortStatPADI OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of PADI packets on the port. " + ::= { msanPppoeIaPortStatisticsEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3.9.1.2 + msanPppoeIaPortStatPADR OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of PADR packets on the port. " + ::= { msanPppoeIaPortStatisticsEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3.9.1.3 + msanPppoeIaPortStatPADO OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of PADO packets on the port. " + ::= { msanPppoeIaPortStatisticsEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3.9.1.4 + msanPppoeIaPortStatPADS OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of PADS packets on the port. " + ::= { msanPppoeIaPortStatisticsEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3.9.1.5 + msanPppoeIaPortStatPADT OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of PADT packets on the port. " + ::= { msanPppoeIaPortStatisticsEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3.9.1.6 + msanPppoeIaPortStatUnsutableFrames OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of packets with unsutable frame on the port. " + ::= { msanPppoeIaPortStatisticsEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3.9.1.7 + msanPppoeIaPortStatUnknownFrames OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of packets with unknown frame on the port. " + ::= { msanPppoeIaPortStatisticsEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.3.9.1.8 + msanPppoeIaPortStatInvalidFrames OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of packets with invalid frame on the port. " + ::= { msanPppoeIaPortStatisticsEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.4 + msanPppoeIaVlanTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanPppoeIaVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanPppoeIA 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.4.1 + msanPppoeIaVlanEntry OBJECT-TYPE + SYNTAX MsanPppoeIaVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { dot1qVlanIndex } + ::= { msanPppoeIaVlanTable 1 } + + + MsanPppoeIaVlanEntry ::= + SEQUENCE { + msanPppoeIaVlanStatus + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.11.4.1.1 + msanPppoeIaVlanStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "State of PPPoE Intermadiate Agent per VLAN." + ::= { msanPppoeIaVlanEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12 + msanQoS OBJECT IDENTIFIER ::= { msanAdditionalConf 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.1 + msanQosGlobal OBJECT IDENTIFIER ::= { msanQoS 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2 + msanIpAclRuleTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanIpAclRuleEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "This table extends aclTable/aclRuleTable." + ::= { msanQoS 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1 + msanIpAclRuleEntry OBJECT-TYPE + SYNTAX MsanIpAclRuleEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "This table extends aclTable/aclRuleTable." + INDEX { msanIpAclIndex, msanIpAclRuleIndex } + ::= { msanIpAclRuleTable 1 } + + + MsanIpAclRuleEntry ::= + SEQUENCE { + msanIpAclIndex + Integer32, + msanIpAclRuleIndex + Integer32, + msanIpAclRuleAssignVlanId + Integer32, + msanIpAclRuleAssignCoSPriority + Integer32, + msanIpAclRuleEgressIntf + Integer32, + msanIpAclRuleAssignVlanId2 + Integer32, + msanIpAclRuleRemoveVlanId + INTEGER, + msanIpAclRuleIcmpType + INTEGER, + msanIpAclRuleDestMacAddr + MacAddress, + msanIpAclRuleDestMacMask + MacAddress, + msanIpAclRuleSrcMacAddr + MacAddress, + msanIpAclRuleSrcMacMask + MacAddress, + msanIpAclRuleCos + INTEGER, + msanIpAclRuleCos2 + INTEGER, + msanIpAclRuleVlanId + Unsigned32, + msanIpAclRuleVlanId2 + Unsigned32, + msanIpAclRuleCVlanId + Integer32, + msanIpAclRuleSVlanId + Integer32, + msanIpAclRuleAssignCVlanId + Integer32, + msanIpAclRuleAssignSVlanId + Integer32, + msanIpAclRuleRemoveSVlanId + INTEGER, + msanIpAclRuleVlanIdRangeStart + Unsigned32, + msanIpAclRuleVlanIdRangeEnd + Unsigned32, + msanIpAclRuleVlanId2RangeStart + Unsigned32, + msanIpAclRuleVlanId2RangeEnd + Unsigned32, + msanIpAclRuleSVlanIdRangeStart + Unsigned32, + msanIpAclRuleSVlanIdRangeEnd + Unsigned32, + msanIpAclRuleCVlanIdRangeStart + Unsigned32, + msanIpAclRuleCVlanIdRangeEnd + Unsigned32, + msanIpAclRuleSrcIpv6Address + InetAddressIPv6, + msanIpAclRuleSrcIpv6AddressMaskLen + Integer32, + msanIpAclRuleDestIpv6Address + InetAddressIPv6, + msanIpAclRuleDestIpv6AddressMaskLen + Integer32, + msanIpAclRuleAssignCPcp + Integer32, + msanIpAclRuleAssignSPcp + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.1 + msanIpAclIndex OBJECT-TYPE + SYNTAX Integer32 (1..199) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "This is aclIndex in aclTable" + ::= { msanIpAclRuleEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.2 + msanIpAclRuleIndex OBJECT-TYPE + SYNTAX Integer32 (1..9) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The index of the IP ACL rule (aclRuleIndex in aclRuleTable)." + ::= { msanIpAclRuleEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.3 + msanIpAclRuleAssignVlanId OBJECT-TYPE + SYNTAX Integer32 (0..4095) + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "Assign VLAN Id." + ::= { msanIpAclRuleEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.4 + msanIpAclRuleAssignCoSPriority OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "Assign CoS priority" + ::= { msanIpAclRuleEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.5 + msanIpAclRuleEgressIntf OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "Egress interface ID (ifIndex/ifTable)." + ::= { msanIpAclRuleEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.6 + msanIpAclRuleAssignVlanId2 OBJECT-TYPE + SYNTAX Integer32 (0..4095) + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "Assign Secondary VLAN ID -> add (if not exists) or change." + ::= { msanIpAclRuleEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.7 + msanIpAclRuleRemoveVlanId OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "Remove VLAN Id (outer)." + DEFVAL { disable } + ::= { msanIpAclRuleEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.8 + msanIpAclRuleIcmpType OBJECT-TYPE + SYNTAX INTEGER + { + echoReply(0), + destinationUnreachable(3), + sourceQuench(4), + redirect(5), + echoRequest(8), + routerAdvertisement(9), + routerSolicitation(10), + timeExceeded(11), + parameterProblem(12), + timestampRequest(13), + timestampReply(14), + informationRequest(15), + informationReply(16), + addressMaskRequest(17), + addressMaskReply(18) + } + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "ICMP message type used in the MAC ACL Classification. + + This parameter is used if aclRuleProtocol is set to icmp(1)." + ::= { msanIpAclRuleEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.9 + msanIpAclRuleDestMacAddr OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Destination MAC address used in the Advanced IP ACL Classification. + + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.10 + msanIpAclRuleDestMacMask OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Destination MAC address mask used in the Advanced IP Classification. + + This mask value identifies the portion of the msanIpAclRuleDestMacAddr + that is compared against a packet. A non-contiguous mask value is + permitted. + + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.11 + msanIpAclRuleSrcMacAddr OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Source MAC address used in the Advanced IP ACL Classification. + + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.12 + msanIpAclRuleSrcMacMask OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Source MAC address mask used in the Advanced IP Classification. + + This mask value identifies the portion of the msanIpAclRuleSrcMacAddr + that is compared against a packet. A non-contiguous mask value is + permitted. + + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.13 + msanIpAclRuleCos OBJECT-TYPE + SYNTAX INTEGER (0..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Class of Service (COS) used in the Advanced IP Classification. + + This is the three-bit user priority field in the 802.1Q tag + header of a tagged Ethernet frame. For frames containing a + double VLAN tag, this field is located in the first/outer tag. + + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299 + " + ::= { msanIpAclRuleEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.14 + msanIpAclRuleCos2 OBJECT-TYPE + SYNTAX INTEGER (0..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Secondary Class of Service (COS) used in the Advanced IP Classification. + + This is the three-bit user priority field in the second 802.1Q tag + header of a tagged Ethernet frame. + + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299 + " + ::= { msanIpAclRuleEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.15 + msanIpAclRuleVlanId OBJECT-TYPE + SYNTAX Unsigned32 (0..4095) + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "The VLAN ID value used in the Advanced IP Classification. + + The VLAN ID field is defined as the 12-bit VLAN identifier + in the 802.1Q tag header of a tagged Ethernet frame. This is + contained in the first/outer tag of a double VLAN tagged frame. + + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299 + " + ::= { msanIpAclRuleEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.16 + msanIpAclRuleVlanId2 OBJECT-TYPE + SYNTAX Unsigned32 (0..4095) + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "The Secondary VLAN ID value used in the Advanced IP Classification. + + The VLAN ID field is defined as the 12-bit VLAN identifier + in the second 802.1Q tag header of a tagged Ethernet frame. + + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299 + " + ::= { msanIpAclRuleEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.17 + msanIpAclRuleCVlanId OBJECT-TYPE + SYNTAX Integer32 (0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The C-customer VLAN ID value used in the Advanced IP Classification. + + The VLAN ID field is defined as the 12-bit VLAN identifier + in the second 802.1Q tag header of a tagged Ethernet frame. + + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.18 + msanIpAclRuleSVlanId OBJECT-TYPE + SYNTAX Integer32 (0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The S-service VLAN ID value used in the Advanced IP Classification. + + The VLAN ID field is defined as the 12-bit VLAN identifier + in the 802.1Q tag header of a tagged Ethernet frame. This is + contained in the first/outer tag of a double VLAN tagged frame. + + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.19 + msanIpAclRuleAssignCVlanId OBJECT-TYPE + SYNTAX Integer32 (0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Assign C VLAN ID -> add (if not exists) or change. + + Used in the Advanced IP Classification. + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 19 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.20 + msanIpAclRuleAssignSVlanId OBJECT-TYPE + SYNTAX Integer32 (0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Assign S VLAN ID -> add (if not exists) or change. + + Used in the Advanced IP Classification. + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.21 + msanIpAclRuleRemoveSVlanId OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Remove S-service VLAN ID. + + Used in the Advanced IP Classification. + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.22 + msanIpAclRuleVlanIdRangeStart OBJECT-TYPE + SYNTAX Unsigned32 (0..4095) + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "The VLAN ID range start value used in the Advanced IP Classification. + Setting this value greater than the current msanIpAclRuleVlanIdRangeEnd + changes the VLAN ID range end to the same value as the range start. + + The VLAN ID field is defined as the 12-bit VLAN identifier + in the 802.1Q tag header of a tagged Ethernet frame. This is + contained in the first/outer tag of a double VLAN tagged frame. + + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 22 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.23 + msanIpAclRuleVlanIdRangeEnd OBJECT-TYPE + SYNTAX Unsigned32 (0..4095) + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "The VLAN ID range end value used in the Advanced IP Classification. + Setting this value less than the current msanIpAclRuleVlanIdRangeStart + changes the VLAN ID range start to the same value as the range end. + + The VLAN ID field is defined as the 12-bit VLAN identifier + in the 802.1Q tag header of a tagged Ethernet frame. This is + contained in the first/outer tag of a double VLAN tagged frame. + + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 23 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.24 + msanIpAclRuleVlanId2RangeStart OBJECT-TYPE + SYNTAX Unsigned32 (0..4095) + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "The Secondary VLAN ID range start value used in the Advanced IP Classification. + Setting this value greater than the current msanIpAclRuleVlanId2RangeEnd + changes the VLAN ID range end to the same value as the range start. + + The VLAN ID field is defined as the 12-bit VLAN identifier + in the second 802.1Q tag header of a tagged Ethernet frame. + + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 24 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.25 + msanIpAclRuleVlanId2RangeEnd OBJECT-TYPE + SYNTAX Unsigned32 (0..4095) + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "The Secondary VLAN ID range end value used in the Advanced IP Classification. + Setting this value less than the current msanIpAclRuleVlanId2RangeStart + changes the VLAN ID range start to the same value as the range end. + + The VLAN ID field is defined as the 12-bit VLAN identifier + in the second 802.1Q tag header of a tagged Ethernet frame. + + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 25 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.26 + msanIpAclRuleSVlanIdRangeStart OBJECT-TYPE + SYNTAX Unsigned32 (0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The S-service VLAN ID range start value used in the Advanced IP Classification. + Setting this value greater than the current msanIpAclRuleSVlanIdRangeEnd + changes the VLAN ID range end to the same value as the range start. + + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 26 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.27 + msanIpAclRuleSVlanIdRangeEnd OBJECT-TYPE + SYNTAX Unsigned32 (0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The S-service VLAN ID range end value used in the Advanced IP Classification. + Setting this value less than the current msanIpAclRuleSVlanIdRangeStart + changes the VLAN ID range start to the same value as the range end. + + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 27 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.28 + msanIpAclRuleCVlanIdRangeStart OBJECT-TYPE + SYNTAX Unsigned32 (0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The C-customer VLAN ID range start value used in the Advanced IP Classification. + Setting this value greater than the current msanIpAclRuleCVlanIdRangeEnd + changes the VLAN ID range end to the same value as the range start. + + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 28 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.29 + msanIpAclRuleCVlanIdRangeEnd OBJECT-TYPE + SYNTAX Unsigned32 (0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The C-customer VLAN ID range end value used in the Advanced IP Classification. + Setting this value less than the current msanIpAclRuleCVlanIdRangeStart + changes the VLAN ID range start to the same value as the range end. + + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 29 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.31 + msanIpAclRuleSrcIpv6Address OBJECT-TYPE + SYNTAX InetAddressIPv6 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Source IPv6 Address used in the ACL Classification. + " + ::= { msanIpAclRuleEntry 31 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.32 + msanIpAclRuleSrcIpv6AddressMaskLen OBJECT-TYPE + SYNTAX Integer32 (0..128) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The length of the prefix (in bits) associated with the + IPv6 source address of this entry (msanIpAclRuleSrcIpv6Address). + + Value 0 indicates that parameter has not been defined." + DEFVAL { 0 } + ::= { msanIpAclRuleEntry 32 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.33 + msanIpAclRuleDestIpv6Address OBJECT-TYPE + SYNTAX InetAddressIPv6 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Destination IPv6 Address used in the ACL Classification. + " + ::= { msanIpAclRuleEntry 33 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.34 + msanIpAclRuleDestIpv6AddressMaskLen OBJECT-TYPE + SYNTAX Integer32 (0..128) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The length of the prefix (in bits) associated with the + IPv6 destination address of this entry (msanIpAclRuleDestIpv6Address). + + Value 0 indicates that parameter has not been defined." + DEFVAL { 0 } + ::= { msanIpAclRuleEntry 34 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.35 + msanIpAclRuleAssignCPcp OBJECT-TYPE + SYNTAX Integer32 (0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Assign Customer PCP (Priority Code Point) - + PCP is also known as Class of Service (CoS) bits. + A value of -1 indicates that parameter has not been defined. + This parameter can be used only if msanIpAclRuleAssignCVlanId is already set. + + Used in the Advanced IP Classification. + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 35 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.2.1.36 + msanIpAclRuleAssignSPcp OBJECT-TYPE + SYNTAX Integer32 (0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Assign Service PCP (Priority Code Point). + PCP is also known as Class of Service (CoS) bits. + A value of -1 indicates that parameter has not been defined. + This parameter can be used only if msanIpAclRuleAssignSVlanId is already set. + + Used in the Advanced IP Classification. + Advanced IP ACL: msanIpAclIndex value in range 200 ... 299" + ::= { msanIpAclRuleEntry 36 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3 + msanMacAclRuleTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMacAclRuleEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "This table extends aclMacTable/aclMacRuleTable." + ::= { msanQoS 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1 + msanMacAclRuleEntry OBJECT-TYPE + SYNTAX MsanMacAclRuleEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "This table extends aclMacTable/aclMacRuleTable." + INDEX { msanMacAclIndex, msanMacAclRuleIndex } + ::= { msanMacAclRuleTable 1 } + + + MsanMacAclRuleEntry ::= + SEQUENCE { + msanMacAclIndex + Integer32, + msanMacAclRuleIndex + Integer32, + msanMacAclRuleEgressIntf + Integer32, + msanMacAclRuleAssignVlanId + Integer32, + msanMacAclRuleAssignCoSPriority + Integer32, + msanMacAclRuleAssignVlanId2 + Integer32, + msanMacAclRuleRemoveVlanId + INTEGER, + msanMacAclRuleCVlanId + Integer32, + msanMacAclRuleSVlanId + Integer32, + msanMacAclRuleAssignCVlanId + Integer32, + msanMacAclRuleAssignSVlanId + Integer32, + msanMacAclRuleRemoveSVlanId + INTEGER, + msanMacAclRuleSVlanIdRangeStart + Unsigned32, + msanMacAclRuleSVlanIdRangeEnd + Unsigned32, + msanMacAclRuleCVlanIdRangeStart + Unsigned32, + msanMacAclRuleCVlanIdRangeEnd + Unsigned32, + msanMacAclRuleAssignCPcp + Integer32, + msanMacAclRuleAssignSPcp + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1.1 + msanMacAclIndex OBJECT-TYPE + SYNTAX Integer32 (1..1000) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "This is aclMacIndex in aclMacTable" + ::= { msanMacAclRuleEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1.2 + msanMacAclRuleIndex OBJECT-TYPE + SYNTAX Integer32 (1..1000) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The index of the MAC ACL rule (aclMACRuleIndex in aclMACRuleTable)." + ::= { msanMacAclRuleEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1.3 + msanMacAclRuleEgressIntf OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "Egress Interface ID (ifIndex/ifTable)." + ::= { msanMacAclRuleEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1.4 + msanMacAclRuleAssignVlanId OBJECT-TYPE + SYNTAX Integer32 (0..4095) + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "Assign VLAN Id." + ::= { msanMacAclRuleEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1.5 + msanMacAclRuleAssignCoSPriority OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "Assign CoS priority" + ::= { msanMacAclRuleEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1.6 + msanMacAclRuleAssignVlanId2 OBJECT-TYPE + SYNTAX Integer32 (0..4095) + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "Assign Secondary VLAN ID -> add (if not exists) or change." + ::= { msanMacAclRuleEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1.7 + msanMacAclRuleRemoveVlanId OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "Remove outer VLAN Id (outer)." + DEFVAL { disable } + ::= { msanMacAclRuleEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1.8 + msanMacAclRuleCVlanId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "C-customer Vlan ID" + ::= { msanMacAclRuleEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1.9 + msanMacAclRuleSVlanId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "S-service Vlan ID" + ::= { msanMacAclRuleEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1.10 + msanMacAclRuleAssignCVlanId OBJECT-TYPE + SYNTAX Integer32 (0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Assign C-customer VLAN ID -> add (if not exists) or change." + ::= { msanMacAclRuleEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1.11 + msanMacAclRuleAssignSVlanId OBJECT-TYPE + SYNTAX Integer32 (0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Assign S-service VLAN ID -> add (if not exists) or change." + ::= { msanMacAclRuleEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1.12 + msanMacAclRuleRemoveSVlanId OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Remove S-service VLAN ID." + ::= { msanMacAclRuleEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1.13 + msanMacAclRuleSVlanIdRangeStart OBJECT-TYPE + SYNTAX Unsigned32 (0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The S-service VLAN ID range start value. + Setting this value greater than the current msanMacAclRuleSVlanIdRangeEnd + changes the VLAN ID range end to the same value as the range start. + " + ::= { msanMacAclRuleEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1.14 + msanMacAclRuleSVlanIdRangeEnd OBJECT-TYPE + SYNTAX Unsigned32 (0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The S-service VLAN ID range end value. + Setting this value less than the current msanMacAclRuleSVlanIdRangeStart + changes the VLAN ID range start to the same value as the range end." + ::= { msanMacAclRuleEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1.15 + msanMacAclRuleCVlanIdRangeStart OBJECT-TYPE + SYNTAX Unsigned32 (0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The C-customer VLAN ID range start value. + Setting this value greater than the current msanMacAclRuleCVlanIdRangeEnd + changes the VLAN ID range end to the same value as the range start. + " + ::= { msanMacAclRuleEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1.16 + msanMacAclRuleCVlanIdRangeEnd OBJECT-TYPE + SYNTAX Unsigned32 (0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The C-customer VLAN ID range end value. + Setting this value less than the current msanMacAclRuleCVlanIdRangeStart + changes the VLAN ID range start to the same value as the range end." + ::= { msanMacAclRuleEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1.17 + msanMacAclRuleAssignCPcp OBJECT-TYPE + SYNTAX Integer32 (0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Assign Customer PCP (Priority Code Point) - + PCP is also known as Class of Service (CoS) bits. + A value of -1 indicates that parameter has not been defined. + This parameter can be used only if msanMacAclRuleAssignCVlanId is already set. + " + ::= { msanMacAclRuleEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.3.1.18 + msanMacAclRuleAssignSPcp OBJECT-TYPE + SYNTAX Integer32 (0..4095) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Assign Service PCP (Priority Code Point) - + PCP is also known as Class of Service (CoS) bits. + A value of -1 indicates that parameter has not been defined. + This parameter can be used only if msanMacAclRuleAssignSVlanId is already set. + " + ::= { msanMacAclRuleEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.4 + msanCosQueueControlTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanCosQueueControlEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanQoS 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.4.1 + msanCosQueueControlEntry OBJECT-TYPE + SYNTAX MsanCosQueueControlEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanCosQueueControlTable 1 } + + + MsanCosQueueControlEntry ::= + SEQUENCE { + msanCosQueueControlIntfBurstSize + Integer32, + msanCosQueueIntfShapingRate + Unsigned32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.4.1.1 + msanCosQueueControlIntfBurstSize OBJECT-TYPE + SYNTAX Integer32 + UNITS "kilobyte" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the maximum number of uncommitted bytes that the switch will try to send into the network. It is the number of bytes that are sent at a rate, + higher than committed and that the next device in the network must be able to buffer without notifying a congestion. Default value is 0. + Valid values are 16, 20, 28, 40, 76, 140, 268 and 524 kilobytes. Configuring shaping rate without burst size will take the maximum possible value of burst, which is 524 KB. " + ::= { msanCosQueueControlEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.4.1.2 + msanCosQueueIntfShapingRate OBJECT-TYPE + SYNTAX Unsigned32 (0..10000000) + UNITS "kbps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the maximum bandwidth allowed, typically used to shape + the outbound transmission rate. This value is controlled independently + of any per-queue maximum bandwidth configuration. It is effectively a + second-level shaping mechanism. + Default value is 0. Valid Range is 0 to 10000000 kbps. The value 0 means + maximum is unlimited." + ::= { msanCosQueueControlEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.5 + msanCosQueueTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanCosQueueEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Table of class-of-service queue configuration + parameters for the specified interface. + + This is extension of the table agentCosQueueTable. " + REFERENCE + "agentCosQueueTable - 1.3.6.1.4.1.6132.1.1.3.3.2.4" + ::= { msanQoS 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.5.1 + msanCosQueueEntry OBJECT-TYPE + SYNTAX MsanCosQueueEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Each entry describes a single class-of-service (COS) + queue for a given Interface Index. The number of + configurable COS queues for an interface vary based + on device capabilities. + + All objects defined for this table entry contain a + default value corresponding to a typical, + non-preferential treatment of packets traversing the + interface's COS queues." + REFERENCE + "agentCosQueueTable - 1.3.6.1.4.1.6132.1.1.3.3.2.4" + INDEX { ifIndex, msanCosQueueIndex } + ::= { msanCosQueueTable 1 } + + + MsanCosQueueEntry ::= + SEQUENCE { + msanCosQueueIndex + Integer32, + msanCosQueueWeight + INTEGER, + msanCosQueueLength + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.5.1.1 + msanCosQueueIndex OBJECT-TYPE + SYNTAX Integer32 (0..1000) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The COS queue index, numbered 0 to (n-1), where n is + the total number of configurable interface queues for + the device as indicated by agentCosQueueNumQueuesPerPort. + In general, a higher numbered queue index is used to + support higher priority traffic, although actual + operation may be altered via configuration through + this table." + ::= { msanCosQueueEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.5.1.2 + msanCosQueueWeight OBJECT-TYPE + SYNTAX INTEGER (0..32) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Weight of the queue being used in egress scheduling algorithm." + ::= { msanCosQueueEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.5.1.3 + msanCosQueueLength OBJECT-TYPE + SYNTAX INTEGER (2..156) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Length of the queue in kB. " + DEFVAL { 40 } + ::= { msanCosQueueEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.6 + msanCosMapIntfTrustTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanCosMapIntfTrustEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanQoS 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.6.1 + msanCosMapIntfTrustEntry OBJECT-TYPE + SYNTAX MsanCosMapIntfTrustEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanCosMapIntfTrustTable 1 } + + + MsanCosMapIntfTrustEntry ::= + SEQUENCE { + msanCosMapIntfTrustMode + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.6.1.1 + msanCosMapIntfTrustMode OBJECT-TYPE + SYNTAX INTEGER + { + untrusted(1), + trustDot1p(2), + trustIpPrecedence(3), + trustIpDscp(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This is copy of LVL7 parameter agentCosMapIntfTrustMode, + except that index 0 is not supported. + + The class of service trust mode of an interface. + When set to a trusted mode, the appropriate COS + mapping table is used as follows: + + trustDot1p(2) : dot1dTrafficClassTable + trustIpPrecedence(3): agentCosMapIpPrecTable + trustIpDscp(4): agentCosMapIpDscpTable + + For an untrusted(1) interface, packets are handled in + accordance with the dot1dPortDefaultUserPriority value + of the ingress port. + " + ::= { msanCosMapIntfTrustEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7 + msanQosProfileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanQosProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanQoS 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1 + msanQosProfileEntry OBJECT-TYPE + SYNTAX MsanQosProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanQosProfileName } + ::= { msanQosProfileTable 1 } + + + MsanQosProfileEntry ::= + SEQUENCE { + msanQosProfileName + OCTET STRING, + msanQosProfileMatchInAny + INTEGER, + msanQosProfileMatchInMacDestAddr + MacAddress, + msanQosProfileMatchInMacDestMask + MacAddress, + msanQosProfileMatchInMacSrcAddr + MacAddress, + msanQosProfileMatchInMacSrcMask + MacAddress, + msanQosProfileMatchInCos + Integer32, + msanQosProfileMatchInCos2 + Integer32, + msanQosProfileMatchInVlanId + Integer32, + msanQosProfileMatchInVlanId2 + Integer32, + msanQosProfileMatchInEthertype + Integer32, + msanQosProfileMatchInIpProtocol + Integer32, + msanQosProfileMatchInIpSrcAddr + IpAddress, + msanQosProfileMatchInIpSrcMask + IpAddress, + msanQosProfileMatchInIpDestAddr + IpAddress, + msanQosProfileMatchInIpDestMask + IpAddress, + msanQosProfileMatchInIpDscp + Integer32, + msanQosProfileMatchInIpPrecedence + Integer32, + msanQosProfileMatchInIpTosBits + OCTET STRING, + msanQosProfileMatchInIpTosMask + OCTET STRING, + msanQosProfileMatchInL4SrcPort + Integer32, + msanQosProfileMatchInL4DestPort + Integer32, + msanQosProfileMatchOutAny + INTEGER, + msanQosProfileMatchOutMacDestAddr + MacAddress, + msanQosProfileMatchOutMacDestMask + MacAddress, + msanQosProfileMatchOutMacSrcAddr + MacAddress, + msanQosProfileMatchOutMacSrcMask + MacAddress, + msanQosProfileMatchOutCos + Integer32, + msanQosProfileMatchOutCos2 + Integer32, + msanQosProfileMatchOutVlanId + Integer32, + msanQosProfileMatchOutVlanId2 + Integer32, + msanQosProfileMatchOutEthertype + Integer32, + msanQosProfileMatchOutIpProtocol + Integer32, + msanQosProfileMatchOutIpSrcAddr + IpAddress, + msanQosProfileMatchOutIpSrcMask + IpAddress, + msanQosProfileMatchOutIpDestAddr + IpAddress, + msanQosProfileMatchOutIpDestMask + IpAddress, + msanQosProfileMatchOutIpDscp + Integer32, + msanQosProfileMatchOutIpPrecedence + Integer32, + msanQosProfileMatchOutIpTosBits + OCTET STRING, + msanQosProfileMatchOutIpTosMask + OCTET STRING, + msanQosProfileMatchOutL4SrcPort + Integer32, + msanQosProfileMatchOutL4DestPort + Integer32, + msanQosProfileInCdr + Integer32, + msanQosProfileInPdr + Integer32, + msanQosProfileOutCdr + Integer32, + msanQosProfileOutPdr + Integer32, + msanQosProfileInTrustMode + INTEGER, + msanQosProfileInMarkCos + INTEGER, + msanQosProfileInMarkDscp + INTEGER, + msanQosProfileRowStatus + RowStatus, + msanQosProfilePriority + INTEGER, + msanQosProfileInCdrBurstSize + Integer32, + msanQosProfileInPdrBurstSize + Integer32, + msanQosProfileOutCdrBurstSize + Integer32, + msanQosProfileOutPdrBurstSize + Integer32, + msanQosProfileMatchInSrcIpv6Address + InetAddressIPv6, + msanQosProfileMatchInSrcIpv6AddressMaskLen + Integer32, + msanQosProfileMatchInDestIpv6Address + InetAddressIPv6, + msanQosProfileMatchInDestIpv6AddressMaskLen + Integer32, + msanQosProfileMatchOutSrcIpv6Address + InetAddressIPv6, + msanQosProfileMatchOutSrcIpv6AddressMaskLen + Integer32, + msanQosProfileMatchOutDestIpv6Address + InetAddressIPv6, + msanQosProfileMatchOutDestIpv6AddressMaskLen + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.1 + msanQosProfileName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..32)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "QoS profile name." + ::= { msanQosProfileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.2 + msanQosProfileMatchInAny OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match every incoming packet frame." + DEFVAL { disable } + ::= { msanQosProfileEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.3 + msanQosProfileMatchInMacDestAddr OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified destination MAC address. + Empty string indicates that parameter has not been defined" + DEFVAL { ''b } + ::= { msanQosProfileEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.4 + msanQosProfileMatchInMacDestMask OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanQosProfileMatchInMacDestAddr that + is compared with input packet. + Empty string indicates that parameter has not been defined" + DEFVAL { ''b } + ::= { msanQosProfileEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.5 + msanQosProfileMatchInMacSrcAddr OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified source MAC address. + Empty string indicates that parameter has not been defined" + DEFVAL { ''b } + ::= { msanQosProfileEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.6 + msanQosProfileMatchInMacSrcMask OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanQosProfileMatchInMacSrcAddr that + is compared with input packet. + Empty string indicates that parameter has not been defined" + DEFVAL { ''b } + ::= { msanQosProfileEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.7 + msanQosProfileMatchInCos OBJECT-TYPE + SYNTAX Integer32 (-1..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified CoS value (0-7). + A value of -1 indicates that parameter has not been defined" + DEFVAL { -1 } + ::= { msanQosProfileEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.8 + msanQosProfileMatchInCos2 OBJECT-TYPE + SYNTAX Integer32 (-1..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified secondary (C-TAG) CoS value (0-7). + A value of -1 indicates that parameter has not been defined" + DEFVAL { -1 } + ::= { msanQosProfileEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.9 + msanQosProfileMatchInVlanId OBJECT-TYPE + SYNTAX Integer32 (-1..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified VLAN ID value (1-4094). + A value of -1 indicates that parameter has not been defined" + DEFVAL { -1 } + ::= { msanQosProfileEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.10 + msanQosProfileMatchInVlanId2 OBJECT-TYPE + SYNTAX Integer32 (-1..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified secondary (C-TAG) VLAN ID value (1-4094). + A value of -1 indicates that parameter has not been defined" + DEFVAL { -1 } + ::= { msanQosProfileEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.11 + msanQosProfileMatchInEthertype OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified EtherType value. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanQosProfileEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.12 + msanQosProfileMatchInIpProtocol OBJECT-TYPE + SYNTAX Integer32 (-1..255) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified IP protocol value. + A value of -1 indicates that parameter has not been defined. + Some of standard protocol values: + icmp - 1 + igmp - 2 + ip - 4 (ip in ip encapsulation) + tcp - 6 + udp - 17" + DEFVAL { -1 } + ::= { msanQosProfileEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.13 + msanQosProfileMatchInIpSrcAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified source IP address. + Empty string indicates that parameter has not been defined." + DEFVAL { ''h } + ::= { msanQosProfileEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.14 + msanQosProfileMatchInIpSrcMask OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanQosProfileMatchInIpSrcAddr that + is compared with input packet. + Empty string indicates that parameter has not been defined" + DEFVAL { ''h } + ::= { msanQosProfileEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.15 + msanQosProfileMatchInIpDestAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified destination IP address. + Empty string indicates that parameter has not been defined." + DEFVAL { ''h } + ::= { msanQosProfileEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.16 + msanQosProfileMatchInIpDestMask OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanQosProfileMatchInIpDestAddr that + is compared with input packet. + Empty string indicates that parameter has not been defined" + DEFVAL { ''h } + ::= { msanQosProfileEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.17 + msanQosProfileMatchInIpDscp OBJECT-TYPE + SYNTAX Integer32 (-1..63) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified IP DSCP value. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanQosProfileEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.18 + msanQosProfileMatchInIpPrecedence OBJECT-TYPE + SYNTAX Integer32 (-1..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified IP precedence (part of TOS field) value. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanQosProfileEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.19 + msanQosProfileMatchInIpTosBits OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..1)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified IP TOS bits value. + Empty string indicates that parameter has not been defined." + DEFVAL { ''b } + ::= { msanQosProfileEntry 19 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.20 + msanQosProfileMatchInIpTosMask OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..1)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanQosProfileMatchInIpTosBits that + is compared against a packet. + Empty string indicates that parameter has not been defined." + DEFVAL { ''b } + ::= { msanQosProfileEntry 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.21 + msanQosProfileMatchInL4SrcPort OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified source TCP/UDP port number. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanQosProfileEntry 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.22 + msanQosProfileMatchInL4DestPort OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified destination TCP/UDP port number in downstream direction. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanQosProfileEntry 22 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.23 + msanQosProfileMatchOutAny OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match every outgoing packet frame in upstream direction." + DEFVAL { disable } + ::= { msanQosProfileEntry 23 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.24 + msanQosProfileMatchOutMacDestAddr OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match outgoing packet frame with specified destination MAC address. + Empty string indicates that parameter has not been defined" + DEFVAL { ''b } + ::= { msanQosProfileEntry 24 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.25 + msanQosProfileMatchOutMacDestMask OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanQosProfileMatchOutMacDestAddr that + is compared with output packet. + Empty string indicates that parameter has not been defined" + DEFVAL { ''b } + ::= { msanQosProfileEntry 25 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.26 + msanQosProfileMatchOutMacSrcAddr OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match outgoing packet frame with specified source MAC address. + Empty string indicates that parameter has not been defined" + DEFVAL { ''b } + ::= { msanQosProfileEntry 26 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.27 + msanQosProfileMatchOutMacSrcMask OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanQosProfileMatchOutMacSrcAddr that + is compared with output packet. + Empty string indicates that parameter has not been defined" + DEFVAL { ''b } + ::= { msanQosProfileEntry 27 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.28 + msanQosProfileMatchOutCos OBJECT-TYPE + SYNTAX Integer32 (-1..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match outgoing packet frame with specified CoS value (0-7). + A value of -1 indicates that parameter has not been defined" + DEFVAL { -1 } + ::= { msanQosProfileEntry 28 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.29 + msanQosProfileMatchOutCos2 OBJECT-TYPE + SYNTAX Integer32 (-1..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match outgoing packet frame with specified secondary (C-TAG) CoS value (0-7). + A value of -1 indicates that parameter has not been defined" + DEFVAL { -1 } + ::= { msanQosProfileEntry 29 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.30 + msanQosProfileMatchOutVlanId OBJECT-TYPE + SYNTAX Integer32 (-1..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match outgoing packet frame with specified VLAN ID value (1-4094). + A value of -1 indicates that parameter has not been defined" + DEFVAL { -1 } + ::= { msanQosProfileEntry 30 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.31 + msanQosProfileMatchOutVlanId2 OBJECT-TYPE + SYNTAX Integer32 (-1..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match outgoing packet frame with specified secondary (C-TAG) VLAN ID value (1-4094). + A value of -1 indicates that parameter has not been defined" + DEFVAL { -1 } + ::= { msanQosProfileEntry 31 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.32 + msanQosProfileMatchOutEthertype OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match outgoing packet frame with specified EtherType value. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanQosProfileEntry 32 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.33 + msanQosProfileMatchOutIpProtocol OBJECT-TYPE + SYNTAX Integer32 (-1..255) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match outgoing packet frame with specified IP protocol value in upstream direction. + A value of -1 indicates that parameter has not been defined. + Some of standard protocol values: + icmp - 1 + igmp - 2 + ip - 4 (ip in ip encapsulation) + tcp - 6 + udp - 17" + DEFVAL { -1 } + ::= { msanQosProfileEntry 33 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.34 + msanQosProfileMatchOutIpSrcAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match outgoing packet frame with specified source IP address. + Empty string indicates that parameter has not been defined." + DEFVAL { ''h } + ::= { msanQosProfileEntry 34 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.35 + msanQosProfileMatchOutIpSrcMask OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanQosProfileMatchOutIpSrcAddr that + is compared with output packet. + Empty string indicates that parameter has not been defined" + DEFVAL { ''h } + ::= { msanQosProfileEntry 35 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.36 + msanQosProfileMatchOutIpDestAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match outgoing packet frame with specified destination IP address. + Empty string indicates that parameter has not been defined." + DEFVAL { ''h } + ::= { msanQosProfileEntry 36 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.37 + msanQosProfileMatchOutIpDestMask OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanQosProfileMatchOutIpDestAddr that + is compared with output packet. + Empty string indicates that parameter has not been defined" + DEFVAL { ''h } + ::= { msanQosProfileEntry 37 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.38 + msanQosProfileMatchOutIpDscp OBJECT-TYPE + SYNTAX Integer32 (-1..63) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match outgoing packet frame with specified IP DSCP value. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanQosProfileEntry 38 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.39 + msanQosProfileMatchOutIpPrecedence OBJECT-TYPE + SYNTAX Integer32 (-1..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match outgoing packet frame with specified IP precedence (part of TOS field) value. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanQosProfileEntry 39 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.40 + msanQosProfileMatchOutIpTosBits OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..1)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match outgoing packet frame with specified IP TOS bits value. + Empty string indicates that parameter has not been defined." + DEFVAL { ''b } + ::= { msanQosProfileEntry 40 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.41 + msanQosProfileMatchOutIpTosMask OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..1)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanQosProfileMatchOutIpTosBits that + is compared with output packet. + Empty string indicates that parameter has not been defined" + DEFVAL { ''b } + ::= { msanQosProfileEntry 41 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.42 + msanQosProfileMatchOutL4SrcPort OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match outgoing packet frame with specified source TCP/UDP port number in upstream direction. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanQosProfileEntry 42 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.43 + msanQosProfileMatchOutL4DestPort OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match outgoing packet frame with specified destination TCP/UDP port number. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanQosProfileEntry 43 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.44 + msanQosProfileInCdr OBJECT-TYPE + SYNTAX Integer32 (-1..1000000) + UNITS "kbps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Incoming committed data rate (E-CDR) in kbps (0 – 1000000). + A value of -1 indicates that parameter has not been defined." + DEFVAL { 0 } + ::= { msanQosProfileEntry 44 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.45 + msanQosProfileInPdr OBJECT-TYPE + SYNTAX Integer32 (-1..1000000) + UNITS "kbps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Incoming peak data rate (E-PDR) in kbps (0 – 1000000). + A value of -1 indicates that parameter has not been defined." + DEFVAL { 0 } + ::= { msanQosProfileEntry 45 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.46 + msanQosProfileOutCdr OBJECT-TYPE + SYNTAX Integer32 (-1..1000000) + UNITS "kbps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Outgoing committed data rate (E-CDR) in kbps (0 – 1000000). + A value of -1 indicates that parameter has not been defined." + DEFVAL { 0 } + ::= { msanQosProfileEntry 46 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.47 + msanQosProfileOutPdr OBJECT-TYPE + SYNTAX Integer32 (-1..1000000) + UNITS "kbps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Outgoing peak data rate (E-PDR) in kbps (0 – 1000000). + A value of -1 indicates that parameter has not been defined." + DEFVAL { 0 } + ::= { msanQosProfileEntry 47 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.48 + msanQosProfileInTrustMode OBJECT-TYPE + SYNTAX INTEGER + { + untrusted(1), + trustCos(2), + trustDscp(3), + untrustMarkCos(4), + untrustMarkDscp(5) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Trust mode for incoming packets which correspond to this profile. + Default value is untrusted(1). + + Value untrustMarkCos(4) can be set if parameter msanQosProfileInMarkCos value + is grater than -1. + Value untrustMarkCos(5) can be set if parameter msanQosProfileInMarkDscp value + is grater than -1." + DEFVAL { untrusted } + ::= { msanQosProfileEntry 48 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.49 + msanQosProfileInMarkCos OBJECT-TYPE + SYNTAX INTEGER (-1..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Mark incoming packets with specified CoS value (0-7). + A value of -1 indicates that parameter has not been defined" + DEFVAL { -1 } + ::= { msanQosProfileEntry 49 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.50 + msanQosProfileInMarkDscp OBJECT-TYPE + SYNTAX INTEGER (-1..63) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Mark incoming packets with specified IP DSCP value. + A value of -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanQosProfileEntry 50 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.51 + msanQosProfileRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5). + Value active(1) will activate and value destroy(6) will remove this entry. + Other values are currently not supported. + " + ::= { msanQosProfileEntry 51 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.52 + msanQosProfilePriority OBJECT-TYPE + SYNTAX INTEGER + { + normal(1), + high(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Priority of QoS profile. + On interface can be linked only one QoS profile + with high(2) prority (msanQoSIntProfileTable)" + DEFVAL { normal } + ::= { msanQosProfileEntry 52 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.53 + msanQosProfileInCdrBurstSize OBJECT-TYPE + SYNTAX Integer32 + UNITS "kB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Incoming committed data rate burst size in kB (0 – 16384). + + When parameter is set to 0 (default), it's automatically updated to default + burst size in according with current msanQoSProfileInCdr value. + + " + ::= { msanQosProfileEntry 53 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.54 + msanQosProfileInPdrBurstSize OBJECT-TYPE + SYNTAX Integer32 + UNITS "kB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Incoming peak data rate burst size in kB (0 – 16384). + + When parameter is set to 0 (default), it's automatically updated to default + burst size in according with current msanQoSProfileInPdr value. + " + ::= { msanQosProfileEntry 54 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.55 + msanQosProfileOutCdrBurstSize OBJECT-TYPE + SYNTAX Integer32 + UNITS "kB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Outgoing committed data rate burst size in kB (0 – 16384). + + When parameter is set to 0 (default), it's automatically updated to default + burst size in according with current msanQoSProfileOutCdr value. + + " + ::= { msanQosProfileEntry 55 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.56 + msanQosProfileOutPdrBurstSize OBJECT-TYPE + SYNTAX Integer32 + UNITS "kB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Outgoing peak data rate burst size in kB (0 – 16384). + + + When parameter is set to 0 (default), it's automatically updated to default + burst size in according with current msanQoSProfileOutCdr value. + " + DEFVAL { 64 } + ::= { msanQosProfileEntry 56 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.58 + msanQosProfileMatchInSrcIpv6Address OBJECT-TYPE + SYNTAX InetAddressIPv6 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified source IPv6 address. + + Empty string indicates that parameter has not been defined." + ::= { msanQosProfileEntry 58 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.59 + msanQosProfileMatchInSrcIpv6AddressMaskLen OBJECT-TYPE + SYNTAX Integer32 (0..128) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The length of the prefix (in bits) associated with the + incoming IPv6 source address of this entry (msanQosProfileMatchInSrcIpv6Address). + + Value 0 indicates that parameter has not been defined." + DEFVAL { 0 } + ::= { msanQosProfileEntry 59 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.60 + msanQosProfileMatchInDestIpv6Address OBJECT-TYPE + SYNTAX InetAddressIPv6 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified destination IPv6 address. + + Empty string indicates that parameter has not been defined." + ::= { msanQosProfileEntry 60 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.61 + msanQosProfileMatchInDestIpv6AddressMaskLen OBJECT-TYPE + SYNTAX Integer32 (0..128) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The length of the prefix (in bits) associated with the + incoming IPv6 destination address of this entry (msanQosProfileMatchInDestIpv6Address). + + Value 0 indicates that parameter has not been defined." + DEFVAL { 0 } + ::= { msanQosProfileEntry 61 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.63 + msanQosProfileMatchOutSrcIpv6Address OBJECT-TYPE + SYNTAX InetAddressIPv6 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match outgoing packet frame with specified source IPv6 address. + + Empty string indicates that parameter has not been defined." + ::= { msanQosProfileEntry 63 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.64 + msanQosProfileMatchOutSrcIpv6AddressMaskLen OBJECT-TYPE + SYNTAX Integer32 (0..128) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The length of the prefix (in bits) associated with the + outcoming IPv6 source address of this entry (msanQosProfileMatchOutSrcIpv6Address). + + Value 0 indicates that parameter has not been defined." + DEFVAL { 0 } + ::= { msanQosProfileEntry 64 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.65 + msanQosProfileMatchOutDestIpv6Address OBJECT-TYPE + SYNTAX InetAddressIPv6 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match outcoming packet frame with specified destination IPv6 address. + + Empty string indicates that parameter has not been defined." + ::= { msanQosProfileEntry 65 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.7.1.66 + msanQosProfileMatchOutDestIpv6AddressMaskLen OBJECT-TYPE + SYNTAX Integer32 (0..128) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The length of the prefix (in bits) associated with the + outcoming IPv6 destination address of this entry (msanQosProfileMatchOutDestIpv6Address). + + Value 0 indicates that parameter has not been defined." + DEFVAL { 0 } + ::= { msanQosProfileEntry 66 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.8 + msanQosIntfProfileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanQosIntfProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "This table connects selected QoS profiles (msanQoSProfileName) to specified interfaces (ifIndex)." + ::= { msanQoS 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.8.1 + msanQosIntfProfileEntry OBJECT-TYPE + SYNTAX MsanQosIntfProfileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, msanQosProfileName } + ::= { msanQosIntfProfileTable 1 } + + + MsanQosIntfProfileEntry ::= + SEQUENCE { + msanQosIntfProfileAtmVpi + Integer32, + msanQosIntfProfileAtmVci + Integer32, + msanQosIntfProfileRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.8.1.1 + msanQosIntfProfileAtmVpi OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ATM Virtual path identifier of the ADSL interface. + Value -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanQosIntfProfileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.8.1.2 + msanQosIntfProfileAtmVci OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ATM Virtual channel identifier of the ADSL interface. + Value -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanQosIntfProfileEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.8.1.3 + msanQosIntfProfileRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5). + For row activation use active(1). + For row deactivation use notInService(2). + For row deletion use destroy(6). + + Other values are currently not supported. + + On interface can be linked only one QoS profile with high(2) prority (msanQosProfilePriority)" + ::= { msanQosIntfProfileEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.9 + msanQosStatistics OBJECT IDENTIFIER ::= { msanQoS 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.9.1 + msanQosPortStatTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanQosPortStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanQosStatistics 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.9.1.1 + msanQosPortStatEntry OBJECT-TYPE + SYNTAX MsanQosPortStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanQosPortStatTable 1 } + + + MsanQosPortStatEntry ::= + SEQUENCE { + msanQosPortStatInDroppedFrames + Counter32, + msanQosPortStatOutDroppedFrames + Counter32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.9.1.1.1 + msanQosPortStatInDroppedFrames OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of dropped frames per port in incoming direction." + ::= { msanQosPortStatEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.9.1.1.2 + msanQosPortStatOutDroppedFrames OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of dropped frames per port in outgoing direction." + ::= { msanQosPortStatEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.9.2 + msanQosPortProfileStatTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanQosPortProfileStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanQosStatistics 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.9.2.1 + msanQosPortProfileStatEntry OBJECT-TYPE + SYNTAX MsanQosPortProfileStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, msanQosProfileName } + ::= { msanQosPortProfileStatTable 1 } + + + MsanQosPortProfileStatEntry ::= + SEQUENCE { + msanQosPortProfileStatQueueCurrent + Integer32, + msanQosPortProfileStatQueueAverage + Integer32, + msanQosPortProfileStatQueueMax + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.9.2.1.1 + msanQosPortProfileStatQueueCurrent OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current queue occupation per profile per port (in number of packets) ." + ::= { msanQosPortProfileStatEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.9.2.1.2 + msanQosPortProfileStatQueueAverage OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Average queue occupation per profile per port (in number of packets) ." + ::= { msanQosPortProfileStatEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.9.2.1.3 + msanQosPortProfileStatQueueMax OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Maximum queue occupation per profile per port (in number of packets) ." + ::= { msanQosPortProfileStatEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.10 + msanIpAclTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanIpAclEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanQoS 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.10.1 + msanIpAclEntry OBJECT-TYPE + SYNTAX MsanIpAclEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanIpAclId } + ::= { msanIpAclTable 1 } + + + MsanIpAclEntry ::= + SEQUENCE { + msanIpAclId + Integer32, + msanIpAclProtection + INTEGER, + msanIpAclStatus + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.10.1.1 + msanIpAclId OBJECT-TYPE + SYNTAX Integer32 (1..199) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "This is aclIndex in aclTable (1.3.6.1.4.1.1332.1.1.5.2.3.2.1)" + ::= { msanIpAclEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.10.1.2 + msanIpAclProtection OBJECT-TYPE + SYNTAX INTEGER + { + unprotected(0), + protected(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "If protection flag is set to protected (1), other profile values cannot be edited. + + Protection flag is always protected (1) and it can't be changed if profile is assigned as dynamic: + msanAclProfileStatus = dynamic(2)" + DEFVAL { unprotected } + ::= { msanIpAclEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.10.1.4 + msanIpAclStatus OBJECT-TYPE + SYNTAX INTEGER + { + static(1), + dynamic(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Profile status. + If status is dynamic, profile values can't be edited." + ::= { msanIpAclEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.11 + msanMacAclTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMacAclEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanQoS 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.11.1 + msanMacAclEntry OBJECT-TYPE + SYNTAX MsanMacAclEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanMacAclId } + ::= { msanMacAclTable 1 } + + + MsanMacAclEntry ::= + SEQUENCE { + msanMacAclId + Integer32, + msanMacAclProtection + INTEGER, + msanMacAclStatus + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.11.1.1 + msanMacAclId OBJECT-TYPE + SYNTAX Integer32 (1..199) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "This is aclMacIndex in aclMacTable (1.3.6.1.4.1.1332.1.1.5.2.3.2.6)" + ::= { msanMacAclEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.11.1.3 + msanMacAclProtection OBJECT-TYPE + SYNTAX INTEGER + { + unprotected(0), + protected(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "If protection flag is set to protected (1), other profile values cannot be edited. + + Protection flag is always protected (1) and it can't be changed if profile is assigned as dynamic: + msanMacAclStatus = dynamic(2)" + DEFVAL { unprotected } + ::= { msanMacAclEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.11.1.4 + msanMacAclStatus OBJECT-TYPE + SYNTAX INTEGER + { + static(1), + dynamic(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Profile status. + If status is dynamic, profile values can't be edited." + ::= { msanMacAclEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.12 + msanQosPortTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanQosPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanQoS 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.12.1 + msanQosPortEntry OBJECT-TYPE + SYNTAX MsanQosPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanQosPortIfIndex, msanQosPortDirection } + ::= { msanQosPortTable 1 } + + + MsanQosPortEntry ::= + SEQUENCE { + msanQosPortIfIndex + Integer32, + msanQosPortDirection + INTEGER, + msanQosPortPeakDataRate + Integer32, + msanQosPortPeakBurstSize + Integer32, + msanQosPortPeakDroppedFrames + Unsigned32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.12.1.1 + msanQosPortIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Index of GPON ONU interface (from ifTable). + + ifIndex value of selected ONU interface (ifDescr=0/x/y) is calculated by formula: + ifIndex=max_olt_port_number(8 or 16)+(x-1)*128+y " + ::= { msanQosPortEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.12.1.2 + msanQosPortDirection OBJECT-TYPE + SYNTAX INTEGER + { + downstream(1), + upstream(2) + } + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Data traffic direction which defines QoS action: + downstream(1) -> shaping + upstream(2) -> policing" + ::= { msanQosPortEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.12.1.3 + msanQosPortPeakDataRate OBJECT-TYPE + SYNTAX Integer32 (0 | 64..1000000) + UNITS "kbps" + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Peak data rate in kbps (0 | 64 - 1000000). + Value 0 (default) means -> no rate limit" + DEFVAL { 0 } + ::= { msanQosPortEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.12.1.4 + msanQosPortPeakBurstSize OBJECT-TYPE + SYNTAX Integer32 (0..16384) + UNITS "kB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Peak data rate burst size in kB (0 - 16384). + This parameter can be set only when peak data rate value (msanQosPortPeakDataRate) is not 0. + + When parameter is set to 0 (default), it's automatically updated to default + burst size value according to current peak data rate (msanQosPortPeakDataRate)." + DEFVAL { 0 } + ::= { msanQosPortEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.12.12.1.5 + msanQosPortPeakDroppedFrames OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Dropped frames counter (peak data rate is exceeded)" + ::= { msanQosPortEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.13 + msanForwardingDb OBJECT IDENTIFIER ::= { msanAdditionalConf 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.13.3 + msanForwardingDbGlobal OBJECT IDENTIFIER ::= { msanForwardingDb 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.13.3.1 + msanAddressLearningMode OBJECT-TYPE + SYNTAX INTEGER + { + macOnly(1), + noMacOnly(2) + } + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Specifies how source MAC addresses are associated with the interfaces on the switch. If mode is specified as nomaconly, + source MAC addresses are learned as pairs of incoming VLAN ID and the source MAC address. If mode is specified as maconly, + all source MAC addresses are learned in a specified VLAN, VLAN ID of the VLAN the packet was received from is not remembered. + This mode is used for General Purpose Service Based Tagging." + ::= { msanForwardingDbGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.13.3.2 + msanAddressLearningVlanId OBJECT-TYPE + SYNTAX Integer32 (1..4094) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "This is the VLAN ID which is used for learning source MAC addresses in maconly mode. All learned MAC addresses + will be marked as received from this VLAN. VLAN with this VLAN ID is created on the switch and all physical intefaces + are added to this VLAN. This VLAN ID cannot be used for configuring other VLANs on the switch." + ::= { msanForwardingDbGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.13.3.3 + msanSwitchAddressAgingTimeout OBJECT-TYPE + SYNTAX INTEGER (10..1000000) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The FDB entry's address aging timeout (in seconds)." + DEFVAL { 300 } + ::= { msanForwardingDbGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14 + msanDiagnostics OBJECT IDENTIFIER ::= { msanAdditionalConf 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.1 + msanDiagnosticsGlobal OBJECT IDENTIFIER ::= { msanDiagnostics 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.1.1 + msanDiagnosticsFanSpeedLevel OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "MSAN shelf fan current speed level. Higher level defines higer speed. + Level 0 means fan is stopped. Maximum level is defined by + parameter msanDiagnosticsMaxFanSpeedLevel" + ::= { msanDiagnosticsGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.1.2 + msanDiagnosticsMaxFanSpeedLevel OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "MSAN shelf fan max speed level." + ::= { msanDiagnosticsGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.2 + msanDiagnosticsTestTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDiagnosticsTestEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanDiagnostics 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.2.1 + msanDiagnosticsTestEntry OBJECT-TYPE + SYNTAX MsanDiagnosticsTestEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanDiagnosticsTestCode } + ::= { msanDiagnosticsTestTable 1 } + + + MsanDiagnosticsTestEntry ::= + SEQUENCE { + msanDiagnosticsTestCode + Integer32, + msanDiagnosticsTestName + OCTET STRING, + msanDiagnosticsTestActivity + INTEGER, + msanDiagnosticsTestTime + Unsigned32, + msanDiagnosticsTestPriority + INTEGER, + msanDiagnosticsTestType + INTEGER, + msanDiagnosticsTestTimeMin + Integer32, + msanDiagnosticsTestTimeMax + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.2.1.1 + msanDiagnosticsTestCode OBJECT-TYPE + SYNTAX Integer32 (0..99999999) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Unique identification of a test program." + ::= { msanDiagnosticsTestEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.2.1.2 + msanDiagnosticsTestName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The name of a test program." + ::= { msanDiagnosticsTestEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.2.1.3 + msanDiagnosticsTestActivity OBJECT-TYPE + SYNTAX INTEGER + { + testOn(1), + testOff(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specifies the Test activity parameter for the diagnostic. " + ::= { msanDiagnosticsTestEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.2.1.4 + msanDiagnosticsTestTime OBJECT-TYPE + SYNTAX Unsigned32 (100..999999900) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Test time, whose interpretation depends on test running mode: + + - for cyclical tests, it means the period at which the test is + carried out one after another (time unit is milisecond) + + - for all others, it means time of day in the form 'hhmmss' + (e.g. '224950') at which the test begins. + " + ::= { msanDiagnosticsTestEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.2.1.6 + msanDiagnosticsTestPriority OBJECT-TYPE + SYNTAX INTEGER + { + low(0), + medium(1), + high(2), + veryHigh(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Test priority parameter for the diagnostic." + ::= { msanDiagnosticsTestEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.2.1.7 + msanDiagnosticsTestType OBJECT-TYPE + SYNTAX INTEGER + { + testAtReload(1), + testPeriodically(2), + testDaily(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + " + Type of starting the test. + + DECIMAL VALUE DESCRIPTION + 1 At start-up & Recovery + 2 Periodical + 3 Daily + " + ::= { msanDiagnosticsTestEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.2.1.8 + msanDiagnosticsTestTimeMin OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Minimum possible value of parameter msanDiagnosticTestTime." + ::= { msanDiagnosticsTestEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.2.1.9 + msanDiagnosticsTestTimeMax OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Maximum possible value of parameter msanDiagnosticTestTime." + ::= { msanDiagnosticsTestEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.3 + msanDiagnosticsErrorTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDiagnosticsErrorEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanDiagnostics 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.3.1 + msanDiagnosticsErrorEntry OBJECT-TYPE + SYNTAX MsanDiagnosticsErrorEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanDiagnosticsErrorCode } + ::= { msanDiagnosticsErrorTable 1 } + + + MsanDiagnosticsErrorEntry ::= + SEQUENCE { + msanDiagnosticsErrorCode + Integer32, + msanDiagnosticsErrorDescription + OCTET STRING, + msanDiagnosticsErrorPriority + INTEGER, + msanDiagnosticsErrorObjectType + OCTET STRING, + msanDiagnosticsErrorMeasure + OCTET STRING, + msanDiagnosticsErrorMeasureActive + INTEGER, + msanDiagnosticsErrorProbableCause + Integer32, + msanDiagnosticsErrorObjectTypeId + Integer32, + msanDiagnosticsErrorMeasureId + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.3.1.1 + msanDiagnosticsErrorCode OBJECT-TYPE + SYNTAX Integer32 (0..99999999) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Unique identification of an error reported during testing an object." + ::= { msanDiagnosticsErrorEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.3.1.2 + msanDiagnosticsErrorDescription OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Description of the error code." + ::= { msanDiagnosticsErrorEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.3.1.3 + msanDiagnosticsErrorPriority OBJECT-TYPE + SYNTAX INTEGER + { + critical(1), + major(2), + minor(3), + warning(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Error priority." + ::= { msanDiagnosticsErrorEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.3.1.4 + msanDiagnosticsErrorObjectType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Object type - List of values can be found in alr_def.h" + ::= { msanDiagnosticsErrorEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.3.1.5 + msanDiagnosticsErrorMeasure OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Measure (what is done when an error occurs, for instance reset the node, ...) - List of values can be found in alr_def.h" + ::= { msanDiagnosticsErrorEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.3.1.6 + msanDiagnosticsErrorMeasureActive OBJECT-TYPE + SYNTAX INTEGER + { + notActive(0), + active(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Activity of measure. With setting this parameter to notActive(0), you can prevent excecution of measure." + DEFVAL { active } + ::= { msanDiagnosticsErrorEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.3.1.7 + msanDiagnosticsErrorProbableCause OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Probable cause." + ::= { msanDiagnosticsErrorEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.3.1.8 + msanDiagnosticsErrorObjectTypeId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Object type ID- List of values can be found in alr_def.h" + ::= { msanDiagnosticsErrorEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.3.1.9 + msanDiagnosticsErrorMeasureId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Measure (what is done when an error occurs, for instance reset the node, ...) - List of values can be found in alr_def.h" + ::= { msanDiagnosticsErrorEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.4 + msanDiagnosticsTempTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDiagnosticsTempEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanDiagnostics 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.4.1 + msanDiagnosticsTempEntry OBJECT-TYPE + SYNTAX MsanDiagnosticsTempEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanDiagnosticsTempSensorID } + ::= { msanDiagnosticsTempTable 1 } + + + MsanDiagnosticsTempEntry ::= + SEQUENCE { + msanDiagnosticsTempSensorID + Integer32, + msanDiagnosticsTempSensorName + OCTET STRING, + msanDiagnosticsTempCurrent + Integer32, + msanDiagnosticsTempCriticUnderheatThreshold + Integer32, + msanDiagnosticsTempUnderheatThreshold + Integer32, + msanDiagnosticsTempOverheatThreshold + Integer32, + msanDiagnosticsTempCriticOverheatThreshold + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.4.1.1 + msanDiagnosticsTempSensorID OBJECT-TYPE + SYNTAX Integer32 (0..100) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Temperature sensor ID." + ::= { msanDiagnosticsTempEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.4.1.2 + msanDiagnosticsTempSensorName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Temperature sensor name." + ::= { msanDiagnosticsTempEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.4.1.3 + msanDiagnosticsTempCurrent OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current temperature of the specified sensor in [deg C]." + ::= { msanDiagnosticsTempEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.4.1.4 + msanDiagnosticsTempCriticUnderheatThreshold OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Sensor critical underheat threshold temperature limit in [deg C]." + ::= { msanDiagnosticsTempEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.4.1.5 + msanDiagnosticsTempUnderheatThreshold OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Sensor underheat temperature threshold limit in [deg C]." + ::= { msanDiagnosticsTempEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.4.1.6 + msanDiagnosticsTempOverheatThreshold OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Sensor overheat threshold temperature limit in [deg C]." + ::= { msanDiagnosticsTempEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.4.1.7 + msanDiagnosticsTempCriticOverheatThreshold OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Sensor critical overheat threshold temperature limit in [deg C]." + ::= { msanDiagnosticsTempEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.5 + msanDiagnosticsErrorFilterTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDiagnosticsErrorFilterEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanDiagnostics 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.5.1 + msanDiagnosticsErrorFilterEntry OBJECT-TYPE + SYNTAX MsanDiagnosticsErrorFilterEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanDiagnosticsErrorFilterErrMask, msanDiagnosticsErrorFilterObjMask } + ::= { msanDiagnosticsErrorFilterTable 1 } + + + MsanDiagnosticsErrorFilterEntry ::= + SEQUENCE { + msanDiagnosticsErrorFilterErrMask + OCTET STRING, + msanDiagnosticsErrorFilterObjMask + OCTET STRING, + msanDiagnosticsErrorFilterRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.5.1.1 + msanDiagnosticsErrorFilterErrMask OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..20)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Error code in ascii format. Regular expression describing one or more error codes." + ::= { msanDiagnosticsErrorFilterEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.5.1.2 + msanDiagnosticsErrorFilterObjMask OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..40)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Type of object, which alarming is filtered for. Regular expression describing one or more test objects. " + ::= { msanDiagnosticsErrorFilterEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.5.1.3 + msanDiagnosticsErrorFilterRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanDiagnosticsErrorFilterEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.6 + msanDiagnosticsErrorSeverityTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDiagnosticsErrorSeverityEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanDiagnostics 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.6.1 + msanDiagnosticsErrorSeverityEntry OBJECT-TYPE + SYNTAX MsanDiagnosticsErrorSeverityEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanDiagnosticsErrorSeverityErrCode, msanDiagnosticsErrorSeverityObjMask } + ::= { msanDiagnosticsErrorSeverityTable 1 } + + + MsanDiagnosticsErrorSeverityEntry ::= + SEQUENCE { + msanDiagnosticsErrorSeverityErrCode + Integer32, + msanDiagnosticsErrorSeverityErrPriority + INTEGER, + msanDiagnosticsErrorSeverityObjMask + OCTET STRING, + msanDiagnosticsErrorSeverityRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.6.1.1 + msanDiagnosticsErrorSeverityErrCode OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Unique identification of an error reported during testing an object. + All error codes are stated in alr_def.h (KFMT)" + ::= { msanDiagnosticsErrorSeverityEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.6.1.2 + msanDiagnosticsErrorSeverityErrPriority OBJECT-TYPE + SYNTAX INTEGER + { + critical(1), + major(2), + minor(3), + warning(4) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Priority of error. " + ::= { msanDiagnosticsErrorSeverityEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.6.1.3 + msanDiagnosticsErrorSeverityObjMask OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..40)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Type of object, which alarming is filtered for. Regular expression describing one or more test objects. " + ::= { msanDiagnosticsErrorSeverityEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.6.1.4 + msanDiagnosticsErrorSeverityRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5) [createAndGo(4) is not supported]. + " + ::= { msanDiagnosticsErrorSeverityEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.7 + msanDiagnosticsExtAlrSensorTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDiagnosticsExtAlrSensorEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanDiagnostics 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.7.1 + msanDiagnosticsExtAlrSensorEntry OBJECT-TYPE + SYNTAX MsanDiagnosticsExtAlrSensorEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanDiagnosticsExtAlrSensorName } + ::= { msanDiagnosticsExtAlrSensorTable 1 } + + + MsanDiagnosticsExtAlrSensorEntry ::= + SEQUENCE { + msanDiagnosticsExtAlrSensorName + DisplayString, + msanDiagnosticsExtAlrSensorAlarm + INTEGER, + msanDiagnosticsExtAlrSensorLogic + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.7.1.1 + msanDiagnosticsExtAlrSensorName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanDiagnosticsExtAlrSensorEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.7.1.2 + msanDiagnosticsExtAlrSensorAlarm OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Description." + ::= { msanDiagnosticsExtAlrSensorEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.7.1.3 + msanDiagnosticsExtAlrSensorLogic OBJECT-TYPE + SYNTAX INTEGER + { + open(1), + close(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Description." + ::= { msanDiagnosticsExtAlrSensorEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.8 + msanDiagnosticsFanTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDiagnosticsFanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanDiagnostics 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.8.1 + msanDiagnosticsFanEntry OBJECT-TYPE + SYNTAX MsanDiagnosticsFanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanDiagnosticsFanId } + ::= { msanDiagnosticsFanTable 1 } + + + MsanDiagnosticsFanEntry ::= + SEQUENCE { + msanDiagnosticsFanId + Integer32, + msanDiagnosticsFanCurrentRpm + Integer32, + msanDiagnosticsFanCurrentPercentRpm + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.8.1.1 + msanDiagnosticsFanId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Fan id" + ::= { msanDiagnosticsFanEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.8.1.2 + msanDiagnosticsFanCurrentRpm OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Fan current RPM (rotations per minute) " + ::= { msanDiagnosticsFanEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.14.8.1.3 + msanDiagnosticsFanCurrentPercentRpm OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Fan current percent of Max RPM (rotations per minute) " + ::= { msanDiagnosticsFanEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.15 + msanPpp OBJECT IDENTIFIER ::= { msanAdditionalConf 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.15.1 + msanPppGlobal OBJECT IDENTIFIER ::= { msanPpp 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.15.1.1 + msanPppLocalIpAddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Local IP address for PPP connection" + ::= { msanPppGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.15.1.2 + msanPppRemoteIpAddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Remote IP address for PPP connection" + ::= { msanPppGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.15.1.3 + msanPppAuthProtocol OBJECT-TYPE + SYNTAX INTEGER + { + none(0), + chap(1), + pap(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "PPP authentication protocol. For MPS connection use CHAP." + ::= { msanPppGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.15.1.4 + msanPppEchoInterval OBJECT-TYPE + SYNTAX Integer32 + UNITS "seconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "LCP echo interval (in seconds) for session breakdown identification." + ::= { msanPppGlobal 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.15.1.5 + msanPppVanJacobsonCompression OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Control of VanJacobson compression. For MPS connection it must be disabled." + ::= { msanPppGlobal 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.15.1.6 + msanPppAdminState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Global PPP connection administrative state." + ::= { msanPppGlobal 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.16 + msanAlarmPanel OBJECT IDENTIFIER ::= { msanAdditionalConf 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.16.1 + msanAlarmPanelGlobal OBJECT IDENTIFIER ::= { msanAlarmPanel 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.16.1.1 + msanAlarmPanelAudioAlarmPriority OBJECT-TYPE + SYNTAX INTEGER + { + critical(1), + major(2), + minor(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Alarm Panel Audio Alarm Priority." + ::= { msanAlarmPanelGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.16.1.2 + msanAlarmPanelSerialPortType OBJECT-TYPE + SYNTAX INTEGER + { + noConnection(1), + mps(2), + alarmPanel(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Type of equipment connected to serial port." + ::= { msanAlarmPanelGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.16.2 + msanAlarmPanelTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanAlarmPanelEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanAlarmPanel 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.16.2.1 + msanAlarmPanelEntry OBJECT-TYPE + SYNTAX MsanAlarmPanelEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanAlarmPanelIndex } + ::= { msanAlarmPanelTable 1 } + + + MsanAlarmPanelEntry ::= + SEQUENCE { + msanAlarmPanelIndex + Integer32, + msanAlarmPanelConnectionState + INTEGER, + msanAlarmPanelAdminState + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.16.2.1.1 + msanAlarmPanelIndex OBJECT-TYPE + SYNTAX Integer32 (1..16) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Unique identification of an alarm panel." + ::= { msanAlarmPanelEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.16.2.1.2 + msanAlarmPanelConnectionState OBJECT-TYPE + SYNTAX INTEGER + { + up(1), + down(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Alarm panel connection status" + ::= { msanAlarmPanelEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.16.2.1.3 + msanAlarmPanelAdminState OBJECT-TYPE + SYNTAX INTEGER + { + unequipped(0), + equipped(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Flag determining whether an alarm panel is equipped or not." + ::= { msanAlarmPanelEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.16.3 + msanAlarmPanelIndicatorTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanAlarmPanelIndicatorEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanAlarmPanel 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.16.3.1 + msanAlarmPanelIndicatorEntry OBJECT-TYPE + SYNTAX MsanAlarmPanelIndicatorEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanAlarmPanelIndex, msanAlarmPanelIndicatorIndex } + ::= { msanAlarmPanelIndicatorTable 1 } + + + MsanAlarmPanelIndicatorEntry ::= + SEQUENCE { + msanAlarmPanelIndicatorIndex + Integer32, + msanAlarmPanelIndicatorErrCode + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.16.3.1.1 + msanAlarmPanelIndicatorIndex OBJECT-TYPE + SYNTAX Integer32 (1..15) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Alarm panel indicator number. " + ::= { msanAlarmPanelIndicatorEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.16.3.1.2 + msanAlarmPanelIndicatorErrCode OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Alarm panel indicator error number." + ::= { msanAlarmPanelIndicatorEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.16.4 + msanAlarmPanelInputTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanAlarmPanelInputEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanAlarmPanel 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.16.4.1 + msanAlarmPanelInputEntry OBJECT-TYPE + SYNTAX MsanAlarmPanelInputEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanAlarmPanelIndex, msanAlarmPanelInputIndex } + ::= { msanAlarmPanelInputTable 1 } + + + MsanAlarmPanelInputEntry ::= + SEQUENCE { + msanAlarmPanelInputIndex + Integer32, + msanAlarmPanelInputErrCode + Integer32, + msanAlarmPanelInputActiveLevel + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.16.4.1.1 + msanAlarmPanelInputIndex OBJECT-TYPE + SYNTAX Integer32 (1..15) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Alarm panel input sensor number." + ::= { msanAlarmPanelInputEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.16.4.1.2 + msanAlarmPanelInputErrCode OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Alarm panel input sensor error code." + ::= { msanAlarmPanelInputEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.16.4.1.3 + msanAlarmPanelInputActiveLevel OBJECT-TYPE + SYNTAX INTEGER + { + low(0), + high(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Alarm panel input sensor active level." + ::= { msanAlarmPanelInputEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.17 + msanMvr OBJECT IDENTIFIER ::= { msanAdditionalConf 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.1 + msanMvrGlobal OBJECT IDENTIFIER ::= { msanMvr 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.2 + msanMvrPortTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMvrPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanMvr 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.2.1 + msanMvrPortEntry OBJECT-TYPE + SYNTAX MsanMvrPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanMvrPortTable 1 } + + + MsanMvrPortEntry ::= + SEQUENCE { + msanMvrPortAdminMode + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.2.1.1 + msanMvrPortAdminMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Administrative mode for Multicast VLAN Registration (a.k.a. Service Based Tagging) for the selected interface" + ::= { msanMvrPortEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.3 + msanMvrMulticastGroupTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMvrMulticastGroupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanMvr 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.3.1 + msanMvrMulticastGroupEntry OBJECT-TYPE + SYNTAX MsanMvrMulticastGroupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanMvrMulticastGroupMVlanId, msanMvrMulticastGroupStartIp } + ::= { msanMvrMulticastGroupTable 1 } + + + MsanMvrMulticastGroupEntry ::= + SEQUENCE { + msanMvrMulticastGroupMVlanId + Integer32, + msanMvrMulticastGroupStartIp + IpAddress, + msanMvrMulticastGroupEndIp + IpAddress, + msanMvrMulticastGroupRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.3.1.1 + msanMvrMulticastGroupMVlanId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "VLAN ID (refers to dot1qVlanIndex) where MVR functionality is used." + ::= { msanMvrMulticastGroupEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.3.1.2 + msanMvrMulticastGroupStartIp OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Start IP Address of the multicast group range." + ::= { msanMvrMulticastGroupEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.3.1.3 + msanMvrMulticastGroupEndIp OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "End IP Address of the multicast group range." + ::= { msanMvrMulticastGroupEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.3.1.4 + msanMvrMulticastGroupRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + For row creation use createAndWait(5) [createAndGo(4) is not supported]." + ::= { msanMvrMulticastGroupEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.4 + msanMvrConfigTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMvrConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanMvr 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.4.1 + msanMvrConfigEntry OBJECT-TYPE + SYNTAX MsanMvrConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, msanMvrConfigCVlanId, msanMvrConfigMVlanId } + ::= { msanMvrConfigTable 1 } + + + MsanMvrConfigEntry ::= + SEQUENCE { + msanMvrConfigCVlanId + Integer32, + msanMvrConfigMVlanId + Integer32, + msanMvrConfigCos + Integer32, + msanMvrConfigRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.4.1.1 + msanMvrConfigCVlanId OBJECT-TYPE + SYNTAX Integer32 (1..4094) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Customer VLAN ID for the selected interface from which + IGMP Join/Leave messages will be remarked." + ::= { msanMvrConfigEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.4.1.2 + msanMvrConfigMVlanId OBJECT-TYPE + SYNTAX Integer32 (1..4092) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Service provider multicast VLAN ID for the selected interface + to which IGMP Join/Leave messages will be remarked." + ::= { msanMvrConfigEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.4.1.3 + msanMvrConfigCos OBJECT-TYPE + SYNTAX Integer32 (-1..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Output CoS priority on the selected interface. IGMP messages received from + this interface will have this priority when they are transmitted into service provider + multicast VLAN. + + Value '-1' defines that original CoS value is not changed." + DEFVAL { 0 } + ::= { msanMvrConfigEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.4.1.4 + msanMvrConfigRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanMvrConfigEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.5 + msanMvrDvlanTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMvrDvlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanMvr 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.5.1 + msanMvrDvlanEntry OBJECT-TYPE + SYNTAX MsanMvrDvlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanMvrDvlanTable 1 } + + + MsanMvrDvlanEntry ::= + SEQUENCE { + msanMvrDvlanRmOuterTagStatus + INTEGER, + msanMvrDvlanEthertypeRewriteStatus + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.5.1.1 + msanMvrDvlanRmOuterTagStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The desired state of removing outer tags on IGMP packets funcionality." + DEFVAL { disable } + ::= { msanMvrDvlanEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.17.5.1.2 + msanMvrDvlanEthertypeRewriteStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The desired state of rewriting ether type from outer vlan tag to inner vlan + tag." + DEFVAL { disable } + ::= { msanMvrDvlanEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.18 + msanRemoteAccess OBJECT IDENTIFIER ::= { msanAdditionalConf 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.18.1 + msanRemoteAccessGlobal OBJECT IDENTIFIER ::= { msanRemoteAccess 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.18.2 + msanRemoteAccessFilterTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanRemoteAccessFilterEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + ::= { msanRemoteAccess 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.18.2.1 + msanRemoteAccessFilterEntry OBJECT-TYPE + SYNTAX MsanRemoteAccessFilterEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + INDEX { msanRemoteAccessFilterRuleIndex } + ::= { msanRemoteAccessFilterTable 1 } + + + MsanRemoteAccessFilterEntry ::= + SEQUENCE { + msanRemoteAccessFilterRuleIndex + INTEGER, + msanRemoteAccessFilterIp + IpAddress, + msanRemoteAccessFilterNetmask + IpAddress, + msanRemoteAccessFilterAction + INTEGER, + msanRemoteAccessFilterRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.18.2.1.1 + msanRemoteAccessFilterRuleIndex OBJECT-TYPE + SYNTAX INTEGER (1..200) + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Rule's index. Index should be continued, without gaps. " + ::= { msanRemoteAccessFilterEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.18.2.1.2 + msanRemoteAccessFilterIp OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "IP Address of the rule." + ::= { msanRemoteAccessFilterEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.18.2.1.3 + msanRemoteAccessFilterNetmask OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "Netmask of the rule." + ::= { msanRemoteAccessFilterEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.18.2.1.4 + msanRemoteAccessFilterAction OBJECT-TYPE + SYNTAX INTEGER + { + accept(1), + deny(2) + } + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "Action to be taken with a packet: accept or deny it." + ::= { msanRemoteAccessFilterEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.18.2.1.5 + msanRemoteAccessFilterRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + For row creation use createAndWait(5) [createAndGo(4) is not supported]." + ::= { msanRemoteAccessFilterEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19 + msanDslSpecific OBJECT IDENTIFIER ::= { msanAdditionalConf 19 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.1 + msanDslSpecificGlobal OBJECT IDENTIFIER ::= { msanDslSpecific 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.1.1 + msanDslSpecificSystemState OBJECT-TYPE + SYNTAX INTEGER + { + operational(4), + notReady(12) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "VDSL system operational state. For normal blade operation this value should be operational (4). + If value differ from 4, VDSL driver is not operational." + ::= { msanDslSpecificGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.1.2 + msanDslSpecificSystemFirmware OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "VDSL firmware version." + ::= { msanDslSpecificGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.1.3 + msanDslSpecificVectoringAdminMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DSL vectoring admin mode." + DEFVAL { disable } + ::= { msanDslSpecificGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3 + msanDslSpecificTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDslSpecificEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanDslSpecific 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1 + msanDslSpecificEntry OBJECT-TYPE + SYNTAX MsanDslSpecificEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanDslSpecificTable 1 } + + + MsanDslSpecificEntry ::= + SEQUENCE { + msanDslSpecificDsPsdMask + OCTET STRING, + msanDslSpecificUsPsdMask + OCTET STRING, + msanDslSpecificLineState + INTEGER, + msanDslSpecificMaxDelayDs + Integer32, + msanDslSpecificMaxDelayUs + Integer32, + msanDslSpecificMinProtectionDs + Integer32, + msanDslSpecificMinProtectionUs + Integer32, + msanDslSpecificMaxSnrmDs + Unsigned32, + msanDslSpecificMinSnrmDs + Unsigned32, + msanDslSpecificMaxSnrmUs + Unsigned32, + msanDslSpecificMinSnrmUs + Unsigned32, + msanDslSpecificRaUsNrmDs + Unsigned32, + msanDslSpecificRaUsNrmUs + Unsigned32, + msanDslSpecificRaUsTimeDs + Unsigned32, + msanDslSpecificRaUsTimeUs + Unsigned32, + msanDslSpecificRaDsNrmDs + Unsigned32, + msanDslSpecificRaDsNrmUs + Unsigned32, + msanDslSpecificRaDsTimeDs + Unsigned32, + msanDslSpecificRaDsTimeUs + Unsigned32, + msanDslSpecificL0Time + Unsigned32, + msanDslSpecificL2Time + Unsigned32, + msanDslSpecificL2Atpr + Unsigned32, + msanDslSpecificL2Atprt + Unsigned32, + msanDslSpecificScMaskDs + OCTET STRING, + msanDslSpecificScMaskUs + OCTET STRING, + msanDslSpecificRfiBands + OCTET STRING, + msanDslSpecificMaxNomPsdDs + Integer32, + msanDslSpecificMaxNomPsdUs + Integer32, + msanDslSpecificMaxNomAtpDs + Unsigned32, + msanDslSpecificMaxNomAtpUs + Unsigned32, + msanDslSpecificMaxAggRxPwrUs + Integer32, + msanDslSpecificClassMask + INTEGER, + msanDslSpecificDpboEsEL + Unsigned32, + msanDslSpecificUpboKLF + INTEGER, + msanDslSpecificUpboKL + Unsigned32, + msanDslSpecificSelt + INTEGER, + msanDslSpecificSeltStatus + INTEGER, + msanDslSpecificPhyRDs + INTEGER, + msanDslSpecificPhyRUs + INTEGER, + msanDslSpecificUpboUs1a + INTEGER, + msanDslSpecificUpboUs1b + INTEGER, + msanDslSpecificUpboUs2a + INTEGER, + msanDslSpecificUpboUs2b + INTEGER, + msanDslSpecificUpboUs3a + INTEGER, + msanDslSpecificUpboUs3b + INTEGER, + msanDslSpecificUpboUs4a + INTEGER, + msanDslSpecificUpboUs4b + INTEGER, + msanDslSpecificDpboEPsdMask + OCTET STRING, + msanDslSpecificDpboEsCmA + Unsigned32, + msanDslSpecificDpboEsCmB + Unsigned32, + msanDslSpecificDpboEsCmC + Unsigned32, + msanDslSpecificDpboMus + Unsigned32, + msanDslSpecificDpboFMin + Unsigned32, + msanDslSpecificDpboFMax + Unsigned32, + msanDslSpecificVectorModeEnable + BITS, + msanDslSpecificVectorModeState + BITS + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.1 + msanDslSpecificDsPsdMask OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Unique name of the downstream PSD mask as defined by msanDslPsdMaskDsName." + DEFVAL { "" } + ::= { msanDslSpecificEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.2 + msanDslSpecificUsPsdMask OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Unique name of the upstream PSD mask as defined by msanDslPsdMaskUsName." + DEFVAL { "ANSI_FTTCab_M11" } + ::= { msanDslSpecificEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.3 + msanDslSpecificLineState OBJECT-TYPE + SYNTAX INTEGER + { + quiet(0), + idle(1), + activateInitTrain(2), + activeFullPower(3), + activeLowPower(4), + unitFail(5), + atpPtmLoopback(6), + dspDigitalLoopback(7), + lineDriverDigitalLoopback(8), + hybridLoopback(9), + testMode(10), + loopDiagnosticsDeltInit(11), + loopDiagnosticsDelt(12), + seltInits(13), + selt(14), + lowPowerL3(15) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "VDSL system operational state. For normal blade operation this value should be active(3). + If value is differ from 3, VDSL driver is not operational." + ::= { msanDslSpecificEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.4 + msanDslSpecificMaxDelayDs OBJECT-TYPE + SYNTAX Integer32 (-1..63) + UNITS "milliseconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Maximum interleave delay for the downstream interleaved channel. + -1 means that value from profile will be used (xdsl2ChConfProfMaxDelayDs). + + This object is created based on xdsl2ChConfProfMaxDelayDs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.5 + msanDslSpecificMaxDelayUs OBJECT-TYPE + SYNTAX Integer32 (-1..63) + UNITS "milliseconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Maximum interleave delay for the upstream interleaved channel. + -1 means that value from profile will be used (xdsl2ChConfProfMaxDelayUs). + + This object is created based on xdsl2ChConfProfMaxDelayUs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.6 + msanDslSpecificMinProtectionDs OBJECT-TYPE + SYNTAX Integer32 (-1..160) + UNITS "symbols" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Downstream impulse noise protection. + -1 means that value from profile will be used (xdsl2ChConfProfMinProtectionDs) + + This object is created based on xdsl2ChConfProfMinProtectionDs(VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.7 + msanDslSpecificMinProtectionUs OBJECT-TYPE + SYNTAX Integer32 (-1..160) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Upstream impulse noise protection. + -1 means that value from profile will be used (xdsl2ChConfProfMinProtectionUs) + + This object is created based on xdsl2ChConfProfMinProtectionUs(VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.8 + msanDslSpecificMaxSnrmDs OBJECT-TYPE + SYNTAX Unsigned32 (0..310) + UNITS "0.1 dB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Downstream maximum Signal/Noise Margin. + + This object is created based on xdsl2LConfProfMaxSnrmDs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.9 + msanDslSpecificMinSnrmDs OBJECT-TYPE + SYNTAX Unsigned32 (0..310) + UNITS "0.1 dB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Downstream minimum Signal/Noise Margin. + + This object is created based on xdsl2LConfProfMinSnrmDs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.10 + msanDslSpecificMaxSnrmUs OBJECT-TYPE + SYNTAX Unsigned32 (0..310) + UNITS "0.1 dB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Upstream maximum Signal/Noise Margin. + + This object is created based on xdsl2LConfProfMaxSnrmUs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.11 + msanDslSpecificMinSnrmUs OBJECT-TYPE + SYNTAX Unsigned32 (0..310) + UNITS "0.1 dB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Upstream minimum Signal/Noise Margin. + + This object is created based on xdsl2LConfProfMinSnrmUs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.12 + msanDslSpecificRaUsNrmDs OBJECT-TYPE + SYNTAX Unsigned32 (0..310) + UNITS "0.1 dB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Downstream Up-Shift Noise Margin (for dynamic rate adaptive + mode). + + This object is created based on xdsl2LConfProfRaUsNrmDs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.13 + msanDslSpecificRaUsNrmUs OBJECT-TYPE + SYNTAX Unsigned32 (0..310) + UNITS "0.1 dB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Upstream Up-Shift Noise Margin (for dynamic rate adaptive mode). + + This object is created based on xdsl2LConfProfRaUsNrmUs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.14 + msanDslSpecificRaUsTimeDs OBJECT-TYPE + SYNTAX Unsigned32 (0..16383) + UNITS "seconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Downstream Up-Shift Time Interval (for rate dynamic adaptive + mode). + + This object is created based on xdsl2LConfProfRaUsTimeDs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.15 + msanDslSpecificRaUsTimeUs OBJECT-TYPE + SYNTAX Unsigned32 (0..16383) + UNITS "seconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Upstream Up-Shift Time Interval (for rate dynamic adaptive + mode). + + This object is created based on xdsl2LConfProfRaUsTimeUs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.16 + msanDslSpecificRaDsNrmDs OBJECT-TYPE + SYNTAX Unsigned32 (0..310) + UNITS "0.1 dB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Downstream Down-Shift Noise Margin (for dynamic rate adaptive + mode). + + This object is created based on xdsl2LConfProfRaDsNrmDs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.17 + msanDslSpecificRaDsNrmUs OBJECT-TYPE + SYNTAX Unsigned32 (0..310) + UNITS "0.1 dB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Upstream Down-Shift Noise Margin (for dynamic rate adaptive mode). + + This object is created based on xdsl2LConfProfRaDsNrmUs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.18 + msanDslSpecificRaDsTimeDs OBJECT-TYPE + SYNTAX Unsigned32 (0..16383) + UNITS "seconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Downstream Down-Shift Time Interval (for rate dynamic adaptive + mode). + + This object is created based on xdsl2LConfProfRaDsTimeDs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.19 + msanDslSpecificRaDsTimeUs OBJECT-TYPE + SYNTAX Unsigned32 (0..16383) + UNITS "seconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The Upstream Down-Shift Time Interval (for rate dynamic adaptive + mode). + + This object is created based on xdsl2LConfProfRaDsTimeUs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 19 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.20 + msanDslSpecificL0Time OBJECT-TYPE + SYNTAX Unsigned32 (0..255) + UNITS "seconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The minimum time between an exit from the L2 state and the next entry + into the L2 state. + + This object is created based on xdsl2LConfProfL0Time (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.21 + msanDslSpecificL2Time OBJECT-TYPE + SYNTAX Unsigned32 (0..255) + UNITS "seconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The minimum time between an entry into the L2 state and the first + power trim in the L2 state and between two consecutive power trims in + the L2 State. + + This object is created based on xdsl2LConfProfL2Time (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.22 + msanDslSpecificL2Atpr OBJECT-TYPE + SYNTAX Unsigned32 (0..31) + UNITS "dB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The maximum aggregate transmit power reduction that can be performed + at transition of L0 to L2 state or through a single power trim in the + L2 state. + + This object is created based on xdsl2LConfProfL2Atpr (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 22 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.23 + msanDslSpecificL2Atprt OBJECT-TYPE + SYNTAX Unsigned32 (0..31) + UNITS "dB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The total maximum aggregate transmit power reduction that can be + performed in an L2 state. + + This object is created based on xdsl2LConfProfL2Atprt (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 23 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.24 + msanDslSpecificScMaskDs OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..512)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Downstream Sub-carriers mask. A bitmap of 4096 bits that allows + masking up to 4096 downstream sub-carriers. + If bit is set to '1', the respective downstream sub-carrier is + masked (not used), and if set to '0', the respective sub-carrier is + unmasked. + + This object is created based on xdsl2LConfProfScMaskDs (VDSL2-LINE MIB) + " + ::= { msanDslSpecificEntry 24 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.25 + msanDslSpecificScMaskUs OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..512)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Upstream Sub-carriers mask. A bitmap of 4096 bits that allows + masking up to 4096 downstream sub-carriers. + If bit is set to '1', the respective downstream sub-carrier is + masked (not used), and if set to '0', the respective sub-carrier is + unmasked. + + This object is created based on xdsl2LConfProfScMaskUs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 25 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.26 + msanDslSpecificRfiBands OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..64)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "For VDLS, this configuration parameter defines the bands where the + PSD shall be reduced. Each band shall be represented by a start and + stop subcarrier indices with a subcarrier spacing of 4.3125 kHz. Up to + 16 bands may be specified. This parameter defines the RFI bands for + both upstream and downstream directions. Each RFI band is + represented by 4 octets: 16 bit start sub-carrier index followed by a + 16 bit stop sub-carrier index. + + This object is created based on xdsl2LConfProfRfiBands (VDSL2-LINE MIB) + " + ::= { msanDslSpecificEntry 26 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.27 + msanDslSpecificMaxNomPsdDs OBJECT-TYPE + SYNTAX Integer32 (-600..-300) + UNITS "0.1 dBm/Hz" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The maximum nominal transmit PSD in the downstream direction during + initialization and Showtime. (0.1 dBm/Hz - physical values are -60 to + -30 dBm/Hz). + + This object is created based on xdsl2LConfProfMaxNomPsdDs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 27 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.28 + msanDslSpecificMaxNomPsdUs OBJECT-TYPE + SYNTAX Integer32 (-600..-300) + UNITS "0.1 dBm/Hz" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The maximum nominal transmit PSD in the upstream direction during + initialization and Showtime. (0.1 dBm/Hz - physical values are -60 to + -30 dBm/Hz). + + This object is created based on xdsl2LConfProfMaxNomPsdUs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 28 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.29 + msanDslSpecificMaxNomAtpDs OBJECT-TYPE + SYNTAX Unsigned32 (0..255) + UNITS "0.1 dBm" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The maximum nominal aggregate transmit power in the downstream + direction during initialization and Showtime. (0.1 dBm - physical + values are 0 to 25.5 dBm). + + This object is created based on xdsl2LConfProfMaxNomAtpDs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 29 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.30 + msanDslSpecificMaxNomAtpUs OBJECT-TYPE + SYNTAX Unsigned32 (0..255) + UNITS "0.1 dBm" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The maximum nominal aggregate transmit power in the upstream + direction during initialization and Showtime. (0.1 dBm - physical + values are 0 to 25.5 dBm). + + This object is created based on xdsl2LConfProfMaxNomAtpUs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 30 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.31 + msanDslSpecificMaxAggRxPwrUs OBJECT-TYPE + SYNTAX Integer32 (-255..255) + UNITS "0.1 dBm" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The maximum upstream aggregate receive power over the relevant set of + sub-carriers.. (0.1 dBm - physical values are -25.5 to 25.5 dBm). + + This object is created based on xdsl2LConfProfMaxAggRxPwrUs (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 31 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.32 + msanDslSpecificClassMask OBJECT-TYPE + SYNTAX INTEGER + { + b998M1xA(1), + b998M1xB(2), + b998M1xNUS0(3), + b998M2xA(4), + b998M2xM(5), + b998M2xB(6), + b998M2xNUS0(7), + b998E17M2xNUS0(8), + b998E17M2xNUS0M(9), + b998ADE17M2xNUS0M(10), + b998ADE17M2xA(11), + b998ADE17M2xB(12), + b997M1cA7(13), + b997M1xM8(14), + b997M1xM(15), + b997M2xM8(16), + b997M2xA(17), + b997M2xM(18), + bHPE17M1NUS0(19), + bHPE30M1NUS0(20), + b997E17M2xA(21) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Predefined PSD mask. + + This object is created based on xdsl2LConfProfClassMask (VDSL2-LINE MIB)" + DEFVAL { b998E17M2xNUS0 } + ::= { msanDslSpecificEntry 32 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.35 + msanDslSpecificDpboEsEL OBJECT-TYPE + SYNTAX Unsigned32 (0..511) + UNITS "0.5 dB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Assumed electrical length of cables (E-side cables) connecting + exchange based DSL services to a remote flexibility point (cabinet). + The electrical length is defined as the loss (in dB) of an equivalent + length of hypothetical cable at a reference frequency. 0 dB (coded as + 0) to 255.5 dB (coded as 511) in steps of 0.5 dB. + + This object is created based on xdsl2LConfProfDpboEsEL (VDSL2-LINE MIB) + " + ::= { msanDslSpecificEntry 35 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.36 + msanDslSpecificUpboKLF OBJECT-TYPE + SYNTAX INTEGER + { + auto(1), + override(2), + disableUpbo(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Defines the upstream power backoff force mode. + The three possible mode values are: + auto(1), + override(2), + disableUpbo(3). + + This object is created based on xdsl2LConfProfUpboKLF (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 36 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.37 + msanDslSpecificUpboKL OBJECT-TYPE + SYNTAX Unsigned32 (0..1280) + UNITS "0.1 dB" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This configuration parameter defines the electrical length expressed + in dB at 1MHz, configured by the CO-MIB. The value ranges from 0 + (coded as 0) to 128 dB (coded as 1280) in steps of 0.1 dB. + + This object is created based on xdsl2LConfProfUpboKL (VDSL2-LINE MIB)" + ::= { msanDslSpecificEntry 37 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.39 + msanDslSpecificSelt OBJECT-TYPE + SYNTAX INTEGER + { + inhibit(1), + force(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Defines whether the line should be forced into the SELT (Single-Ended Loop Testing) + diagnostics mode by the near-end xTU of this line. + Upon completion of the loop diagnostic mode procedures, the Access Node shall set + this object to 'inhibit'. + The results of the SELT procedure are stored in the table msanDslSeltStatusTable. + The status of the loop diagnostic procedure is indicated by msanDslSpecificSeltStatus. + " + DEFVAL { inhibit } + ::= { msanDslSpecificEntry 39 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.40 + msanDslSpecificSeltStatus OBJECT-TYPE + SYNTAX INTEGER + { + none(1), + success(2), + inProgress(3), + unsupported(4), + cannotRun(5), + aborted(6), + failed(7), + illegalMode(8), + adminUp(9), + tableFull(10), + noResources(11), + undefinedError(12) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "SELT (Single-Ended Loop Testing) status of dsl line. " + ::= { msanDslSpecificEntry 40 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.41 + msanDslSpecificPhyRDs OBJECT-TYPE + SYNTAX INTEGER + { + disabled(1), + enabled(2), + auto(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Physical Layer Retransmission configuration in the downstream direction. " + DEFVAL { auto } + ::= { msanDslSpecificEntry 41 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.42 + msanDslSpecificPhyRUs OBJECT-TYPE + SYNTAX INTEGER + { + disabled(1), + enabled(2), + auto(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Physical Layer Retransmission configuration in the upstream direction. " + DEFVAL { auto } + ::= { msanDslSpecificEntry 42 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.43 + msanDslSpecificUpboUs1a OBJECT-TYPE + SYNTAX INTEGER (4000..8095) + UNITS "0.01 dBm/Hz" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ITU-T G.997.1, paragraph #7.3.1.2.14 (UPBOPSD-pb) + + Parameter defines the 'a' reference parameter of the UPBO reference PSD + used to compute the upstream power back-off for the upstream band. + A UPBO PSD defined for each band shall consist of two parameters [a, b]. + + Parameter 'a' (xdsl2LConfProfUpboPsdA) ranges from 40 dBm/Hz (coded as + 4000) to 80.95 dBm/Hz (coded as 8095) in steps of 0.01 dBm/Hz; and + parameter 'b' (xdsl2LConfProfUpboPsdB) ranges from 0 dBm/Hz (coded as 0) + to 40.95 dBm/Hz (coded as 4095) in steps of 0.01 dBm/Hz. + + The UPBO reference PSD at the frequency 'f' expressed in MHz shall be + equal to '-a-b(SQRT(f))'. Setting xdsl2LConfProfUpboPsdA to 4000 and + xdsl2LConfProfUpboPsdB to 0 is a special configuration to disable UPBO in + the respective upstream band." + DEFVAL { 4000 } + ::= { msanDslSpecificEntry 43 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.44 + msanDslSpecificUpboUs1b OBJECT-TYPE + SYNTAX INTEGER (0..4095) + UNITS "0.01 dBm/Hz" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ITU-T G.997.1, paragraph #7.3.1.2.14 (UPBOPSD-pb) + + Parameter defines the 'b' reference parameter of the UPBO + reference PSD used to compute the upstream power back-off for the + upstream band. Parameter 'b' (xdsl2LConfProfUpboPsdB) ranges from + 0 dBm/Hz (coded as 0) to 40.95 dBm/Hz (coded as 4095) in steps of 0.01 dBm/Hz. + " + DEFVAL { 0 } + ::= { msanDslSpecificEntry 44 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.45 + msanDslSpecificUpboUs2a OBJECT-TYPE + SYNTAX INTEGER (4000..8095) + UNITS "0.01 dBm/Hz" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ITU-T G.997.1, paragraph #7.3.1.2.14 (UPBOPSD-pb) + + Parameter defines the 'a' reference parameter of the UPBO reference PSD + used to compute the upstream power back-off for the upstream band. + A UPBO PSD defined for each band shall consist of two parameters [a, b]. + + Parameter 'a' (xdsl2LConfProfUpboPsdA) ranges from 40 dBm/Hz (coded as + 4000) to 80.95 dBm/Hz (coded as 8095) in steps of 0.01 dBm/Hz; and + parameter 'b' (xdsl2LConfProfUpboPsdB) ranges from 0 dBm/Hz (coded as 0) + to 40.95 dBm/Hz (coded as 4095) in steps of 0.01 dBm/Hz. + + The UPBO reference PSD at the frequency 'f' expressed in MHz shall be + equal to '-a-b(SQRT(f))'. Setting xdsl2LConfProfUpboPsdA to 4000 and + xdsl2LConfProfUpboPsdB to 0 is a special configuration to disable UPBO in + the respective upstream band." + DEFVAL { 4000 } + ::= { msanDslSpecificEntry 45 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.46 + msanDslSpecificUpboUs2b OBJECT-TYPE + SYNTAX INTEGER (0..4095) + UNITS "0.01 dBm/Hz" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ITU-T G.997.1, paragraph #7.3.1.2.14 (UPBOPSD-pb) + + Parameter defines the 'b' reference parameter of the UPBO + reference PSD used to compute the upstream power back-off for the + upstream band. Parameter 'b' (xdsl2LConfProfUpboPsdB) ranges from + 0 dBm/Hz (coded as 0) to 40.95 dBm/Hz (coded as 4095) in steps of 0.01 dBm/Hz. + " + DEFVAL { 0 } + ::= { msanDslSpecificEntry 46 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.47 + msanDslSpecificUpboUs3a OBJECT-TYPE + SYNTAX INTEGER (4000..8095) + UNITS "0.01 dBm/Hz" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ITU-T G.997.1, paragraph #7.3.1.2.14 (UPBOPSD-pb) + + Parameter defines the 'a' reference parameter of the UPBO reference PSD + used to compute the upstream power back-off for the upstream band. + A UPBO PSD defined for each band shall consist of two parameters [a, b]. + + Parameter 'a' (xdsl2LConfProfUpboPsdA) ranges from 40 dBm/Hz (coded as + 4000) to 80.95 dBm/Hz (coded as 8095) in steps of 0.01 dBm/Hz; and + parameter 'b' (xdsl2LConfProfUpboPsdB) ranges from 0 dBm/Hz (coded as 0) + to 40.95 dBm/Hz (coded as 4095) in steps of 0.01 dBm/Hz. + + The UPBO reference PSD at the frequency 'f' expressed in MHz shall be + equal to '-a-b(SQRT(f))'. Setting xdsl2LConfProfUpboPsdA to 4000 and + xdsl2LConfProfUpboPsdB to 0 is a special configuration to disable UPBO in + the respective upstream band." + DEFVAL { 4000 } + ::= { msanDslSpecificEntry 47 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.48 + msanDslSpecificUpboUs3b OBJECT-TYPE + SYNTAX INTEGER (0..4095) + UNITS "0.01 dBm/Hz" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ITU-T G.997.1, paragraph #7.3.1.2.14 (UPBOPSD-pb) + + Parameter defines the 'b' reference parameter of the UPBO + reference PSD used to compute the upstream power back-off for the + upstream band. Parameter 'b' (xdsl2LConfProfUpboPsdB) ranges from + 0 dBm/Hz (coded as 0) to 40.95 dBm/Hz (coded as 4095) in steps of 0.01 dBm/Hz. + " + DEFVAL { 0 } + ::= { msanDslSpecificEntry 48 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.49 + msanDslSpecificUpboUs4a OBJECT-TYPE + SYNTAX INTEGER (4000..8095) + UNITS "0.01 dBm/Hz" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ITU-T G.997.1, paragraph #7.3.1.2.14 (UPBOPSD-pb) + + Parameter defines the 'a' reference parameter of the UPBO reference PSD + used to compute the upstream power back-off for the upstream band. + A UPBO PSD defined for each band shall consist of two parameters [a, b]. + + Parameter 'a' (xdsl2LConfProfUpboPsdA) ranges from 40 dBm/Hz (coded as + 4000) to 80.95 dBm/Hz (coded as 8095) in steps of 0.01 dBm/Hz; and + parameter 'b' (xdsl2LConfProfUpboPsdB) ranges from 0 dBm/Hz (coded as 0) + to 40.95 dBm/Hz (coded as 4095) in steps of 0.01 dBm/Hz. + + The UPBO reference PSD at the frequency 'f' expressed in MHz shall be + equal to '-a-b(SQRT(f))'. Setting xdsl2LConfProfUpboPsdA to 4000 and + xdsl2LConfProfUpboPsdB to 0 is a special configuration to disable UPBO in + the respective upstream band." + DEFVAL { 4000 } + ::= { msanDslSpecificEntry 49 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.50 + msanDslSpecificUpboUs4b OBJECT-TYPE + SYNTAX INTEGER (0..4095) + UNITS "0.01 dBm/Hz" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ITU-T G.997.1, paragraph #7.3.1.2.14 (UPBOPSD-pb) + + Parameter defines the 'b' reference parameter of the UPBO + reference PSD used to compute the upstream power back-off for the + upstream band. Parameter 'b' (xdsl2LConfProfUpboPsdB) ranges from + 0 dBm/Hz (coded as 0) to 40.95 dBm/Hz (coded as 4095) in steps of 0.01 dBm/Hz. + " + DEFVAL { 0 } + ::= { msanDslSpecificEntry 50 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.51 + msanDslSpecificDpboEPsdMask OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DPbo EPsd mask name. + It should be of the downstream PSD mask as defined by msanDslPsdMaskDsName." + DEFVAL { "" } + ::= { msanDslSpecificEntry 51 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.52 + msanDslSpecificDpboEsCmA OBJECT-TYPE + SYNTAX Unsigned32 (0..640) + UNITS "2^-8" + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "ITU-T G.997.1, paragraph #7.3.1.2.13 (DPBOESCMA) + + The E-side Cable Model parameter A (DPBOESCMA) of the cable model + (DPBOESCM) for cables connecting exchange-based DSL services to a remote + flexibility point (cabinet), that hosts the xTU-C that is subject to spectrally shaped + downstream power back- off (DPBO) depending on this value. + Possible values shall be coded as unsigned integers representing a scalar value + from -1 (coded as 0) to 1.5 (coded as 640) in steps of 2-8 All values in the range are + valid. + " + REFERENCE + "ITU-T G.997.1, paragraph #7.3.1.2.13 (DPBOESCMA)" + DEFVAL { 0 } + ::= { msanDslSpecificEntry 52 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.53 + msanDslSpecificDpboEsCmB OBJECT-TYPE + SYNTAX Unsigned32 (0..640) + UNITS "2^-8" + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "ITU-T G.997.1, paragraph #7.3.1.2.13 (DPBOESCMB) + + The E-side Cable Model parameter B (DPBOESCMB) of the cable model + (DPBOESCM) for cables connecting exchange-based DSL services to a remote + flexibility point (cabinet), that hosts the xTU-C that is subject to spectrally shaped + downstream power back- off (DPBO) depending on this value. + Possible values shall be coded as unsigned integers representing a scalar value + from -1 (coded as 0) to 1.5 (coded as 640) in steps of 2-8 All values in the range are + valid. + " + REFERENCE + "ITU-T G.997.1, paragraph #7.3.1.2.13 (DPBOESCMB)" + DEFVAL { 0 } + ::= { msanDslSpecificEntry 53 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.54 + msanDslSpecificDpboEsCmC OBJECT-TYPE + SYNTAX Unsigned32 (0..640) + UNITS "2^-8" + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "ITU-T G.997.1, paragraph #7.3.1.2.13 (DPBOESCMC) + + The E-side Cable Model parameter C (DPBOESCMC) of the cable model + (DPBOESCM) for cables connecting exchange-based DSL services to a remote + flexibility point (cabinet), that hosts the xTU-C that is subject to spectrally shaped + downstream power back- off (DPBO) depending on this value. + Possible values shall be coded as unsigned integers representing a scalar value + from -1 (coded as 0) to 1.5 (coded as 640) in steps of 2-8 All values in the range are + valid. + " + REFERENCE + "ITU-T G.997.1, paragraph #7.3.1.2.13 (DPBOESCMC)" + DEFVAL { 0 } + ::= { msanDslSpecificEntry 54 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.55 + msanDslSpecificDpboMus OBJECT-TYPE + SYNTAX Unsigned32 (0..255) + UNITS "0.5 dBm/Hz" + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "ITU-T G.997.1, paragraph #7.3.1.2.13 (DPBOMUS) + + Assumed Minimum Usable receive PSD mask (in dBm/Hz) for exchange-based + services. + It shall be coded as an unsigned integer representing a PSD mask level from + 0 dBm/Hz (coded as 0) to -127.5 dBm/Hz (coded as 255) in steps of 0.5 dBm/Hz. + All values in the range are valid. + " + REFERENCE + "ITU-T G.997.1, paragraph #7.3.1.2.13 (DPBOMUS)" + DEFVAL { 0 } + ::= { msanDslSpecificEntry 55 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.56 + msanDslSpecificDpboFMin OBJECT-TYPE + SYNTAX Unsigned32 (0..2048) + UNITS "4.3125 kHz" + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "ITU-T G.997.1, paragraph #7.3.1.2.13 (DPBOFMIN) + + Minimum frequency from which the DPBO shall be applied. + It ranges from 0 kHz (coded as 0) to 8832 kHz (coded as 2048) in steps of 4.3125 kHz. + " + REFERENCE + "ITU-T G.997.1, paragraph #7.3.1.2.13 (DPBOFMIN)" + DEFVAL { 32 } + ::= { msanDslSpecificEntry 56 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.57 + msanDslSpecificDpboFMax OBJECT-TYPE + SYNTAX Unsigned32 (32..6956) + UNITS "4.3125 kHz" + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "ITU-T G.997.1, paragraph #7.3.1.2.13 (DPBOFMAX) + + Maximum frequency at which DPBO may be applied. + It ranges from 138 kHz (coded as 32) to 29997.75 kHz (coded as 6956) in steps of 4.3125 kHz. + " + REFERENCE + "ITU-T G.997.1, paragraph #7.3.1.2.13 (DPBOFMAX)" + DEFVAL { 512 } + ::= { msanDslSpecificEntry 57 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.58 + msanDslSpecificVectorModeEnable OBJECT-TYPE + SYNTAX BITS + { + vdsl2Only(0), + vectoringFriendlyDs(1), + vectoringFriendlyDsUs(2), + vectoringFully(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Type of vectoring initialization to be allowed by the VTU-O on the line. + ITU-T G.997.1, paragraph #7.3.1.13.9 (VECTORMODE_ENABLE). + + This configuration parameter defines the vectoring initialization type to be + allowed by the VTU-O on the line. It is coded in a bit-map representation (0 + if not allowed, 1 if allowed). + + " + DEFVAL { { } } + ::= { msanDslSpecificEntry 58 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.3.1.59 + msanDslSpecificVectorModeState OBJECT-TYPE + SYNTAX BITS + { + vdsl2Only(0), + vectoringFriendlyDs(1), + vectoringFriendlyDsUs(2), + vectoringFully(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current vectoring initialization type on the line. + + Line can operate only in common vdsl2 (non/vectoring) + or in one of vectoring modes therefore only one bit may be set to 1. " + ::= { msanDslSpecificEntry 59 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.4 + msanDslPsdMaskDsTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDslPsdMaskDsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Management of Downstream PSD Mask (G997.1 #7.3.1.2.9 )" + ::= { msanDslSpecific 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.4.1 + msanDslPsdMaskDsEntry OBJECT-TYPE + SYNTAX MsanDslPsdMaskDsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanDslPsdMaskDsName } + ::= { msanDslPsdMaskDsTable 1 } + + + MsanDslPsdMaskDsEntry ::= + SEQUENCE { + msanDslPsdMaskDsName + OCTET STRING, + msanDslPsdMaskDsType + INTEGER, + msanDslPsdMaskDsShape + Xdsl2PsdMaskDs, + msanDslPsdMaskDsRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.4.1.1 + msanDslPsdMaskDsName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..32)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Downstream custom PSD mask name." + ::= { msanDslPsdMaskDsEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.4.1.2 + msanDslPsdMaskDsType OBJECT-TYPE + SYNTAX INTEGER + { + default(1), + configured(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Downstream custom PSD mask type. + + Possible values: + default(1) - Default mask prepared by vendor, user is not allowed to delete or change it + configured(2) - Mask created by user + " + DEFVAL { management } + ::= { msanDslPsdMaskDsEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.4.1.3 + msanDslPsdMaskDsShape OBJECT-TYPE + SYNTAX Xdsl2PsdMaskDs + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The downstream PSD mask applicable at the U-C2 reference point. + + This parameter is used only for G.992.5 and it may impose PSD + restrictions (breakpoints) in addition to the Limit PSD mask + defined in G.992.5. + This is a string of 32 pairs of values in the following + structure: + Octets 0-1 - Index of the first subcarrier used in the context of + a first breakpoint. + Octet 2 - The PSD reduction for the subcarrier indicated in + octets 0 and 1. + Octets 3-5 - Same, for a second breakpoint. + Octets 6-8 - Same, for a third breakpoint. + This architecture continues until octets 94-95, which are + associated with a 32nd breakpoint. + Each subcarrier index is an unsigned number in the range 0 and + NSCds-1. Each PSD reduction value is in the range 0 (0 dBm/Hz) to + 255 (-127.5 dBm/Hz) with steps of 0.5 dBm/Hz. Valid values are in + the range 0 to 190 (0 to -95 dBm/Hz). + When the number of breakpoints is less than 32, all remaining + octets are set to the value '0'. Note that the content of this + object should be correlated with the subcarrier mask and with + the RFI setup. + " + DEFVAL { '0'h } + ::= { msanDslPsdMaskDsEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.4.1.4 + msanDslPsdMaskDsRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanDslPsdMaskDsEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.5 + msanDslPsdMaskUsTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDslPsdMaskUsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Management of Upstream PSD Mask (G997.1 #7.3.1.2.9 )" + ::= { msanDslSpecific 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.5.1 + msanDslPsdMaskUsEntry OBJECT-TYPE + SYNTAX MsanDslPsdMaskUsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanDslPsdMaskUsName } + ::= { msanDslPsdMaskUsTable 1 } + + + MsanDslPsdMaskUsEntry ::= + SEQUENCE { + msanDslPsdMaskUsName + OCTET STRING, + msanDslPsdMaskUsType + INTEGER, + msanDslPsdMaskUsShape + Xdsl2PsdMaskUs, + msanDslPsdMaskUsRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.5.1.1 + msanDslPsdMaskUsName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..32)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Upstream custom PSD mask name." + ::= { msanDslPsdMaskUsEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.5.1.2 + msanDslPsdMaskUsType OBJECT-TYPE + SYNTAX INTEGER + { + default(1), + configured(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Downstream custom PSD mask type. + + Possible values: + default(1) - Default mask prepared by vendor, user is not allowed to delete or change it + configured(2) - Mask created by user" + DEFVAL { management } + ::= { msanDslPsdMaskUsEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.5.1.3 + msanDslPsdMaskUsShape OBJECT-TYPE + SYNTAX Xdsl2PsdMaskUs + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The upstream PSD mask applicable at the U-R2 reference point. + + This parameter is used only for G.992.5, and it may impose PSD + restrictions (breakpoints) in addition to the Limit PSD mask + defined in G.992.5. + This is a string of 16 pairs of values in the following + structure: + Octets 0-1 - Index of the first subcarrier used in the context of + a first breakpoint. + Octet 2 - The PSD reduction for the subcarrier indicated in + octets 0 and 1. + Octets 3-5 - Same, for a second breakpoint. + Octets 6-8 - Same, for a third breakpoint. + This architecture continues until octets 9-47, which are + associated with a 16th breakpoint. + Each subcarrier index is an unsigned number in the range 0 and + NSCus-1. Each PSD reduction value is in the range 0 (0 dBm/Hz) to + 255 (-127.5 dBm/Hz) with steps of 0.5 dBm/Hz. Valid values are in + the range 0 to 190 (0 to -95 dBm/Hz). + When the number of breakpoints is less than 16, all remaining + octets are set to the value '0'. Note that the content of this + object should be correlated with the subcarrier mask and with + the RFI setup. + " + DEFVAL { '0'h } + ::= { msanDslPsdMaskUsEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.5.1.4 + msanDslPsdMaskUsRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanDslPsdMaskUsEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.6 + msanDslSeltStatusTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDslSeltStatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanDslSpecific 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.6.1 + msanDslSeltStatusEntry OBJECT-TYPE + SYNTAX MsanDslSeltStatusEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanDslSeltStatusTable 1 } + + + MsanDslSeltStatusEntry ::= + SEQUENCE { + msanDslSeltStatusNoiseType + OCTET STRING, + msanDslSeltStatusNoiseMrgDs + Integer32, + msanDslSeltStatusNoiseMrgUs + Integer32, + msanDslSeltStatusNumTonesDs + Integer32, + msanDslSeltStatusNumTonesUs + Integer32, + msanDslSeltStatusMaxRateDs + Integer32, + msanDslSeltStatusMaxRateUs + Integer32, + msanDslSeltStatusCableType + OCTET STRING, + msanDslSeltStatusCableLenght + Integer32, + msanDslSeltStatusFitError + Integer32, + msanDslSeltStatusLoopTermination + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.6.1.1 + msanDslSeltStatusNoiseType OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..30)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Noise type." + ::= { msanDslSeltStatusEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.6.1.2 + msanDslSeltStatusNoiseMrgDs OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.1 dB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Noise margin in DS direction. [0.1 dB]" + ::= { msanDslSeltStatusEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.6.1.3 + msanDslSeltStatusNoiseMrgUs OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.1 dB" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Noise margin in US direction. [0.1 dB]" + ::= { msanDslSeltStatusEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.6.1.4 + msanDslSeltStatusNumTonesDs OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of tones used for SELT in DS direction. " + ::= { msanDslSeltStatusEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.6.1.5 + msanDslSeltStatusNumTonesUs OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of tones used for SELT in US direction. " + ::= { msanDslSeltStatusEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.6.1.6 + msanDslSeltStatusMaxRateDs OBJECT-TYPE + SYNTAX Integer32 + UNITS "kbps" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Maximum Downstream capacity [kbps]" + ::= { msanDslSeltStatusEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.6.1.7 + msanDslSeltStatusMaxRateUs OBJECT-TYPE + SYNTAX Integer32 + UNITS "kbps" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Maximum Upstream capacity [kbps]" + ::= { msanDslSeltStatusEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.6.1.8 + msanDslSeltStatusCableType OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..20)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DSL line loop type." + ::= { msanDslSeltStatusEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.6.1.9 + msanDslSeltStatusCableLenght OBJECT-TYPE + SYNTAX Integer32 + UNITS "m" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DSL line loop lenght. [m]" + ::= { msanDslSeltStatusEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.6.1.10 + msanDslSeltStatusFitError OBJECT-TYPE + SYNTAX Integer32 + UNITS "%" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DSL Line lenght fit error. [%]" + ::= { msanDslSeltStatusEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.6.1.11 + msanDslSeltStatusLoopTermination OBJECT-TYPE + SYNTAX INTEGER + { + unknown(1), + open(2), + short(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of DSL line termination. " + ::= { msanDslSeltStatusEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.7 + msanDslAtmPvcTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanDslAtmPvcEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ATM PVC configuration of the ADSL port" + ::= { msanDslSpecific 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.7.1 + msanDslAtmPvcEntry OBJECT-TYPE + SYNTAX MsanDslAtmPvcEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanDslAtmPvcTable 1 } + + + MsanDslAtmPvcEntry ::= + SEQUENCE { + msanDslAtmPvcVpi + Integer32, + msanDslAtmPvcVci + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.7.1.2 + msanDslAtmPvcVpi OBJECT-TYPE + SYNTAX Integer32 (-1..255) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ATM Virtual path identifier of the ADSL PVC interface. + Value -1 indicates that parameter has not been defined." + DEFVAL { -1 } + ::= { msanDslAtmPvcEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.19.7.1.3 + msanDslAtmPvcVci OBJECT-TYPE + SYNTAX Integer32 (31..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ATM Virtual channel identifier of the ADSL PVC interface. + Value 31 indicates that parameter has not been defined." + DEFVAL { 31 } + ::= { msanDslAtmPvcEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.20 + msanPortMirroring OBJECT IDENTIFIER ::= { msanAdditionalConf 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.20.1 + msanPortMirroringGlobal OBJECT IDENTIFIER ::= { msanPortMirroring 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.20.2 + msanPortMirroringTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanPortMirroringEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanPortMirroring 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.20.2.1 + msanPortMirroringEntry OBJECT-TYPE + SYNTAX MsanPortMirroringEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanPortMirroringSessionId } + ::= { msanPortMirroringTable 1 } + + + MsanPortMirroringEntry ::= + SEQUENCE { + msanPortMirroringSessionId + Integer32, + msanPortMirroringAdminState + INTEGER, + msanPortMirroringDestPort + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.20.2.1.1 + msanPortMirroringSessionId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The Session number of this mirroring entry." + ::= { msanPortMirroringEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.20.2.1.2 + msanPortMirroringAdminState OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The status of this port mirroring session. " + ::= { msanPortMirroringEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.20.2.1.3 + msanPortMirroringDestPort OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The port which traffic from the mirrored ports will be sent to. + Port value is ifIndex from ifTable. Value 0 means, port is not defined." + ::= { msanPortMirroringEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.20.3 + msanPortMirroringMemberTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanPortMirroringMemberEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanPortMirroring 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.20.3.1 + msanPortMirroringMemberEntry OBJECT-TYPE + SYNTAX MsanPortMirroringMemberEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanPortMirroringSessionId, msanPortMirroringMemberSrcPort } + ::= { msanPortMirroringMemberTable 1 } + + + MsanPortMirroringMemberEntry ::= + SEQUENCE { + msanPortMirroringMemberSrcPort + Integer32, + msanPortMirroringMemberDirection + INTEGER, + msanPortMirroringMemberRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.20.3.1.1 + msanPortMirroringMemberSrcPort OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The port from which traffic will be sent to the destination port. " + ::= { msanPortMirroringMemberEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.20.3.1.2 + msanPortMirroringMemberDirection OBJECT-TYPE + SYNTAX INTEGER + { + tx(1), + rx(2), + txAndRx(3) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The direction of the data to be mirrored on this source port. " + ::= { msanPortMirroringMemberEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.20.3.1.3 + msanPortMirroringMemberRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + For row creation use createAndWait(5) [createAndGo(4) is not supported]." + ::= { msanPortMirroringMemberEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.21 + msanResetWithDelay OBJECT IDENTIFIER ::= { msanAdditionalConf 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.21.1 + msanResetWithDelayGlobal OBJECT IDENTIFIER ::= { msanResetWithDelay 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.21.1.1 + msanResetDelay OBJECT-TYPE + SYNTAX INTEGER (0..3600) + UNITS "seconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Delay in seconds before reset will be performed. If set to 0, reset countdown is stopped and reset is cancelled. + This parameter returns number of seconds before reset. If it returns 0, reset with delay was not initiated. " + ::= { msanResetWithDelayGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.22 + msanMacTable OBJECT IDENTIFIER ::= { msanAdditionalConf 22 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.22.1 + msanMacTableGlobal OBJECT IDENTIFIER ::= { msanMacTable 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.22.1.1 + msanMacTableLength OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Maximum number of MAC addresses (total length of MAC table). " + ::= { msanMacTableGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.22.1.2 + msanMacTableUsed OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of entries in MAC table." + ::= { msanMacTableGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.22.2 + msanMacTableCAMTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMacTableCAMEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanMacTable 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.22.2.1 + msanMacTableCAMEntry OBJECT-TYPE + SYNTAX MsanMacTableCAMEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanMacTableCAMIndex } + ::= { msanMacTableCAMTable 1 } + + + MsanMacTableCAMEntry ::= + SEQUENCE { + msanMacTableCAMIndex + Integer32, + msanMacTableMacAddress + MacAddress, + msanMacTablePort + Integer32, + msanMacTableVLAN + Integer32, + msanMacTableType + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.22.2.1.1 + msanMacTableCAMIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Id of the CAM entry." + ::= { msanMacTableCAMEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.22.2.1.2 + msanMacTableMacAddress OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "MAC address of the CAM entry. " + ::= { msanMacTableCAMEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.22.2.1.3 + msanMacTablePort OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The port on which MAC address was learned or defined. " + ::= { msanMacTableCAMEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.22.2.1.4 + msanMacTableVLAN OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "VLAN id of the learned or defined MAC address. " + ::= { msanMacTableCAMEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.22.2.1.5 + msanMacTableType OBJECT-TYPE + SYNTAX INTEGER + { + learned(1), + managment(2), + static(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of the MAC address. " + ::= { msanMacTableCAMEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.23 + msanAcs OBJECT IDENTIFIER ::= { msanAdditionalConf 23 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.23.1 + msanAcsGlobal OBJECT IDENTIFIER ::= { msanAcs 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.23.1.1 + msanAcsServerUrl OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This is URL of the ACS server in form: ://|[:]/[/] + If hostname is used, msanDnsIpAddress and msanAcsDomainName must also be set. " + ::= { msanAcsGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.23.1.2 + msanPrimaryDnsIpAddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This specifies the primary DNS server IP . " + ::= { msanAcsGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.23.1.3 + msanSecondaryDnsIpAddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This specifies the secondary DNS server IP . " + ::= { msanAcsGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.23.1.4 + msanAcsDomainName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Domain name. " + ::= { msanAcsGlobal 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.23.1.5 + msanAcsClientStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ACS client administrative status." + ::= { msanAcsGlobal 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.23.1.6 + msanAcsBackupConf OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Back up configuration (as CLI script) to ACS server." + ::= { msanAcsGlobal 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24 + msanStp OBJECT IDENTIFIER ::= { msanAdditionalConf 24 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.1 + msanStpGlobal OBJECT IDENTIFIER ::= { msanStp 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.2 + msanStpBpduFilterTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanStpBpduFilterEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanStp 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.2.1 + msanStpBpduFilterEntry OBJECT-TYPE + SYNTAX MsanStpBpduFilterEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanStpBpduFilterTable 1 } + + + MsanStpBpduFilterEntry ::= + SEQUENCE { + msanStpBpduFilter + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.2.1.1 + msanStpBpduFilter OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Defines how BPDU packets are handled in case stp_port_state is disabled. + + 0 disable - If stp_port_state is disabled on interface, forward all + BPDUs unchanged to all other interfaces that also have stp_port_state + disabled. + 1 enable - If stp_port_state is disabled on interface, drop all + BPDUs received on the interface. " + ::= { msanStpBpduFilterEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.3 + msanStpSwitchConfigGroup OBJECT IDENTIFIER ::= { msanStp 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.3.1 + msanStpCstBridgePriority OBJECT-TYPE + SYNTAX Unsigned32 (0..61440) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The CSTP bridge priority in instance 0. The priority is + in the increments of 4096. The recommended default value is 32768." + ::= { msanStpSwitchConfigGroup 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.4 + msanStpMstTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanStpMstEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + REFERENCE + "agentStpMstTable - 1.3.6.1.4.1.6132.1.1.1.2.15.10" + ::= { msanStp 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.4.1 + msanStpMstEntry OBJECT-TYPE + SYNTAX MsanStpMstEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanStpMstId } + ::= { msanStpMstTable 1 } + + + MsanStpMstEntry ::= + SEQUENCE { + msanStpMstId + Unsigned32, + msanStpMstBridgePriority + Unsigned32, + msanStpMstRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.4.1.1 + msanStpMstId OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The MSTP instance ID. Instance 0 is not shown. " + ::= { msanStpMstEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.4.1.2 + msanStpMstBridgePriority OBJECT-TYPE + SYNTAX Unsigned32 (0..61440) + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The MSTP bridge priority in a specific instance. The priority is + in the increments of 4096. The recommended default value is 32768." + ::= { msanStpMstEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.4.1.3 + msanStpMstRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The MSTP instance status. Instance 0 is not shown. + + Supported values: + active(1) - valid instance. + createAndGo(4) - used to create a new instance. + destroy(6) - removes an instance." + ::= { msanStpMstEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.5 + msanStpMstVlanTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanStpMstVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + REFERENCE + "agentStpMstTable - 1.3.6.1.4.1.6132.1.1.1.2.15.10" + ::= { msanStp 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.5.1 + msanStpMstVlanEntry OBJECT-TYPE + SYNTAX MsanStpMstVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { dot1qVlanIndex, msanStpMstId } + ::= { msanStpMstVlanTable 1 } + + + MsanStpMstVlanEntry ::= + SEQUENCE { + msanStpMstVlanRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.5.1.1 + msanStpMstVlanRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The association status of an MSTP instance and a VLAN. + Instance 0 is not shown. + + Supported values: + active(1) - valid association between an MSTP instance and a VLAN. + createAndGo(4) - used to create a new association between an MSTP instance and a VLAN. + destroy(6) - removes the association between an MSTP instance and a VLAN." + ::= { msanStpMstVlanEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.6 + msanStpMstPortTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanStpMstPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "MST port table." + REFERENCE + "agentStpMstPortTable - 1.3.6.1.4.1.6132.1.1.1.2.15.11" + ::= { msanStp 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.6.1 + msanStpMstPortEntry OBJECT-TYPE + SYNTAX MsanStpMstPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "MST port entry." + INDEX { ifIndex, msanStpMstId } + ::= { msanStpMstPortTable 1 } + + + MsanStpMstPortEntry ::= + SEQUENCE { + msanStpMstPortPathCost + Unsigned32, + msanStpMstPortPriority + Unsigned32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.6.1.1 + msanStpMstPortPathCost OBJECT-TYPE + SYNTAX Unsigned32 (0..200000000) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The MSTP port path cost in a specific instance. The default value will + correspond to the recommendation specified in IEEE 802.1s Table 13-2 + which varies depending upon link speed. + Instance 0 is not shown." + ::= { msanStpMstPortEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.6.1.2 + msanStpMstPortPriority OBJECT-TYPE + SYNTAX Unsigned32 (0..240) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The MSTP port priority in a specific instance. The priority is + in the increments of 16. The default value is 128. + Instance 0 is not shown." + DEFVAL { 128 } + ::= { msanStpMstPortEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.7 + msanStpPortTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanStpPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanStp 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.7.1 + msanStpPortEntry OBJECT-TYPE + SYNTAX MsanStpPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanStpPortTable 1 } + + + MsanStpPortEntry ::= + SEQUENCE { + msanStpPortHelloTime + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.7.1.1 + msanStpPortHelloTime OBJECT-TYPE + SYNTAX Integer32 (0..10) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Hello time for the STP port. The default value is 0 (Not configured)." + ::= { msanStpPortEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.8 + msanStpCstPortTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanStpCstPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanStp 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.8.1 + msanStpCstPortEntry OBJECT-TYPE + SYNTAX MsanStpCstPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanStpCstPortTable 1 } + + + MsanStpCstPortEntry ::= + SEQUENCE { + msanStpCstPortPathCost + Unsigned32, + msanStpCstExtPortPathCost + Unsigned32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.8.1.1 + msanStpCstPortPathCost OBJECT-TYPE + SYNTAX Unsigned32 (0..200000000) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The MSTP port path cost in CIST. The default value will + correspond to the recommendation specified in IEEE 802.1s Table 13-2 + which varies depending upon link speed. + " + ::= { msanStpCstPortEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.24.8.1.2 + msanStpCstExtPortPathCost OBJECT-TYPE + SYNTAX Unsigned32 (0..200000000) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The MSTP external port path cost in CIST. The default value varies depending upon the link speed." + ::= { msanStpCstPortEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.25 + msanAuthentication OBJECT IDENTIFIER ::= { msanAdditionalConf 25 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.25.1 + msanAuthenticationGlobal OBJECT IDENTIFIER ::= { msanAuthentication 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.25.2 + msanAuthenticationListCreate OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..15)) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Authentication List Create + If set to a non empty string, creates a new Authentication List for + configuration." + ::= { msanAuthentication 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.25.3 + msanAuthenticationListTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanAuthenticationListEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanAuthentication 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.25.3.1 + msanAuthenticationListEntry OBJECT-TYPE + SYNTAX MsanAuthenticationListEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanAuthenticationListName } + ::= { msanAuthenticationListTable 1 } + + + MsanAuthenticationListEntry ::= + SEQUENCE { + msanAuthenticationListName + DisplayString, + msanAuthenticationListMethod1 + INTEGER, + msanAuthenticationListMethod2 + INTEGER, + msanAuthenticationListMethod3 + INTEGER, + msanAuthenticationListStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.25.3.1.1 + msanAuthenticationListName OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..15)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Authenticaiton List Name + Unique name used to identify the Authentication List from other tables." + ::= { msanAuthenticationListEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.25.3.1.2 + msanAuthenticationListMethod1 OBJECT-TYPE + SYNTAX INTEGER + { + local(1), + radius(2), + reject(3), + tacacs(4) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Authenticion List Method 1 + Configures the first authentication method to use when this list is + specified." + ::= { msanAuthenticationListEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.25.3.1.3 + msanAuthenticationListMethod2 OBJECT-TYPE + SYNTAX INTEGER + { + undefined(1), + local(2), + radius(3), + reject(4), + tacacs(5) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Authenticion List Method 2 + Configures the second authentication method to use when this list is + specified." + ::= { msanAuthenticationListEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.25.3.1.4 + msanAuthenticationListMethod3 OBJECT-TYPE + SYNTAX INTEGER + { + undefined(1), + local(2), + radius(3), + reject(4), + tacacs(5) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Authenticion List Method 3 + Configures the third authentication method to use when this list is + specified." + ::= { msanAuthenticationListEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.25.3.1.5 + msanAuthenticationListStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The status of the Authentication List. + + Supported values: + active(1) - indicates a valid Authenticaiton List + createAndGo (4) + destroy(6) - removes the Authentication List." + ::= { msanAuthenticationListEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.26 + msanPortSecurity OBJECT IDENTIFIER ::= { msanAdditionalConf 26 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.26.1 + msanPortSecurityGlobal OBJECT IDENTIFIER ::= { msanPortSecurity 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.26.2 + msanPortSecurityStatMacTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanPortSecurityStatMacEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanPortSecurity 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.26.2.1 + msanPortSecurityStatMacEntry OBJECT-TYPE + SYNTAX MsanPortSecurityStatMacEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanPortSecurityStatMacIf, msanPortSecurityStatMacVlanId, msanPortSecurityStatMacMacAddress } + ::= { msanPortSecurityStatMacTable 1 } + + + MsanPortSecurityStatMacEntry ::= + SEQUENCE { + msanPortSecurityStatMacIf + Integer32, + msanPortSecurityStatMacVlanId + INTEGER, + msanPortSecurityStatMacMacAddress + MacAddress, + msanPortSecurityStatMacRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.26.2.1.1 + msanPortSecurityStatMacIf OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Unique numerical identification of the interface." + ::= { msanPortSecurityStatMacEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.26.2.1.2 + msanPortSecurityStatMacVlanId OBJECT-TYPE + SYNTAX INTEGER (1..4094) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "VLAN identification." + ::= { msanPortSecurityStatMacEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.26.2.1.3 + msanPortSecurityStatMacMacAddress OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Statically locked MAC addresses for port." + ::= { msanPortSecurityStatMacEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.26.2.1.5 + msanPortSecurityStatMacRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanPortSecurityStatMacEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.26.3 + msanPortSecurityPortVlanTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanPortSecurityPortVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanPortSecurity 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.26.3.1 + msanPortSecurityPortVlanEntry OBJECT-TYPE + SYNTAX MsanPortSecurityPortVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, dot1qVlanIndex } + ::= { msanPortSecurityPortVlanTable 1 } + + + MsanPortSecurityPortVlanEntry ::= + SEQUENCE { + msanPortSecurityPortVlanDynamicLimit + Integer32, + msanPortSecurityPortVlanRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.26.3.1.1 + msanPortSecurityPortVlanDynamicLimit OBJECT-TYPE + SYNTAX Integer32 (1..64) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The limit of dynamically learned MAC addresses per vlan on selected port. + + " + ::= { msanPortSecurityPortVlanEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.26.3.1.2 + msanPortSecurityPortVlanRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5). + For row activation use active(1). + For row deletion use destroy(6). + + Other values are currently not supported." + ::= { msanPortSecurityPortVlanEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.27 + msanLag OBJECT IDENTIFIER ::= { msanAdditionalConf 27 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.27.1 + msanLagGlobal OBJECT IDENTIFIER ::= { msanLag 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.27.2 + msanLagDetailedConfigTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanLagDetailedConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A detailed table of the switch's LAG config entries. " + REFERENCE + "agentLagDetailedConfigTable" + ::= { msanLag 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.27.2.1 + msanLagDetailedConfigEntry OBJECT-TYPE + SYNTAX MsanLagDetailedConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Switch's LAG config entry" + INDEX { msanLagDetailedLagIndex, msanLagDetailedIfIndex } + ::= { msanLagDetailedConfigTable 1 } + + + MsanLagDetailedConfigEntry ::= + SEQUENCE { + msanLagDetailedLagIndex + Integer32, + msanLagDetailedIfIndex + Integer32, + msanLagDetailedPortSpeed + OBJECT IDENTIFIER, + msanLagDetailedPortStatus + INTEGER, + msanLagDetailedRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.27.2.1.1 + msanLagDetailedLagIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "LAG index" + ::= { msanLagDetailedConfigEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.27.2.1.2 + msanLagDetailedIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "LAG port index" + ::= { msanLagDetailedConfigEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.27.2.1.3 + msanLagDetailedPortSpeed OBJECT-TYPE + SYNTAX OBJECT IDENTIFIER + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "LAG port speed. See agentPortType for a description and list + of valid values." + ::= { msanLagDetailedConfigEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.27.2.1.4 + msanLagDetailedPortStatus OBJECT-TYPE + SYNTAX INTEGER + { + active(1), + inactive(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "LAG port status. + + active(1) - Actively participating in the LAG. + inactive(2) - Not participating in the LAG." + ::= { msanLagDetailedConfigEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.27.2.1.5 + msanLagDetailedRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanLagDetailedConfigEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.27.3 + msanLagTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanLagEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Config table of additional LAG parameters." + ::= { msanLag 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.27.3.1 + msanLagEntry OBJECT-TYPE + SYNTAX MsanLagEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanLagIndex } + ::= { msanLagTable 1 } + + + MsanLagEntry ::= + SEQUENCE { + msanLagIndex + Integer32, + msanLagMaxFrameSize + Integer32, + msanLagDVlanTagMode + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.27.3.1.1 + msanLagIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "LAG index. Value corresponds to ifIndex for LAG interfaces in ifTable." + ::= { msanLagEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.27.3.1.2 + msanLagMaxFrameSize OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This object identifies the currently configured maximum frame size + value for this LAG interface. + " + ::= { msanLagEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.27.3.1.3 + msanLagDVlanTagMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Controls the Double Vlan Tag mode on this LAG interface." + ::= { msanLagEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.28 + msanRadiusServer OBJECT IDENTIFIER ::= { msanAdditionalConf 28 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.28.1 + msanRadiusServerGlobal OBJECT IDENTIFIER ::= { msanRadiusServer 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.28.2 + msanRadiusServerConfigTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanRadiusServerConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Table with information about Radius Authentication Server IP + Addresses, port numbers and shared secret" + ::= { msanRadiusServer 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.28.2.1 + msanRadiusServerConfigEntry OBJECT-TYPE + SYNTAX MsanRadiusServerConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry consisting of configuration data for a Radius + Authentication Server." + INDEX { msanRadiusServerAddress } + ::= { msanRadiusServerConfigTable 1 } + + + MsanRadiusServerConfigEntry ::= + SEQUENCE { + msanRadiusServerAddress + IpAddress, + msanRadiusServerPort + Unsigned32, + msanRadiusServerSecret + DisplayString, + msanRadiusServerPrimaryMode + INTEGER, + msanRadiusServerCurrentMode + INTEGER, + msanRadiusServerMsgAuth + INTEGER, + msanRadiusServerStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.28.2.1.1 + msanRadiusServerAddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "IP Address of the configured RADIUS server. + This object cannot be changed after creation." + ::= { msanRadiusServerConfigEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.28.2.1.2 + msanRadiusServerPort OBJECT-TYPE + SYNTAX Unsigned32 (0..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Port number for the RADIUS server." + DEFVAL { 1812 } + ::= { msanRadiusServerConfigEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.28.2.1.3 + msanRadiusServerSecret OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..20)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Configured shared sercret for the RADIUS server." + ::= { msanRadiusServerConfigEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.28.2.1.4 + msanRadiusServerPrimaryMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Configure the RADIUS server to be the primary server. If there is any + other server that is configured to be primary, that server is set to be + a seconday server and this entry is set Primary." + ::= { msanRadiusServerConfigEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.28.2.1.5 + msanRadiusServerCurrentMode OBJECT-TYPE + SYNTAX INTEGER + { + yes(1), + no(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Indicate if the RADIUS server is the current server in user for + authentication." + ::= { msanRadiusServerConfigEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.28.2.1.6 + msanRadiusServerMsgAuth OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Enable or disable the message authenticator attribute for this + RADIUS server." + ::= { msanRadiusServerConfigEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.28.2.1.7 + msanRadiusServerStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Creates or destroys a RADIUS Authentication server entry. + + active(1) - This entry is active. + createAndGo(4) - Creates a new entry. + destroy(6) - Deletes an entry." + ::= { msanRadiusServerConfigEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.29 + msanNetwork OBJECT IDENTIFIER ::= { msanAdditionalConf 29 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.29.1 + msanNetworkGlobal OBJECT IDENTIFIER ::= { msanNetwork 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.29.1.1 + msanNetworkIPAddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The switch's network ip address" + ::= { msanNetworkGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.29.1.2 + msanNetworkSubnetMask OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The switch's network subnet mask" + ::= { msanNetworkGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.29.1.3 + msanNetworkDefaultGateway OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The switch's network default gateway" + ::= { msanNetworkGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.29.1.4 + msanNetworkDhcpSrvIpAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "IP address of DHCP server used by DHCP client." + ::= { msanNetworkGlobal 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.29.1.5 + msanNetworkDhcpSrvVendorSpecific OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCP client uses only vendor specific DHCP servers + (when client sends opt. 60 to server, it should return expected vendor specific value in opt. 43)" + ::= { msanNetworkGlobal 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.29.1.6 + msanNetworkDhcpClientLeaseObtained OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The date and time when DHCP lease was obtained. + " + ::= { msanNetworkGlobal 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.29.1.7 + msanNetworkDhcpClientLeaseExpires OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The date and time for which the DHCP lease is valid." + ::= { msanNetworkGlobal 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.29.1.8 + msanNetworkDhcpClientLocalOpt82 OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCP client adds relay agent information option into its own outgoing frames." + ::= { msanNetworkGlobal 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.29.2 + msanNetworkDhcpClientVlanTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanNetworkDhcpClientVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "DHCP client configuration per vlan id." + ::= { msanNetwork 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.29.2.1 + msanNetworkDhcpClientVlanEntry OBJECT-TYPE + SYNTAX MsanNetworkDhcpClientVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { dot1qVlanIndex } + ::= { msanNetworkDhcpClientVlanTable 1 } + + + MsanNetworkDhcpClientVlanEntry ::= + SEQUENCE { + msanNetworkDhcpClientVlanLocalOpt82 + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.29.2.1.1 + msanNetworkDhcpClientVlanLocalOpt82 OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DHCP client on specified vlan adds relay agent information option into its own outgoing frames." + DEFVAL { disable } + ::= { msanNetworkDhcpClientVlanEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.30 + msanStormControl OBJECT IDENTIFIER ::= { msanAdditionalConf 30 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.30.1 + msanStormControlGlobal OBJECT IDENTIFIER ::= { msanStormControl 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.30.2 + msanPortStormControlTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanPortStormControlEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanStormControl 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.30.2.1 + msanPortStormControlEntry OBJECT-TYPE + SYNTAX MsanPortStormControlEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanPortStormControlTable 1 } + + + MsanPortStormControlEntry ::= + SEQUENCE { + msanPortBroadcastControlMode + INTEGER, + msanPortBroadcastControlThreshold + Integer32, + msanPortMulticastControlMode + INTEGER, + msanPortMulticastControlThreshold + Integer32, + msanPortUnicastControlMode + INTEGER, + msanPortUnicastControlThreshold + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.30.2.1.1 + msanPortBroadcastControlMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "he switch config broadcast allows you to enable or disable + broadcast storm recovery mode. When you specify Enable for Broadcast + Storm Recovery and the broadcast traffic on any Ethernet port exceeds + the configured threshold, the switch blocks (discards) the broadcast + traffic. + " + ::= { msanPortStormControlEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.30.2.1.2 + msanPortBroadcastControlThreshold OBJECT-TYPE + SYNTAX Integer32 + UNITS "packets per second" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specify the data rate at which broadcast storm control activates (packets per second)" + ::= { msanPortStormControlEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.30.2.1.3 + msanPortMulticastControlMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The switch config multicast allows you to enable or disable + multicast storm recovery mode. When you specify Enable for multicast + Storm Recovery and the multicast traffic on any Ethernet port exceeds + the configured threshold, the switch blocks (discards) the multicast + traffic" + ::= { msanPortStormControlEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.30.2.1.4 + msanPortMulticastControlThreshold OBJECT-TYPE + SYNTAX Integer32 + UNITS "packets per second" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specify the data rate at which multicast storm control activates (packets per second)" + ::= { msanPortStormControlEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.30.2.1.5 + msanPortUnicastControlMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The switch config unicast allows you to enable or disable + unicast storm recovery mode. When you specify Enable for unicast + Storm Recovery and the unknown unicast traffic on any Ethernet port exceeds + the configured threshold, the switch blocks (discards) the unknown unicast + traffic. + " + ::= { msanPortStormControlEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.30.2.1.6 + msanPortUnicastControlThreshold OBJECT-TYPE + SYNTAX Integer32 + UNITS "packets per second" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Specify the data rate at which unicast storm control activates (packets per second)" + ::= { msanPortStormControlEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.31 + msanUserConfig OBJECT IDENTIFIER ::= { msanAdditionalConf 31 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.31.1 + msanUserConfigGlobal OBJECT IDENTIFIER ::= { msanUserConfig 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.31.1.1 + msanUserConfigCheckPassword OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..255)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Parameter is used to check user's password. String must + be written in next format: user_name password + First blank space is used as delimeter between user_name and + password. + + If password is ok and user has write permission, + noError(0) code is returned. + + If password is ok but user has only read permission, + noAccess(6) error code is returned. + + If password is not valid or user is not configured, + inconsistentValue(12) error code is returned. + " + ::= { msanUserConfigGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.31.2 + msanUserConfigTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanUserConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanUserConfig 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.31.2.1 + msanUserConfigEntry OBJECT-TYPE + SYNTAX MsanUserConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanUserIndex } + ::= { msanUserConfigTable 1 } + + + MsanUserConfigEntry ::= + SEQUENCE { + msanUserIndex + Integer32, + msanUserAccessMode + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.31.2.1.1 + msanUserIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "User Config Index" + ::= { msanUserConfigEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.31.2.1.2 + msanUserAccessMode OBJECT-TYPE + SYNTAX INTEGER + { + read(1), + write(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "User Access Mode" + ::= { msanUserConfigEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32 + msanSfp OBJECT IDENTIFIER ::= { msanAdditionalConf 32 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.1 + msanSfpGlobal OBJECT IDENTIFIER ::= { msanSfp 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.2 + msanSfpInfoTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanSfpInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanSfp 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.2.1 + msanSfpInfoEntry OBJECT-TYPE + SYNTAX MsanSfpInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanSfpInfoTable 1 } + + + MsanSfpInfoEntry ::= + SEQUENCE { + msanSfpInfoState + INTEGER, + msanSfpInfoInterfaceType + INTEGER, + msanSfpInfoNominalBitrate + Integer32, + msanSfpInfoNominalRange + OCTET STRING, + msanSfpInfoVendor + OCTET STRING, + msanSfpInfoIeeeVendorId + Integer32, + msanSfpInfoPartNr + OCTET STRING, + msanSfpInfoRevisionNr + OCTET STRING, + msanSfpInfoSerialNr + OCTET STRING, + msanSfpInfoManufacturingDate + OCTET STRING, + msanSfpInfoWavelength + Integer32, + msanSfpInfoVendorPN + DisplayString, + msanSfpInfoSfpType + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.2.1.1 + msanSfpInfoState OBJECT-TYPE + SYNTAX INTEGER + { + adminOff(1), + operational(2), + operWithAl(3), + loss(4), + notAvaliable(5), + presNoDiag(6), + notPresent(7) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module state value on port. Ports which support SFP module are from + 1 to 10 and from 15 to 28. State value adminOff means that specific + port is administrative disabled and we can not read data from module + on that port. Operational state means that SFP module is present and + it works perfect. State operWithAl(operational with alarm) means + that SFP module is present, but it works with internal alarms. + Loss(Loss of signal) state means that SFP module is present but it + have loss of signal. PresNoDiag(Present, no diagnostic) state means + that SFP module is present but diagnostic is not supported. + NotAvaliable state means that admin. mode of specific port has + disabled value and SFP state is not avaliable. + NotPresent state means that SFP module is not present. + " + ::= { msanSfpInfoEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.2.1.2 + msanSfpInfoInterfaceType OBJECT-TYPE + SYNTAX INTEGER + { + sfp(1), + not(2), + no(3), + ad(4), + xfp(5) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Transceiver(module) type. + Module type can be SFP, NOT(mudule type is not SFP), + NO(no module on port), AD(admin. disabled port) and XFP." + ::= { msanSfpInfoEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.2.1.3 + msanSfpInfoNominalBitrate OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module(SFP) nominal bitrate value measure in Mbit/s. + If parameter is not available, value -1 is used." + ::= { msanSfpInfoEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.2.1.4 + msanSfpInfoNominalRange OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module(SFP) nominal range value. + Nominal range value can support five different link lengths. + Link length value and nominal range units are defined depends + on value of nominal range. + We can get link length value which can support 9/125 um fiber + and nominal range measure in km units. + We can get link length value which can support 9/125 um fiber + and nominal range measure in 100m units. + We can get link length value which can support 50/125 um fiber + and nominal range measure in 10m units. + We can get link length value which can support 62,5/125 um fiber + and nominal range measure in 10m units. + We can get link length value which can support cooper + and nominal range measure in m units. + " + ::= { msanSfpInfoEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.2.1.5 + msanSfpInfoVendor OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module(SFP) vendor name." + ::= { msanSfpInfoEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.2.1.6 + msanSfpInfoIeeeVendorId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module(SFP) vendor IEEE company ID. + If parameter is not available, value -1 is used." + ::= { msanSfpInfoEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.2.1.7 + msanSfpInfoPartNr OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module(SFP) part number." + ::= { msanSfpInfoEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.2.1.8 + msanSfpInfoRevisionNr OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module(SFP) revision number." + ::= { msanSfpInfoEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.2.1.9 + msanSfpInfoSerialNr OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module(SFP) serial number." + ::= { msanSfpInfoEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.2.1.10 + msanSfpInfoManufacturingDate OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module(SFP) manufacturing date." + ::= { msanSfpInfoEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.2.1.11 + msanSfpInfoWavelength OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module(SFP) laser wavelength measure in nanometers. + If parameter is not available, value -1 is used." + ::= { msanSfpInfoEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.2.1.12 + msanSfpInfoVendorPN OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module(SFP) vendor Part Number" + ::= { msanSfpInfoEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.2.1.13 + msanSfpInfoSfpType OBJECT-TYPE + SYNTAX INTEGER + { + GPON(1), + XGSPON(2), + Combo(3), + P2P(4), + Undefined(5) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "SFP Type" + ::= { msanSfpInfoEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3 + msanSfpDiagnosticsTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanSfpDiagnosticsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanSfp 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1 + msanSfpDiagnosticsEntry OBJECT-TYPE + SYNTAX MsanSfpDiagnosticsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanSfpDiagnosticsTable 1 } + + + MsanSfpDiagnosticsEntry ::= + SEQUENCE { + msanSfpDiagnosticsSignal + INTEGER, + msanSfpDiagnosticsTempCurrent + Integer32, + msanSfpDiagnosticsTempMin + Integer32, + msanSfpDiagnosticsTempMax + Integer32, + msanSfpDiagnosticsVoltageCurrent + Integer32, + msanSfpDiagnosticsVoltageMin + Integer32, + msanSfpDiagnosticsVoltageMax + Integer32, + msanSfpDiagnosticsTxBiasCrrCurrent + Integer32, + msanSfpDiagnosticsTxBiasCrrMin + Integer32, + msanSfpDiagnosticsTxBiasCrrMax + Integer32, + msanSfpDiagnosticsTxPowerCurrent + Integer32, + msanSfpDiagnosticsTxPowerMin + Integer32, + msanSfpDiagnosticsTxPowerMax + Integer32, + msanSfpDiagnosticsRxPowerCurrent + Integer32, + msanSfpDiagnosticsRxPowerMin + Integer32, + msanSfpDiagnosticsRxPowerMax + Integer32, + msanSfpDiagnosticsTempStatus + INTEGER, + msanSfpDiagnosticsVoltageStatus + INTEGER, + msanSfpDiagnosticsTxBiasStatus + INTEGER, + msanSfpDiagnosticsTxPowerStatus + INTEGER, + msanSfpDiagnosticsRxPowerStatus + INTEGER, + msanSfpDiagnosticsTxPowerCurrentDBm + Integer32, + msanSfpDiagnosticsRxPowerCurrentDBm + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.1 + msanSfpDiagnosticsSignal OBJECT-TYPE + SYNTAX INTEGER + { + loss(1), + ok(2), + notSupported(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Module(SFP) signal value. + If diagnostic for SFP module is supported than value can be + OK(signal is ok) or loss(loss of signal), in the other case + the value is set on notSupported becouse diagnostic is not + supported(-1)." + ::= { msanSfpDiagnosticsEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.2 + msanSfpDiagnosticsTempCurrent OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current SFP module temperature value in [deg C]. + If diagnostic is not supported for SFP module then + current temperature is set on not supported value(-129). " + ::= { msanSfpDiagnosticsEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.3 + msanSfpDiagnosticsTempMin OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "SFP module minimum temperature threshold limit in [deg C]. + If diagnostic is not supported for SFP module then minimum + temperature threshold limit is set on not supported value(-129). " + ::= { msanSfpDiagnosticsEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.4 + msanSfpDiagnosticsTempMax OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "SFP module maximum temperature threshold limit in [deg C]. + If diagnostic is not supported for SFP module then maximum + temperature threshold limit is set on not supported value(-129). " + ::= { msanSfpDiagnosticsEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.6 + msanSfpDiagnosticsVoltageCurrent OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.01 V" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current SFP module supply voltage value in [V]. + If diagnostic is not supported for SFP module then + current supply voltage is set on not supported value(-1). " + ::= { msanSfpDiagnosticsEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.7 + msanSfpDiagnosticsVoltageMin OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.01 V" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "SFP module minimum supply voltage threshold limit in [V]. + If diagnostic is not supported for SFP module then minimum + supply voltage threshold limit is set on not supported value(-1). " + ::= { msanSfpDiagnosticsEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.8 + msanSfpDiagnosticsVoltageMax OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.01 V" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "SFP module maximum supply voltage threshold limit in [V]. + If diagnostic is not supported for SFP module then maximum + supply voltage threshold limit is set on not supported value(-1). " + ::= { msanSfpDiagnosticsEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.9 + msanSfpDiagnosticsTxBiasCrrCurrent OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.01 mA" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current SFP module Tx Bias Current value in [mA]. + If diagnostic is not supported for SFP module then + current Tx Bias Current is set on not supported value(-1). " + ::= { msanSfpDiagnosticsEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.10 + msanSfpDiagnosticsTxBiasCrrMin OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.01 mA" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "SFP module minimum Tx Bias Current threshold limit in [mA]. + If diagnostic is not supported for SFP module then minimum + Tx Bias Current threshold limit is set on not supported value(-1). " + ::= { msanSfpDiagnosticsEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.11 + msanSfpDiagnosticsTxBiasCrrMax OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.01 mA" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "SFP module maximum Tx Bias Current threshold limit in [mA]. + If diagnostic is not supported for SFP module then maximum + Tx Bias Current threshold limit is set on not supported value(-1). " + ::= { msanSfpDiagnosticsEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.12 + msanSfpDiagnosticsTxPowerCurrent OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.01 mW" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current SFP module transmitted optical output power value in [mW]. + If diagnostic is not supported for SFP module then current + transmitted optical output power is set on not supported value(-1). " + ::= { msanSfpDiagnosticsEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.13 + msanSfpDiagnosticsTxPowerMin OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.01 mW" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "SFP module minimum transmitted optical output power threshold limit + in [mW]. If diagnostic is not supported for SFP module then minimum + transmitted optical output power is set on not supported value(-1). " + ::= { msanSfpDiagnosticsEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.14 + msanSfpDiagnosticsTxPowerMax OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.01 mW" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "SFP module maximum transmitted optical output power threshold limit + in [mW]. If diagnostic is not supported for SFP module then maximum + transmitted optical output power is set on not supported value(-1)." + ::= { msanSfpDiagnosticsEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.15 + msanSfpDiagnosticsRxPowerCurrent OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.01 mW" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current SFP module received optical input power value in [mW]. + If diagnostic is not supported for SFP module then current + received optical input power is set on not supported value(-1). " + ::= { msanSfpDiagnosticsEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.16 + msanSfpDiagnosticsRxPowerMin OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.01 mW" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "SFP module minimum received optical input power threshold limit + in [mW]. If diagnostic is not supported for SFP module then minimum + received optical input power is set on not supported value(-1). " + ::= { msanSfpDiagnosticsEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.17 + msanSfpDiagnosticsRxPowerMax OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.01 mW" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "SFP module maximum received optical input power threshold limit + in [mW]. If diagnostic is not supported for SFP module then maximum + received optical input power is set on not supported value(-1). " + ::= { msanSfpDiagnosticsEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.19 + msanSfpDiagnosticsTempStatus OBJECT-TYPE + SYNTAX INTEGER + { + sfpDiagNoAlarm(1), + sfpDiagAlarm(2), + notAvailable(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Temperature alarm status. + " + ::= { msanSfpDiagnosticsEntry 19 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.20 + msanSfpDiagnosticsVoltageStatus OBJECT-TYPE + SYNTAX INTEGER + { + sfpDiagNoAlarm(1), + sfpDiagAlarm(2), + notAvailable(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Voltage alarm status." + ::= { msanSfpDiagnosticsEntry 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.21 + msanSfpDiagnosticsTxBiasStatus OBJECT-TYPE + SYNTAX INTEGER + { + sfpDiagNoAlarm(1), + sfpDiagAlarm(2), + notAvailable(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "TX bias alarm status." + ::= { msanSfpDiagnosticsEntry 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.22 + msanSfpDiagnosticsTxPowerStatus OBJECT-TYPE + SYNTAX INTEGER + { + sfpDiagNoAlarm(1), + sfpDiagAlarm(2), + notAvailable(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "TX power alarm status." + ::= { msanSfpDiagnosticsEntry 22 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.23 + msanSfpDiagnosticsRxPowerStatus OBJECT-TYPE + SYNTAX INTEGER + { + sfpDiagNoAlarm(1), + sfpDiagAlarm(2), + notAvailable(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "RX power alarm status." + ::= { msanSfpDiagnosticsEntry 23 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.24 + msanSfpDiagnosticsTxPowerCurrentDBm OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.01 dBm" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current SFP module transmitted optical output power value in [dBM]. + + If diagnostic is not supported for SFP module then current + transmitted optical input power is set on not supported value(-100000). + " + ::= { msanSfpDiagnosticsEntry 24 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.32.3.1.25 + msanSfpDiagnosticsRxPowerCurrentDBm OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.01 dBm" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current SFP module received optical input power value in [dBm]. + + If diagnostic is not supported for SFP module then current + reveived optical input power is set on not supported value(-100000). + " + ::= { msanSfpDiagnosticsEntry 25 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.34 + msanMacSg OBJECT IDENTIFIER ::= { msanAdditionalConf 34 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.34.1 + msanMacSgGlobal OBJECT IDENTIFIER ::= { msanMacSg 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.34.1.1 + msanMacSgStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Administrative state of MAC Source Guard on the system." + ::= { msanMacSgGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.34.2 + msanMacSgPortTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMacSgPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanMacSg 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.34.2.1 + msanMacSgPortEntry OBJECT-TYPE + SYNTAX MsanMacSgPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanMacSgPortTable 1 } + + + MsanMacSgPortEntry ::= + SEQUENCE { + msanMacSgPortStatus + INTEGER, + msanMacSgPortViolationsCounter + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.34.2.1.1 + msanMacSgPortStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Administrative state of MAC Source Guard on interface." + ::= { msanMacSgPortEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.34.2.1.2 + msanMacSgPortViolationsCounter OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "MAC Source Guard Violations counter" + ::= { msanMacSgPortEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.35 + msanErrorDisable OBJECT IDENTIFIER ::= { msanAdditionalConf 35 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.35.1 + msanErrorDisableGlobal OBJECT IDENTIFIER ::= { msanErrorDisable 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.35.1.1 + msanErrorDisableInterval OBJECT-TYPE + SYNTAX Integer32 + UNITS "minutes" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The interval in minutes that will pass since error-disabled interface + will be enabled. This parameter has effect only if ErrorDisable Recovery + is enabled. + " + ::= { msanErrorDisableGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.35.1.2 + msanErrorDisableMacSgDetectionStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Administrative state of ErrorDisable Detection for MAC Source Guard cause. + If enabled, interface will be error-disabled when MAC Source Guard violation + is detected. + " + ::= { msanErrorDisableGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.35.1.3 + msanErrorDisableMacSgRecoveryStatus OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Administrative state of ErrorDisable Recovery for MAC Source Guard cause. + If enabled, interface will be automatically recovered when error-disabled + due to MAC Source Guard violation." + ::= { msanErrorDisableGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.35.2 + msanErrorDisablePortTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanErrorDisablePortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanErrorDisable 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.35.2.1 + msanErrorDisablePortEntry OBJECT-TYPE + SYNTAX MsanErrorDisablePortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanErrorDisablePortTable 1 } + + + MsanErrorDisablePortEntry ::= + SEQUENCE { + msanErrorDisablePortStatus + INTEGER, + msanErrorDisablePortCause + OCTET STRING, + msanErrorDisablePortTimeLeft + Integer32, + msanErrorDisablePortCounter + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.35.2.1.1 + msanErrorDisablePortStatus OBJECT-TYPE + SYNTAX INTEGER + { + regular(1), + errorDisable(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This parameter shows which interfaces are in errorDisable(2) + recovery administrative state." + ::= { msanErrorDisablePortEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.35.2.1.2 + msanErrorDisablePortCause OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Cause for errorDisable(2) status on interface." + ::= { msanErrorDisablePortEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.35.2.1.3 + msanErrorDisablePortTimeLeft OBJECT-TYPE + SYNTAX Integer32 + UNITS "sec" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Time in seconds which defines how much time left for + interface to stay in errorDisable(2) state." + ::= { msanErrorDisablePortEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.35.2.1.4 + msanErrorDisablePortCounter OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of times the specified interface has been in errorDisable(2) state." + ::= { msanErrorDisablePortEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36 + msanAdsl OBJECT IDENTIFIER ::= { msanAdditionalConf 36 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.1 + msanAdslGlobal OBJECT IDENTIFIER ::= { msanAdsl 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2 + msanAdslAtucPhysExtnTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanAdslAtucPhysExtnEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "This table provides one row for each ATUC. This table is an extention to adslAtucPhysTable defined in rfc-2662." + ::= { msanAdsl 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1 + msanAdslAtucPhysExtnEntry OBJECT-TYPE + SYNTAX MsanAdslAtucPhysExtnEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry (conceptual row) in the msanAdslAtucPhysExtnTable. + The Table is indexed by ifIndex." + INDEX { ifIndex } + ::= { msanAdslAtucPhysExtnTable 1 } + + + MsanAdslAtucPhysExtnEntry ::= + SEQUENCE { + msanAdslAtucPhysExtnOpState + INTEGER, + msanAdslAtucPhysExtnActualStd + INTEGER, + msanAdslAtucPhysExtnBertError + Integer32, + msanAdslAtucPhysExtnTxAtmCellCounter + Counter32, + msanAdslAtucPhysExtnRxAtmCellCounter + Integer32, + msanAdslAtucPhysExtnStartProgress + Integer32, + msanAdslAtucPhysExtnIdleBertError + Integer32, + msanAdslAtucPhysExtnIdleBertCells + Integer32, + msanAdslAtucPhysExtnBertSync + INTEGER, + msanAdslAtucPhysExtnParametricTestResult + INTEGER, + msanAdslAtucPhysExtnSeltInfoValid + INTEGER, + msanAdslAtucPhysExtnSeltLoopLen + Integer32, + msanAdslAtucPhysExtnSeltLoopEnd + INTEGER, + msanAdslAtucPhysExtnSeltLoopGauge + INTEGER, + msanAdslAtucPhysExtnSeltUpShannonCap + Gauge32, + msanAdslAtucPhysExtnSeltDownShannonCap + Gauge32, + msanAdslAtucPhysExtnSeltInbandNoise + OCTET STRING, + msanAdslAtucPhysExtnSeltTerminationResp + OCTET STRING, + msanAdslAtucPhysExtnSeltUpMgnAtRate + OCTET STRING, + msanAdslAtucPhysExtnSeltDownMgnAtRate + OCTET STRING, + msanAdslAtucPhysExtnDataBoostStatus + INTEGER, + msanAdslAtucPhysExtnTestArray + OCTET STRING, + msanAdslAtucPhysExtnChanPerfCD + Integer32, + msanAdslAtucPhysExtnChanPerfBE + Integer32, + msanAdslAtucPhysExtnDeltHLINSCus + Integer32, + msanAdslAtucPhysExtnDeltHLINpsus + OCTET STRING, + msanAdslAtucPhysExtnDeltHLOGMTus + Integer32, + msanAdslAtucPhysExtnDeltHLOGpsus + OCTET STRING, + msanAdslAtucPhysExtnDeltQLNMTus + Integer32, + msanAdslAtucPhysExtnDeltQLNpsus + OCTET STRING, + msanAdslAtucPhysExtnDeltLastTxState + INTEGER, + msanAdslAtucPhysExtnPMState + INTEGER, + msanAdslAtucPhysExtnChanPerfCU + Integer32, + msanAdslAtucPhysExtnExtendedPsdStatus + TruthValue, + msanAdslAtucPhysExtnChipVersion + Integer32, + msanAdslAtucPhysExtnPilotTone + Integer32, + msanAdslAtucMSGds + Gauge32, + msanAdslAtucPhysExtnPsdMaskMode + INTEGER, + msanAdslAtucPhysExtnDeltSNRMTus + Integer32, + msanAdslAtucPhysExtnDeltCurrStatus + INTEGER, + msanAdslAtucSATN + Integer32, + msanAdslAtucPhysExtnSystemVendorId + OCTET STRING, + msanAdslAtucPhysExtnSelfTestResult + Gauge32, + msanAdslAtucPhysExtnG9941VendorId + OCTET STRING, + msanAdslAtucPhysExtnTsspsUs + OCTET STRING, + msanAdslAtucPhysExtnActPsdUs + Integer32, + msanAdslAtucPhysExtnGainspsUs + OCTET STRING, + msanAdslAtucPhysExtnStartBin + Integer32, + msanAdslAtucPhysExtnStartupErrorCode + INTEGER, + msanAdslAtucPhysExtnBitSwapCount + Unsigned32, + msanAdslAtucPhysExtnModPhase + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.1 + msanAdslAtucPhysExtnOpState OBJECT-TYPE + SYNTAX INTEGER + { + idle(0), + data(1), + handshake(16), + training(24), + llTest(128), + dlTest(131), + txTest(132), + framerSync(26), + fastRetrainInProg(27), + bootupLoad(8), + atmLpTest(133), + discovery(46), + deltTraining(139), + delt(140) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This object indicates the operational state of the ATU. Values include idle, handshake, training, etc." + ::= { msanAdslAtucPhysExtnEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.2 + msanAdslAtucPhysExtnActualStd OBJECT-TYPE + SYNTAX INTEGER + { + t1413(0), + gLite(1), + gDmt(2), + alctl14(3), + multimode(4), + adi(5), + alctl(6), + t1413auto(9), + adslPlus(48), + gspanPlus(64), + adsl2(26), + adsl2Plus(27), + readsl2(28), + adsl2Auto(29), + adsl2PlusAuto(30), + gspanPlusPlus(80) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This object provides actual ATU-C configuration based on outcome of negotiation with ATU-R. In this case, the parameter provides actual standard used for the connection." + ::= { msanAdslAtucPhysExtnEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.3 + msanAdslAtucPhysExtnBertError OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This object indicates the No. of bit errors detected during BERT." + ::= { msanAdslAtucPhysExtnEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.4 + msanAdslAtucPhysExtnTxAtmCellCounter OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This object Provides transmit ATM cell counter." + ::= { msanAdslAtucPhysExtnEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.5 + msanAdslAtucPhysExtnRxAtmCellCounter OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This object Provides receive ATM cell counter." + ::= { msanAdslAtucPhysExtnEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.6 + msanAdslAtucPhysExtnStartProgress OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This object provides current detailed start up information to be used for debugging." + ::= { msanAdslAtucPhysExtnEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.7 + msanAdslAtucPhysExtnIdleBertError OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of bit errors." + ::= { msanAdslAtucPhysExtnEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.8 + msanAdslAtucPhysExtnIdleBertCells OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of idle cells." + ::= { msanAdslAtucPhysExtnEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.9 + msanAdslAtucPhysExtnBertSync OBJECT-TYPE + SYNTAX INTEGER + { + bertOutOfSync(0), + bertInSync(128) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Indicates if the Signal is in Sync or not." + ::= { msanAdslAtucPhysExtnEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.10 + msanAdslAtucPhysExtnParametricTestResult OBJECT-TYPE + SYNTAX INTEGER + { + ok(0), + fail(1), + dspIfFail(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Indicates the Result of the Parametric Test conducted on the Xcvr." + ::= { msanAdslAtucPhysExtnEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.11 + msanAdslAtucPhysExtnSeltInfoValid OBJECT-TYPE + SYNTAX INTEGER + { + true(1), + notConnected(32768), + lostConnection(33024), + noResponseSeltEngine(33280) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Indicates the information validity for the SELT operation conducted on the Xcvr." + ::= { msanAdslAtucPhysExtnEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.12 + msanAdslAtucPhysExtnSeltLoopLen OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Indicates the LOOP Length in Feet once when the SELT information is valid on the Xcvr." + ::= { msanAdslAtucPhysExtnEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.13 + msanAdslAtucPhysExtnSeltLoopEnd OBJECT-TYPE + SYNTAX INTEGER + { + open(0), + short(1), + unknown(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Indicates whether the loop is short or open once when the SELT information is valid on the Xcvr." + ::= { msanAdslAtucPhysExtnEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.14 + msanAdslAtucPhysExtnSeltLoopGauge OBJECT-TYPE + SYNTAX INTEGER + { + greater26awg(-1), + equal26awg(0), + equal24awg(1), + less26awg(2), + unknownAwg(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Indicates the LOOP wire_gauge information once when the SELT information is valid on the Xcvr." + ::= { msanAdslAtucPhysExtnEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.15 + msanAdslAtucPhysExtnSeltUpShannonCap OBJECT-TYPE + SYNTAX Gauge32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Indicates the LOOP Upstream Shannon Capacity (in bps) once when the SELT information is valid on the Xcvr." + ::= { msanAdslAtucPhysExtnEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.16 + msanAdslAtucPhysExtnSeltDownShannonCap OBJECT-TYPE + SYNTAX Gauge32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Indicates the LOOP Downstream Shannon Capacity (in bps) once when the SELT information is valid on the Xcvr." + ::= { msanAdslAtucPhysExtnEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.17 + msanAdslAtucPhysExtnSeltInbandNoise OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..2048)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "512 values that indicate inband noise length in dBM/Hz, covering both bands from 0 to 1.1 MHz." + ::= { msanAdslAtucPhysExtnEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.18 + msanAdslAtucPhysExtnSeltTerminationResp OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..720)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "180 discrete values that indicate termination response magnitude from 0 to 18Kft." + ::= { msanAdslAtucPhysExtnEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.19 + msanAdslAtucPhysExtnSeltUpMgnAtRate OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..1200)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "300 values that indicate SNR margin in dB/10 at a particular rate are provided, at 100K increments, up to 15 Mbps." + ::= { msanAdslAtucPhysExtnEntry 19 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.20 + msanAdslAtucPhysExtnSeltDownMgnAtRate OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..1200)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "300 values that indicate SNR margin in dB/10 at a particular rate are provided, at 100K increments, up to 15 Mbps." + ::= { msanAdslAtucPhysExtnEntry 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.21 + msanAdslAtucPhysExtnDataBoostStatus OBJECT-TYPE + SYNTAX INTEGER + { + enabled(32768), + disabled(0) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This object indicates whether DataBoost is utilized for the connection." + ::= { msanAdslAtucPhysExtnEntry 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.22 + msanAdslAtucPhysExtnTestArray OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..1024)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This object indicates the Parametric Test Array. Every Four octets refer to one element in this array of octets." + ::= { msanAdslAtucPhysExtnEntry 22 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.23 + msanAdslAtucPhysExtnChanPerfCD OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The near-end delineated total cell count performance parameter is a count of the total number of cells passed through the cell delineation and HEC function process operating on the ATM Data Path while in the SYNC state. (Not available for ADSL)." + ::= { msanAdslAtucPhysExtnEntry 23 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.24 + msanAdslAtucPhysExtnChanPerfBE OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The near-end idle bit error count performance parameter is a count of the number of bit errors in the idle cell payload received in the ATM Data Path at the near-end. (Not available for ADSL)." + ::= { msanAdslAtucPhysExtnEntry 24 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.25 + msanAdslAtucPhysExtnDeltHLINSCus OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DELT-related parameter that provides the scale factor to be applied to the upstream Hlin(f) values.(Not available for ADSL and ADSL2plus)." + ::= { msanAdslAtucPhysExtnEntry 25 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.26 + msanAdslAtucPhysExtnDeltHLINpsus OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..128)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DELT-related parameter that provides an array of complex upstream Hlin(f) values in linear scale. (Not available for ADSL and ADSL2plus). Every two octets refer to one element in this array of octets." + ::= { msanAdslAtucPhysExtnEntry 26 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.27 + msanAdslAtucPhysExtnDeltHLOGMTus OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DELT-related parameter that provides the number of symbols used to measure the upstream Hlog(f).(Not available for ADSL and ADSL2plus)." + ::= { msanAdslAtucPhysExtnEntry 27 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.28 + msanAdslAtucPhysExtnDeltHLOGpsus OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..64)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DELT-related parameter that provides an array of real upstream Hlog(f) values in dB. (Not available for ADSL and ADSL2plus). Every two octets refer to one element in this array of octets." + ::= { msanAdslAtucPhysExtnEntry 28 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.29 + msanAdslAtucPhysExtnDeltQLNMTus OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DELT-related parameter that provides the number of symbols used to measure the upstream QLN(f) values. (Not available for ADSL and ADSL2plus)." + ::= { msanAdslAtucPhysExtnEntry 29 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.30 + msanAdslAtucPhysExtnDeltQLNpsus OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..32)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DELT-related parameter that provides an array of real upstream QLN(f) values in dB. (Not available for ADSL and ADSL2plus). Every two octets refer to one element in this array of octets." + ::= { msanAdslAtucPhysExtnEntry 30 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.31 + msanAdslAtucPhysExtnDeltLastTxState OBJECT-TYPE + SYNTAX INTEGER + { + dmtatucg9941(0), + dmtatucquiet1(1), + dmtatuccomb1(2), + dmtatucquiet2(3), + dmtatuccomb2(4), + dmtatucicomb1(5), + dmtatuclineprob(6), + dmtatucquiet3(7), + dmtatuccomb3(8), + dmtatucicomb2(9), + dmtatucmsgfmt(10), + dmtatucmsgpcb(11), + dmtatucquiet4(12), + dmtatucreverb1(13), + dmtatuctref1(14), + dmtatucreverb2(15), + dmtatucect(16), + dmtatucreverb3(17), + dmtatuctref2(18), + dmtatucreverb4(19), + dmtatucsegue1(20), + dmtatucmsg1(21), + dmtatucreverb5(22), + dmtatucsegue2(23), + dmtatucmedley(24), + dmtatucexchmarker(25), + dmtatucmsg2(26), + dmtatucreverb6(27), + dmtatucsegue3(28), + dmtatucparams(29), + dmtatucreverb7(30), + dmtatucsegue4(31), + dmtatucshowtime(32) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DELT-related parameter that provides last successful transmitted initialization state by the ATU-C. (Not available for ADSL and ADSL2plus)." + ::= { msanAdslAtucPhysExtnEntry 31 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.32 + msanAdslAtucPhysExtnPMState OBJECT-TYPE + SYNTAX INTEGER + { + l0(0), + l2(2), + l3(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Line Power Management State. (Not available for ADSL)." + ::= { msanAdslAtucPhysExtnEntry 32 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.33 + msanAdslAtucPhysExtnChanPerfCU OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + " The near-end user total cell count performance parameter is a count of the total number of cells in the ATM Data Path delivered at the V-C (for ATU-C) or T-R (for ATU-R) interface. (Not available for ADSL)." + ::= { msanAdslAtucPhysExtnEntry 33 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.34 + msanAdslAtucPhysExtnExtendedPsdStatus OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Conexant parameter that indicates whether an extended upstream PSD is used - for G.Span Plus mode of operation only. Only supported for G.Span Plus, therefore this parameter is not valid for ADSL2/ADSL2plus modes of operation." + ::= { msanAdslAtucPhysExtnEntry 34 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.35 + msanAdslAtucPhysExtnChipVersion OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Conexant parameter that indicates the DSP version number." + ::= { msanAdslAtucPhysExtnEntry 35 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.36 + msanAdslAtucPhysExtnPilotTone OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Conexant parameter that indicates the Pilot Tone Index." + ::= { msanAdslAtucPhysExtnEntry 36 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.37 + msanAdslAtucMSGds OBJECT-TYPE + SYNTAX Gauge32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Indicates the Overhead Channel. This feature is not supported by DSLPHY as yet." + ::= { msanAdslAtucPhysExtnEntry 37 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.38 + msanAdslAtucPhysExtnPsdMaskMode OBJECT-TYPE + SYNTAX INTEGER + { + coMsk2(0), + flatMsk(3), + cabMsk2(4), + coMsk2Rfi(32768), + flatMskRfi(32771), + cabMsk2Rfi(32772), + coMsk2Rfi0(49152), + adsl2NonovlpM1(275), + adsl2NonovlpM2(291), + adsl2NonovlpFlat(259) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Conexant parameter that indicates the actual Psd Mask currently being used." + ::= { msanAdslAtucPhysExtnEntry 38 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.39 + msanAdslAtucPhysExtnDeltSNRMTus OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DELT-related parameter that provides the number of symbols used to measure the upstream SNR(f) values. (Not available for ADSL and ADSL2plus)" + ::= { msanAdslAtucPhysExtnEntry 39 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.40 + msanAdslAtucPhysExtnDeltCurrStatus OBJECT-TYPE + SYNTAX INTEGER + { + success(255), + failedInsufficientCapacity(17), + failedCrcError(34), + failedTimeOut(68), + failedUnexpectedContent(136), + failedUnknown(0) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This Conexant parameter indicates the current status of Atuc Line in DELT mode." + ::= { msanAdslAtucPhysExtnEntry 40 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.41 + msanAdslAtucSATN OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DELT-related parameter that provides the upstream signal attenuation (length = 4 bytes). (Not available for ADSL and ADSL2plus). For further details, Refer to Section 7.5.1.9 Revised Recommendation G.997.1." + ::= { msanAdslAtucPhysExtnEntry 41 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.42 + msanAdslAtucPhysExtnSystemVendorId OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..9)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Indicates the Vendor ID as inserted by the ATU-C in the Overhead Messages(ADSL2). Typically identifies the ATU-C system integrator which usually refers to the vendor of the smallest field-replaceable unit. ATU-C System Vendor ID may not be the same as ATU-C Vendor ID. It is not available for ADSL. This is string of 8 octets containing 2 octet country code , 4 octet vendor id and 2 octet vendor revision number." + ::= { msanAdslAtucPhysExtnEntry 42 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.43 + msanAdslAtucPhysExtnSelfTestResult OBJECT-TYPE + SYNTAX Gauge32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Defines the ATU-C selftest result. The most significant octet is: 00 hex if the self-test passed or 01 hex if the self-test failed. Interpretation of the other octets is vendor discretionary and can be interpreted in combination with G.994.1 and system Vendor IDs. For further details, refer to Section 7.4.9 Revised Recommendation G.997.1." + ::= { msanAdslAtucPhysExtnEntry 43 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.44 + msanAdslAtucPhysExtnG9941VendorId OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..9)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Indicates the Vendor ID as inserted by the ATU-C in the G.994.1 CL message. Typically identifies the vendor of the ATU-C G.994.1 functionality. This is string of 8 octets containing 2 octet country code , 4 octet vendor id and 2 octet vendor revision number. For further details, refer to Section 7.4.1 Revised Recommendation G.997.1." + ::= { msanAdslAtucPhysExtnEntry 44 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.45 + msanAdslAtucPhysExtnTsspsUs OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..128)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This parameter provides the Upstream Transmit Spectrum Shaping parameter expressed as the set of break points exchanged during G994.1. Each breakpoint consists in a subcarrier index and the associated shaping parameter. Value of this parameter is in range 0 - 127, in multiples of -0.5 dB. 127 is a special value indicating the subcarrier is not transmitted. It is available only for ADSL2/ADSL2plus.For further details, Refer to Section 7.5.1.21.5 Revised Recommendation G.997.1." + ::= { msanAdslAtucPhysExtnEntry 45 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.46 + msanAdslAtucPhysExtnActPsdUs OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This parameter defines the average upstream transmit power spectrum density over the used subcarriers delivered by the ATU-C at the U-C reference point, at the instant of measurement. It's value ranges from -90 to 0, in 0.1 dB/Hz steps. It is available only for ADSL2/ADSL2plus. For further details, Refer to Section 7.5.1.14 Revised Recommendation G.997.1." + ::= { msanAdslAtucPhysExtnEntry 46 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.47 + msanAdslAtucPhysExtnGainspsUs OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..128)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This parameter defines the upstream gains allocation table per subcarrier. It is an array of integer values in the 0 to 4093 range for subcarriers 0 to NSCus-1. The gain value is represented as a multiple of 1/512 on linear scale. It is supported for ADSL2/ADSl2plus only." + ::= { msanAdslAtucPhysExtnEntry 47 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.48 + msanAdslAtucPhysExtnStartBin OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This Gspan++ parameter indicates the start bin of the bit loading up array." + ::= { msanAdslAtucPhysExtnEntry 48 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.49 + msanAdslAtucPhysExtnStartupErrorCode OBJECT-TYPE + SYNTAX INTEGER + { + startupErrorCodeOk(0), + startupErrorCodeMaxnomPsdDs(1), + startupErrorCodeMaxnomPsdUs(65536), + startupErrorCodePsdMaskDs(2), + startupErrorCodePsdMaskUs(131072), + startupErrorCodeMaxnomAtpDs(4), + startupErrorCodeMaxnomAtpUs(262144) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Conexant parameter which indicates the startup error code." + ::= { msanAdslAtucPhysExtnEntry 49 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.50 + msanAdslAtucPhysExtnBitSwapCount OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This Conexant parameter indicates the bit swap count. It can read only in data mode" + ::= { msanAdslAtucPhysExtnEntry 50 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.2.1.51 + msanAdslAtucPhysExtnModPhase OBJECT-TYPE + SYNTAX INTEGER + { + flatRateCheck(0), + snrMeasure(1), + modRateCheck(2), + modShowtime(3), + flatShowtime(4) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Conexant parameter to monitor the status of MoD" + ::= { msanAdslAtucPhysExtnEntry 51 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3 + msanAdslLineExtnTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanAdslLineExtnEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "This table includes common attributes describing both ends of the line. It is required for all ADSL physical interfaces. This Table is an extension to adslLineTable defined in rfc-2662." + ::= { msanAdsl 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3.1 + msanAdslLineExtnEntry OBJECT-TYPE + SYNTAX MsanAdslLineExtnEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry (conceptual row) in the msanAdslLineExtnTable. + The Table is indexed by ifIndex." + INDEX { ifIndex } + ::= { msanAdslLineExtnTable 1 } + + + MsanAdslLineExtnEntry ::= + SEQUENCE { + msanAdslLineExtnAction + INTEGER, + msanAdslLineExtnUtopiaL2RxAddr + INTEGER, + msanAdslLineExtnUtopiaL2TxAddr + INTEGER, + msanAdslLineExtnTransAtucCap + BITS, + msanAdslLineExtnTransAtucActual + BITS, + msanAdslLineExtnClockType + INTEGER, + msanAdslLineExtnLineDmtTrellis + INTEGER, + msanAdslLineExtnTransAturCap + BITS, + msanAdslLineExtnPMConfPMSF + INTEGER, + msanAdslLineExtnDeltConfLDSF + INTEGER, + msanAdslLineExtnTransAtucConfig + BITS, + msanAdslLineExtnAtucCurrOutputPwr + Integer32, + msanAdslLineExtnAtucBinSNRMargin + OCTET STRING, + msanAdslLineExtnUtopiaL2RxAddrSecond + INTEGER, + msanAdslLineExtnUtopiaL2TxAddrSecond + INTEGER, + msanAdslLineExtnDsBinSnrUpdate + INTEGER, + msanAdslLineExtnServiceType + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3.1.1 + msanAdslLineExtnAction OBJECT-TYPE + SYNTAX INTEGER + { + startup(0), + spectrumReverb(5), + analogLb(6), + digitalLb(7), + atmLp(10), + spectrumMedley(26), + spectrumPilot(27), + spectrumCMtpr(30), + spectrumRMtpr(32), + hybridLossTest(8193), + rcvLinearityTest(8194), + rcvFilterTest(8195), + rcvPowerPerBinTest(8196), + idleNoisePerBinTest(8198), + totalIdleNoiseTest(8197), + selt(4134), + shutdown(101), + wakeup(102), + abortReq(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "this object indicates parameter that allows actions on a per line basis. These actions include abort, startup, and tests." + ::= { msanAdslLineExtnEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3.1.2 + msanAdslLineExtnUtopiaL2RxAddr OBJECT-TYPE + SYNTAX INTEGER (0..254) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This object indicates UTOPIA Level 2 Rx address for a line." + ::= { msanAdslLineExtnEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3.1.3 + msanAdslLineExtnUtopiaL2TxAddr OBJECT-TYPE + SYNTAX INTEGER (0..254) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This object indicates UTOPIA Level 2 Tx address for a line." + ::= { msanAdslLineExtnEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3.1.4 + msanAdslLineExtnTransAtucCap OBJECT-TYPE + SYNTAX BITS + { + ansit1413(0), + etsi(1), + q9921PotsNonOverlapped(2), + q9921PotsOverlapped(3), + q9921IsdnNonOverlapped(4), + q9921isdnOverlapped(5), + q9921tcmIsdnNonOverlapped(6), + q9921tcmIsdnOverlapped(7), + q9922potsNonOverlapeed(8), + q9922potsOverlapped(9), + q9922tcmIsdnNonOverlapped(10), + q9922tcmIsdnOverlapped(11), + q9921tcmIsdnSymmetric(12), + adslPlusPotsNonOverlapped(13), + q9921GspanPlusPotsNonOverlapped(31), + q9921GspanPlusPotsOverlapped(30), + vdslNonOverlapped(25), + vdslOverlapped(24), + q9923Adsl2PotsOverlapped(29), + q9923Adsl2PotsNonOverlapped(28), + q9925Adsl2PlusPotsOverlapped(27), + q9925Adsl2PlusPotsNonOverlapped(26), + q9923Readsl2PotsOverlapped(22), + q9923Readsl2PotsNonOverlapped(23), + adslPlusPotsOverlapped(18), + q9921GspanPlusPlusPotsNonOverlapped(20), + q9921GspanPlusPlusPotsOverlapped(21), + q9923IsdnNonOverlapped(34), + q9923IsdnOverlapped(35), + q9925IsdnNonOverlapped(42), + q9925IsdnOverlapped(43), + q9923AnnexMPotsExtUsNonOverlapped(56), + q9923AnnexMPotsExtUsOverlapped(57), + q9925AnnexMPotsExtUsNonOverlapped(60), + q9925AnnexMPotsExtUsOverlapped(61) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The transmission modes that the ATU-C is capable of supporting. The modes available are limited by the design of the equipment. REFERENCE Section 7.3.2 ITU G.997.1." + ::= { msanAdslLineExtnEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3.1.5 + msanAdslLineExtnTransAtucActual OBJECT-TYPE + SYNTAX BITS + { + ansit1413(0), + etsi(1), + q9921PotsNonOverlapped(2), + q9921PotsOverlapped(3), + q9921IsdnNonOverlapped(4), + q9921isdnOverlapped(5), + q9921tcmIsdnNonOverlapped(6), + q9921tcmIsdnOverlapped(7), + q9922potsNonOverlapeed(8), + q9922potsOverlapped(9), + q9922tcmIsdnNonOverlapped(10), + q9922tcmIsdnOverlapped(11), + q9921tcmIsdnSymmetric(12), + adslPlusPotsNonOverlapped(13), + q9921GspanPlusPotsNonOverlapped(31), + q9921GspanPlusPotsOverlapped(30), + vdslNonOverlapped(25), + vdslOverlapped(24), + q9923Adsl2PotsOverlapped(29), + q9923Adsl2PotsNonOverlapped(28), + q9925Adsl2PlusPotsOverlapped(27), + q9925Adsl2PlusPotsNonOverlapped(26), + q9923Readsl2PotsOverlapped(22), + q9923Readsl2PotsNonOverlapped(23), + adslPlusPotsOverlapped(18), + q9921GspanPlusPlusPotsNonOverlapped(20), + q9921GspanPlusPlusPotsOverlapped(21), + q9923IsdnNonOverlapped(34), + q9923IsdnOverlapped(35), + q9925IsdnNonOverlapped(42), + q9925IsdnOverlapped(43), + q9923AnnexMPotsExtUsNonOverlapped(56), + q9923AnnexMPotsExtUsOverlapped(57), + q9925AnnexMPotsExtUsNonOverlapped(60), + q9925AnnexMPotsExtUsOverlapped(61) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The transmission mode of the ATU-C. This object returns if there is no mode currently known. The initialization with the ATU-R will determine the mode used. REFERENCE Section 7.3.2 ITU G.997.1." + ::= { msanAdslLineExtnEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3.1.6 + msanAdslLineExtnClockType OBJECT-TYPE + SYNTAX INTEGER + { + oscillator(0), + crystal(4) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This object indicates parameter to set use of either crystal or oscillator." + ::= { msanAdslLineExtnEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3.1.7 + msanAdslLineExtnLineDmtTrellis OBJECT-TYPE + SYNTAX INTEGER + { + trellisOn(1), + trellisOff(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Parameter that indicates whether trellis coding has been enabled or disabled. Trellis coding should always be enabled for its clear performance advantage." + ::= { msanAdslLineExtnEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3.1.8 + msanAdslLineExtnTransAturCap OBJECT-TYPE + SYNTAX BITS + { + ansit1413(0), + etsi(1), + q9921PotsNonOverlapped(2), + q9921PotsOverlapped(3), + q9921IsdnNonOverlapped(4), + q9921isdnOverlapped(5), + q9921tcmIsdnNonOverlapped(6), + q9921tcmIsdnOverlapped(7), + q9922potsNonOverlapeed(8), + q9922potsOverlapped(9), + q9922tcmIsdnNonOverlapped(10), + q9922tcmIsdnOverlapped(11), + q9921tcmIsdnSymmetric(12), + adslPlusPotsNonOverlapped(13), + q9921GspanPlusPotsNonOverlapped(31), + q9921GspanPlusPotsOverlapped(30), + vdslNonOverlapped(25), + vdslOverlapped(24), + q9923Adsl2PotsOverlapped(29), + q9923Adsl2PotsNonOverlapped(28), + q9925Adsl2PlusPotsOverlapped(27), + q9925Adsl2PlusPotsNonOverlapped(26), + q9923Readsl2PotsOverlapped(22), + q9923Readsl2PotsNonOverlapped(23), + adslPlusPotsOverlapped(18), + q9921GspanPlusPlusPotsNonOverlapped(20), + q9921GspanPlusPlusPotsOverlapped(21), + q9923IsdnNonOverlapped(34), + q9923IsdnOverlapped(35), + q9925IsdnNonOverlapped(42), + q9925IsdnOverlapped(43), + q9923AnnexMPotsExtUsNonOverlapped(56), + q9923AnnexMPotsExtUsOverlapped(57), + q9925AnnexMPotsExtUsNonOverlapped(60), + q9925AnnexMPotsExtUsOverlapped(61) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The transmission modes that the ATU-R is capable of supporting. The modes available are limited by the design of the equipment." + ::= { msanAdslLineExtnEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3.1.9 + msanAdslLineExtnPMConfPMSF OBJECT-TYPE + SYNTAX INTEGER + { + l3ToL0StateForce(0), + l0ToL2StateForce(2), + l3StateForce(3), + l2ToL0StateForce(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "PM-related parameter used by the ATU-C to force a change in the line state.(Not available for ADSL/ADSL2Plus)." + ::= { msanAdslLineExtnEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3.1.10 + msanAdslLineExtnDeltConfLDSF OBJECT-TYPE + SYNTAX INTEGER + { + inhibit(0), + force(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "DELT-related parameter used by the ATU-C to force the line into loop diagnostics mode.(Not available for ADSL and ADSL2plus)." + ::= { msanAdslLineExtnEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3.1.11 + msanAdslLineExtnTransAtucConfig OBJECT-TYPE + SYNTAX BITS + { + ansit1413(0), + etsi(1), + q9921PotsNonOverlapped(2), + q9921PotsOverlapped(3), + q9921IsdnNonOverlapped(4), + q9921isdnOverlapped(5), + q9921tcmIsdnNonOverlapped(6), + q9921tcmIsdnOverlapped(7), + q9922potsNonOverlapeed(8), + q9922potsOverlapped(9), + q9922tcmIsdnNonOverlapped(10), + q9922tcmIsdnOverlapped(11), + q9921tcmIsdnSymmetric(12), + adslPlusPotsNonOverlapped(13), + q9921GspanPlusPotsNonOverlapped(31), + q9921GspanPlusPotsOverlapped(30), + q9923Adsl2PotsOverlapped(29), + q9923Adsl2PotsNonOverlapped(28), + q9925Adsl2PlusPotsOverlapped(27), + q9925Adsl2PlusPotsNonOverlapped(26), + q9923Readsl2PotsOverlapped(22), + q9923Readsl2PotsNonOverlapped(23), + adslPlusPotsOverlapped(18), + q9921GspanPlusPlusPotsNonOverlapped(20), + q9921GspanPlusPlusPotsOverlapped(21), + q9923IsdnNonOverlapped(34), + q9923IsdnOverlapped(35), + q9925IsdnNonOverlapped(42), + q9925IsdnOverlapped(43), + q9923AnnexMPotsExtUsNonOverlapped(56), + q9923AnnexMPotsExtUsOverlapped(57), + q9925AnnexMPotsExtUsNonOverlapped(60), + q9925AnnexMPotsExtUsOverlapped(61) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The transmission modes that the ATU-C is capable of supporting. The modes available are limited by the design of the equipment. REFERENCE Section 7.3.2 ITU G.997.1." + ::= { msanAdslLineExtnEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3.1.12 + msanAdslLineExtnAtucCurrOutputPwr OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This parameter indicates the measure of total output power transmitted by this ATU. The value of this parameter is dynamic and will also show the change in Tx power due to Power Management. For example, the value will decrease in L2 low power mode. This value can be negative" + ::= { msanAdslLineExtnEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3.1.13 + msanAdslLineExtnAtucBinSNRMargin OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..64)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This Conexant parameter is an array of upstream SNR Margin values in dB. Each array entry represents the SNR Margin value for particular sub carrier." + ::= { msanAdslLineExtnEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3.1.14 + msanAdslLineExtnUtopiaL2RxAddrSecond OBJECT-TYPE + SYNTAX INTEGER (0..254) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Conexant parameter to set UTOPIA Level 2 Rx address for the secondary bearer channel in case of Dual Latency." + ::= { msanAdslLineExtnEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3.1.15 + msanAdslLineExtnUtopiaL2TxAddrSecond OBJECT-TYPE + SYNTAX INTEGER (0..254) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Conexant parameter to set UTOPIA Level 2 Tx address for the secondary bearer channel in case of Dual Latency." + ::= { msanAdslLineExtnEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3.1.16 + msanAdslLineExtnDsBinSnrUpdate OBJECT-TYPE + SYNTAX INTEGER + { + disable(0), + enable(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Conexant parameter to enable or disable collection of downstream SNR bin status" + ::= { msanAdslLineExtnEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.3.1.17 + msanAdslLineExtnServiceType OBJECT-TYPE + SYNTAX INTEGER + { + multimode(1), + reserved(2), + t1413(3), + gDmt(4), + adsl2plus(6), + adsl2(7), + adsl2plusAutoAnnexM(8), + adsl2AutoAnnexM(9), + reAdsl2(10) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The service type configured in ADSL configuration profile which applies for this line. + Supported values: + 1: multimode + 2: reserved + 3: T1_413 + 4: G.DMT + 6: ADSL2+ + 7: ADSL2 + 8: ADSL2+ AUTO[+Annex M] + 9: ADSL2 AUTO[+Annex M] + 10: READSL2" + ::= { msanAdslLineExtnEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4 + msanAdslAturPhysExtnTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanAdslAturPhysExtnEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "This table is an extention to adslAtucPhysTable defined in rfc-2662. This table provides one row for each ATUR. Each row contains the Physical Layer Parameters table for that ATUR." + ::= { msanAdsl 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1 + msanAdslAturPhysExtnEntry OBJECT-TYPE + SYNTAX MsanAdslAturPhysExtnEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry (conceptual row) in the msanAdslAturPhysExtnTable. + The Table is indexed by ifIndex." + INDEX { ifIndex } + ::= { msanAdslAturPhysExtnTable 1 } + + + MsanAdslAturPhysExtnEntry ::= + SEQUENCE { + msanAdslAturPhysExtnConfig + OCTET STRING, + msanAdslAturPhysExtnChanPerfCD + Integer32, + msanAdslAturPhysExtnChanPerfCU + Integer32, + msanAdslAturPhysExtnChanPerfBE + Integer32, + msanAdslAturPhysExtnDeltHLINSCds + Integer32, + msanAdslAturPhysExtnDeltHLINpsds + OCTET STRING, + msanAdslAturPhysExtnDeltHLOGMTds + Integer32, + msanAdslAturPhysExtnDeltHLOGpsus + OCTET STRING, + msanAdslAturPhysExtnDeltQLNMTds + Integer32, + msanAdslAturPhysExtnDeltQLNpsds + OCTET STRING, + msanAdslAturPhysExtnDeltLastTxState + INTEGER, + msanAdslAturMSGus + Gauge32, + msanAdslAturDeltSNRMTds + Gauge32, + msanAdslAturSATN + Integer32, + msanAdslAturPhysExtnSystemVendorId + OCTET STRING, + msanAdslAturPhysExtnGainspsDs + OCTET STRING, + msanAdslAturPhysExtnSelfTestResult + Gauge32, + msanAdslAturPhysExtnG9941VendorId + OCTET STRING, + msanAdslAturPhysExtnTsspsDs + OCTET STRING, + msanAdslAturPhysExtnActPsdDs + Integer32, + msanAdslAturPhysExtnBitSwapCount + Unsigned32, + msanAdslAturPhysExtnPsdMaskMode + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.1 + msanAdslAturPhysExtnConfig OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..30)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This object provides the upstream and downstream ATU-R configuration data, as defined in T1.413 i2, Sections 6.4, 6.6, 7.4, 7.6 and Table 27." + ::= { msanAdslAturPhysExtnEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.2 + msanAdslAturPhysExtnChanPerfCD OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The far-end delineated total cell count performance parameter is a count of the total number of cells passed through the cell delineation and HEC function process operating on the ATM Data Path while in the SYNC state.(Not available for ADSL)." + ::= { msanAdslAturPhysExtnEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.3 + msanAdslAturPhysExtnChanPerfCU OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The far-end user total cell count performance parameter is a count of the total number of cells in the ATM Data Path delivered at the V-C (for ATU-C) or T-R (for ATUR) interface. (Not available for ADSL)." + ::= { msanAdslAturPhysExtnEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.4 + msanAdslAturPhysExtnChanPerfBE OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The far-end idle bit error count performance parameter is a count of the number of bit errors in the idle cell payload received in the ATM Data Path at the far-end. (Not available for ADSL)." + ::= { msanAdslAturPhysExtnEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.5 + msanAdslAturPhysExtnDeltHLINSCds OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DELT-related parameter that provides the scale factor to be applied to the downstream Hlin(f) values.(Not available for ADSL and ADSL2plus)." + ::= { msanAdslAturPhysExtnEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.6 + msanAdslAturPhysExtnDeltHLINpsds OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..2048)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DELT-related parameter that provides an array of complex downstream Hlin(f) values in linear scale. (Not available for ADSL and ADSL2plus). Every two octets refer to one element in this array of octets." + ::= { msanAdslAturPhysExtnEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.7 + msanAdslAturPhysExtnDeltHLOGMTds OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DELT-related parameter that provides the number of symbols used to measure the downstream Hlog(f). (Not available for ADSL and ADSL2plus)." + ::= { msanAdslAturPhysExtnEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.8 + msanAdslAturPhysExtnDeltHLOGpsus OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..1024)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DELT-related parameter that provides an array of real downstream Hlog(f) values in dB. (Not available for ADSL and ADSL2plus)." + ::= { msanAdslAturPhysExtnEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.9 + msanAdslAturPhysExtnDeltQLNMTds OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DELT-related parameter that provides the number of symbols used to measure the downstream QLN(f) values. (Not available for ADSL and ADSL2plus)." + ::= { msanAdslAturPhysExtnEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.10 + msanAdslAturPhysExtnDeltQLNpsds OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..512)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DELT-related parameter that provides an array of real downstream QLN(f) values in dB. (Not available for ADSL and ADSL2plus). Every two octets refer to one element in this array of octets." + ::= { msanAdslAturPhysExtnEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.11 + msanAdslAturPhysExtnDeltLastTxState OBJECT-TYPE + SYNTAX INTEGER + { + dmtaturg9941(0), + dmtaturquiet1(1), + dmtaturcomb1(2), + dmtaturquiet2(3), + dmtaturcomb2(4), + dmtaturicomb1(5), + dmtaturlineprob(6), + dmtaturquiet3(7), + dmtaturcomb3(8), + dmtaturicomb2(9), + dmtaturmsgfmt(10), + dmtaturmsgpcb(11), + dmtaturreverb1(12), + dmtaturquiet4(13), + dmtaturreverb2(14), + dmtaturquiet5(15), + dmtaturreverb3(16), + dmtaturect(17), + dmtaturreverb4(18), + dmtatursegue1(19), + dmtaturreverb5(20), + dmtatursegue2(21), + dmtaturmsg1(22), + dmtaturmedley(23), + dmtaturexchmarker(24), + dmtaturmsg2(25), + dmtaturreverb6(26), + dmtatursegue3(27), + dmtaturparams(28), + dmtaturreverb7(29), + dmtatursegue4(30), + dmtaturshowtime(31) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DELT-related parameter that provides last successful transmitted initialization state by the ATU-R. (Not available for ADSL and ADSL2plus)." + ::= { msanAdslAturPhysExtnEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.12 + msanAdslAturMSGus OBJECT-TYPE + SYNTAX Gauge32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Indicates the Overhead Channel. This feature is not supported by DSLPHY as yet." + ::= { msanAdslAturPhysExtnEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.13 + msanAdslAturDeltSNRMTds OBJECT-TYPE + SYNTAX Gauge32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DELT-related parameter that provides the number of symbols used to measure the downstream SNR(f) values. (Not available for ADSL and ADSL2plus)" + ::= { msanAdslAturPhysExtnEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.14 + msanAdslAturSATN OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "DELT-related parameter that provides the downtream signal attenuation (length = 4 bytes). (Not available for ADSL and ADSL2plus). For further details, Refer to Section 7.5.1.9 Revised Recommendation G.997.1." + ::= { msanAdslAturPhysExtnEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.15 + msanAdslAturPhysExtnSystemVendorId OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..9)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Indicates the Vendor ID as inserted by the ATU-R in the Embedded Operations Channel(ADSL). Typically identiies the ATU-R system integrator which usually refers to the vendor of the smallest field-replaceable unit. ATU-R System Vendor ID may not be the same as ATU-R G.994.1 Vendor ID. For ADSL2, provides the Vendor ID as inserted by the ATU-R in the Overhead Messages. It is not available for ADSL. This is string of 8 octets containing 2 octet country code , 4 octet vendor id and 2 octet vendor revision number." + ::= { msanAdslAturPhysExtnEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.16 + msanAdslAturPhysExtnGainspsDs OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..1024)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This parameter defines the downstream gains allocation table per bin. For further details, Refer to Section 7.5.1.21.3 Revised Recommendation G.997.1. It is supported for ADSL2/ADSl2plus only." + ::= { msanAdslAturPhysExtnEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.17 + msanAdslAturPhysExtnSelfTestResult OBJECT-TYPE + SYNTAX Gauge32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Defines the ATU-R selftest result. The most significant octet is: 00 hex if the self-test passed or 01 hex if the self-test failed. Interpretation of the other octets is vendor discretionary and can be interpreted in combination with G.994.1 and system Vendor IDs. For further details, refer to Section 7.4.10 Revised Recommendation G.997.1." + ::= { msanAdslAturPhysExtnEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.18 + msanAdslAturPhysExtnG9941VendorId OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..9)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Indicates the Vendor ID as inserted by the ATU-R in the G.994.1 CLR message.The G.994.1 Vendor ID typically identifies the vendor of the ATU-R G.994.1 functionality. This is string of 8 octets containing 2 octet country code , 4 octet vendor id and 2 octet vendor revision number. For further details, refer to Section 7.4.2 Revised Recommendation G.997.1." + ::= { msanAdslAturPhysExtnEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.19 + msanAdslAturPhysExtnTsspsDs OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..128)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This parameter provides the Downstream Transmit Spectrum Shaping parameter expressed as the set of break points exchanged during G994.1. Value of this parameter is in range 0 - 127, in multiples of -0.5 dB. 127 is a special value indicating the subcarrier is not transmitted. It is available only for ADSL2/ADSL2plus. For further details, Refer to Section 7.5.1.21.5 Revised Recommendation G.997.1" + ::= { msanAdslAturPhysExtnEntry 19 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.20 + msanAdslAturPhysExtnActPsdDs OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This parameter defines the average downstream transmit power spectrum density over the used subcarriers delivered by the ATU-C at the U-C reference point, at the instant of measurement. It's value ranges from -90 to 0, in 0.1 dB/Hz steps. It is available only for ADSL2/ADSL2plus.For further details, Refer to Section 7.5.1.14 Revised Recommendation G.997.1." + ::= { msanAdslAturPhysExtnEntry 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.21 + msanAdslAturPhysExtnBitSwapCount OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This Conexant parameter indicates the bit swap count. It can read only in data mode" + ::= { msanAdslAturPhysExtnEntry 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.36.4.1.22 + msanAdslAturPhysExtnPsdMaskMode OBJECT-TYPE + SYNTAX INTEGER + { + coMsk2(0), + flatMsk(3), + cabMsk2(4), + coMsk2Rfi(32768), + flatMskRfi(32771), + cabMsk2Rfi(32772), + coMsk2Rfi0(49152), + adsl2NonovlpM1(275), + adsl2NonovlpM2(291), + adsl2NonovlpFlat(259) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This conexant parameter that indicates the actual PSD Mask currently being used by ATU-R" + ::= { msanAdslAturPhysExtnEntry 22 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.37 + msanEaps OBJECT IDENTIFIER ::= { msanAdditionalConf 37 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.37.1 + msanEapsGlobal OBJECT IDENTIFIER ::= { msanEaps 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.37.1.1 + msanEapsAdminState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Global EAPS administrative state." + DEFVAL { disable } + ::= { msanEapsGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.37.2 + msanEapsDomainTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanEapsDomainEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "EAPS domain configuration." + ::= { msanEaps 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.37.2.1 + msanEapsDomainEntry OBJECT-TYPE + SYNTAX MsanEapsDomainEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanEapsDomainName } + ::= { msanEapsDomainTable 1 } + + + MsanEapsDomainEntry ::= + SEQUENCE { + msanEapsDomainName + OCTET STRING, + msanEapsDomainDeviceRole + INTEGER, + msanEapsDomainHelloTime + INTEGER, + msanEapsDomainFailTimeout + INTEGER, + msanEapsDomainAdminState + INTEGER, + msanEapsDomainPrimaryIfIndex + Integer32, + msanEapsDomainSecondaryIfIndex + Integer32, + msanEapsDomainCntrlVlanId + Integer32, + msanEapsDomainRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.37.2.1.2 + msanEapsDomainName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..12)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description of the EAPS domain. Each msanEapsDomainName value in this + table must be unique." + ::= { msanEapsDomainEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.37.2.1.3 + msanEapsDomainDeviceRole OBJECT-TYPE + SYNTAX INTEGER + { + master(1), + transit(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Role of the node in the EAPS domain (Master or Transit)" + DEFVAL { transit } + ::= { msanEapsDomainEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.37.2.1.4 + msanEapsDomainHelloTime OBJECT-TYPE + SYNTAX INTEGER (1..15) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "EAPS domain hello frame send interval. + This value must be lower than msanEapsDomainFailTimeout" + DEFVAL { 1 } + ::= { msanEapsDomainEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.37.2.1.5 + msanEapsDomainFailTimeout OBJECT-TYPE + SYNTAX INTEGER (2..300) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "EAPS fail timeout. + This value must be higher than msanEapsDomainHelloTime" + DEFVAL { 3 } + ::= { msanEapsDomainEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.37.2.1.6 + msanEapsDomainAdminState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "EAPS domain administrative state. + State can be changed from disable to enable only when all parameters + in this table are defined." + DEFVAL { disable } + ::= { msanEapsDomainEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.37.2.1.7 + msanEapsDomainPrimaryIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "EAPS primary interface. The value must be different from msanEapsSecondaryIfIndex. + + The interface identified by a particular value of this index is the same + interface as identified by the same value of ifIndex. + ifType of selected interface can be ethernetCsmacd(6) or ieee8023adLag (161). + + This parameter can be undefined when EAPS domain is created and msanEapsDomainAdminState + is disable. + + + + " + ::= { msanEapsDomainEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.37.2.1.8 + msanEapsDomainSecondaryIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "EAPS secondary interface. The value must be different from msanEapsPrimaryIfIndex. + + The interface identified by a particular value of this index is the same + interface as identified by the same value of ifIndex. + ifType of selected interface can be ethernetCsmacd(6) or ieee8023adLag (161). + + This parameter can be undefined when EAPS domain is created and msanEapsDomainAdminState + is disable. + + " + ::= { msanEapsDomainEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.37.2.1.9 + msanEapsDomainCntrlVlanId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "EAPS control VLAN ID. + Selected VLAN ID must exists in dot1qVlanStaticTable. + + This parameter can be undefined when EAPS domain is created and msanEapsDomainAdminState + is disable. + " + ::= { msanEapsDomainEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.37.2.1.10 + msanEapsDomainRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + For row creation use createAndWait(5) [createAndGo(4) is not supported]. + + If msanEapsDomainAdminState is disable, created row can be actived by row status object + also when next parameters are not defined: + - msanEapsDomainPrimaryifIndex + - msanEapsDomainSecondaryifIndex + - msanEapsDomainCntrlVlanId + " + ::= { msanEapsDomainEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.37.3 + msanEapsDomainProtVlanTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanEapsDomainProtVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "List of protected VLANs for EAPS domain." + ::= { msanEaps 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.37.3.1 + msanEapsDomainProtVlanEntry OBJECT-TYPE + SYNTAX MsanEapsDomainProtVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanEapsDomainName, dot1qVlanIndex } + ::= { msanEapsDomainProtVlanTable 1 } + + + MsanEapsDomainProtVlanEntry ::= + SEQUENCE { + msanEapsDomainProtVlanRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.37.3.1.1 + msanEapsDomainProtVlanRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanEapsDomainProtVlanEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38 + msanCpe OBJECT IDENTIFIER ::= { msanAdditionalConf 38 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.1 + msanCpeGlobal OBJECT IDENTIFIER ::= { msanCpe 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.1.1 + msanCpeReset OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "ifIndex" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Reset CPE equipment connected to selected interface index (ifIndex)." + DEFVAL { 0 } + ::= { msanCpeGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.1.2 + msanCpeSendConfig OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "ifIndex" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Apply configuration to CPE equipment connected to + selected interface index (ifIndex)." + DEFVAL { 0 } + ::= { msanCpeGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.1.3 + msanCpeApiMajorVersion OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..32)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "CPE API major version information." + ::= { msanCpeGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.1.4 + msanCpeApiMinorVersion OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..32)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "CPE API minor version information." + ::= { msanCpeGlobal 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.2 + msanCpeTypeTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanCpeTypeEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "List of possible CPE types." + ::= { msanCpe 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.2.1 + msanCpeTypeEntry OBJECT-TYPE + SYNTAX MsanCpeTypeEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanCpeTypeName } + ::= { msanCpeTypeTable 1 } + + + MsanCpeTypeEntry ::= + SEQUENCE { + msanCpeTypeName + OCTET STRING, + msanCpeTypePortNum + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.2.1.1 + msanCpeTypeName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..20)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Usage name of CPE model." + ::= { msanCpeTypeEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.2.1.2 + msanCpeTypePortNum OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Number of CPE user ports." + ::= { msanCpeTypeEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.3 + msanCpeIntfTypeTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanCpeIntfTypeEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Tabel defines which CPE model can be connected to selected interface." + ::= { msanCpe 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.3.1 + msanCpeIntfTypeEntry OBJECT-TYPE + SYNTAX MsanCpeIntfTypeEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, msanCpeTypeName } + ::= { msanCpeIntfTypeTable 1 } + + + MsanCpeIntfTypeEntry ::= + SEQUENCE { + msanCpeIntfTypeRowStatus + RowStatus, + msanCpeIntfTypeHwVersion + OCTET STRING, + msanCpeIntfTypeSwVersion + OCTET STRING + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.3.1.1 + msanCpeIntfTypeRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported. + " + ::= { msanCpeIntfTypeEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.3.1.2 + msanCpeIntfTypeHwVersion OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..32)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Connected CPE hardware version." + ::= { msanCpeIntfTypeEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.3.1.3 + msanCpeIntfTypeSwVersion OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..32)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Connected CPE software version." + ::= { msanCpeIntfTypeEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.4 + msanCpeIntfPortTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanCpeIntfPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Table of CPE ports parameters" + ::= { msanCpe 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.4.1 + msanCpeIntfPortEntry OBJECT-TYPE + SYNTAX MsanCpeIntfPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, msanCpeIntfPortId } + ::= { msanCpeIntfPortTable 1 } + + + MsanCpeIntfPortEntry ::= + SEQUENCE { + msanCpeIntfPortId + INTEGER, + msanCpeIntfPortPowerMode + INTEGER, + msanCpeIntfPortLinkMode + INTEGER, + msanCpeIntfPortPvid + INTEGER, + msanCpeIntfPortCos + INTEGER, + msanCpeIntfPortOverrideVid + INTEGER, + msanCpeIntfPortOverrideCos + INTEGER, + msanCpeIntfPortProtection + INTEGER, + msanCpeIntfPortStatus + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.4.1.1 + msanCpeIntfPortId OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "CPE port ID (1 .. n)." + ::= { msanCpeIntfPortEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.4.1.2 + msanCpeIntfPortPowerMode OBJECT-TYPE + SYNTAX INTEGER + { + normal(0), + fullPowerDown(1), + sleep(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Power mode of the CPE port. When port is in Sleep(2) mode, + automatic wake-up is also activated. + " + DEFVAL { normal } + ::= { msanCpeIntfPortEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.4.1.3 + msanCpeIntfPortLinkMode OBJECT-TYPE + SYNTAX INTEGER + { + autonegotiation(0), + speed100MbpsFD(1), + speed100MbpsHD(2), + speed10MbpsFD(3), + speed10MbpsHD(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Speed and duplex mode of the CPE port." + DEFVAL { autonegotiation } + ::= { msanCpeIntfPortEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.4.1.4 + msanCpeIntfPortPvid OBJECT-TYPE + SYNTAX INTEGER (1..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Default Vlan ID (pVID) for selected CPE port." + DEFVAL { 1 } + ::= { msanCpeIntfPortEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.4.1.5 + msanCpeIntfPortCos OBJECT-TYPE + SYNTAX INTEGER (0..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Default CoS bit settings for the CPE port." + DEFVAL { 0 } + ::= { msanCpeIntfPortEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.4.1.6 + msanCpeIntfPortOverrideVid OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "When enable(1)VLAN ID of received tagged frame on selected CPE port + is overwritten with default VLAN ID (msanCpeIntfPortPvid)." + DEFVAL { disable } + ::= { msanCpeIntfPortEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.4.1.7 + msanCpeIntfPortOverrideCos OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "When enable(1)CoS value of received tagged frame on selected CPE port + is overwritten with default CoS bit settings (msanCpeIntfPortCos)." + DEFVAL { disable } + ::= { msanCpeIntfPortEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.4.1.8 + msanCpeIntfPortProtection OBJECT-TYPE + SYNTAX INTEGER + { + unprotected(0), + protected(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "If protection flag is set to protected (1), other profile values cannot be edited. + + Protection flag is always protected (1) and it can't be changed if profile is assigned as dynamic: + msanAclProfileStatus = dynamic(2)" + DEFVAL { unprotected } + ::= { msanCpeIntfPortEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.4.1.9 + msanCpeIntfPortStatus OBJECT-TYPE + SYNTAX INTEGER + { + static(1), + dynamic(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Profile status. + If status is dynamic, profile values can't be edited." + ::= { msanCpeIntfPortEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.5 + msanCpeTrafficTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanCpeTrafficEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanCpe 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.5.1 + msanCpeTrafficEntry OBJECT-TYPE + SYNTAX MsanCpeTrafficEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanCpeTrafficId } + ::= { msanCpeTrafficTable 1 } + + + MsanCpeTrafficEntry ::= + SEQUENCE { + msanCpeTrafficId + Integer32, + msanCpeTrafficName + OCTET STRING, + msanCpeTrafficSpeed + Integer32, + msanCpeTrafficFlowCntrlMode + INTEGER, + msanCpeTrafficRowStatus + RowStatus, + msanCpeTrafficProtection + INTEGER, + msanCpeTrafficStatus + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.5.1.1 + msanCpeTrafficId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Number identifying traffic configuration (1 .. n)." + ::= { msanCpeTrafficEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.5.1.2 + msanCpeTrafficName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..40)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name identifying traffic configuration. Must be unique value." + ::= { msanCpeTrafficEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.5.1.3 + msanCpeTrafficSpeed OBJECT-TYPE + SYNTAX Integer32 (0..100000) + UNITS "kbit/s" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Maximum bitrate of services using this traffic configuration. + Domain value is 0-100000kbit/s, where: + - for speeds below 1Mbit/s step is 64kbit/s + - for speeds above 1Mbit/s step is 1000kbit/s" + ::= { msanCpeTrafficEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.5.1.4 + msanCpeTrafficFlowCntrlMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Flow control mode. When enable(1) and speed is to be exceeded, device will send + PAUSE flow control packet. If disable(2) packet will be just dropped." + DEFVAL { disable } + ::= { msanCpeTrafficEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.5.1.5 + msanCpeTrafficRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + For row creation use createAndWait(5) [createAndGo(4) is not supported]. + Setting this object to active(1) will activate this entry, if msanCpeTrafficName is defined. + Setting this object to destroy(6) will remove this entry. + " + ::= { msanCpeTrafficEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.5.1.6 + msanCpeTrafficProtection OBJECT-TYPE + SYNTAX INTEGER + { + unprotected(0), + protected(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "If protection flag is set to protected (1), other profile values cannot be edited. + + Protection flag is always protected (1) and it can't be changed if profile is assigned as dynamic: + msanAclProfileStatus = dynamic(2)" + DEFVAL { unprotected } + ::= { msanCpeTrafficEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.5.1.7 + msanCpeTrafficStatus OBJECT-TYPE + SYNTAX INTEGER + { + static(1), + dynamic(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Profile status. + If status is dynamic, profile values can't be edited." + ::= { msanCpeTrafficEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.6 + msanCpeServiceTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanCpeServiceEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanCpe 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.6.1 + msanCpeServiceEntry OBJECT-TYPE + SYNTAX MsanCpeServiceEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanCpeServiceId } + ::= { msanCpeServiceTable 1 } + + + MsanCpeServiceEntry ::= + SEQUENCE { + msanCpeServiceId + Integer32, + msanCpeServiceName + OCTET STRING, + msanCpeServiceCVlanId + Integer32, + msanCpeServiceCCos + Integer32, + msanCpeServiceTrafficId + Integer32, + msanCpeServiceUntaggedPorts + OCTET STRING, + msanCpeServiceTaggedPorts + OCTET STRING, + msanCpeServiceCMltcstMode + INTEGER, + msanCpeServiceRowStatus + RowStatus, + msanCpeServiceTypeName + OCTET STRING, + msanCpeServiceProtection + INTEGER, + msanCpeServiceStatus + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.6.1.1 + msanCpeServiceId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Number identifying service configuration (0 .. n)." + ::= { msanCpeServiceEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.6.1.2 + msanCpeServiceName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..40)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name identifying service. Must be unique value." + ::= { msanCpeServiceEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.6.1.3 + msanCpeServiceCVlanId OBJECT-TYPE + SYNTAX Integer32 (1..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Customer VLAN ID, used for all frames belong to this service." + DEFVAL { 1 } + ::= { msanCpeServiceEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.6.1.4 + msanCpeServiceCCos OBJECT-TYPE + SYNTAX Integer32 (0..7) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "CoS bit settings for all frames belonging to this service." + DEFVAL { 0 } + ::= { msanCpeServiceEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.6.1.5 + msanCpeServiceTrafficId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Reference to parameter msanCpeTrafficId (1 .. n), which identifies traffic configuration . + Value 0 is used when traffic configuration is not defined." + DEFVAL { 0 } + ::= { msanCpeServiceEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.6.1.6 + msanCpeServiceUntaggedPorts OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..2)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The set of ports (bitmask) which should transmit egress packets as untagged. + When untagged frame is received on this ports set, appropriate default VLAN ID + (msanCpeIntfPortPvid) and default CoS bits (msanCpeIntfPortCos) are set." + DEFVAL { '0'h } + ::= { msanCpeServiceEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.6.1.7 + msanCpeServiceTaggedPorts OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..2)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The set of ports (bitmask) where frames can be received only if they have + appropriate Customer VLAN ID (msanCpeServiceCVlanId). Otherwise they are dropped. + When transmitting frames to this set of ports, VLAN tags are not removed. + " + DEFVAL { '0'h } + ::= { msanCpeServiceEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.6.1.8 + msanCpeServiceCMltcstMode OBJECT-TYPE + SYNTAX INTEGER + { + disableIGMPprocessing(0), + igmpV2SnoopNormalLeave(1), + igmpV2SnoopFastLeave(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Mode of multicast operation for this service." + DEFVAL { disableIGMPprocessing } + ::= { msanCpeServiceEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.6.1.9 + msanCpeServiceRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + For row creation use createAndWait(5) [createAndGo(4) is not supported]. + Setting this object to active(1) will activate this entry, if msanCpeServiceName + and msanCpeServiceTrafficId are defined. + Setting this object to destroy(6) will remove this entry. + " + ::= { msanCpeServiceEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.6.1.10 + msanCpeServiceTypeName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..20)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Usage name of CPE model. + Must be one of predefined msanCpeTypeName values." + ::= { msanCpeServiceEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.6.1.11 + msanCpeServiceProtection OBJECT-TYPE + SYNTAX INTEGER + { + unprotected(0), + protected(1) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "If protection flag is set to protected (1), other profile values cannot be edited. + + Protection flag is always protected (1) and it can't be changed if profile is assigned as dynamic: + msanAclProfileStatus = dynamic(2)" + DEFVAL { unprotected } + ::= { msanCpeServiceEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.6.1.12 + msanCpeServiceStatus OBJECT-TYPE + SYNTAX INTEGER + { + static(1), + dynamic(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Profile status. + If status is dynamic, profile values can't be edited." + ::= { msanCpeServiceEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.7 + msanCpeIntfServiceTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanCpeIntfServiceEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "This table links CPE ports on selected interface with appropriate service." + ::= { msanCpe 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.7.1 + msanCpeIntfServiceEntry OBJECT-TYPE + SYNTAX MsanCpeIntfServiceEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, msanCpeServiceId } + ::= { msanCpeIntfServiceTable 1 } + + + MsanCpeIntfServiceEntry ::= + SEQUENCE { + msanCpeIntfServiceRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.38.7.1.1 + msanCpeIntfServiceRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanCpeIntfServiceEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39 + msanBoard OBJECT IDENTIFIER ::= { msanAdditionalConf 39 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.1 + msanBoardGlobal OBJECT IDENTIFIER ::= { msanBoard 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.1.1 + msanBoardReset OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Reset board in specified shelf slot ID (>0)." + DEFVAL { 0 } + ::= { msanBoardGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2 + msanBoardConfTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanBoardConfEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanBoard 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1 + msanBoardConfEntry OBJECT-TYPE + SYNTAX MsanBoardConfEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanBoardConfNr } + ::= { msanBoardConfTable 1 } + + + MsanBoardConfEntry ::= + SEQUENCE { + msanBoardConfNr + INTEGER, + msanBoardConfParentNr + INTEGER, + msanBoardConfPosition + INTEGER, + msanBoardConfType + DisplayString, + msanBoardConfRequiredId + DisplayString, + msanBoardConfActualId + DisplayString, + msanBoardConfSerialNr + DisplayString, + msanBoardConfDescription + DisplayString, + msanBoardConfStatus + INTEGER, + msanBoardConfRowStatus + RowStatus, + msanBoardConfSwSteerVersion + DisplayString, + msanBoardConfSwBuildDirectory + DisplayString, + msanBoardConfSwBuildTime + DisplayString, + msanBoardConfSwBranch + DisplayString, + msanBoardConfSwBuildReference + DisplayString, + msanBoardConfSwBackupSteerVersion + DisplayString, + msanBoardConfSwBackupStatus + INTEGER, + msanBoardConfPowerConsumption + Gauge32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1.1 + msanBoardConfNr OBJECT-TYPE + SYNTAX INTEGER (1..1000) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Unique identification of a board." + ::= { msanBoardConfEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1.2 + msanBoardConfParentNr OBJECT-TYPE + SYNTAX INTEGER (1..1000) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Unique identification of a parent board." + ::= { msanBoardConfEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1.3 + msanBoardConfPosition OBJECT-TYPE + SYNTAX INTEGER (1..1000) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Position of the board on the parent board. + " + ::= { msanBoardConfEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1.4 + msanBoardConfType OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of physical board (e.g. IDC, SGO, SFA, ...). This value is automatically + set according to msanBoardConfRequiredId." + ::= { msanBoardConfEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1.5 + msanBoardConfRequiredId OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Required identification of a board, which is one of available msanBoardListId + values (e.g. UTA6041BA)." + ::= { msanBoardConfEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1.6 + msanBoardConfActualId OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Actual identification of a board (e.g. UTA6041BA050 - last three numbers define board version)." + ::= { msanBoardConfEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1.7 + msanBoardConfSerialNr OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Serial number of a board." + ::= { msanBoardConfEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1.8 + msanBoardConfDescription OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Description of the board." + ::= { msanBoardConfEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1.9 + msanBoardConfStatus OBJECT-TYPE + SYNTAX INTEGER + { + boardPresentRunning(1), + boardPresentNotAccessible(2), + boardNotPresent(3), + boardPresentInitProcess(4) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Physical status of configured board." + ::= { msanBoardConfEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1.10 + msanBoardConfRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5). + For row activation use active(1). + For row deactivation use notInService(2). + For row deletion use destroy(6) (board with management interface can not be deleted). + + Other values are currently not supported. + + For row activation next terms must be accomplished: + - all requested values (they don't have default definition) must be set + - msanBoardConfId is one of available msanBoardListId values " + ::= { msanBoardConfEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1.11 + msanBoardConfSwSteerVersion OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The unique steer code of installed software. " + ::= { msanBoardConfEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1.12 + msanBoardConfSwBuildDirectory OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The directory where installed software was build on. " + ::= { msanBoardConfEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1.13 + msanBoardConfSwBuildTime OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The time when the installed software was built. (DateAndTime textual convention, from SNMPv2-TC) + " + ::= { msanBoardConfEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1.14 + msanBoardConfSwBranch OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The repository branch where the installed software was built from." + ::= { msanBoardConfEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1.15 + msanBoardConfSwBuildReference OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The repository reference number of the installed software build branch. " + ::= { msanBoardConfEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1.16 + msanBoardConfSwBackupSteerVersion OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The unique steer code of installed backup software. " + ::= { msanBoardConfEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1.17 + msanBoardConfSwBackupStatus OBJECT-TYPE + SYNTAX INTEGER + { + currentActive(1), + nextActive(2), + backup(3), + none(4), + fail(5) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Backup software package status" + ::= { msanBoardConfEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.2.1.18 + msanBoardConfPowerConsumption OBJECT-TYPE + SYNTAX Gauge32 + UNITS "Watts" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Measured usage power expressed in Watts." + ::= { msanBoardConfEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.3 + msanBoardListTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanBoardListEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanBoard 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.3.1 + msanBoardListEntry OBJECT-TYPE + SYNTAX MsanBoardListEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanBoardListId } + ::= { msanBoardListTable 1 } + + + MsanBoardListEntry ::= + SEQUENCE { + msanBoardListId + DisplayString, + msanBoardListType + DisplayString + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.3.1.1 + msanBoardListId OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Identification of supported board (e.g. UTA6041BA)." + ::= { msanBoardListEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.39.3.1.2 + msanBoardListType OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of physical board (e.g. IDC, SGO, SFA, ...)." + ::= { msanBoardListEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.40 + msanFtpServer OBJECT IDENTIFIER ::= { msanAdditionalConf 40 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.40.1 + msanFtpServerGlobal OBJECT IDENTIFIER ::= { msanFtpServer 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.40.1.1 + msanFtpServerAdminState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "FTP server administrative state." + DEFVAL { disable } + ::= { msanFtpServerGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.41 + msanAppRateLimit OBJECT IDENTIFIER ::= { msanAdditionalConf 41 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.41.1 + msanAppRateLimitGlobal OBJECT IDENTIFIER ::= { msanAppRateLimit 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.41.2 + msanAppRateLimitTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanAppRateLimitEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanAppRateLimit 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.41.2.1 + msanAppRateLimitEntry OBJECT-TYPE + SYNTAX MsanAppRateLimitEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanAppRateLimitTable 1 } + + + MsanAppRateLimitEntry ::= + SEQUENCE { + msanAppRateLimitDhcp + Integer32, + msanAppRateLimitDhcpState + INTEGER, + msanAppRateLimitPppoe + Integer32, + msanAppRateLimitPppoeState + INTEGER, + msanAppRateLimitIgmp + Integer32, + msanAppRateLimitIgmpState + INTEGER, + msanAppRateLimitStp + Integer32, + msanAppRateLimitStpState + INTEGER, + msanAppRateLimitMn + Integer32, + msanAppRateLimitMnState + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.41.2.1.1 + msanAppRateLimitDhcp OBJECT-TYPE + SYNTAX Integer32 (0..1000) + UNITS "pps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Maximum number of received DHCP packets in one second (pps) per interface." + ::= { msanAppRateLimitEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.41.2.1.2 + msanAppRateLimitDhcpState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Administrative state of DHCP traffic rate limiting." + DEFVAL { enable } + ::= { msanAppRateLimitEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.41.2.1.3 + msanAppRateLimitPppoe OBJECT-TYPE + SYNTAX Integer32 (0..1000) + UNITS "pps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Maximum number of received PPPoE packets in one second (pps) per interface." + ::= { msanAppRateLimitEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.41.2.1.4 + msanAppRateLimitPppoeState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Administrative state of PPPoE traffic rate limiting." + ::= { msanAppRateLimitEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.41.2.1.5 + msanAppRateLimitIgmp OBJECT-TYPE + SYNTAX Integer32 (0..1000) + UNITS "pps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Maximum number of received DHCP packets in one second (pps) per interface. + " + ::= { msanAppRateLimitEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.41.2.1.6 + msanAppRateLimitIgmpState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Administrative state of IGMP traffic rate limiting." + ::= { msanAppRateLimitEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.41.2.1.7 + msanAppRateLimitStp OBJECT-TYPE + SYNTAX Integer32 (0..1000) + UNITS "pps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Maximum number of received STP packets in one second (pps) per interface. + " + ::= { msanAppRateLimitEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.41.2.1.8 + msanAppRateLimitStpState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Administrative state of STP traffic rate limiting." + ::= { msanAppRateLimitEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.41.2.1.9 + msanAppRateLimitMn OBJECT-TYPE + SYNTAX Integer32 (0..1000) + UNITS "pps" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Maximum number of received MN packets (management traffic) in one second (pps) per interface. + " + ::= { msanAppRateLimitEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.41.2.1.10 + msanAppRateLimitMnState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Administrative state of MN traffic rate limiting." + ::= { msanAppRateLimitEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.50 + msanMlinec OBJECT IDENTIFIER ::= { msanAdditionalConf 50 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.50.1 + msanMlinecGlobal OBJECT IDENTIFIER ::= { msanMlinec 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.50.1.1 + msanMlinecAdminState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "MLINEC (Multi-Link Network Connectivity) administrative state." + ::= { msanMlinecGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100 + msanMulticast OBJECT IDENTIFIER ::= { msanAdditionalConf 100 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.1 + msanMulticastGlobal OBJECT IDENTIFIER ::= { msanMulticast 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.2 + msanMulticastIntfStaticGroupTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMulticastIntfStaticGroupEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "The table attaches static multicast groups to the interfaces." + ::= { msanMulticast 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.2.1 + msanMulticastIntfStaticGroupEntry OBJECT-TYPE + SYNTAX MsanMulticastIntfStaticGroupEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + INDEX { ifIndex, msanMulticastIntfStaticGroupIPAddr } + ::= { msanMulticastIntfStaticGroupTable 1 } + + + MsanMulticastIntfStaticGroupEntry ::= + SEQUENCE { + msanMulticastIntfStaticGroupIPAddr + IpAddress, + msanMulticastIntfStaticGroupRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.2.1.1 + msanMulticastIntfStaticGroupIPAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "IP multicast address of valid multicast group." + ::= { msanMulticastIntfStaticGroupEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.2.1.2 + msanMulticastIntfStaticGroupRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanMulticastIntfStaticGroupEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.3 + msanMulticastGroupTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMulticastGroupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanMulticast 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.3.1 + msanMulticastGroupEntry OBJECT-TYPE + SYNTAX MsanMulticastGroupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { dot1qVlanIndex, msanMulticastGroupIpAddr } + ::= { msanMulticastGroupTable 1 } + + + MsanMulticastGroupEntry ::= + SEQUENCE { + msanMulticastGroupIpAddr + IpAddress, + msanMulticastGroupName + OCTET STRING, + msanMulticastGroupRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.3.1.1 + msanMulticastGroupIpAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "IP multicast address of valid multicast group." + ::= { msanMulticastGroupEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.3.1.2 + msanMulticastGroupName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Name of multicast group. + " + ::= { msanMulticastGroupEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.3.1.3 + msanMulticastGroupRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + For row creation use createAndWait(5) [createAndGo(4) is not supported]." + ::= { msanMulticastGroupEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.4 + msanMulticastAclListTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMulticastAclListEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "The table below assigns the symbolic names to the specific multicast ACLs." + ::= { msanMulticast 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.4.1 + msanMulticastAclListEntry OBJECT-TYPE + SYNTAX MsanMulticastAclListEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + INDEX { msanMulticastAclListId } + ::= { msanMulticastAclListTable 1 } + + + MsanMulticastAclListEntry ::= + SEQUENCE { + msanMulticastAclListId + INTEGER, + msanMulticastAclListName + SnmpAdminString, + msanMulticastAclListRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.4.1.1 + msanMulticastAclListId OBJECT-TYPE + SYNTAX INTEGER (0..255) + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Multicast List id. Integer from 0 to 255. + " + ::= { msanMulticastAclListEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.4.1.2 + msanMulticastAclListName OBJECT-TYPE + SYNTAX SnmpAdminString + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "ACL list symbolic name. Should be unique." + ::= { msanMulticastAclListEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.4.1.3 + msanMulticastAclListRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5). + For row activation use active(1). + For row deletion use destroy(6). + + Other values are currently not supported." + ::= { msanMulticastAclListEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.5 + msanMulticastAclListGroupTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMulticastAclListGroupEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "The table below links the multicast groups to the ACL." + ::= { msanMulticast 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.5.1 + msanMulticastAclListGroupEntry OBJECT-TYPE + SYNTAX MsanMulticastAclListGroupEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + INDEX { msanMulticastAclListId, msanMulticastAclGroupIpAddr } + ::= { msanMulticastAclListGroupTable 1 } + + + MsanMulticastAclListGroupEntry ::= + SEQUENCE { + msanMulticastAclGroupIpAddr + IpAddress, + msanMulticastAclListGroupRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.5.1.1 + msanMulticastAclGroupIpAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "IP multicast address of valid ACL multicast group." + ::= { msanMulticastAclListGroupEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.5.1.2 + msanMulticastAclListGroupRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanMulticastAclListGroupEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.6 + msanMulticastAclIntfListTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMulticastAclIntfListEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "The table below assigns the multicast ACL to the interfaces" + ::= { msanMulticast 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.6.1 + msanMulticastAclIntfListEntry OBJECT-TYPE + SYNTAX MsanMulticastAclIntfListEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + INDEX { ifIndex, msanMulticastAclListId } + ::= { msanMulticastAclIntfListTable 1 } + + + MsanMulticastAclIntfListEntry ::= + SEQUENCE { + msanMulticastAclIntfListMode + INTEGER, + msanMulticastAclIntfListRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.6.1.1 + msanMulticastAclIntfListMode OBJECT-TYPE + SYNTAX INTEGER + { + accept(1), + deny(2) + } + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Defines the mode in which interface for specified ACL list works. + " + ::= { msanMulticastAclIntfListEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.6.1.2 + msanMulticastAclIntfListRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5). + For row activation use active(1). + For row deletion use destroy(6). + + Other values are currently not supported." + ::= { msanMulticastAclIntfListEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.7 + msanMulticastAclListVlanGroupTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMulticastAclListVlanGroupEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "The table below links the multicast groups to the ACL." + ::= { msanMulticast 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.7.1 + msanMulticastAclListVlanGroupEntry OBJECT-TYPE + SYNTAX MsanMulticastAclListVlanGroupEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + INDEX { msanMulticastAclListId, dot1qVlanIndex, msanMulticastAclListVlanGroupIpAddr } + ::= { msanMulticastAclListVlanGroupTable 1 } + + + MsanMulticastAclListVlanGroupEntry ::= + SEQUENCE { + msanMulticastAclListVlanGroupIpAddr + IpAddress, + msanMulticastAclListVlanGroupRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.7.1.1 + msanMulticastAclListVlanGroupIpAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "IP multicast address of valid ACL multicast group." + ::= { msanMulticastAclListVlanGroupEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.7.1.2 + msanMulticastAclListVlanGroupRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanMulticastAclListVlanGroupEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.8 + msanMulticastIntfVlanStaticGroupTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMulticastIntfVlanStaticGroupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanMulticast 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.8.1 + msanMulticastIntfVlanStaticGroupEntry OBJECT-TYPE + SYNTAX MsanMulticastIntfVlanStaticGroupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, dot1qVlanIndex, msanMulticastIntfVlanStaticGroupIpAddr } + ::= { msanMulticastIntfVlanStaticGroupTable 1 } + + + MsanMulticastIntfVlanStaticGroupEntry ::= + SEQUENCE { + msanMulticastIntfVlanStaticGroupIpAddr + IpAddress, + msanMulticastIntfVlanStaticGroupRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.8.1.1 + msanMulticastIntfVlanStaticGroupIpAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "IP multicast address of valid multicast group." + ::= { msanMulticastIntfVlanStaticGroupEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.8.1.2 + msanMulticastIntfVlanStaticGroupRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanMulticastIntfVlanStaticGroupEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.9 + msanMulticastAccessListTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMulticastAccessListEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The table below assigns the symbolic names to the specific multicast ACLs." + ::= { msanMulticast 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.9.1 + msanMulticastAccessListEntry OBJECT-TYPE + SYNTAX MsanMulticastAccessListEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanMulticastAccessListName } + ::= { msanMulticastAccessListTable 1 } + + + MsanMulticastAccessListEntry ::= + SEQUENCE { + msanMulticastAccessListName + OCTET STRING, + msanMulticastAccessListRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.9.1.1 + msanMulticastAccessListName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..32)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ACL list symbolic name. Should be unique." + ::= { msanMulticastAccessListEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.9.1.2 + msanMulticastAccessListRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndGo(4). + For row activation use active(1). + For row deletion use destroy(6). + + Other values are currently not supported." + ::= { msanMulticastAccessListEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.10 + msanMulticastAccessListGroupTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMulticastAccessListGroupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The table below links the multicast addresses to the ACL list" + ::= { msanMulticast 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.10.1 + msanMulticastAccessListGroupEntry OBJECT-TYPE + SYNTAX MsanMulticastAccessListGroupEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanMulticastAccessListName, dot1qVlanIndex, msanMulticastAccessListGroupIpAddr } + ::= { msanMulticastAccessListGroupTable 1 } + + + MsanMulticastAccessListGroupEntry ::= + SEQUENCE { + msanMulticastAccessListGroupIpAddr + IpAddress, + msanMulticastAccessListGroupRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.10.1.1 + msanMulticastAccessListGroupIpAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "IP multicast address of valid ACL multicast group." + ::= { msanMulticastAccessListGroupEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.10.1.2 + msanMulticastAccessListGroupRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanMulticastAccessListGroupEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.11 + msanMulticastAccessListIntfTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMulticastAccessListIntfEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The table below assigns the multicast ACL list to the interfaces" + ::= { msanMulticast 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.11.1 + msanMulticastAccessListIntfEntry OBJECT-TYPE + SYNTAX MsanMulticastAccessListIntfEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, msanMulticastAccessListName } + ::= { msanMulticastAccessListIntfTable 1 } + + + MsanMulticastAccessListIntfEntry ::= + SEQUENCE { + msanMulticastAccessListIntfMode + INTEGER, + msanMulticastAccessListIntfRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.11.1.1 + msanMulticastAccessListIntfMode OBJECT-TYPE + SYNTAX INTEGER + { + accept(1), + deny(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Defines the mode in which interface for specified ACL list works. + " + ::= { msanMulticastAccessListIntfEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.11.1.2 + msanMulticastAccessListIntfRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5). + For row activation use active(1). + For row deletion use destroy(6). + + Other values are currently not supported." + ::= { msanMulticastAccessListIntfEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.12 + msanSwitchMFDBTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanSwitchMFDBEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The Multicast Forwarding Database table" + ::= { msanMulticast 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.12.1 + msanSwitchMFDBEntry OBJECT-TYPE + SYNTAX MsanSwitchMFDBEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Contains Forwarding and Filtering information per Component User, Vlan Index, and MAC Address." + INDEX { msanSwitchMFDBProtocolType, msanSwitchMFDBVlanId, msanSwitchMFDBMacAddress } + ::= { msanSwitchMFDBTable 1 } + + + MsanSwitchMFDBEntry ::= + SEQUENCE { + msanSwitchMFDBProtocolType + INTEGER, + msanSwitchMFDBVlanId + VlanIndex, + msanSwitchMFDBMacAddress + MacAddress, + msanSwitchMFDBType + INTEGER, + msanSwitchMFDBDescription + DisplayString, + msanSwitchMFDBForwardingPortMask + PortMask, + msanSwitchMFDBFilteringPortMask + PortMask + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.12.1.1 + msanSwitchMFDBProtocolType OBJECT-TYPE + SYNTAX INTEGER + { + static(1), + gmrp(2), + igmp(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The component that is responsible for this entry in the Multicast + Forwarding Database." + ::= { msanSwitchMFDBEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.12.1.2 + msanSwitchMFDBVlanId OBJECT-TYPE + SYNTAX VlanIndex + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Vlan Index for which this entry is associated with." + ::= { msanSwitchMFDBEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.12.1.3 + msanSwitchMFDBMacAddress OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A multicast MAC address for which the switch has forwarding and or + filtering information." + ::= { msanSwitchMFDBEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.12.1.4 + msanSwitchMFDBType OBJECT-TYPE + SYNTAX INTEGER + { + static(1), + dynamic(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This displays the type of the entry. + + static(1) - Entries configured by the end user + dynamic(2) - Entries added as a result of a learning process or protocol" + ::= { msanSwitchMFDBEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.12.1.5 + msanSwitchMFDBDescription OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Text description of this multicast table entry." + ::= { msanSwitchMFDBEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.12.1.6 + msanSwitchMFDBForwardingPortMask OBJECT-TYPE + SYNTAX PortMask + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "BitMask indicating which ports this entry indicates should be forwarded. + + To obtain port numbers from interface numbers, use the objects + agentPortDot1dBasePort and agentPortIfIndex in the agentPortConfigTable + table." + ::= { msanSwitchMFDBEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.12.1.7 + msanSwitchMFDBFilteringPortMask OBJECT-TYPE + SYNTAX PortMask + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "BitMask indicating which ports this entry indicates should be filtered. + + To obtain port numbers from interface numbers, use the objects + agentPortDot1dBasePort and agentPortIfIndex in the agentPortConfigTable + table." + ::= { msanSwitchMFDBEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.13 + msanMulticastStaticClientTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanMulticastStaticClientEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanMulticast 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.13.1 + msanMulticastStaticClientEntry OBJECT-TYPE + SYNTAX MsanMulticastStaticClientEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { dot1qVlanIndex, msanMulticastStaticClientIpAddr } + ::= { msanMulticastStaticClientTable 1 } + + + MsanMulticastStaticClientEntry ::= + SEQUENCE { + msanMulticastStaticClientIpAddr + IpAddress, + msanMulticastStaticClientRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.13.1.1 + msanMulticastStaticClientIpAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Multicast static client IP address on specified vlan_id." + ::= { msanMulticastStaticClientEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.100.13.1.2 + msanMulticastStaticClientRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanMulticastStaticClientEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101 + msanFiltering OBJECT IDENTIFIER ::= { msanAdditionalConf 101 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.2 + msanFilteringGlobal OBJECT IDENTIFIER ::= { msanFiltering 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.3 + msanFilteringFilterTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanFilteringFilterEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Defines a list of filters." + ::= { msanFiltering 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.3.1 + msanFilteringFilterEntry OBJECT-TYPE + SYNTAX MsanFilteringFilterEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + INDEX { msanFilteringFilterId } + ::= { msanFilteringFilterTable 1 } + + + MsanFilteringFilterEntry ::= + SEQUENCE { + msanFilteringFilterId + Integer32, + msanFilteringFilterName + OCTET STRING, + msanFilteringFilterType + INTEGER, + msanFilteringFilterRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.3.1.1 + msanFilteringFilterId OBJECT-TYPE + SYNTAX Integer32 (1..64 | 301..500) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Filter identity." + ::= { msanFilteringFilterEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.3.1.2 + msanFilteringFilterName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Name of filter to be shown." + ::= { msanFilteringFilterEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.3.1.3 + msanFilteringFilterType OBJECT-TYPE + SYNTAX INTEGER + { + static(1), + dynamic(2) + } + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "Type of filter (static or dynamic)." + ::= { msanFilteringFilterEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.3.1.4 + msanFilteringFilterRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "SNMP row status. + + Supported values: + active(1) - valid entry; + createAndGo(4) - used to create a new entry; + destroy(6) - removes the entry." + DEFVAL { active } + ::= { msanFilteringFilterEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.4 + msanFilteringAssignFilterTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanFilteringAssignFilterEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "This table defines a list of filters assigned to interface." + ::= { msanFiltering 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.4.1 + msanFilteringAssignFilterEntry OBJECT-TYPE + SYNTAX MsanFilteringAssignFilterEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + INDEX { ifIndex, msanFilteringFilterId } + ::= { msanFilteringAssignFilterTable 1 } + + + MsanFilteringAssignFilterEntry ::= + SEQUENCE { + msanFilteringAssignFilterVid + Integer32, + msanFilteringAssignFilterCos + Integer32, + msanFilteringAssignFilterDscp + Integer32, + msanFilteringAssignFilterPrec + Integer32, + msanFilteringAssignFilterRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.4.1.1 + msanFilteringAssignFilterVid OBJECT-TYPE + SYNTAX Integer32 (0..4094) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "ID of VLAN to be filtered." + ::= { msanFilteringAssignFilterEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.4.1.2 + msanFilteringAssignFilterCos OBJECT-TYPE + SYNTAX Integer32 (0..7) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "CoS value to be filtered." + ::= { msanFilteringAssignFilterEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.4.1.3 + msanFilteringAssignFilterDscp OBJECT-TYPE + SYNTAX Integer32 (0..63) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "DSCP field." + ::= { msanFilteringAssignFilterEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.4.1.4 + msanFilteringAssignFilterPrec OBJECT-TYPE + SYNTAX Integer32 (0..7) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Precedence in DSCP tag." + ::= { msanFilteringAssignFilterEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.4.1.5 + msanFilteringAssignFilterRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "SNMP row status. + + Supported values: + active(1) - valid entry; + createAndGo(4) - used to create a new entry; + destroy(6) - removes the entry." + DEFVAL { active } + ::= { msanFilteringAssignFilterEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5 + msanFilteringRuleTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanFilteringRuleEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "This table defines a list of filtering rules associated to filters." + ::= { msanFiltering 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1 + msanFilteringRuleEntry OBJECT-TYPE + SYNTAX MsanFilteringRuleEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + INDEX { msanFilteringRuleId, msanFilteringFilterId } + ::= { msanFilteringRuleTable 1 } + + + MsanFilteringRuleEntry ::= + SEQUENCE { + msanFilteringRuleId + Integer32, + msanFilteringRuleResponse + INTEGER, + msanFilteringRuleFromMac + MacAddress, + msanFilteringRuleFromMacMask + MacAddress, + msanFilteringRuleFromIp + IpAddress, + msanFilteringRuleFromMask + IpAddress, + msanFilteringRuleFromPortLow + Unsigned32, + msanFilteringRuleFromPortHigh + Unsigned32, + msanFilteringRuleToMac + MacAddress, + msanFilteringRuleToMacMask + MacAddress, + msanFilteringRuleToIp + IpAddress, + msanFilteringRuleToMask + IpAddress, + msanFilteringRuleToPortLow + Unsigned32, + msanFilteringRuleToPortHigh + Unsigned32, + msanFilteringRuleEtherProto + OCTET STRING, + msanFilteringRuleIpProto + OCTET STRING, + msanFilteringRuleIcmType + Unsigned32, + msanFilteringRulePrec + Unsigned32, + msanFilteringRuleTos + Unsigned32, + msanFilteringRuleVid + Unsigned32, + msanFilteringRuleCos + Unsigned32, + msanFilteringRuleTag + INTEGER, + msanFilteringRuleRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.1 + msanFilteringRuleId OBJECT-TYPE + SYNTAX Integer32 (1..65535) + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "Filtering rule identity." + ::= { msanFilteringRuleEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.2 + msanFilteringRuleResponse OBJECT-TYPE + SYNTAX INTEGER + { + accept(1), + deny(2) + } + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Filter response." + ::= { msanFilteringRuleEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.3 + msanFilteringRuleFromMac OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Source Ethernet address." + ::= { msanFilteringRuleEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.4 + msanFilteringRuleFromMacMask OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Source Ethernet address mask." + ::= { msanFilteringRuleEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.5 + msanFilteringRuleFromIp OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Source IP address." + ::= { msanFilteringRuleEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.6 + msanFilteringRuleFromMask OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Source IP address mask." + ::= { msanFilteringRuleEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.7 + msanFilteringRuleFromPortLow OBJECT-TYPE + SYNTAX Unsigned32 (0..65535) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "The lowest number of a source TCP or UDP port." + ::= { msanFilteringRuleEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.8 + msanFilteringRuleFromPortHigh OBJECT-TYPE + SYNTAX Unsigned32 (0..65535) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "The highest number of a source TCP or UDP port.." + ::= { msanFilteringRuleEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.9 + msanFilteringRuleToMac OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Destination Ethernet address." + ::= { msanFilteringRuleEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.10 + msanFilteringRuleToMacMask OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Destination Ethernet address mask." + ::= { msanFilteringRuleEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.11 + msanFilteringRuleToIp OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Destination IP address." + ::= { msanFilteringRuleEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.12 + msanFilteringRuleToMask OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Destination IP address mask." + ::= { msanFilteringRuleEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.13 + msanFilteringRuleToPortLow OBJECT-TYPE + SYNTAX Unsigned32 (0..65535) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "The lowest number of a destination TCP or UDP port." + ::= { msanFilteringRuleEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.14 + msanFilteringRuleToPortHigh OBJECT-TYPE + SYNTAX Unsigned32 (0..65535) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "The highest number of a destination TCP or UDP port." + ::= { msanFilteringRuleEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.15 + msanFilteringRuleEtherProto OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Ethernet protocol to be filtered." + ::= { msanFilteringRuleEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.16 + msanFilteringRuleIpProto OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "IP protocol to be filtered." + ::= { msanFilteringRuleEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.17 + msanFilteringRuleIcmType OBJECT-TYPE + SYNTAX Unsigned32 (0..255) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "ICMP type. ICMP sends an error message to the transmitter of IP packets and provides + information at IP packet processing." + ::= { msanFilteringRuleEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.18 + msanFilteringRulePrec OBJECT-TYPE + SYNTAX Unsigned32 (0..7) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Precedence in DSCP tag." + ::= { msanFilteringRuleEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.19 + msanFilteringRuleTos OBJECT-TYPE + SYNTAX Unsigned32 (0..15) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "TOS to be filtered." + ::= { msanFilteringRuleEntry 19 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.20 + msanFilteringRuleVid OBJECT-TYPE + SYNTAX Unsigned32 (0..4094) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "ID of VLAN to be filtered." + ::= { msanFilteringRuleEntry 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.21 + msanFilteringRuleCos OBJECT-TYPE + SYNTAX Unsigned32 (0..7) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "CoS value to be filtered." + ::= { msanFilteringRuleEntry 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.22 + msanFilteringRuleTag OBJECT-TYPE + SYNTAX INTEGER + { + untagged(1), + tagged(2), + qinq-tagged(3) + } + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "802.1Q tag." + ::= { msanFilteringRuleEntry 22 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.5.1.23 + msanFilteringRuleRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "SNMP row status. + + Supported values: + active(1) - valid entry; + createAndGo(4) - used to create a new entry; + destroy(6) - removes the entry." + DEFVAL { active } + ::= { msanFilteringRuleEntry 23 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.6 + msanFilteringAttachedFilterTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanFilteringAttachedFilterEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "This table defines information about filters attached to interface." + ::= { msanFiltering 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.6.1 + msanFilteringAttachedFilterEntry OBJECT-TYPE + SYNTAX MsanFilteringAttachedFilterEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + INDEX { ifIndex, msanFilteringFilterId } + ::= { msanFilteringAttachedFilterTable 1 } + + + MsanFilteringAttachedFilterEntry ::= + SEQUENCE { + msanFilteringAttachedFilterDirect + INTEGER, + msanFilteringAttachedFilterRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.6.1.1 + msanFilteringAttachedFilterDirect OBJECT-TYPE + SYNTAX INTEGER + { + in(1), + out(2) + } + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Point of attaching a filter." + ::= { msanFilteringAttachedFilterEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.101.6.1.2 + msanFilteringAttachedFilterRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "SNMP row status. + + Supported values: + active(1) - valid entry; + createAndGo(4) - used to create a new entry; + destroy(6) - removes the entry." + ::= { msanFilteringAttachedFilterEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.102 + msanBridge OBJECT IDENTIFIER ::= { msanAdditionalConf 102 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.102.1 + msanBridgeGlobal OBJECT IDENTIFIER ::= { msanBridge 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.102.1.1 + msanBridgeMode OBJECT-TYPE + SYNTAX INTEGER + { + bridge(1), + ccx(2) + } + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "A bridge operating mode. + bridge(1) + ccx(2) + " + ::= { msanBridgeGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.102.1.2 + msanBridgeMacTableSize OBJECT-TYPE + SYNTAX INTEGER (64..4095) + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "The maximum MAC table size" + ::= { msanBridgeGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.102.1.3 + msanBridgeRedAdminMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Enable or disable Random Early Discard functionality." + ::= { msanBridgeGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.102.2 + msanBridgeCCXTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanBridgeCCXEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "The table contents the information about all CCX pairs." + ::= { msanBridge 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.102.2.1 + msanBridgeCCXEntry OBJECT-TYPE + SYNTAX MsanBridgeCCXEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + INDEX { msanBridgeCCXInterface1, msanBridgeCCXInterface2 } + ::= { msanBridgeCCXTable 1 } + + + MsanBridgeCCXEntry ::= + SEQUENCE { + msanBridgeCCXInterface1 + InterfaceIndex, + msanBridgeCCXInterface2 + InterfaceIndex, + msanBridgeCCXRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.102.2.1.1 + msanBridgeCCXInterface1 OBJECT-TYPE + SYNTAX InterfaceIndex + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "The first interface to make cross-connection exchange" + ::= { msanBridgeCCXEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.102.2.1.2 + msanBridgeCCXInterface2 OBJECT-TYPE + SYNTAX InterfaceIndex + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "The second interface to make cross-connection exchange" + ::= { msanBridgeCCXEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.102.2.1.3 + msanBridgeCCXRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanBridgeCCXEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103 + msanIPSG OBJECT IDENTIFIER ::= { msanAdditionalConf 103 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.1 + msanIPSGGlobal OBJECT IDENTIFIER ::= { msanIPSG 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.1.1 + msanIPSGAdminMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Enable/disable IPv4 source guard for all interfaces" + ::= { msanIPSGGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.1.2 + msanIPSGStoreAdminMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Enable/disable storing of the IP-MAC binds to the interoperation table." + ::= { msanIPSGGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.1.3 + msanIPSGIpv6AdminMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Enable/disable IPv6 source guard for all interfaces" + ::= { msanIPSGGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.1.4 + msanIPSGClearDynamicBinds OBJECT-TYPE + SYNTAX INTEGER + { + disable(1), + clear-all(2), + clear-dhcpv4(3), + clear-dhcpv6(4), + clear-nd(5) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Clear IPSG snooping tables for all ports." + ::= { msanIPSGGlobal 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.2 + msanIPSGIntfTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanIPSGIntfEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanIPSG 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.2.1 + msanIPSGIntfEntry OBJECT-TYPE + SYNTAX MsanIPSGIntfEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanIPSGIntfTable 1 } + + + MsanIPSGIntfEntry ::= + SEQUENCE { + msanIPSGIntfAdminMode + INTEGER, + msanIPSGIntfBindsLimit + Integer32, + msanIPSGIntfFilteringMode + INTEGER, + msanIPSGIntfIpv6AdminMode + INTEGER, + msanIPSGIntfBindsLimitDhcpv6 + Integer32, + msanIPSGIntfBindsLimitND + Integer32, + msanIPSGIntfClearDynamicBinds + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.2.1.1 + msanIPSGIntfAdminMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Enable/disable IP Source Guard for the selected interface." + DEFVAL { disable } + ::= { msanIPSGIntfEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.2.1.2 + msanIPSGIntfBindsLimit OBJECT-TYPE + SYNTAX Integer32 (0..15) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IPSG binding limit for DHCPv4 snooping table per interface. + Value 0 defines there is no limit." + DEFVAL { 4 } + ::= { msanIPSGIntfEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.2.1.3 + msanIPSGIntfFilteringMode OBJECT-TYPE + SYNTAX INTEGER + { + iponly(1), + ipmac(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Sets the traffic filtering type. Traffic can be filtered either by IP or by both IP and MAC address." + DEFVAL { iponly } + ::= { msanIPSGIntfEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.2.1.4 + msanIPSGIntfIpv6AdminMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Enable/disable IPv6 Source Guard for the selected interface." + DEFVAL { disable } + ::= { msanIPSGIntfEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.2.1.5 + msanIPSGIntfBindsLimitDhcpv6 OBJECT-TYPE + SYNTAX Integer32 (0..15) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IPSG binding limit for DHCPv6 (IPv6 DHCP)snooping table per interface. + Value 0 defines there is no limit." + DEFVAL { 4 } + ::= { msanIPSGIntfEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.2.1.6 + msanIPSGIntfBindsLimitND OBJECT-TYPE + SYNTAX Integer32 (0..15) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "IPSG binding limit for ND (IPv6 Neighbor Discovery) snooping table per interface + Value 0 defines there is no limit." + DEFVAL { 4 } + ::= { msanIPSGIntfEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.2.1.7 + msanIPSGIntfClearDynamicBinds OBJECT-TYPE + SYNTAX INTEGER + { + disable(1), + clear-all(2), + clear-dhcpv4(3), + clear-dhcpv6(4), + clear-nd(5) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Clear IPSG snooping tables per interface" + ::= { msanIPSGIntfEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.3 + msanIPSGBindingsTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanIPSGBindingsEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "DThe table for storing IP source binding" + ::= { msanIPSG 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.3.1 + msanIPSGBindingsEntry OBJECT-TYPE + SYNTAX MsanIPSGBindingsEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + INDEX { ifIndex, msanIPSGBindVlan, msanIPSGBindMac } + ::= { msanIPSGBindingsTable 1 } + + + MsanIPSGBindingsEntry ::= + SEQUENCE { + msanIPSGBindIp + IpAddress, + msanIPSGBindVlan + VlanIndex, + msanIPSGBindMac + MacAddress, + msanIPSGBindLeaseRemainingTime + TimeTicks, + msanIPSGBindType + INTEGER, + msanIPSGBindMatchedFrames + Counter32, + msanIPSGBindRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.3.1.1 + msanIPSGBindIp OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Allowed IP address" + ::= { msanIPSGBindingsEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.3.1.2 + msanIPSGBindVlan OBJECT-TYPE + SYNTAX VlanIndex + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "Allowed VLAN number" + ::= { msanIPSGBindingsEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.3.1.3 + msanIPSGBindMac OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "Allowed MAC address" + ::= { msanIPSGBindingsEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.3.1.4 + msanIPSGBindLeaseRemainingTime OBJECT-TYPE + SYNTAX TimeTicks + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "The period for which the DHCP lease is valid. + It is displayed in days, hours, minutes, and seconds. + + For static IPSG bindings this value is set to 0 (infinitive)." + ::= { msanIPSGBindingsEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.3.1.5 + msanIPSGBindType OBJECT-TYPE + SYNTAX INTEGER + { + static(1), + dynamic(2) + } + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "Type of IPSG binding." + ::= { msanIPSGBindingsEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.3.1.6 + msanIPSGBindMatchedFrames OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "Number of matched frames for selected IPSG binding." + ::= { msanIPSGBindingsEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.3.1.7 + msanIPSGBindRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5). + For row activation use active(1). + For row deletion use destroy(6). + + Other values are currently not supported. + + For row activation next terms must be accomplished: + - msanIPSGBindIp must be defined " + ::= { msanIPSGBindingsEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.4 + msanIPSGIpv4PortStaticBindTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanIPSGIpv4PortStaticBindEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanIPSG 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.4.1 + msanIPSGIpv4PortStaticBindEntry OBJECT-TYPE + SYNTAX MsanIPSGIpv4PortStaticBindEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, msanIPSGIpv4PortStaticBindMacAddress, msanIPSGIpv4PortStaticBindVlanId, msanIPSGIpv4PortStaticBindIpAddress } + ::= { msanIPSGIpv4PortStaticBindTable 1 } + + + MsanIPSGIpv4PortStaticBindEntry ::= + SEQUENCE { + msanIPSGIpv4PortStaticBindMacAddress + MacAddress, + msanIPSGIpv4PortStaticBindVlanId + VlanIndex, + msanIPSGIpv4PortStaticBindIpAddress + InetAddressIPv4, + msanIPSGIpv4PortStaticBindMatchedFrames + Counter32, + msanIPSGIpv4PortStaticBindRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.4.1.1 + msanIPSGIpv4PortStaticBindMacAddress OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Allowed MAC address" + ::= { msanIPSGIpv4PortStaticBindEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.4.1.2 + msanIPSGIpv4PortStaticBindVlanId OBJECT-TYPE + SYNTAX VlanIndex + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Allowed VLAN number" + ::= { msanIPSGIpv4PortStaticBindEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.4.1.3 + msanIPSGIpv4PortStaticBindIpAddress OBJECT-TYPE + SYNTAX InetAddressIPv4 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Allowed IPv4 address" + ::= { msanIPSGIpv4PortStaticBindEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.4.1.4 + msanIPSGIpv4PortStaticBindMatchedFrames OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of matched frames for selected IPSG binding." + ::= { msanIPSGIpv4PortStaticBindEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.4.1.5 + msanIPSGIpv4PortStaticBindRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndGo(4). + For row activation use active(1). + For row deletion use destroy(6). + + Other values are currently not supported." + ::= { msanIPSGIpv4PortStaticBindEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.5 + msanIPSGIpv6PortStaticBindTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanIPSGIpv6PortStaticBindEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanIPSG 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.5.1 + msanIPSGIpv6PortStaticBindEntry OBJECT-TYPE + SYNTAX MsanIPSGIpv6PortStaticBindEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, msanIPSGIpv6PortStaticBindMacAddress, msanIPSGIpv6PortStaticBindVlanId, msanIPSGIpv6PortStaticBindIpAddress } + ::= { msanIPSGIpv6PortStaticBindTable 1 } + + + MsanIPSGIpv6PortStaticBindEntry ::= + SEQUENCE { + msanIPSGIpv6PortStaticBindMacAddress + MacAddress, + msanIPSGIpv6PortStaticBindVlanId + VlanIndex, + msanIPSGIpv6PortStaticBindIpAddress + InetAddressIPv6, + msanIPSGIpv6PortStaticBindMatchedFrames + Counter32, + msanIPSGIpv6PortStaticBindRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.5.1.1 + msanIPSGIpv6PortStaticBindMacAddress OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Allowed MAC address" + ::= { msanIPSGIpv6PortStaticBindEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.5.1.2 + msanIPSGIpv6PortStaticBindVlanId OBJECT-TYPE + SYNTAX VlanIndex + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Allowed VLAN number" + ::= { msanIPSGIpv6PortStaticBindEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.5.1.3 + msanIPSGIpv6PortStaticBindIpAddress OBJECT-TYPE + SYNTAX InetAddressIPv6 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Allowed IPv6 address" + ::= { msanIPSGIpv6PortStaticBindEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.5.1.4 + msanIPSGIpv6PortStaticBindMatchedFrames OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of matched frames for selected IPSG binding." + ::= { msanIPSGIpv6PortStaticBindEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.5.1.5 + msanIPSGIpv6PortStaticBindRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndGo(4). + For row activation use active(1). + For row deletion use destroy(6). + + Other values are currently not supported." + ::= { msanIPSGIpv6PortStaticBindEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.6 + msanIPSGPortBindCurrentTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanIPSGPortBindCurrentEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "DThe table for storing IP source binding" + ::= { msanIPSG 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.6.1 + msanIPSGPortBindCurrentEntry OBJECT-TYPE + SYNTAX MsanIPSGPortBindCurrentEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanIPSGPortBindCurrentId } + ::= { msanIPSGPortBindCurrentTable 1 } + + + MsanIPSGPortBindCurrentEntry ::= + SEQUENCE { + msanIPSGPortBindCurrentId + Integer32, + msanIPSGPortBindCurrentIfIndex + InterfaceIndex, + msanIPSGPortBindCurrentMacAddress + MacAddress, + msanIPSGPortBindCurrentVlanId + VlanIndex, + msanIPSGPortBindCurrentIpAddressType + InetAddressType, + msanIPSGPortBindCurrentIpAddress + InetAddress, + msanIPSGPortBindCurrentLeaseRemainingTime + TimeTicks, + msanIPSGPortBindCurrentType + INTEGER, + msanIPSGPortBindCurrentMatchedFrames + Counter32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.6.1.1 + msanIPSGPortBindCurrentId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Table index." + ::= { msanIPSGPortBindCurrentEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.6.1.2 + msanIPSGPortBindCurrentIfIndex OBJECT-TYPE + SYNTAX InterfaceIndex + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Port index (ifIndex value)." + ::= { msanIPSGPortBindCurrentEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.6.1.3 + msanIPSGPortBindCurrentMacAddress OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Allowed MAC address" + ::= { msanIPSGPortBindCurrentEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.6.1.4 + msanIPSGPortBindCurrentVlanId OBJECT-TYPE + SYNTAX VlanIndex + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Allowed VLAN number" + ::= { msanIPSGPortBindCurrentEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.6.1.5 + msanIPSGPortBindCurrentIpAddressType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Specifies the type of ip address: ipv4[1], ipv6[2]." + ::= { msanIPSGPortBindCurrentEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.6.1.6 + msanIPSGPortBindCurrentIpAddress OBJECT-TYPE + SYNTAX InetAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Allowed IP address" + ::= { msanIPSGPortBindCurrentEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.6.1.7 + msanIPSGPortBindCurrentLeaseRemainingTime OBJECT-TYPE + SYNTAX TimeTicks + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The period for which the DHCP lease is valid. + It is displayed in days, hours, minutes, and seconds. + + For static IPSG bindings this value is set to 0 (infinitive)." + ::= { msanIPSGPortBindCurrentEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.6.1.8 + msanIPSGPortBindCurrentType OBJECT-TYPE + SYNTAX INTEGER + { + static(1), + dynamic-dhcpv4(2), + dynamic-dhcpv6(3), + dynamic-nd(4) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of IPSG binding." + ::= { msanIPSGPortBindCurrentEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.103.6.1.9 + msanIPSGPortBindCurrentMatchedFrames OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of matched frames for selected IPSG binding." + ::= { msanIPSGPortBindCurrentEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105 + msanVlan OBJECT IDENTIFIER ::= { msanAdditionalConf 105 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.1 + msanVlanGlobal OBJECT IDENTIFIER ::= { msanVlan 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.1.1 + msanDVlanTagMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Controls the Double Vlan Tag mode on the system." + ::= { msanVlanGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.1.2 + msanVlanRemarkAdminState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Global VLAN Remarking administrative state." + DEFVAL { disable } + ::= { msanVlanGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.1.3 + msanInternalVlanId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Internal Vlan ID." + ::= { msanVlanGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.2 + msanPortVlanTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanPortVlanEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Vlan config parameters per port." + ::= { msanVlan 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.2.1 + msanPortVlanEntry OBJECT-TYPE + SYNTAX MsanPortVlanEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanPortVlanTable 1 } + + + MsanPortVlanEntry ::= + SEQUENCE { + msanPortVlanMode + INTEGER, + msanPortVlanStackPriority + INTEGER, + msanPortVlanStackVlanId + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.2.1.1 + msanPortVlanMode OBJECT-TYPE + SYNTAX INTEGER + { + access(0), + trunk(1), + dot1qtunnel(2), + vlanStacking(3) + } + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Interface vlan mode." + ::= { msanPortVlanEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.2.1.2 + msanPortVlanStackPriority OBJECT-TYPE + SYNTAX INTEGER + { + mapPriorityFromOuterTag(0), + priority1(1), + priority2(2), + priority3(3), + priority4(4), + priority5(5), + priority6(6), + priority7(7) + } + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Priority of inner tag when interface is in vlanStacking mode (msanPortVlanMode=vlanStacking)." + ::= { msanPortVlanEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.2.1.3 + msanPortVlanStackVlanId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Vlan ID of inner tag when interface is in vlanStacking mode (msanPortVlanMode=vlanStacking). + " + ::= { msanPortVlanEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.3 + msanPortDVlanMapTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanPortDVlanMapEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Ingress mapping of inner VID to outer VID different from default + (PVID) mapping. + " + ::= { msanVlan 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.3.1 + msanPortDVlanMapEntry OBJECT-TYPE + SYNTAX MsanPortDVlanMapEntry + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Description." + INDEX { ifIndex, msanPortDVlanMapInTagVlanId } + ::= { msanPortDVlanMapTable 1 } + + + MsanPortDVlanMapEntry ::= + SEQUENCE { + msanPortDVlanMapInTagVlanId + Integer32, + msanPortDVlanMapOutTagVlanId + Integer32, + msanPortDVlanMapRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.3.1.1 + msanPortDVlanMapInTagVlanId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS deprecated + DESCRIPTION + "Inner tag VLAN ID. DVlan functionality is used when interface is in dot1qtunnel mode." + ::= { msanPortDVlanMapEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.3.1.2 + msanPortDVlanMapOutTagVlanId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "Outer tag VLAN ID added for inner tag VLAN ID (msanPortDVlanMapInTagVlanId). + DVlan functionality is used when interface is in dot1qtunnel mode. + + Value of -1 indicates that outer tag is not added for selected inner tag VLAN ID." + ::= { msanPortDVlanMapEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.3.1.3 + msanPortDVlanMapRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS deprecated + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + For row creation use createAndWait(5) [createAndGo(4) is not supported]. + Setting this object to active(1) will activate this entry. + Setting this object to destroy(6) will remove this entry. + + " + ::= { msanPortDVlanMapEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.4 + msanPortVlanRemarkTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanPortVlanRemarkEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Vlan remarking table for ingress traffic (per port). + + Note: All defined Vlan remarking rules for ingress traffic also add , automatically, + reverse Vlan remarking rule for egress traffic on same port." + ::= { msanVlan 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.4.1 + msanPortVlanRemarkEntry OBJECT-TYPE + SYNTAX MsanPortVlanRemarkEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, msanPortVlanRemarkSrcVlanId } + ::= { msanPortVlanRemarkTable 1 } + + + MsanPortVlanRemarkEntry ::= + SEQUENCE { + msanPortVlanRemarkSrcVlanId + Integer32, + msanPortVlanRemarkDstVlanId + Integer32, + msanPortVlanRemarkRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.4.1.1 + msanPortVlanRemarkSrcVlanId OBJECT-TYPE + SYNTAX Integer32 (1..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Ingress traffic Source VLAN ID which will be changed to Destination VLAN ID + (msanPortVlanRemarkDstVlanId) by VLAN remarking rule." + ::= { msanPortVlanRemarkEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.4.1.2 + msanPortVlanRemarkDstVlanId OBJECT-TYPE + SYNTAX Integer32 (1..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Destination VLAN ID to which will be changed Source VLAN ID of ingress traffic (msanPortVlanRemarkSrcVlanId) + by VLAN remarking rule." + ::= { msanPortVlanRemarkEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.4.1.3 + msanPortVlanRemarkRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5). + For row activation use active(1). + For row deletion use destroy(6). + + Other values are currently not supported. + + For row activation next terms must be accomplished: + - msanPortVlanRemarkDstVlanId must be defined (default value not defined) + + Note: All defined Vlan remarking rules for ingress traffic also add , automatically, + reverse Vlan remarking rule for egress traffic on same port. + " + ::= { msanPortVlanRemarkEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.5 + msanPortDVlanTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanPortDVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanVlan 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.5.1 + msanPortDVlanEntry OBJECT-TYPE + SYNTAX MsanPortDVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanPortDVlanTable 1 } + + + MsanPortDVlanEntry ::= + SEQUENCE { + msanPortDVlanTagMode + INTEGER, + msanPortDVlanStackVlanId + Integer32, + msanPortDVlanStackPriority + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.5.1.1 + msanPortDVlanTagMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Administrative state of 802.1Q tunneling (DVLAN) mode." + DEFVAL { disable } + ::= { msanPortDVlanEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.5.1.2 + msanPortDVlanStackVlanId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Vlan ID of inner tag when interface is in vlanStacking mode. + + Interface is in vlanStacking mode when msanPortDVlanTagMode=enable and + msanPortDVlanStackVlanId>=0. + + msanPortDVlanStackVlanId value of -1 indicates that vlanStacking mode is not activated." + ::= { msanPortDVlanEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.5.1.3 + msanPortDVlanStackPriority OBJECT-TYPE + SYNTAX INTEGER + { + priority0(0), + priority1(1), + priority2(2), + priority3(3), + priority4(4), + priority5(5), + priority6(6), + priority7(7) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Priority of inner tag when interface is in vlanStacking mode. + + Interface is in vlanStacking mode when msanPortDVlanTagMode=enable and + msanPortDVlanStackVlanId>=0." + DEFVAL { priority0 } + ::= { msanPortDVlanEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.6 + msanPortDVlanConfigTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanPortDVlanConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Ingress mapping of inner VID to outer VID different from default + (PVID) mapping. + " + ::= { msanVlan 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.6.1 + msanPortDVlanConfigEntry OBJECT-TYPE + SYNTAX MsanPortDVlanConfigEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, msanDVlanConfigInTagVlanId, msanDVlanConfigInTagPriority } + ::= { msanPortDVlanConfigTable 1 } + + + MsanPortDVlanConfigEntry ::= + SEQUENCE { + msanDVlanConfigInTagVlanId + Integer32, + msanDVlanConfigInTagPriority + INTEGER, + msanDVlanConfigOutTagVlanId + Integer32, + msanDVlanConfigOutTagPriority + INTEGER, + msanDVlanConfigRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.6.1.1 + msanDVlanConfigInTagVlanId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Inner tag VLAN ID. DVlan functionality is used when interface is in dot1qtunnel mode." + ::= { msanPortDVlanConfigEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.6.1.2 + msanDVlanConfigInTagPriority OBJECT-TYPE + SYNTAX INTEGER + { + priority0(0), + priority1(1), + priority2(2), + priority3(3), + priority4(4), + priority5(5), + priority6(6), + priority7(7), + unspecified(8) + } + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Priority of inner tag. + Value unspecified(8) defines that rule line applies to all packets with + appropriate msanDVlanConfigInTagVlanId, except if packet match to other more specific rule." + ::= { msanPortDVlanConfigEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.6.1.3 + msanDVlanConfigOutTagVlanId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Outer tag VLAN ID added for inner tag VLAN ID (msanPortDVlanConfigInTagVlanId). + DVlan functionality is used when interface is in dot1qtunnel mode. + + Value of -1 indicates that outer tag is not added for selected inner tag VLAN ID." + ::= { msanPortDVlanConfigEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.6.1.4 + msanDVlanConfigOutTagPriority OBJECT-TYPE + SYNTAX INTEGER + { + priority0(0), + priority1(1), + priority2(2), + priority3(3), + priority4(4), + priority5(5), + priority6(6), + priority7(7), + unspecified(8) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Priority of outer tag. + Value unspecified(8) defines that msanDVlanMapInTagPriority is copied to outer tag." + DEFVAL { priority0 } + ::= { msanPortDVlanConfigEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.6.1.5 + msanDVlanConfigRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + For row creation use createAndWait(5) [createAndGo(4) is not supported]. + Setting this object to active(1) will activate this entry. + Setting this object to destroy(6) will remove this entry. + + " + ::= { msanPortDVlanConfigEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.7 + msanPortVlanRemarkAdminTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanPortVlanRemarkAdminEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanVlan 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.7.1 + msanPortVlanRemarkAdminEntry OBJECT-TYPE + SYNTAX MsanPortVlanRemarkAdminEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanPortVlanRemarkAdminTable 1 } + + + MsanPortVlanRemarkAdminEntry ::= + SEQUENCE { + msanPortVlanRemarkAdminMode + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.7.1.1 + msanPortVlanRemarkAdminMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Administrative mode for VLAN Remarking" + ::= { msanPortVlanRemarkAdminEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.8 + msanUplinkPortVlanTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanUplinkPortVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanVlan 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.8.1 + msanUplinkPortVlanEntry OBJECT-TYPE + SYNTAX MsanUplinkPortVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, msanUplinkPortVlanId } + ::= { msanUplinkPortVlanTable 1 } + + + MsanUplinkPortVlanEntry ::= + SEQUENCE { + msanUplinkPortVlanId + Integer32, + msanUplinkPortVlanMode + INTEGER, + msanUplinkPortVlanMulticastMode + INTEGER, + msanUplinkPortVlanRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.8.1.1 + msanUplinkPortVlanId OBJECT-TYPE + SYNTAX Integer32 (0..4094) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Vlan ID." + ::= { msanUplinkPortVlanEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.8.1.2 + msanUplinkPortVlanMode OBJECT-TYPE + SYNTAX INTEGER + { + tagged(1), + native(2), + unconfigured(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Vlan Mode." + ::= { msanUplinkPortVlanEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.8.1.3 + msanUplinkPortVlanMulticastMode OBJECT-TYPE + SYNTAX INTEGER + { + discarding(1), + flooding(2), + snooping(3), + snoopingAndFloodUnknown(4), + undefined(5) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Vlan Multicast Mode. + This parameter can't be set if msanUplinkPortVlanMulticastMode=unconfigured(3)" + DEFVAL { undefined } + ::= { msanUplinkPortVlanEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.8.1.4 + msanUplinkPortVlanRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + For row creation use createAndWait(5) [createAndGo(4) is not supported]. + + Setting object to active(1) will activate this entry -> + INFO: parameter msanUplinkPortVlanMode must be defined. + + Setting object to destroy(6) will remove this entry. + + " + ::= { msanUplinkPortVlanEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.9 + msanVlanPortStatisticsTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanVlanPortStatisticsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanVlan 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.9.1 + msanVlanPortStatisticsEntry OBJECT-TYPE + SYNTAX MsanVlanPortStatisticsEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, msanVlanPortStatisticsVlanId } + ::= { msanVlanPortStatisticsTable 1 } + + + MsanVlanPortStatisticsEntry ::= + SEQUENCE { + msanVlanPortStatisticsVlanId + Integer32, + msanVlanPortStatisticsInFrames + Counter64, + msanVlanPortStatisticsOutFrames + Counter64, + msanVlanPortStatisticsInDiscarded + Counter64, + msanVlanPortStatisticsInOctets + Counter64, + msanVlanPortStatisticsOutOctets + Counter64 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.9.1.1 + msanVlanPortStatisticsVlanId OBJECT-TYPE + SYNTAX Integer32 (0..4094) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanVlanPortStatisticsEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.9.1.2 + msanVlanPortStatisticsInFrames OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of valid frames received by this port from + its segment which were classified as belonging to this + VLAN." + ::= { msanVlanPortStatisticsEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.9.1.3 + msanVlanPortStatisticsOutFrames OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of valid frames transmitted by this port to + its segment from the local forwarding process for this + VLAN." + ::= { msanVlanPortStatisticsEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.9.1.4 + msanVlanPortStatisticsInDiscarded OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of valid frames received by this port from + its segment which were classified as belonging to this + VLAN which were discarded due to VLAN related reasons. + Specifically, the IEEE 802.1Q counters for Discard + " + ::= { msanVlanPortStatisticsEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.9.1.5 + msanVlanPortStatisticsInOctets OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of valid frames octets received by this port from + its segment which were classified as belonging to this + VLAN." + ::= { msanVlanPortStatisticsEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.105.9.1.6 + msanVlanPortStatisticsOutOctets OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of valid frames octets transmitted by this port to + its segment from the local forwarding process for this + VLAN." + ::= { msanVlanPortStatisticsEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.106 + msanAtm OBJECT IDENTIFIER ::= { msanAdditionalConf 106 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.106.1 + msanAtmGlobal OBJECT IDENTIFIER ::= { msanAtm 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.106.2 + msanPortAtmPvcTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanPortAtmPvcEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanAtm 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.106.2.1 + msanPortAtmPvcEntry OBJECT-TYPE + SYNTAX MsanPortAtmPvcEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex, msanPortAtmPvcVpi, msanPortAtmPvcVci } + ::= { msanPortAtmPvcTable 1 } + + + MsanPortAtmPvcEntry ::= + SEQUENCE { + msanPortAtmPvcVpi + Integer32, + msanPortAtmPvcVci + Integer32, + msanPortAtmPvcPvid + INTEGER, + msanPortAtmPvcRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.106.2.1.1 + msanPortAtmPvcVpi OBJECT-TYPE + SYNTAX Integer32 (0..255) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ATM-PVC(Permanent Virtual Circuits) VPI(Virtual Path Identifier) value." + ::= { msanPortAtmPvcEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.106.2.1.2 + msanPortAtmPvcVci OBJECT-TYPE + SYNTAX Integer32 (32..255) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ATM-PVC(Permanent Virtual Circuits) VCI(Virtual Channel Identifier) value." + ::= { msanPortAtmPvcEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.106.2.1.3 + msanPortAtmPvcPvid OBJECT-TYPE + SYNTAX INTEGER (0..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The PVID, the VLAN ID assigned to untagged frames or + Priority-Tagged frames received on this ATM-PVC(Permanent Virtual Circuits). + + Value 0 defines that PVID is not set." + DEFVAL { '0'b } + ::= { msanPortAtmPvcEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.106.2.1.4 + msanPortAtmPvcRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + For row creation use createAndWait(5) [createAndGo(4) is not supported]. + Setting this object to active(1) will activate this entry. + Setting this object to destroy(6) will remove this entry." + ::= { msanPortAtmPvcEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107 + msanEnergyMeter OBJECT IDENTIFIER ::= { msanAdditionalConf 107 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.1 + msanEnergyMeterGlobal OBJECT IDENTIFIER ::= { msanEnergyMeter 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.1.1 + msanEnergyMeterIpAddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Energy meter's Ip address." + ::= { msanEnergyMeterGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.1.2 + msanEnergyMeterTcpPort OBJECT-TYPE + SYNTAX Unsigned32 (0..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Energy meter's Tcp port." + ::= { msanEnergyMeterGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.1.3 + msanEnergyMeterAddress OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Energy meter's address." + ::= { msanEnergyMeterGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.1.4 + msanEnergyMeterPassword OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-write + STATUS deprecated + DESCRIPTION + "Energy meter's password." + DEFVAL { 0 } + ::= { msanEnergyMeterGlobal 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.1.5 + msanEnergyMeterSerialNo OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..128)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Energy meter's serial number." + ::= { msanEnergyMeterGlobal 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.1.6 + msanEnergyMeterDateTime OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Energy meter's date and time in format: + year-month-day, hour:minutes:seconds" + ::= { msanEnergyMeterGlobal 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.1.7 + msanEnergyMeterCurrTariff OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Energy meter's current active tariff." + ::= { msanEnergyMeterGlobal 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.1.8 + msanEnergyMeterCurrPower OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "0.01 kW" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Energy meter's current measured power." + ::= { msanEnergyMeterGlobal 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.1.9 + msanEnergyMeterCoreVersion OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Energy meter's current version number." + ::= { msanEnergyMeterGlobal 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.1.10 + msanEnergyMeterFwType OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Energy meter's current firmware type." + ::= { msanEnergyMeterGlobal 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.1.11 + msanEnergyMeterFwVersion OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS deprecated + DESCRIPTION + "Energy meter's current firmware version." + ::= { msanEnergyMeterGlobal 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.1.12 + msanEnergyMeterFwCreationDate OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Energy meter's current firmware creation date in format: + year-month-day" + ::= { msanEnergyMeterGlobal 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.1.13 + msanEnergyMeterStdPassword OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..8)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Energy meter's password as ASCII string + (according to used standard IEC 61107-2001 / IEC 62056-21)." + ::= { msanEnergyMeterGlobal 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.1.14 + msanEnergyMeterStdFwVersion OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Energy meter's current firmware version as ASCII string + (according to used standard IEC 61107-2001 / IEC 62056-21)." + ::= { msanEnergyMeterGlobal 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.2 + msanEnergyMeterEnergyTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanEnergyMeterEnergyEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Energy values." + ::= { msanEnergyMeter 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.2.1 + msanEnergyMeterEnergyEntry OBJECT-TYPE + SYNTAX MsanEnergyMeterEnergyEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanEnergyMeterTariff, msanEnergyMeterDepth } + ::= { msanEnergyMeterEnergyTable 1 } + + + MsanEnergyMeterEnergyEntry ::= + SEQUENCE { + msanEnergyMeterTariff + Unsigned32, + msanEnergyMeterDepth + Unsigned32, + msanEnergyMeterEnergyValue + Unsigned32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.2.1.1 + msanEnergyMeterTariff OBJECT-TYPE + SYNTAX Unsigned32 (1..8) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "This is msanEnergyMeterTariff index in msanEnergyMeterEnergyTable + Defines tariff. 1 – tariff No1, 1 – tariff No2, …, 8 - tariff No8" + ::= { msanEnergyMeterEnergyEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.2.1.2 + msanEnergyMeterDepth OBJECT-TYPE + SYNTAX Unsigned32 (1..13) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "This is msanEnergyMeterDepth index in msanEnergyMeterEnergyTable. + Defines time span. + 1 – current value, + 2 – value at the end of previous month, + 3 – value at the end of 2. month ago, …, 13 –value at the end of the 12. month ago" + ::= { msanEnergyMeterEnergyEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.2.1.3 + msanEnergyMeterEnergyValue OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "0.01 kWh" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Energy value." + ::= { msanEnergyMeterEnergyEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.3 + msanEnergyMeterEnergySumTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanEnergyMeterEnergySumEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Energy sum values of all tariffs." + ::= { msanEnergyMeter 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.3.1 + msanEnergyMeterEnergySumEntry OBJECT-TYPE + SYNTAX MsanEnergyMeterEnergySumEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanEnergyMeterDepth } + ::= { msanEnergyMeterEnergySumTable 1 } + + + MsanEnergyMeterEnergySumEntry ::= + SEQUENCE { + msanEnergyMeterEnergySumValue + Unsigned32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.107.3.1.1 + msanEnergyMeterEnergySumValue OBJECT-TYPE + SYNTAX Unsigned32 + UNITS "0.01 kWh" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Energy sum value of all tariffs" + ::= { msanEnergyMeterEnergySumEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.108 + msanArpInspection OBJECT IDENTIFIER ::= { msanAdditionalConf 108 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.108.1 + msanArpInspectionGlobal OBJECT IDENTIFIER ::= { msanArpInspection 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.108.1.1 + msanArpInspectionAdminMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Enable/disable global dynamic arp inspection " + ::= { msanArpInspectionGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.108.2 + msanArpInspectionPortTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanArpInspectionPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Arp Inspection." + ::= { msanArpInspection 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.108.2.1 + msanArpInspectionPortEntry OBJECT-TYPE + SYNTAX MsanArpInspectionPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanArpInspectionPortTable 1 } + + + MsanArpInspectionPortEntry ::= + SEQUENCE { + msanArpInspectionPortAdminMode + INTEGER, + msanArpInspectionPortStatDroppedFrames + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.108.2.1.1 + msanArpInspectionPortAdminMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Enable/disable dynamic arp inspection for the selected interface." + DEFVAL { disable } + ::= { msanArpInspectionPortEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.108.2.1.2 + msanArpInspectionPortStatDroppedFrames OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of discarded ARP packets on interface." + ::= { msanArpInspectionPortEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.108.3 + msanArpInspectionVlanTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanArpInspectionVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Arp Inspection." + ::= { msanArpInspection 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.108.3.1 + msanArpInspectionVlanEntry OBJECT-TYPE + SYNTAX MsanArpInspectionVlanEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { dot1qVlanIndex } + ::= { msanArpInspectionVlanTable 1 } + + + MsanArpInspectionVlanEntry ::= + SEQUENCE { + msanArpInspectionVlanAdminMode + INTEGER, + msanArpInspectionVlanStatDroppedFrames + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.108.3.1.1 + msanArpInspectionVlanAdminMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Enable/disable dynamic arp inspection per vlan." + DEFVAL { disable } + ::= { msanArpInspectionVlanEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.108.3.1.2 + msanArpInspectionVlanStatDroppedFrames OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of discarded ARP packets per vlan." + ::= { msanArpInspectionVlanEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109 + msanIsa OBJECT IDENTIFIER ::= { msanAdditionalConf 109 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.1 + msanIsaGlobal OBJECT IDENTIFIER ::= { msanIsa 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.1.1 + msanIsaTalAdminMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ISA TAL functionality global admin mode." + DEFVAL { disable } + ::= { msanIsaGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.1.2 + msanIsaDasServerPort OBJECT-TYPE + SYNTAX Unsigned32 (0..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ISA Radius DAS (Dynamic Authorization Server) port number." + DEFVAL { 3799 } + ::= { msanIsaGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.1.3 + msanIsaDasServerSecret OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ISA Radius DAS (Dynamic Authorization Server) shared secret." + ::= { msanIsaGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.1.4 + msanIsaRadiusServerRetries OBJECT-TYPE + SYNTAX Unsigned32 (1..15) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Maximum number of retransmissions of a ISA Radius request packet." + DEFVAL { 3 } + ::= { msanIsaGlobal 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.1.5 + msanIsaRadiusServerTimeout OBJECT-TYPE + SYNTAX Unsigned32 (1..30) + UNITS "seconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Time out duration (in seconds) before packets are retransmitted to ISA Radius server" + DEFVAL { 3 } + ::= { msanIsaGlobal 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.2 + msanIsaStatistics OBJECT IDENTIFIER ::= { msanIsa 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.2.1 + msanIsaPortStatTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanIsaPortStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanIsaStatistics 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.2.1.1 + msanIsaPortStatEntry OBJECT-TYPE + SYNTAX MsanIsaPortStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanIsaPortStatTable 1 } + + + MsanIsaPortStatEntry ::= + SEQUENCE { + msanIsaPortStatTalMatchedFrames + Counter32, + msanIsaPortStatTalDroppedFrames + Counter32, + msanIsaPortStatAuthenReqSent + Counter32, + msanIsaPortStatAuthenReqConfirmed + Counter32, + msanIsaPortStatAuthenReqRejected + Counter32, + msanIsaPortStatAuthenTimeoutExpired + Counter32, + msanIsaPortStatAuthorReqSent + Counter32, + msanIsaPortStatAuthorReqConfirmed + Counter32, + msanIsaPortStatAuthorReqRejected + Counter32, + msanIsaPortStatAuthorTimeoutExpired + Counter32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.2.1.1.1 + msanIsaPortStatTalMatchedFrames OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of TAL matched frames." + ::= { msanIsaPortStatEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.2.1.1.2 + msanIsaPortStatTalDroppedFrames OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of TAL dropped frames." + ::= { msanIsaPortStatEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.2.1.1.3 + msanIsaPortStatAuthenReqSent OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of sent Authentication requests." + ::= { msanIsaPortStatEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.2.1.1.4 + msanIsaPortStatAuthenReqConfirmed OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of confirmed Authentication requests." + ::= { msanIsaPortStatEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.2.1.1.6 + msanIsaPortStatAuthenReqRejected OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of rejected Authentication requests." + ::= { msanIsaPortStatEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.2.1.1.7 + msanIsaPortStatAuthenTimeoutExpired OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of expired Authentication timeouts." + ::= { msanIsaPortStatEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.2.1.1.8 + msanIsaPortStatAuthorReqSent OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of sent Authorization requests." + ::= { msanIsaPortStatEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.2.1.1.9 + msanIsaPortStatAuthorReqConfirmed OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of confirmed Authorization requests." + ::= { msanIsaPortStatEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.2.1.1.10 + msanIsaPortStatAuthorReqRejected OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of rejected Authorization requests." + ::= { msanIsaPortStatEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.2.1.1.11 + msanIsaPortStatAuthorTimeoutExpired OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of expired Authorization timeouts." + ::= { msanIsaPortStatEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.2.2 + msanIsaStatLoginReq OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Cumulative number of Login requests." + ::= { msanIsaStatistics 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.2.3 + msanIsaStatLoginUnsuccessfulReq OBJECT-TYPE + SYNTAX Counter32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of unsuccessful login requests." + ::= { msanIsaStatistics 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.3 + msanIsaRadiusServerTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanIsaRadiusServerEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanIsa 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.3.1 + msanIsaRadiusServerEntry OBJECT-TYPE + SYNTAX MsanIsaRadiusServerEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanIsaRadiusServerIpAddress, msanIsaRadiusServerType } + ::= { msanIsaRadiusServerTable 1 } + + + MsanIsaRadiusServerEntry ::= + SEQUENCE { + msanIsaRadiusServerIpAddress + IpAddress, + msanIsaRadiusServerType + INTEGER, + msanIsaRadiusServerPort + Unsigned32, + msanIsaRadiusServerSecret + DisplayString, + msanIsaRadiusServerPrimaryMode + INTEGER, + msanIsaRadiusServerRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.3.1.1 + msanIsaRadiusServerIpAddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ISA Radius server IP address. + " + ::= { msanIsaRadiusServerEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.3.1.2 + msanIsaRadiusServerType OBJECT-TYPE + SYNTAX INTEGER + { + authentication(1), + accounting(2) + } + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ISA Radius server type." + ::= { msanIsaRadiusServerEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.3.1.3 + msanIsaRadiusServerPort OBJECT-TYPE + SYNTAX Unsigned32 (0..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + " ISA Radius server port number. + + If msanIsaRadiusServerType = authentication(1) then default port value is 1812. + If msanIsaRadiusServerType = accounting(2) then default port value is 1813." + ::= { msanIsaRadiusServerEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.3.1.4 + msanIsaRadiusServerSecret OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ISA Radius server shared secret." + DEFVAL { "" } + ::= { msanIsaRadiusServerEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.3.1.5 + msanIsaRadiusServerPrimaryMode OBJECT-TYPE + SYNTAX INTEGER + { + primary(1), + secondary(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ISA Radius server primary mode. + Only one server can be defined as primary(1)." + ::= { msanIsaRadiusServerEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.3.1.6 + msanIsaRadiusServerRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5). + For row activation use active(1). + For row deletion use destroy(6). + + Other values are currently not supported. + + For row activation parameter msanIsaRadiusServerType must be defined." + ::= { msanIsaRadiusServerEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.5 + msanIsaPortTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanIsaPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanIsa 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.5.1 + msanIsaPortEntry OBJECT-TYPE + SYNTAX MsanIsaPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanIsaPortTable 1 } + + + MsanIsaPortEntry ::= + SEQUENCE { + msanIsaPortTalAdminMode + INTEGER, + msanIsaPortAuthentication + INTEGER, + msanIsaPortAuthorization + INTEGER, + msanIsaPortAccounting + INTEGER, + msanIsaPortLoginMask + BITS, + msanIsaPortLoginUserPatternMask + OCTET STRING, + msanIsaPortTalAutomaticReq + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.5.1.1 + msanIsaPortTalAdminMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ISA TAL functionality admin mode." + DEFVAL { disable } + ::= { msanIsaPortEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.5.1.2 + msanIsaPortAuthentication OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ISA Authentication administrative state." + DEFVAL { enable } + ::= { msanIsaPortEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.5.1.3 + msanIsaPortAuthorization OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ISA Authorization administrative state." + DEFVAL { enable } + ::= { msanIsaPortEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.5.1.4 + msanIsaPortAccounting OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ISA Accounting administrative state." + DEFVAL { disable } + ::= { msanIsaPortEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.5.1.5 + msanIsaPortLoginMask OBJECT-TYPE + SYNTAX BITS + { + circuitId(0), + remoteId(1), + vendorId(2), + clientId(3), + sourceMAC(4), + sourceIP(5), + userPattern(6) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ISA login mask." + DEFVAL { { circuitId } } + ::= { msanIsaPortEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.5.1.6 + msanIsaPortLoginUserPatternMask OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of input packet that + is send to Radius server, if userPattern bit is set in msanIsaPortLoginMask. + Empty string indicates that parameter has not been defined." + ::= { msanIsaPortEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.5.1.7 + msanIsaPortTalAutomaticReq OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "TAL automatic request state." + DEFVAL { disable } + ::= { msanIsaPortEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.6 + msanIsaTalPortMatchTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanIsaTalPortMatchEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanIsa 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.6.1 + msanIsaTalPortMatchEntry OBJECT-TYPE + SYNTAX MsanIsaTalPortMatchEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { ifIndex } + ::= { msanIsaTalPortMatchTable 1 } + + + MsanIsaTalPortMatchEntry ::= + SEQUENCE { + msanIsaTalPortMatchEthertype + Integer32, + msanIsaTalPortMatchMacSrcAddr + MacAddress, + msanIsaTalPortMatchMacSrcMask + MacAddress, + msanIsaTalPortMatchVlanId + Integer32, + msanIsaTalPortMatchIpSrcAddr + IpAddress, + msanIsaTalPortMatchIpSrcMask + IpAddress, + msanIsaTalPortMatchDhcpType + INTEGER, + msanIsaTalPortMatchDhcpOpt60VendorId + DisplayString, + msanIsaTalPortMatchDhcpOpt61ClientId + DisplayString, + msanIsaTalPortMatchDhcpOpt61ClientIdMacAddr + MacAddress, + msanIsaTalPortMatchDhcpOpt82RemoteId + DisplayString, + msanIsaTalPortMatchUserBits + OCTET STRING, + msanIsaTalPortMatchUserMask + OCTET STRING + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.6.1.1 + msanIsaTalPortMatchEthertype OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified EtherType value. + A value of -1 indicates that parameter has not been defined. + " + DEFVAL { -1 } + ::= { msanIsaTalPortMatchEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.6.1.2 + msanIsaTalPortMatchMacSrcAddr OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified Source MAC address. + Empty string indicates that parameter has not been defined." + DEFVAL { ''b } + ::= { msanIsaTalPortMatchEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.6.1.3 + msanIsaTalPortMatchMacSrcMask OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanIsaTalPortMatchMacSrcAddr that + is compared with input packet. + Empty string indicates that parameter has not been defined + " + DEFVAL { ''b } + ::= { msanIsaTalPortMatchEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.6.1.4 + msanIsaTalPortMatchVlanId OBJECT-TYPE + SYNTAX Integer32 (-1..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified VLAN ID value (1-4094). + A value of -1 indicates that parameter has not been defined + " + ::= { msanIsaTalPortMatchEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.6.1.5 + msanIsaTalPortMatchIpSrcAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified source IP address. + Empty string indicates that parameter has not been defined. + " + DEFVAL { ''h } + ::= { msanIsaTalPortMatchEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.6.1.6 + msanIsaTalPortMatchIpSrcMask OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanIsaTalPortMatchIpSrcAddr that + is compared with input packet. + Empty string indicates that parameter has not been defined + + " + DEFVAL { ''h } + ::= { msanIsaTalPortMatchEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.6.1.7 + msanIsaTalPortMatchDhcpType OBJECT-TYPE + SYNTAX INTEGER + { + undefined(0), + discover(1), + request(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified DHCP type value. + " + DEFVAL { undefined } + ::= { msanIsaTalPortMatchEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.6.1.8 + msanIsaTalPortMatchDhcpOpt60VendorId OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified DHCP option 60 vendorId value. + Empty string indicates that parameter has not been defined." + DEFVAL { "" } + ::= { msanIsaTalPortMatchEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.6.1.9 + msanIsaTalPortMatchDhcpOpt61ClientId OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified DHCP option 61 clientId value. + Empty string indicates that parameter has not been defined." + DEFVAL { "" } + ::= { msanIsaTalPortMatchEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.6.1.10 + msanIsaTalPortMatchDhcpOpt61ClientIdMacAddr OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified DHCP option 61 MAC address. + Empty string indicates that parameter has not been defined." + DEFVAL { ''b } + ::= { msanIsaTalPortMatchEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.6.1.11 + msanIsaTalPortMatchDhcpOpt82RemoteId OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified DHCP option 82 remoteId value. + Empty string indicates that parameter has not been defined." + DEFVAL { "" } + ::= { msanIsaTalPortMatchEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.6.1.12 + msanIsaTalPortMatchUserBits OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified user defined bits. + Empty string indicates that parameter has not been defined." + DEFVAL { ''h } + ::= { msanIsaTalPortMatchEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.6.1.13 + msanIsaTalPortMatchUserMask OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of msanIsaTalPortMatchUserBits that + is compared with input packet. + Empty string indicates that parameter has not been defined." + DEFVAL { ''h } + ::= { msanIsaTalPortMatchEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.7 + msanIsaTalPatternMatchTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanIsaTalPatternMatchEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "This table is used to store the pattern match name, pattern + rules and the corresponding login mask for the pattern match." + ::= { msanIsa 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.7.1 + msanIsaTalPatternMatchEntry OBJECT-TYPE + SYNTAX MsanIsaTalPatternMatchEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Each entry in this table contains the + a unique pattern match along with the loginmask to identify the user login packets." + INDEX { msanIsaTalPatternMatchName } + ::= { msanIsaTalPatternMatchTable 1 } + + + MsanIsaTalPatternMatchEntry ::= + SEQUENCE { + msanIsaTalPatternMatchName + OCTET STRING, + msanIsaTalPatternMatchEthertype + Integer32, + msanIsaTalPatternMatchMacSrcAddr + MacAddress, + msanIsaTalPatternMatchMacSrcMask + MacAddress, + msanIsaTalPatternMatchVlanId + Integer32, + msanIsaTalPatternMatchIpSrcAddr + IpAddress, + msanIsaTalPatternMatchIpSrcMask + IpAddress, + msanIsaTalPatternMatchDhcpType + INTEGER, + msanIsaTalPatternMatchDhcpOpt60VendorId + DisplayString, + msanIsaTalPatternMatchDhcpOpt61ClientId + DisplayString, + msanIsaTalPatternMatchDhcpOpt61ClientIdMacAddr + MacAddress, + msanIsaTalPatternMatchDhcpOpt82RemoteId + DisplayString, + msanIsaTalPatternMatchUserBits + OCTET STRING, + msanIsaTalPatternMatchUserMask + OCTET STRING, + msanIsaTalPatternMatchLoginMask + BITS, + msanIsaTalPatternMatchRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.7.1.1 + msanIsaTalPatternMatchName OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (1..64)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Pattern match name." + ::= { msanIsaTalPatternMatchEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.7.1.2 + msanIsaTalPatternMatchEthertype OBJECT-TYPE + SYNTAX Integer32 (-1..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified EtherType value. + A value of -1 indicates that parameter has not been defined. + " + DEFVAL { -1 } + ::= { msanIsaTalPatternMatchEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.7.1.3 + msanIsaTalPatternMatchMacSrcAddr OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified Source MAC address. + Empty string indicates that parameter has not been defined." + DEFVAL { ''b } + ::= { msanIsaTalPatternMatchEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.7.1.4 + msanIsaTalPatternMatchMacSrcMask OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of + msanIsaTalPatternMatchMacSrcAddr that is compared with input + packet. Empty string indicates that parameter has not been + defined" + DEFVAL { ''b } + ::= { msanIsaTalPatternMatchEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.7.1.5 + msanIsaTalPatternMatchVlanId OBJECT-TYPE + SYNTAX Integer32 (-1..4094) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified VLAN ID value + (1-4094). A value of -1 indicates that parameter has not been + defined" + ::= { msanIsaTalPatternMatchEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.7.1.6 + msanIsaTalPatternMatchIpSrcAddr OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified source IP address. + Empty string indicates that parameter has not been defined. + " + DEFVAL { ''h } + ::= { msanIsaTalPatternMatchEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.7.1.7 + msanIsaTalPatternMatchIpSrcMask OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of + msanIsaTalPatternMatchIpSrcAddr that is compared with input + packet. Empty string indicates that parameter has not been + defined" + DEFVAL { ''h } + ::= { msanIsaTalPatternMatchEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.7.1.8 + msanIsaTalPatternMatchDhcpType OBJECT-TYPE + SYNTAX INTEGER + { + undefined(0), + discover(1), + request(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified DHCP type value. + " + DEFVAL { undefined } + ::= { msanIsaTalPatternMatchEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.7.1.9 + msanIsaTalPatternMatchDhcpOpt60VendorId OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified DHCP option 60 + vendorId value. Empty string indicates that parameter has not + been defined." + DEFVAL { "" } + ::= { msanIsaTalPatternMatchEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.7.1.10 + msanIsaTalPatternMatchDhcpOpt61ClientId OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified DHCP option 61 + clientId value. Empty string indicates that parameter has not + been defined." + DEFVAL { "" } + ::= { msanIsaTalPatternMatchEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.7.1.11 + msanIsaTalPatternMatchDhcpOpt61ClientIdMacAddr OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified DHCP option 61 MAC + address. Empty string indicates that parameter has not been + defined." + DEFVAL { ''b } + ::= { msanIsaTalPatternMatchEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.7.1.12 + msanIsaTalPatternMatchDhcpOpt82RemoteId OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified DHCP option 82 + remoteId value. Empty string indicates that parameter has not + been defined." + DEFVAL { "" } + ::= { msanIsaTalPatternMatchEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.7.1.13 + msanIsaTalPatternMatchUserBits OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Match incoming packet frame with specified user defined bits. + Empty string indicates that parameter has not been defined." + DEFVAL { ''h } + ::= { msanIsaTalPatternMatchEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.7.1.14 + msanIsaTalPatternMatchUserMask OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..128)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "This mask value identifies the portion of + msanIsaTalPatternMatchUserBits that is compared with input + packet. Empty string indicates that parameter has not been + defined." + DEFVAL { ''h } + ::= { msanIsaTalPatternMatchEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.7.1.15 + msanIsaTalPatternMatchLoginMask OBJECT-TYPE + SYNTAX BITS + { + circuitId(0), + remoteId(1), + vendorId(2), + clientId(3), + sourceMAC(4), + sourceIP(5), + userPattern(6) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Login mask for the current pattern match. This is used to + generate the UserId." + DEFVAL { { circuitId } } + ::= { msanIsaTalPatternMatchEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.7.1.16 + msanIsaTalPatternMatchRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows + in this table. + Its semantics are the same as those for the RowStatus textual + convention specified for SNMPv2. + A new row is created using createAndWait(5) + [createAndGo(4) is not supported] + The value active(1) activates the entry. + Setting this object to destroy6) will remove this entry." + ::= { msanIsaTalPatternMatchEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.8 + msanIsaTalPortPatternMatchTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanIsaTalPortPatternMatchEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A connection between Pattern Matches and device ports. + An entry is created in this table whenever a pattern match need to be + attached to a downlink port." + ::= { msanIsa 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.8.1 + msanIsaTalPortPatternMatchEntry OBJECT-TYPE + SYNTAX MsanIsaTalPortPatternMatchEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Each entry in this table contains the + a unique pattern match on a port along with the loginmask to identify the user login packets." + INDEX { ifIndex, msanIsaTalPatternMatchName } + ::= { msanIsaTalPortPatternMatchTable 1 } + + + MsanIsaTalPortPatternMatchEntry ::= + SEQUENCE { + msanIsaTalPortPatternMatchRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.109.8.1.1 + msanIsaTalPortPatternMatchRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows + in this table. + Its semantics are the same as those for the RowStatus textual + convention specified for SNMPv2. + Setting this object to createAndGo(4) creates a row in this table. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanIsaTalPortPatternMatchEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.110 + msanSync OBJECT IDENTIFIER ::= { msanAdditionalConf 110 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.110.1 + msanSyncGlobal OBJECT IDENTIFIER ::= { msanSync 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.110.2 + msanSyncTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanSyncEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanSync 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.110.2.1 + msanSyncEntry OBJECT-TYPE + SYNTAX MsanSyncEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanSyncBoardPosition, msanSyncSourcePriority } + ::= { msanSyncTable 1 } + + + MsanSyncEntry ::= + SEQUENCE { + msanSyncBoardPosition + INTEGER, + msanSyncSourcePriority + INTEGER, + msanSyncSourceType + INTEGER, + msanSyncSourceId + INTEGER, + msanSyncSourceEthPortId + InterfaceIndex, + msanSyncDestinationType + INTEGER, + msanSyncDestinationMlvdsId + INTEGER, + msanSyncSourceSuitability + INTEGER, + msanSyncSourceActivity + INTEGER, + msanSyncRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.110.2.1.1 + msanSyncBoardPosition OBJECT-TYPE + SYNTAX INTEGER (1..20) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Central ethernet board position." + ::= { msanSyncEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.110.2.1.2 + msanSyncSourcePriority OBJECT-TYPE + SYNTAX INTEGER (1..6) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Synchronization source priority: 1-first priority, 2-second priority....." + ::= { msanSyncEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.110.2.1.3 + msanSyncSourceType OBJECT-TYPE + SYNTAX INTEGER + { + ext-2mhz(4), + ext-10mhz(5), + ext-1hz(6), + mlvds-bp(8), + pps-bp(14), + ptp-eth(15), + sync-eth(16), + free-run(40) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Synchronization source type: + ext-2mhz(4) - synchronization on extended source 2MHz, + ext-10mhz(5) - synchronization on extended source 10MHz, + ext-1hz(6) - synchronization on extended source 1Hz, + mlvds-bp(8) - synchronization on MLVDS, + pps-bp(14) - synchronization on PPS, + ptp-eth(15)- synchronization on PtP Ethernet, + sync-eth(16) - synchronization on Synchronous Ethernet, + free-run(40) - free-run synchronization" + ::= { msanSyncEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.110.2.1.4 + msanSyncSourceId OBJECT-TYPE + SYNTAX INTEGER + { + input-1(1), + input-2(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Synchronization source identity. + + msanSyncSourceId can be used when msanSyncSourceType has one of values: + - ext-2mhz(4), + - ext-10mhz(5), + - ext-1hz(6), + - mlvds-bp(8), + - pps-bp(14), + - free-run(40) + + msanSyncSourceId can be set only to input-1(1), when msanSyncSourceType + is pps-bp(14) or free-run(40). + " + ::= { msanSyncEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.110.2.1.5 + msanSyncSourceEthPortId OBJECT-TYPE + SYNTAX InterfaceIndex + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Synchronization source ethernet Port Id (value of ifIndex). + + msanSyncSourceEthPortId can be used, when msanSyncSourceType + has ptp-eth(15) or sync-eth(16) value." + ::= { msanSyncEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.110.2.1.6 + msanSyncDestinationType OBJECT-TYPE + SYNTAX INTEGER + { + local(0), + global(10) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Synchronization destination type: + local(0) - synchronization signal is used only on local board + global(0) - synchronization signal is sent to MLVDS bus" + ::= { msanSyncEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.110.2.1.7 + msanSyncDestinationMlvdsId OBJECT-TYPE + SYNTAX INTEGER + { + mlvds-1(1), + mlvds-2(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Destination MLVDS bus Identity. + This parameter is used when msanSyncDestinationType has global(1) value." + ::= { msanSyncEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.110.2.1.8 + msanSyncSourceSuitability OBJECT-TYPE + SYNTAX INTEGER + { + undefined(0), + suitable(1), + unsuitable(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Source Suitability." + ::= { msanSyncEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.110.2.1.9 + msanSyncSourceActivity OBJECT-TYPE + SYNTAX INTEGER + { + undefined(0), + active(1), + inactive(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Source Activity ." + ::= { msanSyncEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.110.2.1.10 + msanSyncRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5). + For row activation use active(1). + For row deletion use destroy(6). + + Other values are currently not supported. + + For row activation next terms must be defined + - msanSyncSourceType + - msanSyncSourceMlvdsId or msanSyncSourcePortId + - msanSyncDestionationType + - msanSyncDestionaMlvdsId if msanSyncDestionType=global(10) + " + ::= { msanSyncEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111 + msanOnu OBJECT IDENTIFIER ::= { msanAdditionalConf 111 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.1 + msanOnuGlobal OBJECT IDENTIFIER ::= { msanOnu 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.1.1 + msanOnuUpgradeMethodManualStart OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Start ONU manual upgrade method according to configuration in msanOnuUpgradeTable." + DEFVAL { disable } + ::= { msanOnuGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.1.10 + msanOnuAuthMetod OBJECT-TYPE + SYNTAX INTEGER + { + serial(1), + password(2), + serialAndPassword(3), + noAuthentication(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU authentication method." + DEFVAL { serial } + ::= { msanOnuGlobal 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.1.11 + msanOnuAuthAutoLearning OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU serial number auto learning" + DEFVAL { enable } + ::= { msanOnuGlobal 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.1.13 + msanOnuBlackListChangeCnt OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU Blacklist change counter." + ::= { msanOnuGlobal 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.1.14 + msanOnuIfOperStatusChangeCnt OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONUs interface operational status change counter." + ::= { msanOnuGlobal 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.1.15 + msanOnuDataEncryption OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU/GEM downstream data encryption." + ::= { msanOnuGlobal 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.1.16 + msanOnuDefaultConfigFileGet OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "msanOnuDefaultConfigFileGet parameter is used to start transfer of ONU default config file from external tftp or ftp server to local file. + Next syntax must be used for tftp or ftp transfer: + tftp://|[:]/[/] [] + ftp://[:]@|[:]/[/] [] + " + DEFVAL { ''b } + ::= { msanOnuGlobal 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.1.17 + msanOnuXgsAuthMetod OBJECT-TYPE + SYNTAX INTEGER + { + serial(1), + registrationid(2), + serialAndRegistrationid(3), + noAuthentication(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "XGSPON ONU authentication method." + DEFVAL { serial } + ::= { msanOnuGlobal 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2 + msanOnuCfgTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuCfgEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " " + ::= { msanOnu 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1 + msanOnuCfgEntry OBJECT-TYPE + SYNTAX MsanOnuCfgEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "In case of GPON access blade, ifIndex (msanOnuCfgifIndex) for ONU interface (ifDescr=0/x/y) is calculated with formula: + ifIndex=max_olt_port_number(8 or 16)+(x-1)*128+y " + INDEX { msanOnuCfgIfIndex } + ::= { msanOnuCfgTable 1 } + + + MsanOnuCfgEntry ::= + SEQUENCE { + msanOnuCfgIfIndex + Integer32, + msanOnuCfgPassword + DisplayString, + msanOnuCfgEnablePm + INTEGER, + msanOnuCfgSerialNumber + DisplayString, + msanOnuCfgAdminState + INTEGER, + msanOnuCfgOnuDhcpMode + INTEGER, + msanOnuCfgOnuIpAddress + IpAddress, + msanOnuCfgOnuIPMask + IpAddress, + msanOnuCfgOnuDefaultGateway + IpAddress, + msanOnuCfgOnuReset + INTEGER, + msanOnuCfgOnuResetBackupImage + INTEGER, + msanOnuCfgDefaultConfigFile + DisplayString, + msanOnuCfgSendConfig + INTEGER, + msanOnuCfgSendConfigStatus + INTEGER, + msanOnuCfgOnuResync + INTEGER, + msanOnuCfgOnuResetFactoryDefault + INTEGER, + msanOnuCfgPowerMeasurementsStart + INTEGER, + msanOnuCfgRegistrationId + DisplayString, + msanOnuCfgOnuPrimaryDnsIpAddress + IpAddress, + msanOnuCfgOnuSecondaryDnsIpAddress + IpAddress, + msanOnuCfgDataEncryption + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.1 + msanOnuCfgIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Index of ONU interface (from ifTable)." + ::= { msanOnuCfgEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.2 + msanOnuCfgPassword OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..20)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The expected password of the ONU." + ::= { msanOnuCfgEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.3 + msanOnuCfgEnablePm OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "ONU PM (Performance Management) collection. " + ::= { msanOnuCfgEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.4 + msanOnuCfgSerialNumber OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..12)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The expected serial number (12 bytes), which is unique for each ONU. It is defined in ITU-T G.984.3 + and contains the vendor id and version number. The first four bytes are an ASCII encoded + vendor ID four letter mnemonic. The next eight bytes are an ASCII encoded version number (four hex values). + Example: ISKT01C2AA5B + + To delete serial number use empty string." + ::= { msanOnuCfgEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.5 + msanOnuCfgAdminState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "This attribute enable(1) and disable(2) the functions performed by this managed entity. + When the administrative state is set to disable(lock), all user functions are blocked, and alarms, TCAs + and AVCs for this managed entity and all dependent managed entities are no longer generated. + " + ::= { msanOnuCfgEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.6 + msanOnuCfgOnuDhcpMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "ONU DHCP client mode. + " + ::= { msanOnuCfgEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.7 + msanOnuCfgOnuIpAddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The current IP address of the ONU. This column can be written only if the DHCP mode + is set to false. If the DHCP mode is set to true, this column can NOT be written." + ::= { msanOnuCfgEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.8 + msanOnuCfgOnuIPMask OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The current IP Mask of the ONU. This column can be written only if the DHCP mode is + set to false. If the DHCP mode is set to true, this column can NOT be written." + ::= { msanOnuCfgEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.9 + msanOnuCfgOnuDefaultGateway OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The current default gateway of the ONU. This column can be written only if the DHCP + mode is set to false. If the DHCP mode is set to true, this column can NOT be written." + ::= { msanOnuCfgEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.10 + msanOnuCfgOnuReset OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set this option to ¡enable¡to initiate a reboot action on the ONU. This column can be + used to reboot the ONU after Software upgrade. After the reboot command is sent to the ONU, + this column is set to ¡disable¡again by the OLT application. " + ::= { msanOnuCfgEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.11 + msanOnuCfgOnuResetBackupImage OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set this option to 'enable' to initiate a reboot action on the ONU and + switch to a backup SW image." + ::= { msanOnuCfgEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.12 + msanOnuCfgDefaultConfigFile OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "ONU config default file (this is reference to msanOnuDefaultConfigFileName)." + ::= { msanOnuCfgEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.13 + msanOnuCfgSendConfig OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Send default config file and config attributes to ONU." + DEFVAL { disable } + ::= { msanOnuCfgEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.14 + msanOnuCfgSendConfigStatus OBJECT-TYPE + SYNTAX INTEGER + { + ok(1), + pending(2), + notApplicable(3), + error(4), + wrongStatus(5), + notStarted(6) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Status of sending default config file and config attributes to ONU." + DEFVAL { notStarted } + ::= { msanOnuCfgEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.15 + msanOnuCfgOnuResync OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Re-sync OMCI MIB" + DEFVAL { disable } + ::= { msanOnuCfgEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.16 + msanOnuCfgOnuResetFactoryDefault OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set this option to 'enable' to initiate a reboot to factory default action on the ONU." + ::= { msanOnuCfgEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.17 + msanOnuCfgPowerMeasurementsStart OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Start ONU/OLT Rx/Tx Power Measurements " + DEFVAL { disable } + ::= { msanOnuCfgEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.18 + msanOnuCfgRegistrationId OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..36)) + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The expected Registrationid of the XGSPON ONU." + ::= { msanOnuCfgEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.19 + msanOnuCfgOnuPrimaryDnsIpAddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The Primary DNS server IP. This parameter can be written only if the DHCP mode + is set to false. If the DHCP mode is set to true, this column can NOT be written." + ::= { msanOnuCfgEntry 19 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.20 + msanOnuCfgOnuSecondaryDnsIpAddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The Secondary DNS server IP. This parameter can be written only if the DHCP mode + is set to false. If the DHCP mode is set to true, this column can NOT be written." + ::= { msanOnuCfgEntry 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.2.1.21 + msanOnuCfgDataEncryption OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU/GEM downstream data encryption." + ::= { msanOnuCfgEntry 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3 + msanOnuInfoTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " " + ::= { msanOnu 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1 + msanOnuInfoEntry OBJECT-TYPE + SYNTAX MsanOnuInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Row Description" + INDEX { msanOnuInfoIfIndex } + ::= { msanOnuInfoTable 1 } + + + MsanOnuInfoEntry ::= + SEQUENCE { + msanOnuInfoIfIndex + Integer32, + msanOnuInfoPrimaryStatus + INTEGER, + msanOnuInfoEqualizationDelay + Unsigned32, + msanOnuInfoPowerLevel + INTEGER, + msanOnuInfoVendorId + DisplayString, + msanOnuInfoVersion + DisplayString, + msanOnuInfoTrafficManagementOption + INTEGER, + msanOnuInfoOperState + INTEGER, + msanOnuInfoEquipmentId + OCTET STRING, + msanOnuInfoOmccVersion + INTEGER, + msanOnuInfoOnuHardwareType + Unsigned32, + msanOnuInfoHardwareRevision + Unsigned32, + msanOnuInfoSecurityCapability + Unsigned32, + msanOnuInfoTotalPriorityQueueNumber + Unsigned32, + msanOnuInfoTotalTrafficSchedulerNumber + Unsigned32, + msanOnuInfoTotalGemPortNumber + Unsigned32, + msanOnuInfoTotalTcontNumber + Unsigned32, + msanOnuInfoTotalEthernetUniNumber + Unsigned32, + msanOnuInfoTotalPotsUniNumber + Unsigned32, + msanOnuInfoSysUpTime + Unsigned32, + msanOnuInfoOnuImageInstance0Version + DisplayString, + msanOnuInfoOnuImageInstance0Valid + TruthValue, + msanOnuInfoOnuImageInstance0Activate + TruthValue, + msanOnuInfoOnuImageInstance0Commit + TruthValue, + msanOnuInfoOnuImageInstance1Version + DisplayString, + msanOnuInfoOnuImageInstance1Valid + TruthValue, + msanOnuInfoOnuImageInstance1Activate + TruthValue, + msanOnuInfoOnuImageInstance1Commit + TruthValue, + msanOnuInfoOnuMacAddress + MacAddress, + msanOnuInfoOnuDhcpMode + TruthValue, + msanOnuInfoOnuIpAddress + IpAddress, + msanOnuInfoOnuIpMask + IpAddress, + msanOnuInfoOnuDefaultGateway + IpAddress, + msanOnuInfoOnuFastLeaveCapability + Unsigned32, + msanOnuInfoSerialNumber + DisplayString, + msanOnuInfoPassword + DisplayString, + msanOnuInfoRxPower + Integer32, + msanOnuInfoTxPower + Integer32, + msanOnuInfoOltRxPower + Integer32, + msanOnuInfoTemp + Integer32, + msanOnuInfoPowerMeasurementsStarted + DisplayString, + msanOnuInfoDistance + Gauge32, + msanOnuInfoDeactivateReason + DisplayString, + msanOnuInfoRegistrationid + DisplayString + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.1 + msanOnuInfoIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Index of ONU interface (from ifTable)." + ::= { msanOnuInfoEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.2 + msanOnuInfoPrimaryStatus OBJECT-TYPE + SYNTAX INTEGER + { + invalid(0), + inactive(1), + activatePending(2), + active(3), + deactivatePending(4), + disablePending(5), + disabled(6) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "invalid(0), inactive(1), activatePending(2), active(3),deactivatePending(4), + disablePending(5), disabled(6) " + ::= { msanOnuInfoEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.3 + msanOnuInfoEqualizationDelay OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Equalization delay for display." + ::= { msanOnuInfoEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.4 + msanOnuInfoPowerLevel OBJECT-TYPE + SYNTAX INTEGER + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Power level." + ::= { msanOnuInfoEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.5 + msanOnuInfoVendorId OBJECT-TYPE + SYNTAX DisplayString (SIZE (4)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute identifies the vendor of the ONT.It is the same as + the four most significant bytes of the ONT serial number as specified in + ITU-T Rec. G.984.3. (R) (mandatory) (4 bytes). " + ::= { msanOnuInfoEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.7 + msanOnuInfoVersion OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute identifies the version of the ONT as defined by the + vendor. Then character value ¡°0¡± indicates that version information is not + available or applicable." + ::= { msanOnuInfoEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.8 + msanOnuInfoTrafficManagementOption OBJECT-TYPE + SYNTAX INTEGER + { + priorityControlledAndFlexiblyScheduledUpstreamTraffic(0), + rateControlledUpstreamTraffic(1) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute identifies the upstream traffic management function implemented + in the ONT. There are two options: + 0 Priority controlled and flexibly scheduled upstream traffic. The traffic scheduler and + priority queue mechanism are used for upstream traffic. + 1 Rate controlled upstream traffic. The maximum upstream traffic of each individual + connection is guaranteed" + DEFVAL { 0 } + ::= { msanOnuInfoEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.9 + msanOnuInfoOperState OBJECT-TYPE + SYNTAX INTEGER + { + enabled(1), + disabled(2), + unknown(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute reports whether the managed entity is currently capable of performing its + function." + ::= { msanOnuInfoEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.10 + msanOnuInfoEquipmentId OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (20)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute may be used to identify the specific type of ONT. In North America, + this may be the equipment CLEI code. (R) (optional) (20 bytes)." + ::= { msanOnuInfoEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.11 + msanOnuInfoOmccVersion OBJECT-TYPE + SYNTAX INTEGER + { + g-984-4(128), + g-984-4amd1(129), + g-984-4amd2(130), + g-984-4amd3(131), + g-984-42007to2008(132) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute identifies the version of the OMCC protocol being used by the ONT. + This allows the OLT to manage a network with ONTs that support different OMCC versions. + Release levels of G.984.4 may be supported with the following code points: + 0x80 G.984.4 06/04. Note: for historic reasons, this codepoint may also appear in ONTs that + support later versions of G.984.4. + 0x81 G.984.4 amd 1 (06/05) ITU-T Rec. G.984.4 (02/2008) 51 + 0x82 G.984.4 amd 2 (03/06) + 0x83 G.984.4 amd 3 (12/06) + 0x84 G.984.4 2007-2008 current draft (R) (mandatory) (1 byte)" + ::= { msanOnuInfoEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.12 + msanOnuInfoOnuHardwareType OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Most significant byte of vendor product code which provides a vendor-specific product + code for the ONT.(R) (optional) (2 bytes)." + ::= { msanOnuInfoEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.13 + msanOnuInfoHardwareRevision OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS obsolete + DESCRIPTION + "Least significant byte of vendor product code which provides a vendor-specific product + code or the ONT.(R) (optional) (2 bytes). " + ::= { msanOnuInfoEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.14 + msanOnuInfoSecurityCapability OBJECT-TYPE + SYNTAX Unsigned32 (1..255) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute advertises the security capabilities of the ONT. The following codepoints + are defined: + 1 Reserved + 2 AES + 3..255 Reserved (R) (mandatory) (1 byte). " + DEFVAL { 2 } + ::= { msanOnuInfoEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.15 + msanOnuInfoTotalPriorityQueueNumber OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute reports the total number of priority queues that are not associated with + a circuit pack, but with the ONT in its entirety. The maximum value is 0x0FFF. Upon ME instantiation, + he ONT sets this attribute to the value that represents its capabilities. (R) (mandatory) (2 bytes). " + ::= { msanOnuInfoEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.16 + msanOnuInfoTotalTrafficSchedulerNumber OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute reports the total number of traffic schedulers that are not associated + with a circuit pack, but with the ONT in its entirety. The ONT supports null function, HOL scheduling + and WRR from the priority control and guarantee of minimum rate control points of view, respectively. + If the ONT has no traffic schedulers, this attribute is 0. (R) (mandatory) (1 byte)." + ::= { msanOnuInfoEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.17 + msanOnuInfoTotalGemPortNumber OBJECT-TYPE + SYNTAX Unsigned32 (0..4095) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute reports the total number of GEM port-IDs supported by the ONT. The maximum + value is 0x0FFF. Upon ME instantiation, the ONT sets this attribute to the value that represents + its capabilities. (R) (optional) (2 bytes)." + ::= { msanOnuInfoEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.18 + msanOnuInfoTotalTcontNumber OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute reports the total number of T-CONTs supported by the ONT." + ::= { msanOnuInfoEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.19 + msanOnuInfoTotalEthernetUniNumber OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of Ethernet UNI ports." + ::= { msanOnuInfoEntry 19 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.20 + msanOnuInfoTotalPotsUniNumber OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of POTS UNI ports." + ::= { msanOnuInfoEntry 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.21 + msanOnuInfoSysUpTime OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute counts the 10 ms intervals since the ONT was last initialized. It rolls + over to 0 when full. (See RFC 1213.) (R) (optional) (4 bytes)." + ::= { msanOnuInfoEntry 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.22 + msanOnuInfoOnuImageInstance0Version OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute identifies the version of the ONT as defined by the + vendor. Then character value ¡°0¡± indicates that version information is not + available or applicable. (R) (mandatory) (14 bytes)." + ::= { msanOnuInfoEntry 22 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.23 + msanOnuInfoOnuImageInstance0Valid OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The valid flag of ONU image instance 0." + ::= { msanOnuInfoEntry 23 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.24 + msanOnuInfoOnuImageInstance0Activate OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The activate flag of ONU image instance 0." + ::= { msanOnuInfoEntry 24 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.25 + msanOnuInfoOnuImageInstance0Commit OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The commit flag of ONU image instance 0." + ::= { msanOnuInfoEntry 25 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.26 + msanOnuInfoOnuImageInstance1Version OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute identifies the version of the ONT as defined by the + vendor. Then character value ¡°0¡± indicates that version information is not + available or applicable. (R) (mandatory) (14 bytes). " + ::= { msanOnuInfoEntry 26 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.27 + msanOnuInfoOnuImageInstance1Valid OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The valid flag of ONU image instance 1 " + ::= { msanOnuInfoEntry 27 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.28 + msanOnuInfoOnuImageInstance1Activate OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The activate flag of ONU image instance 1." + ::= { msanOnuInfoEntry 28 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.29 + msanOnuInfoOnuImageInstance1Commit OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The commit flag of ONU image instance 1." + ::= { msanOnuInfoEntry 29 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.30 + msanOnuInfoOnuMacAddress OBJECT-TYPE + SYNTAX MacAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The MAC address of the ONU in hexadecimal format." + ::= { msanOnuInfoEntry 30 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.31 + msanOnuInfoOnuDhcpMode OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU DHCP mode: + 1 Enabled + 2 Disabled " + DEFVAL { 2 } + ::= { msanOnuInfoEntry 31 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.32 + msanOnuInfoOnuIpAddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The current IP address of the ONU. " + ::= { msanOnuInfoEntry 32 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.33 + msanOnuInfoOnuIpMask OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The current IP Mask of the ONU. " + ::= { msanOnuInfoEntry 33 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.34 + msanOnuInfoOnuDefaultGateway OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The current default gateway of the ONU. " + ::= { msanOnuInfoEntry 34 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.35 + msanOnuInfoOnuFastLeaveCapability OBJECT-TYPE + SYNTAX Unsigned32 (0..16) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute specifies Fast leave capability. It¡¯s carried in a proprietary OMCI remote DEBUG ME, + Bit value 0 not support + Bit value 1 support + + Bit 0 fast leave in CTC distributed mode + Bit 1 non fast leave in CTC distributed mode + Bit 2 fast leave in CTC controllable mode + Bit 3 non fast leave in CTC controllable mode + " + DEFVAL { 2 } + ::= { msanOnuInfoEntry 35 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.36 + msanOnuInfoSerialNumber OBJECT-TYPE + SYNTAX DisplayString (SIZE (12)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current serial number, which is unique for each ONU. It is defined in ITU-T G.984.3 + and contains the vendor id and version number. The first four bytes are an ASCII encoded + vendor ID four letter mnemonic. The next eight bytes are an ASCII encoded version number (four hex values). + Example: ISKT01C2AA5B" + ::= { msanOnuInfoEntry 36 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.37 + msanOnuInfoPassword OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..20)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received password of the ONU." + ::= { msanOnuInfoEntry 37 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.38 + msanOnuInfoRxPower OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.01 dBm" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU receive (Rx) power measurement." + ::= { msanOnuInfoEntry 38 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.39 + msanOnuInfoTxPower OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.01 dBm" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU transmit (Tx) power measurement." + ::= { msanOnuInfoEntry 39 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.40 + msanOnuInfoOltRxPower OBJECT-TYPE + SYNTAX Integer32 + UNITS "0.01 dBm" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "OLT receive (Rx) power measurement." + ::= { msanOnuInfoEntry 40 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.41 + msanOnuInfoTemp OBJECT-TYPE + SYNTAX Integer32 + UNITS "Celsius" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU current temperature (in Celsius)." + ::= { msanOnuInfoEntry 41 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.42 + msanOnuInfoPowerMeasurementsStarted OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..20)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Info when Rx/Tx power measurements were started." + ::= { msanOnuInfoEntry 42 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.43 + msanOnuInfoDistance OBJECT-TYPE + SYNTAX Gauge32 + UNITS "metre" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU distance in metre." + ::= { msanOnuInfoEntry 43 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.44 + msanOnuInfoDeactivateReason OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU deactivate reason." + ::= { msanOnuInfoEntry 44 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.3.1.45 + msanOnuInfoRegistrationid OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..36)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received Registrationid of the XGSPON ONU." + ::= { msanOnuInfoEntry 45 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.4 + msanOnuUpgradeTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuUpgradeEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOnu 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.4.1 + msanOnuUpgradeEntry OBJECT-TYPE + SYNTAX MsanOnuUpgradeEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOnuUpgradeMethod } + ::= { msanOnuUpgradeTable 1 } + + + MsanOnuUpgradeEntry ::= + SEQUENCE { + msanOnuUpgradeMethod + INTEGER, + msanOnuUpgradeOption + INTEGER, + msanOnuUpgradeRebootMode + INTEGER, + msanOnuUpgradeImageInstance + Integer32, + msanOnuUpgradeScheduledTime + DisplayString, + msanOnuUpgradeRebootScheduledTime + DisplayString, + msanOnuUpgradeParticipantPortListBitMap + OCTET STRING, + msanOnuUpgradeProgressDownloadPortListBitMap + OCTET STRING, + msanOnuUpgradeProgressActivatePortListBitMap + OCTET STRING, + msanOnuUpgradeProgressCommitPortListBitMap + OCTET STRING, + msanOnuUpgradeProgressFinalPortListBitMap + OCTET STRING, + msanOnuUpgradeResultFinalPortListBitMap + OCTET STRING + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.4.1.1 + msanOnuUpgradeMethod OBJECT-TYPE + SYNTAX INTEGER + { + manual(1), + scheduled(2), + automatic(3) + } + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " 1 Manual - in which the EMS initiates upgrade operation. + Manual upgrade procedure starts when global parameter msanOnuUpgradeMethodManualStart + is set to enable. + + 2 Scheduled - in which the EMS specifies the ONU list and the time when the upgrade + should start. Only one scheduled task entry can exist in the table, and it is always valid even + after their execution. + + 3 Automatic - in which the ONU is upgraded automatically when it is + discovered. Only one automatic task entry can exist in the + table, and it is always valid even after its execution. " + ::= { msanOnuUpgradeEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.4.1.2 + msanOnuUpgradeOption OBJECT-TYPE + SYNTAX INTEGER + { + normal(1), + forced(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU upgrade option: + 1 Normal. If the target version is newer than the current version, then the image download will start. + 2 Forced. The image download will always start. + " + DEFVAL { normal } + ::= { msanOnuUpgradeEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.4.1.3 + msanOnuUpgradeRebootMode OBJECT-TYPE + SYNTAX INTEGER + { + automatic(1), + manual(2), + scheduled(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "It defines the reboot action after the image is downloaded to the ONU: + 1 - Automatic. ONU will be rebooted during image activation. The complete upgrade + procedure will be executed automatically: download -> activate (reboot) -> commit. + 2 - Manual. The following upgrade procedure will be executed: download -> commit. The + ONU can be rebooted via onuReset of ONU configuration table. + 3 - Scheduled. The ONU will be rebooted automatically at onuUpgradeRebootScheduledTime. The + following upgrade procedure will be executed: download -> commit -> activate (reboot) at + onuUpgradeRebootScheduledTime. + " + DEFVAL { automatic } + ::= { msanOnuUpgradeEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.4.1.4 + msanOnuUpgradeImageInstance OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "ONU image instance selection: + 1 Automatic. The instance which is not committed will be upgraded. For ONU which + has only one image instance, OLT will always upgrade this image instance 0" + DEFVAL { 1 } + ::= { msanOnuUpgradeEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.4.1.5 + msanOnuUpgradeScheduledTime OBJECT-TYPE + SYNTAX DisplayString + UNITS "hh:mm:ss" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The time at which the ONU will be upgraded scheduledly. This column is used only if the + msanOnuUpgradeMethod is set to 2 - Scheduled. The format of the string is hh:mm:ss which means + the upgrade can be repeated every 24 hours. + " + DEFVAL { "23:30:00" } + ::= { msanOnuUpgradeEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.4.1.6 + msanOnuUpgradeRebootScheduledTime OBJECT-TYPE + SYNTAX DisplayString + UNITS " hh:mm:ss" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The time at which the ONU will be rebooted. This column is used only if the msanOnuUpgradeRebootMode + is set to 3, Scheduled. The format of the string is hh:mm:ss which means the reboot can be repeated + every 24 hours after a successful upgrade. The reboot on a particular ONU should not happen if there is + no any actual upgrade on it. + " + ::= { msanOnuUpgradeEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.4.1.7 + msanOnuUpgradeParticipantPortListBitMap OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..2048)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU upgrade participant port list bit map.To include an ONU in upgrade, set the corresponding bit to 1. + It's assumed that each slot has 8 or 16 OLT PON ports and each OLT PON port has 128 ONUs.Nonexist ports in the + port list bit map should be reserved and set to 0 if the actual capacity of PON ports and ONUs of the line + card in the slot is less than the above maximum assumption" + DEFVAL { "" } + ::= { msanOnuUpgradeEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.4.1.8 + msanOnuUpgradeProgressDownloadPortListBitMap OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..2048)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU upgrade progress download port list bit map. Since an ONU enters the image download stage, the corresponding + bit representing this ONU will remain as 1. + It's assumed that each slot has 8 or 16 OLT PON ports and each OLT PON port has 128 ONUs.Nonexist ports in the + port list bit map should be reserved and set to 0 if the actual capacity of PON ports and ONUs of the line + card in the slot is less than the above maximum assumption" + DEFVAL { "" } + ::= { msanOnuUpgradeEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.4.1.9 + msanOnuUpgradeProgressActivatePortListBitMap OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..2048)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU upgrade progress activate port list bit map. Since an ONU enters image activate stage, the corresponding bit + representing this ONU will remain as 1. + It's assumed that each slot has 8 or 16 OLT PON ports and each OLT PON port has 128 ONUs.Nonexist ports in the + port list bit map should be reserved and set to 0 if the actual capacity of PON ports and ONUs of the line + card in the slot is less than the above maximum assumption" + DEFVAL { "" } + ::= { msanOnuUpgradeEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.4.1.10 + msanOnuUpgradeProgressCommitPortListBitMap OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..2048)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU upgrade progress commit port list bit map. Since an ONU enters image commit stage, the corresponding bit representing + this ONU will remain as 1. + It's assumed that each slot has 8 or 16 OLT PON ports and each OLT PON port has 128 ONUs.Nonexist ports in the + port list bit map should be reserved and set to 0 if the actual capacity of PON ports and ONUs of the line + card in the slot is less than the above maximum assumption" + DEFVAL { "" } + ::= { msanOnuUpgradeEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.4.1.11 + msanOnuUpgradeProgressFinalPortListBitMap OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..2048)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU upgrade progress final port list bit map. Whenever the upgrade procedure for an ONU is finished, regardless of success + or failure, the corresponding bit representing this ONU will become 1. + It's assumed that each slot has 8 or 16 OLT PON ports and each OLT PON port has 128 ONUs.Nonexist ports in the + port list bit map should be reserved and set to 0 if the actual capacity of PON ports and ONUs of the line + card in the slot is less than the above maximum assumption" + DEFVAL { "" } + ::= { msanOnuUpgradeEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.4.1.12 + msanOnuUpgradeResultFinalPortListBitMap OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (0..2048)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU upgrade result port list bit map. Whenever an ONU encounters failure in any stage, then the corresponding bit representing + this ONU will become 1, and the upgrade procedure won't proceed to the next stage for this particular ONU. + It's assumed that each slot has 8 or 16 OLT PON ports and each OLT PON port has 128 ONUs.Nonexist ports in the + port list bit map should be reserved and set to 0 if the actual capacity of PON ports and ONUs of the line + card in the slot is less than the above maximum assumption" + DEFVAL { "" } + ::= { msanOnuUpgradeEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.5 + msanOnuUpgradeHwTypeTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuUpgradeHwTypeEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOnu 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.5.1 + msanOnuUpgradeHwTypeEntry OBJECT-TYPE + SYNTAX MsanOnuUpgradeHwTypeEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOnuUpgradeHwTypeVendorId, msanOnuUpgradeHwTypeHwType, msanOnuUpgradeHwTypeMethod } + ::= { msanOnuUpgradeHwTypeTable 1 } + + + MsanOnuUpgradeHwTypeEntry ::= + SEQUENCE { + msanOnuUpgradeHwTypeVendorId + DisplayString, + msanOnuUpgradeHwTypeHwType + Integer32, + msanOnuUpgradeHwTypeMethod + INTEGER, + msanOnuUpgradeHwTypeHwRevision + DisplayString, + msanOnuUpgradeHwTypeFwRevision + DisplayString, + msanOnuUpgradeHwTypeImageName + DisplayString, + msanOnuUpgradeHwTypeImagePath + DisplayString, + msanOnuUpgradeHwTypeServerName + DisplayString, + msanOnuUpgradeHwTypeRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.5.1.1 + msanOnuUpgradeHwTypeVendorId OBJECT-TYPE + SYNTAX DisplayString (SIZE (4)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOnuUpgradeHwTypeEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.5.1.2 + msanOnuUpgradeHwTypeHwType OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ONU model which need firmware upgrade." + ::= { msanOnuUpgradeHwTypeEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.5.1.3 + msanOnuUpgradeHwTypeMethod OBJECT-TYPE + SYNTAX INTEGER + { + manual(1), + scheduled(2), + automatic(3) + } + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Upgrade method: + 1 Manual + 2 Scheduled + 3 Automatic." + ::= { msanOnuUpgradeHwTypeEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.5.1.4 + msanOnuUpgradeHwTypeHwRevision OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..63)) + MAX-ACCESS read-write + STATUS obsolete + DESCRIPTION + "ONU upgrade hardware revision. + " + DEFVAL { ''b } + ::= { msanOnuUpgradeHwTypeEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.5.1.5 + msanOnuUpgradeHwTypeFwRevision OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..28)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU upgrade firmware revision. " + DEFVAL { "0.0" } + ::= { msanOnuUpgradeHwTypeEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.5.1.6 + msanOnuUpgradeHwTypeImageName OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..256)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU upgrade image name." + ::= { msanOnuUpgradeHwTypeEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.5.1.7 + msanOnuUpgradeHwTypeImagePath OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..112)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU upgrade image folder path." + DEFVAL { "" } + ::= { msanOnuUpgradeHwTypeEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.5.1.8 + msanOnuUpgradeHwTypeServerName OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU upgrade server name. + This is a parameter msanOnuUpgradeServerName from msanOnuUpgradeServerTable." + ::= { msanOnuUpgradeHwTypeEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.5.1.9 + msanOnuUpgradeHwTypeRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + For row creation use createAndWait(5) [createAndGo(4) is not supported]. + Setting this object to active(1) will activate this entry. + Setting this object to destroy(6) will remove this entry. + + Row can be activated only if msanOnuUpgradeHwTypeImageName and + msanOnuUpgradeHwTypeServerName are specified. + + " + ::= { msanOnuUpgradeHwTypeEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.6 + msanOnuVirtGemPortInfoTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuVirtGemPortInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOnu 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.6.1 + msanOnuVirtGemPortInfoEntry OBJECT-TYPE + SYNTAX MsanOnuVirtGemPortInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOnuVirtGemPortInfoIfIndex } + ::= { msanOnuVirtGemPortInfoTable 1 } + + + MsanOnuVirtGemPortInfoEntry ::= + SEQUENCE { + msanOnuVirtGemPortInfoIfIndex + Integer32, + msanOnuVirtGemPortInfoOltGemPortNo + Gauge32, + msanOnuVirtGemPortInfoOltAllocId + Gauge32, + msanOnuVirtGemPortInfoTcontIndex + Gauge32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.6.1.1 + msanOnuVirtGemPortInfoIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Index of Virtual GEM Port (from ifTable)." + ::= { msanOnuVirtGemPortInfoEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.6.1.2 + msanOnuVirtGemPortInfoOltGemPortNo OBJECT-TYPE + SYNTAX Gauge32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "GEM port no which is assigned dynamically by OLT." + ::= { msanOnuVirtGemPortInfoEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.6.1.3 + msanOnuVirtGemPortInfoOltAllocId OBJECT-TYPE + SYNTAX Gauge32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Alloc-ID which is assigned dynamically by OLT, a dynamic Alloc-ID is one-to-one mapped to + a static T-CONT index." + ::= { msanOnuVirtGemPortInfoEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.6.1.4 + msanOnuVirtGemPortInfoTcontIndex OBJECT-TYPE + SYNTAX Gauge32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Static T-CONT index from ONU's perspective." + ::= { msanOnuVirtGemPortInfoEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.7 + msanOnuVirtGemPortStatTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuVirtGemPortStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "This table displays performance statistics for Virtual Gem Ports." + ::= { msanOnu 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.7.1 + msanOnuVirtGemPortStatEntry OBJECT-TYPE + SYNTAX MsanOnuVirtGemPortStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Serves as an index for this table. Identifies the + 15 interval in which PM was collected. The value + 0 identifies the current interval. Value 1 identifies + the latest 15 minute interval and value 96 + identifies the last 15 minute interval in a a 24 hour period." + INDEX { msanOnuVirtGemPortStatIfIndex, msanOnuVirtGemPortStatIntervalId } + ::= { msanOnuVirtGemPortStatTable 1 } + + + MsanOnuVirtGemPortStatEntry ::= + SEQUENCE { + msanOnuVirtGemPortStatIfIndex + Integer32, + msanOnuVirtGemPortStatIntervalId + INTEGER, + msanOnuVirtGemPortStatInFrames + Counter64, + msanOnuVirtGemPortStatInOctets + Counter64, + msanOnuVirtGemPortStatOutFrames + Counter64, + msanOnuVirtGemPortStatOutOctets + Counter64 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.7.1.1 + msanOnuVirtGemPortStatIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Index of Virtual GEM Port (from ifTable)." + ::= { msanOnuVirtGemPortStatEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.7.1.2 + msanOnuVirtGemPortStatIntervalId OBJECT-TYPE + SYNTAX INTEGER (0..96) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Serves as an index for this table. Identifies the + 15 interval in which PM was collected. The value + 0 identifies the current interval. Value 1 identifies + the latest 15 minute interval and value 96 + identifies the last 15 minute interval in a a 24 hour period. + " + ::= { msanOnuVirtGemPortStatEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.7.1.3 + msanOnuVirtGemPortStatInFrames OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The total number of gpon frames received on the interface." + ::= { msanOnuVirtGemPortStatEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.7.1.4 + msanOnuVirtGemPortStatInOctets OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The total number of octets received on the interface. + " + ::= { msanOnuVirtGemPortStatEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.7.1.5 + msanOnuVirtGemPortStatOutFrames OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The total number of gpon frames transmitted out of the + interface." + ::= { msanOnuVirtGemPortStatEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.7.1.6 + msanOnuVirtGemPortStatOutOctets OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The total number of octets transmitted out of the + interface + " + ::= { msanOnuVirtGemPortStatEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.8 + msanOnuBlackListTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuBlackListEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Table for displaying the ONUs in black list per OLT ports. + " + ::= { msanOnu 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.8.1 + msanOnuBlackListEntry OBJECT-TYPE + SYNTAX MsanOnuBlackListEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOnuBlackListIfIndex, msanOnuBlackListSerialNumber } + ::= { msanOnuBlackListTable 1 } + + + MsanOnuBlackListEntry ::= + SEQUENCE { + msanOnuBlackListIfIndex + Integer32, + msanOnuBlackListSerialNumber + DisplayString, + msanOnuBlackListPassword + DisplayString, + msanOnuBlackListCause + INTEGER, + msanOnuBlackListRegistrationid + DisplayString + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.8.1.1 + msanOnuBlackListIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Index of OLT port (from ifTable)." + ::= { msanOnuBlackListEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.8.1.2 + msanOnuBlackListSerialNumber OBJECT-TYPE + SYNTAX DisplayString (SIZE (12)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The serial number. Index for this table. + The serial number is unique for each ONT. + It is defined in ITU-T G.984.3 + and contains the vendor id and version number. The first four bytes are an ASCII encoded + vendor ID four letter mnemonic. The next eight bytes are an ASCII encoded version number (four hex values). + Example: ISKT01C2AA5B + " + ::= { msanOnuBlackListEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.8.1.3 + msanOnuBlackListPassword OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..20)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received ONU password." + ::= { msanOnuBlackListEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.8.1.4 + msanOnuBlackListCause OBJECT-TYPE + SYNTAX INTEGER + { + invalid(1), + unknownSerialnum(2), + passwordMismatch(3), + antiRogueOnu(4), + failedToRanging(5), + linkIdMismatch(6), + registrationIdMismatch(7), + passwordUnknown(8), + registrationidUnknown(9) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The cause of entering black list. + " + ::= { msanOnuBlackListEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.8.1.5 + msanOnuBlackListRegistrationid OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..36)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received Registrationid of XGSPON ONU password." + ::= { msanOnuBlackListEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.9 + msanOnuUpgradeServerTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuUpgradeServerEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOnu 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.9.1 + msanOnuUpgradeServerEntry OBJECT-TYPE + SYNTAX MsanOnuUpgradeServerEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOnuUpgradeServerName } + ::= { msanOnuUpgradeServerTable 1 } + + + MsanOnuUpgradeServerEntry ::= + SEQUENCE { + msanOnuUpgradeServerName + DisplayString, + msanOnuUpgradeServerIpAddress + IpAddress, + msanOnuUpgradeServerUserName + DisplayString, + msanOnuUpgradeServerUserPassword + DisplayString, + msanOnuUpgradeServerProtocol + INTEGER, + msanOnuUpgradeServerProtocolPortId + Integer32, + msanOnuUpgradeServerRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.9.1.1 + msanOnuUpgradeServerName OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..16)) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ONU SW upgrade server name." + ::= { msanOnuUpgradeServerEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.9.1.2 + msanOnuUpgradeServerIpAddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU SW upgrade server IP address." + ::= { msanOnuUpgradeServerEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.9.1.3 + msanOnuUpgradeServerUserName OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..16)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Username used in ONU SW upgrade protocol." + DEFVAL { "anonymous" } + ::= { msanOnuUpgradeServerEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.9.1.4 + msanOnuUpgradeServerUserPassword OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..32)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "User password used in ONU SW upgrade protocol." + DEFVAL { "anonymous" } + ::= { msanOnuUpgradeServerEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.9.1.5 + msanOnuUpgradeServerProtocol OBJECT-TYPE + SYNTAX INTEGER { ftp(1) } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU SW upgrade protocol type." + DEFVAL { ftp } + ::= { msanOnuUpgradeServerEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.9.1.6 + msanOnuUpgradeServerProtocolPortId OBJECT-TYPE + SYNTAX Integer32 (0..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU SW upgrade protocol port number. + + If value is set to -1, standard protocol number is used." + ::= { msanOnuUpgradeServerEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.9.1.7 + msanOnuUpgradeServerRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5). + For row activation use active(1). + For row deletion use destroy(6). + + Other values are currently not supported. + + For row activation parameter msanOnuSwUpgradeServerIpAddress must be defined." + ::= { msanOnuUpgradeServerEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.10 + msanOnuEthPortInfoTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuEthPortInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOnu 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.10.1 + msanOnuEthPortInfoEntry OBJECT-TYPE + SYNTAX MsanOnuEthPortInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOnuEthPortInfoOnuIfIndex, msanOnuEthPortInfoUniId } + ::= { msanOnuEthPortInfoTable 1 } + + + MsanOnuEthPortInfoEntry ::= + SEQUENCE { + msanOnuEthPortInfoOnuIfIndex + Integer32, + msanOnuEthPortInfoUniId + Integer32, + msanOnuEthPortInfoAdminState + INTEGER, + msanOnuEthPortInfoOperState + INTEGER, + msanOnuEthPortInfoType + INTEGER, + msanOnuEthPortInfoSpeed + INTEGER, + msanOnuEthPortInfoDuplex + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.10.1.1 + msanOnuEthPortInfoOnuIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Index of ONU (from ifTable)." + ::= { msanOnuEthPortInfoEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.10.1.2 + msanOnuEthPortInfoUniId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ONU Ethernet Port (UNI) identifier." + ::= { msanOnuEthPortInfoEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.10.1.3 + msanOnuEthPortInfoAdminState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2), + notAvailable(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU eth port (UNI) administration state." + ::= { msanOnuEthPortInfoEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.10.1.4 + msanOnuEthPortInfoOperState OBJECT-TYPE + SYNTAX INTEGER + { + up(1), + down(2), + notAvailable(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU eth port (UNI) operational state." + ::= { msanOnuEthPortInfoEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.10.1.5 + msanOnuEthPortInfoType OBJECT-TYPE + SYNTAX INTEGER + { + fE(1), + gE(2), + notAvailable(3), + tengE(4) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Type of ONU eth port (UNI)." + ::= { msanOnuEthPortInfoEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.10.1.6 + msanOnuEthPortInfoSpeed OBJECT-TYPE + SYNTAX INTEGER + { + mbps10(1), + mbps100(2), + mbps1000(3), + notAvailable(4), + mbps2500(5), + mbps5000(6), + mbps10000(7), + mbps25000(8), + mbps40000(9) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Speed of ONU eth port (UNI). + " + ::= { msanOnuEthPortInfoEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.10.1.7 + msanOnuEthPortInfoDuplex OBJECT-TYPE + SYNTAX INTEGER + { + full(1), + half(2), + notAvailable(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Duplex mode of ONU eth port (UNI)." + ::= { msanOnuEthPortInfoEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11 + msanOnuEthPortStatTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuEthPortStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOnu 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1 + msanOnuEthPortStatEntry OBJECT-TYPE + SYNTAX MsanOnuEthPortStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOnuEthPortStatOnuIfIndex, msanOnuEthPortStatUniId, msanOnuEthPortStatIntervalId } + ::= { msanOnuEthPortStatTable 1 } + + + MsanOnuEthPortStatEntry ::= + SEQUENCE { + msanOnuEthPortStatOnuIfIndex + Integer32, + msanOnuEthPortStatUniId + Integer32, + msanOnuEthPortStatIntervalId + INTEGER, + msanOnuEthPortStatInPkts + Counter64, + msanOnuEthPortStatInUcastPkts + Counter64, + msanOnuEthPortStatInMcastPkts + Counter64, + msanOnuEthPortStatInBcastPkts + Counter64, + msanOnuEthPortStatInOctets + Counter64, + msanOnuEthPortStatInPkts64Octets + Counter64, + msanOnuEthPortStatInPkts64to127Octets + Counter64, + msanOnuEthPortStatInPkts128to255Octets + Counter64, + msanOnuEthPortStatInPkts256to511Octets + Counter64, + msanOnuEthPortStatInPkts512to1023Octets + Counter64, + msanOnuEthPortStatInPkts1024to1518Octets + Counter64, + msanOnuEthPortStatInDiscards + Counter64, + msanOnuEthPortStatInUndersizePkts + Counter64, + msanOnuEthPortStatInOversizePkts + Counter64, + msanOnuEthPortStatInFragments + Counter64, + msanOnuEthPortStatInJabbers + Counter64, + msanOnuEthPortStatInFcsErrors + Counter64, + msanOnuEthPortStatInBufferOverflows + Counter64, + msanOnuEthPortStatInAlignmentError + Counter64, + msanOnuEthPortStatInInternalMACReceiveError + Counter64, + msanOnuEthPortStatOutPkts + Counter64, + msanOnuEthPortStatOutUcastPkts + Counter64, + msanOnuEthPortStatOutMcastPkts + Counter64, + msanOnuEthPortStatOutBcastPkts + Counter64, + msanOnuEthPortStatOutDiscards + Counter64, + msanOnuEthPortStatOutFcsErrors + Counter64, + msanOnuEthPortStatOutExcessiveCollisions + Counter64, + msanOnuEthPortStatOutLateCollisions + Counter64, + msanOnuEthPortStatOutBufferOverflows + Counter64, + msanOnuEthPortStatOutSingleCollisionPkts + Counter64, + msanOnuEthPortStatOutMultipleCollisionsPkts + Counter64, + msanOnuEthPortStatOutDeferredTransmission + Counter64, + msanOnuEthPortStatOutInternalMACTransmitError + Counter64, + msanOnuEthPortStatSQEs + Counter64, + msanOnuEthPortStatCarrierSenseError + Counter64 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.1 + msanOnuEthPortStatOnuIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Index of ONU (from ifTable)." + ::= { msanOnuEthPortStatEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.2 + msanOnuEthPortStatUniId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ONU Ethernet Port (UNI) identifier." + ::= { msanOnuEthPortStatEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.3 + msanOnuEthPortStatIntervalId OBJECT-TYPE + SYNTAX INTEGER (0..96) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Serves as an index for this table. Identifies the + 15 interval in which PM was collected. The value + 0 identifies the current interval. Value 1 identifies + the latest 15 minute interval and value 96 + identifies the last 15 minute interval in a a 24 hour period. + " + ::= { msanOnuEthPortStatEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.4 + msanOnuEthPortStatInPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The total number of received ethernet packets." + ::= { msanOnuEthPortStatEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.5 + msanOnuEthPortStatInUcastPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of received unicast ethernet packets." + ::= { msanOnuEthPortStatEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.6 + msanOnuEthPortStatInMcastPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of received multicast ethernet packets." + ::= { msanOnuEthPortStatEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.7 + msanOnuEthPortStatInBcastPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of received broadcast ethernet packets." + ::= { msanOnuEthPortStatEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.8 + msanOnuEthPortStatInOctets OBJECT-TYPE + SYNTAX Counter64 + UNITS "Octets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The total number of octets received on the interface, + including framing characters. + " + ::= { msanOnuEthPortStatEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.9 + msanOnuEthPortStatInPkts64Octets OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of received packets (including bad packets) + that were 64 octets long, excluding framing bitsbut including FCS. + " + ::= { msanOnuEthPortStatEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.10 + msanOnuEthPortStatInPkts64to127Octets OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of received packets (including bad packets) + that were 65..127 octets long, + excluding framing bits but including FCS. " + ::= { msanOnuEthPortStatEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.11 + msanOnuEthPortStatInPkts128to255Octets OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of received ethernet packets that were between 128 and 255 octets in length." + ::= { msanOnuEthPortStatEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.12 + msanOnuEthPortStatInPkts256to511Octets OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of received ethernet packets that were between 256 and 511 octets in length." + ::= { msanOnuEthPortStatEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.13 + msanOnuEthPortStatInPkts512to1023Octets OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of received ethernet packets that were between 256 and 511 octets in length." + ::= { msanOnuEthPortStatEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.14 + msanOnuEthPortStatInPkts1024to1518Octets OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of received ethernet packets that were between 512 and 1518 octets in length." + ::= { msanOnuEthPortStatEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.15 + msanOnuEthPortStatInDiscards OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of discarded received ethernet packets." + ::= { msanOnuEthPortStatEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.16 + msanOnuEthPortStatInUndersizePkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of packets received that were + less than 64 octets long and were otherwise well + formed. + " + ::= { msanOnuEthPortStatEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.17 + msanOnuEthPortStatInOversizePkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The total number of packets received that were + longer than 1518 octets (excluding framing bits, + but including FCS octets) and were otherwise + well formed. + + " + ::= { msanOnuEthPortStatEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.18 + msanOnuEthPortStatInFragments OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of packets received that were less than + 64 octets long, excluding framing + bits but including FCS octets, and had either a bad + Packet check sequence (FCS) with an integral + number of octets (FCS error) or a bad FCS with a non-integral + number of octets (alignment error). + It is entirely normal for this attribute to increment. + This is because it counts both runts (which are normal + occurrences due to collisions) and noise hits. + + " + ::= { msanOnuEthPortStatEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.19 + msanOnuEthPortStatInJabbers OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of packets received that were longer than + 1518 octets, excluding framing bits but including FCS octets, + and had either a bad Packet check sequence (FCS) with an integral + number of octets (FCS error) or a bad FCS with a non-integral + number of octets (alignment error). + The range to detect jabber is between 20 ms and 150 ms. + + + " + ::= { msanOnuEthPortStatEntry 19 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.20 + msanOnuEthPortStatInFcsErrors OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of received ethernet packets with FCS error." + ::= { msanOnuEthPortStatEntry 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.21 + msanOnuEthPortStatInBufferOverflows OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute counts the number of times that + the receive buffer overflowed." + ::= { msanOnuEthPortStatEntry 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.22 + msanOnuEthPortStatInAlignmentError OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute counts received Packets that were + not an integral number of octets in length + and did not pass the FCS check. + " + ::= { msanOnuEthPortStatEntry 22 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.23 + msanOnuEthPortStatInInternalMACReceiveError OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute counts Packets whose reception + failed due to an internal MAC sublayer receive error + " + ::= { msanOnuEthPortStatEntry 23 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.24 + msanOnuEthPortStatOutPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The total number of transmitted ethernet packets." + ::= { msanOnuEthPortStatEntry 24 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.25 + msanOnuEthPortStatOutUcastPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of transmitted unicast ethernet packets." + ::= { msanOnuEthPortStatEntry 25 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.26 + msanOnuEthPortStatOutMcastPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of transmitted multicast ethernet packets." + ::= { msanOnuEthPortStatEntry 26 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.27 + msanOnuEthPortStatOutBcastPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of transmitted broadcast ethernet packets." + ::= { msanOnuEthPortStatEntry 27 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.28 + msanOnuEthPortStatOutDiscards OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of discarded transmitted ethernet packets." + ::= { msanOnuEthPortStatEntry 28 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.29 + msanOnuEthPortStatOutFcsErrors OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of transmitted ethernet packets with FCS error." + ::= { msanOnuEthPortStatEntry 29 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.30 + msanOnuEthPortStatOutExcessiveCollisions OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute counts Packets whose transmission + failed due to excessive collisions. + " + ::= { msanOnuEthPortStatEntry 30 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.31 + msanOnuEthPortStatOutLateCollisions OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute counts the number of times that + a collision was detected later than 512 bit + times into the transmission of a packet. + + " + ::= { msanOnuEthPortStatEntry 31 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.32 + msanOnuEthPortStatOutBufferOverflows OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute counts the number of times that + the transmit buffer overflowed. + + + " + ::= { msanOnuEthPortStatEntry 32 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.33 + msanOnuEthPortStatOutSingleCollisionPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute counts successfully transmitted + Packets whose transmission was delayed by + exactly one collision. + + " + ::= { msanOnuEthPortStatEntry 33 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.34 + msanOnuEthPortStatOutMultipleCollisionsPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute counts successfully transmitted + Packets whose transmission was delayed by + more than one collision. + + + " + ::= { msanOnuEthPortStatEntry 34 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.35 + msanOnuEthPortStatOutDeferredTransmission OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute counts Packets whose first + transmission attempt was delayed because the medium + was busy. The count does not include Packets + involved in collisions. + + + " + ::= { msanOnuEthPortStatEntry 35 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.36 + msanOnuEthPortStatOutInternalMACTransmitError OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute counts Packets whose transmission + failed due to an internal MAC sublayer transmit error. + + + " + ::= { msanOnuEthPortStatEntry 36 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.37 + msanOnuEthPortStatSQEs OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute counts the number of times that + the SQE test error message was generated by + the PLS sublayer. + + + + " + ::= { msanOnuEthPortStatEntry 37 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.11.1.38 + msanOnuEthPortStatCarrierSenseError OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "This attribute counts the number of times that + carrier sense was lost or never asserted when + attempting to transmit a Packet. + + + + " + ::= { msanOnuEthPortStatEntry 38 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.12 + msanOnuDefaultConfigFileTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuDefaultConfigFileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOnu 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.12.1 + msanOnuDefaultConfigFileEntry OBJECT-TYPE + SYNTAX MsanOnuDefaultConfigFileEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOnuDefaultConfigFileName } + ::= { msanOnuDefaultConfigFileTable 1 } + + + MsanOnuDefaultConfigFileEntry ::= + SEQUENCE { + msanOnuDefaultConfigFileName + DisplayString, + msanOnuDefaultConfigFileRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.12.1.1 + msanOnuDefaultConfigFileName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ONU default config file name." + ::= { msanOnuDefaultConfigFileEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.12.1.2 + msanOnuDefaultConfigFileRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + Setting this object to destroy(6) will remove this entry. + Read values: active(1). + Other values are currently not supported." + ::= { msanOnuDefaultConfigFileEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.13 + msanOnuCfgAttributeTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuCfgAttributeEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOnu 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.13.1 + msanOnuCfgAttributeEntry OBJECT-TYPE + SYNTAX MsanOnuCfgAttributeEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOnuCfgAttributeIfIndex, msanOnuCfgAttributeId } + ::= { msanOnuCfgAttributeTable 1 } + + + MsanOnuCfgAttributeEntry ::= + SEQUENCE { + msanOnuCfgAttributeIfIndex + Integer32, + msanOnuCfgAttributeId + Integer32, + msanOnuCfgAttributeName + DisplayString, + msanOnuCfgAttributeValue + DisplayString, + msanOnuCfgAttributeRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.13.1.2 + msanOnuCfgAttributeIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Index of ONU interface (from ifTable)." + ::= { msanOnuCfgAttributeEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.13.1.3 + msanOnuCfgAttributeId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Onu Attribute Id" + ::= { msanOnuCfgAttributeEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.13.1.4 + msanOnuCfgAttributeName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU config attribute name." + DEFVAL { ''b } + ::= { msanOnuCfgAttributeEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.13.1.5 + msanOnuCfgAttributeValue OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU config attribute value" + DEFVAL { ''b } + ::= { msanOnuCfgAttributeEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.13.1.6 + msanOnuCfgAttributeRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndGo(4). + For row activation use active(1). + For row deletion use destroy(6). + + Other values are currently not supported." + ::= { msanOnuCfgAttributeEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.14 + msanOnuVideoAniPortTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuVideoAniPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOnu 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.14.1 + msanOnuVideoAniPortEntry OBJECT-TYPE + SYNTAX MsanOnuVideoAniPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOnuVideoAniPortOnuIfIndex, msanOnuVideoAniPortAniId } + ::= { msanOnuVideoAniPortTable 1 } + + + MsanOnuVideoAniPortEntry ::= + SEQUENCE { + msanOnuVideoAniPortOnuIfIndex + Integer32, + msanOnuVideoAniPortAniId + Integer32, + msanOnuVideoAniPortAdminState + INTEGER, + msanOnuVideoAniPortOperState + INTEGER, + msanOnuVideoAniPortRowStatus + RowStatus, + msanOnuVideoAniPortTotalOpticalPowerLevel + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.14.1.1 + msanOnuVideoAniPortOnuIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Index of ONU (from ifTable)." + ::= { msanOnuVideoAniPortEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.14.1.2 + msanOnuVideoAniPortAniId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ONU Video ANI Port identifier." + ::= { msanOnuVideoAniPortEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.14.1.3 + msanOnuVideoAniPortAdminState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU Video ANI port administration state." + ::= { msanOnuVideoAniPortEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.14.1.4 + msanOnuVideoAniPortOperState OBJECT-TYPE + SYNTAX INTEGER + { + up(1), + down(2), + notAvailable(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU Video ANI port operational state." + ::= { msanOnuVideoAniPortEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.14.1.5 + msanOnuVideoAniPortRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndGo(4). + For row activation use active(1). + For row deletion use destroy(6). + + Other values are currently not supported." + ::= { msanOnuVideoAniPortEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.14.1.6 + msanOnuVideoAniPortTotalOpticalPowerLevel OBJECT-TYPE + SYNTAX Integer32 + UNITS "dBuW" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU Video ANI port Total Optical Power Level [dBuW]. + Info: -1 defines that value is not available." + ::= { msanOnuVideoAniPortEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.15 + msanOnuVideoUniPortTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuVideoUniPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOnu 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.15.1 + msanOnuVideoUniPortEntry OBJECT-TYPE + SYNTAX MsanOnuVideoUniPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOnuVideoUniPortOnuIfIndex, msanOnuVideoUniPortUniId } + ::= { msanOnuVideoUniPortTable 1 } + + + MsanOnuVideoUniPortEntry ::= + SEQUENCE { + msanOnuVideoUniPortOnuIfIndex + Integer32, + msanOnuVideoUniPortUniId + Integer32, + msanOnuVideoUniPortAdminState + INTEGER, + msanOnuVideoUniPortOperState + INTEGER, + msanOnuVideoUniPortRowStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.15.1.1 + msanOnuVideoUniPortOnuIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Index of ONU (from ifTable)." + ::= { msanOnuVideoUniPortEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.15.1.2 + msanOnuVideoUniPortUniId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ONU Video Ani Port identifier." + ::= { msanOnuVideoUniPortEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.15.1.3 + msanOnuVideoUniPortAdminState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU Video UNI port administration state." + ::= { msanOnuVideoUniPortEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.15.1.4 + msanOnuVideoUniPortOperState OBJECT-TYPE + SYNTAX INTEGER + { + up(1), + down(2), + notAvailable(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ONU Video UNI port operational state." + ::= { msanOnuVideoUniPortEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.15.1.5 + msanOnuVideoUniPortRowStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndGo(4). + For row activation use active(1). + For row deletion use destroy(6). + + Other values are currently not supported." + ::= { msanOnuVideoUniPortEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.16 + msanOnuEthPortConfTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOnuEthPortConfEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOnu 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.16.1 + msanOnuEthPortConfEntry OBJECT-TYPE + SYNTAX MsanOnuEthPortConfEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOnuEthPortConfOnuIfIndex, msanOnuEthPortConfUniId } + ::= { msanOnuEthPortConfTable 1 } + + + MsanOnuEthPortConfEntry ::= + SEQUENCE { + msanOnuEthPortConfOnuIfIndex + Integer32, + msanOnuEthPortConfUniId + Integer32, + msanOnuEthPortConfAdminState + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.16.1.1 + msanOnuEthPortConfOnuIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Index of ONU (from ifTable)." + ::= { msanOnuEthPortConfEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.16.1.2 + msanOnuEthPortConfUniId OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "ONU Ethernet Port (UNI) identifier." + ::= { msanOnuEthPortConfEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.111.16.1.3 + msanOnuEthPortConfAdminState OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2), + poe(3), + unconfigured(4) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU eth port (UNI) administration state forced by OLT side." + ::= { msanOnuEthPortConfEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112 + msanOlt OBJECT IDENTIFIER ::= { msanAdditionalConf 112 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.1 + msanOltGlobal OBJECT IDENTIFIER ::= { msanOlt 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.1.1 + msanOltBlackListRefresh OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set this option to enable to initiate a blacklist refresh for all OLT ports." + ::= { msanOltGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.1.2 + msanOltProtectSwitchHeartbeatRepetitionDelay OBJECT-TYPE + SYNTAX Integer32 (100..5000) + UNITS "miliseconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "OLT Protection Switching Heartbeat repetition delay." + ::= { msanOltGlobal 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.1.3 + msanOltProtectSwitchHeartbeatLossThreshold OBJECT-TYPE + SYNTAX Integer32 (1..10) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "OLT Protection Switching Heartbeat loss threshold." + ::= { msanOltGlobal 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2 + msanOltPortTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOltPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + " " + ::= { msanOlt 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1 + msanOltPortEntry OBJECT-TYPE + SYNTAX MsanOltPortEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Row Description" + INDEX { msanOltPortIfIndex } + ::= { msanOltPortTable 1 } + + + MsanOltPortEntry ::= + SEQUENCE { + msanOltPortIfIndex + Integer32, + msanOltPortOnuDiscoveryMode + INTEGER, + msanOltPortOnuDiscoveryInterval + Unsigned32, + msanOltPortDbaCycleTime + Unsigned32, + msanOltPortLinkMinDistance + INTEGER, + msanOltPortLinkMaxDistance + INTEGER, + msanOltPortLosThreshold + INTEGER, + msanOltPortLofThreshold + INTEGER, + msanOltPortBlackListRefresh + INTEGER, + msanOltPortUsEstAvailTotalBw + Integer32, + msanOltPortUsEstAvailFixedBw + Integer32, + msanOltPortUsActAvailTotalBw + Integer32, + msanOltPortUsActAvailFixedBw + Integer32, + msanOltPortEncryptKeyExchange + INTEGER, + msanOltPortEncryptKeyExchangeInterval + Integer32, + msanOltPortTransciverVendorPN + DisplayString, + msanOltPortRogueOnuDetection + INTEGER, + msanOltPortOnuPhyPowerLevel + INTEGER, + msanOltPortPowerMeasurementsStart + INTEGER, + msanOltPortDsFec + INTEGER + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.2 + msanOltPortIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Index of OLT port (from ifTable)." + ::= { msanOltPortEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.5 + msanOltPortOnuDiscoveryMode OBJECT-TYPE + SYNTAX INTEGER + { + autoPeriodic(1), + manualEnabledOnceThenDisabled(2), + disabled(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU discovery mode: + 1 Auto periodic (onuDiscoveryInterval is the + period) + 2 Manual enabled once then disabled + 3 Disabled " + DEFVAL { 1 } + ::= { msanOltPortEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.6 + msanOltPortOnuDiscoveryInterval OBJECT-TYPE + SYNTAX Unsigned32 (1..3600) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "ONU discovery interval, i.e., serial Number acquisition + interval in seconds. The value ranges from 1 to 3600 " + DEFVAL { 30 } + ::= { msanOltPortEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.7 + msanOltPortDbaCycleTime OBJECT-TYPE + SYNTAX Unsigned32 (2..8) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Upstream bandwidth assignment cycle time. only support 2ms, 4ms and 8ms." + DEFVAL { 8 } + ::= { msanOltPortEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.8 + msanOltPortLinkMinDistance OBJECT-TYPE + SYNTAX INTEGER (0..60) + UNITS "km" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Minimum PON link distance. + + Maximum allowed interval between msanOltPortLinkMinDistance and msanOltPortLinkMaxDistance + is 20km." + ::= { msanOltPortEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.9 + msanOltPortLinkMaxDistance OBJECT-TYPE + SYNTAX INTEGER (0..60) + UNITS "km" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Maximum PON link distance. + + Maximum allowed interval between msanOltPortLinkMinDistance and msanOltPortLinkMaxDistance + is 20km." + ::= { msanOltPortEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.10 + msanOltPortLosThreshold OBJECT-TYPE + SYNTAX INTEGER (1..10) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of consecutive upstream frames that had valid alloc id for which no optical signal was received from + any ONT on the link. After this many number of frames, a LOS alarm will be raised. + WARNING: The default value = 4 is set by G984.3 Standard. Modify for debug purposes only." + DEFVAL { 4 } + ::= { msanOltPortEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.11 + msanOltPortLofThreshold OBJECT-TYPE + SYNTAX INTEGER (1..10) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of consecutive upstream frames from an ONT that are lost. After this many number of frames, a LOFi + alarm will be raised. + WARNING: The default value = 4 is set by G984.3 Standard. Modify for debug purposes only." + DEFVAL { 4 } + ::= { msanOltPortEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.12 + msanOltPortBlackListRefresh OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Set this option to ¡enable¡to initiate a blacklist refresh for this OLT port." + ::= { msanOltPortEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.13 + msanOltPortUsEstAvailTotalBw OBJECT-TYPE + SYNTAX Integer32 + UNITS "kbps" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "OLT interface estimated available total upstream bandwidth." + ::= { msanOltPortEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.14 + msanOltPortUsEstAvailFixedBw OBJECT-TYPE + SYNTAX Integer32 + UNITS "kbps" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "OLT interface estimated available fixed upstream bandwidth." + ::= { msanOltPortEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.15 + msanOltPortUsActAvailTotalBw OBJECT-TYPE + SYNTAX Integer32 + UNITS "kbps" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "OLT interface actual available total upstream bandwidth." + ::= { msanOltPortEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.16 + msanOltPortUsActAvailFixedBw OBJECT-TYPE + SYNTAX Integer32 + UNITS "kbps" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "OLT interface actual available total upstream bandwidth." + ::= { msanOltPortEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.17 + msanOltPortEncryptKeyExchange OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Encryption key exchange." + ::= { msanOltPortEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.18 + msanOltPortEncryptKeyExchangeInterval OBJECT-TYPE + SYNTAX Integer32 (30..26000) + UNITS "seconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Encryption key exchange interval." + ::= { msanOltPortEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.19 + msanOltPortTransciverVendorPN OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "GPON SFP type" + ::= { msanOltPortEntry 19 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.20 + msanOltPortRogueOnuDetection OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Rogue ONU detection." + ::= { msanOltPortEntry 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.21 + msanOltPortOnuPhyPowerLevel OBJECT-TYPE + SYNTAX INTEGER + { + normal(1), + level3dB(2), + level6dB(3) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + " ONU phy power leveling" + ::= { msanOltPortEntry 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.22 + msanOltPortPowerMeasurementsStart OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Start ONU/OLT Rx/Tx Power Measurements " + DEFVAL { disable } + ::= { msanOltPortEntry 22 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.2.1.23 + msanOltPortDsFec OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Start ONU/OLT Rx/Tx Power Measurements " + DEFVAL { disable } + ::= { msanOltPortEntry 23 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3 + msanOltPortStatTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOltPortStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOlt 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1 + msanOltPortStatEntry OBJECT-TYPE + SYNTAX MsanOltPortStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOltPortStatIfIndex, msanOltPortStatIntervalId } + ::= { msanOltPortStatTable 1 } + + + MsanOltPortStatEntry ::= + SEQUENCE { + msanOltPortStatIfIndex + Integer32, + msanOltPortStatIntervalId + INTEGER, + msanOltPortStatInOmciPkts + Counter64, + msanOltPortStatInCpuPkts + Counter64, + msanOltPortStatInPktsDiscarded + Counter64, + msanOltPortStatInPktsUndersize + Counter64, + msanOltPortStatInPktsOversize + Counter64, + msanOltPortStatInPktsCrcError + Counter64, + msanOltPortStatInPktsKeyError + Counter64, + msanOltPortStatOutPktsTpidError + Counter64, + msanOltPortStatOutPktsVidError + Counter64, + msanOltPortStatInPktsFragmentError + Counter64, + msanOltPortStatInGemFrames + Counter64, + msanOltPortStatInGemFramesDiscarded + Counter64, + msanOltPortStatInGemFramesIdle + Counter64, + msanOltPortStatInGemFramesCorrected + Counter64, + msanOltPortStatInGemFramesIllegal + Counter64, + msanOltPortStatInAllocationsValid + Counter64, + msanOltPortStatInAllocationsInvalid + Counter64, + msanOltPortStatInAllocationsDisabled + Counter64, + msanOltPortStatInPloamMsgs + Counter64, + msanOltPortStatInPloamMsgsNonIdle + Counter64, + msanOltPortStatInPloamMsgsError + Counter64, + msanOltPortStatInPloamMsgsDiscarded + Counter64, + msanOltPortStatInFecCodewords + Counter64, + msanOltPortStatInFecCodewordsUncorrected + Counter64, + msanOltPortStatInBip8Bytes + Counter64, + msanOltPortStatInBip8Errors + Counter64, + msanOltPortStatOutOmciPkts + Counter64, + msanOltPortStatOutCpuPkts + Counter64, + msanOltPortStatOutPktsDiscarded + Counter64, + msanOltPortStatOutGemFrames + Counter64, + msanOltPortStatOutPloamMsgs + Counter64 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.1 + msanOltPortStatIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Index of OLT interface (from ifTable)." + ::= { msanOltPortStatEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.2 + msanOltPortStatIntervalId OBJECT-TYPE + SYNTAX INTEGER (0..96) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Serves as an index for this table. Identifies the + 15 interval in which PM was collected. The value + 0 identifies the current interval. Value 1 identifies + the latest 15 minute interval and value 96 + identifies the last 15 minute interval in a a 24 hour period. + " + ::= { msanOltPortStatEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.3 + msanOltPortStatInOmciPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received OMCI packets." + ::= { msanOltPortStatEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.4 + msanOltPortStatInCpuPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received CPU packets." + ::= { msanOltPortStatEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.5 + msanOltPortStatInPktsDiscarded OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of dropped received packets." + ::= { msanOltPortStatEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.6 + msanOltPortStatInPktsUndersize OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received packets dropped due to length too short." + ::= { msanOltPortStatEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.7 + msanOltPortStatInPktsOversize OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received packets dropped due to length too long." + ::= { msanOltPortStatEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.8 + msanOltPortStatInPktsCrcError OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received packets dropped due to CRC error." + ::= { msanOltPortStatEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.9 + msanOltPortStatInPktsKeyError OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received packets dropped due to Key error." + ::= { msanOltPortStatEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.10 + msanOltPortStatOutPktsTpidError OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received packet dropped due to TPID error." + ::= { msanOltPortStatEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.11 + msanOltPortStatOutPktsVidError OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received packet dropped due to VID error." + ::= { msanOltPortStatEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.12 + msanOltPortStatInPktsFragmentError OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received packet dropped due to fragmentation error." + ::= { msanOltPortStatEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.13 + msanOltPortStatInGemFrames OBJECT-TYPE + SYNTAX Counter64 + UNITS "Frames" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received GEM frames." + ::= { msanOltPortStatEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.14 + msanOltPortStatInGemFramesDiscarded OBJECT-TYPE + SYNTAX Counter64 + UNITS "Frames" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of corrected received GEM frames." + ::= { msanOltPortStatEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.15 + msanOltPortStatInGemFramesIdle OBJECT-TYPE + SYNTAX Counter64 + UNITS "Frames" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of idle received GEM frames." + ::= { msanOltPortStatEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.16 + msanOltPortStatInGemFramesCorrected OBJECT-TYPE + SYNTAX Counter64 + UNITS "Frames" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of corrected received GEM frames." + ::= { msanOltPortStatEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.17 + msanOltPortStatInGemFramesIllegal OBJECT-TYPE + SYNTAX Counter64 + UNITS "Frames" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of illegal received GEM frames." + ::= { msanOltPortStatEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.18 + msanOltPortStatInAllocationsValid OBJECT-TYPE + SYNTAX Counter64 + UNITS "Allocations" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received valid allocations." + ::= { msanOltPortStatEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.19 + msanOltPortStatInAllocationsInvalid OBJECT-TYPE + SYNTAX Counter64 + UNITS "Allocations" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received invalid allocations." + ::= { msanOltPortStatEntry 19 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.20 + msanOltPortStatInAllocationsDisabled OBJECT-TYPE + SYNTAX Counter64 + UNITS "Allocations" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received disabled allocations." + ::= { msanOltPortStatEntry 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.21 + msanOltPortStatInPloamMsgs OBJECT-TYPE + SYNTAX Counter64 + UNITS "PLOAM messages" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received PLOAM (physical layer operations and maintenance) messages." + ::= { msanOltPortStatEntry 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.22 + msanOltPortStatInPloamMsgsNonIdle OBJECT-TYPE + SYNTAX Counter64 + UNITS "Messages" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received non-idle PLOAM (physical layer operations and maintenance) messages." + ::= { msanOltPortStatEntry 22 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.23 + msanOltPortStatInPloamMsgsError OBJECT-TYPE + SYNTAX Counter64 + UNITS "Messages" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received PLOAM (physical layer operations and maintenance) messages with errors." + ::= { msanOltPortStatEntry 23 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.24 + msanOltPortStatInPloamMsgsDiscarded OBJECT-TYPE + SYNTAX Counter64 + UNITS "Messages" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of discarded PLOAM (physical layer operations and maintenance) messages." + ::= { msanOltPortStatEntry 24 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.25 + msanOltPortStatInFecCodewords OBJECT-TYPE + SYNTAX Counter64 + UNITS "Codewords" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received FEC (Forward error correction) codewords." + ::= { msanOltPortStatEntry 25 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.26 + msanOltPortStatInFecCodewordsUncorrected OBJECT-TYPE + SYNTAX Counter64 + UNITS "Codewords" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received uncorrected FEC (Forward error correction) codewords." + ::= { msanOltPortStatEntry 26 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.27 + msanOltPortStatInBip8Bytes OBJECT-TYPE + SYNTAX Counter64 + UNITS "Bytes" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received bytes protected by Bip8." + ::= { msanOltPortStatEntry 27 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.28 + msanOltPortStatInBip8Errors OBJECT-TYPE + SYNTAX Counter64 + UNITS "Bytes" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received Bip8 errors." + ::= { msanOltPortStatEntry 28 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.29 + msanOltPortStatOutOmciPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Transmitted OMCI packets." + ::= { msanOltPortStatEntry 29 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.30 + msanOltPortStatOutCpuPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Transmitted CPU packets." + ::= { msanOltPortStatEntry 30 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.31 + msanOltPortStatOutPktsDiscarded OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of dropped transmitted packets because of illegal length." + ::= { msanOltPortStatEntry 31 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.32 + msanOltPortStatOutGemFrames OBJECT-TYPE + SYNTAX Counter64 + UNITS "Frames" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Transmitted GEM frames." + ::= { msanOltPortStatEntry 32 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.3.1.33 + msanOltPortStatOutPloamMsgs OBJECT-TYPE + SYNTAX Counter64 + UNITS "PLOAM messages" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of transmitted PLOAM (physical layer operations and maintenance) messages." + ::= { msanOltPortStatEntry 33 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4 + msanOltOnuPortStatTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOltOnuPortStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOlt 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1 + msanOltOnuPortStatEntry OBJECT-TYPE + SYNTAX MsanOltOnuPortStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOltOnuPortStatIfIndex } + ::= { msanOltOnuPortStatTable 1 } + + + MsanOltOnuPortStatEntry ::= + SEQUENCE { + msanOltOnuPortStatIfIndex + Integer32, + msanOltOnuPortStatInFecCodewords + Counter64, + msanOltOnuPortStatInFecBytesCorrected + Counter64, + msanOltOnuPortStatInFecCodewordsCorrected + Counter64, + msanOltOnuPortStatInFecCodewordsUncorrected + Counter64, + msanOltOnuPortStatInBip8Bytes + Counter64, + msanOltOnuPortStatInBip8Errors + Counter64, + msanOltOnuPortStatInPloamMsgsCrcError + Counter64, + msanOltOnuPortStatInPloamMsgsNonIdle + Counter64, + msanOltOnuPortStatInDriftPositive + Counter64, + msanOltOnuPortStatInDriftNegative + Counter64, + msanOltOnuPortStatInOmciPkts + Counter64, + msanOltOnuPortStatInOmciPktsCrcError + Counter64, + msanOltOnuPortStatInBerReported + Counter64, + msanOltOnuPortStatInLcdgErrors + Counter64, + msanOltOnuPortStatInRdiErrors + Counter64, + msanOltOnuPortStatUnreceivedBurst + Counter64, + msanOltOnuPortStatInDelimiterMissEvents + Counter64 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1.1 + msanOltOnuPortStatIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Index of ONU interface (from ifTable)." + ::= { msanOltOnuPortStatEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1.2 + msanOltOnuPortStatInFecCodewords OBJECT-TYPE + SYNTAX Counter64 + UNITS "Codewords" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received FEC (Forward error correction) codewords. + " + ::= { msanOltOnuPortStatEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1.3 + msanOltOnuPortStatInFecBytesCorrected OBJECT-TYPE + SYNTAX Counter64 + UNITS "Bytes" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received corrected FEC (Forward error correction) bytes." + ::= { msanOltOnuPortStatEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1.4 + msanOltOnuPortStatInFecCodewordsCorrected OBJECT-TYPE + SYNTAX Counter64 + UNITS "Codewords" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received corrected FEC (Forward error correction) codewords." + ::= { msanOltOnuPortStatEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1.5 + msanOltOnuPortStatInFecCodewordsUncorrected OBJECT-TYPE + SYNTAX Counter64 + UNITS "Codewords" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received uncorrected FEC (Forward error correction) codewords." + ::= { msanOltOnuPortStatEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1.6 + msanOltOnuPortStatInBip8Bytes OBJECT-TYPE + SYNTAX Counter64 + UNITS "Bytes" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received bytes protected by Bip8." + ::= { msanOltOnuPortStatEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1.7 + msanOltOnuPortStatInBip8Errors OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received Bip8 errors." + ::= { msanOltOnuPortStatEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1.8 + msanOltOnuPortStatInPloamMsgsCrcError OBJECT-TYPE + SYNTAX Counter64 + UNITS "Messages" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received PLOAM (physical layer operations and maintenance) messages with CRC error." + ::= { msanOltOnuPortStatEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1.9 + msanOltOnuPortStatInPloamMsgsNonIdle OBJECT-TYPE + SYNTAX Counter64 + UNITS "Messages" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received non-idle PLOAM (physical layer operations and maintenance) messages." + ::= { msanOltOnuPortStatEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1.10 + msanOltOnuPortStatInDriftPositive OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of accumulated positive drift in bits." + ::= { msanOltOnuPortStatEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1.11 + msanOltOnuPortStatInDriftNegative OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of accumulated negative drift in bits." + ::= { msanOltOnuPortStatEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1.12 + msanOltOnuPortStatInOmciPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received OMCI packets." + ::= { msanOltOnuPortStatEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1.13 + msanOltOnuPortStatInOmciPktsCrcError OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received OMCI packets with CRC error." + ::= { msanOltOnuPortStatEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1.14 + msanOltOnuPortStatInBerReported OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Accumulated REI error count reported by the ONU." + ::= { msanOltOnuPortStatEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1.15 + msanOltOnuPortStatInLcdgErrors OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received LCDG errors." + ::= { msanOltOnuPortStatEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1.16 + msanOltOnuPortStatInRdiErrors OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received RDI errors." + ::= { msanOltOnuPortStatEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1.17 + msanOltOnuPortStatUnreceivedBurst OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Un-received burst allocated to the ONU." + ::= { msanOltOnuPortStatEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.4.1.18 + msanOltOnuPortStatInDelimiterMissEvents OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Un-received burst allocated to the ONU." + ::= { msanOltOnuPortStatEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.5 + msanOltProtectSwitchPairTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOltProtectSwitchPairEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOlt 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.5.1 + msanOltProtectSwitchPairEntry OBJECT-TYPE + SYNTAX MsanOltProtectSwitchPairEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOltProtectSwitchPairName } + ::= { msanOltProtectSwitchPairTable 1 } + + + MsanOltProtectSwitchPairEntry ::= + SEQUENCE { + msanOltProtectSwitchPairName + DisplayString, + msanOltProtectSwitchPairPrimaryIfIndex + Integer32, + msanOltProtectSwitchPairPrimaryIpAddress + IpAddress, + msanOltProtectSwitchPairSecondaryIfIndex + Integer32, + msanOltProtectSwitchPairSecondaryIpAddress + IpAddress, + msanOltProtectSwitchPairType + INTEGER, + msanOltProtectSwitchPairTimeout + Integer32, + msanOltProtectSwitchPairActive + INTEGER, + msanOltProtectSwitchPairStatus + INTEGER, + msanOltProtectSwitchPairSwitchOver + INTEGER, + msanOltProtectSwitchPairRowStatus + Integer32 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.5.1.1 + msanOltProtectSwitchPairName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "OLT Protection Switching Pair name." + ::= { msanOltProtectSwitchPairEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.5.1.2 + msanOltProtectSwitchPairPrimaryIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "OLT Protection Switching Pair: Index of Primary OLT interface (from ifTable). + + Value 0 defines that parameter is not set." + ::= { msanOltProtectSwitchPairEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.5.1.3 + msanOltProtectSwitchPairPrimaryIpAddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "OLT Protection Switching Pair: IP Address of Primary OLT interface." + ::= { msanOltProtectSwitchPairEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.5.1.4 + msanOltProtectSwitchPairSecondaryIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "OLT Protection Switching Pair: Index of Secondary OLT interface (from ifTable). + + Value 0 defines that parameter is not set." + ::= { msanOltProtectSwitchPairEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.5.1.5 + msanOltProtectSwitchPairSecondaryIpAddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "OLT Protection Switching Pair: IP Address of Secondary OLT interface " + ::= { msanOltProtectSwitchPairEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.5.1.6 + msanOltProtectSwitchPairType OBJECT-TYPE + SYNTAX INTEGER { b(1) } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "OLT Protection Switching Pair type" + ::= { msanOltProtectSwitchPairEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.5.1.7 + msanOltProtectSwitchPairTimeout OBJECT-TYPE + SYNTAX Integer32 + UNITS "miliseconds" + MAX-ACCESS read-only + STATUS obsolete + DESCRIPTION + "OLT Protection Switching Pair connection timeout." + ::= { msanOltProtectSwitchPairEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.5.1.8 + msanOltProtectSwitchPairActive OBJECT-TYPE + SYNTAX INTEGER + { + primary(1), + secondary(2), + none(3) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "OLT Protection Switching Pair currently active side." + ::= { msanOltProtectSwitchPairEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.5.1.9 + msanOltProtectSwitchPairStatus OBJECT-TYPE + SYNTAX INTEGER + { + active(1), + notInService(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "OLT Protection Switching Pair connection status." + ::= { msanOltProtectSwitchPairEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.5.1.10 + msanOltProtectSwitchPairSwitchOver OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "OLT Protection Switching Pair switch over action." + DEFVAL { disable } + ::= { msanOltProtectSwitchPairEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.5.1.11 + msanOltProtectSwitchPairRowStatus OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The row status object controls the creation/deletion of rows in this table. + Its semantics are the same as those for the RowStatus textual convention specified for SNMPv2. + For row creation use createAndWait(5). + For row activation use active(1). + For row deletion use destroy(6). + + Other values are currently not supported. + + For row activation at least parameters msanOltProtectSwitchPairPrimaryIfIndex and + msanOltProtectSwitchPairSecondaryIfIndex must be defined." + ::= { msanOltProtectSwitchPairEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6 + msanOltPortSumStatTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanOltPortSumStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + ::= { msanOlt 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1 + msanOltPortSumStatEntry OBJECT-TYPE + SYNTAX MsanOltPortSumStatEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Description." + INDEX { msanOltPortSumStatIfIndex } + ::= { msanOltPortSumStatTable 1 } + + + MsanOltPortSumStatEntry ::= + SEQUENCE { + msanOltPortSumStatIfIndex + Integer32, + msanOltPortSumStatInOmciPkts + Counter64, + msanOltPortSumStatInCpuPkts + Counter64, + msanOltPortSumStatInPktsDiscarded + Counter64, + msanOltPortSumStatInPktsUndersize + Counter64, + msanOltPortSumStatInPktsOversize + Counter64, + msanOltPortSumStatInPktsCrcError + Counter64, + msanOltPortSumStatInPktsKeyError + Counter64, + msanOltPortSumStatOutPktsTpidError + Counter64, + msanOltPortSumStatOutPktsVidError + Counter64, + msanOltPortSumStatInPktsFragmentError + Counter64, + msanOltPortSumStatInGemFrames + Counter64, + msanOltPortSumStatInGemFramesDiscarded + Counter64, + msanOltPortSumStatInGemFramesIdle + Counter64, + msanOltPortSumStatInGemFramesCorrected + Counter64, + msanOltPortSumStatInGemFramesIllegal + Counter64, + msanOltPortSumStatInAllocationsValid + Counter64, + msanOltPortSumStatInAllocationsInvalid + Counter64, + msanOltPortSumStatInAllocationsDisabled + Counter64, + msanOltPortSumStatInPloamMsgs + Counter64, + msanOltPortSumStatInPloamMsgsNonIdle + Counter64, + msanOltPortSumStatInPloamMsgsError + Counter64, + msanOltPortSumStatInPloamMsgsDiscarded + Counter64, + msanOltPortSumStatInFecCodewords + Counter64, + msanOltPortSumStatInFecCodewordsUncorrected + Counter64, + msanOltPortSumStatInBip8Bytes + Counter64, + msanOltPortSumStatInBip8Errors + Counter64, + msanOltPortSumStatOutOmciPkts + Counter64, + msanOltPortSumStatOutCpuPkts + Counter64, + msanOltPortSumStatOutPktsDiscarded + Counter64, + msanOltPortSumStatOutGemFrames + Counter64, + msanOltPortSumStatOutPloamMsgs + Counter64 + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.1 + msanOltPortSumStatIfIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Index of OLT interface (from ifTable)." + ::= { msanOltPortSumStatEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.3 + msanOltPortSumStatInOmciPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received OMCI packets." + ::= { msanOltPortSumStatEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.4 + msanOltPortSumStatInCpuPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received CPU packets." + ::= { msanOltPortSumStatEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.5 + msanOltPortSumStatInPktsDiscarded OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of dropped received packets." + ::= { msanOltPortSumStatEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.6 + msanOltPortSumStatInPktsUndersize OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received packets dropped due to length too short." + ::= { msanOltPortSumStatEntry 6 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.7 + msanOltPortSumStatInPktsOversize OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received packets dropped due to length too long." + ::= { msanOltPortSumStatEntry 7 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.8 + msanOltPortSumStatInPktsCrcError OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received packets dropped due to CRC error." + ::= { msanOltPortSumStatEntry 8 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.9 + msanOltPortSumStatInPktsKeyError OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received packets dropped due to Key error." + ::= { msanOltPortSumStatEntry 9 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.10 + msanOltPortSumStatOutPktsTpidError OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received packet dropped due to TPID error." + ::= { msanOltPortSumStatEntry 10 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.11 + msanOltPortSumStatOutPktsVidError OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received packet dropped due to VID error." + ::= { msanOltPortSumStatEntry 11 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.12 + msanOltPortSumStatInPktsFragmentError OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received packet dropped due to fragmentation error." + ::= { msanOltPortSumStatEntry 12 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.13 + msanOltPortSumStatInGemFrames OBJECT-TYPE + SYNTAX Counter64 + UNITS "Frames" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Received GEM frames." + ::= { msanOltPortSumStatEntry 13 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.14 + msanOltPortSumStatInGemFramesDiscarded OBJECT-TYPE + SYNTAX Counter64 + UNITS "Frames" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of corrected received GEM frames." + ::= { msanOltPortSumStatEntry 14 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.15 + msanOltPortSumStatInGemFramesIdle OBJECT-TYPE + SYNTAX Counter64 + UNITS "Frames" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of idle received GEM frames." + ::= { msanOltPortSumStatEntry 15 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.16 + msanOltPortSumStatInGemFramesCorrected OBJECT-TYPE + SYNTAX Counter64 + UNITS "Frames" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of corrected received GEM frames." + ::= { msanOltPortSumStatEntry 16 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.17 + msanOltPortSumStatInGemFramesIllegal OBJECT-TYPE + SYNTAX Counter64 + UNITS "Frames" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of illegal received GEM frames." + ::= { msanOltPortSumStatEntry 17 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.18 + msanOltPortSumStatInAllocationsValid OBJECT-TYPE + SYNTAX Counter64 + UNITS "Allocations" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received valid allocations." + ::= { msanOltPortSumStatEntry 18 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.19 + msanOltPortSumStatInAllocationsInvalid OBJECT-TYPE + SYNTAX Counter64 + UNITS "Allocations" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received invalid allocations." + ::= { msanOltPortSumStatEntry 19 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.20 + msanOltPortSumStatInAllocationsDisabled OBJECT-TYPE + SYNTAX Counter64 + UNITS "Allocations" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received disabled allocations." + ::= { msanOltPortSumStatEntry 20 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.21 + msanOltPortSumStatInPloamMsgs OBJECT-TYPE + SYNTAX Counter64 + UNITS "PLOAM messages" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received PLOAM (physical layer operations and maintenance) messages." + ::= { msanOltPortSumStatEntry 21 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.22 + msanOltPortSumStatInPloamMsgsNonIdle OBJECT-TYPE + SYNTAX Counter64 + UNITS "Messages" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received non-idle PLOAM (physical layer operations and maintenance) messages." + ::= { msanOltPortSumStatEntry 22 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.23 + msanOltPortSumStatInPloamMsgsError OBJECT-TYPE + SYNTAX Counter64 + UNITS "Messages" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received PLOAM (physical layer operations and maintenance) messages with errors." + ::= { msanOltPortSumStatEntry 23 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.24 + msanOltPortSumStatInPloamMsgsDiscarded OBJECT-TYPE + SYNTAX Counter64 + UNITS "Messages" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of discarded PLOAM (physical layer operations and maintenance) messages." + ::= { msanOltPortSumStatEntry 24 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.25 + msanOltPortSumStatInFecCodewords OBJECT-TYPE + SYNTAX Counter64 + UNITS "Codewords" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received FEC (Forward error correction) codewords." + ::= { msanOltPortSumStatEntry 25 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.26 + msanOltPortSumStatInFecCodewordsUncorrected OBJECT-TYPE + SYNTAX Counter64 + UNITS "Codewords" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received uncorrected FEC (Forward error correction) codewords." + ::= { msanOltPortSumStatEntry 26 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.27 + msanOltPortSumStatInBip8Bytes OBJECT-TYPE + SYNTAX Counter64 + UNITS "Bytes" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received bytes protected by Bip8." + ::= { msanOltPortSumStatEntry 27 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.28 + msanOltPortSumStatInBip8Errors OBJECT-TYPE + SYNTAX Counter64 + UNITS "Bytes" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of received Bip8 errors." + ::= { msanOltPortSumStatEntry 28 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.29 + msanOltPortSumStatOutOmciPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Transmitted OMCI packets." + ::= { msanOltPortSumStatEntry 29 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.30 + msanOltPortSumStatOutCpuPkts OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Transmitted CPU packets." + ::= { msanOltPortSumStatEntry 30 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.31 + msanOltPortSumStatOutPktsDiscarded OBJECT-TYPE + SYNTAX Counter64 + UNITS "Packets" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of dropped transmitted packets because of illegal length." + ::= { msanOltPortSumStatEntry 31 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.32 + msanOltPortSumStatOutGemFrames OBJECT-TYPE + SYNTAX Counter64 + UNITS "Frames" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Transmitted GEM frames." + ::= { msanOltPortSumStatEntry 32 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.112.6.1.33 + msanOltPortSumStatOutPloamMsgs OBJECT-TYPE + SYNTAX Counter64 + UNITS "PLOAM messages" + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of transmitted PLOAM (physical layer operations and maintenance) messages." + ::= { msanOltPortSumStatEntry 33 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.113 + msanTacacsServer OBJECT IDENTIFIER ::= { msanAdditionalConf 113 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.113.1 + msanTacacsServerGlobal OBJECT IDENTIFIER ::= { msanTacacsServer 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.113.1.1 + msanTacacsServerTimeout OBJECT-TYPE + SYNTAX Integer32 (1..30) + UNITS "seconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "TACACS server response timeout value." + DEFVAL { '10'b } + ::= { msanTacacsServerGlobal 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.113.2 + msanTacacsServerTable OBJECT-TYPE + SYNTAX SEQUENCE OF MsanTacacsServerEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Table with information about Radius Authentication Server IP + Addresses, port numbers and shared secret" + ::= { msanTacacsServer 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.113.2.1 + msanTacacsServerEntry OBJECT-TYPE + SYNTAX MsanTacacsServerEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Entry consisting of configuration data for a Radius + Authentication Server." + INDEX { msanTacacsServerIpAddress } + ::= { msanTacacsServerTable 1 } + + + MsanTacacsServerEntry ::= + SEQUENCE { + msanTacacsServerIpAddress + IpAddress, + msanTacacsServerPort + Unsigned32, + msanTacacsServerSecret + DisplayString, + msanTacacsServerPrimaryMode + INTEGER, + msanTacacsServerCurrentMode + INTEGER, + msanTacacsServerStatus + RowStatus + } + + -- 1.3.6.1.4.1.1332.1.1.5.3.113.2.1.1 + msanTacacsServerIpAddress OBJECT-TYPE + SYNTAX IpAddress + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "IP Address of the configured TACACS server. + This object cannot be changed after creation." + ::= { msanTacacsServerEntry 1 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.113.2.1.2 + msanTacacsServerPort OBJECT-TYPE + SYNTAX Unsigned32 (0..65535) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "TCP/UDP port number of the TACACS server." + DEFVAL { 49 } + ::= { msanTacacsServerEntry 2 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.113.2.1.3 + msanTacacsServerSecret OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..48)) + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Configured shared secret for the TACACS server." + DEFVAL { ''b } + ::= { msanTacacsServerEntry 3 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.113.2.1.4 + msanTacacsServerPrimaryMode OBJECT-TYPE + SYNTAX INTEGER + { + enable(1), + disable(2) + } + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "Configure the TACACS server to be the primary server. If there is any + other server that is configured to be primary, that server is set to be + a seconday server and this entry is set Primary." + ::= { msanTacacsServerEntry 4 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.113.2.1.5 + msanTacacsServerCurrentMode OBJECT-TYPE + SYNTAX INTEGER + { + yes(1), + no(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Indicates if the TACACS server is the current server in user for + authentication." + ::= { msanTacacsServerEntry 5 } + + + -- 1.3.6.1.4.1.1332.1.1.5.3.113.2.1.6 + msanTacacsServerStatus OBJECT-TYPE + SYNTAX RowStatus + MAX-ACCESS read-create + STATUS current + DESCRIPTION + "Creates or destroys a TACACS server entry. + + active(1) - This entry is active. + createAndGo(4) - Creates a new entry. + destroy(6) - Deletes an entry." + ::= { msanTacacsServerEntry 6 } + + + + END + +-- +-- ISKRATEL-MSAN-MIB.mib +-- diff --git a/mibs/opengear/OG-CONNECT-MIB b/mibs/opengear/OG-CONNECT-MIB index b6902513912..bdc2751c6ff 100644 --- a/mibs/opengear/OG-CONNECT-MIB +++ b/mibs/opengear/OG-CONNECT-MIB @@ -24,7 +24,7 @@ ogConnectMib MODULE-IDENTITY ORGANIZATION "Opengear Inc." CONTACT-INFO "Opengear Inc. - 630 West 9560 South, + 9270 South 500 West, Suite J, Sandy, UT 84070 support@opengear.com" DESCRIPTION diff --git a/mibs/opengear/OG-DATA-MIB b/mibs/opengear/OG-DATA-MIB index 5e8cf489240..b34c029f0df 100644 --- a/mibs/opengear/OG-DATA-MIB +++ b/mibs/opengear/OG-DATA-MIB @@ -22,7 +22,7 @@ ogDataMib MODULE-IDENTITY ORGANIZATION "Opengear Inc." CONTACT-INFO "Opengear Inc. -630 West 9560 South, +9270 South 500 West, Suite J, Sandy, UT 84070 support@opengear.com" DESCRIPTION diff --git a/mibs/opengear/OG-FAILOVER-MIB b/mibs/opengear/OG-FAILOVER-MIB index c72889bc376..e5f4b54d73a 100644 --- a/mibs/opengear/OG-FAILOVER-MIB +++ b/mibs/opengear/OG-FAILOVER-MIB @@ -24,7 +24,7 @@ ogFailoverMib MODULE-IDENTITY ORGANIZATION "Opengear Inc." CONTACT-INFO "Opengear Inc. - 630 West 9560 South, + 9270 South 500 West, Suite J, Sandy, UT 84070 support@opengear.com" DESCRIPTION diff --git a/mibs/opengear/OG-HOST-MIB b/mibs/opengear/OG-HOST-MIB index e46ea9e2862..f7187eaed3e 100644 --- a/mibs/opengear/OG-HOST-MIB +++ b/mibs/opengear/OG-HOST-MIB @@ -22,7 +22,7 @@ ogHostMib MODULE-IDENTITY ORGANIZATION "Opengear Inc." CONTACT-INFO "Opengear Inc. - 630 West 9560 South, + 9270 South 500 West, Suite J, Sandy, UT 84070 support@opengear.com" DESCRIPTION diff --git a/mibs/opengear/OG-PATTERN-MIB b/mibs/opengear/OG-PATTERN-MIB index fc858c61976..d072e87edee 100644 --- a/mibs/opengear/OG-PATTERN-MIB +++ b/mibs/opengear/OG-PATTERN-MIB @@ -23,7 +23,7 @@ ogPatternMib MODULE-IDENTITY ORGANIZATION "Opengear Inc." CONTACT-INFO "Opengear Inc. - 630 West 9560 South, + 9270 South 500 West, Suite J, Sandy, UT 84070 support@opengear.com" DESCRIPTION diff --git a/mibs/opengear/OG-PRODUCTS-MIB b/mibs/opengear/OG-PRODUCTS-MIB index fa220446491..e4f00a89bd5 100644 --- a/mibs/opengear/OG-PRODUCTS-MIB +++ b/mibs/opengear/OG-PRODUCTS-MIB @@ -8,49 +8,49 @@ OG-PRODUCTS-MIB DEFINITIONS ::= BEGIN IMPORTS - ogProducts, ogModules - FROM OG-SMI-MIB - MODULE-IDENTITY - FROM SNMPv2-SMI; + ogProducts, ogModules + FROM OG-SMI-MIB + MODULE-IDENTITY + FROM SNMPv2-SMI; ogProductsMib MODULE-IDENTITY - LAST-UPDATED "202301180000Z" - ORGANIZATION "Opengear Inc." - CONTACT-INFO - "Opengear Inc. - 630 West 9560 South, - Sandy, UT 84070 - support@opengear.com" - DESCRIPTION - "Opengear Product MIB" - REVISION "202301180000Z" - DESCRIPTION - "Add OM12xx, OM22xx and CM81xx targets to the MIB." - REVISION "202005200000Z" - DESCRIPTION - "Add Operations Manager to the MIB." - REVISION "201806150000Z" - DESCRIPTION - "Add Lighthouse 5 target to the MIB." - REVISION "201606270000Z" - DESCRIPTION - "Add CM7196 target to the MIB." - REVISION "201602100000Z" - DESCRIPTION - "Add CM71xx target to the MIB." - REVISION "201506020000Z" - DESCRIPTION - "Add ACM700x target to the MIB." - REVISION "201308110000Z" - DESCRIPTION - "Renamed from OPENGEAR-PRODUCTS-MIB to OG-PRODUCTS-MIB to - fix naming discrepancy." - REVISION "201108150123Z" - DESCRIPTION - "Add ACM550x target to the MIB." - REVISION "201004151127Z" - DESCRIPTION - "Initial version." + LAST-UPDATED "202301180000Z" + ORGANIZATION "Opengear Inc." + CONTACT-INFO + "Opengear Inc. + 9270 South 500 West, Suite J, + Sandy, UT 84070 + support@opengear.com" + DESCRIPTION + "Opengear Product MIB" + REVISION "202301180000Z" + DESCRIPTION + "Add OM12xx, OM22xx and CM81xx targets to the MIB." + REVISION "202005200000Z" + DESCRIPTION + "Add Operations Manager to the MIB." + REVISION "201806150000Z" + DESCRIPTION + "Add Lighthouse 5 target to the MIB." + REVISION "201606270000Z" + DESCRIPTION + "Add CM7196 target to the MIB." + REVISION "201602100000Z" + DESCRIPTION + "Add CM71xx target to the MIB." + REVISION "201506020000Z" + DESCRIPTION + "Add ACM700x target to the MIB." + REVISION "201308110000Z" + DESCRIPTION + "Renamed from OPENGEAR-PRODUCTS-MIB to OG-PRODUCTS-MIB to + fix naming discrepancy." + REVISION "201108150123Z" + DESCRIPTION + "Add ACM550x target to the MIB." + REVISION "201004151127Z" + DESCRIPTION + "Initial version." ::= { ogModules 2 } ogCM4001 OBJECT IDENTIFIER ::= { ogProducts 1 } diff --git a/mibs/opengear/OG-SENSOR-MIB b/mibs/opengear/OG-SENSOR-MIB index 983f16a8a3e..a570d4d3372 100644 --- a/mibs/opengear/OG-SENSOR-MIB +++ b/mibs/opengear/OG-SENSOR-MIB @@ -22,7 +22,7 @@ ogSensorMib MODULE-IDENTITY ORGANIZATION "Opengear Inc." CONTACT-INFO "Opengear Inc. - 630 West 9560 South, + 9270 South 500 West, Suite J, Sandy, UT 84070 support@opengear.com" DESCRIPTION diff --git a/mibs/opengear/OG-SIGNAL-MIB b/mibs/opengear/OG-SIGNAL-MIB index a0aeda48c2e..492bd61f13c 100644 --- a/mibs/opengear/OG-SIGNAL-MIB +++ b/mibs/opengear/OG-SIGNAL-MIB @@ -22,7 +22,7 @@ ogSignalMib MODULE-IDENTITY ORGANIZATION "Opengear Inc." CONTACT-INFO "Opengear Inc. - 630 West 9560 South, + 9270 South 500 West, Suite J, Sandy, UT 84070 support@opengear.com" DESCRIPTION diff --git a/mibs/opengear/OG-SMI-MIB b/mibs/opengear/OG-SMI-MIB index 35463d13f1a..8c5671b785d 100644 --- a/mibs/opengear/OG-SMI-MIB +++ b/mibs/opengear/OG-SMI-MIB @@ -18,7 +18,7 @@ opengear MODULE-IDENTITY ORGANIZATION "Opengear Inc." CONTACT-INFO "Opengear Inc. - 630 West 9560 South, + 9270 South 500 West, Suite J, Sandy, UT 84070 support@opengear.com" DESCRIPTION diff --git a/mibs/opengear/OG-STATUS-MIB b/mibs/opengear/OG-STATUS-MIB index bc7cbb1783f..be4ec42cc18 100644 --- a/mibs/opengear/OG-STATUS-MIB +++ b/mibs/opengear/OG-STATUS-MIB @@ -26,7 +26,7 @@ ogStatus MODULE-IDENTITY ORGANIZATION "Opengear Inc." CONTACT-INFO "Opengear Inc. - 630 West 9560 South, Suite A, + 9270 South 500 West, Suite J, Sandy, UT 84070 support@opengear.com" DESCRIPTION diff --git a/mibs/opengear/OG-STATUSv2-MIB b/mibs/opengear/OG-STATUSv2-MIB index 0c00dd00b91..7e93464cc0c 100644 --- a/mibs/opengear/OG-STATUSv2-MIB +++ b/mibs/opengear/OG-STATUSv2-MIB @@ -2,7 +2,7 @@ -- == OG-STATUSv2-MIB: == -- == Opengear status Management Information Base == -- == == --- == (c) Copyright 2013-2020 Opengear Inc. == +-- == (c) Copyright 2013-2023 Opengear Inc. == -- ===================================================================== OG-STATUSv2-MIB DEFINITIONS ::= BEGIN @@ -20,13 +20,22 @@ IMPORTS FROM SNMPv2-TC; ogStatus2 MODULE-IDENTITY - LAST-UPDATED "202011100000Z" + LAST-UPDATED "202308020000Z" ORGANIZATION "Opengear Inc." CONTACT-INFO "Opengear Inc. - 630 West 9560 South, Suite A, + 9270 South 500 West, Suite J, Sandy, UT 84070 support@opengear.com" + DESCRIPTION + "Updated contact info and removed EOS hostService OIDs" + REVISION "202308020000Z" + DESCRIPTION + "Added UpsTempNotification type" + REVISION "202301190000Z" + DESCRIPTION + "Removed unused notification fields" + REVISION "202301050000Z" DESCRIPTION "Extended network interface status for failover" REVISION "202011100000Z" @@ -424,88 +433,6 @@ ogHostIpV6Address OBJECT-TYPE "The IPv6 Address of this monitored network host." ::= { ogHostEntry 4 } -ogHostServiceTable OBJECT-TYPE - SYNTAX SEQUENCE OF HostServiceEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "A table of services belonging to a monitored host." - ::= { ogStatus2 5 } - -ogHostServiceEntry OBJECT-TYPE - SYNTAX HostServiceEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "A monitored host service." - INDEX { ogHostIndex, - ogHostServiceIndex } - ::= { ogHostServiceTable 1 } - -HostServiceEntry ::= SEQUENCE { - ogHostServiceIndex Integer32, - ogHostServiceHost OBJECT IDENTIFIER, - ogHostServiceType INTEGER, - ogHostServicePort Unsigned32, - ogHostServiceStatus INTEGER, - ogHostServiceCounter Counter32 -} - -ogHostServiceIndex OBJECT-TYPE - SYNTAX Integer32 (0..65535) - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "Index within the RPC outlet table" - ::= { ogHostServiceEntry 1 } - -ogHostServiceHost OBJECT-TYPE - SYNTAX OBJECT IDENTIFIER - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The monitored host this service belongs to" - ::= { ogHostServiceEntry 2 } - -ogHostServiceType OBJECT-TYPE - SYNTAX INTEGER { - tcp(1), - udp(2) - } - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The type of service this is." - ::= { ogHostServiceEntry 3 } - -ogHostServicePort OBJECT-TYPE - SYNTAX Unsigned32 (0..65535) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The TCP Port this service is on." - ::= { ogHostServiceEntry 4 } - -ogHostServiceStatus OBJECT-TYPE - SYNTAX INTEGER { - unknown(1), - available(2), - unavailable(3) - } - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The availabalilty of this service." - ::= { ogHostServiceEntry 5 } - -ogHostServiceCounter OBJECT-TYPE - SYNTAX Counter32 - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The number of alerts related to this service." - ::= { ogHostServiceEntry 6 } - ogHostUserTable OBJECT-TYPE SYNTAX SEQUENCE OF HostUserEntry MAX-ACCESS not-accessible @@ -3123,19 +3050,16 @@ ogMibNotifications OBJECT IDENTIFIER ::= { ogSerialSignalNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, - ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary } STATUS current DESCRIPTION @@ -3144,15 +3068,14 @@ ogSerialSignalNotification NOTIFICATION-TYPE ogSerialPatternNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, ogAlarmName, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, ogAlarmType, - ogAlarmSummary, ogAlarmDevice, ogAlarmUser, + ogAlarmSummary, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, @@ -3166,19 +3089,17 @@ ogSerialPatternNotification NOTIFICATION-TYPE ogSerialUserNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, + ogAlarmSummary, ogAlarmTriggerValue, ogAlarmCurrentValue, - ogAlarmPreviousValue, - ogAlarmState + ogAlarmPreviousValue } STATUS current DESCRIPTION @@ -3188,19 +3109,16 @@ ogSerialUserNotification NOTIFICATION-TYPE ogHostPingNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, - ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary } STATUS current DESCRIPTION @@ -3231,15 +3149,9 @@ ogHostServiceNotification NOTIFICATION-TYPE ogHostUserNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, - ogAlarmCheck, - ogAlarmInstance, - ogAlarmTime, ogAlarmType, - ogAlarmSummary, ogAlarmDevice, - ogAlarmUser, + ogAlarmSummary, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, @@ -3253,19 +3165,17 @@ ogHostUserNotification NOTIFICATION-TYPE ogWebUserNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, + ogAlarmSummary, ogAlarmTriggerValue, ogAlarmCurrentValue, - ogAlarmPreviousValue, - ogAlarmState + ogAlarmPreviousValue } STATUS current DESCRIPTION @@ -3276,19 +3186,17 @@ ogWebUserNotification NOTIFICATION-TYPE ogEmdTemperatureNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary } STATUS current DESCRIPTION @@ -3297,19 +3205,17 @@ ogEmdTemperatureNotification NOTIFICATION-TYPE ogEmdHumidityNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary } STATUS current DESCRIPTION @@ -3318,19 +3224,16 @@ ogEmdHumidityNotification NOTIFICATION-TYPE ogEmdDioNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, - ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary } STATUS current DESCRIPTION @@ -3339,19 +3242,17 @@ ogEmdDioNotification NOTIFICATION-TYPE ogPowerSupplyInputNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary } STATUS current DESCRIPTION @@ -3360,19 +3261,17 @@ ogPowerSupplyInputNotification NOTIFICATION-TYPE ogPowerSupplyOutputNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary } STATUS current DESCRIPTION @@ -3381,19 +3280,17 @@ ogPowerSupplyOutputNotification NOTIFICATION-TYPE ogPowerSupplyTempNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary } STATUS current DESCRIPTION @@ -3402,19 +3299,15 @@ ogPowerSupplyTempNotification NOTIFICATION-TYPE ogUpsNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, - ogAlarmUser, - ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary } STATUS current DESCRIPTION @@ -3423,19 +3316,17 @@ ogUpsNotification NOTIFICATION-TYPE ogUpsBatteryNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary } STATUS current DESCRIPTION @@ -3444,19 +3335,17 @@ ogUpsBatteryNotification NOTIFICATION-TYPE ogUpsInputNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary } STATUS current DESCRIPTION @@ -3465,19 +3354,17 @@ ogUpsInputNotification NOTIFICATION-TYPE ogUpsOutputNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary } STATUS current DESCRIPTION @@ -3550,19 +3437,15 @@ ogRpcOutletNotification NOTIFICATION-TYPE ogNetInterfaceNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, - ogAlarmTriggerValue, ogAlarmCurrentValue, - ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary } STATUS current DESCRIPTION @@ -3571,19 +3454,15 @@ ogNetInterfaceNotification NOTIFICATION-TYPE ogCellDataNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, - ogAlarmUser, ogAlarmTriggerValue, ogAlarmCurrentValue, - ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary } STATUS current DESCRIPTION @@ -3592,19 +3471,15 @@ ogCellDataNotification NOTIFICATION-TYPE ogCellMessageNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, + ogAlarmState, ogAlarmSummary, ogAlarmDevice, - ogAlarmUser, - ogAlarmTriggerValue, ogAlarmCurrentValue, - ogAlarmPreviousValue, - ogAlarmState + ogAlarmPreviousValue } STATUS current DESCRIPTION @@ -3805,19 +3680,15 @@ ogDialPoolHealthNotification NOTIFICATION-TYPE ogCustomNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, + ogAlarmState, ogAlarmSummary, ogAlarmDevice, - ogAlarmUser, - ogAlarmTriggerValue, ogAlarmCurrentValue, - ogAlarmPreviousValue, - ogAlarmState + ogAlarmTriggerValue } STATUS current DESCRIPTION @@ -3826,19 +3697,17 @@ ogCustomNotification NOTIFICATION-TYPE ogCliUserSessionNotification NOTIFICATION-TYPE OBJECTS { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, + ogAlarmSummary, ogAlarmTriggerValue, ogAlarmCurrentValue, - ogAlarmPreviousValue, - ogAlarmState + ogAlarmPreviousValue } STATUS current DESCRIPTION @@ -3846,6 +3715,25 @@ ogCliUserSessionNotification NOTIFICATION-TYPE session." ::= { ogMibNotifications 34 } +ogUpsTempNotification NOTIFICATION-TYPE + OBJECTS { + ogAlarmType, + ogAlarmCheck, + ogAlarmInstance, + ogAlarmTime, + ogAlarmState, + ogAlarmDevice, + ogAlarmUser, + ogAlarmTriggerValue, + ogAlarmCurrentValue, + ogAlarmPreviousValue, + ogAlarmSummary + } + STATUS current + DESCRIPTION + "The notification sent when a power supply temperature alarm occurs" + ::= { ogMibNotifications 35 } + -- End notifications -- conformance information @@ -3903,11 +3791,6 @@ ogBasicStatusGroup OBJECT-GROUP ogHostName, ogHostIpV4Address, ogHostIpV6Address, - ogHostServiceHost, - ogHostServiceType, - ogHostServicePort, - ogHostServiceStatus, - ogHostServiceCounter, ogHostUserHost, ogHostUserStartTime, ogHostUserAddress, @@ -4137,7 +4020,8 @@ ogBasicNotificationGroup NOTIFICATION-GROUP ogWifiApAuthNotification, ogDialPoolHealthNotification, ogCustomNotification, - ogCliUserSessionNotification + ogCliUserSessionNotification, + ogUpsTempNotification } STATUS current DESCRIPTION diff --git a/mibs/opengear/OG-UPS-MIB b/mibs/opengear/OG-UPS-MIB index 18486b9ba62..2ac296fd654 100644 --- a/mibs/opengear/OG-UPS-MIB +++ b/mibs/opengear/OG-UPS-MIB @@ -22,7 +22,7 @@ ogNetUpsMib MODULE-IDENTITY ORGANIZATION "Opengear Inc." CONTACT-INFO "Opengear Inc. -630 West 9560 South, +9270 South 500 West, Suite J, Sandy, UT 84070 support@opengear.com" DESCRIPTION diff --git a/mibs/opengear/OGTRAPv2-MIB b/mibs/opengear/OGTRAPv2-MIB index 491c659fb82..3aa7b1fe13f 100644 --- a/mibs/opengear/OGTRAPv2-MIB +++ b/mibs/opengear/OGTRAPv2-MIB @@ -1,6 +1,8 @@ OGTRAPv2-MIB DEFINITIONS ::= BEGIN IMPORTS + sysName + FROM SNMPv2-MIB OBJECT-TYPE FROM RFC-1212 TRAP-TYPE @@ -311,18 +313,17 @@ ogSerialSignalAlarmEntry OBJECT IDENTIFIER ::= { ogSerialSignalNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, - ogAlarmTriggerValue, + ogAlarmUser, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary, + sysName } DESCRIPTION "The alert sent when a signal change occurs" @@ -345,17 +346,19 @@ ogSerialPatternAlarmEntry OBJECT IDENTIFIER ::= { ogSerialPatternNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, ogAlarmName, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, ogAlarmType, - ogAlarmSummary, ogAlarmDevice, + ogAlarmUser, + ogAlarmSummary, ogAlarmTriggerValue, ogAlarmCurrentValue, - ogAlarmState + ogAlarmPreviousValue, + ogAlarmState, + sysName } DESCRIPTION "The alert sent when a pre-defined pattern was @@ -379,18 +382,18 @@ ogSerialUserAlarmEntry OBJECT IDENTIFIER ::= { ogSerialUserNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, + ogAlarmUser, + ogAlarmSummary, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + sysName } DESCRIPTION "The alert sent when a user connection event occurs." @@ -413,18 +416,17 @@ ogHostEventEntry OBJECT IDENTIFIER ::= { ogHostPingNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, - ogAlarmTriggerValue, + ogAlarmUser, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary, + sysName } DESCRIPTION "An alarm sent when a Network Host occurs stops or resumes @@ -445,7 +447,8 @@ ogHostServiceNotification TRAP-TYPE ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmState, + sysName } DESCRIPTION "An alarm sent when a service on a network host stops or starts @@ -455,18 +458,14 @@ ogHostServiceNotification TRAP-TYPE ogHostUserNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, - ogAlarmCheck, - ogAlarmInstance, - ogAlarmTime, ogAlarmType, - ogAlarmSummary, ogAlarmDevice, + ogAlarmSummary, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmState, + sysName } DESCRIPTION "An alarm sent when a user connection to a Network Host occurs" @@ -489,18 +488,18 @@ ogWebEventEntry OBJECT IDENTIFIER ::= { ogWebUserNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, + ogAlarmUser, + ogAlarmSummary, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + sysName } DESCRIPTION "An alarm sent when a user connection to web interface occurs" @@ -523,18 +522,18 @@ ogEmdAlarmEntry OBJECT IDENTIFIER ::= { ogEmdTemperatureNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, + ogAlarmUser, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary, + sysName } DESCRIPTION "The notification sent when a temperature event occurs" @@ -543,18 +542,18 @@ ogEmdTemperatureNotification TRAP-TYPE ogEmdHumidityNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, + ogAlarmUser, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary, + sysName } DESCRIPTION "The notification sent when a humidity event occurs" @@ -563,18 +562,17 @@ ogEmdHumidityNotification TRAP-TYPE ogEmdDioNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, - ogAlarmTriggerValue, + ogAlarmUser, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary, + sysName } DESCRIPTION "The alert sent when a DIO signal state changes" @@ -597,19 +595,18 @@ ogPowerSupplyAlarmEntry OBJECT IDENTIFIER ::= { ogPowerSupplyInputNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary, + sysName } DESCRIPTION "The notification sent when a power supply voltage alarm occurs" @@ -618,19 +615,18 @@ ogPowerSupplyInputNotification TRAP-TYPE ogPowerSupplyOutputNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary, + sysName } DESCRIPTION "The notification sent when a power supply rail current alarm occurs" @@ -639,19 +635,18 @@ ogPowerSupplyOutputNotification TRAP-TYPE ogPowerSupplyTempNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary, + sysName } DESCRIPTION "The notification sent when a power supply temperature alarm occurs" @@ -674,19 +669,16 @@ ogUpsAlarmEntry OBJECT IDENTIFIER ::= { ogUpsNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, - ogAlarmUser, - ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary, + sysName } DESCRIPTION "The notification sent when a UPS alarm occurs" @@ -695,19 +687,18 @@ ogUpsNotification TRAP-TYPE ogUpsBatteryNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary, + sysName } DESCRIPTION "The notification sent when a UPS battery alarm occurs" @@ -716,19 +707,18 @@ ogUpsBatteryNotification TRAP-TYPE ogUpsInputNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary, + sysName } DESCRIPTION "The notification sent when a UPS input alarm occurs" @@ -737,19 +727,18 @@ ogUpsInputNotification TRAP-TYPE ogUpsOutputNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, ogAlarmUser, ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary, + sysName } DESCRIPTION "The notification sent when a UPS output alarm occurs" @@ -784,7 +773,8 @@ ogRpcInputNotification TRAP-TYPE ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmState, + sysName } DESCRIPTION "The notification sent when an RPC input alarm occurs" @@ -805,7 +795,8 @@ ogRpcOutputNotification TRAP-TYPE ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmState, + sysName } DESCRIPTION "The notification sent when an RPC output alarm occurs" @@ -826,7 +817,8 @@ ogRpcOutletNotification TRAP-TYPE ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmState, + sysName } DESCRIPTION "The notification sent when an RPC outlet alarm occurs" @@ -849,18 +841,16 @@ ogNetAlarmEntry OBJECT IDENTIFIER ::= { ogNetInterfaceNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, - ogAlarmTriggerValue, + ogAlarmUser, ogAlarmCurrentValue, - ogAlarmPreviousValue, - ogAlarmState + ogAlarmSummary, + sysName } DESCRIPTION "The alert sent when a network interface event occurs" @@ -883,19 +873,16 @@ ogCellAlarmEntry OBJECT IDENTIFIER ::= { ogCellDataNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, - ogAlarmSummary, + ogAlarmState, ogAlarmDevice, - ogAlarmUser, - ogAlarmTriggerValue, ogAlarmCurrentValue, - ogAlarmPreviousValue, - ogAlarmState + ogAlarmTriggerValue, + ogAlarmSummary, + sysName } DESCRIPTION "The notification sent when a cell data alarm occurs" @@ -904,19 +891,16 @@ ogCellDataNotification TRAP-TYPE ogCellMessageNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, + ogAlarmState, ogAlarmSummary, ogAlarmDevice, - ogAlarmUser, - ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + sysName } DESCRIPTION "The notification sent when a SMS command alarm occurs" @@ -937,7 +921,8 @@ ogCellSignalNotification TRAP-TYPE ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmState, + sysName } DESCRIPTION "The notification sent when a cellular signal alarm occurs." @@ -958,7 +943,8 @@ ogCellApnNotification TRAP-TYPE ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmState, + sysName } DESCRIPTION "The notification sent when an APN change alarm occurs" @@ -979,7 +965,8 @@ ogCellTowerNotification TRAP-TYPE ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmState, + sysName } DESCRIPTION "The notification sent when a cell tower change alarm occurs" @@ -1000,7 +987,8 @@ ogCellNetworkNotification TRAP-TYPE ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmState, + sysName } DESCRIPTION "The notification sent when a cell network change alarm occurs" @@ -1035,7 +1023,8 @@ ogWifiClientConnectNotification TRAP-TYPE ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmState, + sysName } DESCRIPTION "A notification sent when a wireless client @@ -1057,7 +1046,8 @@ ogWifiClientSignalNotification TRAP-TYPE ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmState, + sysName } DESCRIPTION "A notification sent when a wireless client @@ -1079,7 +1069,8 @@ ogWifiApAssociationNotification TRAP-TYPE ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmState, + sysName } DESCRIPTION "A notification sent when a wireless client @@ -1101,7 +1092,8 @@ ogWifiApAuthNotification TRAP-TYPE ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmState, + sysName } DESCRIPTION "A notification sent when a wireless client @@ -1137,7 +1129,8 @@ ogDialPoolHealthNotification TRAP-TYPE ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmState, + sysName } DESCRIPTION "A notification sent when a dial-pool health alarm occurs." @@ -1160,19 +1153,16 @@ ogCustomAlarmEntry OBJECT IDENTIFIER ::= { ogCustomNotification TRAP-TYPE ENTERPRISE opengear VARIABLES { - ogAlarmEventId, - ogAlarmName, + ogAlarmType, ogAlarmCheck, ogAlarmInstance, ogAlarmTime, - ogAlarmType, + ogAlarmState, ogAlarmSummary, ogAlarmDevice, - ogAlarmUser, - ogAlarmTriggerValue, ogAlarmCurrentValue, - ogAlarmPreviousValue, - ogAlarmState + ogAlarmTriggerValue, + sysName } DESCRIPTION "A notification sent when a custom check alarm occurs." @@ -1206,7 +1196,8 @@ ogCliUserNotification TRAP-TYPE ogAlarmTriggerValue, ogAlarmCurrentValue, ogAlarmPreviousValue, - ogAlarmState + ogAlarmState, + sysName } DESCRIPTION "An alarm sent when a user connection to CLI session occurs" diff --git a/mibs/quanta/IANA-RTPROTO-MIB b/mibs/quanta/IANA-RTPROTO-MIB deleted file mode 100644 index 119cd7df446..00000000000 --- a/mibs/quanta/IANA-RTPROTO-MIB +++ /dev/null @@ -1,82 +0,0 @@ -IANA-RTPROTO-MIB DEFINITIONS ::= BEGIN - -IMPORTS - MODULE-IDENTITY, mib-2 FROM SNMPv2-SMI - TEXTUAL-CONVENTION FROM SNMPv2-TC; - -ianaRtProtoMIB MODULE-IDENTITY - LAST-UPDATED "200009260000Z" -- September 26, 2000 - ORGANIZATION "Netgear Inc" - CONTACT-INFO "" - DESCRIPTION - "This MIB module defines the IANAipRouteProtocol and - IANAipMRouteProtocol textual conventions for use in MIBs - which need to identify unicast or multicast routing - mechanisms. - - Any additions or changes to the contents of this MIB module - require either publication of an RFC, or Designated Expert - Review as defined in RFC 2434, Guidelines for Writing an - IANA Considerations Section in RFCs. The Designated Expert - will be selected by the IESG Area Director(s) of the Routing - Area." - - REVISION "200009260000Z" -- September 26, 2000 - DESCRIPTION "Original version, published in coordination - with RFC 2932." - - ::= { mib-2 84 } - -IANAipRouteProtocol ::= TEXTUAL-CONVENTION - STATUS current - - DESCRIPTION - "A mechanism for learning routes. Inclusion of values for - routing protocols is not intended to imply that those - protocols need be supported." - SYNTAX INTEGER { - other (1), -- not specified - local (2), -- local interface - netmgmt (3), -- static route - icmp (4), -- result of ICMP Redirect - - -- the following are all dynamic - -- routing protocols - - egp (5), -- Exterior Gateway Protocol - ggp (6), -- Gateway-Gateway Protocol - hello (7), -- FuzzBall HelloSpeak - rip (8), -- Berkeley RIP or RIP-II - isIs (9), -- Dual IS-IS - esIs (10), -- ISO 9542 - ciscoIgrp (11), -- Cisco IGRP - bbnSpfIgp (12), -- BBN SPF IGP - ospf (13), -- Open Shortest Path First - bgp (14), -- Border Gateway Protocol - idpr (15), -- InterDomain Policy Routing - ciscoEigrp (16), -- Cisco EIGRP - dvmrp (17) -- DVMRP - } - -IANAipMRouteProtocol ::= TEXTUAL-CONVENTION - STATUS current - DESCRIPTION - "The multicast routing protocol. Inclusion of values for - multicast routing protocols is not intended to imply that - those protocols need be supported." - SYNTAX INTEGER { - other(1), -- none of the following - local(2), -- e.g., manually configured - netmgmt(3), -- set via net.mgmt protocol - dvmrp(4), - mospf(5), - pimSparseDense(6), -- PIMv1, both DM and SM - cbt(7), - pimSparseMode(8), -- PIM-SM - pimDenseMode(9), -- PIM-DM - igmpOnly(10), - bgmp(11), - msdp(12) - } - -END diff --git a/mibs/quanta/PIM-BSR-MIB b/mibs/quanta/PIM-BSR-MIB deleted file mode 100644 index 0f6c29e4bfd..00000000000 --- a/mibs/quanta/PIM-BSR-MIB +++ /dev/null @@ -1,619 +0,0 @@ -PIM-BSR-MIB DEFINITIONS ::= BEGIN - - IMPORTS - MODULE-IDENTITY, OBJECT-TYPE, - NOTIFICATION-TYPE, - mib-2, Unsigned32, TimeTicks FROM SNMPv2-SMI - RowStatus, TruthValue, - StorageType FROM SNMPv2-TC - MODULE-COMPLIANCE, OBJECT-GROUP, - NOTIFICATION-GROUP FROM SNMPv2-CONF - InetAddressType, - InetAddressPrefixLength, - InetAddress, - InetZoneIndex FROM INET-ADDRESS-MIB; - - pimBsrMIB MODULE-IDENTITY - LAST-UPDATED "200805280000Z" -- 28 May 2008 - ORGANIZATION "Netgear Inc" - CONTACT-INFO "" - DESCRIPTION - "The MIB module for management of the Bootstrap Router - (BSR) mechanism for PIM routers. - - Copyright (C) The IETF Trust (2008). This version - of this MIB module is part of RFC 5240; see the RFC - itself for full legal notices." - REVISION "200805280000Z" -- 28 May 2008 - DESCRIPTION "Initial version, published as RFC 5240." - ::= { mib-2 172 } - - -- - -- Top-level structure - -- - - pimBsrNotifications OBJECT IDENTIFIER ::= { pimBsrMIB 0 } - pimBsrObjects OBJECT IDENTIFIER ::= { pimBsrMIB 1 } - -- - -- Conformance Information - -- - - pimBsrConformance OBJECT IDENTIFIER ::= { pimBsrMIB 2 } - pimBsrCompliances OBJECT IDENTIFIER ::= { pimBsrConformance 1 } - pimBsrGroups OBJECT IDENTIFIER ::= { pimBsrConformance 2 } - - -- - -- The BSR Candidate-RP Table - -- - - pimBsrCandidateRPTable OBJECT-TYPE - SYNTAX SEQUENCE OF PimBsrCandidateRPEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The (conceptual) table listing the IP multicast group - prefixes for which the local router is to advertise - itself as a Candidate-RP." - ::= { pimBsrObjects 1 } - - pimBsrCandidateRPEntry OBJECT-TYPE - SYNTAX PimBsrCandidateRPEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "An entry (conceptual row) in the - pimBsrCandidateRPTable." - INDEX { pimBsrCandidateRPAddressType, - pimBsrCandidateRPAddress, - pimBsrCandidateRPGroupAddress, - pimBsrCandidateRPGroupPrefixLength } - ::= { pimBsrCandidateRPTable 1 } - - PimBsrCandidateRPEntry ::= SEQUENCE { - pimBsrCandidateRPAddressType InetAddressType, - pimBsrCandidateRPAddress InetAddress, - pimBsrCandidateRPGroupAddress InetAddress, - pimBsrCandidateRPGroupPrefixLength InetAddressPrefixLength, - pimBsrCandidateRPAdvInterval Unsigned32, - pimBsrCandidateRPBidir TruthValue, - pimBsrCandidateRPStatus RowStatus - } - pimBsrCandidateRPAddressType OBJECT-TYPE - SYNTAX InetAddressType - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The Inet address type of the Candidate-RP." - ::= { pimBsrCandidateRPEntry 1 } - - pimBsrCandidateRPAddress OBJECT-TYPE - SYNTAX InetAddress (SIZE (4|8|16|20)) - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The (unicast) address that will be advertised as a - Candidate-RP. The InetAddressType is given by the - pimBsrCandidateRPAddressType object." - ::= { pimBsrCandidateRPEntry 2 } - - pimBsrCandidateRPGroupAddress OBJECT-TYPE - SYNTAX InetAddress (SIZE (4|8|16|20)) - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The IP multicast group address that, when combined with - the corresponding value of - pimBsrCandidateRPGroupPrefixLength, identifies a group - prefix for which the local router will advertise itself - as a Candidate-RP. The InetAddressType is given by the - pimBsrCandidateRPAddressType object. - - This address object is only significant up to - pimBsrCandidateRPGroupPrefixLength bits. The - remainder of the address bits are zero. This is - especially important for this field, which is part of - the index of this entry. Any non-zero bits would - signify an entirely different entry." - ::= { pimBsrCandidateRPEntry 3 } - - pimBsrCandidateRPGroupPrefixLength OBJECT-TYPE - SYNTAX InetAddressPrefixLength (4..128) - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The multicast group address mask that, when combined - with the corresponding value of - pimBsrCandidateRPGroupAddress, identifies a group prefix - for which the local router will advertise itself as a - Candidate-RP. The InetAddressType is given by the - pimBsrCandidateRPAddressType object." - ::= { pimBsrCandidateRPEntry 4 } - - pimBsrCandidateRPBidir OBJECT-TYPE - SYNTAX TruthValue - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "If this object is set to TRUE, this group range is - advertised with this RP as a BIDIR-PIM group range. If - it is set to FALSE, it is advertised as a PIM-SM group - range." - DEFVAL { false } - ::= { pimBsrCandidateRPEntry 5 } - - pimBsrCandidateRPAdvInterval OBJECT-TYPE - SYNTAX Unsigned32 (1..26214) - UNITS "seconds" - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "A Candidate RP generates Candidate-RP-Advertisements - periodically. This object represents the time interval - in seconds between two consecutive advertisements." - - REFERENCE "RFC5059 section 3.2 and section 5" - DEFVAL { 60 } - - ::= { pimBsrCandidateRPEntry 8 } - - pimBsrCandidateRPStatus OBJECT-TYPE - SYNTAX RowStatus - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "The status of this row, by which new entries may be - created, or old entries deleted from this table. - - This status object can be set to active(1) without - setting any other columnar objects in this entry. - - All writable objects in this entry can be modified - when the status of this entry is active(1)." - - ::= { pimBsrCandidateRPEntry 10 } - - - -- - -- The BSR Elected BSR RP-Set Table - -- - - pimBsrElectedBSRRPSetTable OBJECT-TYPE - SYNTAX SEQUENCE OF PimBsrElectedBSRRPSetEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The (conceptual) table listing BSR-specific information - about PIM group mappings learned via C-RP advertisements - or created locally using configurations. This table is - maintained only on the Elected BSR. - - An Elected BSR uses this table to create Bootstrap - messages after applying a local policy to include some - or all of the group mappings in this table." - - ::= { pimBsrObjects 2 } - - pimBsrElectedBSRRPSetEntry OBJECT-TYPE - SYNTAX PimBsrElectedBSRRPSetEntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "An entry (conceptual row) in the - pimBsrElectedBSRRPSetTable." - INDEX { pimBsrElectedBSRGrpMappingAddrType, - pimBsrElectedBSRGrpMappingGrpAddr, - pimBsrElectedBSRGrpMappingGrpPrefixLen, - pimBsrElectedBSRGrpMappingRPAddr } - ::= { pimBsrElectedBSRRPSetTable 1 } - - PimBsrElectedBSRRPSetEntry ::= SEQUENCE { - pimBsrElectedBSRGrpMappingAddrType InetAddressType, - pimBsrElectedBSRGrpMappingGrpAddr InetAddress, - pimBsrElectedBSRGrpMappingGrpPrefixLen InetAddressPrefixLength, - pimBsrElectedBSRGrpMappingRPAddr InetAddress, - pimBsrElectedBSRRPSetPriority Unsigned32, - pimBsrElectedBSRRPSetHoldtime Unsigned32, - pimBsrElectedBSRRPSetExpiryTime TimeTicks - } - - pimBsrElectedBSRGrpMappingAddrType OBJECT-TYPE - SYNTAX InetAddressType - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The Inet address type of the IP multicast group - prefix." - ::= { pimBsrElectedBSRRPSetEntry 2 } - - pimBsrElectedBSRGrpMappingGrpAddr OBJECT-TYPE - SYNTAX InetAddress (SIZE (4|8|16|20)) - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The IP multicast group address that, when combined - with pimBsrElectedBSRGrpMappingGrpPrefixLen, gives the - group prefix for this mapping. The InetAddressType is - given by the pimBsrElectedBSRGrpMappingAddrType object. - - This address object is only significant up to - pimBsrElectedBSRGrpMappingGrpPrefixLen bits. The - remainder of the address bits are zero. This is - especially important for this field, which is part of - the index of this entry. Any non-zero bits would - signify an entirely different entry." - ::= { pimBsrElectedBSRRPSetEntry 3 } - - pimBsrElectedBSRGrpMappingGrpPrefixLen OBJECT-TYPE - SYNTAX InetAddressPrefixLength (4..128) - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The multicast group prefix length that, when combined - with pimBsrElectedBSRGrpMappingGrpAddr, gives the group - prefix for this mapping. The InetAddressType is given by - the pimBsrElectedBSRGrpMappingAddrType object. If - pimBsrElectedBSRGrpMappingAddrType is 'ipv4' or 'ipv4z', - this object must be in the range 4..32. If - pimBsrElectedBSRGrpMappingAddrType is 'ipv6' or 'ipv6z', - this object must be in the range 8..128." - ::= { pimBsrElectedBSRRPSetEntry 4 } - - pimBsrElectedBSRGrpMappingRPAddr OBJECT-TYPE - SYNTAX InetAddress (SIZE (4|8|16|20)) - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The IP address of the RP to be used for groups within - this group prefix. The InetAddressType is given by the - pimBsrElectedBSRGrpMappingAddrType object." - ::= { pimBsrElectedBSRRPSetEntry 5 } - - pimBsrElectedBSRRPSetPriority OBJECT-TYPE - SYNTAX Unsigned32 (0..255) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The priority for RP. Numerically higher values for - this object indicate lower priorities, with the value - zero denoting the highest priority." - REFERENCE "RFC 5059, section 4.1" - ::= { pimBsrElectedBSRRPSetEntry 6 } - - pimBsrElectedBSRRPSetHoldtime OBJECT-TYPE - SYNTAX Unsigned32 (0..65535) - UNITS "seconds" - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The holdtime for RP" - REFERENCE "RFC 5059, section 4.1" - ::= { pimBsrElectedBSRRPSetEntry 7 } - - pimBsrElectedBSRRPSetExpiryTime OBJECT-TYPE - SYNTAX TimeTicks - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The minimum time remaining before this entry will be - aged out. The value zero indicates that this entry will - never be aged out." - ::= { pimBsrElectedBSRRPSetEntry 8 } - - -- - -- The BSR Candidate-BSR Table - -- - - pimBsrCandidateBSRTable OBJECT-TYPE - SYNTAX SEQUENCE OF PimBsrCandidateBSREntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The (conceptual) table containing Candidate-BSR - configuration for the local router. The table contains - one row for each zone for which the local router is - to advertise itself as a Candidate-BSR." - ::= { pimBsrObjects 3 } - - pimBsrCandidateBSREntry OBJECT-TYPE - SYNTAX PimBsrCandidateBSREntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "An entry (conceptual row) in the - pimBsrCandidateBSRTable." - INDEX { pimBsrCandidateBSRZoneIndex } - ::= { pimBsrCandidateBSRTable 1 } - - PimBsrCandidateBSREntry ::= SEQUENCE { - pimBsrCandidateBSRZoneIndex InetZoneIndex, - pimBsrCandidateBSRAddressType InetAddressType, - pimBsrCandidateBSRAddress InetAddress, - pimBsrCandidateBSRPriority Unsigned32, - pimBsrCandidateBSRHashMaskLength Unsigned32, - pimBsrCandidateBSRElectedBSR TruthValue, - pimBsrCandidateBSRBootstrapTimer TimeTicks, - pimBsrCandidateBSRStatus RowStatus - } - - pimBsrCandidateBSRZoneIndex OBJECT-TYPE - SYNTAX InetZoneIndex (1..4294967295) - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The zone index uniquely identifies the zone on a - device to which this Candidate-BSR is attached. There is - one entry for each zone in ipMcastZoneTable. Scope-level - information for this zone can be extracted from - ipMcastZoneTable in IP Multicast MIB [RFC5132]. - - Zero is a special value used to request the default zone - for a given scope. Zero is not a valid value for this - object." - - ::= { pimBsrCandidateBSREntry 1 } - - pimBsrCandidateBSRAddressType OBJECT-TYPE - SYNTAX InetAddressType - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "The address type of the Candidate-BSR." - ::= { pimBsrCandidateBSREntry 2 } - - pimBsrCandidateBSRAddress OBJECT-TYPE - SYNTAX InetAddress - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "The (unicast) address that the local router will - use to advertise itself as a Candidate-BSR. The - InetAddressType is given by the - pimBsrCandidateBSRAddressType object." - ::= { pimBsrCandidateBSREntry 3 } - - pimBsrCandidateBSRPriority OBJECT-TYPE - SYNTAX Unsigned32 (0..255) - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "The priority value for the local router as a - Candidate-BSR for this zone. Numerically higher - values for this object indicate higher priorities." - DEFVAL { 0 } - ::= { pimBsrCandidateBSREntry 4 } - - pimBsrCandidateBSRHashMaskLength OBJECT-TYPE - SYNTAX Unsigned32 (0..128) - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "The hash mask length (used in the RP hash function) - that the local router will advertise in its Bootstrap - messages for this zone. This object defaults - to 30 if pimBsrCandidateBSRAddressType is 'ipv4' or - 'ipv4z' , and defaults to 126 if - pimBsrCandidateBSRAddressType is 'ipv6' or 'ipv6z'." - ::= { pimBsrCandidateBSREntry 5 } - - pimBsrCandidateBSRElectedBSR OBJECT-TYPE - SYNTAX TruthValue - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "Whether the local router is the elected BSR for this - zone." - ::= { pimBsrCandidateBSREntry 6 } - - pimBsrCandidateBSRBootstrapTimer OBJECT-TYPE - SYNTAX TimeTicks - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The time remaining before the local router next - originates a Bootstrap message for this zone. - Value of this object is zero if - pimBsrCandidateBSRElectedBSR is 'FALSE'." - ::= { pimBsrCandidateBSREntry 7 } - - pimBsrCandidateBSRStatus OBJECT-TYPE - SYNTAX RowStatus - MAX-ACCESS read-create - STATUS current - DESCRIPTION - "The status of this row, by which new entries may - be created or old entries deleted from this table. - - This status object can be set to active(1) without - setting any other columnar objects in this entry. - - All writable objects in this entry can be modified - when the status of this entry is active(1)." - ::= { pimBsrCandidateBSREntry 8 } - - - -- - -- The BSR Elected-BSR Table - -- - - pimBsrElectedBSRTable OBJECT-TYPE - SYNTAX SEQUENCE OF PimBsrElectedBSREntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The (conceptual) table containing information about - elected BSRs. The table contains one row for each - zone for which there is an elected BSR." - ::= { pimBsrObjects 4 } - - pimBsrElectedBSREntry OBJECT-TYPE - SYNTAX PimBsrElectedBSREntry - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "An entry (conceptual row) in the - pimBsrElectedBSRTable." - INDEX { pimBsrElectedBSRZoneIndex } - ::= { pimBsrElectedBSRTable 1 } - - PimBsrElectedBSREntry ::= SEQUENCE { - pimBsrElectedBSRZoneIndex InetZoneIndex, - pimBsrElectedBSRAddressType InetAddressType, - pimBsrElectedBSRAddress InetAddress, - pimBsrElectedBSRPriority Unsigned32, - pimBsrElectedBSRHashMaskLength Unsigned32, - pimBsrElectedBSRExpiryTime TimeTicks - } - - pimBsrElectedBSRZoneIndex OBJECT-TYPE - SYNTAX InetZoneIndex (1..4294967295) - MAX-ACCESS not-accessible - STATUS current - DESCRIPTION - "The zone index uniquely identifies the zone on a - device to which this Elected BSR is attached. There - is one entry for each zone in ipMcastZoneTable. - Scope-level information for this zone can be extracted - from ipMcastZoneTable in IP Multicast MIB [RFC5132]. - - Zero is a special value used to request the default zone - for a given scope. Zero is not a valid value for this - object." - - ::= { pimBsrElectedBSREntry 1 } - - pimBsrElectedBSRAddressType OBJECT-TYPE - SYNTAX InetAddressType - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The address type of the elected BSR." - ::= { pimBsrElectedBSREntry 2 } - pimBsrElectedBSRAddress OBJECT-TYPE - SYNTAX InetAddress (SIZE (4|8|16|20)) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The (unicast) address of the elected BSR. The - InetAddressType is given by the - pimBsrElectedBSRAddressType object." - ::= { pimBsrElectedBSREntry 3 } - - pimBsrElectedBSRPriority OBJECT-TYPE - SYNTAX Unsigned32 (0..255) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The priority value for the elected BSR for this address - type. Numerically higher values for this object indicate - higher priorities." - ::= { pimBsrElectedBSREntry 4 } - - pimBsrElectedBSRHashMaskLength OBJECT-TYPE - SYNTAX Unsigned32 (0..128) - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The hash mask length (used in the RP hash function) - advertised by the elected BSR for this zone." - ::= { pimBsrElectedBSREntry 5 } - - pimBsrElectedBSRExpiryTime OBJECT-TYPE - SYNTAX TimeTicks - MAX-ACCESS read-only - STATUS current - DESCRIPTION - "The minimum time remaining before the elected BSR for - this zone will be declared down." - ::= { pimBsrElectedBSREntry 6 } - - -- - -- PIM BSR Notifications - -- - - pimBsrElectedBSRLostElection NOTIFICATION-TYPE - OBJECTS { pimBsrElectedBSRAddressType, - pimBsrElectedBSRAddress, - pimBsrElectedBSRPriority } - STATUS current - DESCRIPTION - "A pimBsrElectedBSRLostElection notification should be - generated when current E-BSR lost election to a new - Candidate-BSR. Only an E-BSR should generate this - notification. - - This notification is generated when - pimBsrCandidateBSRElectedBSR becomes FALSE." - - REFERENCE "RFC 5059, section 3.1" - ::= { pimBsrNotifications 1 } - - pimBsrCandidateBSRWinElection NOTIFICATION-TYPE - OBJECTS { pimBsrCandidateBSRElectedBSR } - STATUS current - DESCRIPTION - "A pimBsrCandidateBSRWinElection notification should be - generated when a C-BSR wins BSR Election. Only an - E-BSR should generate this notification. - - This notification is generated when - pimBsrCandidateBSRElectedBSR becomes TRUE." - - REFERENCE "RFC 5059, section 3.1" - ::= { pimBsrNotifications 2 } - - -- - -- Compliance Statements - -- - - pimBsrCompliance MODULE-COMPLIANCE - STATUS current - DESCRIPTION - "The compliance statement for PIM routers that implement - the Bootstrap Router (BSR) mechanism." - MODULE -- this module - MANDATORY-GROUPS { pimBsrObjectGroup } - - GROUP pimBsrDiagnosticsGroup - DESCRIPTION - "This group is optional." - - ::= { pimBsrCompliances 1 } - - -- - -- Units of Conformance - -- - - pimBsrObjectGroup OBJECT-GROUP - OBJECTS { pimBsrCandidateRPBidir, - pimBsrCandidateRPStatus, - pimBsrElectedBSRRPSetPriority, - pimBsrElectedBSRRPSetHoldtime, - pimBsrElectedBSRRPSetExpiryTime, - pimBsrCandidateBSRAddress, - pimBsrCandidateBSRAddressType, - pimBsrCandidateBSRPriority, - pimBsrCandidateBSRHashMaskLength, - pimBsrCandidateBSRElectedBSR, - pimBsrCandidateBSRBootstrapTimer, - pimBsrCandidateBSRStatus, - pimBsrElectedBSRAddress, - pimBsrElectedBSRAddressType, - pimBsrElectedBSRPriority, - pimBsrElectedBSRHashMaskLength, - pimBsrElectedBSRExpiryTime } - STATUS current - DESCRIPTION - "A collection of objects for managing the Bootstrap - Router (BSR) mechanism for PIM routers." - ::= { pimBsrGroups 1 } - - pimBsrDiagnosticsGroup NOTIFICATION-GROUP - NOTIFICATIONS { pimBsrElectedBSRLostElection, - pimBsrCandidateBSRWinElection } - STATUS current - DESCRIPTION - "Objects providing additional diagnostics related to - the Bootstrap Router (BSR) mechanism for PIM routers." - ::= { pimBsrGroups 2 } - - END diff --git a/mibs/rdp/ECOSWITCH-HARDWARE-INFO-MIB b/mibs/rdp/ECOSWITCH-HARDWARE-INFO-MIB new file mode 100644 index 00000000000..39111b91bc6 --- /dev/null +++ b/mibs/rdp/ECOSWITCH-HARDWARE-INFO-MIB @@ -0,0 +1,454 @@ +ECOSWITCH-HARDWARE-INFO-MIB DEFINITIONS ::= BEGIN + +-- +-- Hardware information of SDN SWITCH platform +-- + +IMPORTS + MODULE-IDENTITY, + OBJECT-TYPE, + enterprises, + Counter64, + Integer32, + Unsigned32 + FROM SNMPv2-SMI + OBJECT-GROUP + FROM SNMPv2-CONF; + + +rdp MODULE-IDENTITY + LAST-UPDATED "202409100000Z" + ORGANIZATION "RDP.RU" + CONTACT-INFO "web: http://rdp.ru" + DESCRIPTION "Includes information about hardware" + REVISION "202409100000Z" + DESCRIPTION + "Initial version" + ::= { enterprises 45555 } + +ecoswitch OBJECT IDENTIFIER ::= { rdp 3 } +hardwareInfo OBJECT IDENTIFIER ::= { ecoswitch 3 } + +productObjects OBJECT-GROUP + OBJECTS { + serialNumber, + productName, + biosVersion, + cpuCoreNumber, + cpuCoreLoad, + total, + free, + utilization, + storageDevice, + storageType, + storageTotal, + storageFree, + storageUtilization, + psuNumber, + psuType, + psuStatus, + psuInputVoltage, + psuInputCurrent, + psuOutputVoltage, + psuOutputCurrent, + fanNumber, + fanState, + fanSpeedFront, + fanSpeedRear, + sensorsAdapterName, + sensorsAdapterParameterName, + sensorsAdapterParameterValue + } + STATUS current + DESCRIPTION + "The group of objects that constitute the information + about hardware" +::= { hardwareInfo 8 } + +-- +-- platform info +-- + +platformInfo OBJECT IDENTIFIER ::= { hardwareInfo 1 } + +serialNumber OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Product Serial Number" + ::= { platformInfo 1 } + +productName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Product name" + ::= { platformInfo 2 } + +biosVersion OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "BIOS version" + ::= { platformInfo 3 } + +-- +-- CPU Info +-- + +cpuInfoTable OBJECT-TYPE + SYNTAX SEQUENCE OF CpuInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Information about CPUs" + ::= { hardwareInfo 2 } + +cpuInfoEntry OBJECT-TYPE + SYNTAX CpuInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + INDEX { cpuCoreNumber } + ::= { cpuInfoTable 1 } + +CpuInfoEntry ::= + SEQUENCE { + cpuCoreNumber Unsigned32, + cpuCoreLoad Unsigned32 + } + + cpuCoreNumber OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Core number" + ::= { cpuInfoEntry 1 } + + cpuCoreLoad OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "CPU utilization percentage" + ::= { cpuInfoEntry 2 } + +-- +-- Memory Info +-- + +memoryInfo OBJECT IDENTIFIER ::= { hardwareInfo 3 } + +total OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Total capacity" + ::= { memoryInfo 1 } + +free OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Free memory" + ::= { memoryInfo 2 } + +utilization OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Utilization in percents" + ::= { memoryInfo 3 } + +-- +-- Storage Info +-- + +storageInfoTable OBJECT-TYPE + SYNTAX SEQUENCE OF StorageInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Information about storage devices" + ::= { hardwareInfo 4 } + +storageInfoEntry OBJECT-TYPE + SYNTAX StorageInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + INDEX { storageDevice } + ::= { storageInfoTable 1 } + +StorageInfoEntry ::= + SEQUENCE { + storageDevice Unsigned32, + storageType OCTET STRING, + storageTotal Counter64, + storageFree Counter64, + storageUtilization Unsigned32 + } + + storageDevice OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Storage device number" + ::= { storageInfoEntry 1 } + + storageType OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Storage device type" + ::= { storageInfoEntry 2 } + + storageTotal OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Total capacity" + ::= { storageInfoEntry 3 } + + storageFree OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Free memory" + ::= { storageInfoEntry 4 } + + storageUtilization OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Utilization in percents" + ::= { storageInfoEntry 5 } + +-- +-- PSU Info +-- + +psuInfoTable OBJECT-TYPE + SYNTAX SEQUENCE OF PsuInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Information about power consumption" + ::= { hardwareInfo 5 } + +psuInfoEntry OBJECT-TYPE + SYNTAX PsuInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + INDEX { psuNumber } + ::= { psuInfoTable 1 } + +PsuInfoEntry ::= + SEQUENCE { + psuNumber Unsigned32, + psuType INTEGER, + psuStatus INTEGER, + psuInputVoltage Unsigned32, + psuInputCurrent Unsigned32, + psuOutputVoltage Unsigned32, + psuOutputCurrent Unsigned32 + } + + psuNumber OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "PSU number" + ::= { psuInfoEntry 1 } + + psuType OBJECT-TYPE + SYNTAX INTEGER { + unknown(0), + AC(1), + DC(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "PSU type" + ::= { psuInfoEntry 2 } + + psuStatus OBJECT-TYPE + SYNTAX INTEGER { + unknown(0), + PowerOn(1), + PowerOff(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "PSU status" + ::= { psuInfoEntry 3 } + + psuInputVoltage OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Input voltage, mV" + ::= { psuInfoEntry 4 } + + psuInputCurrent OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Input current, mA" + ::= { psuInfoEntry 5 } + + psuOutputVoltage OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Output voltage, mV" + ::= { psuInfoEntry 6 } + + psuOutputCurrent OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Output current, mA" + ::= { psuInfoEntry 7 } + +-- +-- fan Info +-- + +fanInfoTable OBJECT-TYPE + SYNTAX SEQUENCE OF FanInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Information about fans" + ::= { hardwareInfo 6 } + +fanInfoEntry OBJECT-TYPE + SYNTAX FanInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + INDEX { fanNumber } + ::= { fanInfoTable 1 } + +FanInfoEntry ::= + SEQUENCE { + fanNumber Unsigned32, + fanState INTEGER, + fanSpeedFront Unsigned32, + fanSpeedRear Unsigned32 + } + + fanNumber OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Fan number" + ::= { fanInfoEntry 1 } + + fanState OBJECT-TYPE + SYNTAX INTEGER { + unknown(0), + active(1), + inactive(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Fan state" + ::= { fanInfoEntry 2 } + + fanSpeedFront OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Fan speed in revolutions per minute" + ::= { fanInfoEntry 3 } + + fanSpeedRear OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Fan speed in revolutions per minute" + ::= { fanInfoEntry 4 } + +-- +-- Sensors Info +-- + +sensorsInfoTable OBJECT-TYPE + SYNTAX SEQUENCE OF SensorsInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + ::= { hardwareInfo 7 } + +sensorsInfoEntry OBJECT-TYPE + SYNTAX SensorsInfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "" + INDEX { sensorsAdapterName, sensorsAdapterParameterName } + ::= { sensorsInfoTable 1 } + +SensorsInfoEntry ::= + SEQUENCE { + sensorsAdapterName OCTET STRING, + sensorsAdapterParameterName OCTET STRING, + sensorsAdapterParameterValue OCTET STRING + } + + sensorsAdapterName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Name of the sensor" + ::= { sensorsInfoEntry 1 } + + sensorsAdapterParameterName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Name of sensor's parameter" + ::= { sensorsInfoEntry 2 } + + sensorsAdapterParameterValue OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "" + ::= { sensorsInfoEntry 3 } + +END diff --git a/mibs/riedel/RIEDEL-MEDIORNET-MIB b/mibs/riedel/RIEDEL-MEDIORNET-MIB new file mode 100644 index 00000000000..cfae10d4855 --- /dev/null +++ b/mibs/riedel/RIEDEL-MEDIORNET-MIB @@ -0,0 +1,658 @@ +RIEDEL-MEDIORNET-MIB DEFINITIONS ::= BEGIN + + IMPORTS + OBJECT-TYPE + FROM RFC-1212 + enterprises, MODULE-IDENTITY, Integer32, Unsigned32 + FROM SNMPv2-SMI + OBJECT-GROUP, MODULE-COMPLIANCE + FROM SNMPv2-CONF + DisplayString + FROM SNMPv2-TC; + + riedelMediornetMib MODULE-IDENTITY + LAST-UPDATED "202311020000Z" + + ORGANIZATION "Riedel Communications GmbH & Co. KG" + CONTACT-INFO + "RIEDEL Communications GmbH & Co. KG + Customerservice + Uellendahler Str. 353 + 42109 Wuppertal + Germany + phone: +49 (0) 202 292 - 9400 + email: customerservice@riedel.net" + + DESCRIPTION + "This document contains the MIB for the Mediornet system. + Copyright 2017 Riedel Communications GmbH & Co. KG + + This module can be extended or modified as required, + please contact Riedel Communications GmbH for the latest + version and requested enhancements." + + REVISION "202311020000Z" + DESCRIPTION + "Removed inputUsage and outputUsage of linkTable. Removed videoPortTable." + + REVISION "201903220000Z" + DESCRIPTION + "New port status: linkUp25G." + + REVISION "201708220000Z" + DESCRIPTION + "New port status: validNotUsed, testsignalNotUsed." + + REVISION "201412110000Z" + DESCRIPTION + "New port statuses: clipping, linkUp, linkUp10G, linkUp10M, linkUp100M, linkUp1G, locking, gpiOn, gpiOff." + + REVISION "201401310000Z" + DESCRIPTION + "New port status: freezed." + + REVISION "201310230000Z" + DESCRIPTION + "New sync formats: invalid, jitterTooHigh." + + REVISION "201307310000Z" + DESCRIPTION + "New sync formats: triLevel1080psF24, triLevel1080psF23." + + REVISION "201305300000Z" + DESCRIPTION + "Introduced NodeId and serialNumber. Link table with NodeId. Slot table with cardSerialNumber." + + REVISION "201304110000Z" + DESCRIPTION + "New sync formats: wordclock48kHzPulse, wordclock96kHzPulse, wordclock192kHzPulse." + + REVISION "201302040000Z" + DESCRIPTION + "New tables: slotTable, linkTable, videoPortTable, gpiTable." + + REVISION "201010110000Z" + DESCRIPTION + "First release of the mediornet mib." + + ::= { mediornet 1 } + + riedel OBJECT IDENTIFIER + ::= { enterprises 23056 } + -- Assigned by the IANA for Riedel Communications GmbH & Co. KG, the full list can be retrieved at www.iana.org + + mediornet OBJECT IDENTIFIER ::= { riedel 2 } + + + guid OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..14)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A unique identifier used to identify a MediorNet frame." + ::= { mediornet 2 } + + name OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A free configurable, human readable name for the frame." + ::= { mediornet 3 } + + userNotes OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A free configurable string." + ::= { mediornet 4 } + + packageVersion OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..255)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The MediorNet package version installed on the frame." + ::= { mediornet 5 } + + contact OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The email address of the contact person for this frame." + ::= { mediornet 6 } + + location OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The physical location of this frame." + ::= { mediornet 7 } + + nodeId OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The user given node ID of this frame." + ::= { mediornet 8 } + + serialNumber OBJECT-TYPE + SYNTAX DisplayString (SIZE (13)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Riedel serial number of this frame." + ::= { mediornet 9 } + + fanSpeed OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The rotation speed of the fans in RPM." + ::= { mediornet 10 } + + temperature OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The temperature of the frame in degree celsius." + ::= { mediornet 11 } + + cpuLoad OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The processor load in per mille for the last 5 seconds." + ::= { mediornet 12 } + + psu1 OBJECT-TYPE + SYNTAX INTEGER + { + notAvailable(0), + operating(1), + notOperating(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The operating status of power supply 1." + ::= { mediornet 13 } + + psu2 OBJECT-TYPE + SYNTAX INTEGER + { + notAvailable(0), + operating(1), + notOperating(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The operating status of power supply 2." + ::= { mediornet 14 } + + syncIn OBJECT-TYPE + SYNTAX INTEGER + { + none(0), + blackburstNTSC(1), + blackburstPAL(2), + triLevel720p60(3), + triLevel720p59(4), + triLevel720p50(5), + triLevel720p30(6), + triLevel720p29(7), + triLevel720p25(8), + triLevel720p24(9), + triLevel720p23(10), + triLevel1080i60(11), + triLevel1080i59(12), + triLevel1080i50(13), + triLevel1080p30(14), + triLevel1080p29(15), + triLevel1080p25(16), + triLevel1080p24(17), + triLevel1080p23(18), + wordclock48kHz(19), + wordclock96kHz(20), + wordclock192kHz(21), + wordclock48kHzPulse(22), + wordclock96kHzPulse(23), + wordclock192kHzPulse(24), + triLevel1080psF24(25), + triLevel1080psF23(26), + invalid(27), + jitterTooHigh(28) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The synchronization input signal type." + ::= { mediornet 15 } + + syncOut OBJECT-TYPE + SYNTAX INTEGER + { + none(0), + blackburstNTSC(1), + blackburstPAL(2), + triLevel720p60(3), + triLevel720p59(4), + triLevel720p50(5), + triLevel720p30(6), + triLevel720p29(7), + triLevel720p25(8), + triLevel720p24(9), + triLevel720p23(10), + triLevel1080i60(11), + triLevel1080i59(12), + triLevel1080i50(13), + triLevel1080p30(14), + triLevel1080p29(15), + triLevel1080p25(16), + triLevel1080p24(17), + triLevel1080p23(18), + wordclock48kHz(19), + wordclock96kHz(20), + wordclock192kHz(21), + wordclock48kHzPulse(22), + wordclock96kHzPulse(23), + wordclock192kHzPulse(24), + triLevel1080psF24(25), + triLevel1080psF23(26) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The synchronization output signal type." + ::= { mediornet 16 } + + syncState OBJECT-TYPE + SYNTAX INTEGER + { + slave(0), + masterFreerun(1), + masterLocking(2), + masterLocked(3), + undefined(100) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The synchronization status of the frame." + ::= { mediornet 17 } + + + -- SlotTable + + slotTable OBJECT-TYPE + SYNTAX SEQUENCE OF SlotEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Provides information about the slots of a frame." + ::= { mediornet 20 } + + slotEntry OBJECT-TYPE + SYNTAX SlotEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry (conceptual row) in the slotTable." + INDEX { slotTableIndex } + ::= { slotTable 1 } + + SlotEntry ::= SEQUENCE + { + slotTableIndex Integer32, + slot Integer32, + cardName DisplayString, + cardStatus INTEGER, + cardTemperature Integer32, + cardType DisplayString, + cardSerialNumber DisplayString + } + + slotTableIndex OBJECT-TYPE + SYNTAX Integer32 (0..65535) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A unique identifier." + ::= { slotEntry 1 } + + slot OBJECT-TYPE + SYNTAX Integer32 (0..65535) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of the slot." + ::= { slotEntry 2 } + + cardName OBJECT-TYPE + SYNTAX DisplayString (SIZE (1..255)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A free configurable, human readable name for the card." + ::= { slotEntry 3 } + + cardStatus OBJECT-TYPE + SYNTAX INTEGER + { + empty(0), + active(1), + wrongSlot(2), + updateRequired(3), + failed(4) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The actual status of a card." + ::= { slotEntry 4 } + + cardTemperature OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The actual temperature of the card in degree celsius." + ::= { slotEntry 5 } + + cardType OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The card type." + ::= { slotEntry 6 } + + cardSerialNumber OBJECT-TYPE + SYNTAX DisplayString (SIZE (13)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Riedel serial number of a card." + ::= { slotEntry 7 } + + -- End of SlotTable + + + -- LinkTable + + linkTable OBJECT-TYPE + SYNTAX SEQUENCE OF LinkEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Provides infomation about the fiber links of a frame." + ::= { mediornet 30 } + + linkEntry OBJECT-TYPE + SYNTAX LinkEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry (conceptual row) in the linkTable." + INDEX { linkTableIndex } + ::= { linkTable 1 } + + LinkEntry ::= SEQUENCE + { + linkTableIndex Integer32, + linkSlot Integer32, + link Integer32, + linkStatus Integer32, + linkCapacity Integer32, + destNodeMac Unsigned32, + destNodeIp Integer32, + destLink Integer32 + } + + linkTableIndex OBJECT-TYPE + SYNTAX Integer32 (0..65535) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A unique identifier." + ::= { linkEntry 1 } + + linkSlot OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of the slot in which the link card resides." + ::= { linkEntry 2 } + + link OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of the link on the link card." + ::= { linkEntry 3 } + + linkStatus OBJECT-TYPE + SYNTAX INTEGER + { + sfpNotPresentLinkUp(-1), + sfpNotPresentLinkDown(0), + sfpPresentLinkDown(1), + sfpPresentLinkUp(2) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The actual status of the link." + ::= { linkEntry 4 } + + linkCapacity OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The total number of timeslots on that link" + ::= { linkEntry 7 } + + destNodeMac OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The MAC of the remote MediorNet frame of that link." + ::= { linkEntry 8 } + + destNodeIp OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The IP of the remote MediorNet frame of that link." + ::= { linkEntry 9 } + + destLink OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The link number on the link card of the remote MediorNet frame of that link." + ::= { linkEntry 10 } + + -- End of LinkTable + + + -- GPITable + + gpiTable OBJECT-TYPE + SYNTAX SEQUENCE OF GpiEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Provides infomation about the status of GPIs." + ::= { mediornet 80 } + + gpiEntry OBJECT-TYPE + SYNTAX GpiEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry (conceptual row) in the gpiTable." + INDEX { gpiTableIndex } + ::= { gpiTable 1 } + + GpiEntry ::= SEQUENCE + { + gpiTableIndex Integer32, + gpiSlot Integer32, + gpi Integer32, + gpiDirection INTEGER, + gpiName DisplayString, + gpiStatus Integer32 + } + + gpiTableIndex OBJECT-TYPE + SYNTAX Integer32 (0..65535) + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A unique identifier." + ::= { gpiEntry 1 } + + gpiSlot OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of the slot in which the gpi module resides." + ::= { gpiEntry 2 } + + gpi OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of the gpi." + ::= { gpiEntry 3 } + + gpiDirection OBJECT-TYPE + SYNTAX INTEGER + { + input(0), + output(1) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The direction of the gpi." + ::= { gpiEntry 4 } + + gpiName OBJECT-TYPE + SYNTAX DisplayString + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "A free configurable, human readable name for the gpi." + ::= { gpiEntry 5 } + + gpiStatus OBJECT-TYPE + SYNTAX INTEGER + { + off(0), + on(1) + } + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The actual status of the gpi." + ::= { gpiEntry 6 } + + -- End of GPITable + + + -- conformance + + riedelMediornetMibConformance OBJECT IDENTIFIER + ::= { riedelMediornetMib 1 } + + riedelMediornetMibCompliances OBJECT IDENTIFIER + ::= { riedelMediornetMibConformance 1 } + + riedelMediornetMibGroups OBJECT IDENTIFIER + ::= { riedelMediornetMibConformance 2 } + + -- End of conformance + + + -- compliance statements + + riedelMediornetMibCompliance MODULE-COMPLIANCE + STATUS current + DESCRIPTION + "The compliance statement for mediornet MIB" + MODULE + MANDATORY-GROUPS + { + riedelMediornetMibGroup + } + ::= { riedelMediornetMibCompliances 1 } + + -- end of compliance statements + + + -- units of conformance + + riedelMediornetMibGroup OBJECT-GROUP + OBJECTS + { + guid, + name, + userNotes, + packageVersion, + contact, + location, + nodeId, + serialNumber, + fanSpeed, + temperature, + cpuLoad, + psu1, + psu2, + syncIn, + syncOut, + syncState, + slot, + cardName, + cardStatus, + cardTemperature, + cardType, + cardSerialNumber, + linkSlot, + link, + linkStatus, + linkCapacity, + destNodeMac, + destNodeIp, + destLink, + gpiSlot, + gpi, + gpiDirection, + gpiName, + gpiStatus + } + STATUS current + DESCRIPTION + "A collection of objects providing basic mediornet snmp information." + ::= { riedelMediornetMibGroups 1 } + + + +END diff --git a/mibs/zscaler/ZSCALER-NSS-MIB b/mibs/zscaler/ZSCALER-NSS-MIB new file mode 100755 index 00000000000..c81ebf2e199 --- /dev/null +++ b/mibs/zscaler/ZSCALER-NSS-MIB @@ -0,0 +1,128 @@ +ZSCALER-NSS-MIB DEFINITIONS ::= BEGIN + +IMPORTS + MODULE-IDENTITY, OBJECT-TYPE, Counter32, Gauge32, Counter64, + Integer32, TimeTicks, mib-2,enterprises, + NOTIFICATION-TYPE FROM SNMPv2-SMI + TEXTUAL-CONVENTION, DisplayString, + PhysAddress, TruthValue, RowStatus, + TimeStamp, AutonomousType, TestAndIncr FROM SNMPv2-TC + MODULE-COMPLIANCE, OBJECT-GROUP, + NOTIFICATION-GROUP FROM SNMPv2-CONF + snmpTraps FROM SNMPv2-MIB + IANAifType FROM IANAifType-MIB; + +nss MODULE-IDENTITY + LAST-UPDATED "201705020814Z" + ORGANIZATION "Zscaler" + CONTACT-INFO + "Zscaler Inc. + US" + DESCRIPTION + "This module describes information specific to the NSS instance." + + REVISION "201705020814Z" + DESCRIPTION + "Initial revision." + ::= { enterprises 46262 } + +zscaler OBJECT IDENTIFIER ::= { enterprises 46262 } + +nssinfo OBJECT IDENTIFIER ::= { zscaler 7 } + +nssNumber OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of nss present on this system." + ::= { nssinfo 1 } + +nssTable OBJECT-TYPE + SYNTAX SEQUENCE OF NssEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A list of nss entries. The number of entries is + given by the value of nssNumber." + ::= { nssinfo 2 } + +nssEntry OBJECT-TYPE + SYNTAX NssEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry containing management information applicable to a + particular nss." + INDEX { nssIndex } + ::= { nssTable 1 } + +NssEntry ::= + SEQUENCE { + nssIndex Integer32, + nssName OCTET STRING, + nssRole OCTET STRING, + nssInstance OCTET STRING, + smsm_cur_smca_conn_est Counter64, + smsm_cur_weblog_time Counter64, + smsm_nss_tot_transactions_processed Counter64, + } + +nssIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The index of nss in the list of such objects" + ::= { nssEntry 1 } + +nssName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The name of the nss" + ::= { nssEntry 2 } + +nssRole OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Zscaler role to which this nss belongs" + ::= { nssEntry 3 } + +nssInstance OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Zscaler instance path where this nss is present" + ::= { nssEntry 4 } + +smsm_cur_smca_conn_est OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Nss connection to zscaler central authority established or not" + ::= { nssEntry 5 } + +smsm_cur_weblog_time OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Latest time till which Nss has processed data from Nanolog server" + ::= { nssEntry 6 } + +smsm_nss_tot_transactions_processed OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Total number of transaction processed by Nss" + ::= { nssEntry 7 } + + +END diff --git a/mibs/zscaler/ZSCALER-NSSFEED-MIB b/mibs/zscaler/ZSCALER-NSSFEED-MIB new file mode 100755 index 00000000000..30c614e671b --- /dev/null +++ b/mibs/zscaler/ZSCALER-NSSFEED-MIB @@ -0,0 +1,155 @@ +ZSCALER-NSSFEED-MIB DEFINITIONS ::= BEGIN + +IMPORTS + MODULE-IDENTITY, OBJECT-TYPE, Counter32, Gauge32, Counter64, Unsigned32, + Integer32, TimeTicks, mib-2,enterprises, + NOTIFICATION-TYPE FROM SNMPv2-SMI + TEXTUAL-CONVENTION, DisplayString, + PhysAddress, TruthValue, RowStatus, + TimeStamp, AutonomousType, TestAndIncr FROM SNMPv2-TC + MODULE-COMPLIANCE, OBJECT-GROUP, + NOTIFICATION-GROUP FROM SNMPv2-CONF + snmpTraps FROM SNMPv2-MIB + IANAifType FROM IANAifType-MIB; + +nssfeed MODULE-IDENTITY + LAST-UPDATED "201705150406Z" + ORGANIZATION "Zscaler" + CONTACT-INFO + "Zscaler Inc. + US" + DESCRIPTION + "This module describes information specific to NSS feed." + + REVISION "201705150406Z" + DESCRIPTION + "Initial revision." + ::= { enterprises 46262 } + +zscaler OBJECT IDENTIFIER ::= { enterprises 46262 } + +nssfeedinfo OBJECT IDENTIFIER ::= { zscaler 8 } + +nssfeedNumber OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of nssfeed present on this system." + ::= { nssfeedinfo 1 } + +nssfeedTable OBJECT-TYPE + SYNTAX SEQUENCE OF NssfeedEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A list of nssfeed entries. The number of entries is + given by the value of nssfeedNumber." + ::= { nssfeedinfo 2 } + +nssfeedEntry OBJECT-TYPE + SYNTAX NssfeedEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry containing management information applicable to a + particular nssfeed." + INDEX { nssfeedIndex } + ::= { nssfeedTable 1 } + +NssfeedEntry ::= + SEQUENCE { + nssfeedIndex Integer32, + nssfeedName OCTET STRING, + nssfeedRole OCTET STRING, + nssfeedInstance OCTET STRING, + smsmclt_cur_datatimestamp Unsigned32, + smsmclt_tot_nss_buf_roff_overwritten Counter64, + smsmclt_tot_transactions_count Counter64, + smsmclt_tot_conn_closed Counter64, + smsmclt_tot_nss_ratelimit_events_allowed Counter64, + smsmclt_tot_nss_ratelimit_yield_for_credits Counter64, + } + +nssfeedIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The index of nssfeed in the list of such objects" + ::= { nssfeedEntry 1 } + +nssfeedName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The name of the nssfeed" + ::= { nssfeedEntry 2 } + +nssfeedRole OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Zscaler role to which this nssfeed belongs" + ::= { nssfeedEntry 3 } + +nssfeedInstance OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Zscaler instance path where this nssfeed is present" + ::= { nssfeedEntry 4 } + +smsmclt_cur_datatimestamp OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Nss siem time" + ::= { nssfeedEntry 5 } + +smsmclt_tot_nss_buf_roff_overwritten OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of times siem data was overwritten" + ::= { nssfeedEntry 6 } + +smsmclt_tot_transactions_count OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Total number of transactions sent to siem" + ::= { nssfeedEntry 7 } + +smsmclt_tot_conn_closed OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of connection attempts to siem" + ::= { nssfeedEntry 8 } + +smsmclt_tot_nss_ratelimit_events_allowed OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of events allowed by ratelimit feature" + ::= { nssfeedEntry 9 } + +smsmclt_tot_nss_ratelimit_yield_for_credits OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Number of times events were held back from sending by ratelimit feature" + ::= { nssfeedEntry 10 } + + +END diff --git a/mibs/zscaler/ZSCALER-OSNIC-MIB b/mibs/zscaler/ZSCALER-OSNIC-MIB new file mode 100755 index 00000000000..9df1573aa4a --- /dev/null +++ b/mibs/zscaler/ZSCALER-OSNIC-MIB @@ -0,0 +1,103 @@ +ZSCALER-OSNIC-MIB DEFINITIONS ::= BEGIN + +IMPORTS + MODULE-IDENTITY, OBJECT-TYPE, Counter32, Gauge32, Counter64, + Integer32, TimeTicks, mib-2,enterprises, + NOTIFICATION-TYPE FROM SNMPv2-SMI + TEXTUAL-CONVENTION, DisplayString, + PhysAddress, TruthValue, RowStatus, + TimeStamp, AutonomousType, TestAndIncr FROM SNMPv2-TC + MODULE-COMPLIANCE, OBJECT-GROUP, + NOTIFICATION-GROUP FROM SNMPv2-CONF + snmpTraps FROM SNMPv2-MIB + IANAifType FROM IANAifType-MIB; + +osnic MODULE-IDENTITY + LAST-UPDATED "201704280805Z" + ORGANIZATION "Zscaler" + CONTACT-INFO + "Zscaler Inc. + US" + DESCRIPTION + "This module describes the NIC devices managed by the OS. + On a Zscaler system, there are NIC devices managed by the + Zscaler instances and also by the base OS." + + REVISION "201704280805Z" + DESCRIPTION + "Initial revision." + ::= { enterprises 46262 } + +zscaler OBJECT IDENTIFIER ::= { enterprises 46262 } + +osnics OBJECT IDENTIFIER ::= { zscaler 1 } + +osnicNumber OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of osnic present on this system." + ::= { osnics 1 } + +osnicTable OBJECT-TYPE + SYNTAX SEQUENCE OF OsnicEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A list of osnic entries. The number of entries is + given by the value of osnicNumber." + ::= { osnics 2 } + +osnicEntry OBJECT-TYPE + SYNTAX OsnicEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry containing management information applicable to a + particular osnic." + INDEX { osnicIndex } + ::= { osnicTable 1 } + +OsnicEntry ::= + SEQUENCE { + osnicIndex Integer32, + osnicName OCTET STRING, + osnicRole OCTET STRING, + osnicInstance OCTET STRING, + } + +osnicIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The index of osnic in the list of such objects" + ::= { osnicEntry 1 } + +osnicName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The name of the osnic" + ::= { osnicEntry 2 } + +osnicRole OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Zscaler role to which this osnic belongs" + ::= { osnicEntry 3 } + +osnicInstance OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Zscaler instance path where this osnic is present" + ::= { osnicEntry 4 } + + +END diff --git a/mibs/zscaler/ZSCALER-PROCESSHEALTH-MIB b/mibs/zscaler/ZSCALER-PROCESSHEALTH-MIB new file mode 100755 index 00000000000..29bb2cfc813 --- /dev/null +++ b/mibs/zscaler/ZSCALER-PROCESSHEALTH-MIB @@ -0,0 +1,156 @@ +ZSCALER-PROCESSHEALTH-MIB DEFINITIONS ::= BEGIN + +IMPORTS + MODULE-IDENTITY, OBJECT-TYPE, Counter32, Gauge32, Counter64, Unsigned32, + Integer32, TimeTicks, mib-2,enterprises, + NOTIFICATION-TYPE FROM SNMPv2-SMI + TEXTUAL-CONVENTION, DisplayString, + PhysAddress, TruthValue, RowStatus, + TimeStamp, AutonomousType, TestAndIncr FROM SNMPv2-TC + MODULE-COMPLIANCE, OBJECT-GROUP, + NOTIFICATION-GROUP FROM SNMPv2-CONF + snmpTraps FROM SNMPv2-MIB + IANAifType FROM IANAifType-MIB; + +processhealth MODULE-IDENTITY + LAST-UPDATED "201704280805Z" + ORGANIZATION "Zscaler" + CONTACT-INFO + "Zscaler Inc. + US" + DESCRIPTION + "This module describes health information for all watched + processes in the Zscaler instance." + + REVISION "201704280805Z" + DESCRIPTION + "Initial revision." + ::= { enterprises 46262 } + +zscaler OBJECT IDENTIFIER ::= { enterprises 46262 } + +processhealths OBJECT IDENTIFIER ::= { zscaler 5 } + +processhealthNumber OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of processhealth present on this system." + ::= { processhealths 1 } + +processhealthTable OBJECT-TYPE + SYNTAX SEQUENCE OF ProcesshealthEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A list of processhealth entries. The number of entries is + given by the value of processhealthNumber." + ::= { processhealths 2 } + +processhealthEntry OBJECT-TYPE + SYNTAX ProcesshealthEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry containing management information applicable to a + particular processhealth." + INDEX { processhealthIndex } + ::= { processhealthTable 1 } + +ProcesshealthEntry ::= + SEQUENCE { + processhealthIndex Integer32, + processhealthName OCTET STRING, + processhealthRole OCTET STRING, + processhealthInstance OCTET STRING, + process_tot_execution_timeus Counter64, + process_cur_memory_size Counter64, + process_cur_memory_size_resident Counter64, + process_msb_cur_allocated Unsigned32, + process_msb_cur_free Unsigned32, + module_cpu_use Unsigned32, + } + +processhealthIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The index of processhealth in the list of such objects" + ::= { processhealthEntry 1 } + +processhealthName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The name of the processhealth" + ::= { processhealthEntry 2 } + +processhealthRole OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Zscaler role to which this processhealth belongs" + ::= { processhealthEntry 3 } + +processhealthInstance OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Zscaler instance path where this processhealth is present" + ::= { processhealthEntry 4 } + +process_tot_execution_timeus OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Process total execution time in micro seconds" + ::= { processhealthEntry 5 } + +process_cur_memory_size OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Process total memory size in bytes" + ::= { processhealthEntry 6 } + +process_cur_memory_size_resident OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Process total resident memory size in bytes" + ::= { processhealthEntry 7 } + +process_msb_cur_allocated OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "MSBs (Zscaler packet buffers) allocated from the pool - value represent used and free MSBs" + ::= { processhealthEntry 8 } + +process_msb_cur_free OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "MSBs (Zscaler packet buffers) allocated but currently in the free list" + ::= { processhealthEntry 9 } + +module_cpu_use OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Process CPU utilization - To get percentage value, divide by 100" + ::= { processhealthEntry 10 } + + +END diff --git a/mibs/zscaler/ZSCALER-PROCESSWATCHDOG-MIB b/mibs/zscaler/ZSCALER-PROCESSWATCHDOG-MIB new file mode 100755 index 00000000000..75b3730cacf --- /dev/null +++ b/mibs/zscaler/ZSCALER-PROCESSWATCHDOG-MIB @@ -0,0 +1,104 @@ +ZSCALER-PROCESSWATCHDOG-MIB DEFINITIONS ::= BEGIN + +IMPORTS + MODULE-IDENTITY, OBJECT-TYPE, Counter32, Gauge32, Counter64, + Integer32, TimeTicks, mib-2,enterprises, + NOTIFICATION-TYPE FROM SNMPv2-SMI + TEXTUAL-CONVENTION, DisplayString, + PhysAddress, TruthValue, RowStatus, + TimeStamp, AutonomousType, TestAndIncr FROM SNMPv2-TC + MODULE-COMPLIANCE, OBJECT-GROUP, + NOTIFICATION-GROUP FROM SNMPv2-CONF + snmpTraps FROM SNMPv2-MIB + IANAifType FROM IANAifType-MIB; + +processwatchdog MODULE-IDENTITY + LAST-UPDATED "201704280805Z" + ORGANIZATION "Zscaler" + CONTACT-INFO + "Zscaler Inc. + US" + DESCRIPTION + "This module describes the process watchdog information + for each of the managed processes of a Zscaler instance. + For example: For instance of type SME, the watched processes + are sme, smavd, smavd2, smcdsc and sctimer." + + REVISION "201704280805Z" + DESCRIPTION + "Initial revision." + ::= { enterprises 46262 } + +zscaler OBJECT IDENTIFIER ::= { enterprises 46262 } + +processwatchdogs OBJECT IDENTIFIER ::= { zscaler 3 } + +processwatchdogNumber OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of processwatchdog present on this system." + ::= { processwatchdogs 1 } + +processwatchdogTable OBJECT-TYPE + SYNTAX SEQUENCE OF ProcesswatchdogEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A list of processwatchdog entries. The number of entries is + given by the value of processwatchdogNumber." + ::= { processwatchdogs 2 } + +processwatchdogEntry OBJECT-TYPE + SYNTAX ProcesswatchdogEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry containing management information applicable to a + particular processwatchdog." + INDEX { processwatchdogIndex } + ::= { processwatchdogTable 1 } + +ProcesswatchdogEntry ::= + SEQUENCE { + processwatchdogIndex Integer32, + processwatchdogName OCTET STRING, + processwatchdogRole OCTET STRING, + processwatchdogInstance OCTET STRING, + } + +processwatchdogIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The index of processwatchdog in the list of such objects" + ::= { processwatchdogEntry 1 } + +processwatchdogName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The name of the processwatchdog" + ::= { processwatchdogEntry 2 } + +processwatchdogRole OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Zscaler role to which this processwatchdog belongs" + ::= { processwatchdogEntry 3 } + +processwatchdogInstance OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Zscaler instance path where this processwatchdog is present" + ::= { processwatchdogEntry 4 } + + +END diff --git a/mibs/zscaler/ZSCALER-ROLEHEALTH-MIB b/mibs/zscaler/ZSCALER-ROLEHEALTH-MIB new file mode 100755 index 00000000000..34daa4df0cb --- /dev/null +++ b/mibs/zscaler/ZSCALER-ROLEHEALTH-MIB @@ -0,0 +1,212 @@ +ZSCALER-ROLEHEALTH-MIB DEFINITIONS ::= BEGIN + +IMPORTS + MODULE-IDENTITY, OBJECT-TYPE, Counter32, Gauge32, Counter64, Unsigned32, + Integer32, TimeTicks, mib-2,enterprises, + NOTIFICATION-TYPE FROM SNMPv2-SMI + TEXTUAL-CONVENTION, DisplayString, + PhysAddress, TruthValue, RowStatus, + TimeStamp, AutonomousType, TestAndIncr FROM SNMPv2-TC + MODULE-COMPLIANCE, OBJECT-GROUP, + NOTIFICATION-GROUP FROM SNMPv2-CONF + snmpTraps FROM SNMPv2-MIB + IANAifType FROM IANAifType-MIB; + +rolehealth MODULE-IDENTITY + LAST-UPDATED "201704280805Z" + ORGANIZATION "Zscaler" + CONTACT-INFO + "Zscaler Inc. + US" + DESCRIPTION + "This module describes the health information for a Zscaler + instance. This includes many of the OS level information + for the instance such as CPU, memory and also few instance + specific information. Example: currecnt connections on SME." + + REVISION "201704280805Z" + DESCRIPTION + "Initial revision." + ::= { enterprises 46262 } + +zscaler OBJECT IDENTIFIER ::= { enterprises 46262 } + +rolehealths OBJECT IDENTIFIER ::= { zscaler 4 } + +rolehealthNumber OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of rolehealth present on this system." + ::= { rolehealths 1 } + +rolehealthTable OBJECT-TYPE + SYNTAX SEQUENCE OF RolehealthEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A list of rolehealth entries. The number of entries is + given by the value of rolehealthNumber." + ::= { rolehealths 2 } + +rolehealthEntry OBJECT-TYPE + SYNTAX RolehealthEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry containing management information applicable to a + particular rolehealth." + INDEX { rolehealthIndex } + ::= { rolehealthTable 1 } + +RolehealthEntry ::= + SEQUENCE { + rolehealthIndex Integer32, + rolehealthName OCTET STRING, + rolehealthRole OCTET STRING, + rolehealthInstance OCTET STRING, + os_cur_physical_memory_present_in_system_inMB Unsigned32, + os_cur_physical_memory_free_inMB Unsigned32, + os_cur_usable_physical_memory_free_inMB Unsigned32, + os_cur_physical_memory_wired_inMB Unsigned32, + os_cur_physical_memory_active_inMB Unsigned32, + os_cur_physical_memory_inactive_inMB Unsigned32, + os_cur_physical_memory_cached_inMB Unsigned32, + cpu_cur_use Counter64, + sys_cur_rootfs_usedsizeinpercentage Counter64, + sys_cur_varfs_usedsizeinpercentage Counter64, + sys_cur_scfs_usedsizeinpercentage Counter64, + tcp_sessions Counter64, + } + +rolehealthIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The index of rolehealth in the list of such objects" + ::= { rolehealthEntry 1 } + +rolehealthName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The name of the rolehealth" + ::= { rolehealthEntry 2 } + +rolehealthRole OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Zscaler role to which this rolehealth belongs" + ::= { rolehealthEntry 3 } + +rolehealthInstance OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Zscaler instance path where this rolehealth is present" + ::= { rolehealthEntry 4 } + +os_cur_physical_memory_present_in_system_inMB OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Total physical memory present in the system represented in MB" + ::= { rolehealthEntry 5 } + +os_cur_physical_memory_free_inMB OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current physical memory free in the system represented in MB" + ::= { rolehealthEntry 6 } + +os_cur_usable_physical_memory_free_inMB OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Usable physical memory free in the system represented in MB" + ::= { rolehealthEntry 7 } + +os_cur_physical_memory_wired_inMB OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current physical memory wired down represented in MB" + ::= { rolehealthEntry 8 } + +os_cur_physical_memory_active_inMB OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current physical memory active in the system represented in MB" + ::= { rolehealthEntry 9 } + +os_cur_physical_memory_inactive_inMB OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current physical memory inactive in the system represented in MB" + ::= { rolehealthEntry 10 } + +os_cur_physical_memory_cached_inMB OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current physical memory on buffer cache queue represented in MB" + ::= { rolehealthEntry 11 } + +cpu_cur_use OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "System CPU utilization - To get the percentage value, divide by 100 " + ::= { rolehealthEntry 12 } + +sys_cur_rootfs_usedsizeinpercentage OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "root file system used space - To get percentage value, divide by 100" + ::= { rolehealthEntry 13 } + +sys_cur_varfs_usedsizeinpercentage OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "var file system used space - To get percentage value, divide by 100" + ::= { rolehealthEntry 14 } + +sys_cur_scfs_usedsizeinpercentage OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "sc file system used space - To get percentage value, divide by 100" + ::= { rolehealthEntry 15 } + +tcp_sessions OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current number of active TCP sessions on the Zscaler instance" + ::= { rolehealthEntry 16 } + + +END diff --git a/mibs/zscaler/ZSCALER-SWAPINFO-MIB b/mibs/zscaler/ZSCALER-SWAPINFO-MIB new file mode 100755 index 00000000000..1b8168492bc --- /dev/null +++ b/mibs/zscaler/ZSCALER-SWAPINFO-MIB @@ -0,0 +1,183 @@ +ZSCALER-SWAPINFO-MIB DEFINITIONS ::= BEGIN + +IMPORTS + MODULE-IDENTITY, OBJECT-TYPE, Counter32, Gauge32, Counter64, Unsigned32, + Integer32, TimeTicks, mib-2,enterprises, + NOTIFICATION-TYPE FROM SNMPv2-SMI + TEXTUAL-CONVENTION, DisplayString, + PhysAddress, TruthValue, RowStatus, + TimeStamp, AutonomousType, TestAndIncr FROM SNMPv2-TC + MODULE-COMPLIANCE, OBJECT-GROUP, + NOTIFICATION-GROUP FROM SNMPv2-CONF + snmpTraps FROM SNMPv2-MIB + IANAifType FROM IANAifType-MIB; + +swapinfo MODULE-IDENTITY + LAST-UPDATED "201704280805Z" + ORGANIZATION "Zscaler" + CONTACT-INFO + "Zscaler Inc. + US" + DESCRIPTION + "This module describes the status of the swap devices present + on the system." + + REVISION "201704280805Z" + DESCRIPTION + "Initial revision." + ::= { enterprises 46262 } + +zscaler OBJECT IDENTIFIER ::= { enterprises 46262 } + +swapinfos OBJECT IDENTIFIER ::= { zscaler 6 } + +swapinfoNumber OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of swapinfo present on this system." + ::= { swapinfos 1 } + +swapinfoTable OBJECT-TYPE + SYNTAX SEQUENCE OF SwapinfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A list of swapinfo entries. The number of entries is + given by the value of swapinfoNumber." + ::= { swapinfos 2 } + +swapinfoEntry OBJECT-TYPE + SYNTAX SwapinfoEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry containing management information applicable to a + particular swapinfo." + INDEX { swapinfoIndex } + ::= { swapinfoTable 1 } + +SwapinfoEntry ::= + SEQUENCE { + swapinfoIndex Integer32, + swapinfoName OCTET STRING, + swapinfoRole OCTET STRING, + swapinfoInstance OCTET STRING, + osswap_cur_total_pages Unsigned32, + osswap_cur_total_MB Unsigned32, + osswap_cur_used_pages Unsigned32, + osswap_cur_free_pages Unsigned32, + osswap_cur_used_MB Unsigned32, + osswap_cur_free_MB Unsigned32, + osswap_cur_used_inpercentage Unsigned32, + osswap_cur_flags Unsigned32, + osswap_cur_name OCTET STRING, + } + +swapinfoIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The index of swapinfo in the list of such objects" + ::= { swapinfoEntry 1 } + +swapinfoName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The name of the swapinfo" + ::= { swapinfoEntry 2 } + +swapinfoRole OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Zscaler role to which this swapinfo belongs" + ::= { swapinfoEntry 3 } + +swapinfoInstance OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Zscaler instance path where this swapinfo is present" + ::= { swapinfoEntry 4 } + +osswap_cur_total_pages OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Total swap space represented as number of pages" + ::= { swapinfoEntry 5 } + +osswap_cur_total_MB OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Total swap space represented in MB" + ::= { swapinfoEntry 6 } + +osswap_cur_used_pages OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current used swap space represented as number of pages" + ::= { swapinfoEntry 7 } + +osswap_cur_free_pages OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current free swap space represented as number of pages" + ::= { swapinfoEntry 8 } + +osswap_cur_used_MB OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current used swap space represented in MB" + ::= { swapinfoEntry 9 } + +osswap_cur_free_MB OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current free swap space represented in MB" + ::= { swapinfoEntry 10 } + +osswap_cur_used_inpercentage OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Current swap space utilization - To get percentage value, divide by 100" + ::= { swapinfoEntry 11 } + +osswap_cur_flags OBJECT-TYPE + SYNTAX Unsigned32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Swap device operation flags" + ::= { swapinfoEntry 12 } + +osswap_cur_name OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Swap device name" + ::= { swapinfoEntry 13 } + + +END diff --git a/mibs/zscaler/ZSCALER-VSE-MIB b/mibs/zscaler/ZSCALER-VSE-MIB new file mode 100755 index 00000000000..436a6551bfa --- /dev/null +++ b/mibs/zscaler/ZSCALER-VSE-MIB @@ -0,0 +1,119 @@ +ZSCALER-VSE-MIB DEFINITIONS ::= BEGIN + +IMPORTS + MODULE-IDENTITY, OBJECT-TYPE, Counter32, Gauge32, Counter64, + Integer32, TimeTicks, mib-2,enterprises, + NOTIFICATION-TYPE FROM SNMPv2-SMI + TEXTUAL-CONVENTION, DisplayString, + PhysAddress, TruthValue, RowStatus, + TimeStamp, AutonomousType, TestAndIncr FROM SNMPv2-TC + MODULE-COMPLIANCE, OBJECT-GROUP, + NOTIFICATION-GROUP FROM SNMPv2-CONF + snmpTraps FROM SNMPv2-MIB + IANAifType FROM IANAifType-MIB; + +vse MODULE-IDENTITY + LAST-UPDATED "202203170408Z" + ORGANIZATION "Zscaler" + CONTACT-INFO + "Zscaler Inc. + US" + DESCRIPTION + "Zscaler vSe specific information" + + REVISION "202203170408Z" + DESCRIPTION + "Initial revision." + ::= { enterprises 46262 } + +zscaler OBJECT IDENTIFIER ::= { enterprises 46262 } + +vseinfo OBJECT IDENTIFIER ::= { zscaler 9 } + +vseNumber OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of vse present on this system." + ::= { vseinfo 1 } + +vseTable OBJECT-TYPE + SYNTAX SEQUENCE OF VseEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A list of vse entries. The number of entries is + given by the value of vseNumber." + ::= { vseinfo 2 } + +vseEntry OBJECT-TYPE + SYNTAX VseEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry containing management information applicable to a + particular vse." + INDEX { vseIndex } + ::= { vseTable 1 } + +VseEntry ::= + SEQUENCE { + vseIndex Integer32, + vseName OCTET STRING, + vseRole OCTET STRING, + vseInstance OCTET STRING, + sme_ca_cur_health_state Counter64, + sme_cur_smsmclt_state Counter64, + } + +vseIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The index of vse in the list of such objects" + ::= { vseEntry 1 } + +vseName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The name of the vse" + ::= { vseEntry 2 } + +vseRole OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Zscaler role to which this vse belongs" + ::= { vseEntry 3 } + +vseInstance OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Zscaler instance path where this vse is present" + ::= { vseEntry 4 } + +sme_ca_cur_health_state OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Health status of the vse connection to Zscaler central authority" + ::= { vseEntry 5 } + +sme_cur_smsmclt_state OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Health status of the vse connection to Zscaler log & reporting infra" + ::= { vseEntry 6 } + + +END diff --git a/mibs/zscaler/ZSCALER-ZSCALERNIC-MIB b/mibs/zscaler/ZSCALER-ZSCALERNIC-MIB new file mode 100755 index 00000000000..15a318fc09f --- /dev/null +++ b/mibs/zscaler/ZSCALER-ZSCALERNIC-MIB @@ -0,0 +1,104 @@ +ZSCALER-ZSCALERNIC-MIB DEFINITIONS ::= BEGIN + +IMPORTS + MODULE-IDENTITY, OBJECT-TYPE, Counter32, Gauge32, Counter64, + Integer32, TimeTicks, mib-2,enterprises, + NOTIFICATION-TYPE FROM SNMPv2-SMI + TEXTUAL-CONVENTION, DisplayString, + PhysAddress, TruthValue, RowStatus, + TimeStamp, AutonomousType, TestAndIncr FROM SNMPv2-TC + MODULE-COMPLIANCE, OBJECT-GROUP, + NOTIFICATION-GROUP FROM SNMPv2-CONF + snmpTraps FROM SNMPv2-MIB + IANAifType FROM IANAifType-MIB; + +zscalernic MODULE-IDENTITY + LAST-UPDATED "201704280805Z" + ORGANIZATION "Zscaler" + CONTACT-INFO + "Zscaler Inc. + US" + DESCRIPTION + "This module describes the NIC devices managed by the Zscaler + instance. + On a Zscaler system, there are NIC devices managed by the + Zscaler instances and also by the base OS." + + REVISION "201704280805Z" + DESCRIPTION + "Initial revision." + ::= { enterprises 46262 } + +zscaler OBJECT IDENTIFIER ::= { enterprises 46262 } + +zscalernics OBJECT IDENTIFIER ::= { zscaler 2 } + +zscalernicNumber OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The number of zscalernic present on this system." + ::= { zscalernics 1 } + +zscalernicTable OBJECT-TYPE + SYNTAX SEQUENCE OF ZscalernicEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "A list of zscalernic entries. The number of entries is + given by the value of zscalernicNumber." + ::= { zscalernics 2 } + +zscalernicEntry OBJECT-TYPE + SYNTAX ZscalernicEntry + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "An entry containing management information applicable to a + particular zscalernic." + INDEX { zscalernicIndex } + ::= { zscalernicTable 1 } + +ZscalernicEntry ::= + SEQUENCE { + zscalernicIndex Integer32, + zscalernicName OCTET STRING, + zscalernicRole OCTET STRING, + zscalernicInstance OCTET STRING, + } + +zscalernicIndex OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The index of zscalernic in the list of such objects" + ::= { zscalernicEntry 1 } + +zscalernicName OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The name of the zscalernic" + ::= { zscalernicEntry 2 } + +zscalernicRole OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Zscaler role to which this zscalernic belongs" + ::= { zscalernicEntry 3 } + +zscalernicInstance OBJECT-TYPE + SYNTAX OCTET STRING + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Zscaler instance path where this zscalernic is present" + ::= { zscalernicEntry 4 } + + +END diff --git a/mkdocs.yml b/mkdocs.yml index b1be00d23ed..de1ade45c2c 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -300,6 +300,7 @@ nav: - Unit Tests: Developing/os/Test-Units.md - Sensor State Support: Developing/Sensor-State-Support.md - SNMP Traps: Developing/SNMP-Traps.md + - Creating Graphs: Developing/Graphs.md - Dynamic Config: Developing/Dynamic-Config.md - Localization: Developing/Localization.md - Time Handling: Developing/Time-Handling.md diff --git a/package-lock.json b/package-lock.json index dc86c02055b..a5a459b35f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -633,6 +633,72 @@ "node": ">=14.0.0" } }, + "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/core": { + "version": "1.11.1", + "dev": true, + "inBundle": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/wasi-threads": "1.2.2", + "tslib": "^2.4.0" + } + }, + "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": { + "version": "1.11.1", + "dev": true, + "inBundle": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": { + "version": "1.2.2", + "dev": true, + "inBundle": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": { + "version": "1.1.4", + "dev": true, + "inBundle": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@tybys/wasm-util": "^0.10.1" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + }, + "peerDependencies": { + "@emnapi/core": "^1.7.1", + "@emnapi/runtime": "^1.7.1" + } + }, + "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@tybys/wasm-util": { + "version": "0.10.2", + "dev": true, + "inBundle": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/tslib": { + "version": "2.8.1", + "dev": true, + "inBundle": true, + "license": "0BSD", + "optional": true + }, "node_modules/@tailwindcss/oxide-win32-arm64-msvc": { "version": "4.3.3", "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.3.3.tgz", @@ -929,9 +995,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.1.tgz", - "integrity": "sha512-FNvFGzoMLWmE6Yj9spb/zjd7yiNCHiAW9/Tg9CXrQ8wuu32HtlJOwWO11OJafl5FfY3DxTdQ0vj42zU1kvv5jg==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.2.tgz", + "integrity": "sha512-/kVP2U8z596Ia0gwFrwyIeo74ta5aVmSeU1FfAUMAmcEP5EP7zydmag3SLiN64NaRKef3lxsq7i/g7ltJQDGow==", "dev": true, "funding": [ { diff --git a/package.json b/package.json index f9d48a2c334..975fa06b50c 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,5 @@ { + "$schema": "https://www.schemastore.org/package.json", "private": true, "scripts": { "dev": "vite", diff --git a/phpstan-baseline-deprecated.neon b/phpstan-baseline-deprecated.neon index 0f67600e07a..499d7cc6b98 100644 --- a/phpstan-baseline-deprecated.neon +++ b/phpstan-baseline-deprecated.neon @@ -1,14 +1,5 @@ parameters: ignoreErrors: - - - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# - ''' - identifier: method.deprecated - count: 1 - path: LibreNMS/Alert/AlertData.php - - message: ''' #^Call to deprecated function dbFetchCell\(\)\: @@ -24,7 +15,7 @@ parameters: Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' identifier: function.deprecated - count: 2 + count: 1 path: LibreNMS/Alert/RunAlerts.php - @@ -33,16 +24,7 @@ parameters: Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' identifier: function.deprecated - count: 4 - path: LibreNMS/Alert/RunAlerts.php - - - - message: ''' - #^Call to deprecated function dbInsert\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 1 + count: 2 path: LibreNMS/Alert/RunAlerts.php - @@ -51,7 +33,7 @@ parameters: Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# ''' identifier: function.deprecated - count: 6 + count: 3 path: LibreNMS/Alert/RunAlerts.php - @@ -189,51 +171,6 @@ parameters: count: 1 path: LibreNMS/Model.php - - - message: ''' - #^Call to deprecated function snmpwalk_cache_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: LibreNMS/Modules/Isis.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_twopart_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 3 - path: LibreNMS/Modules/Isis.php - - - - message: ''' - #^Call to deprecated function snmp_get_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: LibreNMS/Modules/Mempools.php - - - - message: ''' - #^Call to deprecated function snmp_get\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: LibreNMS/Modules/Os.php - - - - message: ''' - #^Call to deprecated function snmp_get\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: LibreNMS/OS.php - - message: ''' #^Call to deprecated function snmp_get_multi\(\)\: @@ -249,7 +186,7 @@ parameters: Please use SnmpQuery instead$# ''' identifier: function.deprecated - count: 2 + count: 1 path: LibreNMS/OS.php - @@ -639,15 +576,6 @@ parameters: count: 8 path: LibreNMS/OS/Ewc.php - - - message: ''' - #^Call to deprecated function snmp_get\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 2 - path: LibreNMS/OS/Fabos.php - - message: ''' #^Call to deprecated function snmpwalk_cache_oid\(\)\: @@ -843,7 +771,7 @@ parameters: Please use SnmpQuery instead$# ''' identifier: function.deprecated - count: 10 + count: 4 path: LibreNMS/OS/Lcos.php - @@ -852,7 +780,7 @@ parameters: Please use SnmpQuery instead$# ''' identifier: function.deprecated - count: 11 + count: 4 path: LibreNMS/OS/Lcoslx.php - @@ -1098,24 +1026,6 @@ parameters: count: 1 path: LibreNMS/OS/Sgos.php - - - message: ''' - #^Call to deprecated function snmp_get\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: LibreNMS/OS/Shared/Cisco.php - - - - message: ''' - #^Call to deprecated function snmp_get_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: LibreNMS/OS/Shared/Cisco.php - - message: ''' #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: @@ -1152,40 +1062,22 @@ parameters: count: 1 path: LibreNMS/OS/Shared/Printer.php - - - message: ''' - #^Call to deprecated function snmp_get\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: LibreNMS/OS/Shared/Unix.php - - message: ''' #^Call to deprecated function snmp_get_multi_oid\(\)\: Please use SnmpQuery instead$# ''' identifier: function.deprecated - count: 4 + count: 3 path: LibreNMS/OS/Shared/Unix.php - - - message: ''' - #^Call to deprecated function snmp_get\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: LibreNMS/OS/Shared/Zyxel.php - - message: ''' #^Call to deprecated function snmp_get_multi_oid\(\)\: Please use SnmpQuery instead$# ''' identifier: function.deprecated - count: 2 + count: 1 path: LibreNMS/OS/Shared/Zyxel.php - @@ -1379,723 +1271,210 @@ parameters: - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function dbFetchRow\(\)\: + Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' - identifier: method.deprecated + identifier: function.deprecated count: 1 - path: LibreNMS/Snmptrap/Handlers/Aos7stpNewRoot.php + path: billing-calculate.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function dbFetchRows\(\)\: + Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' - identifier: method.deprecated + identifier: function.deprecated count: 1 - path: LibreNMS/Snmptrap/Handlers/AuthenticationFailure.php + path: billing-calculate.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function dbInsert\(\)\: + Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# ''' - identifier: method.deprecated + identifier: function.deprecated count: 1 - path: LibreNMS/Snmptrap/Handlers/BridgeNewRoot.php + path: billing-calculate.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function dbUpdate\(\)\: + Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# ''' - identifier: method.deprecated - count: 1 - path: LibreNMS/Snmptrap/Handlers/BridgeTopologyChanged.php + identifier: function.deprecated + count: 2 + path: billing-calculate.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated method validateCsrfTokens\(\) of class Illuminate\\Foundation\\Configuration\\Middleware\: + Use preventRequestForgery\(\) instead\.$# ''' identifier: method.deprecated count: 1 - path: LibreNMS/Snmptrap/Handlers/ColdBoot.php + path: bootstrap/app.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function dbFetchCell\(\)\: + Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' - identifier: method.deprecated - count: 1 - path: LibreNMS/Snmptrap/Handlers/CppmServiceRestartNotification.php + identifier: function.deprecated + count: 2 + path: includes/common.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function dbFetchRows\(\)\: + Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' - identifier: method.deprecated - count: 1 - path: LibreNMS/Snmptrap/Handlers/CppmServiceStartNotification.php + identifier: function.deprecated + count: 3 + path: includes/common.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function dbFetchRows\(\)\: + Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' - identifier: method.deprecated + identifier: function.deprecated count: 1 - path: LibreNMS/Snmptrap/Handlers/CppmServiceStopNotification.php + path: includes/discovery/applications.inc.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function snmpwalk_cache_oid\(\)\: + Please use SnmpQuery instead$# ''' - identifier: method.deprecated + identifier: function.deprecated count: 1 - path: LibreNMS/Snmptrap/Handlers/EntityDatabaseConfigChanged.php + path: includes/discovery/applications.inc.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function snmpwalk_array_num\(\)\: + Please use SnmpQuery instead$# ''' - identifier: method.deprecated - count: 1 - path: LibreNMS/Snmptrap/Handlers/FailedUserLogin.php + identifier: function.deprecated + count: 3 + path: includes/discovery/cisco-otv.inc.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function dbFetchCell\(\)\: + Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' - identifier: method.deprecated + identifier: function.deprecated count: 2 - path: LibreNMS/Snmptrap/Handlers/OspfTxRetransmit.php - - - - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# - ''' - identifier: method.deprecated - count: 1 - path: LibreNMS/Snmptrap/Handlers/WarmBoot.php + path: includes/discovery/cisco-pw.inc.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function dbFetchRows\(\)\: + Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' - identifier: method.deprecated + identifier: function.deprecated count: 1 - path: app/ApiClients/GraylogApi.php + path: includes/discovery/cisco-pw.inc.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function dbInsert\(\)\: + Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# ''' - identifier: method.deprecated + identifier: function.deprecated count: 1 - path: app/Console/Commands/DevicePing.php + path: includes/discovery/cisco-pw.inc.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function snmpwalk_cache_oid\(\)\: + Please use SnmpQuery instead$# ''' - identifier: method.deprecated - count: 1 - path: app/Console/Commands/ReportDevices.php + identifier: function.deprecated + count: 6 + path: includes/discovery/cisco-pw.inc.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function snmp_get_multi_oid\(\)\: + Please use SnmpQuery instead$# ''' - identifier: method.deprecated + identifier: function.deprecated count: 1 - path: app/Console/Commands/SnmpFetch.php + path: includes/discovery/cisco-qfp.inc.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function snmpwalk_group\(\)\: + Please use SnmpQuery instead$# ''' - identifier: method.deprecated + identifier: function.deprecated count: 1 - path: app/Http/Controllers/Select/DeviceController.php + path: includes/discovery/cisco-qfp.inc.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function dbFetchRows\(\)\: + Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' - identifier: method.deprecated - count: 1 - path: app/Http/Controllers/Table/DeviceController.php + identifier: function.deprecated + count: 2 + path: includes/discovery/entity-state.inc.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function dbUpdate\(\)\: + Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# ''' - identifier: method.deprecated + identifier: function.deprecated count: 1 - path: app/Http/Controllers/Widgets/AlertMapController.php + path: includes/discovery/entity-state.inc.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function snmpwalk_group\(\)\: + Please use SnmpQuery instead$# ''' - identifier: method.deprecated + identifier: function.deprecated count: 1 - path: app/Http/Controllers/Widgets/AvailabilityMapController.php - - - - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# - ''' - identifier: method.deprecated - count: 2 - path: app/Models/Device.php + path: includes/discovery/entity-state.inc.php - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# + #^Call to deprecated function dbFetchCell\(\)\: + Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' - identifier: method.deprecated + identifier: function.deprecated count: 2 - path: app/View/Components/Device/Page.php + path: includes/discovery/functions.inc.php - message: ''' - #^Call to deprecated function dbFetchRow\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# + #^Call to deprecated function dbInsert\(\)\: + Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# ''' identifier: function.deprecated count: 1 - path: billing-calculate.php + path: includes/discovery/functions.inc.php - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# + #^Call to deprecated function snmp_get\(\)\: + Please use SnmpQuery instead$# ''' identifier: function.deprecated count: 1 - path: billing-calculate.php + path: includes/discovery/loadbalancers/f5-gtm.inc.php - message: ''' - #^Call to deprecated function dbInsert\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# + #^Call to deprecated function snmpwalk_array_num\(\)\: + Please use SnmpQuery instead$# ''' identifier: function.deprecated - count: 1 - path: billing-calculate.php - - - - message: ''' - #^Call to deprecated function dbUpdate\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 2 - path: billing-calculate.php - - - - message: ''' - #^Call to deprecated function getidbyname\(\)\: - Use DeviceCache\:\:get\(\) instead$# - ''' - identifier: function.deprecated - count: 1 - path: delhost.php - - - - message: ''' - #^Call to deprecated function dbFetchCell\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 2 - path: includes/common.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 3 - path: includes/common.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/applications.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/applications.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/bgp-peers.inc.php - - - - message: ''' - #^Call to deprecated function dbUpdate\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 2 - path: includes/discovery/bgp-peers.inc.php - - - - message: ''' - #^Call to deprecated function snmp_walk\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 5 - path: includes/discovery/bgp-peers.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 2 - path: includes/discovery/bgp-peers.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 4 - path: includes/discovery/bgp-peers.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/bgp-peers/dell-os10.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/bgp-peers/dell-os10.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/bgp-peers/dell-os10.inc.php - - - - message: ''' - #^Call to deprecated function dbInsert\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/bgp-peers/firebrick.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/bgp-peers/firebrick.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchCell\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/bgp-peers/vrp.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/bgp-peers/vrp.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 7 - path: includes/discovery/bgp-peers/vrp.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchCell\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/cisco-cef.inc.php - - - - message: ''' - #^Call to deprecated function dbInsert\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/cisco-cef.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 3 - path: includes/discovery/cisco-cef.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_array_num\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 3 - path: includes/discovery/cisco-otv.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchCell\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 2 - path: includes/discovery/cisco-pw.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/cisco-pw.inc.php - - - - message: ''' - #^Call to deprecated function dbInsert\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/cisco-pw.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 6 - path: includes/discovery/cisco-pw.inc.php - - - - message: ''' - #^Call to deprecated function snmp_get_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/cisco-qfp.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_group\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/cisco-qfp.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRow\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/cisco-vrf-lite.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/cisco-vrf-lite.inc.php - - - - message: ''' - #^Call to deprecated function dbInsert\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/cisco-vrf-lite.inc.php - - - - message: ''' - #^Call to deprecated function dbUpdate\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/cisco-vrf-lite.inc.php - - - - message: ''' - #^Call to deprecated function snmp_walk\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 2 - path: includes/discovery/cisco-vrf-lite.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 2 - path: includes/discovery/entity-state.inc.php - - - - message: ''' - #^Call to deprecated function dbUpdate\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/entity-state.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_group\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/entity-state.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 2 - path: includes/discovery/fdb-table.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_group\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 2 - path: includes/discovery/fdb-table/aos6.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_group\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/fdb-table/aos7.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_group\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 3 - path: includes/discovery/fdb-table/arubaos.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_group\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 3 - path: includes/discovery/fdb-table/bridge.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_group\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/fdb-table/edgeswitch.inc.php - - - - message: ''' - #^Call to deprecated function dbInsert\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/fdb-table/ios.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_group\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 2 - path: includes/discovery/fdb-table/ios.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_group\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 2 - path: includes/discovery/fdb-table/vrp.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/fdb-table/zynos.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchCell\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 3 - path: includes/discovery/functions.inc.php - - - - message: ''' - #^Call to deprecated function dbInsert\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 3 - path: includes/discovery/functions.inc.php - - - - message: ''' - #^Call to deprecated function dbUpdate\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/functions.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchCell\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/junose-atm-vp.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/junose-atm-vp.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/junose-atm-vp.inc.php - - - - message: ''' - #^Call to deprecated function snmp_get\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/loadbalancers/f5-gtm.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_array_num\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 3 - path: includes/discovery/loadbalancers/f5-gtm.inc.php + count: 3 + path: includes/discovery/loadbalancers/f5-gtm.inc.php - message: ''' @@ -2115,42 +1494,6 @@ parameters: count: 1 path: includes/discovery/loadbalancers/f5-ltm.inc.php - - - message: ''' - #^Call to deprecated function dbFetchCell\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/mef.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/mef.inc.php - - - - message: ''' - #^Call to deprecated function dbInsert\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/mef.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/mef.inc.php - - message: ''' #^Call to deprecated function dbFetchCell\(\)\: @@ -2313,24 +1656,6 @@ parameters: count: 2 path: includes/discovery/sensors/charge/apc.inc.php - - - message: ''' - #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 7 - path: includes/discovery/sensors/cisco-entity-sensor.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_twopart_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 4 - path: includes/discovery/sensors/cisco-entity-sensor.inc.php - - message: ''' #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: @@ -2412,15 +1737,6 @@ parameters: count: 3 path: includes/discovery/sensors/current/liebert.inc.php - - - message: ''' - #^Call to deprecated function snmp_walk\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 2 - path: includes/discovery/sensors/current/mgeups.inc.php - - message: ''' #^Call to deprecated function snmp_walk\(\)\: @@ -2547,15 +1863,6 @@ parameters: count: 1 path: includes/discovery/sensors/fanspeed/onefs.inc.php - - - message: ''' - #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/sensors/fanspeed/quanta.inc.php - - message: ''' #^Call to deprecated function snmp_walk\(\)\: @@ -2592,15 +1899,6 @@ parameters: count: 1 path: includes/discovery/sensors/frequency/eaton-ats.inc.php - - - message: ''' - #^Call to deprecated function snmp_walk\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 2 - path: includes/discovery/sensors/frequency/mgeups.inc.php - - message: ''' #^Call to deprecated function snmpwalk_group\(\)\: @@ -2646,15 +1944,6 @@ parameters: count: 1 path: includes/discovery/sensors/humidity/liebert.inc.php - - - message: ''' - #^Call to deprecated function snmpwalk_cache_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 2 - path: includes/discovery/sensors/humidity/mgeups.inc.php - - message: ''' #^Call to deprecated function snmp_walk\(\)\: @@ -2804,72 +2093,45 @@ parameters: #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: Please use SnmpQuery instead$# ''' - identifier: function.deprecated - count: 18 - path: includes/discovery/sensors/pre-cache/adva_fsp150.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 19 - path: includes/discovery/sensors/pre-cache/adva_fsp3kr7.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 2 - path: includes/discovery/sensors/pre-cache/apc.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 2 - path: includes/discovery/sensors/pre-cache/ciscoepc.inc.php + identifier: function.deprecated + count: 18 + path: includes/discovery/sensors/pre-cache/adva_fsp150.inc.php - message: ''' - #^Call to deprecated function snmpwalk_cache_oid\(\)\: + #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: Please use SnmpQuery instead$# ''' identifier: function.deprecated - count: 1 - path: includes/discovery/sensors/pre-cache/linux.inc.php + count: 19 + path: includes/discovery/sensors/pre-cache/adva_fsp3kr7.inc.php - message: ''' - #^Call to deprecated function snmp_get_multi\(\)\: + #^Call to deprecated function snmpwalk_cache_oid\(\)\: Please use SnmpQuery instead$# ''' identifier: function.deprecated - count: 1 - path: includes/discovery/sensors/pre-cache/nokia-isam.inc.php + count: 2 + path: includes/discovery/sensors/pre-cache/apc.inc.php - message: ''' - #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: + #^Call to deprecated function snmpwalk_cache_oid\(\)\: Please use SnmpQuery instead$# ''' identifier: function.deprecated count: 2 - path: includes/discovery/sensors/pre-cache/nokia-isam.inc.php + path: includes/discovery/sensors/pre-cache/ciscoepc.inc.php - message: ''' - #^Call to deprecated function snmpwalk_cache_twopart_oid\(\)\: + #^Call to deprecated function snmpwalk_cache_oid\(\)\: Please use SnmpQuery instead$# ''' identifier: function.deprecated count: 1 - path: includes/discovery/sensors/pre-cache/nokia-isam.inc.php + path: includes/discovery/sensors/pre-cache/linux.inc.php - message: ''' @@ -2970,15 +2232,6 @@ parameters: count: 3 path: includes/discovery/sensors/signal/cambium.inc.php - - - message: ''' - #^Call to deprecated function snmp_get\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/sensors/signal/canopy.inc.php - - message: ''' #^Call to deprecated function snmpwalk_cache_oid\(\)\: @@ -3186,15 +2439,6 @@ parameters: count: 1 path: includes/discovery/sensors/state/procurve.inc.php - - - message: ''' - #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/sensors/state/quanta.inc.php - - message: ''' #^Call to deprecated function snmpwalk_group\(\)\: @@ -3492,15 +2736,6 @@ parameters: count: 1 path: includes/discovery/sensors/temperature/linux.inc.php - - - message: ''' - #^Call to deprecated function snmpwalk_cache_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 2 - path: includes/discovery/sensors/temperature/mgeups.inc.php - - message: ''' #^Call to deprecated function snmp_walk\(\)\: @@ -3555,15 +2790,6 @@ parameters: count: 2 path: includes/discovery/sensors/temperature/powerconnect.inc.php - - - message: ''' - #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/sensors/temperature/quanta.inc.php - - message: ''' #^Call to deprecated function snmp_get_multi_oid\(\)\: @@ -3744,15 +2970,6 @@ parameters: count: 1 path: includes/discovery/sensors/voltage/linux.inc.php - - - message: ''' - #^Call to deprecated function snmp_walk\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 2 - path: includes/discovery/sensors/voltage/mgeups.inc.php - - message: ''' #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: @@ -3780,78 +2997,6 @@ parameters: count: 3 path: includes/discovery/sensors/voltage/rfc1628.inc.php - - - message: ''' - #^Call to deprecated function dbFetchCell\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 6 - path: includes/discovery/vrf.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRow\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 3 - path: includes/discovery/vrf.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 2 - path: includes/discovery/vrf.inc.php - - - - message: ''' - #^Call to deprecated function dbInsert\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 3 - path: includes/discovery/vrf.inc.php - - - - message: ''' - #^Call to deprecated function dbUpdate\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 7 - path: includes/discovery/vrf.inc.php - - - - message: ''' - #^Call to deprecated function snmp_walk\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 5 - path: includes/discovery/vrf.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 3 - path: includes/discovery/vrf.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_twopart_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/discovery/vrf.inc.php - - message: ''' #^Call to deprecated function dbUpdate\(\)\: @@ -3861,22 +3006,13 @@ parameters: count: 1 path: includes/functions.php - - - message: ''' - #^Call to deprecated function dbFetchRow\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 3 - path: includes/html/api_functions.inc.php - - message: ''' #^Call to deprecated function dbFetchRows\(\)\: Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' identifier: function.deprecated - count: 17 + count: 15 path: includes/html/api_functions.inc.php - @@ -3894,25 +3030,7 @@ parameters: Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# ''' identifier: function.deprecated - count: 3 - path: includes/html/api_functions.inc.php - - - - message: ''' - #^Call to deprecated function device_by_id_cache\(\)\: - Use DeviceCache\:\:get\(\) and the Device model instead$# - ''' - identifier: function.deprecated - count: 5 - path: includes/html/api_functions.inc.php - - - - message: ''' - #^Call to deprecated function getidbyname\(\)\: - Use DeviceCache\:\:get\(\) instead$# - ''' - identifier: function.deprecated - count: 36 + count: 1 path: includes/html/api_functions.inc.php - @@ -4698,15 +3816,6 @@ parameters: count: 1 path: includes/html/modal/alert_rule_list.inc.php - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/html/pages/addhost.inc.php - - message: ''' #^Call to deprecated function dbFetchRows\(\)\: @@ -4725,15 +3834,6 @@ parameters: count: 1 path: includes/html/pages/device/edit/apps.inc.php - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/html/pages/device/edit/snmp.inc.php - - message: ''' #^Call to deprecated function dbFetchRows\(\)\: @@ -4781,102 +3881,12 @@ parameters: - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/html/pages/device/loadbalancer/ace_rservers.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/html/pages/device/loadbalancer/ace_vservers.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 2 - path: includes/html/pages/device/loadbalancer/netscaler_vsvr.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/html/pages/device/port/events.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/html/pages/device/port/junose-atm-vp.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchCell\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/html/pages/device/port/macaccounting.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRow\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 2 - path: includes/html/pages/device/port/macaccounting.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/html/pages/device/port/macaccounting.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/html/pages/device/port/pagp.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 3 - path: includes/html/pages/device/port/vlans.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRow\(\)\: + #^Call to deprecated function dbFetchRows\(\)\: Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' identifier: function.deprecated count: 1 - path: includes/html/pages/device/slas.inc.php + path: includes/html/pages/device/loadbalancer/ace_rservers.inc.php - message: ''' @@ -4885,7 +3895,7 @@ parameters: ''' identifier: function.deprecated count: 1 - path: includes/html/pages/device/slas.inc.php + path: includes/html/pages/device/loadbalancer/ace_vservers.inc.php - message: ''' @@ -4893,8 +3903,8 @@ parameters: Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' identifier: function.deprecated - count: 1 - path: includes/html/pages/device/wireless.inc.php + count: 2 + path: includes/html/pages/device/loadbalancer/netscaler_vsvr.inc.php - message: ''' @@ -4902,17 +3912,17 @@ parameters: Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' identifier: function.deprecated - count: 2 - path: includes/html/pages/packages.inc.php + count: 1 + path: includes/html/pages/device/port/events.inc.php - message: ''' - #^Call to deprecated function device_by_id_cache\(\)\: - Use DeviceCache\:\:get\(\) and the Device model instead$# + #^Call to deprecated function dbFetchRows\(\)\: + Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' identifier: function.deprecated count: 1 - path: includes/html/pages/packages.inc.php + path: includes/html/pages/device/port/junose-atm-vp.inc.php - message: ''' @@ -4921,7 +3931,7 @@ parameters: ''' identifier: function.deprecated count: 1 - path: includes/html/pages/peering/as-selection.inc.php + path: includes/html/pages/device/port/macaccounting.inc.php - message: ''' @@ -4929,8 +3939,8 @@ parameters: Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' identifier: function.deprecated - count: 1 - path: includes/html/pages/pseudowires.inc.php + count: 2 + path: includes/html/pages/device/port/macaccounting.inc.php - message: ''' @@ -4939,16 +3949,16 @@ parameters: ''' identifier: function.deprecated count: 1 - path: includes/html/pages/pseudowires.inc.php + path: includes/html/pages/device/port/macaccounting.inc.php - message: ''' - #^Call to deprecated function dbFetchRow\(\)\: + #^Call to deprecated function dbFetchRows\(\)\: Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' identifier: function.deprecated count: 1 - path: includes/html/pages/routing/bgp.inc.php + path: includes/html/pages/device/port/pagp.inc.php - message: ''' @@ -4956,8 +3966,8 @@ parameters: Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' identifier: function.deprecated - count: 2 - path: includes/html/pages/routing/bgp.inc.php + count: 3 + path: includes/html/pages/device/port/vlans.inc.php - message: ''' @@ -4966,7 +3976,7 @@ parameters: ''' identifier: function.deprecated count: 1 - path: includes/html/pages/routing/cef.inc.php + path: includes/html/pages/device/slas.inc.php - message: ''' @@ -4975,16 +3985,16 @@ parameters: ''' identifier: function.deprecated count: 1 - path: includes/html/pages/routing/cef.inc.php + path: includes/html/pages/device/slas.inc.php - message: ''' - #^Call to deprecated function device_by_id_cache\(\)\: - Use DeviceCache\:\:get\(\) and the Device model instead$# + #^Call to deprecated function dbFetchRows\(\)\: + Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' identifier: function.deprecated - count: 1 - path: includes/html/pages/routing/cef.inc.php + count: 2 + path: includes/html/pages/packages.inc.php - message: ''' @@ -4993,7 +4003,7 @@ parameters: ''' identifier: function.deprecated count: 1 - path: includes/html/pages/routing/isis.inc.php + path: includes/html/pages/packages.inc.php - message: ''' @@ -5001,26 +4011,8 @@ parameters: Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' identifier: function.deprecated - count: 2 - path: includes/html/pages/routing/mpls-path-map.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 3 - path: includes/html/pages/routing/mpls-path-map.inc.php - - - - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# - ''' - identifier: method.deprecated - count: 3 - path: includes/html/pages/routing/mpls-path-map.inc.php + count: 1 + path: includes/html/pages/peering/as-selection.inc.php - message: ''' @@ -5028,26 +4020,8 @@ parameters: Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' identifier: function.deprecated - count: 4 - path: includes/html/pages/routing/mpls.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 6 - path: includes/html/pages/routing/mpls.inc.php - - - - message: ''' - #^Call to deprecated function device_by_id_cache\(\)\: - Use DeviceCache\:\:get\(\) and the Device model instead$# - ''' - identifier: function.deprecated - count: 6 - path: includes/html/pages/routing/mpls.inc.php + count: 1 + path: includes/html/pages/pseudowires.inc.php - message: ''' @@ -5055,8 +4029,8 @@ parameters: Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# ''' identifier: function.deprecated - count: 3 - path: includes/html/pages/routing/vrf.inc.php + count: 1 + path: includes/html/pages/pseudowires.inc.php - message: ''' @@ -5517,51 +4491,6 @@ parameters: count: 1 path: includes/polling/applications/ups-nut.inc.php - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 2 - path: includes/polling/bgp-peers.inc.php - - - - message: ''' - #^Call to deprecated function dbUpdate\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 3 - path: includes/polling/bgp-peers.inc.php - - - - message: ''' - #^Call to deprecated function snmp_get_multi\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/polling/bgp-peers.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 12 - path: includes/polling/bgp-peers.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 9 - path: includes/polling/bgp-peers.inc.php - - message: ''' #^Call to deprecated function dbFetchRows\(\)\: @@ -5670,51 +4599,6 @@ parameters: count: 1 path: includes/polling/cisco-ace-serverfarms.inc.php - - - message: ''' - #^Call to deprecated function dbFetchRow\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/polling/cisco-cef.inc.php - - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/polling/cisco-cef.inc.php - - - - message: ''' - #^Call to deprecated function dbInsert\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 1 - path: includes/polling/cisco-cef.inc.php - - - - message: ''' - #^Call to deprecated function dbUpdate\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 1 - path: includes/polling/cisco-cef.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 3 - path: includes/polling/cisco-cef.inc.php - - message: ''' #^Call to deprecated function snmpwalk_cache_oid\(\)\: @@ -5895,24 +4779,6 @@ parameters: count: 1 path: includes/polling/hr-mib.inc.php - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/polling/junose-atm-vp.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 8 - path: includes/polling/junose-atm-vp.inc.php - - message: ''' #^Call to deprecated function snmpwalk_array_num\(\)\: @@ -5949,33 +4815,6 @@ parameters: count: 1 path: includes/polling/loadbalancers/f5-ltm.inc.php - - - message: ''' - #^Call to deprecated function dbFetchRows\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent$# - ''' - identifier: function.deprecated - count: 1 - path: includes/polling/mef.inc.php - - - - message: ''' - #^Call to deprecated function dbUpdate\(\)\: - Please use Eloquent instead; https\://laravel\.com/docs/eloquent\#inserting\-and\-updating\-models$# - ''' - identifier: function.deprecated - count: 1 - path: includes/polling/mef.inc.php - - - - message: ''' - #^Call to deprecated function snmpwalk_cache_multi_oid\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 1 - path: includes/polling/mef.inc.php - - message: ''' #^Call to deprecated function dbFetchRows\(\)\: @@ -6300,60 +5139,6 @@ parameters: count: 1 path: includes/rewrites.php - - - message: ''' - #^Call to deprecated function device_by_id_cache\(\)\: - Use DeviceCache\:\:get\(\) and the Device model instead$# - ''' - identifier: function.deprecated - count: 1 - path: scripts/new-os.php - - - - message: ''' - #^Call to deprecated function getidbyname\(\)\: - Use DeviceCache\:\:get\(\) instead$# - ''' - identifier: function.deprecated - count: 1 - path: scripts/new-os.php - - - - message: ''' - #^Call to deprecated function snmp_get\(\)\: - Please use SnmpQuery instead$# - ''' - identifier: function.deprecated - count: 2 - path: scripts/new-os.php - - - - message: ''' - #^Call to deprecated function getidbyname\(\)\: - Use DeviceCache\:\:get\(\) instead$# - ''' - identifier: function.deprecated - count: 1 - path: scripts/test-alert.php - - - - message: ''' - #^Call to deprecated function getidbyname\(\)\: - Use DeviceCache\:\:get\(\) instead$# - ''' - identifier: function.deprecated - count: 1 - path: scripts/test-template.php - - - - message: ''' - #^Call to deprecated method displayName\(\) of class App\\Models\\Device\: - use display field directly$# - ''' - identifier: method.deprecated - count: 2 - path: tests/Feature/SnmpTraps/CommonTrapTest.php - - message: ''' #^Call to deprecated function dbPlaceHolders\(\)\: @@ -6383,18 +5168,18 @@ parameters: - message: ''' - #^Call to deprecated method proxmox\(\) of class LibreNMS\\RRD\\RrdPath\: - remove when proxmox is rewritten$# + #^Call to deprecated function snmp_get\(\)\: + Please use SnmpQuery instead$# ''' - identifier: staticMethod.deprecated + identifier: function.deprecated count: 2 - path: tests/Unit/RRD/RrdNameTest.php + path: tests/Unit/NetSnmpTest.php - message: ''' - #^Call to deprecated function snmp_get\(\)\: - Please use SnmpQuery instead$# + #^Call to deprecated method proxmox\(\) of class LibreNMS\\RRD\\RrdPath\: + remove when proxmox is rewritten$# ''' - identifier: function.deprecated + identifier: staticMethod.deprecated count: 2 - path: tests/Unit/NetSnmpTest.php + path: tests/Unit/RRD/RrdNameTest.php diff --git a/phpstan-deprecated.neon b/phpstan-deprecated.neon index 6571ac77f25..6d967f6c21c 100644 --- a/phpstan-deprecated.neon +++ b/phpstan-deprecated.neon @@ -4,8 +4,8 @@ includes: parameters: phpVersion: - min: 80200 - max: 80499 + min: 80400 + max: 80599 customRulesetUsed: true reportUnmatchedIgnoredErrors: false diff --git a/phpstan-legacy.neon b/phpstan-legacy.neon index e7646349e62..5acaba59a68 100644 --- a/phpstan-legacy.neon +++ b/phpstan-legacy.neon @@ -3,8 +3,8 @@ includes: parameters: phpVersion: - min: 80200 - max: 80499 + min: 80400 + max: 80599 parseModelCastsMethod: true diff --git a/phpstan.neon b/phpstan.neon index 6e699b2cc57..37a2a74954d 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -6,8 +6,8 @@ includes: parameters: phpVersion: - min: 80200 - max: 80499 + min: 80400 + max: 80599 parseModelCastsMethod: true @@ -29,6 +29,9 @@ parameters: scanDirectories: - includes + scanFiles: + - vendor/amenadiel/jpgraph/src/config.inc.php + level: 5 treatPhpDocTypesAsCertain: false diff --git a/phpunit.xml b/phpunit.xml index 6a848861787..e7554e471f9 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,13 +1,5 @@ - + tests/Unit @@ -36,6 +28,9 @@ + + + diff --git a/resources/definitions/config_definitions.json b/resources/definitions/config_definitions.json index 0e543d1121b..022c5f0123b 100644 --- a/resources/definitions/config_definitions.json +++ b/resources/definitions/config_definitions.json @@ -914,6 +914,13 @@ "order": 18, "type": "text" }, + "auth_ldap_phoneattr": { + "default": "mobile", + "group": "auth", + "section": "ldap", + "order": 19, + "type": "text" + }, "auth_ldap_group": { "default": "", "group": "auth", @@ -1072,6 +1079,13 @@ "sso": "Single Sign On" } }, + "auth_fallback_local": { + "default": false, + "group": "auth", + "section": "general", + "order": 3, + "type": "boolean" + }, "auth_remember": { "default": 30, "units": "days", @@ -1569,6 +1583,10 @@ "section": "port-descr", "order": 11 }, + "datastore.canonical_metrics": { + "default": false, + "type": "boolean" + }, "dateformat.byminute": { "default": "Y-m-d H:i", "type": "text" @@ -1698,82 +1716,88 @@ "section": "graph", "order": 8 }, - "device_types": { - "default": [ - { - "icon": "hard-drive", - "text": "Appliance", - "type": "appliance" - }, - { - "icon": "people-arrows", - "text": "Collaboration", - "type": "collaboration" - }, - { - "icon": "temperature-full", - "text": "Environment", - "type": "environment" - }, - { - "icon": "shield", - "text": "Firewalls", - "type": "firewall" - }, - { - "icon": "scale-balanced", - "text": "Load Balancers", - "type": "loadbalancer" - }, - { - "icon": "door-open", - "text": "Management", - "type": "management" - }, - { - "icon": "network-wired", - "text": "Network", - "type": "network" - }, - { - "icon": "print", - "text": "Printers", - "type": "printer" - }, - { - "icon": "plug", - "text": "Power", - "type": "power" - }, - { - "icon": "server", - "text": "Servers", - "type": "server" - }, - { - "icon": "database", - "text": "Storage", - "type": "storage" - }, - { - "icon": "wifi", - "text": "Wireless", - "type": "wireless" - }, - { - "icon": "computer", - "text": "Workstation", - "type": "workstation" - } - ], - "type": "array", + "device_types.*": { + "type": "text", "validate": { - "value": "array", - "value.*.icon": "required|string", - "value.*.text": "required|string", - "value.*.type": "required|string" + "value": "string" } }, + "device_types.audiovisual": { + "default": "photo-film", + "type": "text" + }, + "device_types.collaboration": { + "default": "people-arrows", + "type": "text" + }, + "device_types.environment": { + "default": "temperature-full", + "type": "text" + }, + "device_types.firewall": { + "default": "shield", + "type": "text" + }, + "device_types.iot": { + "default": "microchip", + "type": "text" + }, + "device_types.loadbalancer": { + "default": "scale-balanced", + "type": "text" + }, + "device_types.management": { + "default": "door-open", + "type": "text" + }, + "device_types.network": { + "default": "network-wired", + "type": "text" + }, + "device_types.optical": { + "default": "wave-square", + "type": "text" + }, + "device_types.power": { + "default": "plug", + "type": "text" + }, + "device_types.printer": { + "default": "print", + "type": "text" + }, + "device_types.security": { + "default": "user-shield", + "type": "text" + }, + "device_types.server": { + "default": "server", + "type": "text" + }, + "device_types.storage": { + "default": "database", + "type": "text" + }, + "device_types.surveillance": { + "default": "video", + "type": "text" + }, + "device_types.timing": { + "default": "clock", + "type": "text" + }, + "device_types.voice": { + "default": "phone", + "type": "text" + }, + "device_types.wireless": { + "default": "wifi", + "type": "text" + }, + "device_types.workstation": { + "default": "computer", + "type": "text" + }, "disabled_sensors": { "type": "array", "group": "discovery", @@ -1872,13 +1896,6 @@ "default": true, "type": "boolean" }, - "discovery_modules.cisco-vrf-lite": { - "order": 80, - "group": "discovery", - "section": "discovery_modules", - "default": true, - "type": "boolean" - }, "discovery_modules.mac-accounting": { "order": 60, "group": "discovery", @@ -1897,7 +1914,7 @@ "order": 360, "group": "discovery", "section": "discovery_modules", - "default": false, + "default": true, "type": "boolean" }, "discovery_modules.ospfv3": { @@ -1981,7 +1998,7 @@ "order": 285, "group": "discovery", "section": "discovery_modules", - "default": true, + "default": false, "type": "boolean" }, "discovery_modules.storage": { @@ -2437,13 +2454,6 @@ "section": "virtualization", "order": 0 }, - "enable_proxmox": { - "default": false, - "type": "boolean", - "group": "discovery", - "section": "virtualization", - "order": 1 - }, "enable_ports_adsl": { "default": true, "type": "boolean" @@ -2477,14 +2487,6 @@ "default": false, "type": "boolean" }, - "enable_vrf_lite_cisco": { - "default": true, - "type": "boolean" - }, - "enable_vrfs": { - "default": true, - "type": "boolean" - }, "error_font": { "type": "text" }, @@ -2503,6 +2505,10 @@ "order": 2, "type": "text" }, + "first_run_complete": { + "default": false, + "type": "boolean" + }, "fping_options.count": { "default": 3, "group": "poller", @@ -6110,7 +6116,7 @@ "order": 210, "group": "poller", "section": "poller_modules", - "default": true, + "default": false, "type": "boolean" }, "poller_modules.qos": { @@ -6258,6 +6264,13 @@ "default": false, "type": "boolean" }, + "poller_modules.vrf": { + "order": 420, + "group": "poller", + "section": "poller_modules", + "default": false, + "type": "boolean" + }, "poller_modules.wireless": { "order": 440, "group": "poller", @@ -6265,6 +6278,13 @@ "default": true, "type": "boolean" }, + "poller_modules.fdb-table": { + "order": 185, + "group": "poller", + "section": "poller_modules", + "default": false, + "type": "boolean" + }, "poller_modules.ospf": { "order": 330, "group": "poller", @@ -6648,7 +6668,6 @@ "reporting.throttle": { "default": 30, "type": "integer", - "units": "seconds", "group": "system", "section": "reporting", "order": 3 @@ -6694,6 +6713,17 @@ "order": 2, "type": "integer" }, + "rrd.backend": { + "default": "rrdtool", + "group": "poller", + "section": "rrdtool", + "order": 13, + "type": "select", + "options": { + "rrdtool": "rrdtool", + "php-rrd": "php-rrd" + } + }, "rrd.heartbeat": { "default": 600, "group": "poller", @@ -6802,7 +6832,7 @@ "legacy": "legacy", "cron": "cron", "dispatcher": "dispatcher", - "scheduler": "scheduler" + "worker": "worker" } }, "schedule_type.ping": { @@ -6828,7 +6858,7 @@ "legacy": "legacy", "cron": "cron", "dispatcher": "dispatcher", - "scheduler": "scheduler" + "worker": "worker" } }, "schedule_type.services": { diff --git a/resources/definitions/os_detection/aaron.yaml b/resources/definitions/os_detection/aaron.yaml index 88e5a1df86e..73b920d42eb 100644 --- a/resources/definitions/os_detection/aaron.yaml +++ b/resources/definitions/os_detection/aaron.yaml @@ -1,6 +1,6 @@ os: aaron text: 'Aaron FM Rebroadcaster' -type: appliance +type: audiovisual icon: inovonics group: inovonics over: diff --git a/resources/definitions/os_detection/acano.yaml b/resources/definitions/os_detection/acano.yaml index ebc342d030c..35dd65ef2b8 100644 --- a/resources/definitions/os_detection/acano.yaml +++ b/resources/definitions/os_detection/acano.yaml @@ -20,5 +20,3 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true diff --git a/resources/definitions/os_detection/acs.yaml b/resources/definitions/os_detection/acs.yaml index 3700d56c1de..8778e421c42 100644 --- a/resources/definitions/os_detection/acs.yaml +++ b/resources/definitions/os_detection/acs.yaml @@ -2,7 +2,7 @@ os: acs group: cisco text: 'Cisco ACS' ifname: true -type: server +type: security icon: cisco over: - { graph: device_bits, text: 'Device Traffic' } @@ -22,8 +22,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true discovery: - sysObjectID: diff --git a/resources/definitions/os_detection/acsw.yaml b/resources/definitions/os_detection/acsw.yaml index aec75fb4268..4d127c37417 100644 --- a/resources/definitions/os_detection/acsw.yaml +++ b/resources/definitions/os_detection/acsw.yaml @@ -22,8 +22,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true discovery: - sysObjectID: .1.3.6.1.4.1.9.1.1291 diff --git a/resources/definitions/os_detection/adva-fsp150cp.yaml b/resources/definitions/os_detection/adva-fsp150cp.yaml index 07b0126081d..31096fcd787 100644 --- a/resources/definitions/os_detection/adva-fsp150cp.yaml +++ b/resources/definitions/os_detection/adva-fsp150cp.yaml @@ -12,7 +12,6 @@ discovery: sysObjectID: - .1.3.6.1.4.1.2544.1.10.1.1 discovery_modules: - cisco-vrf-lite: false storage: false hr-device: false arp-table: false diff --git a/resources/definitions/os_detection/adva_fsp3kr7.yaml b/resources/definitions/os_detection/adva_fsp3kr7.yaml index c54abd00b5c..b76b33d910d 100644 --- a/resources/definitions/os_detection/adva_fsp3kr7.yaml +++ b/resources/definitions/os_detection/adva_fsp3kr7.yaml @@ -1,6 +1,6 @@ os: adva_fsp3kr7 text: 'ADVA FSP3000 R7' -type: network +type: optical icon: adva group: ADVA over: diff --git a/resources/definitions/os_detection/airconsole.yaml b/resources/definitions/os_detection/airconsole.yaml index d3b54c1ad2c..11c8c364f60 100644 --- a/resources/definitions/os_detection/airconsole.yaml +++ b/resources/definitions/os_detection/airconsole.yaml @@ -1,6 +1,6 @@ os: airconsole text: 'Airconsole Server' -type: network +type: management icon: airconsole group: airconsole discovery: diff --git a/resources/definitions/os_detection/allworx_voip.yaml b/resources/definitions/os_detection/allworx_voip.yaml index 96fe0e78442..8576261bc23 100644 --- a/resources/definitions/os_detection/allworx_voip.yaml +++ b/resources/definitions/os_detection/allworx_voip.yaml @@ -1,6 +1,6 @@ os: allworx_voip text: 'Allworx VoIP' -type: appliance +type: voice icon: allworx over: - { graph: device_bits, text: 'Device Traffic' } diff --git a/resources/definitions/os_detection/alpineoe-tdcmedfa.yaml b/resources/definitions/os_detection/alpineoe-tdcmedfa.yaml index 4c1c7be47a0..88df54b6009 100644 --- a/resources/definitions/os_detection/alpineoe-tdcmedfa.yaml +++ b/resources/definitions/os_detection/alpineoe-tdcmedfa.yaml @@ -1,6 +1,6 @@ os: alpineoe-tdcmedfa text: 'Alpine OptoElectronics TDCM-EDFA platform' -type: appliance +type: optical icon: alpineoe mib_dir: alpineoe over: diff --git a/resources/definitions/os_detection/alteonos.yaml b/resources/definitions/os_detection/alteonos.yaml index a2452a38003..e9a6ce0ab17 100644 --- a/resources/definitions/os_detection/alteonos.yaml +++ b/resources/definitions/os_detection/alteonos.yaml @@ -1,7 +1,7 @@ os: alteonos group: radware text: AlteonOS -type: network +type: loadbalancer icon: radware over: - { graph: device_bits, text: 'Device Traffic' } diff --git a/resources/definitions/os_detection/aos-emu2.yaml b/resources/definitions/os_detection/aos-emu2.yaml index 57c026957b1..1e0bbd7873f 100644 --- a/resources/definitions/os_detection/aos-emu2.yaml +++ b/resources/definitions/os_detection/aos-emu2.yaml @@ -17,7 +17,6 @@ discovery_modules: entity-physical: false processors: false mempools: false - cisco-vrf-lite: false storage: false hr-device: false discovery-protocols: false diff --git a/resources/definitions/os_detection/apic.yaml b/resources/definitions/os_detection/apic.yaml index 40b0b8a8754..83879232e1d 100644 --- a/resources/definitions/os_detection/apic.yaml +++ b/resources/definitions/os_detection/apic.yaml @@ -19,8 +19,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true discovery: - sysObjectID: diff --git a/resources/definitions/os_detection/ardmore-encoder.yaml b/resources/definitions/os_detection/ardmore-encoder.yaml index 58afee6d3c2..81047ff23b6 100644 --- a/resources/definitions/os_detection/ardmore-encoder.yaml +++ b/resources/definitions/os_detection/ardmore-encoder.yaml @@ -1,6 +1,6 @@ os: ardmore-encoder text: 'AvediaStream Encoder' -type: appliance +type: audiovisual icon: exterity over: - { graph: device_bits, text: Traffic } diff --git a/resources/definitions/os_detection/areca.yaml b/resources/definitions/os_detection/areca.yaml index 99fdb80b3db..059c7fb202e 100644 --- a/resources/definitions/os_detection/areca.yaml +++ b/resources/definitions/os_detection/areca.yaml @@ -1,6 +1,6 @@ os: areca text: 'Areca RAID Subsystem' -type: appliance +type: storage over: - { graph: '', text: '' } discovery: diff --git a/resources/definitions/os_detection/arista_eos.yaml b/resources/definitions/os_detection/arista_eos.yaml index 5b997b2bf8f..f88343cbc9b 100644 --- a/resources/definitions/os_detection/arista_eos.yaml +++ b/resources/definitions/os_detection/arista_eos.yaml @@ -17,7 +17,6 @@ poller_modules: services: false ntp: false discovery_modules: - cisco-vrf-lite: false services: false ntp: false wireless: false diff --git a/resources/definitions/os_detection/arris-dsr4410md.yaml b/resources/definitions/os_detection/arris-dsr4410md.yaml index f410d3000e0..223757da20c 100644 --- a/resources/definitions/os_detection/arris-dsr4410md.yaml +++ b/resources/definitions/os_detection/arris-dsr4410md.yaml @@ -20,7 +20,6 @@ discovery_modules: arp-table: false vlans: false ucd-diskio: false - cisco-vrf-lite: false entity-physical: false ports-stack: false ipv6-addresses: false diff --git a/resources/definitions/os_detection/asa.yaml b/resources/definitions/os_detection/asa.yaml index aef1fa02ea5..98e41b02213 100644 --- a/resources/definitions/os_detection/asa.yaml +++ b/resources/definitions/os_detection/asa.yaml @@ -24,7 +24,6 @@ poller_modules: discovery_modules: arp-table: false bgp-peers: false - cisco-vrf-lite: false ntp: false stp: false ucd-diskio: false diff --git a/resources/definitions/os_detection/asrockrack.yaml b/resources/definitions/os_detection/asrockrack.yaml index 215edb0cf5e..abff9a315d1 100644 --- a/resources/definitions/os_detection/asrockrack.yaml +++ b/resources/definitions/os_detection/asrockrack.yaml @@ -1,6 +1,6 @@ os: asrockrack text: 'ASRock Rack BMC' -type: appliance +type: management icon: asrockrack mib_dir: asrockrack snmp_bulk: false diff --git a/resources/definitions/os_detection/asyncos.yaml b/resources/definitions/os_detection/asyncos.yaml index ad5461578f9..ef7a29c3b5c 100644 --- a/resources/definitions/os_detection/asyncos.yaml +++ b/resources/definitions/os_detection/asyncos.yaml @@ -1,6 +1,6 @@ os: asyncos text: 'Cisco AsyncOS' -type: proxy +type: security icon: cisco over: - { graph: device_bits, text: Traffic } @@ -20,7 +20,6 @@ poller_modules: ntp: false discovery_modules: ports-stack: false - cisco-vrf-lite: false bgp-peers: false stp: false ntp: false diff --git a/resources/definitions/os_detection/audiocodes.yaml b/resources/definitions/os_detection/audiocodes.yaml index bde2afb338a..629a6d06012 100644 --- a/resources/definitions/os_detection/audiocodes.yaml +++ b/resources/definitions/os_detection/audiocodes.yaml @@ -1,7 +1,7 @@ os: audiocodes group: audiocodes text: 'Audiocodes' -type: network +type: voice icon: audiocodes over: - { graph: device_bits, text: 'Device Traffic' } diff --git a/resources/definitions/os_detection/avaya-ipo.yaml b/resources/definitions/os_detection/avaya-ipo.yaml index 8bb3d1fd157..388cfceb35d 100644 --- a/resources/definitions/os_detection/avaya-ipo.yaml +++ b/resources/definitions/os_detection/avaya-ipo.yaml @@ -1,6 +1,6 @@ os: avaya-ipo text: 'IP Office Firmware' -type: network +type: voice icon: avaya mib_dir: nortel discovery: diff --git a/resources/definitions/os_detection/avocent-mp.yaml b/resources/definitions/os_detection/avocent-mp.yaml index 342e0a94e8d..b0b92c9bc6e 100644 --- a/resources/definitions/os_detection/avocent-mp.yaml +++ b/resources/definitions/os_detection/avocent-mp.yaml @@ -1,6 +1,6 @@ os: avocent-mp text: Vertiv Avocent MergePoint Unity -type: appliance +type: management icon: vertiv over: - { graph: device_bits, text: 'Device Traffic' } diff --git a/resources/definitions/os_detection/avr-hd.yaml b/resources/definitions/os_detection/avr-hd.yaml index 5dc299625c2..1aacac72b4a 100644 --- a/resources/definitions/os_detection/avr-hd.yaml +++ b/resources/definitions/os_detection/avr-hd.yaml @@ -1,6 +1,6 @@ os: avr-hd text: 'AvediaPlayer Receivers' -type: appliance +type: audiovisual icon: exterity over: - { graph: device_bits, text: Traffic } diff --git a/resources/definitions/os_detection/axisaudio.yaml b/resources/definitions/os_detection/axisaudio.yaml index 607aaf4e774..3fedb0a2cf7 100644 --- a/resources/definitions/os_detection/axisaudio.yaml +++ b/resources/definitions/os_detection/axisaudio.yaml @@ -1,6 +1,6 @@ os: axisaudio text: 'AXIS Audio Appliances' -type: appliance +type: audiovisual icon: axis discovery: - diff --git a/resources/definitions/os_detection/axiscam.yaml b/resources/definitions/os_detection/axiscam.yaml index 79348e83a80..0a009f0367b 100644 --- a/resources/definitions/os_detection/axiscam.yaml +++ b/resources/definitions/os_detection/axiscam.yaml @@ -1,6 +1,6 @@ os: axiscam text: 'AXIS Network Camera' -type: appliance +type: surveillance icon: axis mib_dir: axis discovery: diff --git a/resources/definitions/os_detection/barracudawafirewall.yaml b/resources/definitions/os_detection/barracudawafirewall.yaml index b80e128ba2c..87c29851d76 100644 --- a/resources/definitions/os_detection/barracudawafirewall.yaml +++ b/resources/definitions/os_detection/barracudawafirewall.yaml @@ -17,7 +17,6 @@ poller_modules: wireless: false discovery_modules: bgp-peers: false - cisco-vrf-lite: false discovery-protocols: false entity-physical: false fdb-table: false diff --git a/resources/definitions/os_detection/bluecatnetworks.yaml b/resources/definitions/os_detection/bluecatnetworks.yaml index cd5f464b317..aca07b09904 100644 --- a/resources/definitions/os_detection/bluecatnetworks.yaml +++ b/resources/definitions/os_detection/bluecatnetworks.yaml @@ -1,6 +1,6 @@ os: bluecatnetworks text: 'Bluecat Networks' -type: appliance +type: network icon: bcn snmp_bulk: false mib_dir: bluecatnetworks diff --git a/resources/definitions/os_detection/boschcpp.yaml b/resources/definitions/os_detection/boschcpp.yaml index 7b6f406d6c8..2f15325a175 100644 --- a/resources/definitions/os_detection/boschcpp.yaml +++ b/resources/definitions/os_detection/boschcpp.yaml @@ -1,6 +1,6 @@ os: boschcpp text: 'Bosch IP Camera' -type: camera +type: surveillance icon: bosch group: bosch mib_dir: bosch diff --git a/resources/definitions/os_detection/broadworks.yaml b/resources/definitions/os_detection/broadworks.yaml index 0440c907a82..01eef21de7e 100644 --- a/resources/definitions/os_detection/broadworks.yaml +++ b/resources/definitions/os_detection/broadworks.yaml @@ -1,6 +1,6 @@ os: broadworks text: 'Cisco BroadWorks' -type: server +type: voice group: unix icon: broadworks over: diff --git a/resources/definitions/os_detection/cat1900.yaml b/resources/definitions/os_detection/cat1900.yaml index 141166895f7..1e5f12a22ee 100644 --- a/resources/definitions/os_detection/cat1900.yaml +++ b/resources/definitions/os_detection/cat1900.yaml @@ -23,8 +23,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true mib_dir: cisco discovery: - diff --git a/resources/definitions/os_detection/catos.yaml b/resources/definitions/os_detection/catos.yaml index 7083655cf3f..def3b2f2048 100644 --- a/resources/definitions/os_detection/catos.yaml +++ b/resources/definitions/os_detection/catos.yaml @@ -23,8 +23,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true discovery: - sysDescr: diff --git a/resources/definitions/os_detection/ceraos.yaml b/resources/definitions/os_detection/ceraos.yaml index 0d19f81e872..19b173c3a85 100644 --- a/resources/definitions/os_detection/ceraos.yaml +++ b/resources/definitions/os_detection/ceraos.yaml @@ -28,7 +28,6 @@ discovery_modules: ports-stack: false entity-physical: false processors: false - cisco-vrf-lite: false ipv4-addresses: false ipv6-addresses: false hr-device: false diff --git a/resources/definitions/os_detection/ciena-waveserver.yaml b/resources/definitions/os_detection/ciena-waveserver.yaml index 10476958bc7..b70889887ba 100644 --- a/resources/definitions/os_detection/ciena-waveserver.yaml +++ b/resources/definitions/os_detection/ciena-waveserver.yaml @@ -4,7 +4,7 @@ icon: ciena ifname: true over: - { graph: device_bits, text: Traffic } -type: network +type: optical mib_dir: ciena discovery: - diff --git a/resources/definitions/os_detection/cimc.yaml b/resources/definitions/os_detection/cimc.yaml index 6800523384a..0afad109be9 100644 --- a/resources/definitions/os_detection/cimc.yaml +++ b/resources/definitions/os_detection/cimc.yaml @@ -19,8 +19,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true discovery: - sysDescr: diff --git a/resources/definitions/os_detection/cips.yaml b/resources/definitions/os_detection/cips.yaml index 0e36555dba5..f465b384b8d 100644 --- a/resources/definitions/os_detection/cips.yaml +++ b/resources/definitions/os_detection/cips.yaml @@ -18,8 +18,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true mib_dir: cisco discovery: - diff --git a/resources/definitions/os_detection/cirpack.yaml b/resources/definitions/os_detection/cirpack.yaml index 1e7251a0d4a..743a49148ff 100644 --- a/resources/definitions/os_detection/cirpack.yaml +++ b/resources/definitions/os_detection/cirpack.yaml @@ -1,6 +1,6 @@ os: cirpack text: 'cirpack' -type: server +type: voice icon: cirpack group: cirpack mib_dir: cirpack diff --git a/resources/definitions/os_detection/ciscoepc.yaml b/resources/definitions/os_detection/ciscoepc.yaml index 127a7a99b97..20f06b8e7c6 100644 --- a/resources/definitions/os_detection/ciscoepc.yaml +++ b/resources/definitions/os_detection/ciscoepc.yaml @@ -16,7 +16,6 @@ poller_modules: ucd-mib: false discovery_modules: bgp-peers: false - cisco-vrf-lite: false ntp: false ucd-diskio: false discovery: diff --git a/resources/definitions/os_detection/ciscome1200.yaml b/resources/definitions/os_detection/ciscome1200.yaml index f2065946780..62937fd4a8d 100644 --- a/resources/definitions/os_detection/ciscome1200.yaml +++ b/resources/definitions/os_detection/ciscome1200.yaml @@ -31,7 +31,6 @@ discovery_modules: cisco-pw: false bgp-peers: false vrf: false - cisco-vrf-lite: false ntp: false ucd-diskio: false diff --git a/resources/definitions/os_detection/ciscosb.yaml b/resources/definitions/os_detection/ciscosb.yaml index 4c373691982..2d6e759cda2 100644 --- a/resources/definitions/os_detection/ciscosb.yaml +++ b/resources/definitions/os_detection/ciscosb.yaml @@ -27,7 +27,6 @@ poller_modules: ucd-mib: false discovery_modules: bgp-peers: false - cisco-vrf-lite: false ntp: false ucd-diskio: false discovery: diff --git a/resources/definitions/os_detection/ciscosce.yaml b/resources/definitions/os_detection/ciscosce.yaml index 3664ab12ac9..2aba550c506 100644 --- a/resources/definitions/os_detection/ciscosce.yaml +++ b/resources/definitions/os_detection/ciscosce.yaml @@ -26,7 +26,6 @@ discovery_modules: cisco-otv: false cisco-pw: false vrf: false - cisco-vrf-lite: false mib_dir: cisco discovery: - diff --git a/resources/definitions/os_detection/ciscospa.yaml b/resources/definitions/os_detection/ciscospa.yaml index 6af81e4478a..7a2a5b04cc5 100644 --- a/resources/definitions/os_detection/ciscospa.yaml +++ b/resources/definitions/os_detection/ciscospa.yaml @@ -1,6 +1,6 @@ os: ciscospa text: 'Cisco Voice Gateway' -type: appliance +type: voice icon: cisco group: cisco mib_dir: cisco diff --git a/resources/definitions/os_detection/ciscowap.yaml b/resources/definitions/os_detection/ciscowap.yaml index 14f489e7188..e18a4c67c17 100644 --- a/resources/definitions/os_detection/ciscowap.yaml +++ b/resources/definitions/os_detection/ciscowap.yaml @@ -31,7 +31,5 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true mib_dir: cisco processor_stacked: true diff --git a/resources/definitions/os_detection/ciscowlc.yaml b/resources/definitions/os_detection/ciscowlc.yaml index 0bfd8bc8a59..31e09c52b10 100644 --- a/resources/definitions/os_detection/ciscowlc.yaml +++ b/resources/definitions/os_detection/ciscowlc.yaml @@ -21,8 +21,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true mib_dir: cisco discovery: - diff --git a/resources/definitions/os_detection/clearpass.yaml b/resources/definitions/os_detection/clearpass.yaml index d3df7cb9142..e36ba9bac8c 100644 --- a/resources/definitions/os_detection/clearpass.yaml +++ b/resources/definitions/os_detection/clearpass.yaml @@ -1,6 +1,6 @@ os: clearpass text: 'Aruba Clearpass' -type: appliance +type: security icon: aruba over: - { graph: device_bits, text: 'Device Traffic' } diff --git a/resources/definitions/os_detection/cms.yaml b/resources/definitions/os_detection/cms.yaml index a2c4311b63f..919c364259c 100644 --- a/resources/definitions/os_detection/cms.yaml +++ b/resources/definitions/os_detection/cms.yaml @@ -1,6 +1,6 @@ os: cms text: 'Corero CMS' -type: appliance +type: security icon: corero mib_dir: corero group: Corero diff --git a/resources/definitions/os_detection/coriant.yaml b/resources/definitions/os_detection/coriant.yaml index 6e99fe9e425..e59740a6807 100644 --- a/resources/definitions/os_detection/coriant.yaml +++ b/resources/definitions/os_detection/coriant.yaml @@ -1,6 +1,6 @@ os: coriant text: 'Coriant TNMS' -type: network +type: optical icon: coriant discovery_modules: ntp: false @@ -14,7 +14,6 @@ discovery_modules: vlans: false arp-table: false mef: true - cisco-vrf-lite: false storage: false poller_modules: ntp: false @@ -28,7 +27,6 @@ poller_modules: vlans: false arp-table: false mef: true - cisco-vrf-lite: false storage: false tnms-nbi: true discovery: diff --git a/resources/definitions/os_detection/cumulus.yaml b/resources/definitions/os_detection/cumulus.yaml index 368fb45bfb3..895647e3aeb 100644 --- a/resources/definitions/os_detection/cumulus.yaml +++ b/resources/definitions/os_detection/cumulus.yaml @@ -15,3 +15,5 @@ discovery: - sysDescr: - 'Cumulus' +discovery_modules: + vrf: true diff --git a/resources/definitions/os_detection/cyberoam-utm.yaml b/resources/definitions/os_detection/cyberoam-utm.yaml index fc6292f1853..aa032c4fcee 100644 --- a/resources/definitions/os_detection/cyberoam-utm.yaml +++ b/resources/definitions/os_detection/cyberoam-utm.yaml @@ -5,7 +5,7 @@ over: - { graph: device_processor, text: 'CPU Usage' } - { graph: device_mempool, text: 'Memory Usage' } icon: sophos -type: appliance +type: firewall mib_dir: cyberoam discovery: - diff --git a/resources/definitions/os_detection/dahua-nvr.yaml b/resources/definitions/os_detection/dahua-nvr.yaml index 8507ca801c9..abda1c676ef 100644 --- a/resources/definitions/os_detection/dahua-nvr.yaml +++ b/resources/definitions/os_detection/dahua-nvr.yaml @@ -1,6 +1,6 @@ os: dahua-nvr text: 'Dahua NVR' -type: appliance +type: surveillance icon: dahua group: dahua over: diff --git a/resources/definitions/os_detection/dcn-software.yaml b/resources/definitions/os_detection/dcn-software.yaml index 4a376eada32..117b5d38bb3 100644 --- a/resources/definitions/os_detection/dcn-software.yaml +++ b/resources/definitions/os_detection/dcn-software.yaml @@ -12,3 +12,4 @@ discovery: sysObjectID: - .1.3.6.1.4.1.6339.1.1.1. - .1.3.6.1.4.1.6339.1.1.2. + - .1.3.6.1.4.1.6339.1.1.3. diff --git a/resources/definitions/os_detection/dell-ome-m.yaml b/resources/definitions/os_detection/dell-ome-m.yaml index 128050f118a..657b32ac9dd 100644 --- a/resources/definitions/os_detection/dell-ome-m.yaml +++ b/resources/definitions/os_detection/dell-ome-m.yaml @@ -1,6 +1,6 @@ os: dell-ome-m text: 'Dell OpenManage Enterprise Modular' -type: appliance +type: management icon: dell group: dell mib_dir: dell diff --git a/resources/definitions/os_detection/dell-rcs.yaml b/resources/definitions/os_detection/dell-rcs.yaml index fa33972deab..de699ee246e 100644 --- a/resources/definitions/os_detection/dell-rcs.yaml +++ b/resources/definitions/os_detection/dell-rcs.yaml @@ -1,6 +1,6 @@ os: dell-rcs text: 'Dell Remote Console' -type: appliance +type: management icon: dell over: - { graph: device_bits, text: 'Device Traffic' } diff --git a/resources/definitions/os_detection/deva-db7001.yaml b/resources/definitions/os_detection/deva-db7001.yaml index 86cf53882f3..5ae022202cd 100644 --- a/resources/definitions/os_detection/deva-db7001.yaml +++ b/resources/definitions/os_detection/deva-db7001.yaml @@ -1,6 +1,6 @@ os: deva-db7001 text: 'DB7001 - FM Radio Re-Broadcast Receiver' -type: appliance +type: audiovisual icon: deva group: deva over: diff --git a/resources/definitions/os_detection/dhcpatriot.yaml b/resources/definitions/os_detection/dhcpatriot.yaml index 208e56758a0..5a9db321163 100644 --- a/resources/definitions/os_detection/dhcpatriot.yaml +++ b/resources/definitions/os_detection/dhcpatriot.yaml @@ -1,5 +1,5 @@ os: dhcpatriot -type: server +type: network group: unix text: 'DHCPatriot' ifXmcbc: true diff --git a/resources/definitions/os_detection/didactum.yaml b/resources/definitions/os_detection/didactum.yaml new file mode 100644 index 00000000000..09e01057c52 --- /dev/null +++ b/resources/definitions/os_detection/didactum.yaml @@ -0,0 +1,10 @@ +os: didactum +text: 'Didactum' +type: environment +over: + - { graph: device_bits, text: 'Device Traffic' } + - { graph: device_processor, text: 'CPU Usage' } + - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - sysObjectID: + - .1.3.6.1.4.1.46501 diff --git a/resources/definitions/os_detection/dpi.yaml b/resources/definitions/os_detection/dpi.yaml index a18156d1102..7eda974844b 100644 --- a/resources/definitions/os_detection/dpi.yaml +++ b/resources/definitions/os_detection/dpi.yaml @@ -17,7 +17,6 @@ poller_modules: ntp: false discovery_modules: entity-physical: false - cisco-vrf-lite: false ipv6-address: false storage: false hr-device: false diff --git a/resources/definitions/os_detection/dxmos.yaml b/resources/definitions/os_detection/dxmos.yaml index 46efbc49e53..9f97980ee18 100644 --- a/resources/definitions/os_detection/dxmos.yaml +++ b/resources/definitions/os_detection/dxmos.yaml @@ -1,9 +1,9 @@ -os: dxmos -text: 'DXM Operating System' -type: network -icon: xkl -mib_dir: xkl -over: - - { graph: device_bits, text: 'Device Traffic' } -discovery: - - sysObjectID: .1.3.6.1.4.1.21150. +os: dxmos +text: 'DXM Operating System' +type: network +icon: xkl +mib_dir: xkl +over: + - { graph: device_bits, text: 'Device Traffic' } +discovery: + - sysObjectID: .1.3.6.1.4.1.21150. diff --git a/resources/definitions/os_detection/ecosdn.yaml b/resources/definitions/os_detection/ecosdn.yaml new file mode 100644 index 00000000000..0ec9e210a54 --- /dev/null +++ b/resources/definitions/os_detection/ecosdn.yaml @@ -0,0 +1,13 @@ +os: ecosdn +text: 'RDP EcoSDN' +type: network +icon: rdp +mib_dir: rdp +over: + - { graph: device_processor, text: 'Processor Usage' } + - { graph: device_mempool, text: 'Memory Usage' } + - { graph: device_temperature, text: 'Temperature' } +discovery: + - + sysObjectID: + - .1.3.6.1.4.1.45555.3 diff --git a/resources/definitions/os_detection/ecresofm-os.yaml b/resources/definitions/os_detection/ecresofm-os.yaml index 418847189c6..24adfef13f0 100644 --- a/resources/definitions/os_detection/ecresofm-os.yaml +++ b/resources/definitions/os_detection/ecresofm-os.yaml @@ -1,6 +1,6 @@ os: ecresofm-os text: 'Ecreso FM Transmitter' -type: appliance +type: audiovisual icon: worldcastsystems group: worldcastsystems over: diff --git a/resources/definitions/os_detection/edfa.yaml b/resources/definitions/os_detection/edfa.yaml index 801dd42c4ba..db3634f0a45 100644 --- a/resources/definitions/os_detection/edfa.yaml +++ b/resources/definitions/os_detection/edfa.yaml @@ -1,6 +1,6 @@ os: edfa text: 'EDFA' -type: network +type: optical icon: edfa group: edfa mib_dir: edfa diff --git a/resources/definitions/os_detection/edfamux.yaml b/resources/definitions/os_detection/edfamux.yaml index 836473f3a18..091b383d4f4 100644 --- a/resources/definitions/os_detection/edfamux.yaml +++ b/resources/definitions/os_detection/edfamux.yaml @@ -1,6 +1,6 @@ os: edfamux text: 'Solid Optics EDFAMUX' -type: network +type: optical icon: solidoptics mib_dir: solidoptics over: diff --git a/resources/definitions/os_detection/eds.yaml b/resources/definitions/os_detection/eds.yaml index 421a0ad470d..d176591e6a9 100644 --- a/resources/definitions/os_detection/eds.yaml +++ b/resources/definitions/os_detection/eds.yaml @@ -1,6 +1,6 @@ os: eds text: 'EDS' -type: appliance +type: environment icon: eds group: eds mib_dir: eds @@ -10,7 +10,6 @@ poller_modules: wireless: false discovery_modules: bgp-peers: false - cisco-vrf-lite: false stp: false wireless: false discovery: diff --git a/resources/definitions/os_detection/ekinops.yaml b/resources/definitions/os_detection/ekinops.yaml index 49964ffd17d..810f89cace1 100644 --- a/resources/definitions/os_detection/ekinops.yaml +++ b/resources/definitions/os_detection/ekinops.yaml @@ -1,6 +1,6 @@ os: ekinops text: 'Ekinops Optical' -type: network +type: optical icon: ekinops group: ekinops discovery: diff --git a/resources/definitions/os_detection/elg-ipecs-ucp.yaml b/resources/definitions/os_detection/elg-ipecs-ucp.yaml index 6504c098262..82590c76c41 100644 --- a/resources/definitions/os_detection/elg-ipecs-ucp.yaml +++ b/resources/definitions/os_detection/elg-ipecs-ucp.yaml @@ -1,6 +1,6 @@ os: elg-ipecs-ucp text: 'Ericsson LG iPECS UCP' -type: appliance +type: voice icon: ericsson over: - { graph: device_bits, text: 'Device Traffic' } diff --git a/resources/definitions/os_detection/endrun.yaml b/resources/definitions/os_detection/endrun.yaml index 0cfcd306207..ccc47902ce1 100644 --- a/resources/definitions/os_detection/endrun.yaml +++ b/resources/definitions/os_detection/endrun.yaml @@ -1,5 +1,5 @@ os: endrun -type: appliance +type: timing group: unix mib_dir: endrun text: 'EndRun' diff --git a/resources/definitions/os_detection/enexus.yaml b/resources/definitions/os_detection/enexus.yaml index cd37ddbab2f..72bbb86e972 100644 --- a/resources/definitions/os_detection/enexus.yaml +++ b/resources/definitions/os_detection/enexus.yaml @@ -33,7 +33,6 @@ discovery_modules: entity-physical: true processors: false mempools: false - cisco-vrf-lite: false ipv4-addresses: false ipv6-addresses: false storage: false diff --git a/resources/definitions/os_detection/ericsson-ipos.yaml b/resources/definitions/os_detection/ericsson-ipos.yaml index bbd6a1b7d74..da9b2e17db1 100644 --- a/resources/definitions/os_detection/ericsson-ipos.yaml +++ b/resources/definitions/os_detection/ericsson-ipos.yaml @@ -22,5 +22,3 @@ discovery: - .1.3.6.1.4.1.193.218.1.19 # SSR 8004 sysDescr_regex: - '/^Ericsson\s+IPOS/' -discovery_modules: - vrf: true diff --git a/resources/definitions/os_detection/esphome.yaml b/resources/definitions/os_detection/esphome.yaml index 062a11e0d6e..97a627ee324 100644 --- a/resources/definitions/os_detection/esphome.yaml +++ b/resources/definitions/os_detection/esphome.yaml @@ -1,6 +1,6 @@ os: esphome text: 'ESP-Home' -type: appliance +type: iot icon: esphome snmp_bulk: false over: diff --git a/resources/definitions/os_detection/eurostor.yaml b/resources/definitions/os_detection/eurostor.yaml index 589c0bec068..25ce2bd178c 100644 --- a/resources/definitions/os_detection/eurostor.yaml +++ b/resources/definitions/os_detection/eurostor.yaml @@ -1,7 +1,7 @@ os: eurostor text: 'EUROstor RAID Subsystem' icon: eurostor -type: appliance +type: storage mib_dir: proware discovery: - diff --git a/resources/definitions/os_detection/exalink-fusion.yaml b/resources/definitions/os_detection/exalink-fusion.yaml index ac21139d95e..b3735e01768 100644 --- a/resources/definitions/os_detection/exalink-fusion.yaml +++ b/resources/definitions/os_detection/exalink-fusion.yaml @@ -22,5 +22,4 @@ discovery_modules: storage: false ospf: false ucd-diskio: false - cisco-vrf-lite: false wireless: false diff --git a/resources/definitions/os_detection/exinda.yaml b/resources/definitions/os_detection/exinda.yaml index da6c36e707d..f81a83e4f7e 100644 --- a/resources/definitions/os_detection/exinda.yaml +++ b/resources/definitions/os_detection/exinda.yaml @@ -1,6 +1,6 @@ os: exinda text: Exinda -type: appliance +type: network icon: exinda over: - { graph: device_bits, text: 'Device Traffic' } diff --git a/resources/definitions/os_detection/feos.yaml b/resources/definitions/os_detection/feos.yaml index 580b439083e..0ce58bd45dc 100644 --- a/resources/definitions/os_detection/feos.yaml +++ b/resources/definitions/os_detection/feos.yaml @@ -1,7 +1,7 @@ os: feos group: trellix text: 'FireEye OS' -type: appliance +type: security icon: trellix mib_dir: trellix over: diff --git a/resources/definitions/os_detection/fiberhome.yaml b/resources/definitions/os_detection/fiberhome.yaml index 20d8e2ec054..e5c6614e0c2 100644 --- a/resources/definitions/os_detection/fiberhome.yaml +++ b/resources/definitions/os_detection/fiberhome.yaml @@ -8,7 +8,6 @@ discovery: discovery_modules: arp-table: false bgp-peers: false - cisco-vrf-lite: false entity-physical: false ports: false ports-stack: false diff --git a/resources/definitions/os_detection/fibernet-xmux4-plus.yaml b/resources/definitions/os_detection/fibernet-xmux4-plus.yaml index 34eef2f880e..3637522c3d2 100755 --- a/resources/definitions/os_detection/fibernet-xmux4-plus.yaml +++ b/resources/definitions/os_detection/fibernet-xmux4-plus.yaml @@ -1,6 +1,6 @@ os: fibernet-xmux4-plus text: 'Fibernet XMUX 4+' -type: network +type: optical icon: fibernet discovery: - diff --git a/resources/definitions/os_detection/fortios.yaml b/resources/definitions/os_detection/fortios.yaml index 76724dc1161..9281f348435 100644 --- a/resources/definitions/os_detection/fortios.yaml +++ b/resources/definitions/os_detection/fortios.yaml @@ -1,6 +1,6 @@ os: fortios text: FortiOS -type: appliance +type: firewall icon: fortinet mib_dir: fortinet over: diff --git a/resources/definitions/os_detection/freebsd.yaml b/resources/definitions/os_detection/freebsd.yaml index e8e9e142f07..5d8f1988a9c 100644 --- a/resources/definitions/os_detection/freebsd.yaml +++ b/resources/definitions/os_detection/freebsd.yaml @@ -9,8 +9,11 @@ over: discovery_modules: applications: true discovery: + - + sysObjectID: .1.3.6.1.4.1.8072.3.2.8 - sysDescr: FreeBSD sysDescr_except: - FreeNAS - TrueNAS + - ZscalerOS diff --git a/resources/definitions/os_detection/ftd.yaml b/resources/definitions/os_detection/ftd.yaml index d652b7d1067..badc85e3a6d 100644 --- a/resources/definitions/os_detection/ftd.yaml +++ b/resources/definitions/os_detection/ftd.yaml @@ -42,7 +42,6 @@ discovery: discovery_modules: entity-physical: false - cisco-vrf-lite: false sensors: false storage: false hr-device: false diff --git a/resources/definitions/os_detection/fujitsu-irmc.yaml b/resources/definitions/os_detection/fujitsu-irmc.yaml index 86620b530dd..312c361b482 100644 --- a/resources/definitions/os_detection/fujitsu-irmc.yaml +++ b/resources/definitions/os_detection/fujitsu-irmc.yaml @@ -1,7 +1,7 @@ os: fujitsu-irmc text: 'FUJITSU iRMC' icon: fujitsu -type: appliance +type: management mib_dir: fujitsu discovery: - diff --git a/resources/definitions/os_detection/fusionhub.yaml b/resources/definitions/os_detection/fusionhub.yaml index 1fc670c8152..dd6e5953252 100644 --- a/resources/definitions/os_detection/fusionhub.yaml +++ b/resources/definitions/os_detection/fusionhub.yaml @@ -1,6 +1,6 @@ os: fusionhub text: FusionHub -type: appliance +type: network icon: peplink group: unix mib_dir: peplink diff --git a/resources/definitions/os_detection/fxos.yaml b/resources/definitions/os_detection/fxos.yaml index ed7541c8960..ce39e8354ba 100644 --- a/resources/definitions/os_detection/fxos.yaml +++ b/resources/definitions/os_detection/fxos.yaml @@ -19,8 +19,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true discovery: - sysDescr: diff --git a/resources/definitions/os_detection/genieatm.yaml b/resources/definitions/os_detection/genieatm.yaml index 22f562244d8..74ba766a4aa 100644 --- a/resources/definitions/os_detection/genieatm.yaml +++ b/resources/definitions/os_detection/genieatm.yaml @@ -1,7 +1,7 @@ --- os: genieatm text: 'GenieATM' -type: appliance +type: security icon: genie group: genie mib_dir: genie diff --git a/resources/definitions/os_detection/gepulsar.yaml b/resources/definitions/os_detection/gepulsar.yaml index 489be4ab34f..8799c5b7da3 100644 --- a/resources/definitions/os_detection/gepulsar.yaml +++ b/resources/definitions/os_detection/gepulsar.yaml @@ -30,7 +30,6 @@ discovery_modules: wireless: false fdb-table: false services: false - cisco-vrf-lite: false poller_modules: ospf: false ntp: false diff --git a/resources/definitions/os_detection/gos.yaml b/resources/definitions/os_detection/gos.yaml index b2c69e7b5a2..b6c5e4798ae 100644 --- a/resources/definitions/os_detection/gos.yaml +++ b/resources/definitions/os_detection/gos.yaml @@ -1,5 +1,5 @@ os: gos -type: appliance +type: security group: greenbone text: 'Greenbone OS' ifXmcbc: true diff --git a/resources/definitions/os_detection/grandstream-gxw.yaml b/resources/definitions/os_detection/grandstream-gxw.yaml index dd801d6d366..82ab9b978f6 100644 --- a/resources/definitions/os_detection/grandstream-gxw.yaml +++ b/resources/definitions/os_detection/grandstream-gxw.yaml @@ -1,7 +1,7 @@ os: grandstream-gxw group: grandstream text: 'Grandstream GXW' -type: appliance +type: voice icon: grandstream over: - { graph: device_ping_perf, text: 'Ping Response' } diff --git a/resources/definitions/os_detection/grandstream-ht.yaml b/resources/definitions/os_detection/grandstream-ht.yaml index 0972eef8483..1980eb48f18 100644 --- a/resources/definitions/os_detection/grandstream-ht.yaml +++ b/resources/definitions/os_detection/grandstream-ht.yaml @@ -1,7 +1,7 @@ os: grandstream-ht group: grandstream text: 'Grandstream HT' -type: network +type: voice icon: grandstream over: - { graph: device_ping_perf, text: 'Ping Response' } diff --git a/resources/definitions/os_detection/gude-esb.yaml b/resources/definitions/os_detection/gude-esb.yaml index cccd8788364..3a8cb4094cd 100644 --- a/resources/definitions/os_detection/gude-esb.yaml +++ b/resources/definitions/os_detection/gude-esb.yaml @@ -1,6 +1,6 @@ os: gude-esb text: 'Expert Sensor Box' -type: power +type: environment icon: gude group: gude mib_dir: gude diff --git a/resources/definitions/os_detection/gw-eydfa.yaml b/resources/definitions/os_detection/gw-eydfa.yaml index a9f99b9ca09..b219444ba89 100644 --- a/resources/definitions/os_detection/gw-eydfa.yaml +++ b/resources/definitions/os_detection/gw-eydfa.yaml @@ -1,6 +1,6 @@ os: gw-eydfa text: 'Glass Way WDM EYDFA' -type: network +type: optical icon: glassway over: - { graph: device_temperature, text: 'Temperatures' } @@ -31,7 +31,6 @@ discovery_modules: entity-physical: false processors: false mempools: false - cisco-vrf-lite: false ipv4-addresses: false ipv6-addresses: false storage: false diff --git a/resources/definitions/os_detection/halon.yaml b/resources/definitions/os_detection/halon.yaml index a5266aa2b64..5f455c6b07e 100644 --- a/resources/definitions/os_detection/halon.yaml +++ b/resources/definitions/os_detection/halon.yaml @@ -1,6 +1,6 @@ os: halon text: Halon -type: appliance +type: security over: - { graph: device_processor, text: 'Processor Usage' } - { graph: device_mempool, text: 'Memory Usage' } diff --git a/resources/definitions/os_detection/hatteras.yaml b/resources/definitions/os_detection/hatteras.yaml index b67d2d47745..c6d6ebadbd9 100644 --- a/resources/definitions/os_detection/hatteras.yaml +++ b/resources/definitions/os_detection/hatteras.yaml @@ -1,6 +1,6 @@ os: hatteras text: 'Overture Hatteras DSLAM' -type: network +type: network icon: hatteras empty_ifdescr: true diff --git a/resources/definitions/os_detection/heliosip.yaml b/resources/definitions/os_detection/heliosip.yaml index ca619a3478c..17289b89c8a 100644 --- a/resources/definitions/os_detection/heliosip.yaml +++ b/resources/definitions/os_detection/heliosip.yaml @@ -1,6 +1,6 @@ os: heliosip text: 'Helios IP' -type: appliance +type: voice icon: 2n over: - { graph: device_uptime, text: 'Device Uptime' } diff --git a/resources/definitions/os_detection/hikvision-cam.yaml b/resources/definitions/os_detection/hikvision-cam.yaml index 8a4f1df64b1..3f405af1981 100644 --- a/resources/definitions/os_detection/hikvision-cam.yaml +++ b/resources/definitions/os_detection/hikvision-cam.yaml @@ -1,6 +1,6 @@ os: hikvision-cam text: 'Hikvision Camera' -type: network +type: surveillance icon: hikvision mib_dir: hikvision over: diff --git a/resources/definitions/os_detection/hikvision-nvr.yaml b/resources/definitions/os_detection/hikvision-nvr.yaml index 9938d0d7882..717261e8e36 100644 --- a/resources/definitions/os_detection/hikvision-nvr.yaml +++ b/resources/definitions/os_detection/hikvision-nvr.yaml @@ -1,6 +1,6 @@ os: hikvision-nvr text: 'Hikvision NVR' -type: network +type: surveillance icon: hikvision mib_dir: hikvision over: diff --git a/resources/definitions/os_detection/hpblmos.yaml b/resources/definitions/os_detection/hpblmos.yaml index e3250c5b4ea..78153c937a2 100644 --- a/resources/definitions/os_detection/hpblmos.yaml +++ b/resources/definitions/os_detection/hpblmos.yaml @@ -1,6 +1,6 @@ os: hpblmos text: 'HP Blade Management' -type: appliance +type: management icon: hpe mib_dir: hp over: diff --git a/resources/definitions/os_detection/hwg-ste.yaml b/resources/definitions/os_detection/hwg-ste.yaml index 2c6964deb8e..b8321cc76b4 100644 --- a/resources/definitions/os_detection/hwg-ste.yaml +++ b/resources/definitions/os_detection/hwg-ste.yaml @@ -17,7 +17,6 @@ discovery_modules: applications: false arp-table: false bgp-peers: false - cisco-vrf-lite: false discovery-protocols: false fdb-table: false hr-device: false diff --git a/resources/definitions/os_detection/ibm-amm.yaml b/resources/definitions/os_detection/ibm-amm.yaml index 176398c28b0..9ff67c98538 100644 --- a/resources/definitions/os_detection/ibm-amm.yaml +++ b/resources/definitions/os_detection/ibm-amm.yaml @@ -1,6 +1,6 @@ os: ibm-amm text: 'IBM AMM' -type: appliance +type: management icon: ibmos mib_dir: ibm discovery: diff --git a/resources/definitions/os_detection/ibmc.yaml b/resources/definitions/os_detection/ibmc.yaml index 21949051c07..9d66c86a24d 100644 --- a/resources/definitions/os_detection/ibmc.yaml +++ b/resources/definitions/os_detection/ibmc.yaml @@ -1,6 +1,6 @@ os: ibmc text: 'Huawei iBMC Management Console' -type: appliance +type: management icon: huawei group: ibmc over: @@ -14,7 +14,6 @@ poller_modules: wireless: false discovery_modules: bgp-peers: false - cisco-vrf-lite: false stp: false wireless: false discovery: diff --git a/resources/definitions/os_detection/icotera.yaml b/resources/definitions/os_detection/icotera.yaml index 98cc912d240..b807e3a62d4 100644 --- a/resources/definitions/os_detection/icotera.yaml +++ b/resources/definitions/os_detection/icotera.yaml @@ -18,7 +18,6 @@ poller_modules: ntp: false entity-physical: false discovery_modules: - cisco-vrf-lite: false services: false ntp: false wireless: false diff --git a/resources/definitions/os_detection/ihse-draco.yaml b/resources/definitions/os_detection/ihse-draco.yaml new file mode 100644 index 00000000000..d9861e53c27 --- /dev/null +++ b/resources/definitions/os_detection/ihse-draco.yaml @@ -0,0 +1,13 @@ +os: ihse-draco +text: 'IHSE Draco tera' +type: management +over: + - { graph: device_temperature, text: 'Matrix Temperature' } + - { graph: device_state, text: 'Device Status' } +discovery: + - + sysObjectID: .1.3.6.1.4.1.8072.3.2.10 + snmpget: + oid: TERACPU-MIB::teraFamily.0 + mib_dir: ihse-draco + value: 'Draco tera' diff --git a/resources/definitions/os_detection/illustra.yaml b/resources/definitions/os_detection/illustra.yaml index be0840b8a91..26ef3648dc7 100644 --- a/resources/definitions/os_detection/illustra.yaml +++ b/resources/definitions/os_detection/illustra.yaml @@ -1,6 +1,6 @@ os: illustra text: 'Illustra Network Camera' -type: network +type: surveillance icon: illustra group: illustra discovery: diff --git a/resources/definitions/os_detection/infinera-groove.yaml b/resources/definitions/os_detection/infinera-groove.yaml index d2f56df1d32..242887d7103 100644 --- a/resources/definitions/os_detection/infinera-groove.yaml +++ b/resources/definitions/os_detection/infinera-groove.yaml @@ -1,6 +1,6 @@ os: infinera-groove text: 'Infinera Groove' -type: network +type: optical icon: infinera mib_dir: infinera discovery_modules: @@ -15,7 +15,6 @@ discovery_modules: vlans: false arp-table: false mef: false - cisco-vrf-lite: false storage: false fdb-table: false wireless: false @@ -39,7 +38,6 @@ poller_modules: vlans: false arp-table: false mef: false - cisco-vrf-lite: false storage: false over: - { graph: device_bits, text: 'Device Traffic' } diff --git a/resources/definitions/os_detection/infinera-xtm.yaml b/resources/definitions/os_detection/infinera-xtm.yaml index 9d52b37fd5f..011c972ad65 100644 --- a/resources/definitions/os_detection/infinera-xtm.yaml +++ b/resources/definitions/os_detection/infinera-xtm.yaml @@ -1,6 +1,6 @@ os: infinera-xtm text: 'Infinera XTM' -type: network +type: optical icon: infinera mib_dir: infinera discovery: diff --git a/resources/definitions/os_detection/infortrend.yaml b/resources/definitions/os_detection/infortrend.yaml index 5ddb83a1e73..b8e98fbb886 100644 --- a/resources/definitions/os_detection/infortrend.yaml +++ b/resources/definitions/os_detection/infortrend.yaml @@ -4,9 +4,7 @@ type: storage icon: infortrend mib_dir: infortrend group: Infortrend -over: - - { graph: device_processor, text: 'CPU Usage' } - - { graph: device_mempool, text: 'Memory Usage' } + discovery: - sysObjectID: - .1.3.6.1.4.1.1714.1 diff --git a/resources/definitions/os_detection/innovaphone.yaml b/resources/definitions/os_detection/innovaphone.yaml index 450ec5095d6..994094ef2e0 100644 --- a/resources/definitions/os_detection/innovaphone.yaml +++ b/resources/definitions/os_detection/innovaphone.yaml @@ -1,6 +1,6 @@ os: innovaphone text: 'Innovaphone ISDN' -type: environment +type: voice icon: innovaphone mib_dir: innovaphone discovery: diff --git a/resources/definitions/os_detection/ionodes.yaml b/resources/definitions/os_detection/ionodes.yaml index 1b139c47f45..fe31950bc37 100644 --- a/resources/definitions/os_detection/ionodes.yaml +++ b/resources/definitions/os_detection/ionodes.yaml @@ -1,6 +1,6 @@ os: ionodes text: 'IONODES' -type: encoder +type: surveillance icon: ionodes mib_dir: ionodes over: diff --git a/resources/definitions/os_detection/ios.yaml b/resources/definitions/os_detection/ios.yaml index 80990cdb3bf..0056f3330e2 100644 --- a/resources/definitions/os_detection/ios.yaml +++ b/resources/definitions/os_detection/ios.yaml @@ -54,6 +54,4 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true xdsl: true diff --git a/resources/definitions/os_detection/iosxe.yaml b/resources/definitions/os_detection/iosxe.yaml index cd1276e3d58..4736b0d7619 100644 --- a/resources/definitions/os_detection/iosxe.yaml +++ b/resources/definitions/os_detection/iosxe.yaml @@ -33,8 +33,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true cisco-qfp: true xdsl: true discovery: diff --git a/resources/definitions/os_detection/iosxr.yaml b/resources/definitions/os_detection/iosxr.yaml index 3301d0d87a3..836cfa6918b 100644 --- a/resources/definitions/os_detection/iosxr.yaml +++ b/resources/definitions/os_detection/iosxr.yaml @@ -25,8 +25,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true discovery: - sysDescr: diff --git a/resources/definitions/os_detection/ipolis.yaml b/resources/definitions/os_detection/ipolis.yaml index 9f5955a25d8..a211f527e63 100644 --- a/resources/definitions/os_detection/ipolis.yaml +++ b/resources/definitions/os_detection/ipolis.yaml @@ -1,6 +1,6 @@ os: ipolis text: 'Hanwha Techwin' -type: camera +type: surveillance icon: hanwhatechwin over: - { graph: device_bits, text: 'Device Traffic' } diff --git a/resources/definitions/os_detection/iqnos.yaml b/resources/definitions/os_detection/iqnos.yaml index e144364715c..f459c87f442 100644 --- a/resources/definitions/os_detection/iqnos.yaml +++ b/resources/definitions/os_detection/iqnos.yaml @@ -1,6 +1,6 @@ os: iqnos text: 'Infinera IQNOS' -type: network +type: optical icon: infinera mib_dir: iqnos diff --git a/resources/definitions/os_detection/ise.yaml b/resources/definitions/os_detection/ise.yaml index 4e4f4856298..be85d3d0586 100644 --- a/resources/definitions/os_detection/ise.yaml +++ b/resources/definitions/os_detection/ise.yaml @@ -1,6 +1,6 @@ os: ise text: 'Cisco Identity Services Engine' -type: server +type: security icon: cisco over: - { graph: device_bits, text: 'Device Traffic' } @@ -18,8 +18,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true mib_dir: cisco discovery: - diff --git a/resources/definitions/os_detection/iskratel-lumia.yaml b/resources/definitions/os_detection/iskratel-lumia.yaml new file mode 100644 index 00000000000..261e7fb8312 --- /dev/null +++ b/resources/definitions/os_detection/iskratel-lumia.yaml @@ -0,0 +1,13 @@ +os: iskratel-lumia +text: 'Iskratel Lumia' +type: network +icon: kontron +mib_dir: kontron +over: + - { graph: device_bits, text: 'Device Traffic' } + - { graph: device_processor, text: 'CPU Usage' } + - { graph: device_mempool, text: 'Memory Usage' } +discovery: + - + sysObjectID: + - .1.3.6.1.4.1.1332.1.1.1.10. diff --git a/resources/definitions/os_detection/jetdirect.yaml b/resources/definitions/os_detection/jetdirect.yaml index f732cf1f804..7ab7f257a6b 100644 --- a/resources/definitions/os_detection/jetdirect.yaml +++ b/resources/definitions/os_detection/jetdirect.yaml @@ -18,6 +18,9 @@ discovery: - JETDIRECT - HP ETHERNET MULTI-ENVIRONMENT - HP Laser MFP + - + sysObjectID: + - .1.3.6.1.4.1.11.2.3.9.1 - sysObjectID_regex: - '/^.1.3.6.1.4.1.11.1$/' diff --git a/resources/definitions/os_detection/juniper-mss.yaml b/resources/definitions/os_detection/juniper-mss.yaml index b93e23f1e12..810947830bb 100644 --- a/resources/definitions/os_detection/juniper-mss.yaml +++ b/resources/definitions/os_detection/juniper-mss.yaml @@ -1,6 +1,6 @@ os: juniper-mss text: 'Juniper MSS' -type: appliance +type: wireless icon: junos mib_dir: juniper over: diff --git a/resources/definitions/os_detection/junos.yaml b/resources/definitions/os_detection/junos.yaml index 8a91e65022e..aca609eaf02 100644 --- a/resources/definitions/os_detection/junos.yaml +++ b/resources/definitions/os_detection/junos.yaml @@ -9,7 +9,6 @@ over: - { graph: device_mempool, text: 'Memory Usage' } discovery_modules: slas: true - vrf: true poller_modules: slas: true discovery: diff --git a/resources/definitions/os_detection/kymata.yaml b/resources/definitions/os_detection/kymata.yaml index edb8d22325e..0917855d9cb 100644 --- a/resources/definitions/os_detection/kymata.yaml +++ b/resources/definitions/os_detection/kymata.yaml @@ -1,5 +1,5 @@ os: kymata -type: appliance +type: wireless text: 'Kymata' over: - { graph: device_dbm, text: 'Tx Power' } diff --git a/resources/definitions/os_detection/lambdatrail.yaml b/resources/definitions/os_detection/lambdatrail.yaml index 19a881c356f..cb44cb7cc89 100644 --- a/resources/definitions/os_detection/lambdatrail.yaml +++ b/resources/definitions/os_detection/lambdatrail.yaml @@ -1,6 +1,6 @@ os: lambdatrail text: 'Lambdatrail' -type: network +type: optical icon: lambdatrail group: deltanet over: diff --git a/resources/definitions/os_detection/lantronix-slc.yaml b/resources/definitions/os_detection/lantronix-slc.yaml index f13456cf98b..8100791b4d3 100644 --- a/resources/definitions/os_detection/lantronix-slc.yaml +++ b/resources/definitions/os_detection/lantronix-slc.yaml @@ -1,12 +1,11 @@ os: lantronix-slc text: 'Lantronix SLC' -type: network +type: management icon: lantronix mib_dir: lantronix over: - { graph: device_bits, text: 'Device Traffic' } - - { graph: device_processor, text: 'CPU Usage' } - - { graph: device_mempool, text: 'Memory Usage' } + - { graph: device_temperature, text: 'Temperature' } discovery: - sysObjectID: diff --git a/resources/definitions/os_detection/logmaster.yaml b/resources/definitions/os_detection/logmaster.yaml index f0eeb80a6b8..f99dcf14e1a 100644 --- a/resources/definitions/os_detection/logmaster.yaml +++ b/resources/definitions/os_detection/logmaster.yaml @@ -10,7 +10,6 @@ discovery: discovery_modules: arp-table: false bgp-peers: false - cisco-vrf-lite: false entity-physical: false ports: false ports-stack: false diff --git a/resources/definitions/os_detection/luminato.yaml b/resources/definitions/os_detection/luminato.yaml index 2e2d1c62c0d..b97ebc4bfad 100644 --- a/resources/definitions/os_detection/luminato.yaml +++ b/resources/definitions/os_detection/luminato.yaml @@ -17,7 +17,6 @@ discovery: discovery_modules: arp-table: false bgp-peers: false - cisco-vrf-lite: false ports-stack: false mempools: false discovery-protocols: false diff --git a/resources/definitions/os_detection/mediornet.yaml b/resources/definitions/os_detection/mediornet.yaml new file mode 100644 index 00000000000..c7009dfbdb4 --- /dev/null +++ b/resources/definitions/os_detection/mediornet.yaml @@ -0,0 +1,9 @@ +os: mediornet +text: 'Riedel MediorNet' +type: network +icon: riedel +mib_dir: riedel +discovery: + - + sysObjectID: + - .1.3.6.1.4.1.23056.2 diff --git a/resources/definitions/os_detection/metaview.yaml b/resources/definitions/os_detection/metaview.yaml index 3c874098e97..c1f8a503661 100644 --- a/resources/definitions/os_detection/metaview.yaml +++ b/resources/definitions/os_detection/metaview.yaml @@ -1,6 +1,6 @@ os: metaview text: 'MetaView Server' -type: appliance +type: voice icon: metaswitch over: - { graph: device_bits, text: Traffic } diff --git a/resources/definitions/os_detection/mlos-atd.yaml b/resources/definitions/os_detection/mlos-atd.yaml index a4dca9f90bd..9759e79ebaa 100644 --- a/resources/definitions/os_detection/mlos-atd.yaml +++ b/resources/definitions/os_detection/mlos-atd.yaml @@ -1,7 +1,7 @@ os: mlos-atd group: trellix text: 'McAfee Linux OS - ATD' -type: appliance +type: security icon: trellix mib_dir: trellix over: diff --git a/resources/definitions/os_detection/mlos-nsp.yaml b/resources/definitions/os_detection/mlos-nsp.yaml index df0d6e35c15..2eb23c4a1e7 100644 --- a/resources/definitions/os_detection/mlos-nsp.yaml +++ b/resources/definitions/os_detection/mlos-nsp.yaml @@ -1,7 +1,7 @@ os: mlos-nsp group: trellix text: 'McAfee Linux OS - NSP' -type: appliance +type: security icon: trellix mib_dir: trellix over: diff --git a/resources/definitions/os_detection/mobileiron.yaml b/resources/definitions/os_detection/mobileiron.yaml index a46359f3fe4..9ef758ee8b6 100644 --- a/resources/definitions/os_detection/mobileiron.yaml +++ b/resources/definitions/os_detection/mobileiron.yaml @@ -1,5 +1,5 @@ os: mobileiron -type: appliance +type: server group: unix text: MobileIron ifXmcbc: true diff --git a/resources/definitions/os_detection/montclair-edfa.yaml b/resources/definitions/os_detection/montclair-edfa.yaml index d45a30a068f..3bd6e802864 100644 --- a/resources/definitions/os_detection/montclair-edfa.yaml +++ b/resources/definitions/os_detection/montclair-edfa.yaml @@ -1,6 +1,6 @@ os: montclair-edfa text: Montclair EDFA -type: network +type: optical ifname: true empty_ifdescr: true mib_dir: montclair diff --git a/resources/definitions/os_detection/morningstar-mppt.yaml b/resources/definitions/os_detection/morningstar-mppt.yaml index b598b60c75f..10795dc7313 100644 --- a/resources/definitions/os_detection/morningstar-mppt.yaml +++ b/resources/definitions/os_detection/morningstar-mppt.yaml @@ -4,7 +4,7 @@ over: - { graph: device_temperature, text: Temperatures } - { graph: device_voltage, text: Voltages } - { graph: device_current, text: Currents } -type: appliance +type: power icon: morningstar mib_dir: morningstar discovery: diff --git a/resources/definitions/os_detection/morningstar-pwm.yaml b/resources/definitions/os_detection/morningstar-pwm.yaml index ea99f72c1d1..f44eddb77af 100644 --- a/resources/definitions/os_detection/morningstar-pwm.yaml +++ b/resources/definitions/os_detection/morningstar-pwm.yaml @@ -4,7 +4,7 @@ over: - { graph: device_temperature, text: Temperatures } - { graph: device_voltage, text: Voltages } - { graph: device_current, text: Currents } -type: appliance +type: power icon: morningstar mib_dir: morningstar discovery: diff --git a/resources/definitions/os_detection/moxa-nport.yaml b/resources/definitions/os_detection/moxa-nport.yaml index c20ff3a385f..b12b97d2018 100644 --- a/resources/definitions/os_detection/moxa-nport.yaml +++ b/resources/definitions/os_detection/moxa-nport.yaml @@ -1,6 +1,6 @@ os: moxa-nport text: Moxa -type: appliance +type: management icon: moxa over: - { graph: device_bits, text: 'Device Traffic' } diff --git a/resources/definitions/os_detection/mrv-od.yaml b/resources/definitions/os_detection/mrv-od.yaml index 6dba4ad9cdc..4e95e5956a3 100644 --- a/resources/definitions/os_detection/mrv-od.yaml +++ b/resources/definitions/os_detection/mrv-od.yaml @@ -1,6 +1,6 @@ os: mrv-od text: 'MRV OptiDriver' -type: network +type: optical icon: mrv group: mrv over: diff --git a/resources/definitions/os_detection/mrvld.yaml b/resources/definitions/os_detection/mrvld.yaml index c3f490da1b2..44ffff84d9e 100644 --- a/resources/definitions/os_detection/mrvld.yaml +++ b/resources/definitions/os_detection/mrvld.yaml @@ -1,7 +1,7 @@ os: mrvld group: mrv text: 'MRV LambdaDriver' -type: network +type: optical icon: mrv discovery: - diff --git a/resources/definitions/os_detection/neptune.yaml b/resources/definitions/os_detection/neptune.yaml index f0e7a6a54b2..67bd2de8dbe 100644 --- a/resources/definitions/os_detection/neptune.yaml +++ b/resources/definitions/os_detection/neptune.yaml @@ -1,6 +1,6 @@ os: neptune text: 'Neptune' -type: network +type: optical icon: ribbon mib_dir: ribbon over: diff --git a/resources/definitions/os_detection/netguardian.yaml b/resources/definitions/os_detection/netguardian.yaml index 0ddba19effa..2c74f54556b 100644 --- a/resources/definitions/os_detection/netguardian.yaml +++ b/resources/definitions/os_detection/netguardian.yaml @@ -1,6 +1,6 @@ os: netguardian text: 'DPS Telecom NetGuardian' -type: appliance +type: environment icon: dpstelecom group: dpstelecom over: diff --git a/resources/definitions/os_detection/netscaler-sdwan.yaml b/resources/definitions/os_detection/netscaler-sdwan.yaml index 186fe81bd8e..b1f72c96753 100644 --- a/resources/definitions/os_detection/netscaler-sdwan.yaml +++ b/resources/definitions/os_detection/netscaler-sdwan.yaml @@ -1,6 +1,6 @@ os: netscaler-sdwan text: 'NetScaler SD-WAN' -type: appliance +type: network icon: citrix group: citrix over: diff --git a/resources/definitions/os_detection/netspire.yaml b/resources/definitions/os_detection/netspire.yaml index 444273bd2a4..9edd6cedfe2 100644 --- a/resources/definitions/os_detection/netspire.yaml +++ b/resources/definitions/os_detection/netspire.yaml @@ -1,6 +1,6 @@ os: netspire text: 'Open Access Netspire' -type: appliance +type: audiovisual icon: openaccess discovery: - diff --git a/resources/definitions/os_detection/netsure.yaml b/resources/definitions/os_detection/netsure.yaml index b67487e6353..1c26118c3aa 100644 --- a/resources/definitions/os_detection/netsure.yaml +++ b/resources/definitions/os_detection/netsure.yaml @@ -30,7 +30,6 @@ discovery_modules: wireless: false fdb-table: false services: false - cisco-vrf-lite: false poller_modules: ospf: false ntp: false diff --git a/resources/definitions/os_detection/nios.yaml b/resources/definitions/os_detection/nios.yaml index 1d0f9b83708..15462301d51 100644 --- a/resources/definitions/os_detection/nios.yaml +++ b/resources/definitions/os_detection/nios.yaml @@ -1,6 +1,6 @@ os: nios text: Infoblox -type: appliance +type: network mib_dir: infoblox icon: infoblox discovery: diff --git a/resources/definitions/os_detection/nitro.yaml b/resources/definitions/os_detection/nitro.yaml index de84c8cacaa..ca6c92a3588 100644 --- a/resources/definitions/os_detection/nitro.yaml +++ b/resources/definitions/os_detection/nitro.yaml @@ -1,6 +1,6 @@ os: nitro text: 'McAfee SIEM Nitro' -type: appliance +type: security icon: mcafee over: - { graph: device_bits, text: 'Device Traffic' } diff --git a/resources/definitions/os_detection/nokia-1830.yaml b/resources/definitions/os_detection/nokia-1830.yaml index df55217298c..bfdfe58cb54 100644 --- a/resources/definitions/os_detection/nokia-1830.yaml +++ b/resources/definitions/os_detection/nokia-1830.yaml @@ -2,7 +2,7 @@ os: nokia-1830 group: nokia text: 'Nokia 1830 PSS' mib_dir: nokia/1830 -type: network +type: optical ifXmcbc: true ifname: true empty_ifdescr: true diff --git a/resources/definitions/os_detection/nti.yaml b/resources/definitions/os_detection/nti.yaml index c31771da846..776eb6cb528 100644 --- a/resources/definitions/os_detection/nti.yaml +++ b/resources/definitions/os_detection/nti.yaml @@ -1,6 +1,6 @@ os: nti text: 'NTI' -type: environment +type: environment icon: nti over: - { graph: device_processor, text: 'CPU Usage' } diff --git a/resources/definitions/os_detection/nxos.yaml b/resources/definitions/os_detection/nxos.yaml index c6d926f2f47..dc57a842f16 100644 --- a/resources/definitions/os_detection/nxos.yaml +++ b/resources/definitions/os_detection/nxos.yaml @@ -23,8 +23,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true discovery: - sysDescr: diff --git a/resources/definitions/os_detection/omnipcx.yaml b/resources/definitions/os_detection/omnipcx.yaml index 1a8bc97f28b..e4bed99eea0 100644 --- a/resources/definitions/os_detection/omnipcx.yaml +++ b/resources/definitions/os_detection/omnipcx.yaml @@ -1,7 +1,7 @@ os: omnipcx group: alcatel text: 'Alcatel OmniPCX' -type: appliance +type: voice icon: alcatellucent over: - { graph: device_bits, text: 'Device Traffic' } diff --git a/resources/definitions/os_detection/omnitron-iconverter.yaml b/resources/definitions/os_detection/omnitron-iconverter.yaml index f8162d0de4c..70bc2732a05 100644 --- a/resources/definitions/os_detection/omnitron-iconverter.yaml +++ b/resources/definitions/os_detection/omnitron-iconverter.yaml @@ -1,6 +1,6 @@ os: omnitron-iconverter text: 'Omnitron iConverter' -type: management +type: network icon: omnitron mib_dir: omnitron discovery: diff --git a/resources/definitions/os_detection/ons.yaml b/resources/definitions/os_detection/ons.yaml index 2508c15ab47..83e2a156872 100644 --- a/resources/definitions/os_detection/ons.yaml +++ b/resources/definitions/os_detection/ons.yaml @@ -20,8 +20,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true discovery: - sysDescr: diff --git a/resources/definitions/os_detection/oracle-ilom.yaml b/resources/definitions/os_detection/oracle-ilom.yaml index af77c7d060f..29d22c8c2b7 100644 --- a/resources/definitions/os_detection/oracle-ilom.yaml +++ b/resources/definitions/os_detection/oracle-ilom.yaml @@ -1,6 +1,6 @@ os: oracle-ilom text: 'Oracle ILOM' -type: appliance +type: management icon: oracle over: - { graph: device_bits, text: Traffic } diff --git a/resources/definitions/os_detection/osm.yaml b/resources/definitions/os_detection/osm.yaml index cc627931cd7..9a673ca06c5 100644 --- a/resources/definitions/os_detection/osm.yaml +++ b/resources/definitions/os_detection/osm.yaml @@ -1,6 +1,6 @@ os: osm text: 'endace OSm' -type: appliance +type: network icon: endace poller_modules: applications: false diff --git a/resources/definitions/os_detection/packetlight.yaml b/resources/definitions/os_detection/packetlight.yaml index a1fb81ab049..6484e4174a8 100644 --- a/resources/definitions/os_detection/packetlight.yaml +++ b/resources/definitions/os_detection/packetlight.yaml @@ -1,6 +1,6 @@ os: packetlight text: 'Packetlight' -type: network +type: optical icon: packetlight group: packetlight over: diff --git a/resources/definitions/os_detection/panasonic-ns.yaml b/resources/definitions/os_detection/panasonic-ns.yaml index f5ef91abdfa..e5338d04463 100644 --- a/resources/definitions/os_detection/panasonic-ns.yaml +++ b/resources/definitions/os_detection/panasonic-ns.yaml @@ -1,6 +1,6 @@ os: panasonic-ns text: 'Panasonic KX-NS Series' -type: server +type: voice icon: panasonic mib_dir: panasonic over: diff --git a/resources/definitions/os_detection/patton-sn.yaml b/resources/definitions/os_detection/patton-sn.yaml index 963cc06d99c..6aaf9fd21d6 100644 --- a/resources/definitions/os_detection/patton-sn.yaml +++ b/resources/definitions/os_detection/patton-sn.yaml @@ -1,7 +1,7 @@ os: patton-sn group: patton text: 'Patton SmartNode' -type: network +type: voice icon: patton over: - { graph: device_processor, text: 'Processor Usage' } diff --git a/resources/definitions/os_detection/pcoweb.yaml b/resources/definitions/os_detection/pcoweb.yaml index 73444f1560e..918083a8e47 100644 --- a/resources/definitions/os_detection/pcoweb.yaml +++ b/resources/definitions/os_detection/pcoweb.yaml @@ -18,3 +18,9 @@ discovery: mib_dir: carel op: '!=' value: false + - + sysObjectID_regex: '/^\.1\.3\.6\.1\.4\.1$/' + snmpget: + oid: '.1.3.6.1.4.1.9839.1.2.0' + op: '=' + value: '2' diff --git a/resources/definitions/os_detection/pixos.yaml b/resources/definitions/os_detection/pixos.yaml index 15afd726e07..2cdb8fd06f3 100644 --- a/resources/definitions/os_detection/pixos.yaml +++ b/resources/definitions/os_detection/pixos.yaml @@ -33,8 +33,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true discovery: - sysDescr: diff --git a/resources/definitions/os_detection/powercode.yaml b/resources/definitions/os_detection/powercode.yaml index bde1ecae4a8..43937c2570f 100644 --- a/resources/definitions/os_detection/powercode.yaml +++ b/resources/definitions/os_detection/powercode.yaml @@ -6,7 +6,7 @@ over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'Processor Usage' } - { graph: device_mempool, text: 'Memory Usage' } -type: server +type: network processor_stacked: true discovery: - diff --git a/resources/definitions/os_detection/primeinfrastructure.yaml b/resources/definitions/os_detection/primeinfrastructure.yaml index 1d5b6d98b22..8465f7bf1c7 100644 --- a/resources/definitions/os_detection/primeinfrastructure.yaml +++ b/resources/definitions/os_detection/primeinfrastructure.yaml @@ -19,8 +19,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true mib_dir: cisco discovery: - diff --git a/resources/definitions/os_detection/primekey-sw.yaml b/resources/definitions/os_detection/primekey-sw.yaml index 230fafe867f..59cfc936e9f 100644 --- a/resources/definitions/os_detection/primekey-sw.yaml +++ b/resources/definitions/os_detection/primekey-sw.yaml @@ -1,13 +1,12 @@ os: primekey-sw text: "Software Appliance" -type: appliance +type: security icon: primekey group: primekey mib_dir: primekey snmp_bulk: false discovery_modules: bgp-peers: false - cisco-vrf-lite: false stp: false discovery: - sysObjectID: diff --git a/resources/definitions/os_detection/primekey.yaml b/resources/definitions/os_detection/primekey.yaml index 451bddb7327..4fb9b8b7e5a 100644 --- a/resources/definitions/os_detection/primekey.yaml +++ b/resources/definitions/os_detection/primekey.yaml @@ -1,6 +1,6 @@ os: primekey text: "Hardware Appliance" -type: appliance +type: security icon: primekey group: primekey mib_dir: primekey @@ -16,7 +16,6 @@ poller_modules: mpls: false discovery_modules: bgp-peers: false - cisco-vrf-lite: false stp: false discovery: - diff --git a/resources/definitions/os_detection/prismasdwan.yaml b/resources/definitions/os_detection/prismasdwan.yaml index 90fab084ba7..d05242d7eab 100644 --- a/resources/definitions/os_detection/prismasdwan.yaml +++ b/resources/definitions/os_detection/prismasdwan.yaml @@ -1,6 +1,6 @@ os: prismasdwan text: 'Prisma SD-WAN' -type: appliance +type: network icon: panos mib_dir: paloaltonetworks over: diff --git a/resources/definitions/os_detection/profline-sfd.yaml b/resources/definitions/os_detection/profline-sfd.yaml index 24696a3e5e2..e68fdc1f3a3 100755 --- a/resources/definitions/os_detection/profline-sfd.yaml +++ b/resources/definitions/os_detection/profline-sfd.yaml @@ -1,6 +1,6 @@ os: profline-sfd text: 'PROFline SFD FM Receiver' -type: appliance +type: audiovisual icon: profline group: profline over: diff --git a/resources/definitions/os_detection/protelevision-t1.yaml b/resources/definitions/os_detection/protelevision-t1.yaml index 15e43b03ddf..72e7057b6b7 100644 --- a/resources/definitions/os_detection/protelevision-t1.yaml +++ b/resources/definitions/os_detection/protelevision-t1.yaml @@ -1,6 +1,6 @@ os: protelevision-t1 text: 'DVB-T Transmitter' -type: network +type: audiovisual icon: protelevision group: protelevision mib_dir: protelevision diff --git a/resources/definitions/os_detection/quantum.yaml b/resources/definitions/os_detection/quantum.yaml index 675b10cbad4..be440d6eaff 100644 --- a/resources/definitions/os_detection/quantum.yaml +++ b/resources/definitions/os_detection/quantum.yaml @@ -1,5 +1,5 @@ os: quantum -type: server +type: storage text: Quantum mib_dir: adic ifXmcbc: true diff --git a/resources/definitions/os_detection/rajant.yaml b/resources/definitions/os_detection/rajant.yaml index 6cca931d7e7..02db65468ff 100644 --- a/resources/definitions/os_detection/rajant.yaml +++ b/resources/definitions/os_detection/rajant.yaml @@ -1,6 +1,6 @@ os: rajant text: 'Rajant Breadcrumb' -type: network +type: wireless icon: rajant group: rajant ifname: true diff --git a/resources/definitions/os_detection/raritan-kvm.yaml b/resources/definitions/os_detection/raritan-kvm.yaml index 3c18e1cb37f..5224d32123f 100644 --- a/resources/definitions/os_detection/raritan-kvm.yaml +++ b/resources/definitions/os_detection/raritan-kvm.yaml @@ -1,6 +1,6 @@ os: raritan-kvm text: 'Raritan KVM' -type: appliance +type: management over: - { graph: device_bits, text: 'Device Traffic' } mib_dir: raritan diff --git a/resources/definitions/os_detection/sanos.yaml b/resources/definitions/os_detection/sanos.yaml index 792bc5f7d24..c101449a9c7 100644 --- a/resources/definitions/os_detection/sanos.yaml +++ b/resources/definitions/os_detection/sanos.yaml @@ -21,8 +21,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true discovery: - sysDescr: diff --git a/resources/definitions/os_detection/scopia.yaml b/resources/definitions/os_detection/scopia.yaml index 1782406e5b2..8fdd8dec697 100644 --- a/resources/definitions/os_detection/scopia.yaml +++ b/resources/definitions/os_detection/scopia.yaml @@ -1,6 +1,6 @@ os: scopia text: 'Avaya Scopia' -type: appliance +type: collaboration icon: avaya over: - { graph: device_bits, text: 'Device Traffic' } diff --git a/resources/definitions/os_detection/scs-ks.yaml b/resources/definitions/os_detection/scs-ks.yaml index 7d0eacca761..b1237b1ea30 100644 --- a/resources/definitions/os_detection/scs-ks.yaml +++ b/resources/definitions/os_detection/scs-ks.yaml @@ -27,7 +27,6 @@ discovery_modules: entity-physical: true processors: true mempools: true - cisco-vrf-lite: false ipv4-addresses: true ipv6-addresses: true storage: false diff --git a/resources/definitions/os_detection/seh-uds.yaml b/resources/definitions/os_detection/seh-uds.yaml index 3994c9cc8e1..cd2651c2714 100644 --- a/resources/definitions/os_detection/seh-uds.yaml +++ b/resources/definitions/os_detection/seh-uds.yaml @@ -1,6 +1,6 @@ os: seh-uds text: 'SEH' -type: appliance +type: management icon: seh mib_dir: seh discovery: diff --git a/resources/definitions/os_detection/sensatronics-em1.yaml b/resources/definitions/os_detection/sensatronics-em1.yaml index 6edc24d2201..2bd58bcf52c 100644 --- a/resources/definitions/os_detection/sensatronics-em1.yaml +++ b/resources/definitions/os_detection/sensatronics-em1.yaml @@ -1,6 +1,6 @@ os: sensatronics-em1 text: 'Sensatronics EM1' -type: sensor +type: environment icon: sensatronics over: - { graph: device_temperature, text: 'Temperature' } diff --git a/resources/definitions/os_detection/sentry3.yaml b/resources/definitions/os_detection/sentry3.yaml index 1d187b6fba3..4ed2b38eb6c 100644 --- a/resources/definitions/os_detection/sentry3.yaml +++ b/resources/definitions/os_detection/sentry3.yaml @@ -15,7 +15,6 @@ poller_modules: ospf: false stp: false discovery_modules: - cisco-vrf-lite: false discovery-protocols: false arp-table: false bgp-peers: false diff --git a/resources/definitions/os_detection/sentry4.yaml b/resources/definitions/os_detection/sentry4.yaml index 0ea7adf0035..8286dcad000 100644 --- a/resources/definitions/os_detection/sentry4.yaml +++ b/resources/definitions/os_detection/sentry4.yaml @@ -15,7 +15,6 @@ poller_modules: ospf: false stp: false discovery_modules: - cisco-vrf-lite: false discovery-protocols: false arp-table: false bgp-peers: false diff --git a/resources/definitions/os_detection/siteboss.yaml b/resources/definitions/os_detection/siteboss.yaml index f6b7d2c1763..ff6bed9a018 100644 --- a/resources/definitions/os_detection/siteboss.yaml +++ b/resources/definitions/os_detection/siteboss.yaml @@ -1,6 +1,6 @@ os: siteboss text: 'Asentria SiteBoss' -type: server +type: environment icon: siteboss group: asentria mib_dir: asentria diff --git a/resources/definitions/os_detection/siteboss360.yaml b/resources/definitions/os_detection/siteboss360.yaml index 784b6139041..b9cb5cb3a08 100644 --- a/resources/definitions/os_detection/siteboss360.yaml +++ b/resources/definitions/os_detection/siteboss360.yaml @@ -1,6 +1,6 @@ os: siteboss360 text: 'Asentria SiteBoss' -type: server +type: environment icon: siteboss group: asentria mib_dir: asentria diff --git a/resources/definitions/os_detection/siteboss550.yaml b/resources/definitions/os_detection/siteboss550.yaml index 2157e0188fa..c532aec1db7 100644 --- a/resources/definitions/os_detection/siteboss550.yaml +++ b/resources/definitions/os_detection/siteboss550.yaml @@ -1,6 +1,6 @@ os: siteboss550 text: 'Asentria SiteBoss' -type: server +type: environment icon: siteboss group: asentria mib_dir: asentria diff --git a/resources/definitions/os_detection/siteboss571.yaml b/resources/definitions/os_detection/siteboss571.yaml index c6445c000a8..f6721f99f9e 100644 --- a/resources/definitions/os_detection/siteboss571.yaml +++ b/resources/definitions/os_detection/siteboss571.yaml @@ -1,6 +1,6 @@ os: siteboss571 text: 'Asentria SiteBoss' -type: power +type: environment icon: siteboss group: asentria mib_dir: asentria diff --git a/resources/definitions/os_detection/siteboss572.yaml b/resources/definitions/os_detection/siteboss572.yaml index 7a966d27984..13db6d50682 100644 --- a/resources/definitions/os_detection/siteboss572.yaml +++ b/resources/definitions/os_detection/siteboss572.yaml @@ -1,6 +1,6 @@ os: siteboss572 text: 'Asentria SiteBoss' -type: power +type: environment icon: siteboss group: asentria mib_dir: asentria diff --git a/resources/definitions/os_detection/sitemonitor.yaml b/resources/definitions/os_detection/sitemonitor.yaml index 361a50a75ac..d2b5eb2307d 100644 --- a/resources/definitions/os_detection/sitemonitor.yaml +++ b/resources/definitions/os_detection/sitemonitor.yaml @@ -1,6 +1,6 @@ os: sitemonitor text: 'Packetflux SiteMonitor' -type: appliance +type: environment icon: packetflux over: - { graph: device_poller_perf, text: 'Poller time' } diff --git a/resources/definitions/os_detection/sitemonitor3.yaml b/resources/definitions/os_detection/sitemonitor3.yaml index 458c09829ea..30de8c99de5 100644 --- a/resources/definitions/os_detection/sitemonitor3.yaml +++ b/resources/definitions/os_detection/sitemonitor3.yaml @@ -1,6 +1,6 @@ os: sitemonitor3 text: 'Packetflux SiteMonitor Base 3' -type: appliance +type: environment icon: packetflux over: - { graph: device_voltage, text: 'Voltage' } diff --git a/resources/definitions/os_detection/smartos-dcp-m.yaml b/resources/definitions/os_detection/smartos-dcp-m.yaml index 65c554ed4ef..42e9858b754 100644 --- a/resources/definitions/os_detection/smartos-dcp-m.yaml +++ b/resources/definitions/os_detection/smartos-dcp-m.yaml @@ -1,6 +1,6 @@ os: smartos-dcp-m text: 'SmartOptics DCP-M Series' -type: network +type: optical icon: smartoptics group: smartoptics mib_dir: smartoptics diff --git a/resources/definitions/os_detection/smartos-t.yaml b/resources/definitions/os_detection/smartos-t.yaml index b257bd9be4d..8995c1660f1 100644 --- a/resources/definitions/os_detection/smartos-t.yaml +++ b/resources/definitions/os_detection/smartos-t.yaml @@ -1,6 +1,6 @@ os: smartos-t text: 'SmartOptics T-Series' -type: network +type: optical icon: smartoptics group: smartoptics mib_dir: smartoptics diff --git a/resources/definitions/os_detection/smartos.yaml b/resources/definitions/os_detection/smartos.yaml index 718a439a1b0..32074272399 100644 --- a/resources/definitions/os_detection/smartos.yaml +++ b/resources/definitions/os_detection/smartos.yaml @@ -1,6 +1,6 @@ os: smartos text: 'SmartOptics M-Series' -type: network +type: optical icon: smartoptics group: smartoptics mib_dir: smartoptics diff --git a/resources/definitions/os_detection/snr.yaml b/resources/definitions/os_detection/snr.yaml index 1538774d55f..b8a2f3c3da6 100644 --- a/resources/definitions/os_detection/snr.yaml +++ b/resources/definitions/os_detection/snr.yaml @@ -4,6 +4,7 @@ type: network icon: snr group: snr mib_dir: snr +ifname: true over: - { graph: device_bits, text: 'Device Traffic' } - { graph: device_processor, text: 'CPU Usage' } @@ -13,3 +14,4 @@ discovery: sysObjectID: - .1.3.6.1.4.1.40418.7 - .1.3.6.1.4.1.40418.8.67 + - .1.3.6.1.4.1.57206.1 diff --git a/resources/definitions/os_detection/solidserver.yaml b/resources/definitions/os_detection/solidserver.yaml index e8fe4b9a76a..0108350d2d3 100644 --- a/resources/definitions/os_detection/solidserver.yaml +++ b/resources/definitions/os_detection/solidserver.yaml @@ -1,6 +1,6 @@ os: solidserver text: EfficientIP SOLIDserver -type: server +type: network icon: eip over: - { graph: device_bits, text: 'Device Traffic' } diff --git a/resources/definitions/os_detection/sonus-gsx.yaml b/resources/definitions/os_detection/sonus-gsx.yaml index 2e78e571e78..b3ba71088e0 100644 --- a/resources/definitions/os_detection/sonus-gsx.yaml +++ b/resources/definitions/os_detection/sonus-gsx.yaml @@ -1,6 +1,6 @@ os: sonus-gsx text: 'Ribbon GSX' -type: appliance +type: voice icon: ribbon discovery: - diff --git a/resources/definitions/os_detection/sonus-sbc.yaml b/resources/definitions/os_detection/sonus-sbc.yaml index 3665cb4e5e9..835d4bd2b27 100644 --- a/resources/definitions/os_detection/sonus-sbc.yaml +++ b/resources/definitions/os_detection/sonus-sbc.yaml @@ -1,6 +1,6 @@ os: sonus-sbc text: 'Ribbon SBC' -type: appliance +type: voice icon: ribbon discovery: - diff --git a/resources/definitions/os_detection/sophos-xg.yaml b/resources/definitions/os_detection/sophos-xg.yaml index 0d52bd3f0cf..bab1cb784a5 100644 --- a/resources/definitions/os_detection/sophos-xg.yaml +++ b/resources/definitions/os_detection/sophos-xg.yaml @@ -1,6 +1,6 @@ os: sophos-xg text: 'Sophos XG' -type: appliance +type: firewall icon: sophos-xg group: sophos mib_dir: sophos diff --git a/resources/definitions/os_detection/srlinux.yaml b/resources/definitions/os_detection/srlinux.yaml index dc0fd991454..db0ab591d4b 100644 --- a/resources/definitions/os_detection/srlinux.yaml +++ b/resources/definitions/os_detection/srlinux.yaml @@ -16,7 +16,5 @@ discovery: - .1.3.6.1.4.1.6527.1.20. discovery_modules: bgp-peers: true - vrf: true - cisco-vrf-lite: false poller_modules: bgp-peers: true diff --git a/resources/definitions/os_detection/ssu2000.yaml b/resources/definitions/os_detection/ssu2000.yaml index eddf21b1043..c2ca3bdfae1 100644 --- a/resources/definitions/os_detection/ssu2000.yaml +++ b/resources/definitions/os_detection/ssu2000.yaml @@ -1,6 +1,6 @@ os: ssu2000 text: 'Microsemi Synchronization Supply Unit' -type: appliance +type: timing icon: microsemi mib_dir: microsemi discovery: @@ -24,7 +24,6 @@ discovery_modules: wireless: false fdb-table: false services: false - cisco-vrf-lite: false ucd-mib: false applications: false poller_modules: @@ -44,6 +43,5 @@ poller_modules: wireless: false fdb-table: false services: false - cisco-vrf-lite: false applications: false ospf: false diff --git a/resources/definitions/os_detection/stulz.yaml b/resources/definitions/os_detection/stulz.yaml index 7e3de467df5..fc94c1f3826 100644 --- a/resources/definitions/os_detection/stulz.yaml +++ b/resources/definitions/os_detection/stulz.yaml @@ -7,7 +7,6 @@ over: discovery_modules: arp-table: false bgp-peers: false - cisco-vrf-lite: false discovery-protocols: false fdb-table: false hr-device: false diff --git a/resources/definitions/os_detection/supermicro-bmc.yaml b/resources/definitions/os_detection/supermicro-bmc.yaml index 78eb74180a9..1659089b35f 100644 --- a/resources/definitions/os_detection/supermicro-bmc.yaml +++ b/resources/definitions/os_detection/supermicro-bmc.yaml @@ -1,6 +1,6 @@ os: supermicro-bmc text: 'Supermicro BMC' -type: appliance +type: management icon: supermicro snmp_bulk: false mib_dir: supermicro diff --git a/resources/definitions/os_detection/supervyse-openbmc.yaml b/resources/definitions/os_detection/supervyse-openbmc.yaml index 51fbcc61d8c..92936b56adf 100644 --- a/resources/definitions/os_detection/supervyse-openbmc.yaml +++ b/resources/definitions/os_detection/supervyse-openbmc.yaml @@ -1,6 +1,6 @@ os: supervyse-openbmc text: 'Supervyse OpenBMC' -type: appliance +type: management icon: supervyse-openbmc mib_dir: supervyse-openbmc over: diff --git a/resources/definitions/os_detection/televes-fs.yaml b/resources/definitions/os_detection/televes-fs.yaml index f545eaf5eb6..32e0618f1d0 100644 --- a/resources/definitions/os_detection/televes-fs.yaml +++ b/resources/definitions/os_detection/televes-fs.yaml @@ -1,6 +1,6 @@ os: televes-fs text: 'Fourth Series [TRedess]' -type: appliance +type: audiovisual icon: tredess group: tredess over: diff --git a/resources/definitions/os_detection/terra-receivers.yaml b/resources/definitions/os_detection/terra-receivers.yaml index 188f55fd928..7ec60b551c9 100644 --- a/resources/definitions/os_detection/terra-receivers.yaml +++ b/resources/definitions/os_detection/terra-receivers.yaml @@ -1,6 +1,6 @@ os: terra-receivers text: Terra -type: appliance +type: audiovisual group: terra icon: terra mib_dir: terra diff --git a/resources/definitions/os_detection/timos.yaml b/resources/definitions/os_detection/timos.yaml index b85d725a749..d5edfc99a1e 100644 --- a/resources/definitions/os_detection/timos.yaml +++ b/resources/definitions/os_detection/timos.yaml @@ -14,7 +14,5 @@ discovery: discovery_modules: fdb-table: true bgp-peers: true - vrf: true - cisco-vrf-lite: false poller_modules: bgp-peers: true diff --git a/resources/definitions/os_detection/tpconductor.yaml b/resources/definitions/os_detection/tpconductor.yaml index 60b154db02f..60ba308fbbc 100644 --- a/resources/definitions/os_detection/tpconductor.yaml +++ b/resources/definitions/os_detection/tpconductor.yaml @@ -14,8 +14,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true mib_dir: cisco discovery: - diff --git a/resources/definitions/os_detection/tpdin.yaml b/resources/definitions/os_detection/tpdin.yaml index f27206b65fe..388c9a14a94 100644 --- a/resources/definitions/os_detection/tpdin.yaml +++ b/resources/definitions/os_detection/tpdin.yaml @@ -1,6 +1,6 @@ os: tpdin text: 'Tycon Systems TPDIN' -type: appliance +type: power icon: tyconsystems over: - { graph: device_voltage, text: 'Device Voltage' } diff --git a/resources/definitions/os_detection/trippliteconsole.yaml b/resources/definitions/os_detection/trippliteconsole.yaml index ba9505d2bef..9cba1af9e7f 100644 --- a/resources/definitions/os_detection/trippliteconsole.yaml +++ b/resources/definitions/os_detection/trippliteconsole.yaml @@ -1,6 +1,6 @@ os: trippliteconsole text: 'TrippLite console server' -type: appliance +type: management icon: tripplite group: tripplite over: diff --git a/resources/definitions/os_detection/ucos.yaml b/resources/definitions/os_detection/ucos.yaml index e47e64b7aae..279050b5deb 100644 --- a/resources/definitions/os_detection/ucos.yaml +++ b/resources/definitions/os_detection/ucos.yaml @@ -1,6 +1,6 @@ os: ucos text: 'Cisco Unified Communications Manager' -type: collaboration +type: voice icon: cisco over: - { graph: device_bits, text: 'Device Traffic' } @@ -18,8 +18,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true mib_dir: cisco discovery: - diff --git a/resources/definitions/os_detection/uniping.yaml b/resources/definitions/os_detection/uniping.yaml index de1ca3ecdf2..caa31b7c387 100644 --- a/resources/definitions/os_detection/uniping.yaml +++ b/resources/definitions/os_detection/uniping.yaml @@ -1,6 +1,6 @@ os: uniping text: UniPing -type: environmental +type: environment icon: netping group: netping snmp_bulk: false diff --git a/resources/definitions/os_detection/univerge.yaml b/resources/definitions/os_detection/univerge.yaml index 1dbeec865a1..ed925e60fb5 100644 --- a/resources/definitions/os_detection/univerge.yaml +++ b/resources/definitions/os_detection/univerge.yaml @@ -1,6 +1,6 @@ os: univerge text: 'NEC Univerge' -type: appliance +type: voice over: - { graph: device_bits, text: 'Device Traffic' } icon: nec diff --git a/resources/definitions/os_detection/vccodec.yaml b/resources/definitions/os_detection/vccodec.yaml index 3764c129dcb..0b969b5c7dc 100644 --- a/resources/definitions/os_detection/vccodec.yaml +++ b/resources/definitions/os_detection/vccodec.yaml @@ -14,8 +14,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true mib_dir: cisco discovery: - diff --git a/resources/definitions/os_detection/vcs.yaml b/resources/definitions/os_detection/vcs.yaml index a21285a1306..29a6b6ee847 100644 --- a/resources/definitions/os_detection/vcs.yaml +++ b/resources/definitions/os_detection/vcs.yaml @@ -14,8 +14,6 @@ discovery_modules: slas: true cisco-otv: true cisco-pw: true - vrf: true - cisco-vrf-lite: true mib_dir: cisco discovery: - diff --git a/resources/definitions/os_detection/vega.yaml b/resources/definitions/os_detection/vega.yaml index 91b4d91b6cd..127aabf9182 100644 --- a/resources/definitions/os_detection/vega.yaml +++ b/resources/definitions/os_detection/vega.yaml @@ -1,6 +1,6 @@ os: vega text: 'Sangoma Vega' -type: network +type: voice icon: sangoma mib_dir: sangoma discovery: diff --git a/resources/definitions/os_detection/velocloud.yaml b/resources/definitions/os_detection/velocloud.yaml index 9aa738e268c..9da187e4c25 100644 --- a/resources/definitions/os_detection/velocloud.yaml +++ b/resources/definitions/os_detection/velocloud.yaml @@ -1,6 +1,6 @@ os: velocloud text: 'VMware SD-WAN' -type: appliance +type: network icon: velocloud mib_dir: vmware over: diff --git a/resources/definitions/os_detection/vigintos.yaml b/resources/definitions/os_detection/vigintos.yaml index 8a3f812c822..2adde66699e 100644 --- a/resources/definitions/os_detection/vigintos.yaml +++ b/resources/definitions/os_detection/vigintos.yaml @@ -1,6 +1,6 @@ os: vigintos text: 'DVB Modulator & Ampiflier' -type: network +type: audiovisual icon: vigintos group: vigintos mib_dir: vigintos diff --git a/resources/definitions/os_detection/vivotek.yaml b/resources/definitions/os_detection/vivotek.yaml index 74c4371ad89..28b77305d15 100644 --- a/resources/definitions/os_detection/vivotek.yaml +++ b/resources/definitions/os_detection/vivotek.yaml @@ -1,6 +1,6 @@ os: vivotek text: 'Vivotek Camera' -type: camera +type: surveillance over: - { graph: device_bits, text: 'Device Traffic' } discovery: diff --git a/resources/definitions/os_detection/vos.yaml b/resources/definitions/os_detection/vos.yaml index 32c568c824b..613b57b4e35 100644 --- a/resources/definitions/os_detection/vos.yaml +++ b/resources/definitions/os_detection/vos.yaml @@ -10,5 +10,3 @@ discovery: - sysDescr: - 'Versa Appliance' -discovery_modules: - vrf: true diff --git a/resources/definitions/os_detection/waas.yaml b/resources/definitions/os_detection/waas.yaml index 852c13b5c97..e7929c92e3d 100644 --- a/resources/definitions/os_detection/waas.yaml +++ b/resources/definitions/os_detection/waas.yaml @@ -29,7 +29,6 @@ discovery_modules: cisco-otv: false cisco-pw: false slas: false - cisco-vrf-lite: false vrf: false ntp: false stp: false diff --git a/resources/definitions/os_detection/wiseway.yaml b/resources/definitions/os_detection/wiseway.yaml new file mode 100644 index 00000000000..f451f33b740 --- /dev/null +++ b/resources/definitions/os_detection/wiseway.yaml @@ -0,0 +1,12 @@ +os: wiseway +text: 'Wiseway UPS adapter' +type: power +rfc1628_compat: true +over: + - { graph: device_load, text: Load } + - { graph: device_voltage, text: Voltage } + - { graph: device_current, text: Current } +discovery: + - + sysDescr: + - 'Wiseway network adapter' diff --git a/resources/definitions/os_detection/wti-console.yaml b/resources/definitions/os_detection/wti-console.yaml index f729f43a976..29aa91cd2cf 100644 --- a/resources/definitions/os_detection/wti-console.yaml +++ b/resources/definitions/os_detection/wti-console.yaml @@ -1,6 +1,6 @@ os: wti-console text: 'WTI CONSOLE' -type: appliance +type: management icon: wti group: wti mib_dir: wti diff --git a/resources/definitions/os_detection/xclarity.yaml b/resources/definitions/os_detection/xclarity.yaml index bb5b0147762..5d222327c10 100644 --- a/resources/definitions/os_detection/xclarity.yaml +++ b/resources/definitions/os_detection/xclarity.yaml @@ -1,6 +1,6 @@ os: xclarity text: 'Lenovo XCC IMPI' -type: appliance +type: management icon: lenovo discovery: - diff --git a/resources/definitions/os_detection/zenitel-alphacom.yaml b/resources/definitions/os_detection/zenitel-alphacom.yaml index 2b9a49c1367..56031a09096 100644 --- a/resources/definitions/os_detection/zenitel-alphacom.yaml +++ b/resources/definitions/os_detection/zenitel-alphacom.yaml @@ -1,6 +1,6 @@ os: zenitel-alphacom text: 'AlphaCom' -type: server +type: voice icon: zenitel mib_dir: zenitel over: diff --git a/resources/definitions/os_detection/zenitel-ipstation.yaml b/resources/definitions/os_detection/zenitel-ipstation.yaml index 965f2da53c8..17b142de092 100644 --- a/resources/definitions/os_detection/zenitel-ipstation.yaml +++ b/resources/definitions/os_detection/zenitel-ipstation.yaml @@ -1,6 +1,6 @@ os: zenitel-ipstation text: 'IPStation' -type: appliance +type: voice icon: zenitel mib_dir: zenitel snmp_bulk: false diff --git a/resources/definitions/os_detection/zenitel-vsdevice.yaml b/resources/definitions/os_detection/zenitel-vsdevice.yaml index c9f14366d59..76da87071a9 100644 --- a/resources/definitions/os_detection/zenitel-vsdevice.yaml +++ b/resources/definitions/os_detection/zenitel-vsdevice.yaml @@ -1,6 +1,6 @@ os: zenitel-vsdevice text: 'VS Device' -type: appliance +type: voice icon: zenitel mib_dir: zenitel over: diff --git a/resources/definitions/os_detection/zscaler.yaml b/resources/definitions/os_detection/zscaler.yaml new file mode 100644 index 00000000000..6adba15e1e7 --- /dev/null +++ b/resources/definitions/os_detection/zscaler.yaml @@ -0,0 +1,17 @@ +os: zscaler +text: 'ZscalerOS' +type: security +group: unix +mib_dir: zscaler +processor_stacked: true +over: + - { graph: device_processor, text: 'Processor Usage' } + - { graph: device_mempool, text: 'Memory Usage' } + - { graph: device_storage, text: 'Storage Usage' } +discovery: + - + sysDescr: 'ZscalerOS ' + sysObjectID: .1.3.6.1.4.1.8072.3.2.8 + - + sysDescr: 'Linux zpa-service-edge ' + sysObjectID: .1.3.6.1.4.1.8072.3.2.10 diff --git a/resources/definitions/os_detection/zyxelnwa.yaml b/resources/definitions/os_detection/zyxelnwa.yaml index 7abb076554c..0393b47a788 100644 --- a/resources/definitions/os_detection/zyxelnwa.yaml +++ b/resources/definitions/os_detection/zyxelnwa.yaml @@ -1,7 +1,7 @@ os: zyxelnwa text: 'ZyXEL NWA' group: zyxel -type: network +type: wireless icon: zyxel discovery: - diff --git a/resources/definitions/os_discovery/3com.yaml b/resources/definitions/os_discovery/3com.yaml index ffdb5f9810d..bc729a83c17 100644 --- a/resources/definitions/os_discovery/3com.yaml +++ b/resources/definitions/os_discovery/3com.yaml @@ -10,4 +10,3 @@ modules: - oid: A3COM-HUAWEI-LswDEVM-MIB::hwCpuCostRatePer1Min num_oid: '.1.3.6.1.4.1.43.45.1.6.1.1.1.3.{{ $index }}' - index: 0 diff --git a/resources/definitions/os_discovery/adva_fsp150.yaml b/resources/definitions/os_discovery/adva_fsp150.yaml index e37bafc0c20..6b94657db57 100644 --- a/resources/definitions/os_discovery/adva_fsp150.yaml +++ b/resources/definitions/os_discovery/adva_fsp150.yaml @@ -12,6 +12,8 @@ modules: - oid: - CM-FACILITY-MIB::cmEthernetTrafficPortIndex + - CM-ENTITY-MIB::slotCardUnitName + - CM-ENTITY-MIB::slotIndex state: data: - @@ -143,3 +145,411 @@ modules: states: - { value: 1, generic: 0, descr: 'normal' } - { value: 2, generic: 2, descr: 'outage' } + voltage: + data: + - + oid: CM-ENTITY-MIB::psuTable + value: CM-ENTITY-MIB::psuOutputVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.4.1.6.{{ $index }}' + index: 'psuOutputVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::scuTable + value: CM-ENTITY-MIB::scuVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.6.1.5.{{ $index }}' + index: 'scuVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::nemiTable + value: CM-ENTITY-MIB::nemiVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.7.1.5.{{ $index }}' + index: 'nemiVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTUCardTable + value: CM-ENTITY-MIB::ethernetNTUCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.8.1.5.{{ $index }}' + index: 'ethernetNTUCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetCPMRCardTable + value: CM-ENTITY-MIB::ethernetCPMRCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.9.1.5.{{ $index }}' + index: 'ethernetCPMRCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE101CardTable + value: CM-ENTITY-MIB::ethernetNTEGE101CardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.10.1.5.{{ $index }}' + index: 'ethernetNTEGE101CardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE206CardTable + value: CM-ENTITY-MIB::ethernetNTEGE206CardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.11.1.5.{{ $index }}' + index: 'ethernetNTEGE206CardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::scuTTable + value: CM-ENTITY-MIB::scuTVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.13.1.5.{{ $index }}' + index: 'scuTVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTECardTable + value: CM-ENTITY-MIB::ethernetNTECardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.14.1.5.{{ $index }}' + index: 'ethernetNTECardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE201CardTable + value: CM-ENTITY-MIB::ethernetNTEGE201CardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.15.1.5.{{ $index }}' + index: 'ethernetNTEGE201CardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE201SyncECardTable + value: CM-ENTITY-MIB::ethernetNTEGE201SyncECardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.16.1.5.{{ $index }}' + index: 'ethernetNTEGE201SyncECardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE206FCardTable + value: CM-ENTITY-MIB::ethernetNTEGE206FCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.17.1.5.{{ $index }}' + index: 'ethernetNTEGE206FCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE112CardTable + value: CM-ENTITY-MIB::ethernetNTEGE112CardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.25.1.5.{{ $index }}' + index: 'ethernetNTEGE112CardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE114CardTable + value: CM-ENTITY-MIB::ethernetNTEGE114CardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.26.1.5.{{ $index }}' + index: 'ethernetNTEGE114CardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE206VCardTable + value: CM-ENTITY-MIB::ethernetNTEGE206VCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.27.1.5.{{ $index }}' + index: 'ethernetNTEGE206VCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetGE4SCCCardTable + value: CM-ENTITY-MIB::ethernetGE4SCCCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.28.1.5.{{ $index }}' + index: 'ethernetGE4SCCCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetGE4ECCCardTable + value: CM-ENTITY-MIB::ethernetGE4ECCCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.29.1.5.{{ $index }}' + index: 'ethernetGE4ECCCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEXG210CardTable + value: CM-ENTITY-MIB::ethernetNTEXG210CardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.30.1.5.{{ $index }}' + index: 'ethernetNTEXG210CardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetXG1XCCCardTable + value: CM-ENTITY-MIB::ethernetXG1XCCCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.31.1.5.{{ $index }}' + index: 'ethernetXG1XCCCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetXG1SCCCardTable + value: CM-ENTITY-MIB::ethernetXG1SCCCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.32.1.5.{{ $index }}' + index: 'ethernetXG1SCCCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTET1804CardTable + value: CM-ENTITY-MIB::ethernetNTET1804CardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.38.1.5.{{ $index }}' + index: 'ethernetNTET1804CardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTET3204CardTable + value: CM-ENTITY-MIB::ethernetNTET3204CardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.39.1.5.{{ $index }}' + index: 'ethernetNTET3204CardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetGE8SCCCardTable + value: CM-ENTITY-MIB::ethernetGE8SCCCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.41.1.5.{{ $index }}' + index: 'ethernetGE8SCCCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE114HCardTable + value: CM-ENTITY-MIB::ethernetNTEGE114HCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.42.1.5.{{ $index }}' + index: 'ethernetNTEGE114HCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE114PHCardTable + value: CM-ENTITY-MIB::ethernetNTEGE114PHCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.43.1.5.{{ $index }}' + index: 'ethernetNTEGE114PHCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE114SHCardTable + value: CM-ENTITY-MIB::ethernetNTEGE114SHCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.45.1.5.{{ $index }}' + index: 'ethernetNTEGE114SHCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE114SCardTable + value: CM-ENTITY-MIB::ethernetNTEGE114SCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.46.1.5.{{ $index }}' + index: 'ethernetNTEGE114SCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetGE8ECCCardTable + value: CM-ENTITY-MIB::ethernetGE8ECCCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.49.1.5.{{ $index }}' + index: 'ethernetGE8ECCCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE112ProCardTable + value: CM-ENTITY-MIB::ethernetNTEGE112ProCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.53.1.5.{{ $index }}' + index: 'ethernetNTEGE112ProCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE112ProMCardTable + value: CM-ENTITY-MIB::ethernetNTEGE112ProMCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.54.1.5.{{ $index }}' + index: 'ethernetNTEGE112ProMCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEXG210CCardTable + value: CM-ENTITY-MIB::ethernetNTEXG210CCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.55.1.5.{{ $index }}' + index: 'ethernetNTEXG210CCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetGE8SCryptoConnectorCardTable + value: CM-ENTITY-MIB::ethernetGE8SCryptoConnectorCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.56.1.5.{{ $index }}' + index: 'ethernetGE8SCryptoConnectorCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE114ProCardTable + value: CM-ENTITY-MIB::ethernetNTEGE114ProCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.57.1.5.{{ $index }}' + index: 'ethernetNTEGE114ProCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE114ProCCardTable + value: CM-ENTITY-MIB::ethernetNTEGE114ProCCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.58.1.5.{{ $index }}' + index: 'ethernetNTEGE114ProCCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE114ProSHCardTable + value: CM-ENTITY-MIB::ethernetNTEGE114ProSHCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.59.1.5.{{ $index }}' + index: 'ethernetNTEGE114ProSHCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE114ProCSHCardTable + value: CM-ENTITY-MIB::ethernetNTEGE114ProCSHCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.60.1.5.{{ $index }}' + index: 'ethernetNTEGE114ProCSHCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE114ProHECardTable + value: CM-ENTITY-MIB::ethernetNTEGE114ProHECardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.61.1.5.{{ $index }}' + index: 'ethernetNTEGE114ProHECardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE112ProHCardTable + value: CM-ENTITY-MIB::ethernetNTEGE112ProHCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.62.1.5.{{ $index }}' + index: 'ethernetNTEGE112ProHCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE114ProVmHCardTable + value: CM-ENTITY-MIB::ethernetNTEGE114ProVmHCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.67.1.5.{{ $index }}' + index: 'ethernetNTEGE114ProVmHCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE114ProVmCHCardTable + value: CM-ENTITY-MIB::ethernetNTEGE114ProVmCHCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.68.1.5.{{ $index }}' + index: 'ethernetNTEGE114ProVmCHCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE114ProVmCSHCardTable + value: CM-ENTITY-MIB::ethernetNTEGE114ProVmCSHCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.69.1.5.{{ $index }}' + index: 'ethernetNTEGE114ProVmCSHCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::serverCardTable + value: CM-ENTITY-MIB::serverCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.70.1.6.{{ $index }}' + index: 'serverCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE101ProCardTable + value: CM-ENTITY-MIB::ethernetNTEGE101ProCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.74.1.5.{{ $index }}' + index: 'ethernetNTEGE101ProCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGO102ProSCardTable + value: CM-ENTITY-MIB::ethernetNTEGO102ProSCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.75.1.5.{{ $index }}' + index: 'ethernetNTEGO102ProSCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGO102ProSPCardTable + value: CM-ENTITY-MIB::ethernetNTEGO102ProSPCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.76.1.5.{{ $index }}' + index: 'ethernetNTEGO102ProSPCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEXG116PROCardTable + value: CM-ENTITY-MIB::ethernetNTEXG116PROCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.80.1.5.{{ $index }}' + index: 'ethernetNTEXG116PROCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEXG120PROCardTable + value: CM-ENTITY-MIB::ethernetNTEXG120PROCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.81.1.5.{{ $index }}' + index: 'ethernetNTEXG120PROCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE112ProVmCardTable + value: CM-ENTITY-MIB::ethernetNTEGE112ProVmCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.82.1.5.{{ $index }}' + index: 'ethernetNTEGE112ProVmCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetCSMCardTable + value: CM-ENTITY-MIB::ethernetCSMCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.85.1.5.{{ $index }}' + index: 'ethernetCSMCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE102ProHCardTable + value: CM-ENTITY-MIB::ethernetNTEGE102ProHCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.88.1.5.{{ $index }}' + index: 'ethernetNTEGE102ProHCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE102ProEFMHCardTable + value: CM-ENTITY-MIB::ethernetNTEGE102ProEFMHCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.89.1.5.{{ $index }}' + index: 'ethernetNTEGE102ProEFMHCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEXG116PROHCardTable + value: CM-ENTITY-MIB::ethernetNTEXG116PROHCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.91.1.5.{{ $index }}' + index: 'ethernetNTEXG116PROHCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGO102ProSMCardTable + value: CM-ENTITY-MIB::ethernetNTEGO102ProSMCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.92.1.5.{{ $index }}' + index: 'ethernetNTEGO102ProSMCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEXG118PROSHCardTable + value: CM-ENTITY-MIB::ethernetNTEXG118PROSHCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.93.1.5.{{ $index }}' + index: 'ethernetNTEXG118PROSHCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEXG118PROACSHCardTable + value: CM-ENTITY-MIB::ethernetNTEXG118PROACSHCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.94.1.5.{{ $index }}' + index: 'ethernetNTEXG118PROACSHCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE114ProVmSHCardTable + value: CM-ENTITY-MIB::ethernetNTEGE114ProVmSHCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.95.1.5.{{ $index }}' + index: 'ethernetNTEGE114ProVmSHCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEGE104CardTable + value: CM-ENTITY-MIB::ethernetNTEGE104CardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.96.1.5.{{ $index }}' + index: 'ethernetNTEGE104CardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 + - + oid: CM-ENTITY-MIB::ethernetNTEXG120PROSHCardTable + value: CM-ENTITY-MIB::ethernetNTEXG120PROSHCardVoltage + num_oid: '.1.3.6.1.4.1.2544.1.12.3.1.97.1.5.{{ $index }}' + index: 'ethernetNTEXG120PROSHCardVoltage{{ $index }}' + descr: '{{ CM-ENTITY-MIB::slotCardUnitName }} [#{{ CM-ENTITY-MIB::slotIndex }}]' + divisor: 1000 diff --git a/resources/definitions/os_discovery/aen.yaml b/resources/definitions/os_discovery/aen.yaml index 855489f6e54..c219f511f1d 100644 --- a/resources/definitions/os_discovery/aen.yaml +++ b/resources/definitions/os_discovery/aen.yaml @@ -3,3 +3,8 @@ modules: hardware: ACD-DESC-MIB::acdDescCommercialName.0 serial: ACD-DESC-MIB::acdDescSerialNumber.0 version: ACD-DESC-MIB::acdDescFirmwareVersion.0 + processors: + data: + - + oid: ACD-DESC-MIB::acdDescCpuUsageCurrent + num_oid: '.1.3.6.1.4.1.22420.1.1.20.{{ $index }}' diff --git a/resources/definitions/os_discovery/aos-emu2.yaml b/resources/definitions/os_discovery/aos-emu2.yaml index fdd12000706..2cfba510445 100644 --- a/resources/definitions/os_discovery/aos-emu2.yaml +++ b/resources/definitions/os_discovery/aos-emu2.yaml @@ -6,3 +6,146 @@ modules: hardware_template: '{{ PowerNet-MIB::emsIdentProductNumber.0 }} {{ PowerNet-MIB::emsIdentHardwareRev.0 }}' serial: PowerNet-MIB::emsIdentSerialNumber.0 version: PowerNet-MIB::emsIdentFirmwareRev.0 + sensors: + additional_oids: + data: + - + oid: + - PowerNet-MIB::emsStatusSysTempUnits + humidity: + data: + - + oid: PowerNet-MIB::emsProbeStatusTable + value: PowerNet-MIB::emsProbeStatusProbeHumidity + num_oid: '.1.3.6.1.4.1.318.1.1.10.3.13.1.1.6.{{ $index }}' + descr: '{{ PowerNet-MIB::emsProbeStatusProbeName }}' + low_limit: PowerNet-MIB::emsProbeStatusProbeMinHumidityThresh + low_warn_limit: PowerNet-MIB::emsProbeStatusProbeLowHumidityThresh + warn_limit: PowerNet-MIB::emsProbeStatusProbeHighHumidityThresh + high_limit: PowerNet-MIB::emsProbeStatusProbeMaxHumidityThresh + skip_value_lt: 1 + state: + data: + - + oid: PowerNet-MIB::emsInputContactStatusTable + value: PowerNet-MIB::emsInputContactStatusInputContactState + num_oid: '.1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.{{ $index }}' + descr: '{{ PowerNet-MIB::emsInputContactStatusInputContactName }}' + entPhysicalIndex: '{{ $index }}' + state_name: emsInputContactNormalState_NC + states: + - { value: 1, generic: 0, descr: Closed } + - { value: 2, generic: 1, descr: Open } + skip_values: + - + oid: PowerNet-MIB::emsInputContactStatusInputContactNormalState + op: '!=' + value: 1 + - + oid: PowerNet-MIB::emsInputContactStatusTable + value: PowerNet-MIB::emsInputContactStatusInputContactState + num_oid: '.1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.{{ $index }}' + descr: '{{ PowerNet-MIB::emsInputContactStatusInputContactName }}' + entPhysicalIndex: '{{ $index }}' + state_name: emsInputContactNormalState_NO + states: + - { value: 1, generic: 1, descr: Closed } + - { value: 2, generic: 0, descr: Open } + skip_values: + - + oid: PowerNet-MIB::emsInputContactStatusInputContactNormalState + op: '!=' + value: 2 + - + oid: PowerNet-MIB::emsOutputRelayStatusTable + value: PowerNet-MIB::emsOutputRelayStatusOutputRelayState + num_oid: '.1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.{{ $index }}' + descr: '{{ PowerNet-MIB::emsOutputRelayStatusOutputRelayName }}' + entPhysicalIndex: '{{ $index }}' + state_name: emsOutputRelayNormalState_NC + states: + - { value: 1, generic: 0, descr: Closed } + - { value: 2, generic: 1, descr: Open } + skip_values: + - + oid: PowerNet-MIB::emsOutputRelayStatusOutputRelayNormalState + op: '!=' + value: 1 + - + oid: PowerNet-MIB::emsOutputRelayStatusTable + value: PowerNet-MIB::emsOutputRelayStatusOutputRelayState + num_oid: '.1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.{{ $index }}' + descr: '{{ PowerNet-MIB::emsOutputRelayStatusOutputRelayName }}' + entPhysicalIndex: '{{ $index }}' + state_name: emsOutputRelayNormalState_NO + states: + - { value: 1, generic: 1, descr: Closed } + - { value: 2, generic: 0, descr: Open } + skip_values: + - + oid: PowerNet-MIB::emsOutputRelayStatusOutputRelayNormalState + op: '!=' + value: 2 + - + oid: PowerNet-MIB::emsOutletStatusTable + value: PowerNet-MIB::emsOutletStatusOutletState + num_oid: '.1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.{{ $index }}' + descr: '{{ PowerNet-MIB::emsOutletStatusOutletName }}' + entPhysicalIndex: '{{ $index }}' + state_name: emsOutletNormalState_ON + states: + - { value: 1, generic: 0, descr: On } + - { value: 2, generic: 1, descr: Off } + skip_values: + - + oid: PowerNet-MIB::emsOutletStatusOutletNormalState + op: '!=' + value: 1 + - + oid: PowerNet-MIB::emsOutletStatusTable + value: PowerNet-MIB::emsOutletStatusOutletState + num_oid: '.1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.{{ $index }}' + descr: '{{ PowerNet-MIB::emsOutletStatusOutletName }}' + entPhysicalIndex: '{{ $index }}' + state_name: emsOutletNormalState_OFF + states: + - { value: 1, generic: 1, descr: On } + - { value: 2, generic: 0, descr: Off } + skip_values: + - + oid: PowerNet-MIB::emsOutletStatusOutletNormalState + op: '!=' + value: 2 + temperature: + data: + - + oid: PowerNet-MIB::emsProbeStatusTable + value: PowerNet-MIB::emsProbeStatusProbeTemperature + num_oid: '.1.3.6.1.4.1.318.1.1.10.3.13.1.1.3.{{ $index }}' + descr: '{{ PowerNet-MIB::emsProbeStatusProbeName }}' + low_limit: PowerNet-MIB::emsProbeStatusProbeMinTempThresh + low_warn_limit: PowerNet-MIB::emsProbeStatusProbeLowTempThresh + warn_limit: PowerNet-MIB::emsProbeStatusProbeHighTempThresh + high_limit: PowerNet-MIB::emsProbeStatusProbeMaxTempThresh + skip_value_lt: 1 + skip_values: + - + oid: PowerNet-MIB::emsStatusSysTempUnits.0 + op: '=' + value: 2 + - + oid: PowerNet-MIB::emsProbeStatusTable + value: PowerNet-MIB::emsProbeStatusProbeTemperature + num_oid: '.1.3.6.1.4.1.318.1.1.10.3.13.1.1.3.{{ $index }}' + descr: '{{ PowerNet-MIB::emsProbeStatusProbeName }}' + low_limit: PowerNet-MIB::emsProbeStatusProbeMinTempThresh + low_warn_limit: PowerNet-MIB::emsProbeStatusProbeLowTempThresh + warn_limit: PowerNet-MIB::emsProbeStatusProbeHighTempThresh + high_limit: PowerNet-MIB::emsProbeStatusProbeMaxTempThresh + user_func: fahrenheit_to_celsius + skip_value_lt: 1 + skip_values: + - + oid: PowerNet-MIB::emsStatusSysTempUnits.0 + op: '!=' + value: 2 diff --git a/resources/definitions/os_discovery/aos.yaml b/resources/definitions/os_discovery/aos.yaml index 0363dcdd03f..5de4d29e819 100644 --- a/resources/definitions/os_discovery/aos.yaml +++ b/resources/definitions/os_discovery/aos.yaml @@ -50,3 +50,8 @@ modules: oid: RADLAN-rndMng::rlCpuUtilDuringLastMinute num_oid: '.1.3.6.1.4.1.89.1.8.{{ $index }}' index: 0 + - + oid: ALCATEL-IND1-HEALTH-MIB::healthDeviceCpuLatest.0 + num_oid: '.1.3.6.1.4.1.6486.800.1.2.1.16.1.1.1.13.{{ $index }}' + descr: 'Device CPU' + index: 0 diff --git a/resources/definitions/os_discovery/aos6.yaml b/resources/definitions/os_discovery/aos6.yaml index 5113f2648d3..445ffd67ebe 100755 --- a/resources/definitions/os_discovery/aos6.yaml +++ b/resources/definitions/os_discovery/aos6.yaml @@ -8,12 +8,14 @@ modules: os: sysDescr_regex: '/(?OS\S*)? ?(?\d+\.\d+\.\S*)/' + processors: data: - oid: ALCATEL-IND1-HEALTH-MIB::healthDeviceCpu1MinAvg num_oid: '.1.3.6.1.4.1.6486.800.1.2.1.16.1.1.1.14.{{ $index }}' index: 0 + sensors: additional_oids: data: @@ -23,6 +25,7 @@ modules: - ENTITY-MIB::entPhysicalName - ALCATEL-IND1-LAG-MIB::alclnkaggAggNumber - ALCATEL-IND1-STACK-MANAGER-MIB::alaStackMgrSlotNINumber + temperature: data: - @@ -38,6 +41,12 @@ modules: low_warn_limit: ALCATEL-IND1-PORT-MIB::ddmTempLowWarning high_limit: ALCATEL-IND1-PORT-MIB::ddmTempHiAlarm warn_limit: ALCATEL-IND1-PORT-MIB::ddmTempHiWarning + group: transceiver + skip_values: + - + oid: ALCATEL-IND1-PORT-MIB::ddmSupplyVoltage + op: '=' + value: 0 voltage: data: @@ -54,7 +63,12 @@ modules: low_warn_limit: ALCATEL-IND1-PORT-MIB::ddmSupplyVoltageLowWarning high_limit: ALCATEL-IND1-PORT-MIB::ddmSupplyVoltageHiAlarm warn_limit: ALCATEL-IND1-PORT-MIB::ddmSupplyVoltageHiWarning - + group: transceiver + skip_values: + - + oid: ALCATEL-IND1-PORT-MIB::ddmSupplyVoltage + op: '=' + value: 0 current: data: @@ -71,6 +85,16 @@ modules: low_warn_limit: ALCATEL-IND1-PORT-MIB::ddmTxBiasCurrentLowWarning high_limit: ALCATEL-IND1-PORT-MIB::ddmTxBiasCurrentHiAlarm warn_limit: ALCATEL-IND1-PORT-MIB::ddmTxBiasCurrentHiWarning + group: transceiver + skip_values: + - + oid: ALCATEL-IND1-PORT-MIB::ddmSupplyVoltage + op: '=' + value: 0 + - + oid: ALCATEL-IND1-PORT-MIB::ddmTxOutputPower + op: '<=' + value: -200000 dbm: data: @@ -87,6 +111,16 @@ modules: low_warn_limit: ALCATEL-IND1-PORT-MIB::ddmRxOpticalPowerLowWarning high_limit: ALCATEL-IND1-PORT-MIB::ddmRxOpticalPowerHiAlarm warn_limit: ALCATEL-IND1-PORT-MIB::ddmRxOpticalPowerHiWarning + group: transceiver + skip_values: + - + oid: ALCATEL-IND1-PORT-MIB::ddmSupplyVoltage + op: '=' + value: 0 + - + oid: ALCATEL-IND1-PORT-MIB::ddmTxOutputPower + op: '<=' + value: -200000 - oid: ALCATEL-IND1-PORT-MIB::ddmInfoEntry value: ALCATEL-IND1-PORT-MIB::ddmTxOutputPower @@ -100,6 +134,17 @@ modules: low_warn_limit: ALCATEL-IND1-PORT-MIB::ddmTxOutputPowerLowWarning high_limit: ALCATEL-IND1-PORT-MIB::ddmTxOutputPowerHiAlarm warn_limit: ALCATEL-IND1-PORT-MIB::ddmTxOutputPowerHiWarning + group: transceiver + skip_values: + - + oid: ALCATEL-IND1-PORT-MIB::ddmSupplyVoltage + op: '=' + value: 0 + - + oid: ALCATEL-IND1-PORT-MIB::ddmTxOutputPower + op: '<=' + value: -200000 + state: data: - diff --git a/resources/definitions/os_discovery/apsoluteos.yaml b/resources/definitions/os_discovery/apsoluteos.yaml index df02837f061..e6f7de168e6 100644 --- a/resources/definitions/os_discovery/apsoluteos.yaml +++ b/resources/definitions/os_discovery/apsoluteos.yaml @@ -3,7 +3,6 @@ modules: data: - oid: RADWARE-MIB::rsWSDRSResourceUtilization - value: RADWARE-MIB::rsWSDRSResourceUtilization num_oid: '.1.3.6.1.4.1.89.35.1.54.{{ $index }}' sensors: temperature: diff --git a/resources/definitions/os_discovery/arbos.yaml b/resources/definitions/os_discovery/arbos.yaml index 61725655637..bffa212a8ce 100644 --- a/resources/definitions/os_discovery/arbos.yaml +++ b/resources/definitions/os_discovery/arbos.yaml @@ -32,11 +32,13 @@ modules: - oid: PEAKFLOW-SP-MIB::deviceCpuLoadAvg5min num_oid: '.1.3.6.1.4.1.9694.1.4.2.1.2.{{ $index }}' + precision: 100 descr: 'Load Average' index: 0 - oid: PEAKFLOW-TMS-MIB::deviceCpuLoadAvg5min num_oid: '.1.3.6.1.4.1.9694.1.5.2.4.{{ $index }}' + precision: 100 descr: 'Load Average' index: 0 storage: diff --git a/resources/definitions/os_discovery/arista_eos.yaml b/resources/definitions/os_discovery/arista_eos.yaml index 5cc33aec8e7..782dd0486b2 100644 --- a/resources/definitions/os_discovery/arista_eos.yaml +++ b/resources/definitions/os_discovery/arista_eos.yaml @@ -2,3 +2,28 @@ modules: os: sysDescr_regex: '/ version (?.+) running on .+ (?\S+)$/' serial: ENTITY-MIB::entPhysicalSerialNum.1 + sensors: + additional_oids: + data: + - + oid: + - ENTITY-MIB::entPhysicalDescr + - ENTITY-MIB::entPhysicalClass + state: + data: + - + oid: ENTITY-STATE-MIB::entStateTable + value: ENTITY-STATE-MIB::entStateOper + num_oid: '.1.3.6.1.2.1.131.1.1.1.3.{{ $index }}' + descr: '{{ ENTITY-MIB::entPhysicalDescr }}' + state_name: ENTITY-STATE-MIB::EntityOperState + states: + - { descr: unknown, value: 1, generic: 3 } + - { descr: disabled, value: 2, generic: 2 } + - { descr: enabled, value: 3, generic: 0 } + - { descr: testing, value: 4, generic: 1 } + skip_values: + - + oid: ENTITY-MIB::entPhysicalClass + op: not_in_array + value: [6, 7] diff --git a/resources/definitions/os_discovery/awplus.yaml b/resources/definitions/os_discovery/awplus.yaml index e100b3aa801..3ab72a6b495 100644 --- a/resources/definitions/os_discovery/awplus.yaml +++ b/resources/definitions/os_discovery/awplus.yaml @@ -2,7 +2,7 @@ modules: processors: data: - - oid: AT-SYSINFO-MIB::cpuUtilisationStackEntry + oid: AT-SYSINFO-MIB::cpuUtilisationStackTable value: AT-SYSINFO-MIB::cpuUtilisationStackAvgLastMinute num_oid: '.1.3.6.1.4.1.207.8.4.4.3.3.8.1.4.{{ $index }}' descr: 'Processor {{ $index }}' diff --git a/resources/definitions/os_discovery/boss.yaml b/resources/definitions/os_discovery/boss.yaml index 1d599003e47..4b9fa575a39 100644 --- a/resources/definitions/os_discovery/boss.yaml +++ b/resources/definitions/os_discovery/boss.yaml @@ -8,3 +8,11 @@ modules: precision: 1048576 index: '.{{ $index }}' type: avaya-ers + processors: + data: + - + oid: S5-CHASSIS-MIB::s5ChasUtilCPUUsageLast10Minutes + num_oid: '.1.3.6.1.4.1.45.1.6.3.8.1.1.6.{{ $index }}' + descr: "Unit {{ count }} processor" + index: "{{ count|pad(2, '0') }}" + type: avaya-ers diff --git a/resources/definitions/os_discovery/ciena-sds.yaml b/resources/definitions/os_discovery/ciena-sds.yaml index a46fede0262..617233dac01 100644 --- a/resources/definitions/os_discovery/ciena-sds.yaml +++ b/resources/definitions/os_discovery/ciena-sds.yaml @@ -17,24 +17,19 @@ modules: num_oid: '.1.3.6.1.4.1.6141.2.60.12.1.11.1.{{ $index }}' descr: 'CPU Utilization 5' index: cpu5.{{ $index }} - #low_limit: wwpLeosSystemCpuUtilizationLast5SecondsMinimum - #high_limit: wwpLeosSystemCpuUtilizationLast5SecondsMaximum + - oid: WWP-LEOS-SYSTEM-CONFIG-MIB::wwpLeosSystemCpuUtilization value: WWP-LEOS-SYSTEM-CONFIG-MIB::wwpLeosSystemCpuUtilizationLast10Seconds num_oid: '.1.3.6.1.4.1.6141.2.60.12.1.11.5.{{ $index }}' descr: 'CPU Utilization 10' index: cpu10.{{ $index }} - #low_limit: wwpLeosSystemCpuUtilizationLast10SecondsMinimum - #high_limit: wwpLeosSystemCpuUtilizationLast10SecondsMaximum - oid: WWP-LEOS-SYSTEM-CONFIG-MIB::wwpLeosSystemCpuUtilization value: WWP-LEOS-SYSTEM-CONFIG-MIB::wwpLeosSystemCpuUtilizationLast60Seconds num_oid: '.1.3.6.1.4.1.6141.2.60.12.1.11.9.{{ $index }}' descr: 'CPU Utilization 60' index: cpu60.{{ $index }} - #low_limit: wwpLeosSystemCpuUtilizationLast60SecondsMinimum - #high_limit: wwpLeosSystemCpuUtilizationLast60SecondsMaximum sensors: additional_oids: data: diff --git a/resources/definitions/os_discovery/ciscosb.yaml b/resources/definitions/os_discovery/ciscosb.yaml index a95b2a18aff..5524ea2cf3e 100644 --- a/resources/definitions/os_discovery/ciscosb.yaml +++ b/resources/definitions/os_discovery/ciscosb.yaml @@ -1,6 +1,6 @@ modules: os: - sysDescr_regex: + sysDescr_regex: - '/(?S.+-\d+) \d/' - '/(?CBS[^\s]+) /' hardware: CISCOSB-Physicaldescription-MIB::rlPhdUnitGenParamModelName.1 @@ -50,7 +50,7 @@ modules: - oid: CISCOSB-HWENVIROMENT::rlEnvMonFanState op: '==' - value: 5 + value: 5 - oid: CISCOSB-HWENVIROMENT::rlEnvMonSupplyState value: CISCOSB-HWENVIROMENT::rlEnvMonSupplyState @@ -69,7 +69,7 @@ modules: - oid: CISCOSB-HWENVIROMENT::rlEnvMonSupplyState op: '==' - value: 5 + value: 5 # power: # data: # - @@ -90,20 +90,20 @@ modules: descr: 'FAN {{ $index }} Temperature' # user_func: fahrenheit_to_celsius warn_limit: 91 - high_limit: 95 -# true for all switches, got data from cli output "show system sensors" on a SG350-8F8T, -# temperature seems to be the cpu/processing unit temperature, not the fan-in temperature. + high_limit: 95 +# true for all switches, got data from cli output "show system sensors" on a SG350-8F8T, +# temperature seems to be the cpu/processing unit temperature, not the fan-in temperature. # See CLI-output. All other temperatures are not accessable via SNMP (to my research). SG350X-24P and CBS250-4X have higher values low_limit: 0 # true for CBS250-8T-D and CBS250-8PP-D, all other tolerate -5 skip_values: - oid: CISCOSB-HWENVIROMENT::rlEnvFanDataTemp op: '==' - value: 0 + value: 0 # - # oid: rlEnvFanDataTemp # op: '==' -# value: -17.78 # Fahrenheit = 0 +# value: -17.78 # Fahrenheit = 0 - oid: CISCOSB-Physicaldescription-MIB::rlPhdUnitEnvParamEntry value: CISCOSB-Physicaldescription-MIB::rlPhdUnitEnvParamTempSensorValue diff --git a/resources/definitions/os_discovery/comware.yaml b/resources/definitions/os_discovery/comware.yaml index d1667ecbd54..3b7aefaa307 100644 --- a/resources/definitions/os_discovery/comware.yaml +++ b/resources/definitions/os_discovery/comware.yaml @@ -1,6 +1,17 @@ modules: os: sysDescr_regex: '/Version (?[0-9.]+).*(Release|ESS) (?[R0-9P]+).*[\n ](HPE |HPE FF |HP |H3C )(?.*)[\r ][\n ]/' + processors: + additional_oids: + oids: + - ENTITY-MIB::entPhysicalName + data: + - + oid: HH3C-ENTITY-EXT-MIB::hh3cEntityExtCpuUsage + num_oid: '.1.3.6.1.4.1.25506.2.6.1.1.1.1.6.{{ $index }}' + descr: '{{ ENTITY-MIB::entPhysicalName }}' + skip_values: 0 + sensors: additional_oids: data: diff --git a/resources/definitions/os_discovery/dasan-nos.yaml b/resources/definitions/os_discovery/dasan-nos.yaml index 18283287a3a..7bda316521b 100644 --- a/resources/definitions/os_discovery/dasan-nos.yaml +++ b/resources/definitions/os_discovery/dasan-nos.yaml @@ -14,5 +14,4 @@ modules: data: - oid: DASAN-SWITCH-MIB::dsCpuLoad5s - value: DASAN-SWITCH-MIB::dsCpuLoad5s num_oid: '.1.3.6.1.4.1.6296.9.1.1.1.8.{{ $index }}' diff --git a/resources/definitions/os_discovery/datacom-dmos.yaml b/resources/definitions/os_discovery/datacom-dmos.yaml index 17b133b23a6..49b676996a9 100644 --- a/resources/definitions/os_discovery/datacom-dmos.yaml +++ b/resources/definitions/os_discovery/datacom-dmos.yaml @@ -21,3 +21,149 @@ modules: precision: 1 descr: 'Memory' class: system + sensors: + additional_oids: + data: + - + oid: + - IF-MIB::ifName + - DATACOM-XCVR-MIB::dmXcvrTable + dbm: + data: + - + oid: DATACOM-XCVR-MIB::dmXcvrLaneTable + value: DATACOM-XCVR-MIB::dmXcvrRxDbm + num_oid: '.1.3.6.1.4.1.3709.3.6.8.2.1.1.2.{{ $index }}' + divisor: 100 + skip_limits_calc: true + index: 'dmXcvrRxDbm.{{ $index }}' + descr: '{{ IF-MIB::ifName:0 }} Lane {{ $subindex1 }} RX ({{ DATACOM-XCVR-MIB::dmXcvrType:0 }})' + entPhysicalIndex: '{{ $subindex0 }}' + entPhysicalIndex_measured: 'ports' + group: transceiver + low_limit: 'DATACOM-XCVR-MIB::dmXcvrRxLoAlarm:0' + high_limit: 'DATACOM-XCVR-MIB::dmXcvrRxHiAlarm:0' + low_warn_limit: 'DATACOM-XCVR-MIB::dmXcvrRxLoWarn:0' + warn_limit: 'DATACOM-XCVR-MIB::dmXcvrRxHiWarn:0' + skip_values: + - + oid: DATACOM-XCVR-MIB::dmXcvrBias + op: '<=' + value: 0 + - + oid: DATACOM-XCVR-MIB::dmXcvrLaneTable + value: DATACOM-XCVR-MIB::dmXcvrTxDbm + num_oid: '.1.3.6.1.4.1.3709.3.6.8.2.1.1.3.{{ $index }}' + divisor: 100 + skip_limits_calc: true + index: 'dmXcvrTxDbm.{{ $index }}' + descr: '{{ IF-MIB::ifName:0 }} Lane {{ $subindex1 }} TX ({{ DATACOM-XCVR-MIB::dmXcvrType:0 }})' + entPhysicalIndex: '{{ $subindex0 }}' + entPhysicalIndex_measured: 'ports' + group: transceiver + low_limit: 'DATACOM-XCVR-MIB::dmXcvrTxLoAlarm:0' + high_limit: 'DATACOM-XCVR-MIB::dmXcvrTxHiAlarm:0' + low_warn_limit: 'DATACOM-XCVR-MIB::dmXcvrTxLoWarn:0' + warn_limit: 'DATACOM-XCVR-MIB::dmXcvrTxHiWarn:0' + skip_values: + - + oid: DATACOM-XCVR-MIB::dmXcvrBias + op: '<=' + value: 0 + temperature: + data: + - + oid: DATACOM-XCVR-MIB::dmXcvrDiagTable + value: DATACOM-XCVR-MIB::dmXcvrDiagTemp + num_oid: '.1.3.6.1.4.1.3709.3.6.8.1.1.1.1.{{ $index }}' + divisor: 100 + skip_limits_calc: true + index: 'dmXcvrDiagTemp.{{ $index }}' + descr: '{{ IF-MIB::ifName }} SFP' + entPhysicalIndex: '{{ $index }}' + entPhysicalIndex_measured: 'ports' + group: transceiver + low_limit: 'DATACOM-XCVR-MIB::dmXcvrTempLoAlarm' + high_limit: 'DATACOM-XCVR-MIB::dmXcvrTempHiAlarm' + low_warn_limit: 'DATACOM-XCVR-MIB::dmXcvrTempLoWarn' + warn_limit: 'DATACOM-XCVR-MIB::dmXcvrTempHiWarn' + skip_values: + - 0 + - + oid: DATACOM-XCVR-MIB::dmEnvTempTable + value: DATACOM-XCVR-MIB::dmEnvTempValue + num_oid: '.1.3.6.1.4.1.3709.3.6.6.1.3.1.6.{{ $index }}' + divisor: 10 + index: 'dmEnvTempValue.{{ $index }}' + descr: '{{ DATACOM-XCVR-MIB::dmEnvTempName }}' + high_limit: 'DATACOM-XCVR-MIB::dmEnvTempHiAlarm' + group: system + voltage: + data: + - + oid: DATACOM-XCVR-MIB::dmXcvrDiagTable + value: DATACOM-XCVR-MIB::dmXcvrDiagVolt + num_oid: '.1.3.6.1.4.1.3709.3.6.8.1.1.1.2.{{ $index }}' + divisor: 100 + skip_limits_calc: true + index: 'dmXcvrDiagVolt.{{ $index }}' + descr: '{{ IF-MIB::ifName }} SFP' + entPhysicalIndex: '{{ $index }}' + entPhysicalIndex_measured: 'ports' + group: transceiver + low_limit: 'DATACOM-XCVR-MIB::dmXcvrVoltLoAlarm' + high_limit: 'DATACOM-XCVR-MIB::dmXcvrVoltHiAlarm' + low_warn_limit: 'DATACOM-XCVR-MIB::dmXcvrVoltLoWarn' + warn_limit: 'DATACOM-XCVR-MIB::dmXcvrVoltHiWarn' + skip_values: + - 0 + current: + data: + - + oid: DATACOM-XCVR-MIB::dmXcvrLaneTable + value: DATACOM-XCVR-MIB::dmXcvrBias + num_oid: '.1.3.6.1.4.1.3709.3.6.8.2.1.1.4.{{ $index }}' + divisor: 100 + skip_limits_calc: true + index: 'dmXcvrBias.{{ $index }}' + descr: '{{ IF-MIB::ifName:0 }} Lane {{ $subindex1 }} bias' + entPhysicalIndex: '{{ $subindex0 }}' + entPhysicalIndex_measured: 'ports' + group: transceiver + low_limit: 'DATACOM-XCVR-MIB::dmXcvrBiasLoAlarm:0' + high_limit: 'DATACOM-XCVR-MIB::dmXcvrBiasHiAlarm:0' + low_warn_limit: 'DATACOM-XCVR-MIB::dmXcvrBiasLoWarn:0' + warn_limit: 'DATACOM-XCVR-MIB::dmXcvrBiasHiWarn:0' + skip_values: + - 0 + fanspeed: + data: + - + oid: DATACOM-XCVR-MIB::dmEnvFanTable + value: DATACOM-XCVR-MIB::dmEnvFanRpm + num_oid: '.1.3.6.1.4.1.3709.3.6.6.1.4.1.4.{{ $index }}' + index: 'dmEnvFanRpm.{{ $index }}' + descr: 'Fan {{ DATACOM-XCVR-MIB::dmEnvFanName }}' + group: system + low_limit: 1 + high_limit: 50000 + state: + data: + - + oid: DATACOM-XCVR-MIB::dmInvTable + value: DATACOM-XCVR-MIB::dmUnitStatus + num_oid: '.1.3.6.1.4.1.3709.3.6.11.2.1.18.{{ $index }}' + index: 'dmPsuStatus.{{ $index }}' + descr: 'Fonte {{ DATACOM-XCVR-MIB::dmInvName }}' + state_name: dmPsuStatus + group: system + states: + - { value: 1, generic: 0, descr: OK } + - { value: 0, generic: 2, descr: Failed } + - { value: 2, generic: 2, descr: Failed } + - { value: 3, generic: 2, descr: Failed } + skip_values: + - + oid: DATACOM-XCVR-MIB::dmInvName + op: not_contains + value: PSU diff --git a/resources/definitions/os_discovery/datacom.yaml b/resources/definitions/os_discovery/datacom.yaml index daa4d662c09..c8736a091d1 100644 --- a/resources/definitions/os_discovery/datacom.yaml +++ b/resources/definitions/os_discovery/datacom.yaml @@ -7,7 +7,6 @@ modules: data: - oid: DMswitch-MIB::swCpuUsage - value: DMswitch-MIB::swCpuUsage num_oid: '.1.3.6.1.4.1.3709.3.5.201.1.1.10.{{ $index }}' precision: 100 sensors: diff --git a/resources/definitions/os_discovery/dcn-software.yaml b/resources/definitions/os_discovery/dcn-software.yaml index 06ab722e49f..8df0b09c0c4 100644 --- a/resources/definitions/os_discovery/dcn-software.yaml +++ b/resources/definitions/os_discovery/dcn-software.yaml @@ -17,6 +17,5 @@ modules: data: - oid: DCN-MIB::switchCpuUsage - value: DCN-MIB::switchCpuUsage num_oid: '.1.3.6.1.4.1.6339.100.1.11.10.{{ $index }}' descr: CPU Usage diff --git a/resources/definitions/os_discovery/didactum.yaml b/resources/definitions/os_discovery/didactum.yaml new file mode 100644 index 00000000000..be6f8454ca8 --- /dev/null +++ b/resources/definitions/os_discovery/didactum.yaml @@ -0,0 +1,235 @@ +modules: + os: + version: DIDACTUM-SYSTEM-MIB::systemFirmware.0 + + sensors: + state: + data: + - + oid: DIDACTUM-SYSTEM-MIB::ctlInternalSensorsOutletsTable + value: DIDACTUM-SYSTEM-MIB::ctlInternalSensorsOutletStateInt + num_oid: '.1.3.6.1.4.1.46501.5.3.1.10.{{ $index }}' + descr: DIDACTUM-SYSTEM-MIB::ctlInternalSensorsOutletName + index: 'DIDACTUM-SYSTEM-MIB::ctlInternalSensorsOutletId.{{ $index }}' + state_name: didactumInternalOutlet + group: Internal Sensors + states: + - { value: 0, generic: 3, descr: unknown } + - { value: 5, generic: 0, descr: on } + - { value: 6, generic: 0, descr: off } + - { value: 7, generic: 3, descr: not-connected } + - { value: 8, generic: 0, descr: pulse } + + - + oid: DIDACTUM-SYSTEM-MIB::ctlInternalSensorsDiscretsTable + value: DIDACTUM-SYSTEM-MIB::ctlInternalSensorsDiscretStateInt + num_oid: '.1.3.6.1.4.1.46501.5.1.1.12.{{ $index }}' + descr: DIDACTUM-SYSTEM-MIB::ctlInternalSensorsDiscretName + index: 'DIDACTUM-SYSTEM-MIB::ctlInternalSensorsDiscretId.{{ $index }}' + state_name: didactumInternalDiscreteSensor + group: Internal Sensors + states: + - { value: 0, generic: 3, descr: unknown } + - { value: 1, generic: 0, descr: normal } + - { value: 4, generic: 2, descr: alarm } + - { value: 7, generic: 3, descr: not-connected } + + temperature: + data: + - + oid: DIDACTUM-SYSTEM-MIB::ctlVirtualDevicesAnalogsTable + value: DIDACTUM-SYSTEM-MIB::ctlVirtualDevicesAnalogValueInt + num_oid: '.1.3.6.1.4.1.46501.3.5.1.25.{{ $index }}' + divisor: 100 + descr: "{{ DIDACTUM-SYSTEM-MIB::ctlVirtualDevicesAnalogName }}" + index: "virtual.{{ $index }}" + skip_values: + - oid: DIDACTUM-SYSTEM-MIB::ctlVirtualDevicesAnalogType + op: not_regex + value: '/temperature|temp/i' + + - + oid: DIDACTUM-SYSTEM-MIB::ctlInternalSensorsAnalogsTable + value: DIDACTUM-SYSTEM-MIB::ctlInternalSensorsAnalogValueInt + num_oid: '.1.3.6.1.4.1.46501.5.2.1.25.{{ $index }}' + divisor: 100 + descr: "{{ DIDACTUM-SYSTEM-MIB::ctlInternalSensorsAnalogName }}" + index: "internal.{{ $index }}" + skip_values: + - oid: DIDACTUM-SYSTEM-MIB::ctlInternalSensorsAnalogType + op: not_regex + value: '/temperature|temp/i' + + - + oid: DIDACTUM-SYSTEM-MIB::ctlCANSensorsAnalogsTable + value: DIDACTUM-SYSTEM-MIB::ctlCANSensorsAnalogValueInt + num_oid: '.1.3.6.1.4.1.46501.6.2.1.25.{{ $index }}' + divisor: 100 + descr: "{{ DIDACTUM-SYSTEM-MIB::ctlCANSensorsAnalogName }}" + index: "can.{{ $index }}" + skip_values: + - oid: DIDACTUM-SYSTEM-MIB::ctlCANSensorsAnalogType + op: not_regex + value: '/temperature|temp/i' + + - + oid: DIDACTUM-SYSTEM-MIB::ctlLoRaSensorsAnalogsTable + value: DIDACTUM-SYSTEM-MIB::ctlLoRaSensorsAnalogValueInt + num_oid: '.1.3.6.1.4.1.46501.7.2.1.25.{{ $index }}' + divisor: 100 + descr: "{{ DIDACTUM-SYSTEM-MIB::ctlLoRaSensorsAnalogName }}" + index: "lora.{{ $index }}" + skip_values: + - oid: DIDACTUM-SYSTEM-MIB::ctlLoRaSensorsAnalogType + op: not_regex + value: '/temperature|temp/i' + + humidity: + data: + - + oid: DIDACTUM-SYSTEM-MIB::ctlVirtualDevicesAnalogsTable + value: DIDACTUM-SYSTEM-MIB::ctlVirtualDevicesAnalogValueInt + num_oid: '.1.3.6.1.4.1.46501.3.5.1.25.{{ $index }}' + divisor: 100 + descr: "{{ DIDACTUM-SYSTEM-MIB::ctlVirtualDevicesAnalogName }}" + index: "virtual.{{ $index }}" + skip_values: + - oid: DIDACTUM-SYSTEM-MIB::ctlVirtualDevicesAnalogType + op: not_regex + value: '/humidity/i' + + - + oid: DIDACTUM-SYSTEM-MIB::ctlInternalSensorsAnalogsTable + value: DIDACTUM-SYSTEM-MIB::ctlInternalSensorsAnalogValueInt + num_oid: '.1.3.6.1.4.1.46501.5.2.1.25.{{ $index }}' + divisor: 100 + descr: "{{ DIDACTUM-SYSTEM-MIB::ctlInternalSensorsAnalogName }}" + index: "internal.{{ $index }}" + skip_values: + - oid: DIDACTUM-SYSTEM-MIB::ctlInternalSensorsAnalogType + op: not_regex + value: '/humidity/i' + + - + oid: DIDACTUM-SYSTEM-MIB::ctlCANSensorsAnalogsTable + value: DIDACTUM-SYSTEM-MIB::ctlCANSensorsAnalogValueInt + num_oid: '.1.3.6.1.4.1.46501.6.2.1.25.{{ $index }}' + divisor: 100 + descr: "{{ DIDACTUM-SYSTEM-MIB::ctlCANSensorsAnalogName }}" + index: "can.{{ $index }}" + skip_values: + - oid: DIDACTUM-SYSTEM-MIB::ctlCANSensorsAnalogType + op: not_regex + value: '/humidity/i' + + - + oid: DIDACTUM-SYSTEM-MIB::ctlLoRaSensorsAnalogsTable + value: DIDACTUM-SYSTEM-MIB::ctlLoRaSensorsAnalogValueInt + num_oid: '.1.3.6.1.4.1.46501.7.2.1.25.{{ $index }}' + divisor: 100 + descr: "{{ DIDACTUM-SYSTEM-MIB::ctlLoRaSensorsAnalogName }}" + index: "lora.{{ $index }}" + skip_values: + - oid: DIDACTUM-SYSTEM-MIB::ctlLoRaSensorsAnalogType + op: not_regex + value: '/humidity/i' + + voltage: + data: + - + oid: DIDACTUM-SYSTEM-MIB::ctlVirtualDevicesAnalogsTable + value: DIDACTUM-SYSTEM-MIB::ctlVirtualDevicesAnalogValueInt + num_oid: '.1.3.6.1.4.1.46501.3.5.1.25.{{ $index }}' + divisor: 100 + descr: "{{ DIDACTUM-SYSTEM-MIB::ctlVirtualDevicesAnalogName }}" + index: "virtual.{{ $index }}" + skip_values: + - oid: DIDACTUM-SYSTEM-MIB::ctlVirtualDevicesAnalogType + op: not_regex + value: '/voltage/i' + + - + oid: DIDACTUM-SYSTEM-MIB::ctlInternalSensorsAnalogsTable + value: DIDACTUM-SYSTEM-MIB::ctlInternalSensorsAnalogValueInt + num_oid: '.1.3.6.1.4.1.46501.5.2.1.25.{{ $index }}' + divisor: 100 + descr: "{{ DIDACTUM-SYSTEM-MIB::ctlInternalSensorsAnalogName }}" + index: "internal.{{ $index }}" + skip_values: + - oid: DIDACTUM-SYSTEM-MIB::ctlInternalSensorsAnalogType + op: not_regex + value: '/voltage/i' + + - + oid: DIDACTUM-SYSTEM-MIB::ctlCANSensorsAnalogsTable + value: DIDACTUM-SYSTEM-MIB::ctlCANSensorsAnalogValueInt + num_oid: '.1.3.6.1.4.1.46501.6.2.1.25.{{ $index }}' + divisor: 100 + descr: "{{ DIDACTUM-SYSTEM-MIB::ctlCANSensorsAnalogName }}" + index: "can.{{ $index }}" + skip_values: + - oid: DIDACTUM-SYSTEM-MIB::ctlCANSensorsAnalogType + op: not_regex + value: '/voltage/i' + + - + oid: DIDACTUM-SYSTEM-MIB::ctlLoRaSensorsAnalogsTable + value: DIDACTUM-SYSTEM-MIB::ctlLoRaSensorsAnalogValueInt + num_oid: '.1.3.6.1.4.1.46501.7.2.1.25.{{ $index }}' + divisor: 100 + descr: "{{ DIDACTUM-SYSTEM-MIB::ctlLoRaSensorsAnalogName }}" + index: "lora.{{ $index }}" + skip_values: + - oid: DIDACTUM-SYSTEM-MIB::ctlLoRaSensorsAnalogType + op: not_regex + value: '/voltage/i' + + percent: + data: + - + oid: DIDACTUM-SYSTEM-MIB::ctlVirtualDevicesAnalogsTable + value: DIDACTUM-SYSTEM-MIB::ctlVirtualDevicesAnalogValueInt + num_oid: '.1.3.6.1.4.1.46501.3.5.1.25.{{ $index }}' + divisor: 100 + descr: "{{ DIDACTUM-SYSTEM-MIB::ctlVirtualDevicesAnalogName }}" + index: "virtual.{{ $index }}" + skip_values: + - oid: DIDACTUM-SYSTEM-MIB::ctlVirtualDevicesAnalogType + op: not_regex + value: '/percent|percentage|%/i' + + - + oid: DIDACTUM-SYSTEM-MIB::ctlInternalSensorsAnalogsTable + value: DIDACTUM-SYSTEM-MIB::ctlInternalSensorsAnalogValueInt + num_oid: '.1.3.6.1.4.1.46501.5.2.1.25.{{ $index }}' + divisor: 100 + descr: "{{ DIDACTUM-SYSTEM-MIB::ctlInternalSensorsAnalogName }}" + index: "internal.{{ $index }}" + skip_values: + - oid: DIDACTUM-SYSTEM-MIB::ctlInternalSensorsAnalogType + op: not_regex + value: '/percent|percentage|%/i' + + - + oid: DIDACTUM-SYSTEM-MIB::ctlCANSensorsAnalogsTable + value: DIDACTUM-SYSTEM-MIB::ctlCANSensorsAnalogValueInt + num_oid: '.1.3.6.1.4.1.46501.6.2.1.25.{{ $index }}' + divisor: 100 + descr: "{{ DIDACTUM-SYSTEM-MIB::ctlCANSensorsAnalogName }}" + index: "can.{{ $index }}" + skip_values: + - oid: DIDACTUM-SYSTEM-MIB::ctlCANSensorsAnalogType + op: not_regex + value: '/percent|percentage|%/i' + + - + oid: DIDACTUM-SYSTEM-MIB::ctlLoRaSensorsAnalogsTable + value: DIDACTUM-SYSTEM-MIB::ctlLoRaSensorsAnalogValueInt + num_oid: '.1.3.6.1.4.1.46501.7.2.1.25.{{ $index }}' + divisor: 100 + descr: "{{ DIDACTUM-SYSTEM-MIB::ctlLoRaSensorsAnalogName }}" + index: "lora.{{ $index }}" + skip_values: + - oid: DIDACTUM-SYSTEM-MIB::ctlLoRaSensorsAnalogType + op: not_regex + value: '/percent|percentage|%/i' diff --git a/resources/definitions/os_discovery/dnos.yaml b/resources/definitions/os_discovery/dnos.yaml index f26d5b9b40c..fea165d3337 100644 --- a/resources/definitions/os_discovery/dnos.yaml +++ b/resources/definitions/os_discovery/dnos.yaml @@ -32,19 +32,38 @@ modules: processors: data: - - snmp_flags: ['-OQ'] oid: DELL-NETWORKING-CHASSIS-MIB::dellNetCpuUtilTable value: DELL-NETWORKING-CHASSIS-MIB::dellNetCpuUtil1Min num_oid: '.1.3.6.1.4.1.6027.3.26.1.4.4.1.4.{{ $index }}' descr: '1m Utilization' index: 'dellNetCpuUtil1Min.{{ $index }}' - - snmp_flags: ['-OQ'] oid: DELL-NETWORKING-CHASSIS-MIB::dellNetCpuUtilTable value: DELL-NETWORKING-CHASSIS-MIB::dellNetCpuUtil5Min num_oid: '.1.3.6.1.4.1.6027.3.26.1.4.4.1.5.{{ $index }}' descr: '5m Utilization' index: 'dellNetCpuUtil5Min.{{ $index }}' + - + oid: F10-S-SERIES-CHASSIS-MIB::chStackUnitCpuUtil5Sec + num_oid: '.1.3.6.1.4.1.6027.3.10.1.2.9.1.2.{{ $index }}' + descr: 'Stack Unit {{ $index }} CPU' + - + oid: F10-C-SERIES-CHASSIS-MIB::chRpmCpuUtil5Sec + num_oid: '.1.3.6.1.4.1.6027.3.8.1.3.7.1.3.{{ $index }}' + descr: 'Route Process Module {{ $index }} CPU' + type: dnos-rpm + - + oid: F10-C-SERIES-CHASSIS-MIB::chLineCardCpuUtil5Sec + num_oid: '.1.3.6.1.4.1.6027.3.8.1.5.1.1.1.{{ $index }}' + descr: 'Line Card {{ $index }} CPU' + - + oid: F10-M-SERIES-CHASSIS-MIB::chStackUnitCpuUtil5Sec + num_oid: '.1.3.6.1.4.1.6027.3.19.1.2.8.1.2.{{ $index }}' + descr: 'Stack Unit {{ $index }} CPU' + - + oid: F10-Z-SERIES-CHASSIS-MIB::chSysCpuUtil5Sec + num_oid: '.1.3.6.1.4.1.6027.3.25.1.2.3.1.1.{{ $index }}' + descr: 'Chassis {{ $index }} CPU' sensors: voltage: options: diff --git a/resources/definitions/os_discovery/drac.yaml b/resources/definitions/os_discovery/drac.yaml index ba7ea121809..30e9ee221f3 100644 --- a/resources/definitions/os_discovery/drac.yaml +++ b/resources/definitions/os_discovery/drac.yaml @@ -30,19 +30,41 @@ modules: state: data: - - oid: DELL-RAC-MIB::drsGlobalSystemStatus - value: DELL-RAC-MIB::drsGlobalSystemStatus - num_oid: '.1.3.6.1.4.1.674.10892.2.2.1.{{ $index }}' + oid: IDRAC-MIB-SMIv2::globalSystemStatus + value: IDRAC-MIB-SMIv2::globalSystemStatus + num_oid: '.1.3.6.1.4.1.674.10892.5.2.1.{{ $index }}' state_name: drsGlobalSystemStatus descr: 'Global System' index: 'drsGlobalSystemStatus.{{ $index }}' - states: + skip_values: + - + oid: IDRAC-MIB-SMIv2::globalSystemStatus + op: 'not_in_array' + value: [3, 4, 5, 6] + states: &drsGlobalStates - { value: 1, descr: other, generic: 3 } - { value: 2, descr: unknown, generic: 3 } - { value: 3, descr: ok, generic: 0 } - { value: 4, descr: nonCritical, generic: 1 } - { value: 5, descr: critical, generic: 2 } - { value: 6, descr: nonRecoverable, generic: 2 } + - + oid: DELL-RAC-MIB::drsGlobalSystemStatus + value: DELL-RAC-MIB::drsGlobalSystemStatus + num_oid: '.1.3.6.1.4.1.674.10892.2.2.1.{{ $index }}' + state_name: drsGlobalSystemStatus + descr: 'Global System' + index: 'drsGlobalSystemStatus.{{ $index }}' + skip_values: + - + oid: IDRAC-MIB-SMIv2::globalSystemStatus + op: 'in_array' + value: [3, 4, 5, 6] + - + oid: DELL-RAC-MIB::drsGlobalSystemStatus + op: 'not_in_array' + value: [1, 2, 3, 4, 5, 6] + states: *drsGlobalStates - oid: IDRAC-MIB::systemStateIDSDMCardUnitStatusCombined value: IDRAC-MIB::systemStateIDSDMCardUnitStatusCombined diff --git a/resources/definitions/os_discovery/dxmos.yaml b/resources/definitions/os_discovery/dxmos.yaml index 0c9e10ede37..c6ed92bdaea 100644 --- a/resources/definitions/os_discovery/dxmos.yaml +++ b/resources/definitions/os_discovery/dxmos.yaml @@ -1,376 +1,376 @@ -modules: - os: - hardware_mib: XKL-MIB - version: XKL-MIB::xklSysOs.0 - sensors: - chromatic_dispersion: - data: - - - oid: XKL-MIB::xklWaveMediaSidePMTable - value: XKL-MIB::xklWaveMediaSidePMRxCDCurrent - num_oid: '.1.3.6.1.4.1.21150.1.1.35.1.13.{{ $index }}' - descr: '{{ XKL-MIB::xklWaveMediaSidePMWaveDescr }} Chromatic Dispersion' - index: 'XKL-MIB::xklWaveMediaSidePMRxCDCurrent.{{ $index }}' - skip_values: - - - oid: XKL-MIB::xklWaveMediaSidePMWaveStatus - op: '=' - value: '2' - temperature: - data: - - - oid: XKL-MIB::xklTransportTable - value: XKL-MIB::xklTransportTemp - num_oid: '.1.3.6.1.4.1.21150.1.1.3.1.10.{{ $index }}' - descr: '{{ XKL-MIB::xklTransportDescr }} Temperature' - index: 'xklTransportTemp.{{ $index }}' - group: 'transciever' - low_limit: XKL-MIB::xklTransportTempLoAlrmThreshold - low_warn_limit: XKL-MIB::xklTransportTempLoWarnThreshold - warn_limit: XKL-MIB::xklTransportTempHiWarnThreshold - high_limit: XKL-MIB::xklTransportTempHiAlrmThreshold - skip_values: - - - oid: XKL-MIB::xklTransportStatus - op: '=' - value: '2' - - - oid: XKL-MIB::xklSensorTable - value: XKL-MIB::xklSensorTemp - num_oid: '.1.3.6.1.4.1.21150.1.1.13.1.3.{{ $index }}' - descr: '{{ XKL-MIB::xklSensorDescription }} Temperature' - index: 'xklSensorTemp.{{ $index }}' - group: 'System Temperature' - low_limit: XKL-MIB::xklSensorLowAlarm - low_warn_limit: XKL-MIB::xklSensorLowWarn - warn_limit: XKL-MIB::xklSensorHighWarn - high_limit: XKL-MIB::xklSensorHighAlarm - skip_values: - - - oid: XKL-MIB::xklSensorStatus - op: '=' - value: '3' - - - oid: XKL-MIB::xklEDFATable - value: XKL-MIB::xklEDFACaseTemp - num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.26.{{ $index }}' - descr: '{{ XKL-MIB::xklEDFAName }} Case Temperature' - index: 'xklEDFACaseTemp.{{ $index }}' - group: 'EDFA Amplifiers' - divisor: 10 - - - oid: XKL-MIB::xklEDFATable - value: XKL-MIB::xklEDFAPumpLaserTemp - num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.28.{{ $index }}' - descr: '{{ XKL-MIB::xklEDFAName }} Pump Laser Temperature' - index: 'xklEDFAPumpLaserTemp.{{ $index }}' - group: 'EDFA Amplifiers' - divisor: 10 - dbm: - data: - - - oid: XKL-MIB::xklTransportTable - value: XKL-MIB::xklTransportTransmitPower - num_oid: '.1.3.6.1.4.1.21150.1.1.3.1.11.{{ $index }}' - descr: '{{ XKL-MIB::xklTransportDescr }} TX Power' - index: 'xklTransportTransmitPower.{{ $index }}' - group: 'transciever' - low_limit: XKL-MIB::xklTransportTxPowerLoAlrmThresh - low_warn_limit: XKL-MIB::xklTransportTxPowerLoWarnThresh - warn_limit: XKL-MIB::xklTransportTxPowerHiWarnThresh - high_limit: XKL-MIB::xklTransportTxPowerHiAlrmThresh - divisor: 10 - skip_values: - - - oid: XKL-MIB::xklTransportStatus - op: '=' - value: '2' - - - oid: XKL-MIB::xklTransportTable - value: XKL-MIB::xklTransportReceivePower - num_oid: '.1.3.6.1.4.1.21150.1.1.3.1.12.{{ $index }}' - descr: '{{ XKL-MIB::xklTransportDescr }} RX Power' - index: 'xklTransportReceivePower.{{ $index }}' - group: 'transciever' - low_limit: XKL-MIB::xklTransportRxPowerLoAlrmThresh - low_warn_limit: XKL-MIB::xklTransportRxPowerLoWarnThresh - warn_limit: XKL-MIB::xklTransportRxPowerHiWarnThresh - high_limit: XKL-MIB::xklTransportRxPowerHiAlrmThresh - divisor: 10 - skip_values: - - - oid: XKL-MIB::xklTransportStatus - op: '=' - value: '2' - - - oid: XKL-MIB::xklTransceiverModuleTable - value: XKL-MIB::xklTransceiverModuleOSNR - num_oid: '.1.3.6.1.4.1.21150.1.1.23.1.7.{{ $index }}' - descr: '{{ XKL-MIB::xklTransceiverModuleDescr }} Optical RX SNR' - index: 'xklTransceiverModuleOSNR.{{ $index }}' - group: 'transciever' - divisor: 10 - skip_values: - - - oid: XKL-MIB::xklTransceiverModuleStatus - op: '=' - value: '2' - - - oid: XKL-MIB::xklTransceiverModuleOSNR - op: '=' - value: '0' - - - oid: XKL-MIB::xklTransceiverModuleTable - value: XKL-MIB::xklTransceiverModuleESNR - num_oid: '.1.3.6.1.4.1.21150.1.1.23.1.28.{{ $index }}' - descr: '{{ XKL-MIB::xklTransceiverModuleDescr }} Electrical RX SNR' - index: 'xklTransceiverModuleESNR.{{ $index }}' - group: 'transciever' - divisor: 10 - skip_values: - - - oid: XKL-MIB::xklTransceiverModuleStatus - op: '=' - value: '2' - - - oid: XKL-MIB::xklTransceiverModuleESNR - op: '=' - value: '0' - - - oid: XKL-MIB::xklEDFATable - value: XKL-MIB::xklEDFAPumpLaserPower - num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.30.{{ $index }}' - descr: '{{ XKL-MIB::xklEDFAName }} Pump Power' - index: 'xklEDFAPumpLaserPower.{{ $index }}' - group: 'EDFA Amplifiers' - divisor: 10 - - - oid: XKL-MIB::xklEDFATable - value: XKL-MIB::xklEDFAInputOpticalPower - num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.24.{{ $index }}' - descr: '{{ XKL-MIB::xklEDFAName }} Input Power' - index: 'xklEDFAInputOpticalPower.{{ $index }}' - group: 'EDFA Amplifiers' - divisor: 10 - - - oid: XKL-MIB::xklEDFATable - value: XKL-MIB::xklEDFAOutputOpticalPower - num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.25.{{ $index }}' - descr: '{{ XKL-MIB::xklEDFAName }} Output Power' - index: 'xklEDFAOutputOpticalPower.{{ $index }}' - group: 'EDFA Amplifiers' - divisor: 10 - fanspeed: - data: - - - oid: XKL-MIB::xklFanUnitTable - value: XKL-MIB::xklFanUnitSpeedActual - num_oid: '.1.3.6.1.4.1.21150.1.1.7.1.5.{{ $index }}' - descr: 'Fan {{ $index }} Speed' - index: 'xklFanUnitSpeedActual.{{ $index }}' - skip_values: - - - oid: XKL-MIB::xklFanUnitStatus - op: '=' - value: '4' - voltage: - data: - - - oid: XKL-MIB::xklTransportTable - value: XKL-MIB::xklTransportVoltage - num_oid: '.1.3.6.1.4.1.21150.1.1.3.1.43.{{ $index }}' - descr: '{{ XKL-MIB::xklTransportDescr }} voltage' - index: 'xklTransportVoltage.{{ $index }}' - group: 'transciever' - low_limit: XKL-MIB::xklTransportVoltageLoAlrmThresh - low_warn_limit: XKL-MIB::xklTransportVoltageLoWarnThresh - warn_limit: XKL-MIB::xklTransportVoltageHiWarnThresh - high_limit: XKL-MIB::xklTransportVoltageHiAlrmThresh - divisor: 10000 - skip_values: - - - oid: XKL-MIB::xklTransportStatus - op: '=' - value: '2' - - - oid: XKL-MIB::xklPowerTable - value: XKL-MIB::xklPowerVoltage - num_oid: '.1.3.6.1.4.1.21150.1.1.9.1.4.{{ $index }}' - descr: '{{ XKL-MIB::xklPowerDescr }} Voltage' - index: 'xklPowerVoltage.{{ $index }}' - group: 'Power Supplies' - divisor: 1000 - current: - data: - - - oid: XKL-MIB::xklPowerTable - value: XKL-MIB::xklPowerCurrent - num_oid: '.1.3.6.1.4.1.21150.1.1.9.1.5.{{ $index }}' - descr: '{{ XKL-MIB::xklPowerDescr }} Current' - index: 'xklPowerCurrent.{{ $index }}' - group: 'Power Supplies' - divisor: 1000 - skip_values: - - - oid: XKL-MIB::xklTransportStatus - op: '=' - value: '2' - - - oid: XKL-MIB::xklTransportTable - value: XKL-MIB::xklTransportLaserBias - num_oid: '.1.3.6.1.4.1.21150.1.1.3.1.15.{{ $index }}' - descr: '{{ XKL-MIB::xklTransportDescr }} BIAS' - index: 'xklTransportLaserBias.{{ $index }}' - group: 'transciever' - divisor: 1000000 - skip_values: - - - oid: XKL-MIB::xklTransportStatus - op: '=' - value: '2' - - - oid: XKL-MIB::xklEDFATable - value: XKL-MIB::xklEDFAPumpLaserCurrent - num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.29.{{ $index }}' - descr: '{{ XKL-MIB::xklEDFAName }} Pump Current' - index: 'xklEDFAPumpLaserCurrent.{{ $index }}' - group: 'EDFA Amplifiers' - divisor: 10000 - state: - data: - - - oid: XKL-MIB::xklFanControllerTable - value: XKL-MIB::xklFanControllerStatus - num_oid: '.1.3.6.1.4.1.21150.1.1.5.1.2.{{ $index }}' - descr: 'Fan Controller {{ $index }} Status' - index: 'xklFanControllerStatus.{{ $index }}' - group: 'Fans' - state_name: XKL-MIB::xklFanControllerStatus - states: - - { value: 1, generic: 3, descr: other } - - { value: 2, generic: 0, descr: normal } - - { value: 3, generic: 1, descr: offline } - - { value: 4, generic: 1, descr: error } - - { value: 5, generic: 1, descr: cmdReady } - - { value: 6, generic: 2, descr: alarm } - - { value: 7, generic: 2, descr: timerOverflow } - - { value: 8, generic: 0, descr: absent } - - { value: 9, generic: 2, descr: communicationsError } - skip_values: - - - oid: XKL-MIB::xklFanControllerStatus - op: '=' - value: '8' - - - oid: XKL-MIB::xklFanControllerTable - value: XKL-MIB::xklFanUnitStatus - num_oid: '.1.3.6.1.4.1.21150.1.1.7.1.3.{{ $index }}' - descr: 'Fan {{ $index }} Status' - index: 'xklFanUnitStatus.{{ $index }}' - group: 'Fans' - state_name: XKL-MIB::xklFanUnitStatus - states: - - { value: 1, generic: 3, descr: other } - - { value: 2, generic: 0, descr: normal } - - { value: 3, generic: 1, descr: off } - - { value: 4, generic: 1, descr: notPresent } - - { value: 5, generic: 2, descr: alarm } - - { value: 6, generic: 1, descr: cmdReady } - - { value: 7, generic: 1, descr: override } - - { value: 8, generic: 3, descr: test } - skip_values: - - - oid: 'XKL-MIB::xklFanControllerStatus.{{ xklFanUnitController }}' - op: '=' - value: '8' - - - oid: XKL-MIB::xklPowerTable - value: XKL-MIB::xklPowerStatus - num_oid: '.1.3.6.1.4.1.21150.1.1.9.1.2.{{ $index }}' - descr: '{{ XKL-MIB::xklPowerDescr }} State' - index: 'xklPowerStatus.{{ $index }}' - group: 'Power Supplies' - state_name: XKL-MIB::xklPowerStatus - states: - - { value: 1, generic: 3, descr: other } - - { value: 2, generic: 0, descr: normal } - - { value: 3, generic: 2, descr: offline } - - { value: 4, generic: 2, descr: noPower } - - { value: 5, generic: 3, descr: absent } - - { value: 6, generic: 1, descr: overTemp } - - { value: 7, generic: 2, descr: dcFault } - - { value: 8, generic: 1, descr: fanSlow } - - { value: 9, generic: 2, descr: alert } - - - oid: XKL-MIB::xklEDFATable - value: XKL-MIB::xklEDFAMode - num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.22.{{ $index }}' - descr: '{{ XKL-MIB::xklEDFAName }} Amplifier Mode' - index: 'xklEDFAMode.{{ $index }}' - group: 'EDFA Amplifiers' - state_name: XKL-MIB::xklEDFAMode - states: - - { value: -1, generic: 3, descr: none } - - { value: 0, generic: 0, descr: booster } - - { value: 1, generic: 0, descr: preamp } - - - oid: XKL-MIB::xklEDFATable - value: XKL-MIB::xklEDFAPumpLaserStatus - num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.27.{{ $index }}' - descr: '{{ XKL-MIB::xklEDFAName }} Laser Pump Status' - index: 'xklEDFAPumpLaserStatus.{{ $index }}' - group: 'EDFA Amplifiers' - state_name: XKL-MIB::xklEDFAPumpLaserStatus - states: - - { value: 0, generic: 2, descr: disabled } - - { value: 1, generic: 0, descr: enabled } - - - oid: XKL-MIB::xklEDFATable - value: XKL-MIB::xklEDFAAmplificationState - num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.31.{{ $index }}' - descr: '{{ XKL-MIB::xklEDFAName }} Amplifier State ' - index: 'xklEDFAAmplificationState.{{ $index }}' - group: 'EDFA Amplifiers' - state_name: XKL-MIB::xklEDFAAmplificationState - states: - - { value: 0, generic: 2, descr: down } - - { value: 1, generic: 0, descr: up } - - { value: 2, generic: 3, descr: unused } - - { value: 3, generic: 2, descr: los } - - { value: 4, generic: 1, descr: warning } - - { value: 5, generic: 2, descr: alarm } - - { value: 6, generic: 1, descr: reset } - - { value: 7, generic: 3, descr: unknown } - - - oid: XKL-MIB::xklEDFATable - value: XKL-MIB::xklEDFACommonAlarm - num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.8.{{ $index }}' - descr: '{{ XKL-MIB::xklEDFAName }} Common Alarm' - index: 'xklEDFACommonAlarm.{{ $index}}' - group: 'Amplifier Alarms' - state_name: XKL-MIB::xklEDFACommonAlarm - states: - - { value: 1, generic: 3, descr: unused } - - { value: 2, generic: 2, descr: yes } - - { value: 3, generic: 0, descr: no } - - - oid: XKL-MIB::xklEDFATable - value: XKL-MIB::xklEDFALossOfInputAlarm - num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.10.{{ $index }}' - descr: '{{ XKL-MIB::xklEDFAName }} Loss of Input Alarm' - index: 'xklEDFALossOfInputAlarm.{{ $index}}' - states: - - { value: 2, generic: 2, descr: yes } - - { value: 3, generic: 0, descr: no } - - - oid: XKL-MIB::xklEDFATable - value: XKL-MIB::xklEDFALossOfOutputAlarm - num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.11.{{ $index }}' - descr: '{{ XKL-MIB::xklEDFAName }} Loss of Output Alarm' - index: 'xklEDFALossOfOutputAlarm.{{ $index}}' - group: 'Amplifier Alarms' - state_name: XKL-MIB::xklEDFALossOfOutputAlarm - states: - - { value: 1, generic: 3, descr: unused } - - { value: 2, generic: 2, descr: yes } - - { value: 3, generic: 0, descr: no } +modules: + os: + hardware_mib: XKL-MIB + version: XKL-MIB::xklSysOs.0 + sensors: + chromatic_dispersion: + data: + - + oid: XKL-MIB::xklWaveMediaSidePMTable + value: XKL-MIB::xklWaveMediaSidePMRxCDCurrent + num_oid: '.1.3.6.1.4.1.21150.1.1.35.1.13.{{ $index }}' + descr: '{{ XKL-MIB::xklWaveMediaSidePMWaveDescr }} Chromatic Dispersion' + index: 'XKL-MIB::xklWaveMediaSidePMRxCDCurrent.{{ $index }}' + skip_values: + - + oid: XKL-MIB::xklWaveMediaSidePMWaveStatus + op: '=' + value: '2' + temperature: + data: + - + oid: XKL-MIB::xklTransportTable + value: XKL-MIB::xklTransportTemp + num_oid: '.1.3.6.1.4.1.21150.1.1.3.1.10.{{ $index }}' + descr: '{{ XKL-MIB::xklTransportDescr }} Temperature' + index: 'xklTransportTemp.{{ $index }}' + group: 'transciever' + low_limit: XKL-MIB::xklTransportTempLoAlrmThreshold + low_warn_limit: XKL-MIB::xklTransportTempLoWarnThreshold + warn_limit: XKL-MIB::xklTransportTempHiWarnThreshold + high_limit: XKL-MIB::xklTransportTempHiAlrmThreshold + skip_values: + - + oid: XKL-MIB::xklTransportStatus + op: '=' + value: '2' + - + oid: XKL-MIB::xklSensorTable + value: XKL-MIB::xklSensorTemp + num_oid: '.1.3.6.1.4.1.21150.1.1.13.1.3.{{ $index }}' + descr: '{{ XKL-MIB::xklSensorDescription }} Temperature' + index: 'xklSensorTemp.{{ $index }}' + group: 'System Temperature' + low_limit: XKL-MIB::xklSensorLowAlarm + low_warn_limit: XKL-MIB::xklSensorLowWarn + warn_limit: XKL-MIB::xklSensorHighWarn + high_limit: XKL-MIB::xklSensorHighAlarm + skip_values: + - + oid: XKL-MIB::xklSensorStatus + op: '=' + value: '3' + - + oid: XKL-MIB::xklEDFATable + value: XKL-MIB::xklEDFACaseTemp + num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.26.{{ $index }}' + descr: '{{ XKL-MIB::xklEDFAName }} Case Temperature' + index: 'xklEDFACaseTemp.{{ $index }}' + group: 'EDFA Amplifiers' + divisor: 10 + - + oid: XKL-MIB::xklEDFATable + value: XKL-MIB::xklEDFAPumpLaserTemp + num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.28.{{ $index }}' + descr: '{{ XKL-MIB::xklEDFAName }} Pump Laser Temperature' + index: 'xklEDFAPumpLaserTemp.{{ $index }}' + group: 'EDFA Amplifiers' + divisor: 10 + dbm: + data: + - + oid: XKL-MIB::xklTransportTable + value: XKL-MIB::xklTransportTransmitPower + num_oid: '.1.3.6.1.4.1.21150.1.1.3.1.11.{{ $index }}' + descr: '{{ XKL-MIB::xklTransportDescr }} TX Power' + index: 'xklTransportTransmitPower.{{ $index }}' + group: 'transciever' + low_limit: XKL-MIB::xklTransportTxPowerLoAlrmThresh + low_warn_limit: XKL-MIB::xklTransportTxPowerLoWarnThresh + warn_limit: XKL-MIB::xklTransportTxPowerHiWarnThresh + high_limit: XKL-MIB::xklTransportTxPowerHiAlrmThresh + divisor: 10 + skip_values: + - + oid: XKL-MIB::xklTransportStatus + op: '=' + value: '2' + - + oid: XKL-MIB::xklTransportTable + value: XKL-MIB::xklTransportReceivePower + num_oid: '.1.3.6.1.4.1.21150.1.1.3.1.12.{{ $index }}' + descr: '{{ XKL-MIB::xklTransportDescr }} RX Power' + index: 'xklTransportReceivePower.{{ $index }}' + group: 'transciever' + low_limit: XKL-MIB::xklTransportRxPowerLoAlrmThresh + low_warn_limit: XKL-MIB::xklTransportRxPowerLoWarnThresh + warn_limit: XKL-MIB::xklTransportRxPowerHiWarnThresh + high_limit: XKL-MIB::xklTransportRxPowerHiAlrmThresh + divisor: 10 + skip_values: + - + oid: XKL-MIB::xklTransportStatus + op: '=' + value: '2' + - + oid: XKL-MIB::xklTransceiverModuleTable + value: XKL-MIB::xklTransceiverModuleOSNR + num_oid: '.1.3.6.1.4.1.21150.1.1.23.1.7.{{ $index }}' + descr: '{{ XKL-MIB::xklTransceiverModuleDescr }} Optical RX SNR' + index: 'xklTransceiverModuleOSNR.{{ $index }}' + group: 'transciever' + divisor: 10 + skip_values: + - + oid: XKL-MIB::xklTransceiverModuleStatus + op: '=' + value: '2' + - + oid: XKL-MIB::xklTransceiverModuleOSNR + op: '=' + value: '0' + - + oid: XKL-MIB::xklTransceiverModuleTable + value: XKL-MIB::xklTransceiverModuleESNR + num_oid: '.1.3.6.1.4.1.21150.1.1.23.1.28.{{ $index }}' + descr: '{{ XKL-MIB::xklTransceiverModuleDescr }} Electrical RX SNR' + index: 'xklTransceiverModuleESNR.{{ $index }}' + group: 'transciever' + divisor: 10 + skip_values: + - + oid: XKL-MIB::xklTransceiverModuleStatus + op: '=' + value: '2' + - + oid: XKL-MIB::xklTransceiverModuleESNR + op: '=' + value: '0' + - + oid: XKL-MIB::xklEDFATable + value: XKL-MIB::xklEDFAPumpLaserPower + num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.30.{{ $index }}' + descr: '{{ XKL-MIB::xklEDFAName }} Pump Power' + index: 'xklEDFAPumpLaserPower.{{ $index }}' + group: 'EDFA Amplifiers' + divisor: 10 + - + oid: XKL-MIB::xklEDFATable + value: XKL-MIB::xklEDFAInputOpticalPower + num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.24.{{ $index }}' + descr: '{{ XKL-MIB::xklEDFAName }} Input Power' + index: 'xklEDFAInputOpticalPower.{{ $index }}' + group: 'EDFA Amplifiers' + divisor: 10 + - + oid: XKL-MIB::xklEDFATable + value: XKL-MIB::xklEDFAOutputOpticalPower + num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.25.{{ $index }}' + descr: '{{ XKL-MIB::xklEDFAName }} Output Power' + index: 'xklEDFAOutputOpticalPower.{{ $index }}' + group: 'EDFA Amplifiers' + divisor: 10 + fanspeed: + data: + - + oid: XKL-MIB::xklFanUnitTable + value: XKL-MIB::xklFanUnitSpeedActual + num_oid: '.1.3.6.1.4.1.21150.1.1.7.1.5.{{ $index }}' + descr: 'Fan {{ $index }} Speed' + index: 'xklFanUnitSpeedActual.{{ $index }}' + skip_values: + - + oid: XKL-MIB::xklFanUnitStatus + op: '=' + value: '4' + voltage: + data: + - + oid: XKL-MIB::xklTransportTable + value: XKL-MIB::xklTransportVoltage + num_oid: '.1.3.6.1.4.1.21150.1.1.3.1.43.{{ $index }}' + descr: '{{ XKL-MIB::xklTransportDescr }} voltage' + index: 'xklTransportVoltage.{{ $index }}' + group: 'transciever' + low_limit: XKL-MIB::xklTransportVoltageLoAlrmThresh + low_warn_limit: XKL-MIB::xklTransportVoltageLoWarnThresh + warn_limit: XKL-MIB::xklTransportVoltageHiWarnThresh + high_limit: XKL-MIB::xklTransportVoltageHiAlrmThresh + divisor: 10000 + skip_values: + - + oid: XKL-MIB::xklTransportStatus + op: '=' + value: '2' + - + oid: XKL-MIB::xklPowerTable + value: XKL-MIB::xklPowerVoltage + num_oid: '.1.3.6.1.4.1.21150.1.1.9.1.4.{{ $index }}' + descr: '{{ XKL-MIB::xklPowerDescr }} Voltage' + index: 'xklPowerVoltage.{{ $index }}' + group: 'Power Supplies' + divisor: 1000 + current: + data: + - + oid: XKL-MIB::xklPowerTable + value: XKL-MIB::xklPowerCurrent + num_oid: '.1.3.6.1.4.1.21150.1.1.9.1.5.{{ $index }}' + descr: '{{ XKL-MIB::xklPowerDescr }} Current' + index: 'xklPowerCurrent.{{ $index }}' + group: 'Power Supplies' + divisor: 1000 + skip_values: + - + oid: XKL-MIB::xklTransportStatus + op: '=' + value: '2' + - + oid: XKL-MIB::xklTransportTable + value: XKL-MIB::xklTransportLaserBias + num_oid: '.1.3.6.1.4.1.21150.1.1.3.1.15.{{ $index }}' + descr: '{{ XKL-MIB::xklTransportDescr }} BIAS' + index: 'xklTransportLaserBias.{{ $index }}' + group: 'transciever' + divisor: 1000000 + skip_values: + - + oid: XKL-MIB::xklTransportStatus + op: '=' + value: '2' + - + oid: XKL-MIB::xklEDFATable + value: XKL-MIB::xklEDFAPumpLaserCurrent + num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.29.{{ $index }}' + descr: '{{ XKL-MIB::xklEDFAName }} Pump Current' + index: 'xklEDFAPumpLaserCurrent.{{ $index }}' + group: 'EDFA Amplifiers' + divisor: 10000 + state: + data: + - + oid: XKL-MIB::xklFanControllerTable + value: XKL-MIB::xklFanControllerStatus + num_oid: '.1.3.6.1.4.1.21150.1.1.5.1.2.{{ $index }}' + descr: 'Fan Controller {{ $index }} Status' + index: 'xklFanControllerStatus.{{ $index }}' + group: 'Fans' + state_name: XKL-MIB::xklFanControllerStatus + states: + - { value: 1, generic: 3, descr: other } + - { value: 2, generic: 0, descr: normal } + - { value: 3, generic: 1, descr: offline } + - { value: 4, generic: 1, descr: error } + - { value: 5, generic: 1, descr: cmdReady } + - { value: 6, generic: 2, descr: alarm } + - { value: 7, generic: 2, descr: timerOverflow } + - { value: 8, generic: 0, descr: absent } + - { value: 9, generic: 2, descr: communicationsError } + skip_values: + - + oid: XKL-MIB::xklFanControllerStatus + op: '=' + value: '8' + - + oid: XKL-MIB::xklFanControllerTable + value: XKL-MIB::xklFanUnitStatus + num_oid: '.1.3.6.1.4.1.21150.1.1.7.1.3.{{ $index }}' + descr: 'Fan {{ $index }} Status' + index: 'xklFanUnitStatus.{{ $index }}' + group: 'Fans' + state_name: XKL-MIB::xklFanUnitStatus + states: + - { value: 1, generic: 3, descr: other } + - { value: 2, generic: 0, descr: normal } + - { value: 3, generic: 1, descr: off } + - { value: 4, generic: 1, descr: notPresent } + - { value: 5, generic: 2, descr: alarm } + - { value: 6, generic: 1, descr: cmdReady } + - { value: 7, generic: 1, descr: override } + - { value: 8, generic: 3, descr: test } + skip_values: + - + oid: 'XKL-MIB::xklFanControllerStatus.{{ xklFanUnitController }}' + op: '=' + value: '8' + - + oid: XKL-MIB::xklPowerTable + value: XKL-MIB::xklPowerStatus + num_oid: '.1.3.6.1.4.1.21150.1.1.9.1.2.{{ $index }}' + descr: '{{ XKL-MIB::xklPowerDescr }} State' + index: 'xklPowerStatus.{{ $index }}' + group: 'Power Supplies' + state_name: XKL-MIB::xklPowerStatus + states: + - { value: 1, generic: 3, descr: other } + - { value: 2, generic: 0, descr: normal } + - { value: 3, generic: 2, descr: offline } + - { value: 4, generic: 2, descr: noPower } + - { value: 5, generic: 3, descr: absent } + - { value: 6, generic: 1, descr: overTemp } + - { value: 7, generic: 2, descr: dcFault } + - { value: 8, generic: 1, descr: fanSlow } + - { value: 9, generic: 2, descr: alert } + - + oid: XKL-MIB::xklEDFATable + value: XKL-MIB::xklEDFAMode + num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.22.{{ $index }}' + descr: '{{ XKL-MIB::xklEDFAName }} Amplifier Mode' + index: 'xklEDFAMode.{{ $index }}' + group: 'EDFA Amplifiers' + state_name: XKL-MIB::xklEDFAMode + states: + - { value: -1, generic: 3, descr: none } + - { value: 0, generic: 0, descr: booster } + - { value: 1, generic: 0, descr: preamp } + - + oid: XKL-MIB::xklEDFATable + value: XKL-MIB::xklEDFAPumpLaserStatus + num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.27.{{ $index }}' + descr: '{{ XKL-MIB::xklEDFAName }} Laser Pump Status' + index: 'xklEDFAPumpLaserStatus.{{ $index }}' + group: 'EDFA Amplifiers' + state_name: XKL-MIB::xklEDFAPumpLaserStatus + states: + - { value: 0, generic: 2, descr: disabled } + - { value: 1, generic: 0, descr: enabled } + - + oid: XKL-MIB::xklEDFATable + value: XKL-MIB::xklEDFAAmplificationState + num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.31.{{ $index }}' + descr: '{{ XKL-MIB::xklEDFAName }} Amplifier State ' + index: 'xklEDFAAmplificationState.{{ $index }}' + group: 'EDFA Amplifiers' + state_name: XKL-MIB::xklEDFAAmplificationState + states: + - { value: 0, generic: 2, descr: down } + - { value: 1, generic: 0, descr: up } + - { value: 2, generic: 3, descr: unused } + - { value: 3, generic: 2, descr: los } + - { value: 4, generic: 1, descr: warning } + - { value: 5, generic: 2, descr: alarm } + - { value: 6, generic: 1, descr: reset } + - { value: 7, generic: 3, descr: unknown } + - + oid: XKL-MIB::xklEDFATable + value: XKL-MIB::xklEDFACommonAlarm + num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.8.{{ $index }}' + descr: '{{ XKL-MIB::xklEDFAName }} Common Alarm' + index: 'xklEDFACommonAlarm.{{ $index}}' + group: 'Amplifier Alarms' + state_name: XKL-MIB::xklEDFACommonAlarm + states: + - { value: 1, generic: 3, descr: unused } + - { value: 2, generic: 2, descr: yes } + - { value: 3, generic: 0, descr: no } + - + oid: XKL-MIB::xklEDFATable + value: XKL-MIB::xklEDFALossOfInputAlarm + num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.10.{{ $index }}' + descr: '{{ XKL-MIB::xklEDFAName }} Loss of Input Alarm' + index: 'xklEDFALossOfInputAlarm.{{ $index}}' + states: + - { value: 2, generic: 2, descr: yes } + - { value: 3, generic: 0, descr: no } + - + oid: XKL-MIB::xklEDFATable + value: XKL-MIB::xklEDFALossOfOutputAlarm + num_oid: '.1.3.6.1.4.1.21150.1.1.17.1.11.{{ $index }}' + descr: '{{ XKL-MIB::xklEDFAName }} Loss of Output Alarm' + index: 'xklEDFALossOfOutputAlarm.{{ $index}}' + group: 'Amplifier Alarms' + state_name: XKL-MIB::xklEDFALossOfOutputAlarm + states: + - { value: 1, generic: 3, descr: unused } + - { value: 2, generic: 2, descr: yes } + - { value: 3, generic: 0, descr: no } diff --git a/resources/definitions/os_discovery/eaton-sc200.yaml b/resources/definitions/os_discovery/eaton-sc200.yaml index 72ec363727f..be37873d40c 100644 --- a/resources/definitions/os_discovery/eaton-sc200.yaml +++ b/resources/definitions/os_discovery/eaton-sc200.yaml @@ -26,7 +26,7 @@ modules: index: 'ac.{{ $index }}' skip_values: - - oid: RPS-SC200-MIB::rectifier-Serial-Number + oid: RPS-SC200-MIB::rectifier-Registration-State op: '==' value: "0" - @@ -52,7 +52,7 @@ modules: high_limit: RPS-SC200-MIB::rectifier-Maximum-OVSD-Set-Point skip_values: - - oid: RPS-SC200-MIB::rectifier-Serial-Number + oid: RPS-SC200-MIB::rectifier-Registration-State op: '==' value: "0" @@ -83,7 +83,7 @@ modules: descr: 'Rect {{ $index }} Current' skip_values: - - oid: RPS-SC200-MIB::rectifier-Serial-Number + oid: RPS-SC200-MIB::rectifier-Registration-State op: '==' value: "0" load: @@ -102,7 +102,7 @@ modules: divisor: 10 skip_values: - - oid: RPS-SC200-MIB::rectifier-Serial-Number + oid: RPS-SC200-MIB::rectifier-Registration-State op: '==' value: "0" @@ -126,7 +126,7 @@ modules: index: 'rectTemp.{{ $index }}' skip_values: - - oid: RPS-SC200-MIB::rectifier-Serial-Number + oid: RPS-SC200-MIB::rectifier-Registration-State op: '==' value: "0" state: @@ -178,3 +178,29 @@ modules: states: - { descr: 'OK', value: 0, generic: 0 } - { descr: 'Active', value: 1, generic: 1 } + - + oid: RPS-SC200-MIB::btr-State + value: RPS-SC200-MIB::btr-State + num_oid: '.1.3.6.1.4.1.1918.2.13.10.100.60.10.{{ $index }}' + descr: 'Battery Runtime Estimation' + states: + - { descr: 'inoperative', value: 0, generic: 1 } + - { descr: 'inactive', value: 1, generic: 0 } + - { descr: 'active', value: 2, generic: 0 } + - { descr: 'characterizing', value: 3, generic: 0 } + - { descr: 'waiting', value: 4, generic: 0 } + - { descr: 'not-Characterized', value: 5, generic: 3 } + - + oid: RPS-SC200-MIB::btr-Characterization-Result + value: RPS-SC200-MIB::btr-Characterization-Result + num_oid: '.1.3.6.1.4.1.1918.2.13.10.100.60.40.{{ $index }}' + descr: 'Battery Characterization' + states: + - { descr: 'not-Yet-Run', value: 0, generic: 3 } + - { descr: 'sensor-Failed', value: 1, generic: 1 } + - { descr: 'not-Fully-Charged', value: 2, generic: 1 } + - { descr: 'unstable-Battery-Current', value: 3, generic: 1 } + - { descr: 'voltage-Step-Detected', value: 4, generic: 1 } + - { descr: 'complete', value: 5, generic: 0 } + - { descr: 'updated', value: 6, generic: 0 } + - { descr: 'user-Canceled', value: 7, generic: 3 } diff --git a/resources/definitions/os_discovery/eatonpdu.yaml b/resources/definitions/os_discovery/eatonpdu.yaml index 9d266c844ee..d4c6dd0839a 100644 --- a/resources/definitions/os_discovery/eatonpdu.yaml +++ b/resources/definitions/os_discovery/eatonpdu.yaml @@ -11,48 +11,226 @@ modules: - EATON-EPDU-MIB::firmwareVersion.0 - PDU-MIB::firmwareVersion.0 sensors: + additional_oids: + data: + - + oid: + - EATON-EPDU-MIB::temperatureScale + - EATON-EPDU-MIB::inputPhaseDesignator + - EATON-EPDU-MIB::inputVoltageMeasType + - EATON-EPDU-MIB::inputPowerMeasType + - EATON-EPDU-MIB::inputCurrentThUpperWarning + - EATON-EPDU-MIB::inputCurrentThUpperCritical + - EATON-EPDU-MIB::groupName + - EATON-EPDU-MIB::groupCurrentThUpperWarning + - EATON-EPDU-MIB::groupCurrentThUpperCritical + - EATON-EPDU-MIB::outletName + - EATON-EPDU-MIB::outletDesignator + - EATON-EPDU-MIB::outletCurrentThUpperWarning + - EATON-EPDU-MIB::outletCurrentThUpperCritical + - EATON-EPDU-MIB::outletControlSwitchable + - EATON-EPDU-MIB::temperatureName + - EATON-EPDU-MIB::temperatureProbeStatus + - EATON-EPDU-MIB::humidityName + - EATON-EPDU-MIB::humidityProbeStatus power: data: - - oid: EATON-EPDU-MIB::inputs - value: EATON-EPDU-MIB::inputWatts + oid: EATON-EPDU-MIB::inputWatts + num_oid: '.1.3.6.1.4.1.534.6.6.7.3.4.1.4.{{ $index }}' + descr: 'Unit {{ $subindex0 }} Input Feed L1' + group: 'Unit {{ $subindex0 }}' + index: 'inputWatts.{{ $index }}' + skip_values: + - { oid: EATON-EPDU-MIB::inputPowerMeasType, op: '!=', value: 1 } + - + oid: EATON-EPDU-MIB::inputWatts + num_oid: '.1.3.6.1.4.1.534.6.6.7.3.4.1.4.{{ $index }}' + descr: 'Unit {{ $subindex0 }} Input Feed L2' + group: 'Unit {{ $subindex0 }}' + index: 'inputWatts.{{ $index }}' + skip_values: + - { oid: EATON-EPDU-MIB::inputPowerMeasType, op: '!=', value: 2 } + - + oid: EATON-EPDU-MIB::inputWatts + num_oid: '.1.3.6.1.4.1.534.6.6.7.3.4.1.4.{{ $index }}' + descr: 'Unit {{ $subindex0 }} Input Feed L3' + group: 'Unit {{ $subindex0 }}' + index: 'inputWatts.{{ $index }}' + skip_values: + - { oid: EATON-EPDU-MIB::inputPowerMeasType, op: '!=', value: 3 } + - + oid: EATON-EPDU-MIB::inputWatts + num_oid: '.1.3.6.1.4.1.534.6.6.7.3.4.1.4.{{ $index }}' + descr: 'Unit {{ $subindex0 }} Input Feed Total' + group: 'Unit {{ $subindex0 }}' + index: 'inputWatts.{{ $index }}' + skip_values: + - { oid: EATON-EPDU-MIB::inputPowerMeasType, op: '!=', value: 4 } + - + oid: EATON-EPDU-MIB::inputWatts num_oid: '.1.3.6.1.4.1.534.6.6.7.3.4.1.4.{{ $index }}' - multiplier: 1 - descr: 'Input Feed {{ EATON-EPDU-MIB::inputPhaseDesignator }}' + descr: 'Unit {{ $subindex0 }} Input {{ $subindex2 }}' + group: 'Unit {{ $subindex0 }}' index: 'inputWatts.{{ $index }}' + skip_values: + - { oid: EATON-EPDU-MIB::inputPowerMeasType, op: in_array, value: [1, 2, 3, 4] } - - oid: EATON-EPDU-MIB::outlets - value: EATON-EPDU-MIB::outletWatts + oid: EATON-EPDU-MIB::outletWatts num_oid: '.1.3.6.1.4.1.534.6.6.7.6.5.1.3.{{ $index }}' - multiplier: 1 - descr: 'Outlet {{ EATON-EPDU-MIB::outletDesignator }}: {{ EATON-EPDU-MIB::outletName }}' + descr: 'Unit {{ $subindex0 }} Outlet {{ EATON-EPDU-MIB::outletDesignator }}: {{ EATON-EPDU-MIB::outletName }}' + group: 'Unit {{ $subindex0 }}' index: 'outletWatts.{{ $index }}' current: data: - - oid: EATON-EPDU-MIB::inputs - value: EATON-EPDU-MIB::inputCurrent + oid: EATON-EPDU-MIB::inputCurrent num_oid: '.1.3.6.1.4.1.534.6.6.7.3.3.1.4.{{ $index }}' divisor: 1000 - descr: 'Input Feed {{ EATON-EPDU-MIB::inputPhaseDesignator }}' + descr: 'Unit {{ $subindex0 }} Input Feed {{ EATON-EPDU-MIB::inputPhaseDesignator }}' + group: 'Unit {{ $subindex0 }}' index: 'inputCurrent.{{ $index }}' high_limit: EATON-EPDU-MIB::inputCurrentThUpperCritical warn_limit: EATON-EPDU-MIB::inputCurrentThUpperWarning - - oid: EATON-EPDU-MIB::outlets - value: EATON-EPDU-MIB::outletCurrent + oid: EATON-EPDU-MIB::groupCurrent + num_oid: '.1.3.6.1.4.1.534.6.6.7.5.4.1.3.{{ $index }}' + divisor: 1000 + descr: 'Unit {{ $subindex0 }} {{ EATON-EPDU-MIB::groupName }}' + group: 'Unit {{ $subindex0 }}' + index: 'groupCurrent.{{ $index }}' + high_limit: EATON-EPDU-MIB::groupCurrentThUpperCritical + warn_limit: EATON-EPDU-MIB::groupCurrentThUpperWarning + - + oid: EATON-EPDU-MIB::outletCurrent num_oid: '.1.3.6.1.4.1.534.6.6.7.6.4.1.3.{{ $index }}' divisor: 1000 - descr: 'Outlet {{ EATON-EPDU-MIB::outletDesignator }}: {{ EATON-EPDU-MIB::outletName }}' + descr: 'Unit {{ $subindex0 }} Outlet {{ EATON-EPDU-MIB::outletDesignator }}: {{ EATON-EPDU-MIB::outletName }}' + group: 'Unit {{ $subindex0 }}' index: 'outletCurrent.{{ $index }}' high_limit: EATON-EPDU-MIB::outletCurrentThUpperCritical warn_limit: EATON-EPDU-MIB::outletCurrentThUpperWarning voltage: data: - - oid: EATON-EPDU-MIB::inputs - value: EATON-EPDU-MIB::inputVoltage + oid: EATON-EPDU-MIB::inputVoltage + num_oid: '.1.3.6.1.4.1.534.6.6.7.3.2.1.3.{{ $index }}' + divisor: 1000 + descr: 'Unit {{ $subindex0 }} Input Feed' + group: 'Unit {{ $subindex0 }}' + index: 'inputVoltage.{{ $index }}' + skip_values: + - { oid: EATON-EPDU-MIB::inputVoltageMeasType, op: '!=', value: 1 } + - + oid: EATON-EPDU-MIB::inputVoltage num_oid: '.1.3.6.1.4.1.534.6.6.7.3.2.1.3.{{ $index }}' divisor: 1000 - descr: 'Input' + descr: 'Unit {{ $subindex0 }} Input Feed L1-N' + group: 'Unit {{ $subindex0 }}' index: 'inputVoltage.{{ $index }}' + skip_values: + - { oid: EATON-EPDU-MIB::inputVoltageMeasType, op: '!=', value: 2 } + - + oid: EATON-EPDU-MIB::inputVoltage + num_oid: '.1.3.6.1.4.1.534.6.6.7.3.2.1.3.{{ $index }}' + divisor: 1000 + descr: 'Unit {{ $subindex0 }} Input Feed L2-N' + group: 'Unit {{ $subindex0 }}' + index: 'inputVoltage.{{ $index }}' + skip_values: + - { oid: EATON-EPDU-MIB::inputVoltageMeasType, op: '!=', value: 3 } + - + oid: EATON-EPDU-MIB::inputVoltage + num_oid: '.1.3.6.1.4.1.534.6.6.7.3.2.1.3.{{ $index }}' + divisor: 1000 + descr: 'Unit {{ $subindex0 }} Input Feed L3-N' + group: 'Unit {{ $subindex0 }}' + index: 'inputVoltage.{{ $index }}' + skip_values: + - { oid: EATON-EPDU-MIB::inputVoltageMeasType, op: '!=', value: 4 } + - + oid: EATON-EPDU-MIB::inputVoltage + num_oid: '.1.3.6.1.4.1.534.6.6.7.3.2.1.3.{{ $index }}' + divisor: 1000 + descr: 'Unit {{ $subindex0 }} Input Feed L1-L2' + group: 'Unit {{ $subindex0 }}' + index: 'inputVoltage.{{ $index }}' + skip_values: + - { oid: EATON-EPDU-MIB::inputVoltageMeasType, op: '!=', value: 5 } + - + oid: EATON-EPDU-MIB::inputVoltage + num_oid: '.1.3.6.1.4.1.534.6.6.7.3.2.1.3.{{ $index }}' + divisor: 1000 + descr: 'Unit {{ $subindex0 }} Input Feed L2-L3' + group: 'Unit {{ $subindex0 }}' + index: 'inputVoltage.{{ $index }}' + skip_values: + - { oid: EATON-EPDU-MIB::inputVoltageMeasType, op: '!=', value: 6 } + - + oid: EATON-EPDU-MIB::inputVoltage + num_oid: '.1.3.6.1.4.1.534.6.6.7.3.2.1.3.{{ $index }}' + divisor: 1000 + descr: 'Unit {{ $subindex0 }} Input Feed L3-L1' + group: 'Unit {{ $subindex0 }}' + index: 'inputVoltage.{{ $index }}' + skip_values: + - { oid: EATON-EPDU-MIB::inputVoltageMeasType, op: '!=', value: 7 } + - + oid: EATON-EPDU-MIB::inputVoltage + num_oid: '.1.3.6.1.4.1.534.6.6.7.3.2.1.3.{{ $index }}' + divisor: 1000 + descr: 'Unit {{ $subindex0 }} Input {{ $subindex2 }}' + group: 'Unit {{ $subindex0 }}' + index: 'inputVoltage.{{ $index }}' + skip_values: + - { oid: EATON-EPDU-MIB::inputVoltageMeasType, op: in_array, value: [1, 2, 3, 4, 5, 6, 7] } + temperature: + data: + - + oid: EATON-EPDU-MIB::temperatureValue + num_oid: '.1.3.6.1.4.1.534.6.6.7.7.1.1.4.{{ $index }}' + divisor: 10 + descr: 'Unit {{ $subindex0 }} {{ EATON-EPDU-MIB::temperatureName }}' + group: 'Unit {{ $subindex0 }}' + index: 'temperatureValue.{{ $index }}' + skip_values: + - { oid: EATON-EPDU-MIB::temperatureProbeStatus, op: '!=', value: 1 } + - { oid: 'EATON-EPDU-MIB::temperatureScale:0', op: '!=', value: 0 } + - + oid: EATON-EPDU-MIB::temperatureValue + num_oid: '.1.3.6.1.4.1.534.6.6.7.7.1.1.4.{{ $index }}' + divisor: 10 + user_func: fahrenheit_to_celsius + descr: 'Unit {{ $subindex0 }} {{ EATON-EPDU-MIB::temperatureName }}' + group: 'Unit {{ $subindex0 }}' + index: 'temperatureValue.{{ $index }}' + skip_values: + - { oid: EATON-EPDU-MIB::temperatureProbeStatus, op: '!=', value: 1 } + - { oid: 'EATON-EPDU-MIB::temperatureScale:0', op: '!=', value: 1 } + humidity: + data: + - + oid: EATON-EPDU-MIB::humidityValue + num_oid: '.1.3.6.1.4.1.534.6.6.7.7.2.1.4.{{ $index }}' + divisor: 10 + descr: 'Unit {{ $subindex0 }} {{ EATON-EPDU-MIB::humidityName }}' + group: 'Unit {{ $subindex0 }}' + index: 'humidityValue.{{ $index }}' + skip_values: + - { oid: EATON-EPDU-MIB::humidityProbeStatus, op: '!=', value: 1 } + state: + data: + - + oid: EATON-EPDU-MIB::outletControlStatus + num_oid: '.1.3.6.1.4.1.534.6.6.7.6.6.1.2.{{ $index }}' + descr: 'Unit {{ $subindex0 }} Outlet {{ EATON-EPDU-MIB::outletDesignator }}: {{ EATON-EPDU-MIB::outletName }}' + group: 'Unit {{ $subindex0 }}' + index: 'outletControlStatus.{{ $index }}' + state_name: outletControlStatus + skip_values: + - { oid: EATON-EPDU-MIB::outletControlSwitchable, op: '=', value: 2 } + states: + - { value: 0, generic: 0, descr: 'off' } + - { value: 1, generic: 0, descr: 'on' } + - { value: 2, generic: 1, descr: pendingOff } + - { value: 3, generic: 1, descr: pendingOn } diff --git a/resources/definitions/os_discovery/eatonupsm2.yaml b/resources/definitions/os_discovery/eatonupsm2.yaml index 29c79295eec..9586c005372 100644 --- a/resources/definitions/os_discovery/eatonupsm2.yaml +++ b/resources/definitions/os_discovery/eatonupsm2.yaml @@ -61,3 +61,55 @@ modules: states: - { value: 1, descr: Yes, generic: 1 } - { value: 2, descr: No, generic: 0 } + - + oid: XUPS-MIB::xupsBatteryFailure + value: XUPS-MIB::xupsBatteryFailure + num_oid: '.1.3.6.1.4.1.534.1.2.7.{{ $index }}' + descr: 'Battery Failure' + index: 'xupsBatteryFailure.{{ $index }}' + states: + - { value: 1, descr: Yes, generic: 2 } + - { value: 2, descr: No, generic: 0 } + - + oid: XUPS-MIB::xupsBatteryNotPresent + value: XUPS-MIB::xupsBatteryNotPresent + num_oid: '.1.3.6.1.4.1.534.1.2.8.{{ $index }}' + descr: 'Battery Not Present' + index: 'xupsBatteryNotPresent.{{ $index }}' + states: + - { value: 1, descr: Yes, generic: 2 } + - { value: 2, descr: No, generic: 0 } + - + oid: XUPS-MIB::xupsBatteryAged + value: XUPS-MIB::xupsBatteryAged + num_oid: '.1.3.6.1.4.1.534.1.2.9.{{ $index }}' + descr: 'Battery Aged' + index: 'xupsBatteryAged.{{ $index }}' + states: + - { value: 1, descr: Yes, generic: 1 } + - { value: 2, descr: No, generic: 0 } + - + oid: XUPS-MIB::xupsOutputStatus + value: XUPS-MIB::xupsOutputStatus + num_oid: '.1.3.6.1.4.1.534.1.4.10.{{ $index }}' + descr: 'Output Status' + index: 'xupsOutputStatus.{{ $index }}' + states: + - { value: 1, descr: notPowered, generic: 2 } + - { value: 2, descr: notProtected, generic: 2 } + - { value: 3, descr: protected, generic: 0 } + - + oid: XUPS-MIB::xupsRecepStatus + value: XUPS-MIB::xupsRecepStatus + num_oid: '.1.3.6.1.4.1.534.1.12.2.1.2.{{ $index }}' + descr: 'Outlet Group {{ $index }}' + index: 'xupsRecepStatus.{{ $index }}' + states: + - { value: 1, descr: on, generic: 0 } + - { value: 2, descr: off, generic: 0 } + - { value: 3, descr: pendingOff, generic: 0 } + - { value: 4, descr: pendingOn, generic: 0 } + - { value: 5, descr: unknown, generic: 3 } + - { value: 6, descr: reserved, generic: 3 } + - { value: 7, descr: failedClosed, generic: 2 } + - { value: 8, descr: failedOpen, generic: 2 } diff --git a/resources/definitions/os_discovery/ecosdn.yaml b/resources/definitions/os_discovery/ecosdn.yaml new file mode 100644 index 00000000000..c54e77e467b --- /dev/null +++ b/resources/definitions/os_discovery/ecosdn.yaml @@ -0,0 +1,106 @@ +modules: + os: + hardware: ECOSWITCH-HARDWARE-INFO-MIB::productName.0 + serial: ECOSWITCH-HARDWARE-INFO-MIB::serialNumber.0 + features: ECOSWITCH-HARDWARE-INFO-MIB::biosVersion.0 + processors: + data: + - + oid: ECOSWITCH-HARDWARE-INFO-MIB::cpuCoreLoad + num_oid: '.1.3.6.1.4.1.45555.3.3.2.1.2.{{ $index }}' + descr: 'CPU {{ $index }}' + mempools: + data: + - + total: ECOSWITCH-HARDWARE-INFO-MIB::total + free: ECOSWITCH-HARDWARE-INFO-MIB::free + descr: Memory + storage: + data: + - + oid: ECOSWITCH-HARDWARE-INFO-MIB::storageInfoTable + size: ECOSWITCH-HARDWARE-INFO-MIB::storageTotal + free: ECOSWITCH-HARDWARE-INFO-MIB::storageFree + size_num_oid: '.1.3.6.1.4.1.45555.3.3.4.1.3.{{ $index }}' + free_num_oid: '.1.3.6.1.4.1.45555.3.3.4.1.4.{{ $index }}' + units: 1 + descr: 'Storage {{ $index }}' + sensors: + state: + data: + - + oid: ECOSWITCH-HARDWARE-INFO-MIB::psuStatus + value: ECOSWITCH-HARDWARE-INFO-MIB::psuStatus + num_oid: '.1.3.6.1.4.1.45555.3.3.5.1.3.{{ $index }}' + index: 'psuStatus.{{ $index }}' + descr: 'PSU {{ $index }}' + state_name: psuStatus + states: + - { value: 0, generic: 3, descr: unknown } + - { value: 1, generic: 0, descr: PowerOn } + - { value: 2, generic: 2, descr: PowerOff } + - + oid: ECOSWITCH-HARDWARE-INFO-MIB::fanState + value: ECOSWITCH-HARDWARE-INFO-MIB::fanState + num_oid: '.1.3.6.1.4.1.45555.3.3.6.1.2.{{ $index }}' + index: 'fanState.{{ $index }}' + descr: 'Fan {{ $index }}' + state_name: fanState + states: + - { value: 0, generic: 3, descr: unknown } + - { value: 1, generic: 0, descr: active } + - { value: 2, generic: 2, descr: inactive } + temperature: + data: + - + oid: ECOSWITCH-HARDWARE-INFO-MIB::sensorsInfoTable + value: ECOSWITCH-HARDWARE-INFO-MIB::sensorsAdapterParameterValue + num_oid: '.1.3.6.1.4.1.45555.3.3.7.1.3.{{ $index }}' + index: 'sensorsAdapterParameterValue.{{ $index }}' + descr: '{{ ECOSWITCH-HARDWARE-INFO-MIB::sensorsAdapterName }}: {{ ECOSWITCH-HARDWARE-INFO-MIB::sensorsAdapterParameterName }}' + fanspeed: + data: + - + oid: ECOSWITCH-HARDWARE-INFO-MIB::fanSpeedFront + value: ECOSWITCH-HARDWARE-INFO-MIB::fanSpeedFront + num_oid: '.1.3.6.1.4.1.45555.3.3.6.1.3.{{ $index }}' + index: 'fanSpeedFront.{{ $index }}' + descr: 'Fan {{ $index }} front' + - + oid: ECOSWITCH-HARDWARE-INFO-MIB::fanSpeedRear + value: ECOSWITCH-HARDWARE-INFO-MIB::fanSpeedRear + num_oid: '.1.3.6.1.4.1.45555.3.3.6.1.4.{{ $index }}' + index: 'fanSpeedRear.{{ $index }}' + descr: 'Fan {{ $index }} rear' + voltage: + data: + - + oid: ECOSWITCH-HARDWARE-INFO-MIB::psuInputVoltage + value: ECOSWITCH-HARDWARE-INFO-MIB::psuInputVoltage + num_oid: '.1.3.6.1.4.1.45555.3.3.5.1.4.{{ $index }}' + index: 'psuInputVoltage.{{ $index }}' + descr: 'PSU {{ $index }} input' + divisor: 1000 + - + oid: ECOSWITCH-HARDWARE-INFO-MIB::psuOutputVoltage + value: ECOSWITCH-HARDWARE-INFO-MIB::psuOutputVoltage + num_oid: '.1.3.6.1.4.1.45555.3.3.5.1.6.{{ $index }}' + index: 'psuOutputVoltage.{{ $index }}' + descr: 'PSU {{ $index }} output' + divisor: 1000 + current: + data: + - + oid: ECOSWITCH-HARDWARE-INFO-MIB::psuInputCurrent + value: ECOSWITCH-HARDWARE-INFO-MIB::psuInputCurrent + num_oid: '.1.3.6.1.4.1.45555.3.3.5.1.5.{{ $index }}' + index: 'psuInputCurrent.{{ $index }}' + descr: 'PSU {{ $index }} input' + divisor: 1000 + - + oid: ECOSWITCH-HARDWARE-INFO-MIB::psuOutputCurrent + value: ECOSWITCH-HARDWARE-INFO-MIB::psuOutputCurrent + num_oid: '.1.3.6.1.4.1.45555.3.3.5.1.7.{{ $index }}' + index: 'psuOutputCurrent.{{ $index }}' + descr: 'PSU {{ $index }} output' + divisor: 1000 diff --git a/resources/definitions/os_discovery/fabos.yaml b/resources/definitions/os_discovery/fabos.yaml index b5ec8eb22c5..f2774306444 100644 --- a/resources/definitions/os_discovery/fabos.yaml +++ b/resources/definitions/os_discovery/fabos.yaml @@ -1,4 +1,12 @@ modules: + os: + hardware: ENTITY-MIB::entPhysicalDescr.1 + version: + - SW-MIB::swFirmwareVersion.0 + - ENTITY-MIB::entPhysicalSoftwareRev.1 + serial: + - ENTITY-MIB::entPhysicalSerialNum.1 + - SW-MIB::swSsn.0 mempools: data: - @@ -57,6 +65,39 @@ modules: oid: SW-MIB::swSensorType op: '!=' value: 2 + voltage: + data: + - + oid: FA-EXT-MIB::swSfpVoltage + value: FA-EXT-MIB::swSfpVoltage + num_oid: ".1.3.6.1.4.1.1588.2.1.1.1.28.1.1.2.{{ $index }}" + descr: "{{ SW-MIB::swFCPortName:16 }} Voltage" + divisor: 1000 + entPhysicalIndex: "200000{{ $subindex16 }}" + group: 'transceiver' + index: "swSfpVoltage.{{ $subindex16 }}" + current: + data: + - + oid: FA-EXT-MIB::swSfpCurrent + value: FA-EXT-MIB::swSfpCurrent + num_oid: ".1.3.6.1.4.1.1588.2.1.1.1.28.1.1.3.{{ $index }}" + descr: "{{ SW-MIB::swFCPortName:16 }} Bias" + divisor: 1000 + entPhysicalIndex: "200000{{ $subindex16 }}" + group: 'transceiver' + index: "swSfpCurrent.{{ $subindex16 }}" + count: + data: + - + oid: FA-EXT-MIB::swSfpPoweronHrs + value: FA-EXT-MIB::swSfpPoweronHrs + num_oid: ".1.3.6.1.4.1.1588.2.1.1.1.28.1.1.6.{{ $index }}" + descr: "{{ SW-MIB::swFCPortName:16 }} Power-on Hours" + entPhysicalIndex: "200000{{ $subindex16 }}" + group: 'transceiver' + index: "swSfpPoweronHrs.{{ $subindex16 }}" + skip_values: 0 dbm: data: - @@ -81,6 +122,42 @@ modules: warn_limit: 1 state: data: + - + oid: FCMGMT-MIB::connUnitTable + value: FCMGMT-MIB::connUnitStatus + num_oid: '.1.3.6.1.3.94.1.6.1.6.{{ $index }}' + descr: '{{ FCMGMT-MIB::connUnitName }} Status' + index: 'connUnitStatus.{{ $index }}' + state_name: FCMGMT-MIB::connUnitStatus + states: + - { value: 1, generic: 3, descr: Unknown } + - { value: 2, generic: 3, descr: Unused } + - { value: 3, generic: 0, descr: Ok } + - { value: 4, generic: 1, descr: Warning } + - { value: 5, generic: 2, descr: Failed } + - + oid: SW-MIB::swOperStatus + value: SW-MIB::swOperStatus + num_oid: '.1.3.6.1.4.1.1588.2.1.1.1.1.7.{{ $index }}' + descr: 'Operational Status' + index: 'swOperStatus.{{ $index }}' + state_name: SW-MIB::swOperStatus + states: + - { value: 1, generic: 0, descr: Online } + - { value: 2, generic: 2, descr: Offline } + - { value: 3, generic: 1, descr: Testing } + - { value: 4, generic: 2, descr: Faulty } + - + oid: SW-MIB::swDiagResult + value: SW-MIB::swDiagResult + num_oid: '.1.3.6.1.4.1.1588.2.1.1.1.1.20.{{ $index }}' + descr: 'POST Diagnostics' + index: 'swDiagResult.{{ $index }}' + state_name: SW-MIB::swDiagResult + states: + - { value: 1, generic: 0, descr: Ok } + - { value: 2, generic: 2, descr: Faulty } + - { value: 3, generic: 2, descr: 'Embedded Port Fault' } - oid: SW-MIB::swSensorTable value: SW-MIB::swSensorStatus diff --git a/resources/definitions/os_discovery/fibrolan-falcon.yaml b/resources/definitions/os_discovery/fibrolan-falcon.yaml index d0e06f3a655..8705b8d6b02 100644 --- a/resources/definitions/os_discovery/fibrolan-falcon.yaml +++ b/resources/definitions/os_discovery/fibrolan-falcon.yaml @@ -5,7 +5,7 @@ modules: processors: data: - - oid: FIBROLAN-DEVICE-MIB::flDeviceCpuStatusEntry + oid: FIBROLAN-DEVICE-MIB::flDeviceCpuStatusTable value: FIBROLAN-DEVICE-MIB::flDeviceCpuUtilization num_oid: '.1.3.6.1.4.1.4467.1000.10.1.120.1.2.{{ $index }}' descr: 'CPU Usage' diff --git a/resources/definitions/os_discovery/fibrolan-metrostar.yaml b/resources/definitions/os_discovery/fibrolan-metrostar.yaml index 6bdcfcacc20..ecbd87fbf2f 100644 --- a/resources/definitions/os_discovery/fibrolan-metrostar.yaml +++ b/resources/definitions/os_discovery/fibrolan-metrostar.yaml @@ -1,9 +1,8 @@ modules: - processors: data: - - oid: FIBROLAN-DEVICE-MIB::flDeviceCpuStatusEntry + oid: FIBROLAN-DEVICE-MIB::flDeviceCpuStatusTable value: FIBROLAN-DEVICE-MIB::flDeviceCpuUtilization num_oid: '.1.3.6.1.4.1.4467.1000.10.1.120.1.2.{{ $index }}' descr: 'CPU Usage' diff --git a/resources/definitions/os_discovery/fortigate.yaml b/resources/definitions/os_discovery/fortigate.yaml index 4c111b4331a..db976e727e1 100644 --- a/resources/definitions/os_discovery/fortigate.yaml +++ b/resources/definitions/os_discovery/fortigate.yaml @@ -34,6 +34,7 @@ modules: - oid: - FORTINET-FORTIGATE-MIB::fgVdEntName + - FORTINET-FORTIGATE-MIB::fgHaSystemMode state: data: - @@ -89,6 +90,22 @@ modules: - { value: 2, descr: Connected, generic: 0 } - { value: 3, descr: Suspended, generic: 2 } - { value: 4, descr: Authenticating, generic: 1 } + - + # Same extra level as fg5gSignalInfoTable. Walk only the status column: + # walking the whole fg5gSessInfoTable can stall snmpd for ~20 seconds. + oid: FORTINET-FORTIGATE-MIB::fg5gSessMdmEntIndex.8 + value: FORTINET-FORTIGATE-MIB::fg5gSessMdmEntIndex + num_oid: '.1.3.6.1.4.1.12356.101.28.6.1.1.{{ $index }}' + state_name: fg5gIpv4SessionStatus + index: 'fg5gIpv4SessionStatus.{{ $subindex1 }}' + descr: 'IPv4 Session Status' + group: '5G Modem {{ $subindex1 }}' + states: + - { value: 0, descr: Unknown, generic: 3 } + - { value: 1, descr: Disconnected, generic: 2 } + - { value: 2, descr: Connected, generic: 0 } + - { value: 3, descr: Suspended, generic: 2 } + - { value: 4, descr: Authenticating, generic: 1 } - oid: FORTINET-FORTIGATE-MIB::fgVWLHealthCheckLinkTable value: FORTINET-FORTIGATE-MIB::fgVWLHealthCheckLinkState @@ -123,6 +140,22 @@ modules: - { value: 1, descr: Primary, generic: 0 } - { value: 2, descr: Secondary, generic: 0 } - { value: 3, descr: Standalone, generic: 0 } + - + oid: FORTINET-FORTIGATE-MIB::fgHaStatsTable + value: FORTINET-FORTIGATE-MIB::fgHaStatsSyncStatus + num_oid: '.1.3.6.1.4.1.12356.101.13.2.1.1.12.{{ $index }}' + state_name: fgHaStatsSyncStatus + descr: 'HA sync status {{ FORTINET-FORTIGATE-MIB::fgHaStatsHostname }}' + group: HA + entPhysicalIndex: '{{ $index }}' + skip_values: + - + oid: FORTINET-FORTIGATE-MIB::fgHaSystemMode.0 + op: not_in_array + value: [2, 3] + states: + - { value: 0, descr: Out Of Sync, generic: 2 } + - { value: 1, descr: In Sync, generic: 0 } count: data: - @@ -314,6 +347,17 @@ modules: index: 'fgIpsAnomalyDetections.{{ $index }}' rrd_type: COUNTER + percent: + data: + - + oid: FORTINET-FORTIGATE-MIB::fgDhcpTable + value: FORTINET-FORTIGATE-MIB::fgDhcpLeaseUsage + num_oid: '.1.3.6.1.4.1.12356.101.23.2.1.1.2.{{ $index }}' + descr: '{{ FORTINET-FORTIGATE-MIB::fgVdEntName:0 }} Server ID {{ $subindex1 }} Pool Usage' + group: DHCP Usage + index: 'fgDhcpLeaseUsage.{{ $index }}' + warn_limit: 90 + high_limit: 95 signal: data: - @@ -336,6 +380,93 @@ modules: low_warn_limit: -85 warn_limit: -30 high_limit: -20 + - + # FortiOS serves fg5gSignalInfoTable one level deeper than the MIB + # defines it (.28.4.1.1.. instead of .28.4.1..), + # so every value is parsed as fg5gSigMdmEntIndex... + oid: FORTINET-FORTIGATE-MIB::fg5gSignalInfoEntry + value: FORTINET-FORTIGATE-MIB::fg5gSigMdmEntIndex + num_oid: '.1.3.6.1.4.1.12356.101.28.4.1.1.{{ $index }}' + descr: 'LTE RSSI' + group: '5G Modem {{ $subindex1 }}' + index: 'fg5gSigLteRssi.{{ $subindex1 }}' + low_limit: -95 + low_warn_limit: -85 + warn_limit: 0 + high_limit: 0 + skip_values: + - { oid: index, op: not_starts, value: '4.' } + - + oid: FORTINET-FORTIGATE-MIB::fg5gSignalInfoEntry + value: FORTINET-FORTIGATE-MIB::fg5gSigMdmEntIndex + num_oid: '.1.3.6.1.4.1.12356.101.28.4.1.1.{{ $index }}' + descr: 'LTE RSRQ' + group: '5G Modem {{ $subindex1 }}' + index: 'fg5gSigLteRsrq.{{ $subindex1 }}' + low_limit: -20 + low_warn_limit: -15 + warn_limit: 0 + high_limit: 0 + skip_values: + - { oid: index, op: not_starts, value: '5.' } + - + oid: FORTINET-FORTIGATE-MIB::fg5gSignalInfoEntry + value: FORTINET-FORTIGATE-MIB::fg5gSigMdmEntIndex + num_oid: '.1.3.6.1.4.1.12356.101.28.4.1.1.{{ $index }}' + descr: 'LTE RSRP' + group: '5G Modem {{ $subindex1 }}' + index: 'fg5gSigLteRsrp.{{ $subindex1 }}' + low_limit: -120 + low_warn_limit: -110 + warn_limit: 0 + high_limit: 0 + skip_values: + - { oid: index, op: not_starts, value: '6.' } + - + oid: FORTINET-FORTIGATE-MIB::fg5gSignalInfoEntry + value: FORTINET-FORTIGATE-MIB::fg5gSigMdmEntIndex + num_oid: '.1.3.6.1.4.1.12356.101.28.4.1.1.{{ $index }}' + descr: '5G RSRP' + group: '5G Modem {{ $subindex1 }}' + index: 'fg5gSig5gRsrp.{{ $subindex1 }}' + low_limit: -120 + low_warn_limit: -110 + warn_limit: 0 + high_limit: 0 + skip_values: + - { oid: index, op: not_starts, value: '8.' } + snr: + data: + - + oid: FORTINET-FORTIGATE-MIB::fg5gSignalInfoEntry + value: FORTINET-FORTIGATE-MIB::fg5gSigMdmEntIndex + num_oid: '.1.3.6.1.4.1.12356.101.28.4.1.1.{{ $index }}' + descr: 'LTE SNR' + group: '5G Modem {{ $subindex1 }}' + index: 'fg5gSigLteSnr.{{ $subindex1 }}' + divisor: 10 + low_limit: -10 + low_warn_limit: 0 + warn_limit: 40 + high_limit: 50 + skip_limits_calc: true + skip_values: + - { oid: index, op: not_starts, value: '7.' } + - + oid: FORTINET-FORTIGATE-MIB::fg5gSignalInfoEntry + value: FORTINET-FORTIGATE-MIB::fg5gSigMdmEntIndex + num_oid: '.1.3.6.1.4.1.12356.101.28.4.1.1.{{ $index }}' + descr: '5G SNR' + group: '5G Modem {{ $subindex1 }}' + index: 'fg5gSig5gSnr.{{ $subindex1 }}' + divisor: 10 + low_limit: -10 + low_warn_limit: 0 + warn_limit: 40 + high_limit: 50 + skip_limits_calc: true + skip_values: + - { oid: index, op: not_starts, value: '9.' } temperature: data: - diff --git a/resources/definitions/os_discovery/fs-nmu.yaml b/resources/definitions/os_discovery/fs-nmu.yaml index 12ce7a1fbd4..0dc8abd4395 100644 --- a/resources/definitions/os_discovery/fs-nmu.yaml +++ b/resources/definitions/os_discovery/fs-nmu.yaml @@ -3,3 +3,128 @@ modules: hardware: OAP-NMU::deviceType.0 serial: OAP-NMU::serialNumber.0 version: OAP-NMU::softwareVersion.0 + sensors: + dbm: + data: + - + oid: OAP-C1-OEO::vSFPA1TxPower + num_oid: '.1.3.6.1.4.1.40989.10.16.1.2.11.4.{{ $index }}' + index: vSFPA1TxPower.0 + descr: 'A1 Tx Power' + divisor: 100 + - + oid: OAP-C1-OEO::vSFPA1RxPower + num_oid: '.1.3.6.1.4.1.40989.10.16.1.2.11.5.{{ $index }}' + index: vSFPA1RxPower.0 + descr: 'A1 Rx Power' + divisor: 100 + - + oid: OAP-C1-OEO::vSFPA2TxPower + num_oid: '.1.3.6.1.4.1.40989.10.16.1.2.12.4.{{ $index }}' + index: vSFPA2TxPower.0 + descr: 'A2 Tx Power' + divisor: 100 + - + oid: OAP-C1-OEO::vSFPA2RxPower + num_oid: '.1.3.6.1.4.1.40989.10.16.1.2.12.5.{{ $index }}' + index: vSFPA2RxPower.0 + descr: 'A2 Rx Power' + divisor: 100 + - + oid: OAP-C1-OEO::vSFPB1TxPower + num_oid: '.1.3.6.1.4.1.40989.10.16.1.2.13.4.{{ $index }}' + index: vSFPB1TxPower.0 + descr: 'B1 Tx Power' + divisor: 100 + - + oid: OAP-C1-OEO::vSFPB1RxPower + num_oid: '.1.3.6.1.4.1.40989.10.16.1.2.13.5.{{ $index }}' + index: vSFPB1RxPower.0 + descr: 'B1 Rx Power' + divisor: 100 + - + oid: OAP-C1-OEO::vSFPB2TxPower + num_oid: '.1.3.6.1.4.1.40989.10.16.1.2.14.4.{{ $index }}' + index: vSFPB2TxPower.0 + descr: 'B2 Tx Power' + divisor: 100 + - + oid: OAP-C1-OEO::vSFPB2RxPower + num_oid: '.1.3.6.1.4.1.40989.10.16.1.2.14.5.{{ $index }}' + index: vSFPB2RxPower.0 + descr: 'B2 Rx Power' + divisor: 100 + - + oid: OAP-C1-OEO::vSFPC1TxPower + num_oid: '.1.3.6.1.4.1.40989.10.16.1.2.15.4.{{ $index }}' + index: vSFPC1TxPower.0 + descr: 'C1 Tx Power' + divisor: 100 + - + oid: OAP-C1-OEO::vSFPC1RxPower + num_oid: '.1.3.6.1.4.1.40989.10.16.1.2.15.5.{{ $index }}' + index: vSFPC1RxPower.0 + descr: 'C1 Rx Power' + divisor: 100 + - + oid: OAP-C1-OEO::vSFPC2TxPower + num_oid: '.1.3.6.1.4.1.40989.10.16.1.2.16.4.{{ $index }}' + index: vSFPC2TxPower.0 + descr: 'C2 Tx Power' + divisor: 100 + - + oid: OAP-C1-OEO::vSFPC2RxPower + num_oid: '.1.3.6.1.4.1.40989.10.16.1.2.16.5.{{ $index }}' + index: vSFPC2RxPower.0 + descr: 'C2 Rx Power' + divisor: 100 + - + oid: OAP-C1-OEO::vSFPD1TxPower + num_oid: '.1.3.6.1.4.1.40989.10.16.1.2.17.4.{{ $index }}' + index: vSFPD1TxPower.0 + descr: 'D1 Tx Power' + divisor: 100 + - + oid: OAP-C1-OEO::vSFPD1RxPower + num_oid: '.1.3.6.1.4.1.40989.10.16.1.2.17.5.{{ $index }}' + index: vSFPD1RxPower.0 + descr: 'D1 Rx Power' + divisor: 100 + - + oid: OAP-C1-OEO::vSFPD2TxPower + num_oid: '.1.3.6.1.4.1.40989.10.16.1.2.18.4.{{ $index }}' + index: vSFPD2TxPower.0 + descr: 'D2 Tx Power' + divisor: 100 + - + oid: OAP-C1-OEO::vSFPD2RxPower + num_oid: '.1.3.6.1.4.1.40989.10.16.1.2.18.5.{{ $index }}' + index: vSFPD2RxPower.0 + descr: 'D2 Rx Power' + divisor: 100 + state: + data: + - + oid: OAP-NMU::power1State + num_oid: '.1.3.6.1.4.1.40989.10.16.20.11.{{ $index }}' + descr: 'Power 1 State' + state_name: power1State + states: + - { value: 0, generic: 2, descr: 'off' } + - { value: 1, generic: 0, descr: 'on' } + - + oid: OAP-NMU::power2State + num_oid: '.1.3.6.1.4.1.40989.10.16.20.12.{{ $index }}' + descr: 'Power 2 State' + state_name: power2State + states: + - { value: 0, generic: 2, descr: 'off' } + - { value: 1, generic: 0, descr: 'on' } + - + oid: OAP-NMU::fanState + num_oid: '.1.3.6.1.4.1.40989.10.16.20.10.{{ $index }}' + descr: 'Fan State' + state_name: fanState + states: + - { value: 0, generic: 2, descr: 'off' } + - { value: 1, generic: 0, descr: 'on' } diff --git a/resources/definitions/os_discovery/fs-switch.yaml b/resources/definitions/os_discovery/fs-switch.yaml index c863049b099..8466044d549 100644 --- a/resources/definitions/os_discovery/fs-switch.yaml +++ b/resources/definitions/os_discovery/fs-switch.yaml @@ -38,6 +38,12 @@ modules: value: FS-MIB::cpuCurrentUti num_oid: '.1.3.6.1.4.1.52642.2.1.45.1.39.2.1.{{ $index }}' descr: 'Processor' + - + oid: SWITCH::ssCpuIdle + num_oid: '.1.3.6.1.4.1.27975.1.2.11.{{ $index }}' + descr: 'CPU' + precision: -1 + type: 'fs-SWITCHMIB' sensors: additional_oids: data: diff --git a/resources/definitions/os_discovery/ftos.yaml b/resources/definitions/os_discovery/ftos.yaml index b8d1fcacb7f..36c51b65954 100644 --- a/resources/definitions/os_discovery/ftos.yaml +++ b/resources/definitions/os_discovery/ftos.yaml @@ -18,3 +18,26 @@ modules: percent_used: F10-Z-SERIES-CHASSIS-MIB::chSysCpuUtilMemUsage os: sysDescr_regex: '/Application Software Version: (?[\d.]+\d)/' + processors: + data: + - + oid: F10-S-SERIES-CHASSIS-MIB::chStackUnitCpuUtil5Sec + num_oid: '.1.3.6.1.4.1.6027.3.10.1.2.9.1.2.{{ $index }}' + descr: 'Stack Unit {{ $index }} CPU' + - + oid: F10-C-SERIES-CHASSIS-MIB::chRpmCpuUtil5Sec + num_oid: '.1.3.6.1.4.1.6027.3.8.1.3.7.1.3.{{ $index }}' + descr: 'Route Process Module {{ $index }} CPU' + type: ftos-rpm + - + oid: F10-C-SERIES-CHASSIS-MIB::chLineCardCpuUtil5Sec + num_oid: '.1.3.6.1.4.1.6027.3.8.1.5.1.1.1.{{ $index }}' + descr: 'Line Card {{ $index }} CPU' + - + oid: F10-M-SERIES-CHASSIS-MIB::chStackUnitCpuUtil5Sec + num_oid: '.1.3.6.1.4.1.6027.3.19.1.2.8.1.2.{{ $index }}' + descr: 'Stack Unit {{ $index }} CPU' + - + oid: F10-Z-SERIES-CHASSIS-MIB::chSysCpuUtil5Sec + num_oid: '.1.3.6.1.4.1.6027.3.25.1.2.3.1.1.{{ $index }}' + descr: 'Chassis {{ $index }} CPU' diff --git a/resources/definitions/os_discovery/gwd.yaml b/resources/definitions/os_discovery/gwd.yaml index fd905d321cb..20f36a6b69c 100644 --- a/resources/definitions/os_discovery/gwd.yaml +++ b/resources/definitions/os_discovery/gwd.yaml @@ -3,7 +3,8 @@ modules: data: - total: .1.3.6.1.4.1.10072.2.20.1.1.2.1.1.28.1.1 - used: .1.3.6.1.4.1.10072.2.20.1.1.2.1.1.20.1.1 + percent_used: .1.3.6.1.4.1.10072.2.20.1.1.2.1.1.20.1.1 + descr: 'Memory' index: 0 precision: 1048576 os: @@ -14,9 +15,32 @@ modules: data: - oid: GW-EPON-MIB::boardCpuUsage - value: GW-EPON-MIB::boardCpuUsage num_oid: '.1.3.6.1.4.1.10072.2.20.1.1.2.1.1.19.{{ $index }}' + descr: 'Board {{ $subindex1 }} CPU' + # 255 = empty board slot; deviceIndex other than 1 are ONU rows + skip_values: + - 255 + - { oid: index, op: not_starts, value: '1.' } sensors: + count: + data: + - + oid: GW-EPON-MIB::ponPortCurrOnu + num_oid: '.1.3.6.1.4.1.10072.2.20.1.1.3.1.1.12.{{ $index }}' + index: 'ponPortCurrOnu.{{ $index }}' + descr: 'PON {{ $subindex1 }}/{{ $subindex2 }} Registered ONU' + group: 'PON ONU' + # deviceIndex other than 1 are ONU rows + skip_values: + - { oid: index, op: not_starts, value: '1.' } + - + oid: GW-EPON-MIB::ponPortLinkedOnuCounter + num_oid: '.1.3.6.1.4.1.10072.2.20.1.1.3.1.1.29.{{ $index }}' + index: 'ponPortLinkedOnuCounter.{{ $index }}' + descr: 'PON {{ $subindex1 }}/{{ $subindex2 }} Online ONU' + group: 'PON ONU' + skip_values: + - { oid: index, op: not_starts, value: '1.' } temperature: data: - @@ -29,19 +53,24 @@ modules: descr: 'Temperature power supply {{ $index }}' state: data: + # powerRunStatus: INTEGER { empty(1), powerOff(2), powerOn(3) } per GW-EPON-DEV-MIB - oid: GW-EPON-DEV-MIB::powerRunStatus state_name: powerRunStatus + group: 'Power Supply' num_oid: '.1.3.6.1.4.1.10072.2.15.1.5.1.1.2.{{ $index }}' descr: 'Power Run Status {{ $index }}' states: - - { descr: Normal, value: 0, generic: 0 } - - { descr: Abnormal, value: 1, generic: 2 } + - { descr: 'Empty', value: 1, generic: 1 } + - { descr: 'Power Off', value: 2, generic: 2 } + - { descr: 'Power On', value: 3, generic: 0 } + # devFanAlarmStatus: TruthValue { ALARM(1), CLEAR(5) } per GW-EPON-DEV-MIB - oid: GW-EPON-DEV-MIB::devFanAlarmStatus state_name: devFanAlarmStatus + group: 'Fans' num_oid: '.1.3.6.1.4.1.10072.2.15.1.4.1.1.3.{{ $index }}' - descr: 'Fun status {{ $index }}' + descr: 'Fan status {{ $index }}' states: - - { descr: Normal, value: 0, generic: 0 } - - { descr: Abnormal, value: 1, generic: 2 } + - { descr: 'Alarm', value: 1, generic: 2 } + - { descr: 'Normal', value: 5, generic: 0 } diff --git a/resources/definitions/os_discovery/hiveos-wireless.yaml b/resources/definitions/os_discovery/hiveos-wireless.yaml index 5493ef4a153..276a74dbaba 100644 --- a/resources/definitions/os_discovery/hiveos-wireless.yaml +++ b/resources/definitions/os_discovery/hiveos-wireless.yaml @@ -1,4 +1,9 @@ modules: + processors: + data: + - + oid: AH-SYSTEM-MIB::ahCpuUtilization + num_oid: '.1.3.6.1.4.1.26928.1.2.3.{{ $index }}' mempools: data: - diff --git a/resources/definitions/os_discovery/hpe-pdumm.yaml b/resources/definitions/os_discovery/hpe-pdumm.yaml index baf6bdbd17b..f60fda98e49 100644 --- a/resources/definitions/os_discovery/hpe-pdumm.yaml +++ b/resources/definitions/os_discovery/hpe-pdumm.yaml @@ -10,6 +10,7 @@ modules: num_oid: '.1.3.6.1.4.1.232.165.2.3.2.1.3.{{ $index }}' index: 'breakerCurrent.{{ $index }}' descr: 'PDU {{ $subindex0 }} Phase {{ $subindex1 }}' + group: 'PDU {{ $subindex0 }}' skip_values: -1 load: data: @@ -19,6 +20,7 @@ modules: num_oid: '.1.3.6.1.4.1.232.165.2.3.2.1.4.{{ $index }}' index: 'breakerPercentLoad.{{ $index }}' descr: 'PDU {{ $subindex0 }} Phase {{ $subindex1 }}' + group: 'PDU {{ $subindex0 }}' skip_values: -1 - oid: CPQPOWER-MIB::pduOutputTable @@ -26,6 +28,7 @@ modules: num_oid: '.1.3.6.1.4.1.232.165.2.3.1.1.2.{{ $index }}' index: 'pduOutputLoad.{{ $index }}' descr: 'PDU {{ $index }}' + group: 'PDU {{ $index }}' skip_values: -1 voltage: @@ -36,6 +39,7 @@ modules: num_oid: '.1.3.6.1.4.1.232.165.2.3.2.1.2.{{ $index }}' index: 'breakerVoltage.{{ $index }}' descr: 'PDU {{ $subindex0 }} Phase {{ $subindex1 }}' + group: 'PDU {{ $subindex0 }}' skip_values: -1 power: data: diff --git a/resources/definitions/os_discovery/ihse-draco.yaml b/resources/definitions/os_discovery/ihse-draco.yaml new file mode 100644 index 00000000000..966751a8979 --- /dev/null +++ b/resources/definitions/os_discovery/ihse-draco.yaml @@ -0,0 +1,185 @@ +modules: + os: + hardware: TERACPU-MIB::teraType.0 + version: TERACPU-MIB::teraSlotVersion.0 + version_regex: '/(?[A-Z][0-9]+\.[0-9]+) /' + sensors: + temperature: + data: + - + oid: TERACPU-MIB::teraTemperature + num_oid: '.1.3.6.1.4.1.38034.1.4.2.{{ $index }}' + index: 'teraTemperature.{{ $index }}' + descr: 'Matrix chip' + warn_limit: 110 + high_limit: 130 + percent: + data: + - + oid: TERACPU-MIB::teraFan1Speed + num_oid: '.1.3.6.1.4.1.38034.1.4.41.{{ $index }}' + index: 'teraFan1Speed.{{ $index }}' + descr: 'Fan tray 1 control level' + group: 'Cooling' + divisor: 15 + multiplier: 100 + low_limit: 0 + high_limit: 100 + - + oid: TERACPU-MIB::teraFan2Speed + num_oid: '.1.3.6.1.4.1.38034.1.4.43.{{ $index }}' + index: 'teraFan2Speed.{{ $index }}' + descr: 'Fan tray 2 control level' + group: 'Cooling' + divisor: 15 + multiplier: 100 + low_limit: 0 + high_limit: 100 + delay: + data: + - + oid: TERACPU-MIB::teraTaskTable + value: TERACPU-MIB::teraTaskCycle + num_oid: '.1.3.6.1.4.1.38034.1.3.1.1.5.{{ $index }}' + index: 'teraTaskCycle.{{ $index }}' + skip_values: + - { oid: index, op: not_regex, value: '/^[0-9]+$/' } + descr: '{{ TERACPU-MIB::teraTaskName }} cycle time' + group: 'Tasks' + divisor: 1000000 + state: + data: + - + oid: TERACPU-MIB::teraStatus + num_oid: '.1.3.6.1.4.1.38034.1.4.1.{{ $index }}' + index: 'teraStatus.{{ $index }}' + descr: 'Matrix chip status' + state_name: teraStatus + states: + - { value: 0, descr: unknown, generic: 3 } + - { value: 1, descr: active, generic: 0 } + - { value: 2, descr: disabled, generic: 2 } + - + oid: TERACPU-MIB::teraFan1Status + num_oid: '.1.3.6.1.4.1.38034.1.4.40.{{ $index }}' + index: 'teraFan1Status.{{ $index }}' + descr: 'Fan tray 1 status' + group: 'Cooling' + state_name: teraFanStatus + states: + - { value: 0, descr: unknown, generic: 3 } + - { value: 1, descr: okay, generic: 0 } + - { value: 2, descr: faulty, generic: 2 } + - + oid: TERACPU-MIB::teraFan2Status + num_oid: '.1.3.6.1.4.1.38034.1.4.42.{{ $index }}' + index: 'teraFan2Status.{{ $index }}' + descr: 'Fan tray 2 status' + group: 'Cooling' + state_name: teraFanStatus + states: + - { value: 0, descr: unknown, generic: 3 } + - { value: 1, descr: okay, generic: 0 } + - { value: 2, descr: faulty, generic: 2 } + - + oid: TERACPU-MIB::teraPower1Status + num_oid: '.1.3.6.1.4.1.38034.1.4.50.{{ $index }}' + index: 'teraPower1Status.{{ $index }}' + descr: 'Power supply 1' + group: 'Power supplies' + state_name: teraPowerStatus + states: + - { value: 0, descr: unknown, generic: 3 } + - { value: 1, descr: available, generic: 0 } + - { value: 3, descr: power, generic: 0 } + - { value: 4, descr: faulty, generic: 2 } + - + oid: TERACPU-MIB::teraPower2Status + num_oid: '.1.3.6.1.4.1.38034.1.4.51.{{ $index }}' + index: 'teraPower2Status.{{ $index }}' + descr: 'Power supply 2' + group: 'Power supplies' + state_name: teraPowerStatus + states: + - { value: 0, descr: unknown, generic: 3 } + - { value: 1, descr: available, generic: 0 } + - { value: 3, descr: power, generic: 0 } + - { value: 4, descr: faulty, generic: 2 } + - + oid: TERACPU-MIB::teraPower3Status + num_oid: '.1.3.6.1.4.1.38034.1.4.52.{{ $index }}' + index: 'teraPower3Status.{{ $index }}' + descr: 'Power supply 3' + group: 'Power supplies' + state_name: teraPowerStatus + states: + - { value: 0, descr: unknown, generic: 3 } + - { value: 1, descr: available, generic: 0 } + - { value: 3, descr: power, generic: 0 } + - { value: 4, descr: faulty, generic: 2 } + - + oid: TERACPU-MIB::teraPower4Status + num_oid: '.1.3.6.1.4.1.38034.1.4.53.{{ $index }}' + index: 'teraPower4Status.{{ $index }}' + descr: 'Power supply 4' + group: 'Power supplies' + state_name: teraPowerStatus + states: + - { value: 0, descr: unknown, generic: 3 } + - { value: 1, descr: available, generic: 0 } + - { value: 3, descr: power, generic: 0 } + - { value: 4, descr: faulty, generic: 2 } + - + oid: TERACPU-MIB::teraTaskTable + value: TERACPU-MIB::teraTaskStatus + num_oid: '.1.3.6.1.4.1.38034.1.3.1.1.3.{{ $index }}' + index: 'teraTaskStatus.{{ $index }}' + skip_values: + - { oid: index, op: not_regex, value: '/^[0-9]+$/' } + descr: '{{ TERACPU-MIB::teraTaskName }} status' + group: 'Tasks' + state_name: teraTaskStatus + states: + - { value: 0, descr: unknown, generic: 3 } + - { value: 1, descr: starting, generic: 0 } + - { value: 2, descr: active, generic: 0 } + - { value: 3, descr: busy, generic: 0 } + - { value: 4, descr: waiting, generic: 0 } + - { value: 5, descr: stopped, generic: 0 } + - { value: 6, descr: error, generic: 2 } + - + oid: TERACPU-MIB::teraSlotTable + value: TERACPU-MIB::teraSlotStatus + num_oid: '.1.3.6.1.4.1.38034.1.3.2.1.2.{{ $index }}' + index: 'teraSlotStatus.{{ $index }}' + skip_values: + - { oid: index, op: not_regex, value: '/^[0-9]+$/' } + descr: 'Slot {{ $index }} status' + group: 'Slots' + user_func: \LibreNMS\OS\IhseDraco::slotState + state_name: ihseDracoSlotState + states: + - { value: 0, descr: empty, generic: 0 } + - { value: 1, descr: ready, generic: 0 } + - { value: 2, descr: active, generic: 0 } + - { value: 3, descr: error, generic: 2 } + - { value: 4, descr: on-hold, generic: 1 } + - { value: 5, descr: invalid, generic: 2 } + - { value: 6, descr: unknown, generic: 3 } + - + oid: TERACPU-MIB::teraPortTable + value: TERACPU-MIB::teraPortStatus + num_oid: '.1.3.6.1.4.1.38034.1.3.3.1.2.{{ $index }}' + index: 'teraPortStatus.{{ $index }}' + skip_values: + - { oid: index, op: not_regex, value: '/^[0-9]+$/' } + descr: 'KVM port {{ $index }} status' + group: 'KVM ports' + user_func: \LibreNMS\OS\IhseDraco::portState + state_name: ihseDracoPortState + states: + - { value: 0, descr: unavailable, generic: 0 } + - { value: 1, descr: available, generic: 0 } + - { value: 2, descr: connected, generic: 0 } + - { value: 3, descr: error, generic: 2 } + - { value: 4, descr: unknown, generic: 3 } diff --git a/resources/definitions/os_discovery/infinera-groove.yaml b/resources/definitions/os_discovery/infinera-groove.yaml index 577c0e6a034..0c48b3b1ff1 100644 --- a/resources/definitions/os_discovery/infinera-groove.yaml +++ b/resources/definitions/os_discovery/infinera-groove.yaml @@ -52,6 +52,31 @@ modules: index: 'ochOsOSNR.{{ $index }}' skip_values: -99 + delay: + data: + - + oid: CORIANT-GROOVE-MIB::ochOsTable + value: CORIANT-GROOVE-MIB::ochOsDGD + num_oid: '.1.3.6.1.4.1.42229.1.2.4.1.19.1.1.22.{{ $index }}' + descr: 'och-os-{{ $subindex0 }}/{{ $subindex1 }}/{{ $subindex3 }} Differential Group Delay' + index: 'ochOsOSNR.{{ $index }}' + divisor: 1000000000000 + skip_values: 0 + + load: + data: + - + oid: CORIANT-GROOVE-MIB::cardTable + value: CORIANT-GROOVE-MIB::cardFanSpeedRate + num_oid: '.1.3.6.1.4.1.42229.1.2.3.3.1.1.7.{{ $index }}' + descr: 'Chassis fan slot-{{ $subindex0 }}/{{ $subindex1 }}' + index: 'cardFanSpeedRate.{{ $index }}' + low_limit: 0 + low_warn_limit: 20 + warn_limit: 80 + high_limit: 100 + skip_values: -99 + dbm: data: - diff --git a/resources/definitions/os_discovery/infortrend.yaml b/resources/definitions/os_discovery/infortrend.yaml index 7897f981eaf..e40b7c14ebd 100644 --- a/resources/definitions/os_discovery/infortrend.yaml +++ b/resources/definitions/os_discovery/infortrend.yaml @@ -1,35 +1,425 @@ modules: - os: - serial: - - IFT-SNMP-MIB::serialNum.0 - hardware: - - IFT-SNMP-MIB::privateLogoModel.0 - sensors: - temperature: - data: - - - oid: IFT-SNMP-MIB::luDevTable - value: IFT-SNMP-MIB::luDevValue - num_oid: '.1.3.6.1.4.1.1714.1.1.9.1.9.{{ $index }}' - divisor: 10 - index: 'temp{{ $index }}' - descr: IFT-SNMP-MIB::luDevDescription - skip_values: - - - oid: IFT-SNMP-MIB::luDevTypeCode - op: '!=' - value: 3 - voltage: - data: - - - oid: IFT-SNMP-MIB::luDevTable - value: IFT-SNMP-MIB::luDevValue - num_oid: '.1.3.6.1.4.1.1714.1.1.9.1.9.{{ $index }}' - divisor: 1000 - index: 'voltage{{ $index }}' - descr: IFT-SNMP-MIB::luDevDescription - skip_values: - - - oid: IFT-SNMP-MIB::luDevTypeCode - op: '!=' - value: 5 + os: + hardware: + - IFT-SNMP-MIB::privateLogoModel.0 + serial: + - IFT-SNMP-MIB::serialNum.0 + - IFT-SNMP-MIB::serialNumSec.0 + version_template: '{{ IFT-SNMP-MIB::fwMajorVersion.0 }}.{{ IFT-SNMP-MIB::fwMinorVersion.0 }}.{{ IFT-SNMP-MIB::fwEngineerVersion.0 }}' + + sensors: + state: + data: + + # luDevStatus is a per-device-class BITMASK, not a plain 1-5 enum + - + oid: IFT-SNMP-MIB::luDevTable + value: IFT-SNMP-MIB::luDevStatus + num_oid: '.1.3.6.1.4.1.1714.1.1.9.1.13.{{ $index }}' + descr: IFT-SNMP-MIB::luDevDescription + index: 'luDevStatus.{{ $index }}' + state_name: luDevStatusGeneric + states: + - { value: 0, generic: 0, descr: ok } + - { value: 1, generic: 2, descr: malfunction } + - { value: 64, generic: 1, descr: off } + - { value: 65, generic: 2, descr: 'malfunction, off' } + - { value: 128, generic: 3, descr: 'not present' } + - { value: 129, generic: 2, descr: 'malfunction, not present' } + - { value: 192, generic: 3, descr: 'off, not present' } + - { value: 193, generic: 2, descr: 'malfunction, off, not present' } + - { value: 255, generic: 3, descr: unknown } + skip_values: + - + oid: IFT-SNMP-MIB::luDevTypeCode + op: 'not_in_array' + value: [1, 2, 4, 10, 11, 13, 14, 18, 31] + + + - + oid: IFT-SNMP-MIB::luDevTable + value: IFT-SNMP-MIB::luDevStatus + num_oid: '.1.3.6.1.4.1.1714.1.1.9.1.13.{{ $index }}' + descr: IFT-SNMP-MIB::luDevDescription + index: 'luDevStatus.{{ $index }}' + state_name: luDevStatusLED + states: + - { value: 0, generic: 0, descr: ok } + - { value: 1, generic: 2, descr: malfunction } + - { value: 64, generic: 1, descr: off } + - { value: 65, generic: 2, descr: 'malfunction, off' } + - { value: 128, generic: 3, descr: 'not present' } + - { value: 129, generic: 2, descr: 'malfunction, not present' } + - { value: 192, generic: 3, descr: 'off, not present' } + - { value: 193, generic: 2, descr: 'malfunction, off, not present' } + - { value: 255, generic: 3, descr: unknown } + skip_values: + - + oid: IFT-SNMP-MIB::luDevDescriptor + op: 'not_in_array' + value: [33] + + - + oid: IFT-SNMP-MIB::luDevTable + value: IFT-SNMP-MIB::luDevStatus + num_oid: '.1.3.6.1.4.1.1714.1.1.9.1.13.{{ $index }}' + descr: 'Temperature Out-of-Range Flag {{ $index }}' + index: 'luDevStatus.{{ $index }}' + state_name: luDevStatusTempFlag + states: + - { value: 0, generic: 0, descr: ok } + - { value: 1, generic: 2, descr: 'temperature out of range' } + - { value: 255, generic: 3, descr: unknown } + skip_values: + - + oid: IFT-SNMP-MIB::luDevTypeCode + op: '!=' + value: 8 + + - + oid: IFT-SNMP-MIB::luDevTable + value: IFT-SNMP-MIB::luDevStatus + num_oid: '.1.3.6.1.4.1.1714.1.1.9.1.13.{{ $index }}' + descr: IFT-SNMP-MIB::luDevDescription + index: 'luDevStatus.{{ $index }}' + state_name: luDevStatusDoor + states: + - { value: 0, generic: 0, descr: 'closed, locked' } + - { value: 1, generic: 2, descr: malfunction } + - { value: 2, generic: 1, descr: open } + - { value: 3, generic: 2, descr: 'malfunction, open' } + - { value: 64, generic: 1, descr: 'closed, unlocked' } + - { value: 65, generic: 2, descr: 'malfunction, unlocked' } + - { value: 66, generic: 1, descr: 'open, unlocked' } + - { value: 67, generic: 2, descr: 'malfunction, open, unlocked' } + - { value: 128, generic: 3, descr: 'not present' } + - { value: 129, generic: 2, descr: 'malfunction, not present' } + - { value: 130, generic: 3, descr: 'not present' } + - { value: 131, generic: 2, descr: 'malfunction, not present' } + - { value: 192, generic: 3, descr: 'not present' } + - { value: 193, generic: 2, descr: 'malfunction, not present' } + - { value: 194, generic: 3, descr: 'not present' } + - { value: 195, generic: 2, descr: 'malfunction, not present' } + - { value: 255, generic: 3, descr: unknown } + skip_values: + - + oid: IFT-SNMP-MIB::luDevTypeCode + op: '!=' + value: 9 + + - + oid: IFT-SNMP-MIB::luDevTable + value: IFT-SNMP-MIB::luDevStatus + num_oid: '.1.3.6.1.4.1.1714.1.1.9.1.13.{{ $index }}' + descr: IFT-SNMP-MIB::luDevDescription + index: 'luDevStatus.{{ $index }}' + state_name: luDevStatusSlot + states: + - { value: 0, generic: 0, descr: ok } + - { value: 1, generic: 2, descr: malfunction } + - { value: 2, generic: 1, descr: 'marked for replacement' } + - { value: 3, generic: 2, descr: 'malfunction, marked for replacement' } + - { value: 4, generic: 2, descr: 'not activated' } + - { value: 5, generic: 2, descr: 'malfunction, not activated' } + - { value: 6, generic: 2, descr: 'marked for replacement, not activated' } + - { value: 7, generic: 2, descr: 'malfunction, marked for replacement, not activated' } + - { value: 64, generic: 1, descr: 'ready for insertion/removal' } + - { value: 65, generic: 2, descr: 'malfunction, ready for insertion/removal' } + - { value: 66, generic: 1, descr: 'marked for replacement, ready for removal' } + - { value: 67, generic: 2, descr: 'malfunction, marked for replacement, ready for removal' } + - { value: 68, generic: 1, descr: 'not activated, ready for removal' } + - { value: 69, generic: 2, descr: 'malfunction, not activated, ready for removal' } + - { value: 70, generic: 1, descr: 'marked for replacement, not activated, ready for removal' } + - { value: 71, generic: 2, descr: 'malfunction, marked for replacement, not activated, ready for removal' } + - { value: 128, generic: 3, descr: empty } + - { value: 129, generic: 2, descr: 'malfunction, empty' } + - { value: 130, generic: 3, descr: empty } + - { value: 131, generic: 2, descr: 'malfunction, empty' } + - { value: 132, generic: 3, descr: empty } + - { value: 133, generic: 2, descr: 'malfunction, empty' } + - { value: 134, generic: 3, descr: empty } + - { value: 135, generic: 2, descr: 'malfunction, empty' } + - { value: 192, generic: 3, descr: 'ready for insertion, empty' } + - { value: 193, generic: 2, descr: 'malfunction, ready for insertion, empty' } + - { value: 194, generic: 3, descr: 'ready for insertion, empty' } + - { value: 195, generic: 2, descr: 'malfunction, ready for insertion, empty' } + - { value: 196, generic: 3, descr: 'ready for insertion, empty' } + - { value: 197, generic: 2, descr: 'malfunction, ready for insertion, empty' } + - { value: 198, generic: 3, descr: 'ready for insertion, empty' } + - { value: 199, generic: 2, descr: 'malfunction, ready for insertion, empty' } + - { value: 255, generic: 3, descr: unknown } + skip_values: + - + oid: IFT-SNMP-MIB::luDevTypeCode + op: '!=' + value: 17 + + # Logical Drive Status. + - + oid: IFT-SNMP-MIB::ldTable + value: IFT-SNMP-MIB::ldStatus + num_oid: '.1.3.6.1.4.1.1714.1.1.2.1.6.{{ $index }}' + descr: 'Logical Drive {{ IFT-SNMP-MIB::ldID }}' + index: 'ldStatus.{{ $index }}' + state_name: ldStatus + states: + - { value: 0, generic: 0, descr: good } + - { value: 1, generic: 1, descr: rebuilding } + - { value: 2, generic: 1, descr: initializing } + - { value: 3, generic: 2, descr: degraded } + - { value: 4, generic: 2, descr: dead } + - { value: 5, generic: 2, descr: invalid } + - { value: 6, generic: 2, descr: incomplete } + - { value: 7, generic: 2, descr: drive missing } + - { value: 64, generic: 0, descr: 'good' } + - { value: 65, generic: 1, descr: 'rebuilding (flag bit 6 set)' } + - { value: 66, generic: 1, descr: 'initializing (flag bit 6 set)' } + - { value: 67, generic: 2, descr: 'degraded (flag bit 6 set)' } + - { value: 68, generic: 2, descr: 'dead (flag bit 6 set)' } + - { value: 69, generic: 2, descr: 'invalid (flag bit 6 set)' } + - { value: 70, generic: 2, descr: 'incomplete (flag bit 6 set)' } + - { value: 71, generic: 2, descr: 'drive missing (flag bit 6 set)' } + - { value: 128, generic: 2, descr: 'good (offline)' } + - { value: 129, generic: 2, descr: 'rebuilding (offline)' } + - { value: 130, generic: 2, descr: 'initializing (offline)' } + - { value: 131, generic: 2, descr: 'degraded (offline)' } + - { value: 132, generic: 2, descr: 'dead (offline)' } + - { value: 133, generic: 2, descr: 'invalid (offline)' } + - { value: 134, generic: 2, descr: 'incomplete (offline)' } + - { value: 135, generic: 2, descr: 'drive missing (offline)' } + - { value: 192, generic: 2, descr: 'good (offline, flag bit 6 set)' } + - { value: 193, generic: 2, descr: 'rebuilding (offline, flag bit 6 set)' } + - { value: 194, generic: 2, descr: 'initializing (offline, flag bit 6 set)' } + - { value: 195, generic: 2, descr: 'degraded (offline, flag bit 6 set)' } + - { value: 196, generic: 2, descr: 'dead (offline, flag bit 6 set)' } + - { value: 197, generic: 2, descr: 'invalid (offline, flag bit 6 set)' } + - { value: 198, generic: 2, descr: 'incomplete (offline, flag bit 6 set)' } + - { value: 199, generic: 2, descr: 'drive missing (offline, flag bit 6 set)' } + + # Physical Hard Drive Status. + - + oid: IFT-SNMP-MIB::hddTable + value: IFT-SNMP-MIB::hddStatus + num_oid: '.1.3.6.1.4.1.1714.1.1.6.1.11.{{ $index }}' + descr: 'Drive Slot {{ IFT-SNMP-MIB::hddSlotNum }} {{ IFT-SNMP-MIB::hddModelStr }}' + index: 'hddStatus.{{ $index }}' + state_name: hddStatus + states: + - { value: 0, generic: 0, descr: new } + - { value: 1, generic: 0, descr: online } + - { value: 2, generic: 0, descr: used } + - { value: 3, generic: 0, descr: spare } + - { value: 4, generic: 1, descr: initialization } + - { value: 5, generic: 1, descr: rebuilding } + - { value: 6, generic: 1, descr: add-to-ld } + - { value: 9, generic: 0, descr: global-spare } + - { value: 17, generic: 1, descr: cloning } + - { value: 18, generic: 0, descr: clone-valid } + - { value: 19, generic: 1, descr: copying } + - { value: 63, generic: 3, descr: absent } + - { value: 252, generic: 2, descr: missing-global-spare } + - { value: 253, generic: 2, descr: missing-spare } + - { value: 254, generic: 2, descr: missing } + - { value: 255, generic: 2, descr: failed } + skip_values: + - + oid: IFT-SNMP-MIB::hddSlotNum + op: '=' + value: 0 + + # Dual-controller + - + oid: IFT-SNMP-MIB::redCtlrStatus + value: IFT-SNMP-MIB::redCtlrStatus + num_oid: '.1.3.6.1.4.1.1714.1.1.1.6.4.{{ $index }}' + descr: 'Redundant Controller Status' + index: 'redCtlrStatus' + state_name: redCtlrStatus + states: + - { value: 0, generic: 1, descr: inactive } + - { value: 1, generic: 1, descr: scanning } + - { value: 17, generic: 0, descr: detected } + - { value: 18, generic: 0, descr: enabled } + - { value: 63, generic: 2, descr: 'controller failed' } + - { value: 64, generic: 1, descr: 'inactive (originally secondary)' } + - { value: 65, generic: 1, descr: 'scanning (originally secondary)' } + - { value: 81, generic: 0, descr: 'detected (originally secondary)' } + - { value: 82, generic: 0, descr: 'enabled (originally secondary)' } + - { value: 127, generic: 2, descr: 'controller failed (originally secondary)' } + - { value: 128, generic: 1, descr: 'inactive (secondary)' } + - { value: 129, generic: 1, descr: 'scanning (secondary)' } + - { value: 145, generic: 0, descr: 'detected (secondary)' } + - { value: 146, generic: 0, descr: 'enabled (secondary)' } + - { value: 191, generic: 2, descr: 'controller failed (secondary)' } + - { value: 192, generic: 1, descr: 'inactive (secondary, originally secondary)' } + - { value: 193, generic: 1, descr: 'scanning (secondary, originally secondary)' } + - { value: 209, generic: 0, descr: 'detected (secondary, originally secondary)' } + - { value: 210, generic: 0, descr: 'enabled (secondary, originally secondary)' } + - { value: 255, generic: 2, descr: 'controller failed (secondary, originally secondary)' } + skip_values: + - + oid: IFT-SNMP-MIB::redCtlrCfg + op: '=' + value: 255 + + temperature: + data: + - + oid: IFT-SNMP-MIB::luDevTable + value: IFT-SNMP-MIB::luDevValue + num_oid: '.1.3.6.1.4.1.1714.1.1.9.1.9.{{ $index }}' + descr: IFT-SNMP-MIB::luDevDescription + index: 'temp{{ $index }}' + divisor: 10 + skip_values: + - + oid: IFT-SNMP-MIB::luDevTypeCode + op: '!=' + value: 3 + - + oid: IFT-SNMP-MIB::luDevValue + op: '=' + value: 0 + + voltage: + data: + - + oid: IFT-SNMP-MIB::luDevTable + value: IFT-SNMP-MIB::luDevValue + num_oid: '.1.3.6.1.4.1.1714.1.1.9.1.9.{{ $index }}' + descr: IFT-SNMP-MIB::luDevDescription + index: 'voltage{{ $index }}' + divisor: 1000 + skip_values: + - + oid: IFT-SNMP-MIB::luDevTypeCode + op: '!=' + value: 5 + - + oid: IFT-SNMP-MIB::luDevValue + op: '=' + value: 0 + + current: + data: + - + oid: IFT-SNMP-MIB::luDevTable + value: IFT-SNMP-MIB::luDevValue + num_oid: '.1.3.6.1.4.1.1714.1.1.9.1.9.{{ $index }}' + descr: IFT-SNMP-MIB::luDevDescription + index: 'current.{{ $index }}' + divisor: 1000 + skip_values: + - + oid: IFT-SNMP-MIB::luDevTypeCode + op: '!=' + value: 6 + - + oid: IFT-SNMP-MIB::luDevValue + op: '=' + value: 0 + + fanspeed: + data: + - + oid: IFT-SNMP-MIB::luDevTable + value: IFT-SNMP-MIB::luDevValue + num_oid: '.1.3.6.1.4.1.1714.1.1.9.1.9.{{ $index }}' + descr: IFT-SNMP-MIB::luDevDescription + index: 'fanspeed.{{ $index }}' + skip_values: + - + oid: IFT-SNMP-MIB::luDevTypeCode + op: '!=' + value: 2 + - + oid: IFT-SNMP-MIB::luDevValue + op: '=' + value: 0 + + percent: + data: + - + oid: IFT-SNMP-MIB::hddTable + value: IFT-SNMP-MIB::hddWearLife + num_oid: '.1.3.6.1.4.1.1714.1.1.6.1.50.{{ $index }}' + descr: 'SSD {{ IFT-SNMP-MIB::hddSlotNum }} Wear Life' + index: 'hddWearLife.{{ $index }}' + group: SSD Wear Life + low_limit: 10 + low_warn_limit: 20 + skip_values: + - + oid: IFT-SNMP-MIB::hddWearLife + op: '=' + value: -1 + + count: + data: + + - + oid: IFT-SNMP-MIB::lvTable + value: IFT-SNMP-MIB::lvSize + num_oid: '.1.3.6.1.4.1.1714.1.1.3.1.3.{{ $index }}' + descr: 'LUN {{ IFT-SNMP-MIB::lvID }} (TB)' + index: 'lvSize.{{ $index }}' + multiplier: 24 + divisor: 46881075200 + group: LUN Capacity + + - + oid: IFT-SNMP-MIB::hddTable + value: IFT-SNMP-MIB::hddSize + num_oid: '.1.3.6.1.4.1.1714.1.1.6.1.7.{{ $index }}' + descr: 'Drive Slot {{ IFT-SNMP-MIB::hddSlotNum }} {{ IFT-SNMP-MIB::hddModelStr }} (TB)' + index: 'hddSize.{{ $index }}' + multiplier: 4 + divisor: 7813512960 + group: Physical Drive Capacity + skip_values: + - + oid: IFT-SNMP-MIB::hddSlotNum + op: '=' + value: 0 + + - + oid: IFT-SNMP-MIB::cacheTotal + value: IFT-SNMP-MIB::cacheTotal + num_oid: '.1.3.6.1.4.1.1714.1.1.1.2.3.{{ $index }}' + descr: 'Cache Total Blocks' + index: 'cacheTotal' + + - + oid: IFT-SNMP-MIB::cacheDirty + value: IFT-SNMP-MIB::cacheDirty + num_oid: '.1.3.6.1.4.1.1714.1.1.1.2.4.{{ $index }}' + descr: 'Cache Dirty Blocks' + index: 'cacheDirty' + + - + oid: IFT-SNMP-MIB::ldTable + value: IFT-SNMP-MIB::ldTotalDrvCnt + num_oid: '.1.3.6.1.4.1.1714.1.1.2.1.8.{{ $index }}' + descr: 'LD {{ $index }} Total Drives' + index: 'ldTotalDrvCnt.{{ $index }}' + + - + oid: IFT-SNMP-MIB::ldTable + value: IFT-SNMP-MIB::ldOnlineDrvCnt + num_oid: '.1.3.6.1.4.1.1714.1.1.2.1.9.{{ $index }}' + descr: 'LD {{ $index }} Online Drives' + index: 'ldOnlineDrvCnt.{{ $index }}' + + - + oid: IFT-SNMP-MIB::ldTable + value: IFT-SNMP-MIB::ldSpareDrvCnt + num_oid: '.1.3.6.1.4.1.1714.1.1.2.1.10.{{ $index }}' + descr: 'LD {{ $index }} Spare Drives' + index: 'ldSpareDrvCnt.{{ $index }}' + + - + oid: IFT-SNMP-MIB::ldTable + value: IFT-SNMP-MIB::ldFailedDrvCnt + num_oid: '.1.3.6.1.4.1.1714.1.1.2.1.11.{{ $index }}' + descr: 'LD {{ $index }} Failed Drives' + index: 'ldFailedDrvCnt.{{ $index }}' diff --git a/resources/definitions/os_discovery/ionodes.yaml b/resources/definitions/os_discovery/ionodes.yaml index 01569d8c3b7..a83a33b962d 100644 --- a/resources/definitions/os_discovery/ionodes.yaml +++ b/resources/definitions/os_discovery/ionodes.yaml @@ -11,7 +11,6 @@ modules: num_oid: '.1.3.6.1.4.1.40748.2.1.{{ $index }}' descr: 'CPU usage' index: 'ionSysCpuUsage.{{ $index }}' - value: IONODES-IONSERIES-MIB::ionSysCpuUsage sensors: additional_oids: data: diff --git a/resources/definitions/os_discovery/ironware.yaml b/resources/definitions/os_discovery/ironware.yaml index 660b18df70e..99d4240c57f 100644 --- a/resources/definitions/os_discovery/ironware.yaml +++ b/resources/definitions/os_discovery/ironware.yaml @@ -46,6 +46,22 @@ modules: num_oid: '.1.3.6.1.4.1.1991.1.1.3.3.6.1.2.{{ $index }}' descr: '{{ IF-MIB::ifDescr }} Tx Power' index: 'snIfOpticalMonitoringTxPower.{{ $index }}' + - + oid: FOUNDRY-SN-SWITCH-GROUP-MIB::snIfOpticalLaneMonitoringTable + value: FOUNDRY-SN-SWITCH-GROUP-MIB::snIfOpticalLaneMonitoringRxPower + num_oid: '.1.3.6.1.4.1.1991.1.1.3.3.10.1.4.{{ $index }}' + descr: '{{ IF-MIB::ifDescr:0 }} Lane {{ $subindex1 }} Rx Power' + index: 'snIfOpticalLaneMonitoringRxPower.{{ $index }}' + entPhysicalIndex: '{{ $subindex0 }}' + entPhysicalIndex_measured: 'ports' + - + oid: FOUNDRY-SN-SWITCH-GROUP-MIB::snIfOpticalLaneMonitoringTable + value: FOUNDRY-SN-SWITCH-GROUP-MIB::snIfOpticalLaneMonitoringTxPower + num_oid: '.1.3.6.1.4.1.1991.1.1.3.3.10.1.3.{{ $index }}' + descr: '{{ IF-MIB::ifDescr:0 }} Lane {{ $subindex1 }} Tx Power' + index: 'snIfOpticalLaneMonitoringTxPower.{{ $index }}' + entPhysicalIndex: '{{ $subindex0 }}' + entPhysicalIndex_measured: 'ports' count: data: - @@ -71,6 +87,14 @@ modules: num_oid: '.1.3.6.1.4.1.1991.1.1.3.3.6.1.4.{{ $index }}' descr: '{{ IF-MIB::ifDescr }} Tx Bias Current' index: 'snIfOpticalMonitoringTxBiasCurrent.{{ $index }}' + - + oid: FOUNDRY-SN-SWITCH-GROUP-MIB::snIfOpticalLaneMonitoringTable + value: FOUNDRY-SN-SWITCH-GROUP-MIB::snIfOpticalLaneMonitoringTxBiasCurrent + num_oid: '.1.3.6.1.4.1.1991.1.1.3.3.10.1.5.{{ $index }}' + descr: '{{ IF-MIB::ifDescr:0 }} Lane {{ $subindex1 }} Tx Bias Current' + index: 'snIfOpticalLaneMonitoringTxBiasCurrent.{{ $index }}' + entPhysicalIndex: '{{ $subindex0 }}' + entPhysicalIndex_measured: 'ports' power: data: - @@ -143,6 +167,25 @@ modules: descr: '{{ IF-MIB::ifDescr }} Tx Laser' index: 'snIfOpticalMonitoringTemperature.{{ $index }}' group: 'Transceiver Temperatures' + - + oid: FOUNDRY-SN-SWITCH-GROUP-MIB::snIfOpticalLaneMonitoringTable + value: FOUNDRY-SN-SWITCH-GROUP-MIB::snIfOpticalLaneMonitoringTemperature + num_oid: '.1.3.6.1.4.1.1991.1.1.3.3.10.1.2.{{ $index }}' + descr: '{{ IF-MIB::ifDescr:0 }} Lane {{ $subindex1 }} Temperature' + index: 'snIfOpticalLaneMonitoringTemperature.{{ $index }}' + entPhysicalIndex: '{{ $subindex0 }}' + entPhysicalIndex_measured: 'ports' + group: 'Transceiver Temperatures' + voltage: + data: + - + oid: FOUNDRY-SN-SWITCH-GROUP-MIB::snIfOpticalLaneMonitoringTable + value: FOUNDRY-SN-SWITCH-GROUP-MIB::snIfOpticalLaneMonitoringVoltage + num_oid: '.1.3.6.1.4.1.1991.1.1.3.3.10.1.6.{{ $index }}' + descr: '{{ IF-MIB::ifDescr:0 }} Lane {{ $subindex1 }} Supply Voltage' + index: 'snIfOpticalLaneMonitoringVoltage.{{ $index }}' + entPhysicalIndex: '{{ $subindex0 }}' + entPhysicalIndex_measured: 'ports' state: data: - diff --git a/resources/definitions/os_discovery/iskratel-lumia.yaml b/resources/definitions/os_discovery/iskratel-lumia.yaml new file mode 100644 index 00000000000..58e86e06333 --- /dev/null +++ b/resources/definitions/os_discovery/iskratel-lumia.yaml @@ -0,0 +1,224 @@ +modules: + os: + version: ISKRATEL-MSAN-MIB::msanSwSteerVersion.0 + sensors: + additional_oids: + data: + - + oid: + - IF-MIB::ifDescr + temperature: + data: + - + oid: ISKRATEL-MSAN-MIB::msanDiagnosticsTempTable + value: ISKRATEL-MSAN-MIB::msanDiagnosticsTempCurrent + num_oid: '.1.3.6.1.4.1.1332.1.1.5.3.14.4.1.3.{{ $index }}' + index: 'msanDiagnosticsTempCurrent.{{ $index }}' + descr: '{{ ISKRATEL-MSAN-MIB::msanDiagnosticsTempSensorName }}' + low_limit: ISKRATEL-MSAN-MIB::msanDiagnosticsTempCriticUnderheatThreshold + low_warn_limit: ISKRATEL-MSAN-MIB::msanDiagnosticsTempUnderheatThreshold + warn_limit: ISKRATEL-MSAN-MIB::msanDiagnosticsTempOverheatThreshold + high_limit: ISKRATEL-MSAN-MIB::msanDiagnosticsTempCriticOverheatThreshold + - + oid: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsTable + value: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsTempCurrent + num_oid: '.1.3.6.1.4.1.1332.1.1.5.3.32.3.1.2.{{ $index }}' + index: 'msanSfpDiagnosticsTempCurrent.{{ $index }}' + descr: '{{ IF-MIB::ifDescr }}' + low_limit: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsTempMin + high_limit: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsTempMax + entPhysicalIndex: '{{ $index }}' + entPhysicalIndex_measured: ports + skip_values: + - + oid: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsTempCurrent + op: '==' + value: -129 + - + oid: ISKRATEL-MSAN-MIB::msanOnuInfoTable + value: ISKRATEL-MSAN-MIB::msanOnuInfoTemp + num_oid: '.1.3.6.1.4.1.1332.1.1.5.3.111.3.1.41.{{ $index }}' + index: 'msanOnuInfoTemp.{{ $index }}' + descr: '{{ IF-MIB::ifDescr }}' + entPhysicalIndex: '{{ $index }}' + entPhysicalIndex_measured: ports + skip_values: + - + oid: ISKRATEL-MSAN-MIB::msanOnuInfoPrimaryStatus + op: '!=' + value: 3 + fanspeed: + data: + - + oid: ISKRATEL-MSAN-MIB::msanDiagnosticsFanTable + value: ISKRATEL-MSAN-MIB::msanDiagnosticsFanCurrentRpm + num_oid: '.1.3.6.1.4.1.1332.1.1.5.3.14.8.1.2.{{ $index }}' + index: 'msanDiagnosticsFanCurrentRpm.{{ $index }}' + descr: 'Fan {{ $index }}' + voltage: + data: + - + oid: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsTable + value: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsVoltageCurrent + num_oid: '.1.3.6.1.4.1.1332.1.1.5.3.32.3.1.6.{{ $index }}' + index: 'msanSfpDiagnosticsVoltageCurrent.{{ $index }}' + descr: '{{ IF-MIB::ifDescr }}' + divisor: 100 + low_limit: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsVoltageMin + high_limit: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsVoltageMax + entPhysicalIndex: '{{ $index }}' + entPhysicalIndex_measured: ports + skip_values: + - + oid: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsVoltageCurrent + op: '==' + value: -1 + current: + data: + - + oid: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsTable + value: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsTxBiasCrrCurrent + num_oid: '.1.3.6.1.4.1.1332.1.1.5.3.32.3.1.9.{{ $index }}' + index: 'msanSfpDiagnosticsTxBiasCrrCurrent.{{ $index }}' + descr: '{{ IF-MIB::ifDescr }} Tx Bias' + divisor: 100000 + entPhysicalIndex: '{{ $index }}' + entPhysicalIndex_measured: ports + skip_values: + - + oid: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsTxBiasCrrCurrent + op: '==' + value: -1 + power: + data: + - + oid: ISKRATEL-MSAN-MIB::msanBoardConfTable + value: ISKRATEL-MSAN-MIB::msanBoardConfPowerConsumption + num_oid: '.1.3.6.1.4.1.1332.1.1.5.3.39.2.1.18.{{ $index }}' + index: 'msanBoardConfPowerConsumption.{{ $index }}' + descr: '{{ ISKRATEL-MSAN-MIB::msanBoardConfDescription }}' + divisor: 100 + dbm: + data: + - + oid: ISKRATEL-MSAN-MIB::msanOnuInfoTable + value: ISKRATEL-MSAN-MIB::msanOnuInfoRxPower + num_oid: '.1.3.6.1.4.1.1332.1.1.5.3.111.3.1.38.{{ $index }}' + index: 'msanOnuInfoRxPower.{{ $index }}' + descr: '{{ IF-MIB::ifDescr }} Rx' + divisor: 100 + entPhysicalIndex: '{{ $index }}' + entPhysicalIndex_measured: ports + skip_values: + - + oid: ISKRATEL-MSAN-MIB::msanOnuInfoRxPower + op: '==' + value: -9900 + - + oid: ISKRATEL-MSAN-MIB::msanOnuInfoTable + value: ISKRATEL-MSAN-MIB::msanOnuInfoTxPower + num_oid: '.1.3.6.1.4.1.1332.1.1.5.3.111.3.1.39.{{ $index }}' + index: 'msanOnuInfoTxPower.{{ $index }}' + descr: '{{ IF-MIB::ifDescr }} Tx' + divisor: 100 + entPhysicalIndex: '{{ $index }}' + entPhysicalIndex_measured: ports + skip_values: + - + oid: ISKRATEL-MSAN-MIB::msanOnuInfoTxPower + op: '==' + value: -9900 + - + oid: ISKRATEL-MSAN-MIB::msanOnuInfoTable + value: ISKRATEL-MSAN-MIB::msanOnuInfoOltRxPower + num_oid: '.1.3.6.1.4.1.1332.1.1.5.3.111.3.1.40.{{ $index }}' + index: 'msanOnuInfoOltRxPower.{{ $index }}' + descr: '{{ IF-MIB::ifDescr }} OLT Rx' + divisor: 100 + entPhysicalIndex: '{{ $index }}' + entPhysicalIndex_measured: ports + skip_values: + - + oid: ISKRATEL-MSAN-MIB::msanOnuInfoOltRxPower + op: '==' + value: -9900 + - + oid: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsTable + value: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsTxPowerCurrentDBm + num_oid: '.1.3.6.1.4.1.1332.1.1.5.3.32.3.1.24.{{ $index }}' + index: 'msanSfpDiagnosticsTxPowerCurrentDBm.{{ $index }}' + descr: '{{ IF-MIB::ifDescr }} Tx' + divisor: 100 + entPhysicalIndex: '{{ $index }}' + entPhysicalIndex_measured: ports + skip_values: + - + oid: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsTxPowerCurrentDBm + op: '==' + value: -100000 + - + oid: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsTable + value: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsRxPowerCurrentDBm + num_oid: '.1.3.6.1.4.1.1332.1.1.5.3.32.3.1.25.{{ $index }}' + index: 'msanSfpDiagnosticsRxPowerCurrentDBm.{{ $index }}' + descr: '{{ IF-MIB::ifDescr }} Rx' + divisor: 100 + entPhysicalIndex: '{{ $index }}' + entPhysicalIndex_measured: ports + skip_values: + - + oid: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsRxPowerCurrentDBm + op: '==' + value: -100000 + state: + data: + - + oid: ISKRATEL-MSAN-MIB::msanOnuInfoTable + value: ISKRATEL-MSAN-MIB::msanOnuInfoPrimaryStatus + num_oid: '.1.3.6.1.4.1.1332.1.1.5.3.111.3.1.2.{{ $index }}' + index: 'msanOnuInfoPrimaryStatus.{{ $index }}' + descr: '{{ IF-MIB::ifDescr }}' + entPhysicalIndex: '{{ $index }}' + entPhysicalIndex_measured: ports + state_name: msanOnuInfoPrimaryStatus + group: 'ONU' + states: + - { value: 0, generic: 3, descr: invalid } + - { value: 1, generic: 1, descr: inactive } + - { value: 2, generic: 1, descr: activatePending } + - { value: 3, generic: 0, descr: active } + - { value: 4, generic: 1, descr: deactivatePending } + - { value: 5, generic: 1, descr: disablePending } + - { value: 6, generic: 0, descr: disabled } + - + oid: ISKRATEL-MSAN-MIB::msanOnuInfoTable + value: ISKRATEL-MSAN-MIB::msanOnuInfoOperState + num_oid: '.1.3.6.1.4.1.1332.1.1.5.3.111.3.1.9.{{ $index }}' + index: 'msanOnuInfoOperState.{{ $index }}' + descr: '{{ IF-MIB::ifDescr }} Oper' + entPhysicalIndex: '{{ $index }}' + entPhysicalIndex_measured: ports + state_name: msanOnuInfoOperState + group: 'ONU' + states: + - { value: 1, generic: 0, descr: enabled } + - { value: 2, generic: 1, descr: disabled } + - { value: 3, generic: 3, descr: unknown } + - + oid: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsTable + value: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsSignal + num_oid: '.1.3.6.1.4.1.1332.1.1.5.3.32.3.1.1.{{ $index }}' + index: 'msanSfpDiagnosticsSignal.{{ $index }}' + descr: '{{ IF-MIB::ifDescr }} Signal' + entPhysicalIndex: '{{ $index }}' + entPhysicalIndex_measured: ports + state_name: msanSfpDiagnosticsSignal + states: + - { value: 1, generic: 2, descr: loss } + - { value: 2, generic: 0, descr: ok } + - { value: 3, generic: 3, descr: notSupported } + skip_values: + - + oid: ISKRATEL-MSAN-MIB::msanSfpDiagnosticsSignal + op: '==' + value: 3 diff --git a/resources/definitions/os_discovery/junos.yaml b/resources/definitions/os_discovery/junos.yaml index 993783cb194..501206e5d26 100644 --- a/resources/definitions/os_discovery/junos.yaml +++ b/resources/definitions/os_discovery/junos.yaml @@ -26,7 +26,7 @@ modules: oid: JUNIPER-MIB::jnxOperatingTable value: JUNIPER-MIB::jnxOperatingCPU num_oid: '.1.3.6.1.4.1.2636.3.1.13.1.8.{{ $index }}' - descr: JUNIPER-MIB::jnxOperatingDescr + descr: "{{ JUNIPER-MIB::jnxOperatingDescr }}" skip_values: - oid: JUNIPER-MIB::jnxOperatingMemory @@ -37,7 +37,7 @@ modules: op: 'regex' value: '/(fan|sensor)/i' - - oid: JUNIPER-SRX5000-SPU-MONITORING-MIB::jnxJsSPUMonitoringObjectsEntry + oid: JUNIPER-SRX5000-SPU-MONITORING-MIB::jnxJsSPUMonitoringObjectsTable value: JUNIPER-SRX5000-SPU-MONITORING-MIB::jnxJsSPUMonitoringCPUUsage num_oid: '.1.3.6.1.4.1.2636.3.39.1.12.1.1.1.4.{{ $index }}' descr: '{{ JUNIPER-SRX5000-SPU-MONITORING-MIB::jnxJsSPUMonitoringNodeDescr }} SPU {{ JUNIPER-SRX5000-SPU-MONITORING-MIB::jnxJsSPUMonitoringFPCIndex }}/{{ JUNIPER-SRX5000-SPU-MONITORING-MIB::jnxJsSPUMonitoringSPUIndex }}' @@ -294,6 +294,14 @@ modules: index: 'jnxJsSPUMonitoringCurrentCPSession.{{ $index }}' skip_values: - 0 + - + oid: VRRP-MIB::vrrpRouterStatsTable + value: VRRP-MIB::vrrpStatsBecomeMaster + num_oid: '.1.3.6.1.2.1.68.2.4.1.1.{{ $index }}' + descr: 'VRRP group {{ $subindex1 }} {{ IF-MIB::ifDescr:0 }} master transitions' + group: VRRP + entPhysicalIndex: '{{ $subindex0 }}' + entPhysicalIndex_measured: ports state: data: - @@ -360,6 +368,51 @@ modules: - { value: 1, generic: 0, descr: on } - { value: 2, generic: 0, descr: off } - { value: 3, generic: 2, descr: fault } + - + oid: VRRP-MIB::vrrpOperTable + value: VRRP-MIB::vrrpOperState + num_oid: '.1.3.6.1.2.1.68.1.3.1.3.{{ $index }}' + descr: 'VRRP group {{ $subindex1 }} {{ IF-MIB::ifDescr:0 }}' + group: VRRP + entPhysicalIndex: '{{ $subindex0 }}' + entPhysicalIndex_measured: ports + state_name: vrrpOperState + states: + - { value: 1, descr: initialize, generic: 1 } + - { value: 2, descr: backup, generic: 0 } + - { value: 3, descr: master, generic: 0 } + - + oid: VRRPV3-MIB::vrrpv3OperationsTable + snmp_flags: '-OteQUSb' + value: VRRPV3-MIB::vrrpv3OperationsStatus + num_oid: '.1.3.6.1.2.1.207.1.1.1.1.6.{{ $index }}' + descr: 'VRRPv3 group {{ $subindex1 }} {{ IF-MIB::ifDescr:0 }} IPv4' + group: VRRP + entPhysicalIndex: '{{ $subindex0 }}' + entPhysicalIndex_measured: ports + state_name: vrrpOperState + skip_values: + - { oid: index, op: not_ends, value: '.1' } + states: + - { value: 1, descr: initialize, generic: 1 } + - { value: 2, descr: backup, generic: 0 } + - { value: 3, descr: master, generic: 0 } + - + oid: VRRPV3-MIB::vrrpv3OperationsTable + snmp_flags: '-OteQUSb' + value: VRRPV3-MIB::vrrpv3OperationsStatus + num_oid: '.1.3.6.1.2.1.207.1.1.1.1.6.{{ $index }}' + descr: 'VRRPv3 group {{ $subindex1 }} {{ IF-MIB::ifDescr:0 }} IPv6' + group: VRRP + entPhysicalIndex: '{{ $subindex0 }}' + entPhysicalIndex_measured: ports + state_name: vrrpOperState + skip_values: + - { oid: index, op: not_ends, value: '.2' } + states: + - { value: 1, descr: initialize, generic: 1 } + - { value: 2, descr: backup, generic: 0 } + - { value: 3, descr: master, generic: 0 } power: data: - diff --git a/resources/definitions/os_discovery/junose.yaml b/resources/definitions/os_discovery/junose.yaml index 3029048917e..6269ca8b679 100644 --- a/resources/definitions/os_discovery/junose.yaml +++ b/resources/definitions/os_discovery/junose.yaml @@ -6,6 +6,5 @@ modules: value: Juniper-System-MIB::juniSystemModuleCpuUtilPct num_oid: '.1.3.6.1.4.1.4874.2.2.2.1.3.5.1.3.{{ $index }}' descr: Juniper-System-MIB::juniSystemModuleDescr - entPhysicalIndex: Juniper-System-MIB::juniSystemModulePhysicalIndex skip_values: - -1 diff --git a/resources/definitions/os_discovery/lantronix-slc.yaml b/resources/definitions/os_discovery/lantronix-slc.yaml index 16a83110649..e02e71835d1 100644 --- a/resources/definitions/os_discovery/lantronix-slc.yaml +++ b/resources/definitions/os_discovery/lantronix-slc.yaml @@ -1,6 +1,44 @@ modules: - os: - hardware: LANTRONIX-SLC-MIB::slcSystemModel.0 - version: LANTRONIX-SLC-MIB::slcSystemFWRev.0 - features: LANTRONIX-SLC-MIB::slcSystemModelString.0 - serial: LANTRONIX-SLC-MIB::slcSystemSerialNo.0 + os: + hardware: LANTRONIX-SLC-MIB::slcSystemModel.0 + version: LANTRONIX-SLC-MIB::slcSystemFWRev.0 + features: LANTRONIX-SLC-MIB::slcSystemModelString.0 + serial: LANTRONIX-SLC-MIB::slcSystemSerialNo.0 + sensors: + temperature: + data: + - + oid: LANTRONIX-SLC-MIB::slcSystem + value: LANTRONIX-SLC-MIB::slcSystemInternalTemp + num_oid: '.1.3.6.1.4.1.244.1.1.6.25.{{ $index }}' + index: 1 + descr: 'Internal Temperature' + low_limit: LANTRONIX-SLC-MIB::slcSystemInternalTempLow + high_limit: LANTRONIX-SLC-MIB::slcSystemInternalTempHigh + low_warn_limit: LANTRONIX-SLC-MIB::slcSystemInternalTempLow + warn_limit: LANTRONIX-SLC-MIB::slcSystemInternalTempHigh + skip_values: 9999 + state: + data: + - + oid: LANTRONIX-SLC-MIB::slcDevPowerSupply + value: LANTRONIX-SLC-MIB::slcDevPowerSupplyA + num_oid: '.1.3.6.1.4.1.244.1.1.4.4.2.{{ $index }}' + index: 'slcDevPowerSupplyA.{{ $index }}' + descr: 'Power Supply A' + state_name: slcDevPowerSupplyA + states: + - { value: 1, generic: 0, descr: Up } + - { value: 2, generic: 1, descr: Down } + - + oid: LANTRONIX-SLC-MIB::slcDevPowerSupply + value: LANTRONIX-SLC-MIB::slcDevPowerSupplyB + num_oid: '.1.3.6.1.4.1.244.1.1.4.4.3.{{ $index }}' + index: 'slcDevPowerSupplyB.{{ $index }}' + descr: 'Power Supply B' + state_name: slcDevPowerSupplyB + states: + - { value: 1, generic: 0, descr: Up } + - { value: 2, generic: 1, descr: Down } + - { value: 3, generic: 3, descr: 'Not Installed' } + skip_values: 3 diff --git a/resources/definitions/os_discovery/luminato.yaml b/resources/definitions/os_discovery/luminato.yaml index 5ff112332a8..a499575dcd4 100644 --- a/resources/definitions/os_discovery/luminato.yaml +++ b/resources/definitions/os_discovery/luminato.yaml @@ -6,14 +6,6 @@ modules: hardware_template: '{{ TELESTE-LUMINATO-MIB::hwType.0 }} {{ TELESTE-LUMINATO-MIB::hwVersion.0 }}' serial: TELESTE-LUMINATO-MIB::hwSerialNumber.0 version: TELESTE-LUMINATO-MIB::swVersion.0 - - processors: - data: - - - oid: UCD-SNMP-MIB::laLoadInt - num_oid: '.1.3.6.1.4.1.2021.10.1.5.{{ $index }}' - descr: Chassis CPU - index: 0 sensors: additional_oids: data: diff --git a/resources/definitions/os_discovery/mediornet.yaml b/resources/definitions/os_discovery/mediornet.yaml new file mode 100644 index 00000000000..5ab676ea5f6 --- /dev/null +++ b/resources/definitions/os_discovery/mediornet.yaml @@ -0,0 +1,126 @@ +modules: + os: + hardware: SNMPv2-MIB::sysDescr.0 + hardware_regex: '/MediorNet (?[^(]+?)(?: \(|$)/' + version: RIEDEL-MEDIORNET-MIB::packageVersion.0 + serial: RIEDEL-MEDIORNET-MIB::serialNumber.0 + sysName: RIEDEL-MEDIORNET-MIB::name.0 + location: RIEDEL-MEDIORNET-MIB::location.0 + processors: + data: + - + oid: RIEDEL-MEDIORNET-MIB::cpuLoad + num_oid: '.1.3.6.1.4.1.23056.2.12.{{ $index }}' + precision: 10 + descr: 'CPU' + sensors: + temperature: + data: + - + oid: RIEDEL-MEDIORNET-MIB::temperature + num_oid: '.1.3.6.1.4.1.23056.2.11.{{ $index }}' + descr: 'System Temperature' + index: 'temperature.{{ $index }}' + - + oid: RIEDEL-MEDIORNET-MIB::slotTable + value: RIEDEL-MEDIORNET-MIB::cardTemperature + num_oid: '.1.3.6.1.4.1.23056.2.20.1.5.{{ $index }}' + descr: 'Slot {{ RIEDEL-MEDIORNET-MIB::slot }} {{ RIEDEL-MEDIORNET-MIB::cardName }}' + index: 'cardTemperature.{{ $index }}' + skip_values: + - + oid: RIEDEL-MEDIORNET-MIB::cardStatus + op: '=' + value: 0 + - + oid: RIEDEL-MEDIORNET-MIB::cardType + op: '=' + value: 'Main Module' + - + oid: RIEDEL-MEDIORNET-MIB::cardType + op: '=' + value: 'Video In Module' + - + oid: RIEDEL-MEDIORNET-MIB::cardType + op: '=' + value: 'Video Out Module' + - + oid: RIEDEL-MEDIORNET-MIB::cardType + op: 'starts' + value: 'Link Module' + fanspeed: + data: + - + oid: RIEDEL-MEDIORNET-MIB::fanSpeed + num_oid: '.1.3.6.1.4.1.23056.2.10.{{ $index }}' + descr: 'System Fans' + index: 'fanSpeed.{{ $index }}' + state: + data: + - + oid: RIEDEL-MEDIORNET-MIB::psu1 + num_oid: '.1.3.6.1.4.1.23056.2.13.{{ $index }}' + descr: 'Power Supply 1' + index: 'psu1.{{ $index }}' + state_name: RIEDEL-MEDIORNET-MIB::psu1 + states: + - { value: 0, descr: 'notAvailable', generic: 1 } + - { value: 1, descr: 'operating', generic: 0 } + - { value: 2, descr: 'notOperating', generic: 2 } + - + oid: RIEDEL-MEDIORNET-MIB::psu2 + num_oid: '.1.3.6.1.4.1.23056.2.14.{{ $index }}' + descr: 'Power Supply 2' + index: 'psu2.{{ $index }}' + state_name: RIEDEL-MEDIORNET-MIB::psu2 + states: + - { value: 0, descr: 'notAvailable', generic: 1 } + - { value: 1, descr: 'operating', generic: 0 } + - { value: 2, descr: 'notOperating', generic: 2 } + - + oid: RIEDEL-MEDIORNET-MIB::slotTable + value: RIEDEL-MEDIORNET-MIB::cardStatus + num_oid: '.1.3.6.1.4.1.23056.2.20.1.4.{{ $index }}' + descr: 'Slot {{ RIEDEL-MEDIORNET-MIB::slot }} {{ RIEDEL-MEDIORNET-MIB::cardName }}' + index: 'cardStatus.{{ $index }}' + state_name: RIEDEL-MEDIORNET-MIB::cardStatus + skip_values: + - + oid: RIEDEL-MEDIORNET-MIB::cardStatus + op: '=' + value: 0 + states: + - { value: 0, descr: 'empty', generic: 1 } + - { value: 1, descr: 'active', generic: 0 } + - { value: 2, descr: 'wrongSlot', generic: 2 } + - { value: 3, descr: 'updateRequired', generic: 1 } + - { value: 4, descr: 'failed', generic: 2 } + - + oid: RIEDEL-MEDIORNET-MIB::linkTable + value: RIEDEL-MEDIORNET-MIB::linkStatus + num_oid: '.1.3.6.1.4.1.23056.2.30.1.4.{{ $index }}' + descr: 'Fiber Link {{ RIEDEL-MEDIORNET-MIB::linkSlot }}/{{ RIEDEL-MEDIORNET-MIB::link }}' + index: 'linkStatus.{{ $index }}' + state_name: RIEDEL-MEDIORNET-MIB::linkStatus + skip_values: + - + oid: RIEDEL-MEDIORNET-MIB::linkStatus + op: '=' + value: 0 + states: + - { value: -1, descr: 'sfpNotPresentLinkUp', generic: 1 } + - { value: 0, descr: 'sfpNotPresentLinkDown', generic: 1 } + - { value: 1, descr: 'sfpPresentLinkDown', generic: 2 } + - { value: 2, descr: 'sfpPresentLinkUp', generic: 0 } + - + oid: RIEDEL-MEDIORNET-MIB::syncState + num_oid: '.1.3.6.1.4.1.23056.2.17.{{ $index }}' + descr: 'Sync State' + index: 'syncState.{{ $index }}' + state_name: RIEDEL-MEDIORNET-MIB::syncState + states: + - { value: 0, descr: 'slave', generic: 0 } + - { value: 1, descr: 'masterFreerun', generic: 1 } + - { value: 2, descr: 'masterLocking', generic: 1 } + - { value: 3, descr: 'masterLocked', generic: 0 } + - { value: 100, descr: 'undefined', generic: 3 } diff --git a/resources/definitions/os_discovery/microsemipdsine.yaml b/resources/definitions/os_discovery/microsemipdsine.yaml index b4b33df96ba..ad9b674d981 100644 --- a/resources/definitions/os_discovery/microsemipdsine.yaml +++ b/resources/definitions/os_discovery/microsemipdsine.yaml @@ -23,3 +23,11 @@ modules: descr: 'Used Power (Unit {{ $index }})' index: 'usedmainpw-{{ $index }}' num_oid: '.1.3.6.1.2.1.105.1.3.1.1.4.{{ $index }}' + voltage: + data: + - + oid: MICROSEMI-PDSINE-MIB::mainPseTable + value: MICROSEMI-PDSINE-MIB::mainVoltage + num_oid: '.1.3.6.1.4.1.7428.1.2.2.1.1.2.{{ $index }}' + descr: 'Power Supply Voltage' + index: '2.{{ $index }}' diff --git a/resources/definitions/os_discovery/netagent2.yaml b/resources/definitions/os_discovery/netagent2.yaml index 1571cc01202..9459b18d578 100644 --- a/resources/definitions/os_discovery/netagent2.yaml +++ b/resources/definitions/os_discovery/netagent2.yaml @@ -11,6 +11,7 @@ modules: - PROBE-MIB::temperatureMin - PROBE-MIB::humidityMax - PROBE-MIB::humidityMin + - UPS-MIB::upsInputNumLines state: data: - @@ -52,6 +53,190 @@ modules: - { descr: unknown, value: 0, generic: 3 } - { descr: normal, value: 1, generic: 0 } - { descr: abnormal, value: 2, generic: 2 } + - + oid: XPPC-MIB::upsBaseOutputStatus + num_oid: '.1.3.6.1.4.1.935.1.1.1.4.1.1.{{ $index }}' + descr: UPS state + index: 0 + state_name: netagent2upsstate + high_limit: 10 + states: + - { descr: unknown, value: 0, generic: 3 } + - { descr: unknown, value: 1, generic: 3 } + - { descr: OnLine, value: 2, generic: 0 } + - { descr: OnBattery, value: 3, generic: 1 } + - { descr: OnBoost, value: 4, generic: 0 } + - { descr: Sleeping, value: 5, generic: 1 } + - { descr: OnBypass, value: 6, generic: 0 } + - { descr: Rebooting, value: 7, generic: 1 } + - { descr: Standby, value: 8, generic: 0 } + - { descr: OnBuck, value: 9, generic: 0 } + - + oid: XPPC-MIB::upsThreePhaseDCandRectifierStatusInAndOut + num_oid: '.1.3.6.1.4.1.935.1.1.1.8.5.4.{{ $index }}' + descr: In And Out + index: 0 + state_name: upsThreePhaseDCandRectifierStatusInAndOut + high_limit: 10 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 3 + states: + - { descr: threeInOneOut, value: 2, generic: 3 } + - { descr: threeInThreeOut, value: 3, generic: 3 } + - + oid: XPPC-MIB::upsThreePhaseDCandRectifierStatusBatteryStatus + num_oid: '.1.3.6.1.4.1.935.1.1.1.8.5.5.{{ $index }}' + descr: Back Status + index: 0 + state_name: upsThreePhaseDCandRectifierStatusBatteryStatus + high_limit: 10 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 3 + states: + - { descr: backup, value: 4, generic: 1 } + - { descr: acnormal, value: 5, generic: 0 } + - + oid: XPPC-MIB::upsThreePhaseDCandRectifierStatusChargeStatus + num_oid: '.1.3.6.1.4.1.935.1.1.1.8.5.6.{{ $index }}' + descr: Charge Status + index: 0 + state_name: upsThreePhaseDCandRectifierStatusChargeStatus + high_limit: 10 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 3 + states: + - { descr: boost, value: 6, generic: 0 } + - { descr: float, value: 7, generic: 0 } + - { descr: 'no', value: 16, generic: 2 } + - + oid: XPPC-MIB::upsThreePhaseUPSStatusManualBypassBreaker + num_oid: '.1.3.6.1.4.1.935.1.1.1.8.6.2.{{ $index }}' + descr: Breaker Status + index: 0 + state_name: upsThreePhaseUPSStatusManualBypassBreaker + high_limit: 10 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 3 + states: + - { descr: close, value: 8, generic: 1 } + - { descr: open, value: 9, generic: 0 } + - + oid: XPPC-MIB::upsThreePhaseUPSStatusACStatus + num_oid: '.1.3.6.1.4.1.935.1.1.1.8.6.3.{{ $index }}' + descr: AC status + index: 0 + state_name: upsThreePhaseUPSStatusACStatus + high_limit: 10 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 3 + states: + - { descr: normal, value: 10, generic: 0 } + - { descr: abnormal, value: 11, generic: 2 } + - + oid: XPPC-MIB::upsThreePhaseUPSStatusInverterOperating + num_oid: '.1.3.6.1.4.1.935.1.1.1.8.6.5.{{ $index }}' + descr: Inverter Operating + index: 0 + state_name: upsThreePhaseUPSStatusInverterOperating + high_limit: 10 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 3 + states: + - { descr: 'yes', value: 14, generic: 0 } + - { descr: 'no', value: 16, generic: 2 } + - + oid: XPPC-MIB::upsThreePhaseDCandRectifierStatusRecOperating + num_oid: '.1.3.6.1.4.1.935.1.1.1.8.5.7.{{ $index }}' + descr: Rectifier Operating + index: 0 + state_name: upsThreePhaseDCandRectifierStatusRecOperating + high_limit: 10 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 3 + states: + - { descr: 'yes', value: 14, generic: 0 } + - { descr: 'no', value: 16, generic: 2 } + - + oid: XPPC-MIB::upsThreePhaseUPSStaticSwitchMode + num_oid: '.1.3.6.1.4.1.935.1.1.1.8.6.4.{{ $index }}' + descr: Switch Mode + index: 0 + state_name: upsThreePhaseUPSStaticSwitchMode + high_limit: 10 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 3 + states: + - { descr: invermode, value: 12, generic: 0 } + - { descr: bypassmode, value: 13, generic: 1 } + - + oid: XPPC-MIB::upsThreePhaseDCandRectifierStatusRecRotError + num_oid: '.1.3.6.1.4.1.935.1.1.1.8.5.1.{{ $index }}' + descr: Rectifier Rotation Error + index: 0 + state_name: upsThreePhaseDCandRectifierStatusRecRotError + high_limit: 10 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 3 + states: + - { descr: 'yes', value: 14, generic: 2 } + - { descr: 'no', value: 16, generic: 0 } + - + oid: XPPC-MIB::upsThreePhaseUPSStatusBypassFreqFail + num_oid: '.1.3.6.1.4.1.935.1.1.1.8.6.1.{{ $index }}' + descr: Bypass freq. fail + index: 0 + state_name: upsThreePhaseUPSStatusBypassFreqFail + high_limit: 10 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 3 + states: + - { descr: 'yes', value: 14, generic: 2 } + - { descr: 'no', value: 16, generic: 0 } + - + oid: XPPC-MIB::upsThreePhaseFaultStatusShortCircuit + num_oid: '.1.3.6.1.4.1.935.1.1.1.8.7.7.{{ $index }}' + descr: Short Circuit + index: 0 + state_name: upsThreePhaseFaultStatusShortCircuit + high_limit: 10 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 3 + states: + - { descr: 'yes', value: 14, generic: 2 } + - { descr: 'no', value: 16, generic: 0 } runtime: data: - @@ -69,6 +254,16 @@ modules: index: 'probeStatusTemperature.0' low_limit: PROBE-MIB::temperatureMin high_limit: PROBE-MIB::temperatureMax + - + oid: XPPC-MIB::upsSmartBatteryTemperature + num_oid: '.1.3.6.1.4.1.935.1.1.1.2.2.3.{{ $index }}' + descr: 'Temperature' + index: 0 + divisor: 10 + low_limit: 0 + low_warn_limit: 6 + warn_limit: 50 + high_limit: 110 humidity: data: - @@ -76,4 +271,157 @@ modules: num_oid: '.1.3.6.1.4.1.13409.1.1.2.0{{ $noindex }}' descr: 'Humidity' divisor: 10 - index: 'probeStatusHumidity.0' \ No newline at end of file + index: 'probeStatusHumidity.0' + charge: + data: + - + oid: XPPC-MIB::upsSmartBatteryCapacity + num_oid: '.1.3.6.1.4.1.935.1.1.1.2.2.1.{{ $index }}' + descr: 'Battery Charge' + index: 0 + low_limit: 0 + low_warn_limit: 10 + skip_values: 0 + current: + data: + - + oid: XPPC-MIB::upsSmartBatteryCurrent + num_oid: '.1.3.6.1.4.1.935.1.1.1.2.2.7.{{ $index }}' + descr: 'Battery Current' + index: 0 + divisor: 10 + high_limit: 30 + frequency: + data: + - + oid: XPPC-MIB::upsSmartInputFrequency + num_oid: '.1.3.6.1.4.1.935.1.1.1.3.2.4.{{ $index }}' + descr: 'Input frequency' + index: 0 + divisor: 10 + low_limit: 0 + low_warn_limit: 49 + warn_limit: 51 + high_limit: 60 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 1 + - + oid: XPPC-MIB::upsSmartOutputFrequency + num_oid: '.1.3.6.1.4.1.935.1.1.1.4.2.2.{{ $index }}' + descr: 'Output frequency' + index: 1 + divisor: 10 + low_limit: 0 + low_warn_limit: 49 + warn_limit: 51 + high_limit: 60 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 1 + - + oid: XPPC-MIB::upsThreePhaseInputFrequency + num_oid: '.1.3.6.1.4.1.935.1.1.1.8.2.1.{{ $index }}' + descr: 'Input frequency' + index: 0 + divisor: 10 + low_limit: 0 + low_warn_limit: 49 + warn_limit: 51 + high_limit: 60 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 3 + - + oid: XPPC-MIB::upsThreePhaseOutputFrequency + num_oid: '.1.3.6.1.4.1.935.1.1.1.8.3.1.{{ $index }}' + descr: 'Output frequency' + index: 1 + divisor: 10 + low_limit: 0 + low_warn_limit: 49 + warn_limit: 51 + high_limit: 60 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 3 + - + oid: XPPC-MIB::upsThreePhaseBypassSourceFrequency + num_oid: '.1.3.6.1.4.1.935.1.1.1.8.4.1.{{ $index }}' + descr: 'Bypass frequency' + index: 2 + divisor: 10 + low_limit: 0 + low_warn_limit: 49 + warn_limit: 51 + high_limit: 60 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 3 + load: + data: + - + oid: XPPC-MIB::upsSmartOutputLoad + num_oid: '.1.3.6.1.4.1.935.1.1.1.4.2.3.{{ $index }}' + descr: 'Output load' + index: 0 + low_limit: 0 + warn_limit: 80 + high_limit: 100 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 1 + - + oid: XPPC-MIB::upsThreePhaseOutputLoadPercentageR + num_oid: '.1.3.6.1.4.1.935.1.1.1.8.3.5.{{ $index }}' + descr: 'Out L1 (R)' + index: 0 + divisor: 10 + low_limit: 0 + warn_limit: 80 + high_limit: 100 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 3 + - + oid: XPPC-MIB::upsThreePhaseOutputLoadPercentageS + num_oid: '.1.3.6.1.4.1.935.1.1.1.8.3.6.{{ $index }}' + descr: 'Out L2 (S)' + index: 1 + divisor: 10 + low_limit: 0 + warn_limit: 80 + high_limit: 100 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 3 + - + oid: XPPC-MIB::upsThreePhaseOutputLoadPercentageT + num_oid: '.1.3.6.1.4.1.935.1.1.1.8.3.7.{{ $index }}' + descr: 'Out L3 (T)' + index: 2 + divisor: 10 + low_limit: 0 + warn_limit: 80 + high_limit: 100 + skip_values: + - + oid: UPS-MIB::upsInputNumLines.0 + op: '!=' + value: 3 diff --git a/resources/definitions/os_discovery/netgear.yaml b/resources/definitions/os_discovery/netgear.yaml index e83e1bef01f..daf403789db 100644 --- a/resources/definitions/os_discovery/netgear.yaml +++ b/resources/definitions/os_discovery/netgear.yaml @@ -6,9 +6,13 @@ modules: free: NETGEAR-SWITCHING-MIB::agentSwitchCpuProcessMemFree precision: 1024 os: - sysDescr_regex: '/^(?\S+) .*, (?[\d.]+),/' - serial: ENTITY-MIB::entPhysicalSerialNum.1 - version: ENTITY-MIB::entPhysicalSoftwareRev.1 + sysDescr_regex: '/^(?:NETGEAR )?(?\S+) .*, (?[\d.]+),/' + serial: + - ENTITY-MIB::entPhysicalSerialNum.1 + - ENTITY-MIB::entPhysicalSerialNum.2 + version: + - ENTITY-MIB::entPhysicalSoftwareRev.1 + - ENTITY-MIB::entPhysicalSoftwareRev.2 sensors: power: data: diff --git a/resources/definitions/os_discovery/nokia-isam.yaml b/resources/definitions/os_discovery/nokia-isam.yaml index c9becefba8a..28c292dfb16 100644 --- a/resources/definitions/os_discovery/nokia-isam.yaml +++ b/resources/definitions/os_discovery/nokia-isam.yaml @@ -18,11 +18,19 @@ modules: data: - oid: ASAM-SYSTEM-MIB::cpuLoadTable - value: cpuLoadAverage + value: ASAM-SYSTEM-MIB::cpuLoadAverage num_oid: '.1.3.6.1.4.1.637.61.1.9.29.1.1.4.{{ $index }}' descr: CPU {{ $index }} sensors: + count: + data: + - + oid: ASAM-ALARM-MIB::asamNumberofAlarmEntries + num_oid: '.1.3.6.1.4.1.637.61.1.3.4.{{ $index }}' + index: 'asamNumberofAlarmEntries.{{ $index }}' + descr: 'Alarm: Current Count' + group: 'Alarms' temperature: data: - @@ -33,8 +41,6 @@ modules: descr: '{{ nokiaIsamSlot:0 }} Sensor {{ $subindex1 }}' high_limit: ASAM-EQUIP-MIB::eqptBoardThermalSensorShutdownThresholdHigh warn_limit: ASAM-EQUIP-MIB::eqptBoardThermalSensorTcaThresholdHigh - low_limit: ASAM-EQUIP-MIB::eqptBoardThermalSensorShutdownThresholdLow - low_warn_limit: ASAM-EQUIP-MIB::eqptBoardThermalSensorTcaThresholdLow state: data: - @@ -48,26 +54,13 @@ modules: - { value: 1, generic: 1, descr: 'eco' } - { value: 2, generic: 0, descr: 'protect' } - { value: 3, generic: 0, descr: 'classic' } - - - oid: ASAM-ALARM-MIB::asamNumberofAlarmEntries - num_oid: '.1.3.6.1.4.1.637.61.1.3.4.{{ $index }}' - descr: 'Alarm: Current Count' - group: 'Alarms' - state_name: alarmCount - states: - - { value: 0, generic: 0, descr: '0' } - - { value: 1, generic: 1, descr: '1' } - - { value: 2, generic: 1, descr: '2' } - - { value: 3, generic: 2, descr: '3' } - - { value: 4, generic: 2, descr: '4' } - - { value: 5, generic: 2, descr: '5' } - - { value: 6, generic: 2, descr: '6' } - oid: ASAM-ALARM-MIB::asamCurrentAlarmSeverityStatus num_oid: '.1.3.6.1.4.1.637.61.1.3.5.{{ $index }}' descr: 'Alarm: Current Status' group: 'Alarms' state_name: alarmCurrentSeverityStatus + user_func: highestBit states: - { value: 1, generic: 0, descr: 'NoDefect' } - { value: 2, generic: 3, descr: 'Indeterminate' } @@ -75,3 +68,49 @@ modules: - { value: 8, generic: 1, descr: 'Minor' } - { value: 16, generic: 2, descr: 'Major' } - { value: 32, generic: 2, descr: 'Critical' } + - + # planned slots + oid: ASAM-EQUIP-MIB::eqptBoardTable + value: ASAM-EQUIP-MIB::eqptBoardOperError + num_oid: '.1.3.6.1.4.1.637.61.1.23.3.1.7.{{ $index }}' + descr: '{{ nokiaIsamSlot }} {{ ASAM-EQUIP-MIB::eqptSlotActualType }} ({{ ASAM-EQUIP-MIB::eqptSlotPlannedType }})' + group: '{{ nokiaIsamBoardGroup }}' + state_name: eqptBoardOperError + skip_values: + - 0 + - { oid: ASAM-EQUIP-MIB::eqptSlotPlannedType, op: '=', value: 'NOT_PLANNED' } + states: &eqptBoardOperError + - { value: 1, generic: 0, descr: 'no-error' } + - { value: 2, generic: 1, descr: 'type-mismatch' } + - { value: 3, generic: 2, descr: 'board-missing' } + - { value: 4, generic: 2, descr: 'board-installation-missing' } + - { value: 5, generic: 1, descr: 'no-planned-board' } + - { value: 6, generic: 1, descr: 'waiting-for-sw' } + - { value: 7, generic: 2, descr: 'init-boot-failed' } + - { value: 8, generic: 2, descr: 'init-download-failed' } + - { value: 9, generic: 2, descr: 'init-connection-failed' } + - { value: 10, generic: 2, descr: 'init-configuration-failed' } + - { value: 11, generic: 1, descr: 'board-reset-protection' } + - { value: 12, generic: 2, descr: 'invalid-parameter' } + - { value: 13, generic: 1, descr: 'temperature-alarm' } + - { value: 14, generic: 2, descr: 'tempshutdown' } + - { value: 15, generic: 1, descr: 'defense' } + - { value: 16, generic: 1, descr: 'board-not-licensed' } + - { value: 17, generic: 2, descr: 'sem-power-fail' } + - { value: 18, generic: 2, descr: 'sem-ups-fail' } + - { value: 19, generic: 2, descr: 'board-in-incompatible-slot' } + - { value: 21, generic: 1, descr: 'download-ongoing' } + - { value: 255, generic: 2, descr: 'unknown-error' } + - + # unplanned slots holding a board + oid: ASAM-EQUIP-MIB::eqptBoardTable + value: ASAM-EQUIP-MIB::eqptBoardOperError + num_oid: '.1.3.6.1.4.1.637.61.1.23.3.1.7.{{ $index }}' + descr: '{{ nokiaIsamSlot }} {{ ASAM-EQUIP-MIB::eqptSlotActualType }} ({{ ASAM-EQUIP-MIB::eqptSlotPlannedType }})' + group: '{{ nokiaIsamBoardGroup }}' + state_name: eqptBoardOperError + skip_values: + - 0 + - { oid: ASAM-EQUIP-MIB::eqptSlotPlannedType, op: '!=', value: 'NOT_PLANNED' } + - { oid: ASAM-EQUIP-MIB::eqptSlotActualType, op: '=', value: 'EMPTY' } + states: *eqptBoardOperError diff --git a/resources/definitions/os_discovery/oneaccess.yaml b/resources/definitions/os_discovery/oneaccess.yaml index 370befc9c7d..644eca0442d 100644 --- a/resources/definitions/os_discovery/oneaccess.yaml +++ b/resources/definitions/os_discovery/oneaccess.yaml @@ -16,6 +16,9 @@ modules: serial: ONEACCESS-SYS-MIB::oacExpIMSysHwcSerialNumber.0 hardware: ONEACCESS-SYS-MIB::oacExpIMSysHwcProductName.0 processors: + additional_oids: + oids: + - ONEACCESS-SYS-MIB::oacSysIMSysMainCPU data: - oid: ONEACCESS-SYS-MIB::oacSysCpuUsedValue diff --git a/resources/definitions/os_discovery/pbn.yaml b/resources/definitions/os_discovery/pbn.yaml index 02fe49567a1..69662d2d841 100644 --- a/resources/definitions/os_discovery/pbn.yaml +++ b/resources/definitions/os_discovery/pbn.yaml @@ -1,6 +1,18 @@ modules: os: sysDescr_regex: '/Software\s+(?.*) Series Software, Version (?[^,]+), .*Serial num:(?[^,]+),/s' + processors: + data: + - + oid: NMS-PROCESS-MIB::nmspmCPUTotal5min + num_oid: '.1.3.6.1.4.1.11606.10.9.109.1.1.1.1.5.{{ $index }}' + index: 0 + type: pbn-cpu + skip_values: + - + oid: index + op: '!=' + value: 1 mempools: data: - diff --git a/resources/definitions/os_discovery/pcoweb.yaml b/resources/definitions/os_discovery/pcoweb.yaml new file mode 100644 index 00000000000..5abf9746cbf --- /dev/null +++ b/resources/definitions/os_discovery/pcoweb.yaml @@ -0,0 +1,788 @@ +modules: + sensors: + additional_oids: + data: + - oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + temperature: + data: + - + oid: CAREL-ug40cdz-MIB::roomTemp + num_oid: '.1.3.6.1.4.1.9839.2.1.2.1.{{ $index }}' + index: '2.1.2.1.0' + descr: 'Room Temperature' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::outdoorTemp + num_oid: '.1.3.6.1.4.1.9839.2.1.2.2.{{ $index }}' + index: '2.1.2.2.0' + descr: 'Ambient Temperature' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::deliveryTemp + num_oid: '.1.3.6.1.4.1.9839.2.1.2.3.{{ $index }}' + index: '2.1.2.3.0' + descr: 'Delivery Air Temperature' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::cwTemp + num_oid: '.1.3.6.1.4.1.9839.2.1.2.4.{{ $index }}' + index: '2.1.2.4.0' + descr: 'Chilled Water Temperature' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::hwTemp + num_oid: '.1.3.6.1.4.1.9839.2.1.2.5.{{ $index }}' + index: '2.1.2.5.0' + descr: 'Hot Water Temperature' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::cwoTemp + num_oid: '.1.3.6.1.4.1.9839.2.1.2.7.{{ $index }}' + index: '2.1.2.7.0' + descr: 'Chilled Water Outlet Temperature' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::suctTemp1 + num_oid: '.1.3.6.1.4.1.9839.2.1.2.10.{{ $index }}' + index: '2.1.2.10.0' + descr: 'Circuit 1 Suction Temperature' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::suctTemp2 + num_oid: '.1.3.6.1.4.1.9839.2.1.2.11.{{ $index }}' + index: '2.1.2.11.0' + descr: 'Circuit 2 Suction Temperature' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::evapTemp1 + num_oid: '.1.3.6.1.4.1.9839.2.1.2.12.{{ $index }}' + index: '2.1.2.12.0' + descr: 'Circuit 1 Evap. Temperature' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::evapTemp2 + num_oid: '.1.3.6.1.4.1.9839.2.1.2.13.{{ $index }}' + index: '2.1.2.13.0' + descr: 'Circuit 2 Evap. Temperature' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::ssh1 + num_oid: '.1.3.6.1.4.1.9839.2.1.2.14.{{ $index }}' + index: '2.1.2.14.0' + descr: 'Circuit 1 Superheat' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::ssh2 + num_oid: '.1.3.6.1.4.1.9839.2.1.2.15.{{ $index }}' + index: '2.1.2.15.0' + descr: 'Circuit 2 Superheat' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::coolSetP + num_oid: '.1.3.6.1.4.1.9839.2.1.2.20.{{ $index }}' + index: '2.1.2.20.0' + descr: 'Cooling Set Point' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::coolDiff + num_oid: '.1.3.6.1.4.1.9839.2.1.2.21.{{ $index }}' + index: '2.1.2.21.0' + descr: 'Cooling Prop. Band' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::cool2SetP + num_oid: '.1.3.6.1.4.1.9839.2.1.2.22.{{ $index }}' + index: '2.1.2.22.0' + descr: 'Cooling 2nd Set Point' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::heatSetP + num_oid: '.1.3.6.1.4.1.9839.2.1.2.23.{{ $index }}' + index: '2.1.2.23.0' + descr: 'Heating Set Point' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::heat2SetP + num_oid: '.1.3.6.1.4.1.9839.2.1.2.24.{{ $index }}' + index: '2.1.2.24.0' + descr: 'Heating 2nd Set Point' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::heatDiff + num_oid: '.1.3.6.1.4.1.9839.2.1.2.25.{{ $index }}' + index: '2.1.2.25.0' + descr: 'Heating Prop. Band' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::rettemp + num_oid: '.1.3.6.1.4.1.9839.2.1.2.12.{{ $index }}' + index: 'rettemp.{{ $index }}' + descr: 'Return Temperature' + divisor: 10 + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::condsrcoiltemp + num_oid: '.1.3.6.1.4.1.9839.2.1.2.8.{{ $index }}' + index: 'condsrcoiltemp.{{ $index }}' + descr: 'Condenser Coil Temperature' + divisor: 10 + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::comptemp-val + num_oid: '.1.3.6.1.4.1.9839.2.1.2.14.{{ $index }}' + index: 'comptemp-val.{{ $index }}' + descr: 'Compressor Temperature' + divisor: 10 + skip_values: + - -9999 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::coolsetp + num_oid: '.1.3.6.1.4.1.9839.2.1.2.4.{{ $index }}' + index: 'coolsetp.{{ $index }}' + descr: 'Cooling Setpoint' + divisor: 10 + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::heatsetp + num_oid: '.1.3.6.1.4.1.9839.2.1.2.3.{{ $index }}' + index: 'heatsetp.{{ $index }}' + descr: 'Heating Setpoint' + divisor: 10 + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::offs-coolsetp + num_oid: '.1.3.6.1.4.1.9839.2.1.2.1.{{ $index }}' + index: 'offs-coolsetp.{{ $index }}' + descr: 'Cooling Setpoint Offset' + divisor: 10 + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::offs-heatsetp + num_oid: '.1.3.6.1.4.1.9839.2.1.2.2.{{ $index }}' + index: 'offs-heatsetp.{{ $index }}' + descr: 'Heating Setpoint Offset' + divisor: 10 + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::condsrcoiltemp-val + num_oid: '.1.3.6.1.4.1.9839.2.1.2.13.{{ $index }}' + index: 'condsrcoiltemp-val.{{ $index }}' + descr: 'Condenser Coil Temperature Input' + divisor: 10 + skip_values: + - -9999 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::ambtemp-val + num_oid: '.1.3.6.1.4.1.9839.2.1.2.15.{{ $index }}' + index: 'ambtemp-val.{{ $index }}' + descr: 'Ambient Temperature Input' + divisor: 10 + skip_values: + - -9999 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::rettemp-val + num_oid: '.1.3.6.1.4.1.9839.2.1.2.7.{{ $index }}' + index: 'rettemp-val.{{ $index }}' + descr: 'Return Temperature Input' + divisor: 10 + skip_values: + - -9999 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + humidity: + data: + - + oid: CAREL-ug40cdz-MIB::roomRH + num_oid: '.1.3.6.1.4.1.9839.2.1.2.6.{{ $index }}' + index: '2.1.2.6.0' + descr: 'Room Relative Humidity' + divisor: 10 + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::dehumPband + num_oid: '.1.3.6.1.4.1.9839.2.1.3.12.{{ $index }}' + index: '2.1.3.12.0' + descr: 'Dehumidification Prop. Band' + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::humidPband + num_oid: '.1.3.6.1.4.1.9839.2.1.3.13.{{ $index }}' + index: '2.1.3.13.0' + descr: 'Humidification Prop. Band' + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::dehumSetp + num_oid: '.1.3.6.1.4.1.9839.2.1.3.16.{{ $index }}' + index: '2.1.3.16.0' + descr: 'Dehumidification Set Point' + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + - + oid: CAREL-ug40cdz-MIB::humidSetp + num_oid: '.1.3.6.1.4.1.9839.2.1.3.18.{{ $index }}' + index: '2.1.3.18.0' + descr: 'Humidification Set Point' + skip_values: + - 0 + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + state: + data: + - + oid: CAREL-ug40cdz-MIB::compressore1 + num_oid: '.1.3.6.1.4.1.9839.2.1.1.2.{{ $index }}' + index: 'comp_1' + descr: 'Compressor 1' + state_name: carelCompressor + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + states: + - { value: 0, descr: 'off', generic: 0 } + - { value: 1, descr: 'on', generic: 0 } + - + oid: CAREL-ug40cdz-MIB::compressore2 + num_oid: '.1.3.6.1.4.1.9839.2.1.1.3.{{ $index }}' + index: 'comp_2' + descr: 'Compressor 2' + state_name: carelCompressor + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + states: + - { value: 0, descr: 'off', generic: 0 } + - { value: 1, descr: 'on', generic: 0 } + - + oid: CAREL-ug40cdz-MIB::compressore3 + num_oid: '.1.3.6.1.4.1.9839.2.1.1.4.{{ $index }}' + index: 'comp_3' + descr: 'Compressor 3' + state_name: carelCompressor + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + states: + - { value: 0, descr: 'off', generic: 0 } + - { value: 1, descr: 'on', generic: 0 } + - + oid: CAREL-ug40cdz-MIB::compressore4 + num_oid: '.1.3.6.1.4.1.9839.2.1.1.5.{{ $index }}' + index: 'comp_4' + descr: 'Compressor 4' + state_name: carelCompressor + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '=' + value: '2' + states: + - { value: 0, descr: 'off', generic: 0 } + - { value: 1, descr: 'on', generic: 0 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::pCOId1-Status + num_oid: '.1.3.6.1.4.1.9839.2.0.10.1.{{ $index }}' + index: 'pCOId1-Status.{{ $index }}' + descr: 'pCO Controller Status' + state_name: pCOId1-Status + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'offline', generic: 2 } + - { value: 1, descr: 'init', generic: 1 } + - { value: 2, descr: 'online', generic: 0 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::comp-on + num_oid: '.1.3.6.1.4.1.9839.2.1.1.19.{{ $index }}' + index: 'comp-on.{{ $index }}' + descr: 'Compressor' + state_name: comp-on + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'off', generic: 0 } + - { value: 1, descr: 'on', generic: 0 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::al-hirettemp-active + num_oid: '.1.3.6.1.4.1.9839.2.1.1.7.{{ $index }}' + index: 'al-hirettemp-active.{{ $index }}' + descr: 'High Return Temperature Alarm' + state_name: al-hirettemp-active + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'normal', generic: 0 } + - { value: 1, descr: 'alarm', generic: 2 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::al-compdriboard-offline-active + num_oid: '.1.3.6.1.4.1.9839.2.1.1.8.{{ $index }}' + index: 'al-compdriboard-offline-active.{{ $index }}' + descr: 'Compressor Drive Board Offline Alarm' + state_name: al-compdriboard-offline-active + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'normal', generic: 0 } + - { value: 1, descr: 'alarm', generic: 2 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::keybonoff + num_oid: '.1.3.6.1.4.1.9839.2.1.1.1.{{ $index }}' + index: 'keybonoff.{{ $index }}' + descr: 'Keyboard' + state_name: keybonoff + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'off', generic: 0 } + - { value: 1, descr: 'on', generic: 0 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::glbalrm-doutval + num_oid: '.1.3.6.1.4.1.9839.2.1.1.3.{{ $index }}' + index: 'glbalrm-doutval.{{ $index }}' + descr: 'Global Alarm Output' + state_name: glbalrm-doutval + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'normal', generic: 0 } + - { value: 1, descr: 'alarm', generic: 2 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::lowp-pstat-din + num_oid: '.1.3.6.1.4.1.9839.2.1.1.4.{{ $index }}' + index: 'lowp-pstat-din.{{ $index }}' + descr: 'Low Pressure Switch' + state_name: lowp-pstat-din + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'normal', generic: 0 } + - { value: 1, descr: 'alarm', generic: 2 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::hip-pstat-din + num_oid: '.1.3.6.1.4.1.9839.2.1.1.5.{{ $index }}' + index: 'hip-pstat-din.{{ $index }}' + descr: 'High Pressure Switch' + state_name: hip-pstat-din + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'normal', generic: 0 } + - { value: 1, descr: 'alarm', generic: 2 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::hip-pstat + num_oid: '.1.3.6.1.4.1.9839.2.1.1.15.{{ $index }}' + index: 'hip-pstat.{{ $index }}' + descr: 'High Pressure Status' + state_name: hip-pstat + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'normal', generic: 0 } + - { value: 1, descr: 'alarm', generic: 2 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::heater-on + num_oid: '.1.3.6.1.4.1.9839.2.1.1.16.{{ $index }}' + index: 'heater-on.{{ $index }}' + descr: 'Heater' + state_name: heater-on + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'off', generic: 0 } + - { value: 1, descr: 'on', generic: 0 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::evapfan-on + num_oid: '.1.3.6.1.4.1.9839.2.1.1.17.{{ $index }}' + index: 'evapfan-on.{{ $index }}' + descr: 'Evaporator Fan' + state_name: evapfan-on + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'off', generic: 0 } + - { value: 1, descr: 'on', generic: 0 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::dinonoff-din + num_oid: '.1.3.6.1.4.1.9839.2.1.1.18.{{ $index }}' + index: 'dinonoff-din.{{ $index }}' + descr: 'System On/Off Input' + state_name: dinonoff-din + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'on', generic: 0 } + - { value: 1, descr: 'off', generic: 0 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::condwatersw-din + num_oid: '.1.3.6.1.4.1.9839.2.1.1.13.{{ $index }}' + index: 'condwatersw-din.{{ $index }}' + descr: 'Condenser Water Switch' + state_name: condwatersw-din + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'normal', generic: 0 } + - { value: 1, descr: 'alarm', generic: 2 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::heater-doutval + num_oid: '.1.3.6.1.4.1.9839.2.1.1.2.{{ $index }}' + index: 'heater-doutval.{{ $index }}' + descr: 'Heater Output' + state_name: heater-doutval + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'off', generic: 0 } + - { value: 1, descr: 'on', generic: 0 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::condheater-doutval + num_oid: '.1.3.6.1.4.1.9839.2.1.1.9.{{ $index }}' + index: 'condheater-doutval.{{ $index }}' + descr: 'Condenser Heater Output' + state_name: condheater-doutval + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'off', generic: 0 } + - { value: 1, descr: 'on', generic: 0 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::condfan-doutval + num_oid: '.1.3.6.1.4.1.9839.2.1.1.10.{{ $index }}' + index: 'condfan-doutval.{{ $index }}' + descr: 'Condenser Fan Output' + state_name: condfan-doutval + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'off', generic: 0 } + - { value: 1, descr: 'on', generic: 0 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::comp-doutval + num_oid: '.1.3.6.1.4.1.9839.2.1.1.11.{{ $index }}' + index: 'comp-doutval.{{ $index }}' + descr: 'Compressor Output' + state_name: comp-doutval + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'off', generic: 0 } + - { value: 1, descr: 'on', generic: 0 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::evapfan-doutval + num_oid: '.1.3.6.1.4.1.9839.2.1.1.12.{{ $index }}' + index: 'evapfan-doutval.{{ $index }}' + descr: 'Evaporator Fan Output' + state_name: evapfan-doutval + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'off', generic: 0 } + - { value: 1, descr: 'on', generic: 0 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::lowp-pstat + num_oid: '.1.3.6.1.4.1.9839.2.1.1.14.{{ $index }}' + index: 'lowp-pstat.{{ $index }}' + descr: 'Low Pressure Status' + state_name: lowp-pstat + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'normal', generic: 0 } + - { value: 1, descr: 'alarm', generic: 2 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::al-lowrettemp-active + num_oid: '.1.3.6.1.4.1.9839.2.1.1.6.{{ $index }}' + index: 'al-lowrettemp-active.{{ $index }}' + descr: 'Low Return Temperature Alarm' + state_name: al-lowrettemp-active + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'normal', generic: 0 } + - { value: 1, descr: 'alarm', generic: 2 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::al-lowunitvol-active + num_oid: '.1.3.6.1.4.1.9839.2.1.1.20.{{ $index }}' + index: 'al-lowunitvol-active.{{ $index }}' + descr: 'Low Unit Voltage Alarm' + state_name: al-lowunitvol-active + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'normal', generic: 0 } + - { value: 1, descr: 'alarm', generic: 2 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::al-comprecedataerr-active + num_oid: '.1.3.6.1.4.1.9839.2.1.1.21.{{ $index }}' + index: 'al-comprecedataerr-active.{{ $index }}' + descr: 'Drive Board Receive Data Error Alarm' + state_name: al-comprecedataerr-active + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'normal', generic: 0 } + - { value: 1, descr: 'alarm', generic: 2 } + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::al-compmodcomerr-active + num_oid: '.1.3.6.1.4.1.9839.2.1.1.22.{{ $index }}' + index: 'al-compmodcomerr-active.{{ $index }}' + descr: 'Compressor Modbus Comms Error Alarm' + state_name: al-compmodcomerr-active + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' + states: + - { value: 0, descr: 'normal', generic: 0 } + - { value: 1, descr: 'alarm', generic: 2 } + count: + data: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::pCOId1-ErrorsNumber + num_oid: '.1.3.6.1.4.1.9839.2.0.11.1.{{ $index }}' + index: 'pCOId1-ErrorsNumber.{{ $index }}' + descr: 'pCO Communication Errors' + skip_values: + - + oid: CAREL-vak-cx-bms-snmp-1-MIB::agentCode.0 + op: '!=' + value: '2' diff --git a/resources/definitions/os_discovery/procurve.yaml b/resources/definitions/os_discovery/procurve.yaml index 9db5541162e..711e227248e 100644 --- a/resources/definitions/os_discovery/procurve.yaml +++ b/resources/definitions/os_discovery/procurve.yaml @@ -50,6 +50,21 @@ modules: num_oid: '.1.3.6.1.4.1.11.2.14.11.5.1.55.1.1.1.4.{{ $index }}' index: 'hpicfPsTemp.{{ $index }}' descr: 'Power Supply #{{ $index }}' + - + oid: HP-ICF-TRANSCEIVER-MIB::hpicfXcvrInfoTable + value: HP-ICF-TRANSCEIVER-MIB::hpicfXcvrTemp + num_oid: '.1.3.6.1.4.1.11.2.14.11.5.1.82.1.1.1.1.11.{{ $index }}' + index: 'temp-trans-{{ $index }}' + descr: '{{ HP-ICF-TRANSCEIVER-MIB::hpicfXcvrPortDesc }} Temperature' + divisor: 1000 + low_limit: HP-ICF-TRANSCEIVER-MIB::hpicfXcvrTempLoAlarm + low_warn_limit: HP-ICF-TRANSCEIVER-MIB::hpicfXcvrTempLoWarn + warn_limit: HP-ICF-TRANSCEIVER-MIB::hpicfXcvrTempHiWarn + high_limit: HP-ICF-TRANSCEIVER-MIB::hpicfXcvrTempHiAlarm + entPhysicalIndex: '{{ $index }}' + entPhysicalIndex_measured: ports + group: transceiver + skip_values: 0 power: data: - @@ -77,6 +92,40 @@ modules: value: 0 high_limit: HP-ICF-POE-MIB::hpicfPseAvailablePower descr: 'PoE Power Used' + current: + data: + - + oid: HP-ICF-TRANSCEIVER-MIB::hpicfXcvrInfoTable + value: HP-ICF-TRANSCEIVER-MIB::hpicfXcvrBias + num_oid: '.1.3.6.1.4.1.11.2.14.11.5.1.82.1.1.1.1.13.{{ $index }}' + index: 'hpicfXcvrBias.{{ $index }}' + descr: '{{ HP-ICF-TRANSCEIVER-MIB::hpicfXcvrPortDesc }} Bias Current' + divisor: 1000000 + low_limit: HP-ICF-TRANSCEIVER-MIB::hpicfXcvrBiasLoAlarm + low_warn_limit: HP-ICF-TRANSCEIVER-MIB::hpicfXcvrBiasLoWarn + warn_limit: HP-ICF-TRANSCEIVER-MIB::hpicfXcvrBiasHiWarn + high_limit: HP-ICF-TRANSCEIVER-MIB::hpicfXcvrBiasHiAlarm + entPhysicalIndex: '{{ $index }}' + entPhysicalIndex_measured: ports + group: transceiver + skip_values: 0 + voltage: + data: + - + oid: HP-ICF-TRANSCEIVER-MIB::hpicfXcvrInfoTable + value: HP-ICF-TRANSCEIVER-MIB::hpicfXcvrVoltage + num_oid: '.1.3.6.1.4.1.11.2.14.11.5.1.82.1.1.1.1.12.{{ $index }}' + index: 'hpicfXcvrVoltage.{{ $index }}' + descr: '{{ HP-ICF-TRANSCEIVER-MIB::hpicfXcvrPortDesc }} Voltage' + divisor: 10000 + low_limit: HP-ICF-TRANSCEIVER-MIB::hpicfXcvrVccLoAlarm + low_warn_limit: HP-ICF-TRANSCEIVER-MIB::hpicfXcvrVccLoWarn + warn_limit: HP-ICF-TRANSCEIVER-MIB::hpicfXcvrVccHiWarn + high_limit: HP-ICF-TRANSCEIVER-MIB::hpicfXcvrVccHiAlarm + entPhysicalIndex: '{{ $index }}' + entPhysicalIndex_measured: ports + group: transceiver + skip_values: 0 state: data: - diff --git a/resources/definitions/os_discovery/quanta.yaml b/resources/definitions/os_discovery/quanta.yaml index d270619daae..af21fd1b087 100644 --- a/resources/definitions/os_discovery/quanta.yaml +++ b/resources/definitions/os_discovery/quanta.yaml @@ -6,5 +6,80 @@ modules: free: NETGEAR-SWITCHING-MIB::agentSwitchCpuProcessMemFree precision: 1024 os: - sysDescr_regex: '/(?[^,]+), (?[^,]+), (?[^,]+)/' + sysDescr_regex: '/(?[^,]+), (?[^,]+), (?[^,]+)/' + hardware: NETGEAR-SWITCHING-MIB::agentInventoryMachineType.0 + version: NETGEAR-SWITCHING-MIB::agentInventorySoftwareVersion.0 + version_replace: + - '/^Runtime Code /' + features: + - NETGEAR-SWITCHING-MIB::agentInventoryOperatingSystem.0 + - NETGEAR-SWITCHING-MIB::agentInventoryAdditionalPackages.0 + features_template: '{{ NETGEAR-SWITCHING-MIB::agentInventoryOperatingSystem.0 }}, {{ NETGEAR-SWITCHING-MIB::agentInventoryAdditionalPackages.0 }}' + features_replace: + - '/^, |,$/' serial: NETGEAR-SWITCHING-MIB::agentInventorySerialNumber.0 + sensors: + additional_oids: + data: + - + oid: + - NETGEAR-BOXSERVICES-PRIVATE-MIB::boxServicesNormalTempRangeMin + - NETGEAR-BOXSERVICES-PRIVATE-MIB::boxServicesNormalTempRangeMax + fanspeed: + data: + - + oid: NETGEAR-BOXSERVICES-PRIVATE-MIB::boxServicesFansTable + value: NETGEAR-BOXSERVICES-PRIVATE-MIB::boxServicesFanSpeed + num_oid: '.1.3.6.1.4.1.4413.1.1.43.1.6.1.4.{{ $index }}' + index: '{{ $index }}' + descr: 'Fan {{ $index }}' + skip_values: 0 + percent: + data: + - + oid: NETGEAR-BOXSERVICES-PRIVATE-MIB::boxServicesFansTable + value: NETGEAR-BOXSERVICES-PRIVATE-MIB::boxServicesFanDutyLevel + num_oid: '.1.3.6.1.4.1.4413.1.1.43.1.6.1.5.{{ $index }}' + index: 'boxServicesFanDutyLevel.{{ $index }}' + descr: 'Fan {{ $index }} Duty Level' + group: Fans + skip_values: + - + oid: NETGEAR-BOXSERVICES-PRIVATE-MIB::boxServicesFanItemState + op: '!=' + value: 2 + temperature: + data: + - + oid: NETGEAR-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorsTable + value: NETGEAR-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorState + num_oid: '.1.3.6.1.4.1.4413.1.1.43.1.8.1.4.{{ $index }}' + index: '{{ $index }}' + descr: 'Temperature {{ $index }}' + low_limit: NETGEAR-BOXSERVICES-PRIVATE-MIB::boxServicesNormalTempRangeMin + high_limit: NETGEAR-BOXSERVICES-PRIVATE-MIB::boxServicesNormalTempRangeMax + skip_values: 0 + state: + data: + - + oid: NETGEAR-BOXSERVICES-PRIVATE-MIB::boxServicesFansTable + value: NETGEAR-BOXSERVICES-PRIVATE-MIB::boxServicesFanItemState + num_oid: '.1.3.6.1.4.1.4413.1.1.43.1.6.1.3.{{ $index }}' + index: '{{ $index }}' + descr: 'Fan {{ $index }}' + states: &item_states + - { value: 0, generic: 3, descr: other } + - { value: 1, generic: 3, descr: notpresent } + - { value: 2, generic: 0, descr: operational } + - { value: 3, generic: 2, descr: failed } + - { value: 4, generic: 0, descr: powering } + - { value: 5, generic: 1, descr: nopower } + - { value: 6, generic: 1, descr: notpowering } + - { value: 7, generic: 2, descr: incompatible } + - + oid: NETGEAR-BOXSERVICES-PRIVATE-MIB::boxServicesPowSuppliesTable + value: NETGEAR-BOXSERVICES-PRIVATE-MIB::boxServicesPowSupplyItemState + num_oid: '.1.3.6.1.4.1.4413.1.1.43.1.7.1.3.{{ $index }}' + index: '{{ $index }}' + descr: 'Power Supply {{ $index }}' + states: *item_states diff --git a/resources/definitions/os_discovery/ruckuswireless-sz.yaml b/resources/definitions/os_discovery/ruckuswireless-sz.yaml index d01ab197cdf..af155c872af 100644 --- a/resources/definitions/os_discovery/ruckuswireless-sz.yaml +++ b/resources/definitions/os_discovery/ruckuswireless-sz.yaml @@ -8,6 +8,7 @@ modules: num_oid: '.1.3.6.1.4.1.25053.1.8.1.1.1.1.1.1.17.{{ $index }}' descr: 'Node Status: {{ RUCKUS-CTRL-MIB::ruckusCtrlSystemNodeName }}' group: '{{ RUCKUS-CTRL-MIB::ruckusCtrlSystemNodeName }}' + category: cluster state_name: RUCKUS-CTRL-MIB::ruckusCtrlSystemNodeStatus states: - { value: 0, descr: out-of-service, generic: 2 } @@ -18,6 +19,7 @@ modules: num_oid: '.1.3.6.1.4.1.25053.1.8.1.1.1.1.1.1.18.{{ $index }}' descr: 'Cluster Status: {{ RUCKUS-CTRL-MIB::ruckusCtrlSystemNodeName }}' group: '{{ RUCKUS-CTRL-MIB::ruckusCtrlSystemNodeName }}' + category: cluster state_name: RUCKUS-CTRL-MIB::ruckusCtrlSystemClusterStatus states: - { value: 0, descr: in-service, generic: 0 } @@ -30,6 +32,7 @@ modules: num_oid: '.1.3.6.1.4.1.25053.1.8.1.1.1.1.1.1.26.{{ $index }}' descr: 'Cluster HA State: {{ RUCKUS-CTRL-MIB::ruckusCtrlSystemNodeName }}' group: '{{ RUCKUS-CTRL-MIB::ruckusCtrlSystemNodeName }}' + category: cluster state_name: RUCKUS-CTRL-MIB::ruckusCtrlSystemNodeClusterHAState states: - { value: 1, descr: enabled, generic: 0 } @@ -40,6 +43,7 @@ modules: num_oid: '.1.3.6.1.4.1.25053.1.8.1.1.1.1.1.1.27.{{ $index }}' descr: 'Cluster HA Role: {{ RUCKUS-CTRL-MIB::ruckusCtrlSystemNodeName }}' group: '{{ RUCKUS-CTRL-MIB::ruckusCtrlSystemNodeName }}' + category: cluster state_name: RUCKUS-CTRL-MIB::ruckusCtrlSystemNodeClusterHARoles states: - { value: 1, descr: active, generic: 0 } @@ -53,6 +57,7 @@ modules: num_oid: '.1.3.6.1.4.1.25053.1.8.1.1.1.1.1.1.10.{{ $index }}' descr: 'AP Licenses: {{ RUCKUS-CTRL-MIB::ruckusCtrlSystemNodeName }}' group: '{{ RUCKUS-CTRL-MIB::ruckusCtrlSystemNodeName }}' + category: license - oid: RUCKUS-CTRL-MIB::ruckusCTRLSystemNodeTable value: RUCKUS-CTRL-MIB::ruckusCtrlSystemNodeNumApConnected @@ -60,8 +65,4 @@ modules: index: 'aps.{{ $index }}' descr: 'Connected APs: {{ RUCKUS-CTRL-MIB::ruckusCtrlSystemNodeName }}' group: '{{ RUCKUS-CTRL-MIB::ruckusCtrlSystemNodeName }}' - - - oid: RUCKUS-SZ-SYSTEM-MIB::ruckusSZSystemStatsNumAP - num_oid: '.1.3.6.1.4.1.25053.1.4.1.1.1.15.1.{{ $index }}' - index: total - descr: 'Connected APs: Total' + category: access-point diff --git a/resources/definitions/os_discovery/scalance.yaml b/resources/definitions/os_discovery/scalance.yaml index f4ad8379fc4..cb1ba139979 100644 --- a/resources/definitions/os_discovery/scalance.yaml +++ b/resources/definitions/os_discovery/scalance.yaml @@ -3,34 +3,34 @@ modules: sysDescr_regex: '/SCALANCE (?[^,]+), (?[^,]+)/' serial: '.1.3.6.1.4.1.4329.6.3.2.1.1.3.0' version: '.1.3.6.1.4.1.4329.6.3.2.1.1.5.0' -# processors: -# data: -# - -# # snMspsDiagnosticsUsageTable contains multiple disaparate items with no formal type identifiers, specific OIDs used -# oid: SN-MSPS-SCX200-MIB::snMspsDiagnosticsUsageValue.0 -# num_oid: '.1.3.6.1.4.1.4329.20.1.1.1.1.79.3.1.13.{{ $index }}' -# mempools: -# additional_oids: -# data: -# - -# oid: -# - SN-MSPS-SCX200-MIB::snMspsDiagnosticsUsageName -# data: -# - -# -# #oid: '.1.3.6.1.4.1.4329.20.1.1.1.1.79.3.1.13.1' -# percent_used: SN-MSPS-SCX200-MIB::snMspsDiagnosticsUsageValue -# warn_percent: SN-MSPS-SCX200-MIB::snMspsDiagnosticsUsageHighWarning -# #index: 1 -# skip_values: -# - -# oid: SN-MSPS-SCX200-MIB::snMspsDiagnosticsUsageName -# op: 'regex' -# value: '/CPU/' -# #- -# #oid: SN-MSPS-SCX200-MIB::snMspsDiagnosticsUsageValue.0 -# #op: 'exists' -# #value: true + # snMspsDiagnosticsUsageTable contains multiple disparate items with no formal type identifiers, specific OIDs used + processors: + data: + - + oid: SN-MSPS-SCX200-MIB::snMspsDiagnosticsUsageTable + value: SN-MSPS-SCX200-MIB::snMspsDiagnosticsUsageValue + warn_percent: SN-MSPS-SCX200-MIB::snMspsDiagnosticsUsageHighCritical + descr: '{{ SN-MSPS-SCX200-MIB::snMspsDiagnosticsUsageName }}' + num_oid: '.1.3.6.1.4.1.4329.20.1.1.1.1.79.3.1.13.{{ $index }}' + type: 'scalance-cpu' + index: 0 + skip_values: + - + oid: index + op: '!=' + value: 0 + mempools: + data: + - + oid: SN-MSPS-SCX200-MIB::snMspsDiagnosticsUsageTable + percent_used: SN-MSPS-SCX200-MIB::snMspsDiagnosticsUsageValue + warn_percent: SN-MSPS-SCX200-MIB::snMspsDiagnosticsUsageHighWarning + index: 0 + skip_values: + - + oid: index + op: '!=' + value: 1 sensors: additional_oids: data: @@ -145,7 +145,7 @@ modules: group: Plugs state_name: "C-Plug" states: - - { value: 1, generic: 2, , descr: 'notPresent' } + - { value: 1, generic: 2, descr: 'notPresent' } - { value: 4, generic: 2, descr: 'notAccepted' } - { value: 5, generic: 0, descr: 'accepted' } - { value: 6, generic: 2, descr: 'factory' } @@ -158,7 +158,7 @@ modules: # group: Plugs # state_name: "KEY-Plug" # states: -# - { value: 1, generic: 2, , descr: 'notPresent' } +# - { value: 1, generic: 2, descr: 'notPresent' } # - { value: 4, generic: 2, descr: 'notAccepted' } # - { value: 5, generic: 0, descr: 'accepted' } # - { value: 7, generic: 2, descr: 'missing' } diff --git a/resources/definitions/os_discovery/sgos.yaml b/resources/definitions/os_discovery/sgos.yaml index 87d467b2193..fd0c950b1b4 100644 --- a/resources/definitions/os_discovery/sgos.yaml +++ b/resources/definitions/os_discovery/sgos.yaml @@ -2,6 +2,13 @@ modules: os: hardware: BLUECOAT-SG-PROXY-MIB::sgProxySoftware.0 version: BLUECOAT-SG-PROXY-MIB::sgProxyVersion.0 + processors: + data: + - + oid: BLUECOAT-SG-PROXY-MIB::sgProxyCpuCoreBusyPerCent + num_oid: '.1.3.6.1.4.1.3417.2.11.2.4.1.8.{{ $index }}' + index: "{{ $index|pad(2,'0') }}" + descr: "Processor {{ $count }}" mempools: data: - diff --git a/resources/definitions/os_discovery/smartax.yaml b/resources/definitions/os_discovery/smartax.yaml index 47d7e4116e9..316b1210143 100644 --- a/resources/definitions/os_discovery/smartax.yaml +++ b/resources/definitions/os_discovery/smartax.yaml @@ -12,6 +12,19 @@ modules: oid: HWMUSA-DEV-MIB::hwMusaBoardRamUseRate op: '=' value: -1 + processors: + data: + - + oid: HWMUSA-DEV-MIB::hwMusaSlotConfExtTable + value: HWMUSA-DEV-MIB::hwMusaBoardCpuRate + num_oid: '.1.3.6.1.4.1.2011.2.6.7.1.1.2.1.5.{{ $index }}' + index: '{{ $subindex1 }}' + descr: '{{ HWMUSA-DEV-MIB::hwMusaBoardSlotDesc }} processor' + skip_values: + - + oid: HWMUSA-DEV-MIB::hwMusaBoardCpuRate + op: '=' + value: -1 os: hardware: - ENTITY-MIB::entPhysicalDescr.36 diff --git a/resources/definitions/os_discovery/snr.yaml b/resources/definitions/os_discovery/snr.yaml index 855ececd2c2..85b723f2310 100644 --- a/resources/definitions/os_discovery/snr.yaml +++ b/resources/definitions/os_discovery/snr.yaml @@ -1,28 +1,78 @@ modules: + os: + # Model, firmware and serial come from sysDescr on every SNR family. + # S5210X/S5110G (57206 tree) do not expose sysHardwareVersion or + # sysSoftwareVersion; the version OIDs below override where present. + sysDescr_regex: + - '/^SNR-(?\S+) Device/' + - '/SoftWare Version (?\S+)/' + - '/Serial No\.:\s*(?\S+)/' + version: + - NAG-MIB::sysSoftwareVersion.0 + - NAG-MIB::sysSoftwareVersion.1 mempools: data: + # Legacy per-slot table, values in bytes. Slot 1 keeps index 0 + # so already monitored devices keep their mempool RRD. - total: NAG-MIB::sysMemorySize used: NAG-MIB::sysMemoryBusy - descr: 'Memory Usage' + descr: 'Memory {{ $index }}' index: 0 - os: - hardware: - - NAG-MIB::sysHardwareVersion.0 - - NAG-MIB::sysHardwareVersion.1 - version: - - NAG-MIB::sysSoftwareVersion.0 - - NAG-MIB::sysSoftwareVersion.1 - additional_oids: - data: + skip_values: + - + oid: index + op: '!=' + value: 1 - - oid: - - NAG-MIB::portName + total: NAG-MIB::sysMemorySize + used: NAG-MIB::sysMemoryBusy + descr: 'Memory {{ $index }}' + skip_values: + - + oid: index + op: '=' + value: 1 + # Scalar branch for models without the legacy table. It repeats + # slot 1 where the legacy table exists and is reported in + # megabytes on some models (snr_s2990x), skip it in both cases. + - + total: NAG-MIB::switchMemorySize + used: NAG-MIB::switchMemoryBusy + descr: 'Memory' + index: 0 + skip_values: + - + oid: NAG-MIB::sysMemorySize.1 + op: exists + value: true + - + oid: NAG-MIB::switchMemorySize + op: '<' + value: 1048576 processors: data: + # Legacy per-slot table. - - oid: NAG-MIB::sysCpuUsage + oid: 'NAG-MIB::sysCpuUsage' num_oid: '.1.3.6.1.4.1.40418.7.100.1.8.1.11.{{ $index }}' + descr: 'CPU {{ $index }}' + # Scalar branch for models without the legacy table. Models with + # the legacy table repeat slot 1 here, they are skipped. + - + oid: 'NAG-MIB::switchCpuUsage' + num_oid: '.1.3.6.1.4.1.40418.7.100.1.11.10.{{ $index }}' + descr: 'CPU' + skip_values: + - + device: sysObjectID + op: in_array + value: ['.1.3.6.1.4.1.40418.7.44', '.1.3.6.1.4.1.40418.7.441', '.1.3.6.1.4.1.40418.7.444', '.1.3.6.1.4.1.40418.7.45', '.1.3.6.1.4.1.40418.7.53', '.1.3.6.1.4.1.40418.7.54', '.1.3.6.1.4.1.40418.7.61', '.1.3.6.1.4.1.40418.8.67'] + additional_oids: + data: + - + oid: + - NAG-MIB::portName sensors: temperature: data: @@ -30,6 +80,19 @@ modules: oid: NAG-MIB::sysTemperature num_oid: '.1.3.6.1.4.1.40418.7.100.1.8.1.10.{{ $index }}' descr: 'Temperature {{ $index }}' + - + oid: NAG-MIB::switchTemperature + num_oid: '.1.3.6.1.4.1.40418.7.100.1.11.9.{{ $index }}' + index: 'switchTemperature.{{ $index }}' + descr: 'Temperature' + # 268435356 means no sensor (S2985G). Models with the legacy + # table repeat slot 1 here, they are skipped. + skip_values: + - 268435356 + - + device: sysObjectID + op: in_array + value: ['.1.3.6.1.4.1.40418.7.44', '.1.3.6.1.4.1.40418.7.441', '.1.3.6.1.4.1.40418.7.444', '.1.3.6.1.4.1.40418.7.45', '.1.3.6.1.4.1.40418.7.53', '.1.3.6.1.4.1.40418.7.54', '.1.3.6.1.4.1.40418.7.61', '.1.3.6.1.4.1.40418.8.67'] state: data: - diff --git a/resources/definitions/os_discovery/teldat.yaml b/resources/definitions/os_discovery/teldat.yaml index d68853d9345..ace1602b675 100644 --- a/resources/definitions/os_discovery/teldat.yaml +++ b/resources/definitions/os_discovery/teldat.yaml @@ -30,19 +30,19 @@ modules: data: - oid: TELDAT-MON-CPU-MIB::teldatCPUBusyGroup - value: teldatCPUBusy5sec + value: TELDAT-MON-CPU-MIB::teldatCPUBusy5sec num_oid: '.1.3.6.1.4.1.2007.4.1.2.1.2.1.1.1.{{ $index }}' descr: 'CPU Utilization 5sec' index: cpu5.{{ $index }} - oid: TELDAT-MON-CPU-MIB::teldatCPUBusyGroup - value: teldatCPUBusy1min + value: TELDAT-MON-CPU-MIB::teldatCPUBusy1min num_oid: '.1.3.6.1.4.1.2007.4.1.2.1.2.1.1.2.{{ $index }}' descr: 'CPU Utilization 1min' index: cpu60.{{ $index }} - oid: TELDAT-MON-CPU-MIB::teldatCPUBusyGroup - value: teldatCPUBusy5min + value: TELDAT-MON-CPU-MIB::teldatCPUBusy5min num_oid: '.1.3.6.1.4.1.2007.4.1.2.1.2.1.1.3.{{ $index }}' descr: 'CPU Utilization 5min' index: cpu300.{{ $index }} diff --git a/resources/definitions/os_discovery/terra-receivers.yaml b/resources/definitions/os_discovery/terra-receivers.yaml index ffd3b27cfac..a20cc889f22 100644 --- a/resources/definitions/os_discovery/terra-receivers.yaml +++ b/resources/definitions/os_discovery/terra-receivers.yaml @@ -184,6 +184,94 @@ modules: states: - { value: 1, generic: 0, descr: OK } - { value: 0, generic: 2, descr: Error } + - + oid: TERRA-sdi480-MIB::sdi480alarms + value: TERRA-sdi480-MIB::alarmUnlock1 + num_oid: '.1.3.6.1.4.1.30631.1.17.2.8.{{ $index }}' + descr: 'Input 1' + index: 1 + group: Tuner Lock + state_name: terra-receivers + states: + - { value: 0, generic: 0, descr: OK } + - { value: 1, generic: 2, descr: Error } + - + oid: TERRA-sdi480-MIB::sdi480alarms + value: TERRA-sdi480-MIB::alarmUnlock2 + num_oid: '.1.3.6.1.4.1.30631.1.17.2.9.{{ $index }}' + descr: 'Input 2' + index: 2 + group: Tuner Lock + state_name: terra-receivers + states: + - { value: 0, generic: 0, descr: OK } + - { value: 1, generic: 2, descr: Error } + - + oid: TERRA-sdi480-MIB::sdi480alarms + value: TERRA-sdi480-MIB::alarmUnlock3 + num_oid: '.1.3.6.1.4.1.30631.1.17.2.10.{{ $index }}' + descr: 'Input 3' + index: 3 + group: Tuner Lock + state_name: terra-receivers + states: + - { value: 0, generic: 0, descr: OK } + - { value: 1, generic: 2, descr: Error } + - + oid: TERRA-sdi480-MIB::sdi480alarms + value: TERRA-sdi480-MIB::alarmUnlock4 + num_oid: '.1.3.6.1.4.1.30631.1.17.2.11.{{ $index }}' + descr: 'Input 4' + index: 4 + group: Tuner Lock + state_name: terra-receivers + states: + - { value: 0, generic: 0, descr: OK } + - { value: 1, generic: 2, descr: Error } + - + oid: TERRA-sdi480-MIB::sdi480alarms + value: TERRA-sdi480-MIB::alarmUnlock5 + num_oid: '.1.3.6.1.4.1.30631.1.17.2.12.{{ $index }}' + descr: 'Input 5' + index: 5 + group: Tuner Lock + state_name: terra-receivers + states: + - { value: 0, generic: 0, descr: OK } + - { value: 1, generic: 2, descr: Error } + - + oid: TERRA-sdi480-MIB::sdi480alarms + value: TERRA-sdi480-MIB::alarmUnlock6 + num_oid: '.1.3.6.1.4.1.30631.1.17.2.13.{{ $index }}' + descr: 'Input 6' + index: 6 + group: Tuner Lock + state_name: terra-receivers + states: + - { value: 0, generic: 0, descr: OK } + - { value: 1, generic: 2, descr: Error } + - + oid: TERRA-sdi480-MIB::sdi480alarms + value: TERRA-sdi480-MIB::alarmUnlock7 + num_oid: '.1.3.6.1.4.1.30631.1.17.2.14.{{ $index }}' + descr: 'Input 7' + index: 7 + group: Tuner Lock + state_name: terra-receivers + states: + - { value: 0, generic: 0, descr: OK } + - { value: 1, generic: 2, descr: Error } + - + oid: TERRA-sdi480-MIB::sdi480alarms + value: TERRA-sdi480-MIB::alarmUnlock8 + num_oid: '.1.3.6.1.4.1.30631.1.17.2.15.{{ $index }}' + descr: 'Input 8' + index: 8 + group: Tuner Lock + state_name: terra-receivers + states: + - { value: 0, generic: 0, descr: OK } + - { value: 1, generic: 2, descr: Error } snr: data: - diff --git a/resources/definitions/os_discovery/tpdin.yaml b/resources/definitions/os_discovery/tpdin.yaml index 1741b910add..de0b22e257e 100644 --- a/resources/definitions/os_discovery/tpdin.yaml +++ b/resources/definitions/os_discovery/tpdin.yaml @@ -2,3 +2,70 @@ modules: os: hardware: TPDIN2-MIB::name.0 version: TPDIN2-MIB::version.0 + sensors: + current: + data: + - oid: TPDIN2-MIB::current1 + num_oid: '.1.3.6.1.4.1.45621.2.2.9.{{ $index }}' + index: current1 + descr: 'Current 1' + divisor: 10 + skip_values: 0 + - oid: TPDIN2-MIB::current2 + num_oid: '.1.3.6.1.4.1.45621.2.2.10.{{ $index }}' + index: current2 + descr: 'Current 2' + divisor: 10 + skip_values: 0 + - oid: TPDIN2-MIB::current3 + num_oid: '.1.3.6.1.4.1.45621.2.2.11.{{ $index }}' + index: current3 + descr: 'Current 3' + divisor: 10 + skip_values: 0 + - oid: TPDIN2-MIB::current4 + num_oid: '.1.3.6.1.4.1.45621.2.2.12.{{ $index }}' + index: current4 + descr: 'Current 4' + divisor: 10 + skip_values: 0 + temperature: + data: + - oid: TPDIN2-MIB::temperature1 + num_oid: '.1.3.6.1.4.1.45621.2.2.13.{{ $index }}' + index: temperature1 + descr: 'External Temp' + divisor: 10 + skip_values: 0 + - oid: TPDIN2-MIB::temperature2 + num_oid: '.1.3.6.1.4.1.45621.2.2.14.{{ $index }}' + index: temperature2 + descr: 'Internal Temp' + divisor: 10 + skip_values: 0 + voltage: + data: + - oid: TPDIN2-MIB::voltage1 + num_oid: '.1.3.6.1.4.1.45621.2.2.5.{{ $index }}' + index: voltage1 + descr: 'Voltage 1' + divisor: 10 + skip_values: 0 + - oid: TPDIN2-MIB::voltage2 + num_oid: '.1.3.6.1.4.1.45621.2.2.6.{{ $index }}' + index: voltage2 + descr: 'Voltage 2' + divisor: 10 + skip_values: 0 + - oid: TPDIN2-MIB::voltage3 + num_oid: '.1.3.6.1.4.1.45621.2.2.7.{{ $index }}' + index: voltage3 + descr: 'Voltage 3' + divisor: 10 + skip_values: 0 + - oid: TPDIN2-MIB::voltage4 + num_oid: '.1.3.6.1.4.1.45621.2.2.8.{{ $index }}' + index: voltage4 + descr: 'Voltage 4' + divisor: 10 + skip_values: 0 diff --git a/resources/definitions/os_discovery/truenas-scale.yaml b/resources/definitions/os_discovery/truenas-scale.yaml index 6e0f50478f0..ee0504137ac 100644 --- a/resources/definitions/os_discovery/truenas-scale.yaml +++ b/resources/definitions/os_discovery/truenas-scale.yaml @@ -1,6 +1,6 @@ modules: os: - sysDescr_regex: '/(?:TrueNAS-SCALE-)(?\S*).*\. Hardware: (?.*).*\. Software.*/' + sysDescr_regex: '/(?:TrueNAS-(?:SCALE-)?)(?\S*).*\. Hardware: (?.*).*\. Software.*/' storage: data: - diff --git a/resources/definitions/os_discovery/viptela.yaml b/resources/definitions/os_discovery/viptela.yaml index 21222ed26d3..8bf26dc8fc0 100644 --- a/resources/definitions/os_discovery/viptela.yaml +++ b/resources/definitions/os_discovery/viptela.yaml @@ -3,6 +3,12 @@ modules: serial: VIPTELA-HARDWARE::hardwareInventorySerialNumber.chassis.0 version: VIPTELA-OPER-SYSTEM::systemStatusVersion.0 hardware: VIPTELA-OPER-SYSTEM::systemStatusModel.0 + processors: + data: + - + oid: VIPTELA-OPER-SYSTEM::systemStatusCpuIdle.0 + num_oid: '.1.3.6.1.4.1.41916.11.1.16.{{ $index }}' + precision: -1 mempools: data: - diff --git a/resources/definitions/os_discovery/voss.yaml b/resources/definitions/os_discovery/voss.yaml index 01026077341..ee721282926 100644 --- a/resources/definitions/os_discovery/voss.yaml +++ b/resources/definitions/os_discovery/voss.yaml @@ -44,3 +44,31 @@ modules: - { descr: normal, value: 1, generic: 0 } - { descr: highWarning, value: 2, generic: 1 } - { descr: highCritical, value: 3, generic: 2 } + - + oid: RAPID-CITY::rcVossSystemFanInfoTable + value: RAPID-CITY::rcVossSystemFanInfoOperStatus + num_oid: '.1.3.6.1.4.1.2272.1.101.1.1.4.1.4.{{ $index }}' + descr: 'VOSS Tray {{ $subindex0 }} Fan {{ $subindex1 }}' + index: 'rcVossSystemFanInfoOperStatus.{{ $index }}' + warn_limit: 3 + high_limit: 3 + state_name: rcVossSystemFanInfoOperStatus + states: + - { descr: unknown, value: 1, generic: 3 } + - { descr: up, value: 2, generic: 0 } + - { descr: down, value: 3, generic: 1 } + - { descr: notPresent, value: 4, generic: 3 } + - + oid: RAPID-CITY::rcChasPowerSupplyTable + value: RAPID-CITY::rcChasPowerSupplyOperStatus + num_oid: '.1.3.6.1.4.1.2272.1.4.8.1.1.2.{{ $index }}' + descr: 'VOSS Power Supply {{ $index }}' + index: 'rcChasPowerSupplyOperStatus.{{ $index }}' + warn_limit: 4 + high_limit: 4 + state_name: rcChasPowerSupplyOperStatus + states: + - { descr: unknown, value: 1, generic: 3 } + - { descr: empty, value: 2, generic: 0 } + - { descr: up, value: 3, generic: 0 } + - { descr: down, value: 4, generic: 1 } diff --git a/resources/definitions/os_discovery/vrp.yaml b/resources/definitions/os_discovery/vrp.yaml index 4260b4e34b4..bd49343df7c 100644 --- a/resources/definitions/os_discovery/vrp.yaml +++ b/resources/definitions/os_discovery/vrp.yaml @@ -11,9 +11,12 @@ modules: - HUAWEI-DEVICE-EXT-MIB::hwDeviceEsn.0 - ENTITY-MIB::entPhysicalSerialNum.9 processors: + additional_oids: + oids: + - ENTITY-MIB::entPhysicalName data: - - oid: HUAWEI-ENTITY-EXTENT-MIB::hwEntityStateEntry + oid: HUAWEI-ENTITY-EXTENT-MIB::hwEntityStateTable value: HUAWEI-ENTITY-EXTENT-MIB::hwEntityCpuUsage num_oid: '.1.3.6.1.4.1.2011.5.25.31.1.1.1.1.5.{{ $index }}' descr: '{{ ENTITY-MIB::entPhysicalName }} Processor' @@ -21,7 +24,7 @@ modules: - oid: HUAWEI-ENTITY-EXTENT-MIB::hwEntityOperStatus op: '!=' - value: 3 + value: enabled - oid: HUAWEI-ENTITY-EXTENT-MIB::hwEntityCpuUsageThreshold op: '=' diff --git a/resources/definitions/os_discovery/webmon.yaml b/resources/definitions/os_discovery/webmon.yaml index 4c34300408f..807a4b7da33 100644 --- a/resources/definitions/os_discovery/webmon.yaml +++ b/resources/definitions/os_discovery/webmon.yaml @@ -1,3 +1,146 @@ modules: os: version: WEBMON-EDGE-MATRIX-MIB::systemGeneralVersion.0.0 + sensors: + humidity: + data: + - + oid: WEBMON-EDGE-MATRIX-MIB::pSlot1Table + value: WEBMON-EDGE-MATRIX-MIB::pSlot1LiveRaw + num_oid: '.1.3.6.1.4.1.994.3.4.7.18.1.66.{{ $index }}' + descr: WEBMON-EDGE-MATRIX-MIB::pSlot1Description + group: pSlot1 + index: 'pSlot1LiveRaw.{{ $index }}' + low_limit: WEBMON-EDGE-MATRIX-MIB::pSlot1Thresh4 + low_warn_limit: WEBMON-EDGE-MATRIX-MIB::pSlot1Thresh3 + warn_limit: WEBMON-EDGE-MATRIX-MIB::pSlot1Thresh2 + high_limit: WEBMON-EDGE-MATRIX-MIB::pSlot1Thresh1 + skip_values: + - + oid: WEBMON-EDGE-MATRIX-MIB::pSlot1SensorType + op: '!=' + value: 2 + - + oid: WEBMON-EDGE-MATRIX-MIB::pSlot1LiveRaw + op: '=' + value: 0 + - + oid: WEBMON-EDGE-MATRIX-MIB::pSlot2Table + value: WEBMON-EDGE-MATRIX-MIB::pSlot2LiveRaw + num_oid: '.1.3.6.1.4.1.994.3.4.7.19.1.66.{{ $index }}' + descr: WEBMON-EDGE-MATRIX-MIB::pSlot2Description + group: pSlot2 + index: 'pSlot2LiveRaw.{{ $index }}' + low_limit: WEBMON-EDGE-MATRIX-MIB::pSlot2Thresh4 + low_warn_limit: WEBMON-EDGE-MATRIX-MIB::pSlot2Thresh3 + warn_limit: WEBMON-EDGE-MATRIX-MIB::pSlot2Thresh2 + high_limit: WEBMON-EDGE-MATRIX-MIB::pSlot2Thresh1 + skip_values: + - + oid: WEBMON-EDGE-MATRIX-MIB::pSlot2SensorType + op: '!=' + value: 2 + - + oid: WEBMON-EDGE-MATRIX-MIB::pSlot2LiveRaw + op: '=' + value: 0 + - + oid: WEBMON-EDGE-MATRIX-MIB::pSlot3Table + value: WEBMON-EDGE-MATRIX-MIB::pSlot3LiveRaw + num_oid: '.1.3.6.1.4.1.994.3.4.7.20.1.66.{{ $index }}' + descr: WEBMON-EDGE-MATRIX-MIB::pSlot3Description + group: pSlot3 + index: 'pSlot3LiveRaw.{{ $index }}' + low_limit: WEBMON-EDGE-MATRIX-MIB::pSlot3Thresh4 + low_warn_limit: WEBMON-EDGE-MATRIX-MIB::pSlot3Thresh3 + warn_limit: WEBMON-EDGE-MATRIX-MIB::pSlot3Thresh2 + high_limit: WEBMON-EDGE-MATRIX-MIB::pSlot3Thresh1 + skip_values: + - + oid: WEBMON-EDGE-MATRIX-MIB::pSlot3SensorType + op: '!=' + value: 2 + - + oid: WEBMON-EDGE-MATRIX-MIB::pSlot3LiveRaw + op: '=' + value: 0 + - + oid: WEBMON-EDGE-MATRIX-MIB::pSlot4Table + value: WEBMON-EDGE-MATRIX-MIB::pSlot4LiveRaw + num_oid: '.1.3.6.1.4.1.994.3.4.7.21.1.66.{{ $index }}' + descr: WEBMON-EDGE-MATRIX-MIB::pSlot4Description + group: pSlot4 + index: 'pSlot4LiveRaw.{{ $index }}' + low_limit: WEBMON-EDGE-MATRIX-MIB::pSlot4Thresh4 + low_warn_limit: WEBMON-EDGE-MATRIX-MIB::pSlot4Thresh3 + warn_limit: WEBMON-EDGE-MATRIX-MIB::pSlot4Thresh2 + high_limit: WEBMON-EDGE-MATRIX-MIB::pSlot4Thresh1 + skip_values: + - + oid: WEBMON-EDGE-MATRIX-MIB::pSlot4SensorType + op: '!=' + value: 2 + - + oid: WEBMON-EDGE-MATRIX-MIB::pSlot4LiveRaw + op: '=' + value: 0 + - + oid: WEBMON-EDGE-MATRIX-MIB::pSlot5Table + value: WEBMON-EDGE-MATRIX-MIB::pSlot5LiveRaw + num_oid: '.1.3.6.1.4.1.994.3.4.7.22.1.66.{{ $index }}' + descr: WEBMON-EDGE-MATRIX-MIB::pSlot5Description + group: pSlot5 + index: 'pSlot5LiveRaw.{{ $index }}' + low_limit: WEBMON-EDGE-MATRIX-MIB::pSlot5Thresh4 + low_warn_limit: WEBMON-EDGE-MATRIX-MIB::pSlot5Thresh3 + warn_limit: WEBMON-EDGE-MATRIX-MIB::pSlot5Thresh2 + high_limit: WEBMON-EDGE-MATRIX-MIB::pSlot5Thresh1 + skip_values: + - + oid: WEBMON-EDGE-MATRIX-MIB::pSlot5SensorType + op: '!=' + value: 2 + - + oid: WEBMON-EDGE-MATRIX-MIB::pSlot5LiveRaw + op: '=' + value: 0 + - + oid: WEBMON-EDGE-MATRIX-MIB::pSlot6Table + value: WEBMON-EDGE-MATRIX-MIB::pSlot6LiveRaw + num_oid: '.1.3.6.1.4.1.994.3.4.7.23.1.66.{{ $index }}' + descr: WEBMON-EDGE-MATRIX-MIB::pSlot6Description + group: pSlot6 + index: 'pSlot6LiveRaw.{{ $index }}' + low_limit: WEBMON-EDGE-MATRIX-MIB::pSlot6Thresh4 + low_warn_limit: WEBMON-EDGE-MATRIX-MIB::pSlot6Thresh3 + warn_limit: WEBMON-EDGE-MATRIX-MIB::pSlot6Thresh2 + high_limit: WEBMON-EDGE-MATRIX-MIB::pSlot6Thresh1 + skip_values: + - + oid: WEBMON-EDGE-MATRIX-MIB::pSlot6SensorType + op: '!=' + value: 2 + - + oid: WEBMON-EDGE-MATRIX-MIB::pSlot6LiveRaw + op: '=' + value: 0 + - + oid: WEBMON-EDGE-MATRIX-MIB::pOnboardSensorTable + value: WEBMON-EDGE-MATRIX-MIB::pOnboardSensorLiveRaw + num_oid: '.1.3.6.1.4.1.994.3.4.7.6.1.66.{{ $index }}' + descr: WEBMON-EDGE-MATRIX-MIB::pOnboardSensorDescription + group: pOnboardSensor + index: 'pOnboardSensorLiveRaw.{{ $index }}' + low_limit: WEBMON-EDGE-MATRIX-MIB::pOnboardSensorThresh4 + low_warn_limit: WEBMON-EDGE-MATRIX-MIB::pOnboardSensorThresh3 + warn_limit: WEBMON-EDGE-MATRIX-MIB::pOnboardSensorThresh2 + high_limit: WEBMON-EDGE-MATRIX-MIB::pOnboardSensorThresh1 + skip_values: + - + oid: WEBMON-EDGE-MATRIX-MIB::pOnboardSensorSensorType + op: '!=' + value: 2 + - + oid: WEBMON-EDGE-MATRIX-MIB::pOnboardSensorLiveRaw + op: '=' + value: 0 diff --git a/resources/definitions/os_discovery/wiseway.yaml b/resources/definitions/os_discovery/wiseway.yaml new file mode 100644 index 00000000000..5e989cc9417 --- /dev/null +++ b/resources/definitions/os_discovery/wiseway.yaml @@ -0,0 +1,4 @@ +modules: + os: + hardware: UPS-MIB::upsIdentModel.0 + version: UPS-MIB::upsIdentAgentSoftwareVersion.0 diff --git a/resources/definitions/os_discovery/yunshan.yaml b/resources/definitions/os_discovery/yunshan.yaml index 4f30067b4b6..b358b774aa9 100644 --- a/resources/definitions/os_discovery/yunshan.yaml +++ b/resources/definitions/os_discovery/yunshan.yaml @@ -11,9 +11,12 @@ modules: - HUAWEI-DEVICE-EXT-MIB::hwDeviceEsn.0 - ENTITY-MIB::entPhysicalSerialNum.9 processors: + additional_oids: + oids: + - ENTITY-MIB::entPhysicalName data: - - oid: HUAWEI-ENTITY-EXTENT-MIB::hwEntityStateEntry + oid: HUAWEI-ENTITY-EXTENT-MIB::hwEntityStateTable value: HUAWEI-ENTITY-EXTENT-MIB::hwEntityCpuUsage num_oid: '.1.3.6.1.4.1.2011.5.25.31.1.1.1.1.5.{{ $index }}' descr: '{{ ENTITY-MIB::entPhysicalName }} Processor' @@ -21,7 +24,7 @@ modules: - oid: HUAWEI-ENTITY-EXTENT-MIB::hwEntityOperStatus op: '!=' - value: 3 + value: enabled - oid: HUAWEI-ENTITY-EXTENT-MIB::hwEntityCpuUsageThreshold op: '=' diff --git a/resources/definitions/os_discovery/zscaler.yaml b/resources/definitions/os_discovery/zscaler.yaml new file mode 100644 index 00000000000..9c3fc62b074 --- /dev/null +++ b/resources/definitions/os_discovery/zscaler.yaml @@ -0,0 +1,25 @@ +modules: + os: + sysDescr_regex: + - '/ZscalerOS (?\S+) FreeBSD/' + - '/^Linux zpa-service-edge (?\S+) /' + - '/(?aarch64|amd64|arm\w*|i386|x86_64)\s*$/i' + sensors: + percent: + data: + - + oid: ZSCALER-SWAPINFO-MIB::swapinfoTable + value: ZSCALER-SWAPINFO-MIB::osswap_cur_used_inpercentage + num_oid: '.1.3.6.1.4.1.46262.6.2.1.11.{{ $index }}' + descr: 'Swap used {{ ZSCALER-SWAPINFO-MIB::swapinfoName }}' + index: 'swapused.{{ $index }}' + divisor: 100 + group: Swap + - + oid: ZSCALER-PROCESSHEALTH-MIB::processhealthTable + value: ZSCALER-PROCESSHEALTH-MIB::module_cpu_use + num_oid: '.1.3.6.1.4.1.46262.5.2.1.10.{{ $index }}' + descr: 'CPU {{ ZSCALER-PROCESSHEALTH-MIB::processhealthName }} ({{ ZSCALER-PROCESSHEALTH-MIB::processhealthInstance }})' + index: 'processcpu.{{ $index }}' + divisor: 100 + group: Processes diff --git a/resources/definitions/permissions.yaml b/resources/definitions/permissions.yaml index 632b94ad3d1..d6d89b18fba 100644 --- a/resources/definitions/permissions.yaml +++ b/resources/definitions/permissions.yaml @@ -257,6 +257,11 @@ groups: - wireless-sensor.update - wireless-sensor.delete + worker: + - worker.view + - worker.update + - worker.horizon + hidden: - customoid.viewAll - customoid.view diff --git a/resources/definitions/schema/db_schema.yaml b/resources/definitions/schema/db_schema.yaml index 00f8b0cf01f..21170abc2d1 100644 --- a/resources/definitions/schema/db_schema.yaml +++ b/resources/definitions/schema/db_schema.yaml @@ -307,8 +307,7 @@ bgpPeers_cbgp: - { Field: WithdrawnPrefixes_prev, Type: 'bigint unsigned', 'Null': false, Extra: '' } - { Field: context_name, Type: varchar(128), 'Null': false, Extra: '', Default: '' } Indexes: - bgppeers_cbgp_device_id_bgppeeridentifier_afi_safi_unique: { Name: bgppeers_cbgp_device_id_bgppeeridentifier_afi_safi_unique, Columns: [device_id, bgpPeerIdentifier, afi, safi], Unique: true, Type: BTREE } - bgppeers_cbgp_device_id_bgppeeridentifier_context_name_index: { Name: bgppeers_cbgp_device_id_bgppeeridentifier_context_name_index, Columns: [device_id, bgpPeerIdentifier, context_name], Unique: false, Type: BTREE } + bgppeers_cbgp_peer_family_unique: { Name: bgppeers_cbgp_peer_family_unique, Columns: [device_id, bgpPeerIdentifier, context_name, afi, safi], Unique: true, Type: BTREE } bills: Columns: - { Field: bill_id, Type: 'int unsigned', 'Null': false, Extra: auto_increment } @@ -409,6 +408,7 @@ cache: - { Field: expiration, Type: int, 'Null': false, Extra: '' } Indexes: cache_key_unique: { Name: cache_key_unique, Columns: [key], Unique: true, Type: BTREE } + cache_expiration_index: { Name: cache_expiration_index, Columns: [expiration], Unique: false, Type: BTREE } cache_locks: Columns: - { Field: key, Type: varchar(255), 'Null': false, Extra: '' } @@ -416,6 +416,7 @@ cache_locks: - { Field: expiration, Type: int, 'Null': false, Extra: '' } Indexes: PRIMARY: { Name: PRIMARY, Columns: [key], Unique: true, Type: BTREE } + cache_locks_expiration_index: { Name: cache_locks_expiration_index, Columns: [expiration], Unique: false, Type: BTREE } callback: Columns: - { Field: callback_id, Type: 'int unsigned', 'Null': false, Extra: auto_increment } @@ -1134,6 +1135,7 @@ mempools: - { Field: mempool_precision, Type: int, 'Null': false, Extra: '', Default: '1' } - { Field: mempool_descr, Type: varchar(128), 'Null': false, Extra: '' } - { Field: device_id, Type: 'int unsigned', 'Null': false, Extra: '' } + - { Field: polling_method, Type: varchar(32), 'Null': false, Extra: '', Default: snmp } - { Field: mempool_perc, Type: int, 'Null': false, Extra: '' } - { Field: mempool_perc_oid, Type: varchar(255), 'Null': true, Extra: '' } - { Field: mempool_used, Type: bigint, 'Null': false, Extra: '' } @@ -1887,7 +1889,7 @@ ports_fdb: - { Field: ports_fdb_id, Type: 'bigint unsigned', 'Null': false, Extra: auto_increment } - { Field: port_id, Type: 'int unsigned', 'Null': false, Extra: '' } - { Field: mac_address, Type: varchar(32), 'Null': false, Extra: '' } - - { Field: vlan_id, Type: 'int unsigned', 'Null': false, Extra: '' } + - { Field: vlan, Type: 'int unsigned', 'Null': true, Extra: '' } - { Field: device_id, Type: 'int unsigned', 'Null': false, Extra: '' } - { Field: created_at, Type: timestamp, 'Null': true, Extra: '' } - { Field: updated_at, Type: timestamp, 'Null': true, Extra: '' } @@ -1896,7 +1898,7 @@ ports_fdb: ports_fdb_device_id_index: { Name: ports_fdb_device_id_index, Columns: [device_id], Unique: false, Type: BTREE } ports_fdb_mac_address_index: { Name: ports_fdb_mac_address_index, Columns: [mac_address], Unique: false, Type: BTREE } ports_fdb_port_id_index: { Name: ports_fdb_port_id_index, Columns: [port_id], Unique: false, Type: BTREE } - ports_fdb_vlan_id_index: { Name: ports_fdb_vlan_id_index, Columns: [vlan_id], Unique: false, Type: BTREE } + ports_fdb_vlan_index: { Name: ports_fdb_vlan_index, Columns: [vlan], Unique: false, Type: BTREE } ports_nac: Columns: - { Field: ports_nac_id, Type: 'int unsigned', 'Null': false, Extra: auto_increment } @@ -2095,39 +2097,19 @@ processes: processors: Columns: - { Field: processor_id, Type: 'int unsigned', 'Null': false, Extra: auto_increment } - - { Field: entPhysicalIndex, Type: int, 'Null': false, Extra: '', Default: '0' } - { Field: hrDeviceIndex, Type: int, 'Null': true, Extra: '' } - { Field: device_id, Type: 'int unsigned', 'Null': false, Extra: '' } - { Field: processor_oid, Type: varchar(128), 'Null': false, Extra: '' } - { Field: processor_index, Type: varchar(32), 'Null': false, Extra: '' } - { Field: processor_type, Type: varchar(16), 'Null': false, Extra: '' } - - { Field: processor_usage, Type: int, 'Null': false, Extra: '' } + - { Field: processor_usage, Type: int, 'Null': true, Extra: '' } - { Field: processor_descr, Type: varchar(64), 'Null': false, Extra: '' } - { Field: processor_precision, Type: int, 'Null': false, Extra: '', Default: '1' } - { Field: processor_perc_warn, Type: int, 'Null': true, Extra: '', Default: '75' } + - { Field: processor_perc_warn_custom, Type: int, 'Null': true, Extra: '' } Indexes: PRIMARY: { Name: PRIMARY, Columns: [processor_id], Unique: true, Type: BTREE } processors_device_id_index: { Name: processors_device_id_index, Columns: [device_id], Unique: false, Type: BTREE } -proxmox: - Columns: - - { Field: id, Type: 'int unsigned', 'Null': false, Extra: auto_increment } - - { Field: device_id, Type: 'int unsigned', 'Null': false, Extra: '', Default: '0' } - - { Field: vmid, Type: int, 'Null': false, Extra: '' } - - { Field: cluster, Type: varchar(255), 'Null': false, Extra: '' } - - { Field: description, Type: varchar(255), 'Null': true, Extra: '' } - - { Field: last_seen, Type: timestamp, 'Null': false, Extra: '', Default: CURRENT_TIMESTAMP } - Indexes: - PRIMARY: { Name: PRIMARY, Columns: [id], Unique: true, Type: BTREE } - proxmox_cluster_vmid_unique: { Name: proxmox_cluster_vmid_unique, Columns: [cluster, vmid], Unique: true, Type: BTREE } -proxmox_ports: - Columns: - - { Field: id, Type: 'int unsigned', 'Null': false, Extra: auto_increment } - - { Field: vm_id, Type: int, 'Null': false, Extra: '' } - - { Field: port, Type: varchar(10), 'Null': false, Extra: '' } - - { Field: last_seen, Type: timestamp, 'Null': false, Extra: '', Default: CURRENT_TIMESTAMP } - Indexes: - PRIMARY: { Name: PRIMARY, Columns: [id], Unique: true, Type: BTREE } - proxmox_ports_vm_id_port_unique: { Name: proxmox_ports_vm_id_port_unique, Columns: [vm_id, port], Unique: true, Type: BTREE } pseudowires: Columns: - { Field: pseudowire_id, Type: 'int unsigned', 'Null': false, Extra: auto_increment } @@ -2597,6 +2579,7 @@ users: - { Field: updated_at, Type: timestamp, 'Null': false, Extra: '', Default: CURRENT_TIMESTAMP } - { Field: remember_token, Type: varchar(100), 'Null': true, Extra: '' } - { Field: enabled, Type: tinyint, 'Null': false, Extra: '', Default: '1' } + - { Field: phone, Type: varchar(15), 'Null': true, Extra: '' } Indexes: PRIMARY: { Name: PRIMARY, Columns: [user_id], Unique: true, Type: BTREE } users_auth_type_username_unique: { Name: users_auth_type_username_unique, Columns: [auth_type, username], Unique: true, Type: BTREE } @@ -2654,8 +2637,10 @@ vminfo: - { Field: vmwVmMemSize, Type: int, 'Null': false, Extra: '' } - { Field: vmwVmCpus, Type: int, 'Null': false, Extra: '' } - { Field: vmwVmState, Type: 'smallint unsigned', 'Null': false, Extra: '' } + - { Field: cluster_id, Type: varchar(64), 'Null': true, Extra: '' } Indexes: PRIMARY: { Name: PRIMARY, Columns: [id], Unique: true, Type: BTREE } + vminfo_cluster_id_vm_type_vmwvmvmid_unique: { Name: vminfo_cluster_id_vm_type_vmwvmvmid_unique, Columns: [cluster_id, vm_type, vmwVmVMID], Unique: true, Type: BTREE } vminfo_device_id_index: { Name: vminfo_device_id_index, Columns: [device_id], Unique: false, Type: BTREE } vminfo_vmwvmvmid_index: { Name: vminfo_vmwvmvmid_index, Columns: [vmwVmVMID], Unique: false, Type: BTREE } vrfs: @@ -2663,26 +2648,20 @@ vrfs: - { Field: vrf_id, Type: 'int unsigned', 'Null': false, Extra: auto_increment } - { Field: vrf_oid, Type: varchar(256), 'Null': false, Extra: '' } - { Field: vrf_name, Type: varchar(128), 'Null': true, Extra: '' } + - { Field: context_name, Type: varchar(128), 'Null': true, Extra: '' } + - { Field: context_manual, Type: tinyint, 'Null': false, Extra: '', Default: '0' } + - { Field: vrf_manual, Type: tinyint, 'Null': false, Extra: '', Default: '0' } + - { Field: context_verified, Type: tinyint, 'Null': false, Extra: '', Default: '0' } + - { Field: context_enabled, Type: tinyint, 'Null': false, Extra: '', Default: '1' } + - { Field: context_failures, Type: 'tinyint unsigned', 'Null': false, Extra: '', Default: '0' } - { Field: bgpLocalAs, Type: 'int unsigned', 'Null': true, Extra: '' } - { Field: mplsVpnVrfRouteDistinguisher, Type: varchar(128), 'Null': true, Extra: '' } - { Field: mplsVpnVrfDescription, Type: text, 'Null': true, Extra: '' } - { Field: device_id, Type: 'int unsigned', 'Null': false, Extra: '' } Indexes: PRIMARY: { Name: PRIMARY, Columns: [vrf_id], Unique: true, Type: BTREE } + vrfs_device_id_context_name_index: { Name: vrfs_device_id_context_name_index, Columns: [device_id, context_name], Unique: false, Type: BTREE } vrfs_device_id_index: { Name: vrfs_device_id_index, Columns: [device_id], Unique: false, Type: BTREE } -vrf_lite_cisco: - Columns: - - { Field: vrf_lite_cisco_id, Type: 'int unsigned', 'Null': false, Extra: auto_increment } - - { Field: device_id, Type: 'int unsigned', 'Null': false, Extra: '' } - - { Field: context_name, Type: varchar(128), 'Null': false, Extra: '' } - - { Field: intance_name, Type: varchar(128), 'Null': true, Extra: '', Default: '' } - - { Field: vrf_name, Type: varchar(128), 'Null': true, Extra: '', Default: Default } - Indexes: - PRIMARY: { Name: PRIMARY, Columns: [vrf_lite_cisco_id], Unique: true, Type: BTREE } - vrf_lite_cisco_context_name_index: { Name: vrf_lite_cisco_context_name_index, Columns: [context_name], Unique: false, Type: BTREE } - vrf_lite_cisco_device_id_context_name_vrf_name_index: { Name: vrf_lite_cisco_device_id_context_name_vrf_name_index, Columns: [device_id, context_name, vrf_name], Unique: false, Type: BTREE } - vrf_lite_cisco_device_id_index: { Name: vrf_lite_cisco_device_id_index, Columns: [device_id], Unique: false, Type: BTREE } - vrf_lite_cisco_vrf_name_index: { Name: vrf_lite_cisco_vrf_name_index, Columns: [vrf_name], Unique: false, Type: BTREE } wireless_sensors: Columns: - { Field: sensor_id, Type: 'int unsigned', 'Null': false, Extra: auto_increment } diff --git a/resources/definitions/schema/discovery_schema.json b/resources/definitions/schema/discovery_schema.json index aa39121967d..c8b6a585de4 100644 --- a/resources/definitions/schema/discovery_schema.json +++ b/resources/definitions/schema/discovery_schema.json @@ -132,6 +132,7 @@ "processors": { "type": "object", "properties": { + "additional_oids": {"$ref": "#/$defs/additional_oids"}, "data": { "type": "array", "items": { @@ -172,9 +173,6 @@ "string", "array" ] - }, - "snmp_no_Ih_flag": { - "type": "string" } }, "additionalProperties": false, @@ -211,7 +209,7 @@ "category": { "$comment": "Keep in sync with LibreNMS\\Enum\\SensorCategory", "type": "string", - "enum": ["stack"] + "enum": ["access-point", "cluster", "license", "stack"] }, "low_limit": { "type": ["number", "string"] @@ -433,9 +431,6 @@ "string", "array" ] - }, - "snmp_no_Ih_flag": { - "type": "string" } }, "additionalProperties": false, @@ -503,7 +498,7 @@ "category": { "$comment": "Keep in sync with LibreNMS\\Enum\\SensorCategory", "type": "string", - "enum": ["stack"] + "enum": ["access-point", "cluster", "license", "stack"] }, "low_limit": { "type": ["number", "string"] diff --git a/resources/definitions/schema/os_schema.json b/resources/definitions/schema/os_schema.json index a88802dfd00..856beea70e2 100644 --- a/resources/definitions/schema/os_schema.json +++ b/resources/definitions/schema/os_schema.json @@ -25,7 +25,28 @@ } }, "type": { - "type": "string" + "type": "string", + "enum": [ + "audiovisual", + "collaboration", + "environment", + "firewall", + "iot", + "loadbalancer", + "management", + "network", + "optical", + "power", + "printer", + "security", + "server", + "storage", + "surveillance", + "timing", + "voice", + "wireless", + "workstation" + ] }, "discovery": { "type": "array", @@ -109,9 +130,6 @@ "cisco-vpdn": { "type": "boolean" }, - "cisco-vrf-lite": { - "type": "boolean" - }, "core": { "type": "boolean" }, @@ -289,9 +307,6 @@ "cisco-qfp": { "type": "boolean" }, - "cisco-vrf-lite": { - "type": "boolean" - }, "core": { "type": "boolean" }, diff --git a/resources/js/components/alpine/filterBarComponent.js b/resources/js/components/alpine/filterBarComponent.js index e0b79cbc759..1152848015a 100644 --- a/resources/js/components/alpine/filterBarComponent.js +++ b/resources/js/components/alpine/filterBarComponent.js @@ -34,6 +34,16 @@ export default function filterBarComponent({ { v: "is_empty", s: "∅", l: "Is Empty" }, { v: "is_not_empty", s: "∃", l: "Is Not Empty" }, ], + version: [ + { v: "contains", s: "~", l: "Contains" }, + { v: "not_contains", s: "!~", l: "Not Contains" }, + { v: "eq", s: "=", l: "Equals" }, + { v: "neq", s: "≠", l: "Not Equals" }, + { v: "gt", s: ">", l: "Greater Than" }, + { v: "gte", s: "≥", l: "Greater or Equal" }, + { v: "lt", s: "<", l: "Less Than" }, + { v: "lte", s: "≤", l: "Less or Equal" }, + ], boolean: [{ v: "eq", s: "is", l: "Is" }], date: [ { v: "on", s: "=", l: "On Date" }, @@ -230,6 +240,7 @@ export default function filterBarComponent({ const url = this.applyFiltersToUrl(new URL(window.location)); if (this.reload) { + url.searchParams.delete("page"); // the new results may not have this page window.location.href = url.href; } else { window.history.pushState({}, "", url); diff --git a/resources/js/components/alpine/popup.js b/resources/js/components/alpine/popup.js index 201c857671e..9df6d3d5d43 100644 --- a/resources/js/components/alpine/popup.js +++ b/resources/js/components/alpine/popup.js @@ -29,6 +29,10 @@ export default function popup(url = '', options = {}) { cache: new Map(), popperInstance: null, popupElement: null, + onPopupShown: null, + onDocumentClick: null, + abortController: null, + destroyed: false, init() { // Create popup element and append to body @@ -38,16 +42,12 @@ export default function popup(url = '', options = {}) { this.setupEventListeners(); // Listen for global popup events - window.addEventListener('librenms-popup-shown', (e) => { + this.onPopupShown = (e) => { if (e.detail !== this.$el) { this.hide(0); } - }); - - // Cleanup on destroy - this.$el.addEventListener('alpine:destroyed', () => { - this.destroy(); - }); + }; + window.addEventListener('librenms-popup-shown', this.onPopupShown); }, createPopupElement() { @@ -79,11 +79,12 @@ export default function popup(url = '', options = {}) { }); // Click away to close - document.addEventListener('click', (e) => { + this.onDocumentClick = (e) => { if (!this.$el.contains(e.target) && !this.popupElement.contains(e.target)) { this.hide(0); } - }); + }; + document.addEventListener('click', this.onDocumentClick); }, async show(timeout = 0) { @@ -97,6 +98,10 @@ export default function popup(url = '', options = {}) { // Load content if URL is provided and not cached else if (this.url && !this.content && !this.loading) { await this.loadContent(); + + if (this.destroyed) { + return; + } } // Show popup @@ -142,10 +147,12 @@ export default function popup(url = '', options = {}) { this.loading = true; this.error = false; this.renderLoadingState(); + this.abortController = new AbortController(); try { const response = await fetch(this.url, { method: 'GET', + signal: this.abortController.signal, headers: { 'X-Requested-With': 'XMLHttpRequest', 'Accept': 'text/html,application/json', @@ -172,6 +179,10 @@ export default function popup(url = '', options = {}) { this.renderContent(); } catch (error) { + if (error.name === 'AbortError') { + return; + } + console.error('Popup AJAX error:', error); this.error = true; this.content = ''; @@ -277,6 +288,15 @@ export default function popup(url = '', options = {}) { // Cleanup destroy() { + this.destroyed = true; + + if (this.abortController) { + this.abortController.abort(); + } + + window.removeEventListener('librenms-popup-shown', this.onPopupShown); + document.removeEventListener('click', this.onDocumentClick); + clearTimeout(this.showTimeout); clearTimeout(this.hideTimeout); diff --git a/resources/views/about/index.blade.php b/resources/views/about/index.blade.php index 5cfc5a3b767..dcad4fa8373 100644 --- a/resources/views/about/index.blade.php +++ b/resources/views/about/index.blade.php @@ -104,9 +104,6 @@
-
- {{ __('Error reporting:') }} -
{{ __('Usage statistics:') }} stats.librenms.org
diff --git a/resources/views/auth/public-status.blade.php b/resources/views/auth/public-status.blade.php index 52341462c4f..f565258c78b 100644 --- a/resources/views/auth/public-status.blade.php +++ b/resources/views/auth/public-status.blade.php @@ -30,7 +30,7 @@ - {{ $device->displayName() }} + {{ $device->display }} {{ $device->hardware }} {{ $device->features }} {{ $device->formatDownUptime(true) }}
{{ substr((string) $device->location, 0, 32) }} diff --git a/resources/views/components/device-link-no-access.blade.php b/resources/views/components/device-link-no-access.blade.php index 0f7b1b105d8..f3c831da7c6 100644 --- a/resources/views/components/device-link-no-access.blade.php +++ b/resources/views/components/device-link-no-access.blade.php @@ -1,3 +1,3 @@ -{{ $slot->isNotEmpty() ? $slot : $device->displayName() }} +{{ $slot->isNotEmpty() ? $slot : $device->display }} diff --git a/resources/views/components/device-link.blade.php b/resources/views/components/device-link.blade.php index ce4fec0727c..9458b9bfd52 100644 --- a/resources/views/components/device-link.blade.php +++ b/resources/views/components/device-link.blade.php @@ -1,10 +1,10 @@ - {{ $slot->isNotEmpty() ? $slot : $device->displayName() }} + {{ $slot->isNotEmpty() ? $slot : $device->display }} - {{ $device->displayName() }} + {{ $device->display }} {{ $device->hardware }} diff --git a/resources/views/components/device/maintenance-mode.blade.php b/resources/views/components/device/maintenance-mode.blade.php index 4faca2dca43..15600ca0e8d 100644 --- a/resources/views/components/device/maintenance-mode.blade.php +++ b/resources/views/components/device/maintenance-mode.blade.php @@ -7,7 +7,7 @@
- @endforeach diff --git a/resources/views/components/device/polling/new-secret-fields.blade.php b/resources/views/components/device/polling/new-secret-fields.blade.php index 09aa32d0082..3ef4f6bc64c 100644 --- a/resources/views/components/device/polling/new-secret-fields.blade.php +++ b/resources/views/components/device/polling/new-secret-fields.blade.php @@ -6,8 +6,13 @@ 'descriptionModel' => 'description', 'descriptionPlaceholder' => null, 'errorKey' => null, + 'typeName' => 'secret_type', + 'typeModel' => 'secretType', + 'typeErrorKey' => null, ]) +@php($secretTypes = $method['secret_types'] ?? []) +
@endif
+ + @if(count($secretTypes) > 1) +
+ + + @if($typeErrorKey) + + @endif +
+ @elseif(count($secretTypes) === 1) + + @endif
- + @foreach($secretTypes as $secretType) + {{-- only the fields of the selected type are submitted --}} + + @endforeach
diff --git a/resources/views/components/field-schema-fields.blade.php b/resources/views/components/field-schema-fields.blade.php index 5a8ecff2fd5..ed2ea51febb 100644 --- a/resources/views/components/field-schema-fields.blade.php +++ b/resources/views/components/field-schema-fields.blade.php @@ -56,6 +56,8 @@ * 'label' => string, * 'options' => array, // [value => label, ...] * 'visible_if' => string|null, // Alpine x-show expression + * 'fixed_if' => string|null, // Alpine expression, a select then shows fixed_text disabled + * 'fixed_text' => string|null, * 'min' => int|null, * 'max' => int|null, * 'placeholder' => string|null, @@ -86,6 +88,8 @@ 'label' => $label, 'options' => $config['options'] ?? [], 'visible_if' => $visibleIf, + 'fixed_if' => $config['fixed_if_expression'] ?? null, + 'fixed_text' => $config['fixed_text'] ?? null, 'min' => $config['min'] ?? null, 'max' => $config['max'] ?? null, 'placeholder' => $config['placeholder'] ?? null, @@ -140,10 +144,17 @@ @if($type === 'select') + @if($field['fixed_if']) + {{-- shows what applies in place of the select, which keeps and submits its own value --}} + + @endif - @foreach($types as $type => $type_data) - @endforeach diff --git a/resources/views/device/edit/modules.blade.php b/resources/views/device/edit/modules.blade.php index 4adce81c67d..e48d0355df4 100644 --- a/resources/views/device/edit/modules.blade.php +++ b/resources/views/device/edit/modules.blade.php @@ -82,7 +82,7 @@ class="tw:h-8 tw:w-8 tw:inline-flex tw:items-center tw:justify-center tw:rounded - {{ __('No modules match') }} + {{ empty($modules) ? __('No modules can run with the polling methods enabled on this device.') : __('No modules match') }} @@ -135,7 +135,7 @@ class="tw:h-8 tw:w-8 tw:inline-flex tw:items-center tw:justify-center tw:rounded }, enabled(setting) { - return setting.device ?? setting.os ?? setting.global; + return setting.device ?? setting.method ?? setting.os ?? setting.global; }, isPending(key) { diff --git a/resources/views/device/edit/polling.blade.php b/resources/views/device/edit/polling.blade.php index f23ad5b860c..8a71de06081 100644 --- a/resources/views/device/edit/polling.blade.php +++ b/resources/views/device/edit/polling.blade.php @@ -69,6 +69,42 @@ class="tw:px-3 tw:py-3 tw:shrink-0 tw:transition-colors tw:text-base" {{-- Add polling type dropdown --}} + + @if($unknownMethods->isNotEmpty()) +
+
+ {{ __('poller.unknown_methods') }} +
+

{{ __('poller.unknown_methods_help') }}

+
    + @foreach($unknownMethods as $unknownMethod) +
  • + +
    +
    {{ $unknownMethod->typeName() }}
    +
    + {{ $unknownMethod->enabled ? __('Enabled') : __('Disabled') }} + @if($unknownMethod->secret) + · {{ $unknownMethod->secret->description }} + @endif +
    +
    +
    + @csrf + @method('DELETE') + +
    +
  • + @endforeach +
+
+ @endif @@ -84,7 +120,7 @@ class="tw:px-3 tw:py-3 tw:shrink-0 tw:transition-colors tw:text-base" - @@ -210,6 +214,9 @@ class="tw:appearance-none tw:cursor-pointer tw:text-lg tw:font-medium tw:h-8 tw: @@ -828,6 +835,12 @@ class="tw:py-12 tw:m-0 tw:text-center tw:text-gray-500 tw:dark:text-dark-white-4 return this.diffReversed ? { orig: newer, rev: older } : { orig: older, rev: newer }; }, + get diffAuthor() { + if (this.diffSelection.length !== 2) return null; + const [b1, b2] = this.diffSelection; + return (b1.date <= b2.date ? b2 : b1).author; + }, + get activeDiffOrig() { return this.sortedDiff?.orig ?? null; }, get activeDiffRev() { return this.sortedDiff?.rev ?? null; }, get activeOrigId() { return this.activeDiffOrig?.id ?? ''; }, @@ -943,6 +956,14 @@ class="tw:py-12 tw:m-0 tw:text-center tw:text-gray-500 tw:dark:text-dark-white-4 return this.selected?.date; }, + get selectedDisplayAuthor() { + if (this.selectedBackupId) { + const b = this.backups.find(b => b.id === this.selectedBackupId); + if (b) return b.author; + } + return this.selected?.author; + }, + errorMessage() { return this.messages[this.error] || this.messages.request_failed || this.error; }, formatDate(ts) { return ts ? window.LibreNMS.Date.display(ts) : ''; }, requestError(e) { return e.response?.data?.error ?? 'request_failed'; }, diff --git a/resources/views/device/tabs/logs/eventlog.blade.php b/resources/views/device/tabs/logs/eventlog.blade.php index f474b0af0fa..c00b1f51263 100644 --- a/resources/views/device/tabs/logs/eventlog.blade.php +++ b/resources/views/device/tabs/logs/eventlog.blade.php @@ -35,6 +35,7 @@ return { device: {{ $device->device_id }}, eventtype: @json($eventtype), + port: @json($port_id), }; }, url: "{{ route('table.eventlog') }}" @@ -49,7 +50,7 @@ '' + '' + '    ' + @endif @@ -61,6 +62,15 @@ '' + '  ' + '' + + + @if($port_id) + '' + + '  ' + + '
' + + '' + @json($port ? e($port->getLabel()) : (string) $port_id) + + ' ×
' + + @endif + '' + '' ); diff --git a/resources/views/device/tabs/logs/graylog.blade.php b/resources/views/device/tabs/logs/graylog.blade.php index f4052119b90..382ddb46ce3 100644 --- a/resources/views/device/tabs/logs/graylog.blade.php +++ b/resources/views/device/tabs/logs/graylog.blade.php @@ -42,7 +42,7 @@ @if($filter_device) "
 
"+ @endif diff --git a/resources/views/device/tabs/logs/syslog.blade.php b/resources/views/device/tabs/logs/syslog.blade.php index e15d5828bc2..5579af43f85 100644 --- a/resources/views/device/tabs/logs/syslog.blade.php +++ b/resources/views/device/tabs/logs/syslog.blade.php @@ -54,7 +54,7 @@ '' + @endif diff --git a/resources/views/device/tabs/packages.blade.php b/resources/views/device/tabs/packages.blade.php index 07ca89b4644..020d695f2a9 100644 --- a/resources/views/device/tabs/packages.blade.php +++ b/resources/views/device/tabs/packages.blade.php @@ -2,41 +2,17 @@ @section('content') - - - - - - - - - - - - - - @forelse($data['packages'] as $package) - - - - - - - - @empty - - - - @endforelse - -
{{ __('Package Name') }}{{ __('Version') }}{{ __('Architecture') }}{{ __('Package Manager') }}{{ __('Size') }}
- {{ $package->name }} - - {{ $package->version }}{{ $package->build ? '-' . $package->build : '' }} - {{ $package->arch }}{{ $package->manager }}{{ \LibreNMS\Util\Number::formatSi($package->size, 2, 0, '') }}
- {{ __('No packages found for this device.') }} -
-
-
+ + @foreach($data['packages'] as $package) + + + {{ $package->displayVersion() }} + {{ $package->arch }} + {{ $package->manager }} + {{ \LibreNMS\Util\Number::formatSi($package->size, 2, 0, '') }} + + @endforeach +
@endsection diff --git a/resources/views/device/tabs/ports/includes/port_row.blade.php b/resources/views/device/tabs/ports/includes/port_row.blade.php index df74d561af0..ad94e8bef58 100644 --- a/resources/views/device/tabs/ports/includes/port_row.blade.php +++ b/resources/views/device/tabs/ports/includes/port_row.blade.php @@ -30,6 +30,11 @@ @if($port->ifInErrors_delta > 0 || $port->ifOutErrors_delta > 0) @endif + @if(($data['ports_with_events'] ?? collect())->contains($port->port_id)) + + + + @endif @if($port->getLabel() !== $port->getDescription()) {{ $port->getDescription() }} @endif diff --git a/resources/views/device/tabs/routing/vrf.blade.php b/resources/views/device/tabs/routing/vrf.blade.php index af3d70fa884..f7c95102f42 100644 --- a/resources/views/device/tabs/routing/vrf.blade.php +++ b/resources/views/device/tabs/routing/vrf.blade.php @@ -14,6 +14,7 @@ {{ __('VRF') }} {{ __('Description') }} {{ __('RD') }} + {{ __('SNMP Context') }} {{ __('Interfaces') }} @@ -25,13 +26,14 @@ {{ $vrf->mplsVpnVrfDescription }} {{ $vrf->mplsVpnVrfRouteDistinguisher }} + {{ $vrf->context_name }} @empty - + {{ __('No VRFs found for this device.') }} diff --git a/resources/views/device/tabs/vm.blade.php b/resources/views/device/tabs/vm.blade.php index 9558772f3d2..9f9583db226 100644 --- a/resources/views/device/tabs/vm.blade.php +++ b/resources/views/device/tabs/vm.blade.php @@ -2,30 +2,37 @@ @section('content') - - - -
- - - - - - - - - - - -
{{ __('VM Name') }}{{ __('Power Status') }}{{ __('Type') }}{{ __('Operating System') }}{{ __('Memory') }}{{ __('vCPUs') }}
-
-
-
+ + @if($data['graph']) + + @else + + + +
+ + + + + + + + + + + + +
{{ __('VM Name') }}{{ __('Power Status') }}{{ __('Type') }}{{ __('Operating System') }}{{ __('Memory') }}{{ __('vCPUs') }}{{ __('Graphs') }}
+
+
+
+ @endif
@endsection @section('scripts') +@if(! $data['graph']) +@endif @endsection diff --git a/resources/views/device/tabs/vm/show.blade.php b/resources/views/device/tabs/vm/show.blade.php new file mode 100644 index 00000000000..1651ceb2abd --- /dev/null +++ b/resources/views/device/tabs/vm/show.blade.php @@ -0,0 +1,62 @@ +@extends('layouts.librenmsv1') + +@section('content') + +

+ + + {{ __('All virtual machines') }} + +

+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{ __('VM Name') }} + {{ $vm->vmwVmDisplayName }} + @if($vm->parentDevice) + () + @endif +
{{ __('Power Status') }}{{ $vm->stateLabel[0] }}
{{ __('Type') }}{{ $vm->vm_type }}
{{ __('Operating System') }}{{ $vm->operatingSystem }}
{{ __('Memory') }}{{ $vm->memoryFormatted }}
{{ __('vCPUs') }}{{ $vm->vmwVmCpus }}
+
+
+ + @forelse($graphs as $graph) + + @empty +

{{ __('No graphs have been recorded for this virtual machine.') }}

+ @endforelse +
+@endsection diff --git a/resources/views/first-run/index.blade.php b/resources/views/first-run/index.blade.php new file mode 100644 index 00000000000..070562d07ec --- /dev/null +++ b/resources/views/first-run/index.blade.php @@ -0,0 +1,684 @@ +@extends('layouts.librenmsv1') + +@section('title', __('first_run.title')) + +@section('content') +
+ + +
+

+ {{ __('first_run.panel_title') }} +

+ {{-- the steps that were reached can be opened again --}} + +
+
+ +
+ {{-- Welcome --}} +
+ +

{{ __('first_run.welcome.heading') }}

+

{{ __('first_run.welcome.intro') }}

+
+ + {{-- Credentials --}} +
+

{{ __('first_run.credentials.heading') }}

+

+ {{ __('first_run.credentials.intro') }}
+ {!! str_replace(':link', '' . e(__('first_run.snmp_docs')) . '', e(__('first_run.credentials.docs'))) !!} +

+ + {{-- communities and SNMPv3 credentials are one list, tried in the order shown --}} +
    + +
+

{{ __('first_run.credentials.empty') }}

+

+ + + + {{-- one form for every kind of credential --}} + +
+
+ {{ __('first_run.credentials.version') }} +
+ + +
+
+
+ + +
+
+ +
+ + +
+ + + + +
+
+ + {{-- Networks --}} +
+

{{ __('first_run.networks.heading') }}

+

+ {{ __('first_run.networks.intro') }} + {{ __('first_run.networks.suggested') }} +

+ +
+ +
+ + +
+
+ + +
+
+
+ + {{-- Scan --}} +
+

+ +
+
+
+
+ + +
+ + {{-- Found hosts, newest first --}} +
    + +
+
+ {{ __('first_run.scan.waiting') }} +
+
{{ __('first_run.scan.none_found') }}
+
{{ __('first_run.scan.none_found_help') }} {!! str_replace(':link', '' . e(__('first_run.snmp_docs')) . '', e(__('first_run.scan.docs'))) !!}
+
+
+ + {{-- Finished --}} +
+
+ + {{ __('first_run.scan.stopped') }} + + {{ __('first_run.scan.discovering') }} + + + + +
+ + {{-- Hosts that replied to ping but not SNMP, most likely the credentials are wrong --}} + + + {{ __('first_run.scan.ping_only_help') }} + {!! str_replace(':link', '' . e(__('first_run.snmp_docs')) . '', e(__('first_run.scan.docs'))) !!} +
+ + +
+
+ +

+ {{ __('first_run.next_steps.heading') }}: + @can('viewAny', \App\Models\AlertTransport::class) + {{ __('first_run.next_steps.alerts') }} · + @endcan + {{ __('first_run.next_steps.validate') }} +

+
+
+
+ + {{-- Navigation, skip and finish complete the first run --}} + +
+ @csrf +
+ {{ __('first_run.add_manually') }} + + +
+
+ + + + + + + +
+
+
+
+
+@endsection + +@push('styles') + +@endpush + +@push('scripts') + +@endpush diff --git a/resources/views/install/finish.blade.php b/resources/views/install/finish.blade.php index 51b49d5746d..4a534e03e40 100644 --- a/resources/views/install/finish.blade.php +++ b/resources/views/install/finish.blade.php @@ -42,11 +42,6 @@ -
- - -
-
diff --git a/resources/views/layouts/error.blade.php b/resources/views/layouts/error.blade.php index 25c266f2f42..9f6353f89cf 100644 --- a/resources/views/layouts/error.blade.php +++ b/resources/views/layouts/error.blade.php @@ -75,10 +75,6 @@

{{ __("Check your log for more details.") }} ({{ isset($log_file) ? $log_file : 'librenms.log' }})

{{ __("If you need additional help, you can find how to get help at") }} https://docs.librenms.org/Support.

- - @if(! empty(Flare::sentReports()->all())) -

{{ __("Please include this Error-ID when reporting problems:") }} {{ Flare::sentReports()->latestUuid() }}

- @endif diff --git a/resources/views/layouts/menu.blade.php b/resources/views/layouts/menu.blade.php index 371d04b043f..b3ea56357dd 100644 --- a/resources/views/layouts/menu.blade.php +++ b/resources/views/layouts/menu.blade.php @@ -38,6 +38,10 @@ class="tw:md:hidden tw:2xl:inline-block">{{ __('Overview') }}
+ @can('viewAny', \App\Models\Port::class) +
  • {{ __('search.title') }}
  • + + @endcan @if(Gate::allows('plugin.admin') || $has_v1_plugins || $has_v2_plugins)
  • {{ __('Inventory') }}
  • @if($package_count) -
  • {{ __('search.packages') }} +
  • {{ __('Packages') }}
  • @endif - - -
  • {{ __('search.ipv4') }} -
  • -
  • {{ __('search.ipv6') }} -
  • -
  • {{ __('search.mac') }} -
  • -
  • {{ __('search.arp_tables') }} -
  • -
  • {{ __('search.fdb_tables') }} -
  • {{-- Devices --}} @@ -144,7 +131,7 @@ class="tw:md:hidden tw:2xl:inline-block">{{ __('Overview') }} @if($device_types->isNotEmpty()) @endif @@ -668,7 +655,12 @@ class="global-search-dropdown tw:absolute tw:right-0 tw:mt-1 tw:min-w-70 tw:max-