NEX-16536 SUN-IREPORT-MIB is broken
NEX-16537 enhance FM traps
NEX-16545 SMF dict should have obsolete entries removed
Reviewed by: Dan Fields <dan.fields@nexenta.com>
Reviewed by: Cynthia Eastham <cynthia.eastham@nexenta.com>
Reviewed by: Alexander Eremin <alexander.eremin@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>

*** 20,29 ****
--- 20,34 ----
   */
  
  /*
   * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
   */
+ 
+ /*
+  * Copyright 2018 Nexenta Systems, Inc.
+  */
+ 
  #ifndef _LIBFMNOTIFY_H
  #define _LIBFMNOTIFY_H
  
  #include <stdio.h>
  #include <stdlib.h>
*** 64,86 ****
  const char FMNOTIFY_MSG_DOMAIN[] = "FMNOTIFY";
  
  typedef struct nd_ev_info {
          fmev_t ei_ev;
          const char *ei_class;
!         char *ei_descr;
!         char *ei_severity;
          char *ei_diagcode;
          char *ei_url;
!         char *ei_uuid;
          char *ei_fmri;
          char *ei_from_state;
          char *ei_to_state;
          char *ei_reason;
          nvlist_t *ei_payload;
  } nd_ev_info_t;
  
- 
  void nd_cleanup(nd_hdl_t *);
  void nd_dump_nvlist(nd_hdl_t *, nvlist_t *);
  void nd_debug(nd_hdl_t *, const char *, ...);
  void nd_error(nd_hdl_t *, const char *, ...);
  void nd_abort(nd_hdl_t *, const char *, ...);
--- 69,91 ----
  const char FMNOTIFY_MSG_DOMAIN[] = "FMNOTIFY";
  
  typedef struct nd_ev_info {
          fmev_t ei_ev;
          const char *ei_class;
!         char *ei_uuid;
          char *ei_diagcode;
+         char *ei_type;
+         char *ei_severity;
          char *ei_url;
!         char *ei_descr;
          char *ei_fmri;
          char *ei_from_state;
          char *ei_to_state;
          char *ei_reason;
          nvlist_t *ei_payload;
  } nd_ev_info_t;
  
  void nd_cleanup(nd_hdl_t *);
  void nd_dump_nvlist(nd_hdl_t *, nvlist_t *);
  void nd_debug(nd_hdl_t *, const char *, ...);
  void nd_error(nd_hdl_t *, const char *, ...);
  void nd_abort(nd_hdl_t *, const char *, ...);