diff options
author | Joshua M. Clulow <josh@sysmgr.org> | 2012-02-04 16:38:08 +1100 |
---|---|---|
committer | Joshua M. Clulow <josh@sysmgr.org> | 2012-02-04 16:38:08 +1100 |
commit | 654b400c387942fc00d4f6869539adbd7b25fbce (patch) | |
tree | a078173520ed4c73cc730339f4eb0e7fcbb8d3cc /usr/src/lib/fm | |
parent | 2de57b5d9b7c1eb3c2381c5c88fcedd8027c2883 (diff) | |
download | illumos-joyent-654b400c387942fc00d4f6869539adbd7b25fbce.tar.gz |
763 FMD msg URLs should refer to something visible
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Yuri Pankov <yuri.pankov@gmail.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/lib/fm')
-rw-r--r-- | usr/src/lib/fm/libfmd_adm/common/fmd_adm.c | 2 | ||||
-rw-r--r-- | usr/src/lib/fm/libfmd_msg/common/fmd_msg.c | 4 | ||||
-rw-r--r-- | usr/src/lib/fm/libfmd_msg/common/fmd_msg_test.out | 24 | ||||
-rw-r--r-- | usr/src/lib/fm/libfmd_snmp/mibs/SUN-FM-MIB.mib | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/usr/src/lib/fm/libfmd_adm/common/fmd_adm.c b/usr/src/lib/fm/libfmd_adm/common/fmd_adm.c index 0d0a2946c5..a637542c62 100644 --- a/usr/src/lib/fm/libfmd_adm/common/fmd_adm.c +++ b/usr/src/lib/fm/libfmd_adm/common/fmd_adm.c @@ -37,7 +37,7 @@ #include <fmd_rpc_adm.h> static const uint_t _fmd_adm_bufsize = 128 * 1024; -static const char _url_fallback[] = "http://sun.com/msg/"; +static const char _url_fallback[] = "http://illumos.org/msg/"; fmd_adm_t * fmd_adm_open(const char *host, uint32_t prog, int version) diff --git a/usr/src/lib/fm/libfmd_msg/common/fmd_msg.c b/usr/src/lib/fm/libfmd_msg/common/fmd_msg.c index 5735942fae..6f7ae70ab9 100644 --- a/usr/src/lib/fm/libfmd_msg/common/fmd_msg.c +++ b/usr/src/lib/fm/libfmd_msg/common/fmd_msg.c @@ -67,7 +67,7 @@ * permitted to contain variable expansions, currently defined as follows: * * %% - literal % character - * %s - knowledge article URL (e.g. http://sun.com/msg/<MSG-ID>) + * %s - knowledge article URL (e.g. http://illumos.org/msg/<MSG-ID>) * %< x > - value x from the current event, using the expression syntax below: * * foo.bar => print nvlist_t member "bar" contained within nvlist_t "foo" @@ -145,7 +145,7 @@ static pthread_rwlock_t fmd_msg_rwlock = PTHREAD_RWLOCK_INITIALIZER; static const char FMD_MSG_DOMAIN[] = "FMD"; static const char FMD_MSG_TEMPLATE[] = "syslog-msgs-message-template"; static const char FMD_MSG_URLKEY[] = "syslog-url"; -static const char FMD_MSG_URLBASE[] = "http://sun.com/msg/"; +static const char FMD_MSG_URLBASE[] = "http://illumos.org/msg/"; static const char FMD_MSG_NLSPATH[] = "NLSPATH=/usr/lib/fm/fmd/fmd.cat"; static const char FMD_MSG_MISSING[] = "-"; diff --git a/usr/src/lib/fm/libfmd_msg/common/fmd_msg_test.out b/usr/src/lib/fm/libfmd_msg/common/fmd_msg_test.out index 4ce3f79f87..71a5d82710 100644 --- a/usr/src/lib/fm/libfmd_msg/common/fmd_msg_test.out +++ b/usr/src/lib/fm/libfmd_msg/common/fmd_msg_test.out @@ -24,32 +24,32 @@ # code TEST-8000-08 item 0 = <<Defect>> code TEST-8000-08 item 1 = <<Minor>> -code TEST-8000-08 item 2 = <<This entry tests URL variable expansion - url = http://sun.com/msg/TEST-8000-08>> +code TEST-8000-08 item 2 = <<This entry tests URL variable expansion - url = http://illumos.org/msg/TEST-8000-08>> code TEST-8000-08 item 3 = <<This entry tests the percent character escape sequence: %>> code TEST-8000-08 item 4 = <<This entry tests variable expansion for event payload members: uuid = %<uuid>, de scheme = %<de.scheme>>> code TEST-8000-08 item 5 = <<Variable expansion for arrays: index = %<test_arr[1].index>>> -code TEST-8000-08 item 6 = <<http://sun.com/msg/TEST-8000-08>> +code TEST-8000-08 item 6 = <<http://illumos.org/msg/TEST-8000-08>> SUNW-MSG-ID: TEST-8000-08, TYPE: Defect, VER: 1, SEVERITY: Minor PLATFORM: -, CSN: -, HOSTNAME: - SOURCE: -, REV: - EVENT-ID: - -DESC: This entry tests URL variable expansion - url = http://sun.com/msg/TEST-8000-08 +DESC: This entry tests URL variable expansion - url = http://illumos.org/msg/TEST-8000-08 AUTO-RESPONSE: This entry tests the percent character escape sequence: % IMPACT: This entry tests variable expansion for event payload members: uuid = %<uuid>, de scheme = %<de.scheme> REC-ACTION: Variable expansion for arrays: index = %<test_arr[1].index> code TEST-8000-08 item 0 = <<Defect>> code TEST-8000-08 item 1 = <<Minor>> -code TEST-8000-08 item 2 = <<This entry tests URL variable expansion - url = http://sun.com/msg/TEST-8000-08>> +code TEST-8000-08 item 2 = <<This entry tests URL variable expansion - url = http://illumos.org/msg/TEST-8000-08>> code TEST-8000-08 item 3 = <<This entry tests the percent character escape sequence: %>> code TEST-8000-08 item 4 = <<This entry tests variable expansion for event payload members: uuid = 12345678, de scheme = fmd>> code TEST-8000-08 item 5 = <<Variable expansion for arrays: index = 1>> -code TEST-8000-08 item 6 = <<http://sun.com/msg/TEST-8000-08>> +code TEST-8000-08 item 6 = <<http://illumos.org/msg/TEST-8000-08>> SUNW-MSG-ID: TEST-8000-08, TYPE: Defect, VER: 1, SEVERITY: Minor PLATFORM: product, CSN: product_sn, HOSTNAME: server SOURCE: fmd_msg_test, REV: 1.0 EVENT-ID: 12345678 -DESC: This entry tests URL variable expansion - url = http://sun.com/msg/TEST-8000-08 +DESC: This entry tests URL variable expansion - url = http://illumos.org/msg/TEST-8000-08 AUTO-RESPONSE: This entry tests the percent character escape sequence: % IMPACT: This entry tests variable expansion for event payload members: uuid = 12345678, de scheme = fmd REC-ACTION: Variable expansion for arrays: index = 1 @@ -65,32 +65,32 @@ REC-ACTION: Variable expansion for arrays: index = 1 code TEST-8000-08 item 0 = <<Defect>> code TEST-8000-08 item 1 = <<Minor>> -code TEST-8000-08 item 2 = <<This entry tests URL variable expansion - url = http://sun.com/msg/TEST-8000-08>> +code TEST-8000-08 item 2 = <<This entry tests URL variable expansion - url = http://illumos.org/msg/TEST-8000-08>> code TEST-8000-08 item 3 = <<This entry tests the percent character escape sequence: %>> code TEST-8000-08 item 4 = <<This entry tests variable expansion for event payload members: uuid = %<uuid>, de scheme = %<de.scheme>>> code TEST-8000-08 item 5 = <<Variable expansion for arrays: index = %<test_arr[1].index>>> -code TEST-8000-08 item 6 = <<http://sun.com/msg/TEST-8000-08>> +code TEST-8000-08 item 6 = <<http://illumos.org/msg/TEST-8000-08>> SUNW-MSG-ID: TEST-8000-08, TYPE: Defect, VER: 1, SEVERITY: Minor PLATFORM: -, CSN: -, HOSTNAME: - SOURCE: -, REV: - EVENT-ID: - -DESC: This entry tests URL variable expansion - url = http://sun.com/msg/TEST-8000-08 +DESC: This entry tests URL variable expansion - url = http://illumos.org/msg/TEST-8000-08 AUTO-RESPONSE: This entry tests the percent character escape sequence: % IMPACT: This entry tests variable expansion for event payload members: uuid = %<uuid>, de scheme = %<de.scheme> REC-ACTION: Variable expansion for arrays: index = %<test_arr[1].index> code TEST-8000-08 item 0 = <<Defect>> code TEST-8000-08 item 1 = <<Minor>> -code TEST-8000-08 item 2 = <<This entry tests URL variable expansion - url = http://sun.com/msg/TEST-8000-08>> +code TEST-8000-08 item 2 = <<This entry tests URL variable expansion - url = http://illumos.org/msg/TEST-8000-08>> code TEST-8000-08 item 3 = <<This entry tests the percent character escape sequence: %>> code TEST-8000-08 item 4 = <<This entry tests variable expansion for event payload members: uuid = 12345678, de scheme = fmd>> code TEST-8000-08 item 5 = <<Variable expansion for arrays: index = 1>> -code TEST-8000-08 item 6 = <<http://sun.com/msg/TEST-8000-08>> +code TEST-8000-08 item 6 = <<http://illumos.org/msg/TEST-8000-08>> SUNW-MSG-ID: TEST-8000-08, TYPE: Defect, VER: 1, SEVERITY: Minor PLATFORM: product, CSN: product_sn, HOSTNAME: server SOURCE: fmd_msg_test, REV: 1.0 EVENT-ID: 12345678 -DESC: This entry tests URL variable expansion - url = http://sun.com/msg/TEST-8000-08 +DESC: This entry tests URL variable expansion - url = http://illumos.org/msg/TEST-8000-08 AUTO-RESPONSE: This entry tests the percent character escape sequence: % IMPACT: This entry tests variable expansion for event payload members: uuid = 12345678, de scheme = fmd REC-ACTION: Variable expansion for arrays: index = 1 diff --git a/usr/src/lib/fm/libfmd_snmp/mibs/SUN-FM-MIB.mib b/usr/src/lib/fm/libfmd_snmp/mibs/SUN-FM-MIB.mib index b093cbc365..3d18fc9056 100644 --- a/usr/src/lib/fm/libfmd_snmp/mibs/SUN-FM-MIB.mib +++ b/usr/src/lib/fm/libfmd_snmp/mibs/SUN-FM-MIB.mib @@ -166,7 +166,7 @@ sunFmProblemCode OBJECT-TYPE DESCRIPTION "The SUNW-MSG-ID static message identifier for this class of problem, as recorded by fmd(1M) and shown by fmdump(1M). The - message identifier can be used as a key at http://sun.com/msg/" + message identifier can be used as a key at http://illumos.org/msg/" ::= { sunFmProblemEntry 3 } sunFmProblemURL OBJECT-TYPE |