--- a/usr/src/cmd/fm/dicts/Makefile Thu Jul 01 17:47:34 2010 -0700
+++ b/usr/src/cmd/fm/dicts/Makefile Thu Jul 01 23:30:39 2010 -0400
@@ -19,8 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
#
include ../../Makefile.cmd
@@ -36,6 +35,7 @@
SCA500 \
SCA1000 \
SENSOR \
+ STORAGE \
TEST
i386_DCNAMES = \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/dicts/STORAGE.dict Thu Jul 01 23:30:39 2010 -0400
@@ -0,0 +1,46 @@
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# DO NOT EDIT -- this file is generated by the Event Registry.
+#
+
+FMDICT: name=STORAGE version=1 maxkey=1 dictid=0x5354
+
+fault.config.fan-fail=1
+fault.config.psu-fail=2
+fault.device.controller.fail=3
+fault.device.ethernet.fail=4
+fault.device.fan.fail=5
+fault.device.psu.fail=6
+fault.device.sas-expander.fail=7
+fault.device.unusable-chassis-id=8
+fault.io.i2c.fail=9
+fault.io.i2c.poweron-fail=10
+fault.io.sas.log.non-fatal=11
+fault.io.sas.log.fatal=12
+fault.power.fail=13
+fault.power.ext-fail=14
+fault.sensor.read-fail=15
+fault.sp.fail=16
+fault.sp.unavailable=17
+fault.sp.svc-fail=18
+fault.temp.fail=19
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/dicts/STORAGE.po Thu Jul 01 23:30:39 2010 -0400
@@ -0,0 +1,328 @@
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# DO NOT EDIT -- this file is generated by the Event Registry.
+#
+#
+# code: STORAGE-8000-1Q
+# keys: fault.config.fan-fail
+#
+msgid "STORAGE-8000-1Q.type"
+msgstr "Fault"
+msgid "STORAGE-8000-1Q.severity"
+msgstr "Critical"
+msgid "STORAGE-8000-1Q.description"
+msgstr "The minimum number of required fan trays (3) were not detected.\n"
+msgid "STORAGE-8000-1Q.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-1Q.impact"
+msgstr "The SAS fabric is down, and user data storage is unavailable until the configuration problem is resolved.\n"
+msgid "STORAGE-8000-1Q.action"
+msgstr "Check that the minimum required number of components are configured.\n"
+#
+# code: STORAGE-8000-24
+# keys: fault.config.psu-fail
+#
+msgid "STORAGE-8000-24.type"
+msgstr "Fault"
+msgid "STORAGE-8000-24.severity"
+msgstr "Critical"
+msgid "STORAGE-8000-24.description"
+msgstr "The minimum number of required power supplies (3) were not detected.\n"
+msgid "STORAGE-8000-24.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-24.impact"
+msgstr "The SAS fabric is down, and user data storage is unavailable until the configuration problem is resolved.\n"
+msgid "STORAGE-8000-24.action"
+msgstr "Check that the minimum required number of components are configured.\n"
+#
+# code: STORAGE-8000-3R
+# keys: fault.device.controller.fail
+#
+msgid "STORAGE-8000-3R.type"
+msgstr "Fault"
+msgid "STORAGE-8000-3R.severity"
+msgstr "Major"
+msgid "STORAGE-8000-3R.description"
+msgstr "A Controller failed.\n"
+msgid "STORAGE-8000-3R.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-3R.impact"
+msgstr "The SAS fabric may be in a degraded state.\n"
+msgid "STORAGE-8000-3R.action"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+#
+# code: STORAGE-8000-42
+# keys: fault.device.ethernet.fail
+#
+msgid "STORAGE-8000-42.type"
+msgstr "Fault"
+msgid "STORAGE-8000-42.severity"
+msgstr "Major"
+msgid "STORAGE-8000-42.description"
+msgstr "An ethernet device failed.\n"
+msgid "STORAGE-8000-42.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-42.impact"
+msgstr "The SAS fabric may be in a degraded state. User data storage is still available.\n"
+msgid "STORAGE-8000-42.action"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+#
+# code: STORAGE-8000-5X
+# keys: fault.device.fan.fail
+#
+msgid "STORAGE-8000-5X.type"
+msgstr "Fault"
+msgid "STORAGE-8000-5X.severity"
+msgstr "Major"
+msgid "STORAGE-8000-5X.description"
+msgstr "A fan is no longer operating correctly.\n"
+msgid "STORAGE-8000-5X.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-5X.impact"
+msgstr "The enclosure may be getting inadequate cooling. If the problem persists, components may overheat and the enclosure may shutdown.\n"
+msgid "STORAGE-8000-5X.action"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+#
+# code: STORAGE-8000-6E
+# keys: fault.device.psu.fail
+#
+msgid "STORAGE-8000-6E.type"
+msgstr "Fault"
+msgid "STORAGE-8000-6E.severity"
+msgstr "Major"
+msgid "STORAGE-8000-6E.description"
+msgstr "A power supply is no longer operating correctly.\n"
+msgid "STORAGE-8000-6E.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-6E.impact"
+msgstr "The enclosure may not be getting adequate power. Subsequent loss of power supplies may cause the enclosure to shutdown.\n"
+msgid "STORAGE-8000-6E.action"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+#
+# code: STORAGE-8000-7J
+# keys: fault.device.sas-expander.fail
+#
+msgid "STORAGE-8000-7J.type"
+msgstr "Fault"
+msgid "STORAGE-8000-7J.severity"
+msgstr "Major"
+msgid "STORAGE-8000-7J.description"
+msgstr "A SAS expander is not functioning properly.\n"
+msgid "STORAGE-8000-7J.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-7J.impact"
+msgstr "The SAS fabric is in a degraded state. User data storage is still available.\n"
+msgid "STORAGE-8000-7J.action"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+#
+# code: STORAGE-8000-8S
+# keys: fault.device.unusable-chassis-id
+#
+msgid "STORAGE-8000-8S.type"
+msgstr "Fault"
+msgid "STORAGE-8000-8S.severity"
+msgstr "Critical"
+msgid "STORAGE-8000-8S.description"
+msgstr "The chassis ID was determined to be unusable.\n"
+msgid "STORAGE-8000-8S.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-8S.impact"
+msgstr "The SAS fabric is down, and user data storage is unavailable.\n"
+msgid "STORAGE-8000-8S.action"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+#
+# code: STORAGE-8000-95
+# keys: fault.io.i2c.fail
+#
+msgid "STORAGE-8000-95.type"
+msgstr "Fault"
+msgid "STORAGE-8000-95.severity"
+msgstr "Critical"
+msgid "STORAGE-8000-95.description"
+msgstr "An I2C bus failure has occurred.\n"
+msgid "STORAGE-8000-95.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-95.impact"
+msgstr "The system is in an unknown state.\n"
+msgid "STORAGE-8000-95.action"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+#
+# code: STORAGE-8000-AP
+# keys: fault.io.i2c.poweron-fail
+#
+msgid "STORAGE-8000-AP.type"
+msgstr "Fault"
+msgid "STORAGE-8000-AP.severity"
+msgstr "Critical"
+msgid "STORAGE-8000-AP.description"
+msgstr "An I2C bus failure has occurred during power-on.\n"
+msgid "STORAGE-8000-AP.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-AP.impact"
+msgstr "The system is in an unknown state.\n"
+msgid "STORAGE-8000-AP.action"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+#
+# code: STORAGE-8000-CA
+# keys: fault.io.sas.log.non-fatal
+#
+msgid "STORAGE-8000-CA.type"
+msgstr "Fault"
+msgid "STORAGE-8000-CA.severity"
+msgstr "Major"
+msgid "STORAGE-8000-CA.description"
+msgstr "A SAS expander log failure has occurred.\n"
+msgid "STORAGE-8000-CA.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-CA.impact"
+msgstr "The system is in an unknown state.\n"
+msgid "STORAGE-8000-CA.action"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+#
+# code: STORAGE-8000-DH
+# keys: fault.io.sas.log.fatal
+#
+msgid "STORAGE-8000-DH.type"
+msgstr "Fault"
+msgid "STORAGE-8000-DH.severity"
+msgstr "Critical"
+msgid "STORAGE-8000-DH.description"
+msgstr "A SAS expander log failure has occurred.\n"
+msgid "STORAGE-8000-DH.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-DH.impact"
+msgstr "The system is in an unknown state.\n"
+msgid "STORAGE-8000-DH.action"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+#
+# code: STORAGE-8000-ED
+# keys: fault.power.fail
+#
+msgid "STORAGE-8000-ED.type"
+msgstr "Fault"
+msgid "STORAGE-8000-ED.severity"
+msgstr "Major"
+msgid "STORAGE-8000-ED.description"
+msgstr "A power failure has occurred.\n"
+msgid "STORAGE-8000-ED.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-ED.impact"
+msgstr "A device in the enclosure may be getting inadequate power. Subsequent loss of the device may force the enclosure to shutdown.\n"
+msgid "STORAGE-8000-ED.action"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+#
+# code: STORAGE-8000-FY
+# keys: fault.power.ext-fail
+#
+msgid "STORAGE-8000-FY.type"
+msgstr "Fault"
+msgid "STORAGE-8000-FY.severity"
+msgstr "Major"
+msgid "STORAGE-8000-FY.description"
+msgstr "A power failure external to the enclosure has occurred.\n"
+msgid "STORAGE-8000-FY.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-FY.impact"
+msgstr "The enclosure may not be getting adequate power. Subsequent loss of power supplies may cause the enclosure to shutdown.\n"
+msgid "STORAGE-8000-FY.action"
+msgstr "Check that external AC power is available and that all the power cords are properly plugged into the enclosure power supplies.\n"
+#
+# code: STORAGE-8000-G3
+# keys: fault.sensor.read-fail
+#
+msgid "STORAGE-8000-G3.type"
+msgstr "Fault"
+msgid "STORAGE-8000-G3.severity"
+msgstr "Major"
+msgid "STORAGE-8000-G3.description"
+msgstr "An attempt to read a sensor failed.\n"
+msgid "STORAGE-8000-G3.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-G3.impact"
+msgstr "The system is in an unknown state.\n"
+msgid "STORAGE-8000-G3.action"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+#
+# code: STORAGE-8000-HR
+# keys: fault.sp.fail
+#
+msgid "STORAGE-8000-HR.type"
+msgstr "Fault"
+msgid "STORAGE-8000-HR.severity"
+msgstr "Critical"
+msgid "STORAGE-8000-HR.description"
+msgstr "A Service Processor failed.\n"
+msgid "STORAGE-8000-HR.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-HR.impact"
+msgstr "The SAS fabric may be in a degraded state.\n"
+msgid "STORAGE-8000-HR.action"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+#
+# code: STORAGE-8000-J4
+# keys: fault.sp.unavailable
+#
+msgid "STORAGE-8000-J4.type"
+msgstr "Fault"
+msgid "STORAGE-8000-J4.severity"
+msgstr "Major"
+msgid "STORAGE-8000-J4.description"
+msgstr "A Service Processor has detected that its peer is no longer available.\n"
+msgid "STORAGE-8000-J4.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-J4.impact"
+msgstr "A Root Controller Card failed and redundancy has been lost. The SAS fabric is in a degraded state. User data storage is still available.\n"
+msgid "STORAGE-8000-J4.action"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+#
+# code: STORAGE-8000-KQ
+# keys: fault.sp.svc-fail
+#
+msgid "STORAGE-8000-KQ.type"
+msgstr "Fault"
+msgid "STORAGE-8000-KQ.severity"
+msgstr "Major"
+msgid "STORAGE-8000-KQ.description"
+msgstr "A Service Processor service failure has occurred.\n"
+msgid "STORAGE-8000-KQ.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-KQ.impact"
+msgstr "The SAS fabric may be in a degraded state. User data storage is still available.\n"
+msgid "STORAGE-8000-KQ.action"
+msgstr "Refer to the Maintenance page in the Sun ZFS Storage UI to identify the failed component. If a repair is required, the repair instructions are located in the Help section of the Sun ZFS Storage UI.\n"
+#
+# code: STORAGE-8000-LC
+# keys: fault.temp.fail
+#
+msgid "STORAGE-8000-LC.type"
+msgstr "Fault"
+msgid "STORAGE-8000-LC.severity"
+msgstr "Major"
+msgid "STORAGE-8000-LC.description"
+msgstr "Ambient temperature is outside of normal operating range.\n"
+msgid "STORAGE-8000-LC.response"
+msgstr "The service required LED on the enclosure will be illuminated.\n"
+msgid "STORAGE-8000-LC.impact"
+msgstr "A device in the enclosure may be overheating. Subsequent loss of the device may force the enclosure to shutdown.\n"
+msgid "STORAGE-8000-LC.action"
+msgstr "Check that the ambient temperature is adequately cool, and none of the enclosure air inlets are blocked.\n"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/eversholt/files/common/storage.esc Thu Jul 01 23:30:39 2010 -0400
@@ -0,0 +1,332 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ */
+
+#pragma dictionary "STORAGE"
+
+/*
+ * Fault event definitions.
+ */
+
+event fault.config.fan-fail@ses-enclosure;
+event fault.config.psu-fail@ses-enclosure;
+event fault.device.controller.fail@controller;
+event fault.device.ethernet.fail@controller;
+event fault.device.ethernet.fail@sas-expander;
+event fault.device.fan.fail@fan;
+event fault.device.fan.fail@fanmodule;
+event fault.device.psu.fail@psu;
+event fault.device.psu.fail@psu;
+event fault.device.sas-expander.fail@sas-expander;
+event fault.device.unusable-chassis-id@fanboard;
+event fault.io.i2c.fail@controller;
+event fault.io.i2c.fail@fanboard;
+event fault.io.i2c.fail@fanmodule;
+event fault.io.i2c.fail@powerboard;
+event fault.io.i2c.fail@psu;
+event fault.io.i2c.poweron-fail@controller;
+event fault.io.i2c.poweron-fail@fanboard;
+event fault.io.i2c.poweron-fail@fanmodule;
+event fault.io.i2c.poweron-fail@powerboard;
+event fault.io.i2c.poweron-fail@psu;
+event fault.io.sas.log.fatal@sas-expander;
+event fault.io.sas.log.non-fatal@sas-expander;
+event fault.power.ext-fail@ses-enclosure;
+event fault.power.fail@controller;
+event fault.power.fail@controller;
+event fault.power.fail@controller;
+event fault.power.fail@fanmodule;
+event fault.power.fail@fanmodule;
+event fault.power.fail@psu;
+event fault.power.fail@psu;
+event fault.sensor.read-fail@controller;
+event fault.sensor.read-fail@fanmodule;
+event fault.sensor.read-fail@fan;
+event fault.sensor.read-fail@psu;
+event fault.sp.fail@controller;
+event fault.sp.svc-fail@controller;
+event fault.sp.unavailable@controller;
+event fault.temp.fail@controller;
+event fault.temp.fail@fanmodule;
+event fault.temp.fail@psu;
+
+/*
+ * Error event definitions.
+ */
+
+event ereport.chassis.config.missing-fan@ses-enclosure;
+event ereport.chassis.config.missing-psu@ses-enclosure;
+event ereport.chassis.device.ecb.shutoff@controller;
+event ereport.chassis.device.ethernet.link-down@controller;
+event ereport.chassis.device.ethernet.link-down@sas-expander;
+event ereport.chassis.device.psu.dc-fail@psu;
+event ereport.chassis.device.psu.dc-oc@psu;
+event ereport.chassis.device.psu.dc-ov@psu;
+event ereport.chassis.device.psu.dc-uv@psu;
+event ereport.chassis.device.psu.ext-ac-fail@psu;
+event ereport.chassis.device.psu.ot@psu;
+event ereport.chassis.device.sas-expander.fail@sas-expander;
+event ereport.chassis.device.unusable-chassis-id@fanboard;
+event ereport.chassis.io.i2c.fail@controller;
+event ereport.chassis.io.i2c.fail@fanboard;
+event ereport.chassis.io.i2c.fail@fanmodule;
+event ereport.chassis.io.i2c.fail@powerboard;
+event ereport.chassis.io.i2c.fail@psu;
+event ereport.chassis.io.i2c.poweron-fail@controller;
+event ereport.chassis.io.i2c.poweron-fail@fanboard;
+event ereport.chassis.io.i2c.poweron-fail@fanmodule;
+event ereport.chassis.io.i2c.poweron-fail@powerboard;
+event ereport.chassis.io.i2c.poweron-fail@psu;
+event ereport.chassis.post.device.fail@controller;
+event ereport.chassis.post.device.fail@fan;
+event ereport.chassis.post.device.fail@fanmodule;
+event ereport.chassis.post.device.fail@psu;
+event ereport.chassis.post.sp.fail@controller;
+event ereport.chassis.sensor.current.oc@controller;
+event ereport.chassis.sensor.current.oc@fanmodule;
+event ereport.chassis.sensor.current.oc@psu;
+event ereport.chassis.sensor.current.uc@controller;
+event ereport.chassis.sensor.current.uc@fanmodule;
+event ereport.chassis.sensor.current.uc@psu;
+event ereport.chassis.sensor.fanspeed.us@fan;
+event ereport.chassis.sensor.read-fail@controller;
+event ereport.chassis.sensor.read-fail@fanmodule;
+event ereport.chassis.sensor.read-fail@fan;
+event ereport.chassis.sensor.read-fail@psu;
+event ereport.chassis.sensor.temp.ot@controller;
+event ereport.chassis.sensor.temp.ot@fanmodule;
+event ereport.chassis.sensor.temp.ot@psu;
+event ereport.chassis.sensor.temp.ut@controller;
+event ereport.chassis.sensor.temp.ut@fanmodule;
+event ereport.chassis.sensor.temp.ut@psu;
+event ereport.chassis.sensor.voltage.ov@controller;
+event ereport.chassis.sensor.voltage.ov@fanmodule;
+event ereport.chassis.sensor.voltage.ov@psu;
+event ereport.chassis.sensor.voltage.uv@controller;
+event ereport.chassis.sensor.voltage.uv@fanmodule;
+event ereport.chassis.sensor.voltage.uv@psu;
+event ereport.chassis.sp.svc-restart@controller;
+event ereport.chassis.sp.unavailable@controller;
+event ereport.io.sas.log.fatal@sas-expander;
+event ereport.io.sas.log.non-fatal@sas-expander;
+
+/*
+ * Service Processor failure
+ */
+
+prop fault.sp.fail@controller ->
+ ereport.chassis.post.sp.fail@controller;
+
+/*
+ * Controller failure
+ */
+
+prop fault.device.controller.fail@controller ->
+ ereport.chassis.post.device.fail@controller;
+
+/*
+ * Fan module failure
+ */
+
+prop fault.device.fan.fail@fanmodule ->
+ ereport.chassis.post.device.fail@fanmodule;
+
+/*
+ * I2C transaction failure
+ */
+
+prop fault.io.i2c.fail@controller ->
+ ereport.chassis.io.i2c.fail@controller;
+
+prop fault.io.i2c.fail@fanboard ->
+ ereport.chassis.io.i2c.fail@fanboard;
+
+prop fault.io.i2c.fail@fanmodule ->
+ ereport.chassis.io.i2c.fail@fanmodule;
+
+prop fault.io.i2c.fail@powerboard ->
+ ereport.chassis.io.i2c.fail@powerboard;
+
+prop fault.io.i2c.fail@psu ->
+ ereport.chassis.io.i2c.fail@psu;
+
+/*
+ * I2C transaction failure during power-on
+ */
+
+prop fault.io.i2c.poweron-fail@controller ->
+ ereport.chassis.io.i2c.poweron-fail@controller;
+
+prop fault.io.i2c.poweron-fail@fanboard ->
+ ereport.chassis.io.i2c.poweron-fail@fanboard;
+
+prop fault.io.i2c.poweron-fail@fanmodule ->
+ ereport.chassis.io.i2c.poweron-fail@fanmodule;
+
+prop fault.io.i2c.poweron-fail@powerboard ->
+ ereport.chassis.io.i2c.poweron-fail@powerboard;
+
+prop fault.io.i2c.poweron-fail@psu ->
+ ereport.chassis.io.i2c.poweron-fail@psu;
+
+/*
+ * Chassis ID unusable failure
+ */
+
+prop fault.device.unusable-chassis-id@fanboard ->
+ ereport.chassis.device.unusable-chassis-id@fanboard;
+
+/*
+ * Configuration failure
+ */
+
+prop fault.config.psu-fail@ses-enclosure ->
+ ereport.chassis.config.missing-psu@ses-enclosure;
+
+prop fault.config.fan-fail@ses-enclosure ->
+ ereport.chassis.config.missing-fan@ses-enclosure;
+
+/*
+ * Fan failure
+ */
+
+prop fault.device.fan.fail@fan ->
+ ereport.chassis.sensor.fanspeed.us@fan,
+ ereport.chassis.post.device.fail@fan;
+
+/*
+ * Sensor reading failure
+ */
+
+prop fault.sensor.read-fail@controller ->
+ ereport.chassis.sensor.read-fail@controller;
+
+prop fault.sensor.read-fail@fanmodule ->
+ ereport.chassis.sensor.read-fail@fanmodule;
+
+prop fault.sensor.read-fail@fan ->
+ ereport.chassis.sensor.read-fail@fan;
+
+prop fault.sensor.read-fail@psu ->
+ ereport.chassis.sensor.read-fail@psu;
+
+/*
+ * Temperature failure
+ */
+
+prop fault.temp.fail@controller ->
+ ereport.chassis.sensor.temp.ot@controller,
+ ereport.chassis.sensor.temp.ut@controller;
+
+prop fault.temp.fail@fanmodule ->
+ ereport.chassis.sensor.temp.ot@fanmodule,
+ ereport.chassis.sensor.temp.ut@fanmodule;
+
+prop fault.temp.fail@psu ->
+ ereport.chassis.sensor.temp.ot@psu,
+ ereport.chassis.sensor.temp.ut@psu;
+
+/*
+ * Power failure
+ */
+
+prop fault.power.fail@controller ->
+ ereport.chassis.device.ecb.shutoff@controller,
+ ereport.chassis.sensor.current.oc@controller,
+ ereport.chassis.sensor.current.uc@controller,
+ ereport.chassis.sensor.voltage.ov@controller,
+ ereport.chassis.sensor.voltage.uv@controller;
+
+prop fault.power.fail@fanmodule ->
+ ereport.chassis.sensor.current.oc@fanmodule,
+ ereport.chassis.sensor.current.uc@fanmodule,
+ ereport.chassis.sensor.voltage.ov@fanmodule,
+ ereport.chassis.sensor.voltage.uv@fanmodule;
+
+prop fault.power.fail@psu ->
+ ereport.chassis.sensor.current.oc@psu,
+ ereport.chassis.sensor.current.uc@psu,
+ ereport.chassis.sensor.voltage.ov@psu,
+ ereport.chassis.sensor.voltage.uv@psu;
+
+/*
+ * Power supply unit failure
+ */
+
+prop fault.device.psu.fail@psu ->
+ ereport.chassis.device.psu.dc-fail@psu,
+ ereport.chassis.device.psu.dc-ov@psu,
+ ereport.chassis.device.psu.dc-uv@psu,
+ ereport.chassis.device.psu.dc-oc@psu,
+ ereport.chassis.device.psu.ot@psu,
+ ereport.chassis.post.device.fail@psu;
+
+/*
+ * External power failure
+ */
+
+prop fault.power.ext-fail@ses-enclosure ->
+ ereport.chassis.device.psu.ext-ac-fail@psu<>;
+
+/*
+ * SAS Expander failure
+ */
+
+prop fault.device.sas-expander.fail@sas-expander ->
+ ereport.chassis.device.sas-expander.fail@sas-expander;
+
+/*
+ * Ethernet failure
+ */
+
+prop fault.device.ethernet.fail@controller ->
+ ereport.chassis.device.ethernet.link-down@controller;
+
+prop fault.device.ethernet.fail@sas-expander ->
+ ereport.chassis.device.ethernet.link-down@sas-expander;
+
+/*
+ * Service Processor unavailable failure
+ */
+
+prop fault.sp.unavailable@controller ->
+ ereport.chassis.sp.unavailable@controller;
+
+/*
+ * Service Processor service failure
+ */
+
+prop fault.sp.svc-fail@controller ->
+ ereport.chassis.sp.svc-restart@controller;
+
+/*
+ * SAS Expander Log failure
+ */
+
+prop fault.io.sas.log.non-fatal@sas-expander ->
+ ereport.io.sas.log.non-fatal@sas-expander;
+
+prop fault.io.sas.log.fatal@sas-expander ->
+ ereport.io.sas.log.fatal@sas-expander;
+
--- a/usr/src/cmd/fm/eversholt/files/i386/Makefile Thu Jul 01 17:47:34 2010 -0700
+++ b/usr/src/cmd/fm/eversholt/files/i386/Makefile Thu Jul 01 23:30:39 2010 -0400
@@ -19,8 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
#
SUBDIRS=i86pc
@@ -33,7 +32,8 @@
pciexrc.eft \
sca500.eft \
sca1000.eft \
- sensor.eft
+ sensor.eft \
+ storage.eft
include ../../../Makefile.subdirs
--- a/usr/src/cmd/fm/eversholt/files/sparc/Makefile Thu Jul 01 17:47:34 2010 -0700
+++ b/usr/src/cmd/fm/eversholt/files/sparc/Makefile Thu Jul 01 23:30:39 2010 -0400
@@ -19,8 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
#
SUBDIRS=sun4u sun4v SUNW,Sun-Fire-15000
@@ -33,7 +32,8 @@
pciexrc.eft \
sca500.eft \
sca1000.eft \
- sensor.eft
+ sensor.eft \
+ storage.eft
include ../../../Makefile.subdirs
--- a/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf Thu Jul 01 17:47:34 2010 -0700
+++ b/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf Thu Jul 01 23:30:39 2010 -0400
@@ -304,6 +304,7 @@
file path=usr/lib/locale/C/LC_MESSAGES/SCA500.po
file path=usr/lib/locale/C/LC_MESSAGES/SCF.po
file path=usr/lib/locale/C/LC_MESSAGES/SENSOR.po
+file path=usr/lib/locale/C/LC_MESSAGES/STORAGE.po
file path=usr/lib/locale/C/LC_MESSAGES/SUN4.po
file path=usr/lib/locale/C/LC_MESSAGES/SUN4U.po
file path=usr/lib/locale/C/LC_MESSAGES/SUN4V.po
--- a/usr/src/pkg/manifests/service-fault-management.mf Thu Jul 01 17:47:34 2010 -0700
+++ b/usr/src/pkg/manifests/service-fault-management.mf Thu Jul 01 23:30:39 2010 -0400
@@ -249,6 +249,7 @@
file path=usr/lib/fm/dict/PCIEX.dict mode=0444
$(sparc_ONLY)file path=usr/lib/fm/dict/SCF.dict mode=0444
file path=usr/lib/fm/dict/SENSOR.dict mode=0444
+file path=usr/lib/fm/dict/STORAGE.dict mode=0444
$(sparc_ONLY)file path=usr/lib/fm/dict/SUN4.dict mode=0444
$(sparc_ONLY)file path=usr/lib/fm/dict/SUN4U.dict mode=0444
$(sparc_ONLY)file path=usr/lib/fm/dict/SUN4V.dict mode=0444
@@ -261,6 +262,7 @@
file path=usr/lib/fm/eft/pciex.eft mode=0444
file path=usr/lib/fm/eft/pciexrc.eft mode=0444
file path=usr/lib/fm/eft/sensor.eft mode=0444
+file path=usr/lib/fm/eft/storage.eft mode=0444
file path=usr/lib/fm/fmd/fmd mode=0555
file path=usr/lib/fm/fmd/fminject mode=0555
file path=usr/lib/fm/fmd/fmsim mode=0555
@@ -365,6 +367,7 @@
file path=usr/lib/locale/C/LC_MESSAGES/PCIEX.mo mode=0444
$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/SCF.mo mode=0444
file path=usr/lib/locale/C/LC_MESSAGES/SENSOR.mo mode=0444
+file path=usr/lib/locale/C/LC_MESSAGES/STORAGE.mo mode=0444
$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/SUN4.mo mode=0444
$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/SUN4U.mo mode=0444
$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/SUN4V.mo mode=0444